diff --git a/AUTHORS b/AUTHORS index 9bedcede6..ecd0aafc8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -20,8 +20,7 @@ and moral support from (alphabetically by first name or nickname): - artoo@cromnix.org - Bernhard Landauer - Bezzy1999 - - Bill Auguer - - bill-auger + - Bill Auger - Caio Jordão Carvalho - Collabora LTD - crispg72 diff --git a/CHANGES b/CHANGES index cb807cdc4..0ecaafb51 100644 --- a/CHANGES +++ b/CHANGES @@ -31,6 +31,14 @@ This release contains contributions from (alphabetically by first name): "fancy" release notes as a QML application, rather than a webview or text widget. Note that this does not replace the slideshow-during- installation module. + - The *users* module now has knobs for setting the hostname and writing + the `/etc/hosts` file. The new configuration options are documented + in `users.conf`. #1140 + - Multiple *netinstall* modules can exist side-by-side, and they each + control the package installation for their part of the package list. + Previously, a netinstall module would overwrite all of the package + configuration done by other netinstall modules. Translations can be + provided in the configuration file, `netinstall.conf`. #1303 # 3.2.18 (2020-01-28) # diff --git a/CMakeLists.txt b/CMakeLists.txt index f27b91d8e..efa07d2d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -549,10 +549,11 @@ install( "${PROJECT_BINARY_DIR}/CalamaresConfig.cmake" "${PROJECT_BINARY_DIR}/CalamaresConfigVersion.cmake" "${PROJECT_BINARY_DIR}/CalamaresUse.cmake" - "CMakeModules/CalamaresAddPlugin.cmake" - "CMakeModules/CalamaresAddModuleSubdirectory.cmake" - "CMakeModules/CalamaresAddLibrary.cmake" "CMakeModules/CalamaresAddBrandingSubdirectory.cmake" + "CMakeModules/CalamaresAddLibrary.cmake" + "CMakeModules/CalamaresAddModuleSubdirectory.cmake" + "CMakeModules/CalamaresAddPlugin.cmake" + "CMakeModules/CalamaresAddTest.cmake" "CMakeModules/CalamaresAddTranslations.cmake" "CMakeModules/CalamaresAutomoc.cmake" "CMakeModules/CMakeColors.cmake" diff --git a/CMakeModules/CalamaresAddTest.cmake b/CMakeModules/CalamaresAddTest.cmake new file mode 100644 index 000000000..36be0f03e --- /dev/null +++ b/CMakeModules/CalamaresAddTest.cmake @@ -0,0 +1,58 @@ +# === 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 +# +### +# +# Support functions for building Calamares tests. +# This extends KDE's ECM tests with some custom patterns. +# +# calamares_add_test( +# +# [GUI] +# SOURCES +# ) + +include( CMakeParseArguments ) +include( CalamaresAutomoc ) + +function( calamares_add_test ) + # parse arguments (name needs to be saved before passing ARGN into the macro) + set( NAME ${ARGV0} ) + set( options GUI ) + set( multiValueArgs SOURCES LIBRARIES DEFINITIONS ) + cmake_parse_arguments( TEST "${options}" "" "${multiValueArgs}" ${ARGN} ) + set( TEST_NAME ${NAME} ) + + if( ECM_FOUND AND BUILD_TESTING ) + ecm_add_test( + ${TEST_SOURCES} + TEST_NAME + ${TEST_NAME} + LINK_LIBRARIES + calamares + ${TEST_LIBRARIES} + Qt5::Core + Qt5::Test + ) + calamares_automoc( ${TEST_NAME} ) + target_compile_definitions( ${TEST_NAME} PRIVATE -DBUILD_AS_TEST ${TEST_DEFINITIONS} ) + if( TEST_GUI ) + target_link_libraries( ${TEST_NAME} calamaresui Qt5::Gui ) + endif() + endif() +endfunction() diff --git a/CMakeModules/FindYAMLCPP.cmake b/CMakeModules/FindYAMLCPP.cmake index 1ec9798d5..395c794bb 100644 --- a/CMakeModules/FindYAMLCPP.cmake +++ b/CMakeModules/FindYAMLCPP.cmake @@ -1,9 +1,11 @@ # Locate yaml-cpp # # This module defines -# YAMLCPP_FOUND, if false, do not try to link to yaml-cpp -# YAMLCPP_LIBRARY, where to find yaml-cpp -# YAMLCPP_INCLUDE_DIR, where to find yaml.h +# YAMLCPP_FOUND, if false, do not try to link to yaml-cpp +# YAMLCPP_LIBRARY, where to find yaml-cpp +# YAMLCPP_INCLUDE_DIR, where to find yaml.h +# There is also one IMPORTED library target, +# yamlcpp # # By default, the dynamic libraries of yaml-cpp will be found. To find the static ones instead, # you must set the YAMLCPP_STATIC_LIBRARY variable to TRUE before calling find_package(YamlCpp ...). @@ -48,3 +50,12 @@ find_library(YAMLCPP_LIBRARY include(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(YAMLCPP DEFAULT_MSG YAMLCPP_INCLUDE_DIR YAMLCPP_LIBRARY) mark_as_advanced(YAMLCPP_INCLUDE_DIR YAMLCPP_LIBRARY) + +# Add an imported target +if( YAMLCPP_LIBRARY ) + add_library( yamlcpp UNKNOWN IMPORTED ) + set_property( TARGET yamlcpp PROPERTY IMPORTED_LOCATION ${YAMLCPP_LIBRARY} ) + if ( YAMLCPP_INCLUDE_DIR ) + set_property( TARGET yamlcpp PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${YAMLCPP_INCLUDE_DIR} ) + endif() +endif() diff --git a/calamares.desktop b/calamares.desktop index f945144a4..f071c3410 100644 --- a/calamares.desktop +++ b/calamares.desktop @@ -17,9 +17,9 @@ Name[ar]=تثبيت النظام Icon[ar]=كالامارس GenericName[ar]=مثبت النظام Comment[ar]=كالامارس - مثبت النظام -Name[as]=চিছ্তেম ইনস্তল কৰক +Name[as]=চিছটেম ইনস্তল কৰক Icon[as]=কেলামাৰেচ -GenericName[as]=চিছ্তেম ইনস্তলাৰ +GenericName[as]=চিছটেম ইনস্তলাৰ Comment[as]=কেলামাৰেচ — চিছটেম​ ইনস্তলাৰ Name[be]=Усталяваць сістэму Icon[be]=calamares diff --git a/lang/calamares_ar.ts b/lang/calamares_ar.ts index 76733dd16..9184d2434 100644 --- a/lang/calamares_ar.ts +++ b/lang/calamares_ar.ts @@ -6,7 +6,7 @@ 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 إن بدأته بوضع التّوافقيّة. + <strong>بيئة الإقلاع</strong> لهذا النّظام.<br><br> يدعم فقط أنظمة x86 القديمة <strong>BIOS</strong>.<br>غالبًا ما تستخدم الأنظمة الجديدة <strong>EFI</strong>، ولكن ما زال بإمكانك إظهاره ك‍ BIOS إن بدأته بوضع التّوافقيّة. @@ -101,7 +101,7 @@ Reload Stylesheet - + إعادة تحميل ورقة الأنماط @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install ثبت @@ -143,7 +143,7 @@ Calamares::JobThread - + Done انتهى @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -242,175 +260,176 @@ Calamares::ViewManager - - + + &Back &رجوع - - + + &Next &التالي - - + + &Cancel &إلغاء - + Cancel setup without changing the system. - + Cancel installation without changing the system. الغاء الـ تثبيت من دون احداث تغيير في النظام - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install &ثبت - + Setup is complete. Close the setup program. - + اكتمل الإعداد. أغلق برنامج الإعداد. - + Cancel setup? - + إلغاء الإعداد؟ - + Cancel installation? إلغاء التثبيت؟ - + Do you really want to cancel the current setup process? The setup program 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? الإستمرار في التثبيت؟ - + 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 فشل التثبيت @@ -418,22 +437,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type نوع الاستثناء غير معروف - + unparseable Python error خطأ بايثون لا يمكن تحليله - + unparseable Python traceback تتبّع بايثون خلفيّ لا يمكن تحليله - + Unfetchable Python error. خطأ لا يمكن الحصول علية في بايثون. @@ -739,22 +758,22 @@ The installer will quit and all changes will be lost. تشفير - + Logical منطقيّ - + Primary أساسيّ - + GPT GPT - + Mountpoint already in use. Please select another one. @@ -762,22 +781,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. ينشئ قسم %1 جديد على %2. - + The installer failed to create partition on disk '%1'. فشل المثبّت في إنشاء قسم على القرص '%1'. @@ -1071,7 +1090,7 @@ The installer will quit and all changes will be lost. الشّارات: - + Mountpoint already in use. Please select another one. @@ -1107,37 +1126,37 @@ The installer will quit and all changes will be lost. 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. يضبط نقاط الضّمّ. @@ -1221,22 +1240,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. يهيّء القسم %1 بنظام الملفّات %2. - + The installer failed to format partition %1 on disk '%2'. فشل المثبّت في تهيئة القسم %1 على القرص '%2'. @@ -1619,7 +1638,7 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1644,27 +1663,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) @@ -1672,10 +1691,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1951,7 +2029,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2373,7 +2451,7 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. + There are no partitions to install on. @@ -2438,65 +2516,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. معاملات نداء المهمة سيّئة. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -2550,7 +2628,7 @@ Output: - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2566,29 +2644,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2617,69 +2689,69 @@ Output: نموذج - + 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 غ.بايت على الأقلّ. - + <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: @@ -2862,29 +2934,29 @@ Output: 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 تعذّرت كتابة اسم المضيف إلى النّظام الهدف @@ -2922,82 +2994,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. اضبط رايات القسم %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. يمحي رايات القسم <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. يمحي رايات القسم <strong>%1</strong>. - + Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. يضبط رايات <strong>%2</strong> القسم<strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. فشل المثبّت في ضبط رايات القسم %1. @@ -3005,42 +3077,42 @@ Output: 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. @@ -3237,37 +3309,37 @@ Output: - + Your username is too long. اسم المستخدم طويل جدًّا. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. اسم المضيف قصير جدًّا. - + Your hostname is too long. اسم المضيف طويل جدًّا. - + Your passwords do not match! لا يوجد تطابق في كلمات السر! @@ -3275,7 +3347,7 @@ Output: UsersViewStep - + Users المستخدمين @@ -3445,6 +3517,14 @@ Output: %1 الدعم + + WelcomeQmlViewStep + + + Welcome + مرحبا بك + + WelcomeViewStep @@ -3453,4 +3533,46 @@ Output: مرحبا بك + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_as.ts b/lang/calamares_as.ts index f9c4b32f4..e6871325d 100644 --- a/lang/calamares_as.ts +++ b/lang/calamares_as.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up চেত্ আপ - + Install ইনস্তল @@ -143,7 +143,7 @@ Calamares::JobThread - + Done হৈ গ'ল @@ -177,36 +177,54 @@ Calamares::PythonJob - + Running %1 operation. %1 কাৰ্য চলি আছে। - + Bad working directory path বেয়া কৰ্মৰত ডাইৰেক্টৰী পথ - + Working directory %1 for python job %2 is not readable. %2 পাইথন কাৰ্য্যৰ %1 কৰ্মৰত ডাইৰেক্টৰী পঢ়িব নোৱাৰি।​ - + Bad main script file বেয়া মুখ্য লিপি ফাইল - + Main script file %1 for python job %2 is not readable. %2 পাইথন কাৰ্য্যৰ %1 মূখ্য লিপি ফাইল পঢ়িব নোৱাৰি। - + Boost.Python error in job "%1". "%1" কাৰ্য্যত Boost.Python ত্ৰুটি। + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,176 +252,176 @@ Calamares::ViewManager - - + + &Back পাছলৈ (&B) - - + + &Next পৰবর্তী (&N) - - + + &Cancel বাতিল কৰক (&C) - + Cancel setup without changing the system. চিছ্তেম সলনি নকৰাকৈ চেত্ আপ বাতিল কৰক। - + Cancel installation without changing the system. চিছ্তেম সলনি নকৰাকৈ ইনস্তলেচন বাতিল কৰক। - + Setup Failed চেত্ আপ বিফল হ'ল - + Would you like to paste the install log to the web? আপুনি ৱেবত ইণ্স্টল ল'গ পেস্ট কৰিব বিচাৰে নেকি? - + Install Log Paste URL ইনস্তল​ ল'গ পেস্ট URL - + The upload was unsuccessful. No web-paste was done. আপলোড বিফল হৈছিল। কোনো ৱেব-পেস্ট কৰা হোৱা নাছিল। - + Calamares Initialization Failed কেলামাৰেচৰ আৰম্ভণি বিফল হ'ল - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 ইনস্তল কৰিব পৰা নগ'ল। কেলামাৰেচে সকলোবোৰ সংৰূপ দিয়া মডিউল লোড্ কৰাত সফল নহ'ল। এইটো এটা আপোনাৰ ডিষ্ট্ৰিবিউচনে কি ধৰণে কেলামাৰেচ ব্যৱহাৰ কৰিছে, সেই সম্বন্ধীয় সমস্যা। - + <br/>The following modules could not be loaded: <br/>নিম্নোক্ত মডিউলবোৰ লোড্ কৰিৱ পৰা নগ'ল: - + Continue with installation? ইন্স্তলেচন অব্যাহত ৰাখিব? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> %1 চেত্ আপ প্ৰগ্ৰেমটোৱে %2 চেত্ আপ কৰিবলৈ আপোনাৰ ডিস্কত সালসলনি কৰিব।<br/><strong>আপুনি এইবোৰ পিছত পূৰ্বলৈ সলনি কৰিব নোৱাৰিব।</strong> - + &Set up now এতিয়া চেত্ আপ কৰক (&S) - + &Set up চেত্ আপ কৰক (&S) - + &Install ইনস্তল (&I) - + Setup is complete. Close the setup program. চেত্ আপ সম্পূৰ্ণ হ'ল। প্ৰোগ্ৰেম বন্ধ কৰক। - + Cancel setup? চেত্ আপ বাতিল কৰিব? - + Cancel installation? ইনস্তলেছন বাতিল কৰিব? - + Do you really want to cancel the current setup process? The setup program 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 হয় (&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) - + &Done হৈ গ'ল (&D) - + The installation is complete. Close the installer. ইনস্তলেচন সম্পূৰ্ণ হ'ল। ইন্স্তলাৰ বন্ধ কৰক। - + Error ত্ৰুটি - + Installation Failed ইনস্তলেচন বিফল হ'ল @@ -411,22 +429,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type অপৰিচিত প্ৰকাৰৰ ব্যতিক্রম - + unparseable Python error অপ্ৰাপ্য পাইথন ত্ৰুটি - + unparseable Python traceback অপ্ৰাপ্য পাইথন ত্ৰেচবেক - + Unfetchable Python error. ঢুকি নোপোৱা পাইথন ক্ৰুটি। @@ -535,7 +553,7 @@ The installer will quit and all changes will be lost. EFI system partition: - EFI চিছ্টেম বিভাজন: + EFI চিছটেম বিভাজন: @@ -548,12 +566,12 @@ The installer will quit and all changes will be lost. <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> কৰা হ'ব। + <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/> আপুনি কি কৰিব বিচাৰে? স্টোৰেজ ডিভাইচটোত যিকোনো সলনি কৰাৰ আগত আপুনি পুনৰীক্ষণ আৰু সলনি কৰিব পাৰিব। + এইটো ষ্টোৰেজ ডিভাইচত %1 আছে। <br/> আপুনি কি কৰিব বিচাৰে? ষ্টোৰেজ ডিভাইচটোত যিকোনো সলনি কৰাৰ আগত আপুনি পুনৰীক্ষণ আৰু সলনি কৰিব পাৰিব। @@ -599,12 +617,12 @@ The installer will quit and all changes will be lost. 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/>স্টোৰেজ ডিভাইচটোত যিকোনো সলনি কৰাৰ আগত আপুনি পুনৰীক্ষণ আৰু সলনি কৰিব পাৰিব। + এইটো ষ্টোৰেজ ডিভাইচত ইতিমধ্যে এটা অপাৰেটিং চিছটেম আছে। আপুনি কি কৰিব বিচাৰে? <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. - এইটো স্টোৰেজ ডিভাইচত একাধিক এটা অপাৰেটিন্গ্ চিছটেম আছে। আপুনি কি কৰিব বিচাৰে? 1স্টোৰেজ ডিভাইচটোত যিকোনো সলনি কৰাৰ আগত আপুনি পুনৰীক্ষণ আৰু সলনি কৰিব পাৰিব। + এইটো ষ্টোৰেজ ডিভাইচত একাধিক এটা অপাৰেটিং চিছটেম আছে। আপুনি কি কৰিব বিচাৰে? 1ষ্টোৰেজ ডিভাইচটোত যিকোনো সলনি কৰাৰ আগত আপুনি পুনৰীক্ষণ আৰু সলনি কৰিব পাৰিব। @@ -659,12 +677,12 @@ The installer will quit and all changes will be lost. The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined. - কমান্ডটো হ'স্ট পৰিৱেশত চলে আৰু তাৰ বাবে ৰুট পথ জানাটো আৱশ্যক, কিন্তু rootMountPointৰ বিষয়ে একো উল্লেখ নাই। + কমাণ্ডটো হ'স্ট পৰিৱেশত চলে আৰু তাৰ বাবে ৰুট পথ জানাটো আৱশ্যক, কিন্তু rootMountPointৰ বিষয়ে একো উল্লেখ নাই। The command needs to know the user's name, but no username is defined. - কমান্ডটোৱে ব্যৱহাৰকাৰীৰ নাম জনাটো আৱশ্যক, কিন্তু কোনো ব্যৱহাৰকাৰীৰ নাম উল্লেখ নাই। + কমাণ্ডটোৱে ব্যৱহাৰকাৰীৰ নাম জনাটো আৱশ্যক, কিন্তু কোনো ব্যৱহাৰকাৰীৰ নাম উল্লেখ নাই। @@ -730,25 +748,25 @@ The installer will quit and all changes will be lost. En&crypt - এন্ক্ৰিপ্ত্ (&c) + এনক্ৰিপ্ত্ (&c) - + Logical যুক্তিসম্মত - + Primary মূখ্য - + GPT GPT - + Mountpoint already in use. Please select another one. এইটো মাওন্ট্ পইন্ট্ ইতিমধ্যে ব্যৱহাৰ হৈ আছে। অনুগ্ৰহ কৰি বেলেগ এটা বাচনি কৰক। @@ -756,22 +774,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. %1 ফাইল চিছটেমৰ সৈতে %4 (%3) ত %2MiBৰ নতুন বিভাজন বনাওক। - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. <strong>%4</strong>ত নতুন (%3) <strong>%1</strong> ফাইল চিছটেমৰ <strong>%2MiB</strong> বিভাজন কৰক। - + Creating new %1 partition on %2. %2ত নতুন %1 বিভজন বনাই আছে। - + The installer failed to create partition on disk '%1'. '%1' ডিস্কত নতুন বিভাজন বনোৱাত ইনস্তলাৰটো বিফল হ'ল। @@ -852,17 +870,17 @@ The installer will quit and all changes will be lost. Cannot create sudoers file for writing. - লিখাৰ বাবে sudoers ফাইল বনাব নোৱাৰি। + লিখাৰ বাবে sudoers ফাইল বনাব পৰা নগ'ল। Cannot chmod sudoers file. - sudoers ফাইলত chmod কৰিব নোৱাৰি। + sudoers ফাইলত chmod কৰিব পৰা নগ'ল। Cannot open groups file for reading. - পঢ়াৰ বাবে গ্ৰুপবোৰৰ ফাইল খুলিব নোৱাৰি। + পঢ়াৰ বাবে groups ফাইল খুলিব পৰা নগ'ল। @@ -902,17 +920,17 @@ The installer will quit and all changes will be lost. Deactivate volume group named %1. - %1 নামৰ ভলিউম্ গোট নিস্ক্ৰিয় কৰক। + %1 নামৰ ভলিউম গোট নিস্ক্ৰিয় কৰক। Deactivate volume group named <strong>%1</strong>. - <strong>%1</strong> নামৰ ভলিউম্ গোট নিস্ক্ৰিয় কৰক। + <strong>%1</strong> নামৰ ভলিউম গোট নিস্ক্ৰিয় কৰক। The installer failed to deactivate a volume group named %1. - ইনস্তলাৰটো %1 নামৰ ভলিউম্ গোট নিস্ক্ৰিয় কৰাত বিফল হ'ল। + ইনস্তলাৰটো %1 নামৰ ভলিউম গোট নিস্ক্ৰিয় কৰাত বিফল হ'ল। @@ -925,7 +943,7 @@ The installer will quit and all changes will be lost. Delete partition <strong>%1</strong>. - <strong>%1</strong> বিভাজন বিলোপ কৰক। + <strong>%1</strong> বিভাজন ডিলিট কৰক। @@ -943,7 +961,7 @@ The installer will quit and all changes will be lost. The type of <strong>partition table</strong> on the selected storage device.<br><br>The only way to change the partition table type is to erase and recreate the partition table from scratch, which destroys all data on the storage device.<br>This installer will keep the current partition table unless you explicitly choose otherwise.<br>If unsure, on modern systems GPT is preferred. - বাচনি কৰা ডিভাইচৰ বিভাজন তালিকাৰ প্ৰকাৰ। বিভাজন তালিকা বিলোপ কৰি আকৌ আৰম্ভনিৰ পৰা বনাইহে বিভাজন তালিকাৰ প্ৰকাৰ সলনি কৰিব পাৰি, যিয়ে ডিভাইচত থকা গোটেই ডাটা বিলোপ কৰিব। যদি আপুনি বেলেগ একো বাচনি নকৰে, ইনস্তলাৰটোৱে বৰ্তমানৰ বিভাজন তালিকা প্ৰয়োগ কৰিব। যদি আপুনি নিশ্চিত নহয়, আধুনিক চিছটেমত GPT বাচনি কৰক। + বাচনি কৰা ডিভাইচৰ বিভাজন তালিকাৰ প্ৰকাৰ। বিভাজন তালিকা বিলোপ কৰি আকৌ আৰম্ভনিৰ পৰা বনাইহে বিভাজন তালিকাৰ প্ৰকাৰ সলনি কৰিব পাৰি, যিয়ে ষ্টোৰেজ ডিভাইচত থকা গোটেই ডাটা বিলোপ কৰিব। যদি আপুনি বেলেগ একো বাচনি নকৰে, ইনস্তলাৰটোৱে বৰ্তমানৰ বিভাজন তালিকা প্ৰয়োগ কৰিব। যদি আপুনি নিশ্চিত নহয়, আধুনিক চিছটেমত GPT বাচনি কৰক। @@ -958,7 +976,7 @@ The installer will quit and all changes will be lost. 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. - ইনস্তলাৰটোৱে বচনি কৰা ডিভাইচত বিভাজন তালিকা বিচাৰি নাপলে। ডিভাইচটোত কোনো বিভাজন তালিকা নাই বা বিভাজন তালিকা বেয়া বা অগ্যাত প্ৰকাৰ। এই ইনস্তলাৰটোৱে আপোনাৰ বাবে নতুন বিভাজন তালিকা স্বত:ভাৱে বনাব পাৰে বা মেন্যুৱেল বিভাজন পেজৰ দ্বাৰা বনাব পাৰে। + ইনস্তলাৰটোৱে বচনি কৰা ষ্টোৰেজ ডিভাইচত বিভাজন তালিকা বিচাৰি নাপলে। ডিভাইচটোত কোনো বিভাজন তালিকা নাই বা বিভাজন তালিকা বেয়া বা অগ্যাত প্ৰকাৰ। এই ইনস্তলাৰটোৱে আপোনাৰ বাবে নতুন বিভাজন তালিকা স্বত:ভাৱে বনাব পাৰে বা মেন্যুৱেল বিভাজন পেজৰ দ্বাৰা বনাব পাৰে। @@ -991,12 +1009,12 @@ The installer will quit and all changes will be lost. Write LUKS configuration for Dracut to %1 - Dracutৰ বাবে %1ৰ LUKS কন্ফিগাৰেশ্বন লিখক + Dracutৰ বাবে LUKS কনফিগাৰেচন %1ত লিখক Skip writing LUKS configuration for Dracut: "/" partition is not encrypted - Dracutৰ বাবে %1ৰ LUKS কন্ফিগাৰেশ্বন লিখা বন্ধ কৰক: "/" বিভাজন এনক্ৰিপ্ত নহয় + Dracutৰ বাবে LUKS কনফিগাৰেচন লিখা বন্ধ কৰক: "/" বিভাজনত এনক্ৰিপছন নাই @@ -1009,7 +1027,7 @@ The installer will quit and all changes will be lost. Dummy C++ Job - ডামী সী++ কাৰ্য্য + ডামী C++ কাৰ্য্য @@ -1047,7 +1065,7 @@ The installer will quit and all changes will be lost. Si&ze: - আকাৰ (&z): + আয়তন (&z): @@ -1062,10 +1080,10 @@ The installer will quit and all changes will be lost. Flags: - ফ্লেগ সমুহ: + ফ্লেগ সমূহ: - + Mountpoint already in use. Please select another one. এইটো মাওন্ট্ পইন্ট্ ইতিমধ্যে ব্যৱহাৰ হৈ আছে। অনুগ্ৰহ কৰি বেলেগ এটা বাচনি কৰক। @@ -1080,7 +1098,7 @@ The installer will quit and all changes will be lost. En&crypt system - চিছটেম এন্ক্ৰিপ্ত্ কৰক (&E) + চিছটেম এনক্ৰিপ্ত্ কৰক (&c) @@ -1101,39 +1119,39 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information - বিভাজন তথ্য ছেট কৰক + বিভাজন তথ্য চেত্ কৰক - + Install %1 on <strong>new</strong> %2 system partition. <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>. %3 বিভাজন <strong>%1</strong> <strong>%2</strong>ৰ সৈতে স্থাপন কৰক। - + Install boot loader on <strong>%1</strong>. <strong>1%ত</strong> বুত্ লোডাৰ ইনস্তল কৰক। - + Setting up mount points. - মাউন্ট পইন্ট চেত্ আপ কৰি আছে। + মাউন্ট পইন্ট চেত্ আপ হৈ আছে। @@ -1215,24 +1233,24 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - %4ত ফৰমেট বিভাজন %1 ( ফাইল চিছটেম: %2, আয়তন: %3 MiB) + %4ত ফৰ্মেট বিভাজন %1 ( ফাইল চিছটেম: %2, আয়তন: %3 MiB) - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - <strong>%3MiB</strong> ৰ <strong>%1 %</strong> বিভাজন <strong>%2</strong> ফাইল চিছটেমৰ সৈতে ফৰমেট কৰক। + <strong>%3MiB</strong> ৰ <strong>%1 %</strong> বিভাজন <strong>%2</strong> ফাইল চিছটেমৰ সৈতে ফৰ্মেট কৰক। - + Formatting partition %1 with file system %2. - %1 ফৰমেট বিভাজনৰ সৈতে %2 ফাইল চিছটেম। + %1 ফৰ্মেট বিভাজনৰ সৈতে %2 ফাইল চিছটেম। - + The installer failed to format partition %1 on disk '%2'. - ইনস্তলাৰটো '%2' ডিস্কত %1 বিভাজন​ ফৰমেট কৰাত বিফল হ'ল। + ইনস্তলাৰটো '%2' ডিস্কত %1 বিভাজন​ ফৰ্মেট কৰাত বিফল হ'ল। @@ -1324,7 +1342,7 @@ The installer will quit and all changes will be lost. OEM Batch Identifier - মূল ঊপকৰণ নিৰ্মাতা গোট চিনক্তকাৰী + মূল উপকৰণ নিৰ্মাতা গোট চিনক্তকাৰী @@ -1410,12 +1428,12 @@ The installer will quit and all changes will be lost. 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>. - চিছটেমৰ স্থানীয় ছেটিংস্ কমান্ডলাইনৰ কিছুমান উপভোক্তা ইন্টাৰফেছ উপাদানৰ ভাষা আৰু আখৰবোৰত প্ৰভাৱ পেলায়। বৰ্তমান ছেটিংস্ হ'ল: <strong>%1</strong>। + চিছটেমৰ স্থানীয় ছেটিংস্ কমাণ্ডলাইনৰ কিছুমান উপভোক্তা ইন্টাৰফেছ উপাদানৰ ভাষা আৰু আখৰবোৰত প্ৰভাৱ পেলায়। বৰ্তমান ছেটিংস্ হ'ল: <strong>%1</strong>। @@ -1476,7 +1494,7 @@ The installer will quit and all changes will be lost. License - লাইচেন্ছ্ + অনুজ্ঞা-পত্ৰ @@ -1526,17 +1544,17 @@ The installer will quit and all changes will be lost. Show the license text - লাইচেন্ছ্ টেক্স্ট্ দেখাওক + অনুজ্ঞা-পত্ৰৰ লেখনি দেখাওক Open license agreement in browser. - লাইচেন্ছ্ চুক্তি ব্ৰাউজাৰত দেখাওক। + অনুজ্ঞা-পত্ৰ চুক্তি ব্ৰাউজাৰত দেখাওক। Hide license text - লাইচেন্ছ্ টেক্স্ট্ লুকাওক + অনুজ্ঞা-পত্ৰৰ লেখনি লুকাওক @@ -1613,8 +1631,8 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. - %1 বিভাজনত LUKS কি ফাইল কনফিগাৰ কৰিব পৰা নগ'ল। + Could not configure LUKS key file on partition %1. + @@ -1638,38 +1656,97 @@ 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) নেটৱৰ্ক্ ইনস্তলেচন। (নিস্ক্ৰিয়: পেকেজ সুচী বিচাৰি পোৱা নগ'ল, আপোনাৰ নেটৱৰ্ক্ সংযোগ পৰীক্ষা কৰক) - + Network Installation. (Disabled: Received invalid groups data) নেটৱৰ্ক্ ইনস্তলেচন। (নিস্ক্ৰিয়: অকার্যকৰ গোটৰ তথ্য পোৱা গ'ল) - + Network Installation. (Disabled: Incorrect configuration) - নেটৱৰ্ক্ ইনস্তলেচন। (নিস্ক্ৰিয়: ভুল কন্ফিগাৰেচন) + নেটৱৰ্ক ইনস্তলেচন। (নিস্ক্ৰিয়: ভুল কনফিগাৰেচন) NetInstallViewStep - + + Package selection পেকেজ বাচনি + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1686,7 +1763,7 @@ The installer will quit and all changes will be lost. <html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html> - <html><head/><body><h1>মূল ঊপকৰণ নিৰ্মাতা কনফিগাৰেচন.</h1> <p>গন্তব্য চিছটেম কনফিগাৰ কৰোতে Calamaresয়ে মূল ঊপকৰণ নিৰ্মাতা চেটিংস ব্যৱহাৰ কৰিব।</p></body></html> + <html><head/><body><h1>মূল উপকৰণ নিৰ্মাতা কনফিগাৰেচন।</h1> <p>গন্তব্য চিছটেম কনফিগাৰ কৰোতে কেলামাৰেচে মূল উপকৰণ নিৰ্মাতাৰ চেটিংস ব্যৱহাৰ কৰিব।</p></body></html> @@ -1694,12 +1771,12 @@ The installer will quit and all changes will be lost. OEM Configuration - মূল ঊপকৰণ নিৰ্মাতা কনফিগাৰেচন + মূল উপকৰণ নিৰ্মাতা কনফিগাৰেচন Set the OEM Batch Identifier to <code>%1</code>. - মূল ঊপকৰণ নিৰ্মাতা গোট চিনক্তকাৰি <code>%1</code>লৈ নিৰূপণ কৰক। + <code>%1ত</code> মূল উপকৰণ নিৰ্মাতা গোট চিনক্তকাৰি চেত্ কৰক। @@ -1927,12 +2004,12 @@ The installer will quit and all changes will be lost. Opening the configuration file failed - কন্ফিগাৰেচন ফাইল খোলাত বিফল হ'ল + কনফিগাৰেচন ফাইল খোলাত বিফল হ'ল The configuration file is malformed - কন্ফিগাৰেচন ফাইলটো বেয়া + কনফিগাৰেচন ফাইলটো বেয়া @@ -1945,7 +2022,7 @@ The installer will quit and all changes will be lost. অজ্ঞাত ক্ৰুটি - + Password is empty খালী পাছৱৰ্ড @@ -2195,7 +2272,7 @@ The installer will quit and all changes will be lost. Storage de&vice: - স্তোৰেজ ডিভাইচ (&v): + ষ্টোৰেজ ডিভাইচ (&v): @@ -2230,7 +2307,7 @@ The installer will quit and all changes will be lost. Resize Volume Group - ভলিউম্ গোটৰ আকাৰ সলনি কৰক + ভলিউম্ গোটৰ আয়তন সলনি কৰক @@ -2353,12 +2430,12 @@ The installer will quit and all changes will be lost. 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/>বুট বিভাজন এনক্ৰিপ্ট কৰিবলৈ উভতি যাওক আৰু বিভাজন বনোৱা windowত <strong>Encrypt</strong> বাচনি কৰি আকৌ বনাওক। + এনক্ৰিপ্তেড ৰুট বিভাজনৰ সৈতে এটা বেলেগ বুট বিভাজন চেত্ আপ কৰা হৈছিল, কিন্তু বুট বিভাজন এনক্ৰিপ্তেড কৰা হোৱা নাই। <br/><br/>এইধৰণৰ চেত্ আপ সুৰক্ষিত নহয় কাৰণ গুৰুত্ব্পুৰ্ণ চিছটেম ফাইল আন্এনক্ৰিপ্তেড বিভাজনত ৰখা হয়। <br/>আপুনি বিচাৰিলে চলাই থাকিব পাৰে কিন্তু পিছ্ত চিছটেম আৰম্ভৰ সময়ত ফাইল চিছটেম খোলা যাব। <br/>বুট বিভাজন এনক্ৰিপ্ত্ কৰিবলৈ উভতি যাওক আৰু বিভাজন বনোৱা windowত <strong>Encrypt</strong> বাচনি কৰি আকৌ বনাওক। @@ -2367,8 +2444,8 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. - ইনস্তল কৰিবলৈ কোনো বিভাজন নাই। + There are no partitions to install on. + @@ -2432,14 +2509,14 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. -কমান্ডৰ পৰা কোনো আউটপুট পোৱা নগ'ল। +কমাণ্ডৰ পৰা কোনো আউটপুট পোৱা নগ'ল। - + Output: @@ -2448,54 +2525,54 @@ Output: - + External command crashed. - বাহ্যিক কমান্ড ক্ৰেছ্ কৰিলে। + বাহ্যিক কমাণ্ড ক্ৰেছ্ কৰিলে। - + Command <i>%1</i> crashed. - <i>%1</i> কমান্ড ক্ৰেছ্ কৰিলে। + <i>%1</i> কমাণ্ড ক্ৰেছ্ কৰিলে। - + External command failed to start. - বাহ্যিক কমান্ড আৰম্ভ হোৱাত বিফল হ'ল। + বাহ্যিক কমাণ্ড আৰম্ভ হোৱাত বিফল হ'ল। - + Command <i>%1</i> failed to start. - <i>%1</i> কমান্ড আৰম্ভ হোৱাত বিফল হ'ল। + <i>%1</i> কমাণ্ড আৰম্ভ হোৱাত বিফল হ'ল। - + Internal error when starting command. - কমান্ড আৰম্ভ কৰাৰ সময়ত আভ্যন্তৰীণ ক্ৰুটি। + কমাণ্ড আৰম্ভ কৰাৰ সময়ত আভ্যন্তৰীণ ক্ৰুটি। - + Bad parameters for process job call. প্ৰক্ৰিয়া কাৰ্য্যৰ বাবে বেয়া মান। - + External command failed to finish. - বাহ্যিক কমান্ড সমাপ্ত কৰাত বিফল হ'ল। + বাহ্যিক কমাণ্ড সমাপ্ত কৰাত বিফল হ'ল। - + Command <i>%1</i> failed to finish in %2 seconds. - <i>%1</i> কমান্ড সমাপ্ত কৰাত %2 ছেকেণ্ডত বিফল হ'ল। + <i>%1</i> কমাণ্ড সমাপ্ত কৰাত %2 ছেকেণ্ডত বিফল হ'ল। - + External command finished with errors. - বাহ্যিক কমান্ড ক্ৰটিৰ সৈতে সমাপ্ত হ'ল। + বাহ্যিক কমাণ্ড ক্ৰটিৰ সৈতে সমাপ্ত হ'ল। - + Command <i>%1</i> finished with exit code %2. - <i>%1</i> কমান্ড %2 এক্সিড্ কোডৰ সৈতে সমাপ্ত হ'ল। + <i>%1</i> কমাণ্ড %2 এক্সিড্ কোডৰ সৈতে সমাপ্ত হ'ল। @@ -2524,7 +2601,7 @@ Output: unformatted - ফৰমেট কৰা হোৱা নাই + ফৰ্মেট কৰা হোৱা নাই @@ -2547,7 +2624,7 @@ Output: <i>%1</i> মডিউল পৰীক্ষণৰ বাবে আৱশ্যকতাবোৰ সম্পূৰ্ণ হ'ল। - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2563,29 +2640,23 @@ Output: একো বিৱৰণি দিয়া হোৱা নাই। - - - - - + + + + File not found ফাইল বিচাৰি পোৱা নাই - + Path <pre>%1</pre> must be an absolute path. <pre>%1</pre> পথটো পূৰ্ণ পথ নহয়। - + Could not create new random file <pre>%1</pre>. <pre>%1</pre> ৰেন্ডম ফাইল বনাব পৰা নগ'ল। - - - Could not read random file <pre>%1</pre>. - <pre>%1</pre> ৰেন্ডম ফাইল পঢ়িব পৰা নগ'ল। - RemoveVolumeGroupJob @@ -2614,69 +2685,69 @@ Output: ৰূপ - + 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">সকীয়নি: ইয়ে বাচনি কৰা বিভাজনৰ সকলো ফাইল বিলোপ কৰিব। - + 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 চিছটেম বিভাজন: @@ -2691,12 +2762,12 @@ Output: Invalid configuration - অকার্যকৰ কন্ফিগাৰেশ্ৱন + অকার্যকৰ কনফিগাৰেচন The file-system resize job has an invalid configuration and will not run. - ফাইল চিছটেমটোৰ আয়তন পৰিৱৰ্তন কাৰ্য্যৰ এটা অকার্যকৰ কন্ফিগাৰেশ্ৱন আছে আৰু সেইটো নচলিব। + ফাইল চিছটেমটোৰ আয়তন পৰিৱৰ্তন কাৰ্য্যৰ এটা অকার্যকৰ কনফিগাৰেচন আছে আৰু সেইটো নচলিব। @@ -2708,7 +2779,7 @@ Output: Calamares cannot start KPMCore for the file-system resize job. - ফাইল চিছটেমৰ আয়তন সলনি কৰিবলৈ Calamaresয়ে KPMCore আৰম্ভ নোৱাৰিলে। + ফাইল চিছটেমৰ আয়তন সলনি কৰিবলৈ কেলামাৰেচে KPMCore আৰম্ভ নোৱাৰিলে। @@ -2780,7 +2851,7 @@ Output: Resize Volume Group - ভলিউম্ গোটৰ আকাৰ সলনি কৰক + ভলিউম্ গোটৰ আয়তন সলনি কৰক @@ -2848,7 +2919,7 @@ Output: Scanning storage devices... - স্টোৰেজ্ ডিভাইচ স্কেন কৰি আছে... + ষ্টোৰেজ ডিভাইচ স্কেন কৰি আছে... @@ -2859,29 +2930,29 @@ Output: 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 গন্তব্য চিছটেমত হোষ্ট নাম লিখিব নোৱাৰিলে @@ -2896,7 +2967,7 @@ Output: Failed to write keyboard configuration for the virtual console. - ভাৰচুৱেল কনচ'লৰ বাবে কিবোৰ্ড কন্ফিগাৰেচন লিখাত বিফল হ'ল। + ভাৰচুৱেল কনচ'লৰ বাবে কিবোৰ্ড কনফিগাৰেচন লিখাত বিফল হ'ল। @@ -2908,93 +2979,93 @@ Output: Failed to write keyboard configuration for X11. - কিবোৰ্ড কন্ফিগাৰেচন X11 ৰ কাৰণে লিখাত বিফল হ'ল। + X11ৰ বাবে কিবোৰ্ড কনফিগাৰেচন লিখাত বিফল হ'ল। Failed to write keyboard configuration to existing /etc/default directory. - উপস্থিত থকা /etc/default ডিৰেক্টৰিত কিবোৰ্ড কন্ফিগাৰেচন লিখাত বিফল হ'ল। + উপস্থিত থকা /etc/default ডিৰেক্টৰিত কিবোৰ্ড কনফিগাৰেচন লিখাত বিফল হ'ল। SetPartFlagsJob - + Set flags on partition %1. %1 বিভাজনত ফ্লেগ চেত্ কৰক। - + Set flags on %1MiB %2 partition. %1MiB ৰ %2 বিভাজনত ফ্লেগ চেত্ কৰক। - + Set flags on new partition. নতুন বিভাজনত ফ্লেগ চেত্ কৰক। - + Clear flags on partition <strong>%1</strong>. <strong>%1</strong> বিভাজনত ফ্লেগ আতৰাওক। - + Clear flags on %1MiB <strong>%2</strong> partition. %1MiB ৰ <strong>%2</strong> বিভাজনৰ ফ্লেগবোৰ আতৰাওক। - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. %1MiBৰ <strong>%2</strong> বিভাজনত <strong>%3</strong> ফ্লেগ লগাওক। - + Clearing flags on %1MiB <strong>%2</strong> partition. %1MiB ৰ <strong>%2</strong> বিভাজনৰ ফ্লেগবোৰ আতৰ কৰি আছে। - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. %1MiBৰ <strong>%2</strong> বিভাজনত <strong>%3</strong> ফ্লেগ লগাই আছে। - + Clear flags on new partition. নতুন বিভাজনৰ ফ্লেগ আতৰাওক। - + Flag partition <strong>%1</strong> as <strong>%2</strong>. <strong>%1</strong> বিভাজনত <strong>%2</strong>ৰ ফ্লেগ লগাওক। - + Flag new partition as <strong>%1</strong>. নতুন বিভাজনত <strong>%1</strong>ৰ ফ্লেগ লগাওক। - + Clearing flags on partition <strong>%1</strong>. <strong>%1</strong> বিভাজনৰ ফ্লেগ আতৰাই আছে। - + Clearing flags on new partition. নতুন বিভাজনৰ ফ্লেগ আতৰাই আছে। - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. <strong>%1</strong> বিভাজনত <strong>%2</strong> ফ্লেগ লগাই আছে। - + Setting flags <strong>%1</strong> on new partition. নতুন বিভাজনত <strong>%1</strong> ফ্লেগ লগাই আছে। - + The installer failed to set flags on partition %1. ইনস্তলাৰটো​ %1 বিভাজনত ফ্লেগ লগোৱাত বিফল হ'ল। @@ -3002,42 +3073,42 @@ Output: 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. ৰূট একাঊন্ট নিস্ক্ৰিয় কৰিব নোৱাৰি। - + passwd terminated with error code %1. %1 ক্ৰুটি কোডৰ সৈতে পাছৱৰ্ড সমাপ্তি হ'ল। - + Cannot set password for user %1. %1 ব্যৱহাৰকাৰীৰ পাছ্ৱৰ্ড চেত্ কৰিব নোৱাৰি। - + usermod terminated with error code %1. %1 ক্ৰুটি চিহ্নৰ সৈতে ইউজাৰম'ড সমাপ্ত হ'ল। @@ -3157,7 +3228,7 @@ Output: Error in machine feedback configuration. - মেচিন সম্বন্ধীয় প্ৰতিক্ৰীয়াৰ কনফিগাৰেচনৰ ক্ৰুটি। + মেচিনত ফিডবেক কনফিগাৰেচনৰ ক্ৰুটি। @@ -3167,7 +3238,7 @@ Output: Could not configure machine feedback correctly, Calamares error %1. - মেচিনৰ প্ৰতিক্ৰিয়া ঠাকভাৱে কন্ফিগাৰ কৰিব পৰা নগ'ল, Calamares ক্ৰুটি %1। + মেচিনৰ প্ৰতিক্ৰিয়া ঠাকভাৱে কন্ফিগাৰ কৰিব পৰা নগ'ল, কেলামাৰেচ ক্ৰুটি %1। @@ -3234,37 +3305,37 @@ Output: <small>যদি এটাতকৈ বেছি ব্যক্তিয়ে এইটো কম্পিউটাৰ ব্যৱহাৰ কৰে, আপুনি ইনস্তলচেন​ৰ পিছত বহুতো একাউন্ট বনাব পাৰে।</small> - + Your username is too long. আপোনাৰ ইউজাৰ নাম বহুত দীঘল। - + Your username must start with a lowercase letter or underscore. আপোনাৰ ব্যৱহাৰকাৰী নাম lowercase বৰ্ণ বা underscoreৰে আৰম্ভ হ'ব লাগিব। - + Only lowercase letters, numbers, underscore and hyphen are allowed. কেৱল lowercase বৰ্ণ, সংখ্যা, underscore আৰু hyphenৰ হে মাত্ৰ অনুমতি আছে। - + Only letters, numbers, underscore and hyphen are allowed. কেৱল বৰ্ণ, সংখ্যা, underscore আৰু hyphenৰ হে মাত্ৰ অনুমতি আছে। - + Your hostname is too short. আপোনাৰ হ'স্ট্ নাম বহুত ছুটি। - + Your hostname is too long. আপোনাৰ হ'স্ট্ নাম বহুত দীঘল। - + Your passwords do not match! আপোনাৰ পাছৱৰ্ডকেইটাৰ মিল নাই! @@ -3272,7 +3343,7 @@ Output: UsersViewStep - + Users ব্যৱহাৰকাৰীসকল @@ -3369,7 +3440,7 @@ Output: Open help and support website - সহায় আৰু সমৰ্থন কৰা ৱেবচাইট খোলক + সহায়ক ৱেবচাইট খোলক @@ -3394,7 +3465,7 @@ Output: &Support - সমৰ্থন (&S) + সহায় (&S) @@ -3404,22 +3475,22 @@ Output: <h1>Welcome to the %1 installer.</h1> - <h1>%1 ইনস্তলাৰলৈ স্ৱাগতম জনাইছো।</h1> + <h1>%1 ইনস্তলাৰলৈ আদৰণি জনাইছো।</h1> <h1>Welcome to the Calamares installer for %1.</h1> - <h1>%1 ৰ কাৰণে Calamares ইনস্তলাৰলৈ স্ৱাগতম জনাইছো।</h1> + <h1>%1ৰ কেলামাৰেচ ইনস্তলাৰলৈ আদৰণি জনাইছো।</h1> <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>%1 ৰ কাৰণে Calamares চেত্ আপ প্ৰগ্ৰামলৈ স্ৱাগতম জনাইছো।</h1> + <h1>%1ৰ কেলামাৰেচ চেত্ আপ প্ৰগ্ৰামলৈ আদৰণি জনাইছো।</h1> <h1>Welcome to %1 setup.</h1> - <h1> %1 চেত্ আপ প্ৰগ্ৰামলৈ স্ৱাগতম জনাইছো।</h1> + <h1> %1 চেত্ আপলৈ আদৰণি জনাইছো।</h1> @@ -3434,12 +3505,20 @@ Output: <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-2019 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>ৰ বাবে %3</strong><br/><br/> মালিকিস্বত্ত 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>মালিকিস্বত্ত 2017-2019 Adriaan de Groot &lt;groot@kde.org&gt;<br/><a href="https://calamares.io/team/">Calamares দল</a> আৰু <a href="https://www.transifex.com/calamares/calamares/">Calamares অনুবাদক দল</a>ক ধন্যবাদ জনাইছো।<br/><br/><a href="https://calamares.io/">Calamares</a>ৰ বিকাশ<br/><a href="http://www.blue-systems.com/">Blue Systems</a>- Liberating Softwareৰ দ্বাৰা প্ৰযোজিত। + <h1>%1</h1><br/><strong>%2<br/>ৰ বাবে %3</strong><br/><br/> মালিকিস্বত্ত 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>মালিকিস্বত্ত 2017-2019 Adriaan de Groot &lt;groot@kde.org&gt;<br/><a href="https://calamares.io/team/">Calamares দল</a> আৰু <a href="https://www.transifex.com/calamares/calamares/">কেলামাৰেচ অনুবাদক দল</a>ক ধন্যবাদ জনাইছো।<br/><br/><a href="https://calamares.io/">Calamares</a>ৰ বিকাশ<br/><a href="http://www.blue-systems.com/">Blue Systems</a>- Liberating Softwareৰ দ্বাৰা প্ৰযোজিত। %1 support - %1 সমৰ্থন + %1 সহায় + + + + WelcomeQmlViewStep + + + Welcome + আদৰণি @@ -3447,7 +3526,49 @@ Output: Welcome - স্ৱাগতম + আদৰণি + + + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + diff --git a/lang/calamares_ast.ts b/lang/calamares_ast.ts index 6c7e3c998..63c47d8a8 100644 --- a/lang/calamares_ast.ts +++ b/lang/calamares_ast.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up Configuración - + Install Instalación @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Fecho @@ -177,36 +177,54 @@ Calamares::PythonJob - + Running %1 operation. Executando la operación %1. - + Bad working directory path El camín del direutoriu de trabayu ye incorreutu - + Working directory %1 for python job %2 is not readable. El direutoriu de trabayu %1 pal trabayu en Python %2 nun ye lleibe. - + Bad main script file El ficheru del script principal ye incorreutu - + Main script file %1 for python job %2 is not readable. El ficheru del script principal %1 pal trabayu en Python %2 nun ye lleibe. - + Boost.Python error in job "%1". Fallu de Boost.Python nel trabayu «%1». + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,176 +252,176 @@ Calamares::ViewManager - - + + &Back &Atrás - - + + &Next &Siguiente - - + + &Cancel &Encaboxar - + Cancel setup without changing the system. Encaboxa la configuración ensin camudar el sistema. - + Cancel installation without changing the system. Encaboxa la instalación ensin camudar el sistema. - + Setup Failed Falló la configuración - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed Falló l'aniciu de Calamares - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 nun pue instalase. Calamares nun foi a cargar tolos módulos configuraos. Esto ye un problema col mou nel que la distribución usa Calamares. - + <br/>The following modules could not be loaded: <br/>Nun pudieron cargase los módulos de darréu: - + Continue with installation? ¿Siguir cola instalación? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> El programa d'instalación de %1 ta a piques de facer cambeos nel discu pa configurar %2.<br/><strong>Nun vas ser a desfacer estos cambeos.<strong> - + &Set up now &Configurar agora - + &Set up &Configurar - + &Install &Instalar - + Setup is complete. Close the setup program. Completóse la configuración. Zarra'l programa de configuración. - + Cancel setup? ¿Encaboxar la configuración? - + Cancel installation? ¿Encaboxar la instalación? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. ¿De xuru que quies encaboxar el procesu actual de configuración? El programa de configuración va colar y van perdese tolos cambeos. - + 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 va colar y van perdese tolos cambeos. - - + + &Yes &Sí - - + + &No &Non - + &Close &Zarrar - + Continue with setup? ¿Siguir cola 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> L'instalador de %1 ta a piques de facer cambeos nel discu pa instalar %2.<br/><strong>Nun vas ser a desfacer esos cambeos.</strong> - + &Install now &Instalar agora - + Go &back Dir p'&atrás - + &Done &Fecho - + The installation is complete. Close the installer. Completóse la instalación. Zarra l'instalador. - + Error Fallu - + Installation Failed Falló la instalación @@ -411,22 +429,22 @@ L'instalador va colar y van perdese tolos cambeos. CalamaresPython::Helper - + Unknown exception type Desconozse la triba de la esceición - + unparseable Python error Fallu de Python que nun pue analizase - + unparseable Python traceback Traza inversa de Python que nun pue analizase - + Unfetchable Python error. Fallu de Python al que nun pue dise en cata. @@ -732,22 +750,22 @@ L'instalador va colar y van perdese tolos cambeos. &Cifrar - + Logical Llóxica - + Primary Primaria - + GPT GPT - + Mountpoint already in use. Please select another one. El puntu de montaxe yá ta n'usu. Esbilla otru, por favor. @@ -755,22 +773,22 @@ L'instalador va colar y van perdese tolos cambeos. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. Creando una partición %1 nueva en %2. - + The installer failed to create partition on disk '%1'. L'instalador falló al crear la partición nel discu «%1». @@ -1064,7 +1082,7 @@ L'instalador va colar y van perdese tolos cambeos. Banderes: - + Mountpoint already in use. Please select another one. El puntu de montaxe yá ta n'usu. Esbilla otru, por favor. @@ -1100,37 +1118,37 @@ L'instalador va colar y van perdese tolos cambeos. FillGlobalStorageJob - + Set partition information Afitamientu de la información de les particiones - + Install %1 on <strong>new</strong> %2 system partition. Va instalase %1 na partición %2 <strong>nueva</strong> del sistema. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Va configurase una partición %2 <strong>nueva</strong> col puntu de montaxe <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. Va instalase %2 na partición %3 del sistema de <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Va configurase la partición %3 de <strong>%1</strong> col puntu de montaxe <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Va instalase'l xestor d'arrinque en <strong>%1</strong>. - + Setting up mount points. Configurando los puntos de montaxe. @@ -1214,22 +1232,22 @@ L'instalador va colar y van perdese tolos cambeos. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. Formatiando la partición %1 col sistema de ficheros %2. - + The installer failed to format partition %1 on disk '%2'. L'instalador falló al formatiar la partición %1 nel discu «%2». @@ -1612,7 +1630,7 @@ L'instalador va colar y van perdese tolos cambeos. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1637,27 +1655,27 @@ L'instalador va colar y van perdese tolos cambeos. NetInstallPage - + Name Nome - + Description Descripción - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalación per rede. (Desactivada: Nun pue dise en cata de les llistes de paquetes, comprueba la conexón a internet) - + Network Installation. (Disabled: Received invalid groups data) Instalación per rede. (Desactivada: Recibiéronse datos non válidos de grupos) - + Network Installation. (Disabled: Incorrect configuration) @@ -1665,10 +1683,69 @@ L'instalador va colar y van perdese tolos cambeos. NetInstallViewStep - + + Package selection Esbilla de paquetes + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1944,7 +2021,7 @@ L'instalador va colar y van perdese tolos cambeos. Desconozse'l fallu - + Password is empty @@ -2366,8 +2443,8 @@ L'instalador va colar y van perdese tolos cambeos. - There are no partitons to install on. - Nun hai particiones onde instalar. + There are no partitions to install on. + @@ -2431,14 +2508,14 @@ L'instalador va colar y van perdese tolos cambeos. ProcessResult - + There was no output from the command. El comandu nun produxo denguna salida. - + Output: @@ -2447,52 +2524,52 @@ Salida: - + External command crashed. El comandu esternu cascó. - + Command <i>%1</i> crashed. El comandu <i>%1</i> cascó. - + External command failed to start. El comandu esternu falló al aniciar. - + Command <i>%1</i> failed to start. El comandu <i>%1</i> falló al aniciar. - + Internal error when starting command. Fallu internu al aniciar el comandu. - + Bad parameters for process job call. Los parámetros son incorreutos pa la llamada del trabayu de procesos. - + External command failed to finish. El comandu esternu finó al finar. - + Command <i>%1</i> failed to finish in %2 seconds. El comandu <i>%1</i> falló al finar en %2 segundos. - + External command finished with errors. El comandu esternu finó con fallos. - + Command <i>%1</i> finished with exit code %2. El comandu <i>%1</i> finó col códigu de salida %2. @@ -2546,7 +2623,7 @@ Salida: Completóse la comprobación de requirimientos del módulu <i>%1</i> - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2562,29 +2639,23 @@ Salida: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2613,69 +2684,69 @@ Salida: Formulariu - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. Esbilla ónde instalar %1.<br/><font color="red">Alvertencia:</font> esto va desaniciar tolos ficheros de la partición esbillada. - + The selected item does not appear to be a valid partition. L'elementu 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 primaria o llóxica 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) Desconozse la partición del sistema (%1) - + %1 system partition (%2) Partición %1 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 ye perpequeña pa %2. Esbilla una con una capacidá de polo menos %3GB. - + <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 pudo alcontrase per nenyures una partición del sistema EFI. Volvi p'atrás y usa'l particionáu manual pa configurar %1, por favor. - - - + + + <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 instalase en %2.<br/><font color="red">Alvertencia: </font>van perdese tolos datos de la partición %2. - + The EFI system partition at %1 will be used for starting %2. La partición del sistema EFI en %1 va usase p'aniciar %2. - + EFI system partition: Partición del sistema EFI: @@ -2858,29 +2929,29 @@ Salida: SetHostNameJob - + Set hostname %1 Afitamientu del nome d'agospiu a %1 - + Set hostname <strong>%1</strong>. Va afitase'l nome d'agospiu <strong>%1</strong>. - + Setting hostname %1. Afitando'l nome d'agospiu %1. - - + + Internal Error Fallu internu - - + + Cannot write hostname to target system Nun pue escribise'l nome d'agospiu nel sistema de destín @@ -2918,82 +2989,82 @@ Salida: SetPartFlagsJob - + Set flags on partition %1. Afitamientu de banderes na partición %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. Afitamientu de banderes na partición nueva. - + Clear flags on partition <strong>%1</strong>. Van llimpiase les banderes de la partición <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. Llimpieza de les banderes de la partición nueva. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Va afitase la bandera <strong>%2</strong> na partición <strong>%1</strong>. - + Flag new partition as <strong>%1</strong>. Va afitase la bandera <strong>%1</strong> na partición nueva. - + Clearing flags on partition <strong>%1</strong>. Llimpiando les banderes de la partición <strong>%1</strong>. - + Clearing flags on new partition. Llimpiando les banderes de la partición nueva. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Afitando les banderes <strong>%2</strong> na partición <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. Afitando les banderes <strong>%1</strong> na partición nueva. - + The installer failed to set flags on partition %1. L'instalador falló al afitar les banderes na partición %1. @@ -3001,42 +3072,42 @@ Salida: SetPasswordJob - + Set password for user %1 Afitamientu de la contraseña del usuariu %1 - + Setting password for user %1. Afitando la contraseña del usuariu %1. - + Bad destination system path. El camín del sistema de destín ye incorreutu. - + rootMountPoint is %1 rootMountPoint ye %1 - + Cannot disable root account. Nun pue desactivase la cuenta root. - + passwd terminated with error code %1. passwd terminó col códigu de fallu %1. - + Cannot set password for user %1. Nun pue afitase la contraseña del usuariu %1. - + usermod terminated with error code %1. usermod terminó col códigu de fallu %1. @@ -3233,37 +3304,37 @@ Salida: <small>Si va usar l'ordenador más d'una persona, pues crear más cuentes tres la instalación.</small> - + Your username is too long. El nome d'usuariu ye perllargu. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. El nome d'agospiu ye percurtiu. - + Your hostname is too long. El nome d'agospiu ye perllargu. - + Your passwords do not match! ¡Les contraseñes nun concasen! @@ -3271,7 +3342,7 @@ Salida: UsersViewStep - + Users Usuarios @@ -3441,6 +3512,14 @@ Salida: Sofitu de %1 + + WelcomeQmlViewStep + + + Welcome + Acoyida + + WelcomeViewStep @@ -3449,4 +3528,46 @@ Salida: Acoyida + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_be.ts b/lang/calamares_be.ts index 5c27df4e0..cef655b8a 100644 --- a/lang/calamares_be.ts +++ b/lang/calamares_be.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up Наладзіць - + Install Усталяваць @@ -143,7 +143,7 @@ Calamares::JobThread - + Done @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -238,174 +256,174 @@ Calamares::ViewManager - - + + &Back - - + + &Next - - + + &Cancel - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? - + Do you really want to cancel the current setup process? The setup program 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? - + 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 - + &Done - + The installation is complete. Close the installer. - + Error - + Installation Failed @@ -413,22 +431,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type - + unparseable Python error - + unparseable Python traceback - + Unfetchable Python error. @@ -734,22 +752,22 @@ The installer will quit and all changes will be lost. - + Logical - + Primary - + GPT - + Mountpoint already in use. Please select another one. @@ -757,22 +775,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1066,7 +1084,7 @@ The installer will quit and all changes will be lost. - + Mountpoint already in use. Please select another one. @@ -1102,37 +1120,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information - + Install %1 on <strong>new</strong> %2 system partition. - + 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. @@ -1216,22 +1234,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1614,7 +1632,7 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1639,27 +1657,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) @@ -1667,10 +1685,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1946,7 +2023,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2368,7 +2445,7 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. + There are no partitions to install on. @@ -2433,65 +2510,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -2545,7 +2622,7 @@ Output: - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2561,29 +2638,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2612,69 +2683,69 @@ Output: Форма - + 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. - + %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: @@ -2857,29 +2928,29 @@ Output: SetHostNameJob - + Set hostname %1 - + Set hostname <strong>%1</strong>. - + Setting hostname %1. - - + + Internal Error - - + + Cannot write hostname to target system @@ -2917,82 +2988,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. - + Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. @@ -3000,42 +3071,42 @@ Output: 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. @@ -3232,37 +3303,37 @@ Output: - + Your username is too long. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + Your passwords do not match! @@ -3270,7 +3341,7 @@ Output: UsersViewStep - + Users @@ -3440,6 +3511,14 @@ Output: + + WelcomeQmlViewStep + + + Welcome + + + WelcomeViewStep @@ -3448,4 +3527,46 @@ Output: + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_bg.ts b/lang/calamares_bg.ts index 94c366532..dc419129d 100644 --- a/lang/calamares_bg.ts +++ b/lang/calamares_bg.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Инсталирай @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Готово @@ -177,36 +177,54 @@ 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::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,175 +252,175 @@ Calamares::ViewManager - - + + &Back &Назад - - + + &Next &Напред - - + + &Cancel &Отказ - + Cancel setup without changing the system. - + Cancel installation without changing the system. Отказ от инсталацията без промяна на системата. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed Инициализацията на Calamares се провали - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 не може да се инсталира. Calamares не можа да зареди всичките конфигурирани модули. Това е проблем с начина, по който Calamares е използван от дистрибуцията. - + <br/>The following modules could not be loaded: <br/>Следните модули не могат да се заредят: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install &Инсталирай - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? Отмяна на инсталацията? - + Do you really want to cancel the current setup process? The setup program 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? Продължаване? - + 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. Инсталацията е завършена. Затворете инсталаторa. - + Error Грешка - + Installation Failed Неуспешна инсталация @@ -410,22 +428,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type Неизвестен тип изключение - + unparseable Python error неанализируема грешка на Python - + unparseable Python traceback неанализируемо проследяване на Python - + Unfetchable Python error. Недостъпна грешка на Python. @@ -731,22 +749,22 @@ The installer will quit and all changes will be lost. Ши&фриране - + Logical Логическа - + Primary Главна - + GPT GPT - + Mountpoint already in use. Please select another one. Точката за монтиране вече се използва. Моля изберете друга. @@ -754,22 +772,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. Създаване на нов %1 дял върху %2. - + The installer failed to create partition on disk '%1'. Инсталатора не успя да създаде дял върху диск '%1'. @@ -1063,7 +1081,7 @@ The installer will quit and all changes will be lost. Флагове: - + Mountpoint already in use. Please select another one. Точката за монтиране вече се използва. Моля изберете друга. @@ -1099,37 +1117,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information Постави информация за дял - + Install %1 on <strong>new</strong> %2 system partition. Инсталирай %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. Настройка на точките за монтиране. @@ -1213,22 +1231,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. Форматирай дял %1 с файлова система %2. - + The installer failed to format partition %1 on disk '%2'. Инсталатора не успя да форматира дял %1 на диск '%2'. @@ -1611,7 +1629,7 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1636,27 +1654,27 @@ 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) Мрежова инсталация. (Изключена: Списъкът с пакети не може да бъде извлечен, проверете Вашата Интернет връзка) - + Network Installation. (Disabled: Received invalid groups data) Мрежова инсталация. (Изключена: Получени са данни за невалидни групи) - + Network Installation. (Disabled: Incorrect configuration) @@ -1664,10 +1682,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection Избор на пакети + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1943,7 +2020,7 @@ The installer will quit and all changes will be lost. Неизвестна грешка - + Password is empty @@ -2365,7 +2442,7 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. + There are no partitions to install on. @@ -2430,13 +2507,13 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: @@ -2445,52 +2522,52 @@ Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. Невалидни параметри за извикване на задача за процес. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -2544,7 +2621,7 @@ Output: - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2560,29 +2637,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2611,69 +2682,69 @@ Output: Форма - + 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 ГБ. - + <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 системен дял: @@ -2857,29 +2928,29 @@ Output: 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 Не може да се запише името на хоста на целевата система @@ -2917,82 +2988,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. Задай флагове на дял %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. Задай флагове на нов дял. - + Clear flags on partition <strong>%1</strong>. Изчисти флаговете на дял <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. Изчисти флагове на нов дял. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Сложи флаг на дял <strong>%1</strong> като <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. Сложи флаг на новия дял като <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. Изчистване на флаговете на дял <strong>%1</strong>. - + Clearing flags on new partition. Изчистване на флаговете на новия дял. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Задаване на флагове <strong>%2</strong> на дял <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. Задаване на флагове <strong>%1</strong> на новия дял. - + The installer failed to set flags on partition %1. Инсталатора не успя да зададе флагове на дял %1. @@ -3000,42 +3071,42 @@ Output: 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. @@ -3232,37 +3303,37 @@ Output: - + Your username is too long. Вашето потребителско име е твърде дълго. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Вашето име на хоста е твърде кратко. - + Your hostname is too long. Вашето име на хоста е твърде дълго. - + Your passwords do not match! Паролите Ви не съвпадат! @@ -3270,7 +3341,7 @@ Output: UsersViewStep - + Users Потребители @@ -3440,6 +3511,14 @@ Output: %1 поддръжка + + WelcomeQmlViewStep + + + Welcome + Добре дошли + + WelcomeViewStep @@ -3448,4 +3527,46 @@ Output: Добре дошли + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_ca.ts b/lang/calamares_ca.ts index ef0d3c1c3..6938f5b1e 100644 --- a/lang/calamares_ca.ts +++ b/lang/calamares_ca.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up Configuració - + Install Instal·la @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Fet @@ -177,36 +177,54 @@ Calamares::PythonJob - + Running %1 operation. S'executa l'operació %1. - + Bad working directory path Camí incorrecte al 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". + + Calamares::QmlViewStep + + + Loading ... + Es carrega... + + + + QML Step <i>%1</i>. + Pas QML <i>%1</i>. + + + + Loading failed. + Ha fallat la càrrega. + + Calamares::RequirementsChecker @@ -234,176 +252,176 @@ Calamares::ViewManager - - + + &Back &Enrere - - + + &Next &Següent - - + + &Cancel &Cancel·la - + Cancel setup without changing the system. Cancel·la la configuració sense canviar el sistema. - + Cancel installation without changing the system. Cancel·leu la instal·lació sense canviar el sistema. - + Setup Failed Ha fallat la configuració. - + Would you like to paste the install log to the web? Voleu enganxar el registre d'instal·lació a la xarxa? - + Install Log Paste URL URL de publicació del registre d'instal·lació - + The upload was unsuccessful. No web-paste was done. La càrrega no s'ha fet correctament. No s'ha enganxat res a la xarxa. - + Calamares Initialization Failed Ha fallat la inicialització de Calamares - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. No es pot instal·lar %1. El Calamares no ha pogut carregar tots els mòduls configurats. Aquest és un problema amb la manera com el Calamares és utilitzat per la distribució. - + <br/>The following modules could not be loaded: <br/>No s'han pogut carregar els mòduls següents: - + Continue with installation? Voleu continuar la instal·lació? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> El programa de configuració %1 està a punt de fer canvis al disc per tal de configurar %2.<br/><strong>No podreu desfer aquests canvis.</strong> - + &Set up now Con&figura-ho ara - + &Set up Con&figura-ho - + &Install &Instal·la - + Setup is complete. Close the setup program. La configuració s'ha acabat. Tanqueu el programa de configuració. - + Cancel setup? Voleu cancel·lar la configuració? - + Cancel installation? Voleu cancel·lar la instal·lació? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Realment voleu cancel·lar el procés de configuració actual? El programa de configuració es tancarà i es perdran tots els canvis. - + 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> + L'instal·lador per a %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'l ara - + Go &back Ves &enrere - + &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. @@ -411,22 +429,22 @@ L'instal·lador es tancarà i tots els canvis es perdran. CalamaresPython::Helper - + Unknown exception type Tipus d'excepció desconeguda - + unparseable Python error Error de Python no analitzable - + unparseable Python traceback Traceback de Python no analitzable - + Unfetchable Python error. Error de Python irrecuperable. @@ -456,7 +474,7 @@ L'instal·lador es tancarà i tots els canvis es perdran. Show debug information - Mostra la informació de depuració + Informació de depuració @@ -586,7 +604,7 @@ L'instal·lador es tancarà i tots els canvis es perdran. <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>Instal·la'l al costat</strong><br/>L'instal·lador reduirà una partició per fer espai per a %1. @@ -733,22 +751,22 @@ L'instal·lador es tancarà i tots els canvis es perdran. En&cripta - + Logical Lògica - + Primary Primària - + GPT GPT - + Mountpoint already in use. Please select another one. El punt de muntatge ja està en ús. Si us plau, seleccioneu-ne un altre. @@ -756,22 +774,22 @@ L'instal·lador es tancarà i tots els canvis es perdran. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. Crea una partició nova de %2 MiB a %4 (%3) amb el sistema de fitxers %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Crea una partició nova de <strong>%2 MiB</strong> a <strong>%4</strong> (%3) amb el sistema de fitxers <strong>%1</strong>. - + Creating new %1 partition on %2. Es crea la partició nova %1 a %2. - + The installer failed to create partition on disk '%1'. L'instal·lador no ha pogut crear la partició al disc '%1'. @@ -1065,7 +1083,7 @@ L'instal·lador es tancarà i tots els canvis es perdran. Indicadors: - + Mountpoint already in use. Please select another one. El punt de muntatge ja està en ús. Si us plau, seleccioneu-ne un altre. @@ -1101,37 +1119,37 @@ L'instal·lador es tancarà i tots els canvis es perdran. FillGlobalStorageJob - + Set partition information Estableix la informació de la partició - + Install %1 on <strong>new</strong> %2 system partition. 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 gestor d'arrencada a <strong>%1</strong>. - + Setting up mount points. S'estableixen els punts de muntatge. @@ -1215,22 +1233,22 @@ L'instal·lador es tancarà i tots els canvis es perdran. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. Formata la partició %1 (sistema de fitxers: %2, mida: %3 MiB) de %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. Formata la partició de <strong>%3 MiB</strong> <strong>%1</strong> amb el sistema de fitxers <strong>%2</strong>. - + Formatting partition %1 with file system %2. Es formata la partició %1 amb el sistema de fitxers %2. - + The installer failed to format partition %1 on disk '%2'. L'instal·lador no ha pogut formatar la partició %1 del disc '%2'. @@ -1389,12 +1407,12 @@ L'instal·lador es tancarà i tots els canvis es perdran. Set keyboard model to %1.<br/> - Assigna el model del teclat a %1.<br/> + Establirà el model del teclat a %1.<br/> Set keyboard layout to %1/%2. - Assigna la distribució del teclat a %1/%2. + Establirà la distribució del teclat a %1/%2. @@ -1570,7 +1588,7 @@ L'instal·lador es tancarà i tots els canvis es perdran. Set timezone to %1/%2.<br/> - Estableix la zona horària a %1/%2.<br/> + Establirà la zona horària a %1/%2.<br/> @@ -1613,8 +1631,8 @@ L'instal·lador es tancarà i tots els canvis es perdran. - Could configure LUKS key file on partition %1. - S'ha pogut configurar el fitxer de clau de LUKS a la partició %1. + Could not configure LUKS key file on partition %1. + No s'ha pogut configurar el fitxer de clau de LUKS a la partició %1. @@ -1638,27 +1656,27 @@ 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ó.) - + Network Installation. (Disabled: Received invalid groups data) Instal·lació per xarxa. (Inhabilitada: dades de grups rebudes no vàlides) - + Network Installation. (Disabled: Incorrect configuration) Instal·lació per xarxa. (Inhabilitada: configuració incorrecta) @@ -1666,10 +1684,69 @@ L'instal·lador es tancarà i tots els canvis es perdran. NetInstallViewStep - + + Package selection Selecció de paquets + + + Office software + Programari d'oficina + + + + Office package + Paquet d'oficina + + + + Browser software + Programari de navegador + + + + Browser package + Paquet de navegador + + + + Web browser + Navegador web + + + + Kernel + Nucli + + + + Services + Serveis + + + + Login + Entrada + + + + Desktop + Escriptori + + + + Applications + Aplicacions + + + + NotesQmlViewStep + + + Notes + Notes + OEMPage @@ -1945,7 +2022,7 @@ L'instal·lador es tancarà i tots els canvis es perdran. Error desconegut - + Password is empty La contrasenya és buida. @@ -2024,7 +2101,7 @@ L'instal·lador es tancarà i tots els canvis es perdran. What name do you want to use to log in? - Quin nom voleu utilitzar per iniciar la sessió d'usuari? + Quin nom voleu usar per iniciar la sessió d'usuari? @@ -2055,7 +2132,7 @@ L'instal·lador es tancarà i tots els canvis es perdran. <small>This name will be used if you make the computer visible to others on a network.</small> - <small>Aquest nom s'utilitzarà en cas que feu visible per a altres aquest ordinador en una xarxa.</small> + <small>Aquest nom s'usarà si feu visible aquest ordinador per a altres en una xarxa.</small> @@ -2367,8 +2444,8 @@ L'instal·lador es tancarà i tots els canvis es perdran. - There are no partitons to install on. - No hi ha cap partició per fer-hi la instal·lació. + There are no partitions to install on. + No hi ha particions per fer-hi una instal·lació. @@ -2432,14 +2509,14 @@ L'instal·lador es tancarà i tots els canvis es perdran. ProcessResult - + There was no output from the command. No hi ha hagut sortida de l'ordre. - + Output: @@ -2448,52 +2525,52 @@ Sortida: - + External command crashed. L'ordre externa ha fallat. - + Command <i>%1</i> crashed. L'ordre <i>%1</i> ha fallat. - + External command failed to start. L'ordre externa no s'ha pogut iniciar. - + Command <i>%1</i> failed to start. L'ordre <i>%1</i> no s'ha pogut iniciar. - + Internal error when starting command. Error intern en iniciar l'ordre. - + Bad parameters for process job call. Paràmetres incorrectes per a la crida de la tasca del procés. - + External command failed to finish. L'ordre externa no ha acabat correctament. - + Command <i>%1</i> failed to finish in %2 seconds. L'ordre <i>%1</i> no ha pogut acabar en %2 segons. - + External command finished with errors. L'ordre externa ha acabat amb errors. - + Command <i>%1</i> finished with exit code %2. L'ordre <i>%1</i> ha acabat amb el codi de sortida %2. @@ -2547,7 +2624,7 @@ Sortida: S'ha completat la comprovació dels requeriments per al mòdul <i>%1</i>. - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2563,29 +2640,23 @@ Sortida: No se n'ha proporcionat cap descripció. - - - - - + + + + File not found No s'ha trobat el fitxer. - + Path <pre>%1</pre> must be an absolute path. El camí <pre>%1</pre> ha de ser un camí absolut. - + Could not create new random file <pre>%1</pre>. No s'ha pogut crear el fitxer aleatori nou <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - No s'ha pogut llegir el fitxer aleatori <pre>%1</pre>. - RemoveVolumeGroupJob @@ -2614,69 +2685,69 @@ Sortida: Formulari - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. Seleccioneu on instal·lar %1.<br/><font color="red">Atenció: </font>això suprimirà 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 les particions manuals 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: @@ -2840,7 +2911,7 @@ Sortida: 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. + Aquest programa us farà unes preguntes i instal·larà %2 a l'ordinador. @@ -2859,29 +2930,29 @@ Sortida: SetHostNameJob - + Set hostname %1 Estableix el nom d'amfitrió %1 - + Set hostname <strong>%1</strong>. Estableix el nom d'amfitrió <strong>%1</strong>. - + Setting hostname %1. S'estableix el nom d'amfitrió %1. - - + + Internal Error Error intern - - + + Cannot write hostname to target system No es pot escriure el nom d'amfitrió al sistema de destinació @@ -2919,82 +2990,82 @@ Sortida: SetPartFlagsJob - + Set flags on partition %1. Estableix les banderes a la partició %1. - + Set flags on %1MiB %2 partition. Estableix les banderes a la partició %2 de %1 MiB. - + Set flags on new partition. Estableix les banderes a la partició nova. - + Clear flags on partition <strong>%1</strong>. Neteja les banderes de la partició <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. Neteja les banderes de la partició <strong>%2</strong> de %1 MiB. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. Estableix la bandera de la partició <strong>%2</strong> de %1 MiB com a <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. Es netegen les banderes de la partició <strong>%2</strong>de %1 MiB. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. S'estableixen les banderes <strong>%3</strong> a la partició <strong>%2</strong> de %1 MiB. - + Clear flags on new partition. Neteja les banderes de la partició nova. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Estableix la bandera <strong>%2</strong> a la partició <strong>%1</strong>. - + Flag new partition as <strong>%1</strong>. Estableix la bandera de la partició nova com a <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. Es netegen les banderes de la partició <strong>%1</strong>. - + Clearing flags on new partition. Es netegen les banderes de la partició nova. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Establint les banderes <strong>%2</strong> a la partició <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. S'estableixen les banderes <strong>%1</strong> a la partició nova. - + The installer failed to set flags on partition %1. L'instal·lador ha fallat en establir les banderes a la partició %1. @@ -3002,42 +3073,42 @@ Sortida: SetPasswordJob - + Set password for user %1 - Assigneu una contrasenya per a l'usuari %1 + Establiu una contrasenya per a l'usuari %1 - + Setting password for user %1. S'estableix la contrasenya per a l'usuari %1. - + Bad destination system path. Destinació errònia de la ruta del sistema. - + rootMountPoint is %1 El punt de muntatge de l'arrel é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 es pot establir la contrasenya per a l'usuari %1. - + usermod terminated with error code %1. usermod ha terminat amb el codi d'error %1. @@ -3047,7 +3118,7 @@ Sortida: Set timezone to %1/%2 - Assigna la zona horària a %1/%2 + Estableix la zona horària a %1/%2 @@ -3062,7 +3133,7 @@ Sortida: Cannot set timezone. - No es pot assignar la zona horària. + No es pot establir la zona horària. @@ -3234,37 +3305,37 @@ Sortida: <small>Si més d'una persona usarà aquest ordinador, podeu crear diversos comptes després de la instal·lació.</small> - + Your username is too long. El nom d'usuari és massa llarg. - + Your username must start with a lowercase letter or underscore. El nom d'usuari ha de començar amb una lletra en minúscula o una ratlla baixa. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Només es permeten lletres en minúscula, números, ratlles baixes i guions. - + Only letters, numbers, underscore and hyphen are allowed. Només es permeten lletres, números, ratlles baixes i guions. - + Your hostname is too short. El nom d'amfitrió és massa curt. - + Your hostname is too long. El nom d'amfitrió és massa llarg. - + Your passwords do not match! Les contrasenyes no coincideixen! @@ -3272,7 +3343,7 @@ Sortida: UsersViewStep - + Users Usuaris @@ -3404,22 +3475,22 @@ Sortida: <h1>Welcome to the %1 installer.</h1> - <h1>Us donem la benvinguda a l'instal·lador de %1.</h1> + <h1>Benvingut/da a l'instal·lador per a %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> + <h1>Benvingut/da a l'instal·lador Calamares per a %1.</h1> <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Us donem la benvinguda al programa de configuració del Calamares per a %1.</h1> + <h1>Benvingut/da al programa de configuració del Calamares per a %1.</h1> <h1>Welcome to %1 setup.</h1> - <h1>Us donem la benvinguda a la configuració de %1.</h1> + <h1>Benvingut/da a la configuració per a %1.</h1> @@ -3442,6 +3513,14 @@ Sortida: %1 suport + + WelcomeQmlViewStep + + + Welcome + Benvinguda + + WelcomeViewStep @@ -3450,4 +3529,47 @@ Sortida: Benvinguda + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + <h3>%1</h3> + <p>Aquestes són exemples de notes de la versió.</p> + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + <h3>%1 <quote>%2</quote></h3> + + + + About + Quant a + + + + Support + Suport + + + + Known issues + Problemes coneguts + + + + Release notes + Notes de la versió + + + + Donate + Feu una donació + + diff --git a/lang/calamares_ca@valencia.ts b/lang/calamares_ca@valencia.ts index 64f981da3..3470d90e1 100644 --- a/lang/calamares_ca@valencia.ts +++ b/lang/calamares_ca@valencia.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install @@ -143,7 +143,7 @@ Calamares::JobThread - + Done @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,174 +252,174 @@ Calamares::ViewManager - - + + &Back - - + + &Next - - + + &Cancel - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? - + Do you really want to cancel the current setup process? The setup program 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? - + 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 - + &Done - + The installation is complete. Close the installer. - + Error - + Installation Failed @@ -409,22 +427,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type - + unparseable Python error - + unparseable Python traceback - + Unfetchable Python error. @@ -730,22 +748,22 @@ The installer will quit and all changes will be lost. - + Logical - + Primary - + GPT - + Mountpoint already in use. Please select another one. @@ -753,22 +771,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1062,7 +1080,7 @@ The installer will quit and all changes will be lost. - + Mountpoint already in use. Please select another one. @@ -1098,37 +1116,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information - + Install %1 on <strong>new</strong> %2 system partition. - + 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. @@ -1212,22 +1230,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1610,7 +1628,7 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1635,27 +1653,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) @@ -1663,10 +1681,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1942,7 +2019,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2364,7 +2441,7 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. + There are no partitions to install on. @@ -2429,65 +2506,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -2541,7 +2618,7 @@ Output: - + %1 (%2) language[name] (country[name]) @@ -2557,29 +2634,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2608,69 +2679,69 @@ Output: - + 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. - + %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: @@ -2853,29 +2924,29 @@ Output: SetHostNameJob - + Set hostname %1 - + Set hostname <strong>%1</strong>. - + Setting hostname %1. - - + + Internal Error - - + + Cannot write hostname to target system @@ -2913,82 +2984,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. - + Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. @@ -2996,42 +3067,42 @@ Output: 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. @@ -3228,37 +3299,37 @@ Output: - + Your username is too long. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + Your passwords do not match! @@ -3266,7 +3337,7 @@ Output: UsersViewStep - + Users @@ -3436,6 +3507,14 @@ Output: %1 soport + + WelcomeQmlViewStep + + + Welcome + Benvingut + + WelcomeViewStep @@ -3444,4 +3523,46 @@ Output: Benvingut + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_cs_CZ.ts b/lang/calamares_cs_CZ.ts index 838099dfe..86db9b5ae 100644 --- a/lang/calamares_cs_CZ.ts +++ b/lang/calamares_cs_CZ.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up Nastavit - + Install Instalovat @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Hotovo @@ -177,36 +177,54 @@ Calamares::PythonJob - + Running %1 operation. Spouštění %1 operace. - + Bad working directory path Chybný popis umístění pracovní složky - + Working directory %1 for python job %2 is not readable. Pracovní složku %1 pro Python skript %2 se nedaří otevřít pro čtení. - + Bad main script file Nesprávný soubor s hlavním skriptem - + Main script file %1 for python job %2 is not readable. Hlavní soubor s python skriptem %1 pro úlohu %2 se nedaří otevřít pro čtení.. - + Boost.Python error in job "%1". Boost.Python chyba ve skriptu „%1“. + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -238,176 +256,176 @@ Calamares::ViewManager - - + + &Back &Zpět - - + + &Next &Další - - + + &Cancel &Storno - + Cancel setup without changing the system. Zrušit nastavení bez změny v systému. - + Cancel installation without changing the system. Zrušení instalace bez provedení změn systému. - + Setup Failed Nastavení se nezdařilo - + Would you like to paste the install log to the web? Chcete vyvěsit záznam událostí při instalaci na web? - + Install Log Paste URL URL pro vložení záznamu událostí při instalaci - + The upload was unsuccessful. No web-paste was done. Nahrání se nezdařilo. Na web nebylo nic vloženo. - + Calamares Initialization Failed Inicializace Calamares se nezdařila - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 nemůže být nainstalováno. Calamares se nepodařilo načíst všechny nastavené moduly. Toto je problém způsobu použití Calamares ve vámi používané distribuci. - + <br/>The following modules could not be loaded: <br/> Následující moduly se nepodařilo načíst: - + Continue with installation? Pokračovat v instalaci? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> Instalátor %1 provede změny na datovém úložišti, aby bylo nainstalováno %2.<br/><strong>Změny nebude možné vrátit zpět.</strong> - + &Set up now Na&stavit nyní - + &Set up Na&stavit - + &Install Na&instalovat - + Setup is complete. Close the setup program. Nastavení je dokončeno. Ukončete nastavovací program. - + Cancel setup? Zrušit nastavování? - + Cancel installation? Přerušit instalaci? - + Do you really want to cancel the current setup process? The setup program 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. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Opravdu chcete instalaci přerušit? 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> Instalátor %1 provede změny na datovém úložišti, aby bylo nainstalováno %2.<br/><strong>Změny nebude možné vrátit zpět.</strong> - + &Install now &Spustit instalaci - + Go &back Jít &zpět - + &Done &Hotovo - + The installation is complete. Close the installer. Instalace je dokončena. Ukončete instalátor. - + Error Chyba - + Installation Failed Instalace se nezdařila @@ -415,22 +433,22 @@ Instalační program bude ukončen a všechny změny ztraceny. CalamaresPython::Helper - + Unknown exception type Neznámý typ výjimky - + unparseable Python error Chyba při zpracovávání (parse) Python skriptu. - + unparseable Python traceback Chyba při zpracovávání (parse) Python záznamu volání funkcí (traceback). - + Unfetchable Python error. Chyba při načítání Python skriptu. @@ -737,22 +755,22 @@ Instalační program bude ukončen a všechny změny ztraceny. Š&ifrovat - + Logical Logický - + Primary Primární - + GPT GPT - + Mountpoint already in use. Please select another one. Tento přípojný bod už je používán – vyberte jiný. @@ -760,22 +778,22 @@ Instalační program bude ukončen a všechny změny ztraceny. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. Vytvořit nový %2MiB oddíl na %4 (%3) se souborovým systémem %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Vytvořit nový <strong>%2MiB</strong> oddíl na <strong>%4</strong> (%3) se souborovým systémem <strong>%1</strong>. - + Creating new %1 partition on %2. Vytváří se nový %1 oddíl na %2. - + The installer failed to create partition on disk '%1'. Instalátoru se nepodařilo vytvořit oddíl na datovém úložišti „%1“. @@ -1069,7 +1087,7 @@ Instalační program bude ukončen a všechny změny ztraceny. Příznaky: - + Mountpoint already in use. Please select another one. Tento přípojný bod je už používán – vyberte jiný. @@ -1105,37 +1123,37 @@ Instalační program bude ukončen a všechny změny ztraceny. FillGlobalStorageJob - + Set partition information Nastavit informace o oddílu - + Install %1 on <strong>new</strong> %2 system partition. Nainstalovat %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>. Nainstalovat %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>. Nainstalovat zavaděč do <strong>%1</strong>. - + Setting up mount points. Nastavují se přípojné body. @@ -1219,22 +1237,22 @@ Instalační program bude ukončen a všechny změny ztraceny. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. Formátovat oddíl %1 (souborový systém: %2, velikost %3 MiB) na %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. Naformátovat <strong>%3MiB</strong> oddíl <strong>%1</strong> souborovým systémem <strong>%2</strong>. - + Formatting partition %1 with file system %2. Vytváření souborového systému %2 na oddílu %1. - + The installer failed to format partition %1 on disk '%2'. Instalátoru se nepodařilo vytvořit souborový systém na oddílu %1 jednotky datového úložiště „%2“. @@ -1617,8 +1635,8 @@ Instalační program bude ukončen a všechny změny ztraceny. - Could configure LUKS key file on partition %1. - Nedaří se nastavit LUKS klíč pro oddíl %1. + Could not configure LUKS key file on partition %1. + @@ -1642,27 +1660,27 @@ 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. (Vypnuto: Nedaří se stáhnout seznamy balíčků – zkontrolujte připojení k síti) - + Network Installation. (Disabled: Received invalid groups data) Síťová instalace. (Vypnuto: Obdrženy neplatné údaje skupin) - + Network Installation. (Disabled: Incorrect configuration) Síťová instalace. (vypnuto: nesprávné nastavení) @@ -1670,10 +1688,69 @@ Instalační program bude ukončen a všechny změny ztraceny. NetInstallViewStep - + + Package selection Výběr balíčků + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1949,7 +2026,7 @@ Instalační program bude ukončen a všechny změny ztraceny. Neznámá chyba - + Password is empty Heslo není vyplněné @@ -2371,8 +2448,8 @@ Instalační program bude ukončen a všechny změny ztraceny. - There are no partitons to install on. - Nejsou zde žádné oddíly na které by se dalo nainstalovat. + There are no partitions to install on. + @@ -2436,14 +2513,14 @@ Instalační program bude ukončen a všechny změny ztraceny. ProcessResult - + There was no output from the command. Příkaz neposkytl žádný výstup. - + Output: @@ -2452,52 +2529,52 @@ Výstup: - + External command crashed. Vnější příkaz byl neočekávaně ukončen. - + Command <i>%1</i> crashed. Příkaz <i>%1</i> byl neočekávaně ukončen. - + External command failed to start. Vnější příkaz se nepodařilo spustit. - + Command <i>%1</i> failed to start. Příkaz <i>%1</i> se nepodařilo spustit. - + Internal error when starting command. Vnitřní chyba při spouštění příkazu. - + Bad parameters for process job call. Chybné parametry volání úlohy procesu. - + External command failed to finish. Vnější příkaz se nepodařilo dokončit. - + Command <i>%1</i> failed to finish in %2 seconds. Příkaz <i>%1</i> se nepodařilo dokončit do %2 sekund. - + External command finished with errors. Vnější příkaz skončil s chybami. - + Command <i>%1</i> finished with exit code %2. Příkaz <i>%1</i> skončil s návratovým kódem %2. @@ -2551,7 +2628,7 @@ Výstup: Kontrola požadavků pro modul <i>%1</i> dokončena. - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2567,29 +2644,23 @@ Výstup: Nebyl poskytnut žádný popis. - - - - - + + + + File not found Soubor nenalezen - + Path <pre>%1</pre> must be an absolute path. Je třeba, aby <pre>%1</pre>byl úplný popis umístění. - + Could not create new random file <pre>%1</pre>. Nepodařilo se vytvořit nový náhodný soubor <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - Nepodařilo se číst náhodný soubor <pre>%1</pre>. - RemoveVolumeGroupJob @@ -2618,69 +2689,69 @@ Výstup: Formulář - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. 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 se nezdá být 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. 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. 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. 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/>EFI systémový oddíl nenalezen. Vraťte se, zvolte ruční rozdělení jednotky, a nastavte %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 EFI systémový oddíl %1. - + EFI system partition: EFI systémový oddíl: @@ -2863,29 +2934,29 @@ Výstup: SetHostNameJob - + Set hostname %1 Nastavit název počítače %1 - + Set hostname <strong>%1</strong>. Nastavit název počítače <strong>%1</strong>. - + Setting hostname %1. Nastavuje se název počítače %1. - - + + Internal Error Vnitřní chyba - - + + Cannot write hostname to target system Název počítače se nedaří zapsat do cílového systému @@ -2923,82 +2994,82 @@ Výstup: SetPartFlagsJob - + Set flags on partition %1. Nastavit příznaky na oddílu %1. - + Set flags on %1MiB %2 partition. Nastavit příznaky na %1MiB %2 oddílu. - + Set flags on new partition. Nastavit příznaky na novém oddílu. - + Clear flags on partition <strong>%1</strong>. Vymazat příznaky z oddílu <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. Odstranit příznaky z %1MiB <strong>%2</strong> oddílu. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. Označit %1MiB <strong>%2</strong> oddíl jako <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. Odstraňování příznaků na %1MiB <strong>%2</strong> oddílu. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. Nastavování příznaků <strong>%3</strong> na %1MiB <strong>%2</strong> oddílu. - + Clear flags on new partition. Vymazat příznaky z nového oddílu. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Nastavit příznak oddílu <strong>%1</strong> jako <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. Nastavit příznak <strong>%1</strong> na novém oddílu. - + Clearing flags on partition <strong>%1</strong>. Mazání příznaků oddílu <strong>%1</strong>. - + Clearing flags on new partition. Mazání příznaků na novém oddílu. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Nastavování příznaků <strong>%2</strong> na oddílu <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. Nastavování příznaků <strong>%1</strong> na novém oddílu. - + The installer failed to set flags on partition %1. Instalátoru se nepodařilo nastavit příznak na oddílu %1 @@ -3006,42 +3077,42 @@ Výstup: SetPasswordJob - + Set password for user %1 Nastavit heslo pro uživatele %1 - + Setting password for user %1. Nastavuje se heslo pro uživatele %1. - + Bad destination system path. Chybný popis cílového umístění systému. - + rootMountPoint is %1 Přípojný bod kořenového souborového systému (root) je %1 - + Cannot disable root account. Nedaří se zakázat účet správce systému (root). - + passwd terminated with error code %1. Příkaz passwd ukončen s chybovým kódem %1. - + Cannot set password for user %1. Nepodařilo se nastavit heslo uživatele %1. - + usermod terminated with error code %1. Příkaz usermod ukončen s chybovým kódem %1. @@ -3238,37 +3309,37 @@ Výstup: <small>Pokud bude tento počítač používat více lidí, můžete přidat uživatelské účty po dokončení instalace.</small> - + Your username is too long. Vaše uživatelské jméno je příliš dlouhé. - + Your username must start with a lowercase letter or underscore. Je třeba, aby uživatelské jméno začínalo na malé písmeno nebo podtržítko. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Je možné použít pouze malá písmena, číslice, podtržítko a spojovník. - + Only letters, numbers, underscore and hyphen are allowed. Je možné použít pouze písmena, číslice, podtržítko a spojovník. - + Your hostname is too short. Název stroje je příliš krátký. - + Your hostname is too long. Název stroje je příliš dlouhý. - + Your passwords do not match! Zadání hesla se neshodují! @@ -3276,7 +3347,7 @@ Výstup: UsersViewStep - + Users Uživatelé @@ -3446,6 +3517,14 @@ Výstup: %1 podpora + + WelcomeQmlViewStep + + + Welcome + Vítejte + + WelcomeViewStep @@ -3454,4 +3533,46 @@ Výstup: Vítejte + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_da.ts b/lang/calamares_da.ts index 40a7791cc..b6abb1db2 100644 --- a/lang/calamares_da.ts +++ b/lang/calamares_da.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up Sæt op - + Install Installation @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Færdig @@ -177,36 +177,54 @@ 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. Arbejdsmappen %1 til python-jobbet %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 til python-jobbet %2 er ikke læsbar. - + Boost.Python error in job "%1". Boost.Python-fejl i job "%1". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,176 +252,176 @@ Calamares::ViewManager - - + + &Back &Tilbage - - + + &Next &Næste - - + + &Cancel &Annullér - + Cancel setup without changing the system. Annullér opsætningen uden at ændre systemet. - + Cancel installation without changing the system. Annullér installation uden at ændre systemet. - + Setup Failed Opsætningen mislykkedes - + Would you like to paste the install log to the web? Vil du indsætte installationsloggen på webbet? - + Install Log Paste URL Indsættelses-URL for installationslog - + The upload was unsuccessful. No web-paste was done. Uploaden lykkedes ikke. Der blev ikke foretaget nogen webindsættelse. - + Calamares Initialization Failed Initiering af Calamares mislykkedes - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 kan ikke installeres. Calamares kunne ikke indlæse alle de konfigurerede moduler. Det er et problem med den måde Calamares bruges på af distributionen. - + <br/>The following modules could not be loaded: <br/>Følgende moduler kunne ikke indlæses: - + Continue with installation? Fortsæt installationen? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> %1-opsætningsprogrammet er ved at foretage ændringer til din disk for at opsætte %2.<br/><strong>Det vil ikke være muligt at fortryde ændringerne.</strong> - + &Set up now &Sæt op nu - + &Set up &Sæt op - + &Install &Installér - + Setup is complete. Close the setup program. Opsætningen er fuldført. Luk opsætningsprogrammet. - + Cancel setup? Annullér opsætningen? - + Cancel installation? Annullér installationen? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Vil du virkelig annullere den igangværende opsætningsproces? Opsætningsprogrammet vil stoppe og alle ændringer vil gå tabt. - + 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 opsætningen? - + 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 foretage ændringer til din disk for at installere %2.<br/><strong>Det vil ikke være muligt at fortryde ændringerne.</strong> - + &Install now &Installér nu - + Go &back Gå &tilbage - + &Done &Færdig - + The installation is complete. Close the installer. Installationen er fuldført. Luk installationsprogrammet. - + Error Fejl - + Installation Failed Installation mislykkedes @@ -411,22 +429,22 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. CalamaresPython::Helper - + Unknown exception type Ukendt undtagelsestype - + unparseable Python error Python-fejl som ikke kan fortolkes - + unparseable Python traceback Python-traceback som ikke kan fortolkes - + Unfetchable Python error. Python-fejl som ikke kan hentes. @@ -733,22 +751,22 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.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. @@ -756,22 +774,22 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. Opret en ny %2 MiB partition på %4 (%3) med %1-filsystem. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Opret en ny <strong>%2 MiB</strong> partition på <strong>%4</strong> (%3) med <strong>%1</strong>-filsystem. - + Creating new %1 partition on %2. Opretter ny %1-partition på %2. - + The installer failed to create partition on disk '%1'. Installationsprogrammet kunne ikke oprette partition på disk '%1'. @@ -1065,7 +1083,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Flag: - + Mountpoint already in use. Please select another one. Monteringspunktet er allerede i brug. Vælg venligst et andet. @@ -1101,37 +1119,37 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. FillGlobalStorageJob - + Set partition information Sæt partitionsinformation - + Install %1 on <strong>new</strong> %2 system partition. Installér %1 på <strong>ny</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>. - + 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. @@ -1215,22 +1233,22 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. Formatér partition %1 (filsystem: %2, størrelse: %3 MiB) på %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. Formatér <strong>%3 MiB</strong> partition <strong>%1</strong> med <strong>%2</strong>-filsystem. - + Formatting partition %1 with file system %2. Formatterer partition %1 med %2-filsystem. - + The installer failed to format partition %1 on disk '%2'. Installationsprogrammet kunne ikke formatere partition %1 på disk '%2'. @@ -1280,7 +1298,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. is running the installer as an administrator (root) - + kører installationsprogrammet som administrator (root) @@ -1295,7 +1313,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. has a screen large enough to show the whole installer - + har en skærm, som er stor nok til at vise hele installationsprogrammet @@ -1613,8 +1631,8 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. - Could configure LUKS key file on partition %1. - Kunne ikke konfigurere LUKS-nøglefil på partitionen %1. + Could not configure LUKS key file on partition %1. + @@ -1638,27 +1656,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) Netværksinstallation. (Deaktiveret: Modtog ugyldige gruppers data) - + Network Installation. (Disabled: Incorrect configuration) Netværksinstallation. (deaktiveret: forkert konfiguration) @@ -1666,10 +1684,69 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. NetInstallViewStep - + + Package selection Valg af pakke + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1945,7 +2022,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Ukendt fejl - + Password is empty Adgangskoden er tom @@ -2367,8 +2444,8 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. - There are no partitons to install on. - Der er ikke installeret nogen partitioner på den. + There are no partitions to install on. + @@ -2432,14 +2509,14 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. ProcessResult - + There was no output from the command. Der var ikke nogen output fra kommandoen. - + Output: @@ -2448,52 +2525,52 @@ Output: - + External command crashed. Ekstern kommando holdt op med at virke. - + Command <i>%1</i> crashed. Kommandoen <i>%1</i> holdte op med at virke. - + External command failed to start. Ekstern kommando kunne ikke starte. - + Command <i>%1</i> failed to start. Kommandoen <i>%1</i> kunne ikke starte. - + Internal error when starting command. Intern fejl ved start af kommando. - + Bad parameters for process job call. Ugyldige parametre til kald af procesjob. - + External command failed to finish. Ekstern kommando blev ikke færdig. - + Command <i>%1</i> failed to finish in %2 seconds. Kommandoen <i>%1</i> blev ikke færdig på %2 sekunder. - + External command finished with errors. Ekstern kommando blev færdig med fejl. - + Command <i>%1</i> finished with exit code %2. Kommandoen <i>%1</i> blev færdig med afslutningskoden %2. @@ -2547,7 +2624,7 @@ Output: Tjek at krav for modulet <i>%1</i> er fuldført. - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2563,29 +2640,23 @@ Output: Der er ikke angivet nogen beskrivelse. - - - - - + + + + File not found Filen blev ikke fundet - + Path <pre>%1</pre> must be an absolute path. Stien <pre>%1</pre> skal være en absolut sti. - + Could not create new random file <pre>%1</pre>. Kunne ikke oprette den tilfældige fil <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - Kunne ikke læse den tilfældige fil <pre>%1</pre>. - RemoveVolumeGroupJob @@ -2614,69 +2685,69 @@ Output: Formular - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. Vælg hvor %1 skal installeres.<br/><font color="red">Advarsel: </font>Det 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) - + <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: @@ -2859,29 +2930,29 @@ Output: SetHostNameJob - + Set hostname %1 Sæt værtsnavn %1 - + Set hostname <strong>%1</strong>. Sæt værtsnavn <strong>%1</strong>. - + Setting hostname %1. Sætter værtsnavn %1. - - + + Internal Error Intern fejl - - + + Cannot write hostname to target system Kan ikke skrive værtsnavn til destinationssystem @@ -2919,82 +2990,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. Sæt flag på partition %1. - + Set flags on %1MiB %2 partition. Sæt flag på %1 MiB %2 partition. - + Set flags on new partition. Sæt flag på ny partition. - + Clear flags on partition <strong>%1</strong>. Ryd flag på partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. Ryd flag på %1 MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. Flag %1 MiB <strong>%2</strong> partition som <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. Rydder flag på %1 MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. Sætter flag <strong>%3</strong> på %1 MiB <strong>%2</strong> partition. - + Clear flags on new partition. Ryd flag på ny partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Flag partition <strong>%1</strong> som <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. Flag ny partition som <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. Rydder flag på partition <strong>%1</strong>. - + Clearing flags on new partition. Rydder flag på ny partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Sætter flag <strong>%2</strong> på partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. Sætter flag <strong>%1</strong> på ny partition. - + The installer failed to set flags on partition %1. Installationsprogrammet kunne ikke sætte flag på partition %1. @@ -3002,42 +3073,42 @@ Output: 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. @@ -3234,37 +3305,37 @@ Output: <small>Hvis mere end én person bruger computeren, kan du oprette flere konti efter installationen.</small> - + Your username is too long. Dit brugernavn er for langt. - + Your username must start with a lowercase letter or underscore. Dit brugernavn skal begynde med et bogstav med småt eller understregning. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Det er kun tilladt at bruge bogstaver med småt, tal, understregning og bindestreg. - + Only letters, numbers, underscore and hyphen are allowed. Det er kun tilladt at bruge bogstaver, tal, understregning og bindestreg. - + Your hostname is too short. Dit værtsnavn er for kort. - + Your hostname is too long. Dit værtsnavn er for langt. - + Your passwords do not match! Dine adgangskoder er ikke ens! @@ -3272,7 +3343,7 @@ Output: UsersViewStep - + Users Brugere @@ -3442,6 +3513,14 @@ Output: %1 support + + WelcomeQmlViewStep + + + Welcome + Velkommen + + WelcomeViewStep @@ -3450,4 +3529,46 @@ Output: Velkommen + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts index 437d1bc7f..c05d247a0 100644 --- a/lang/calamares_de.ts +++ b/lang/calamares_de.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up Einrichtung - + Install Installieren @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Fertig @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + Lade ... + + + + QML Step <i>%1</i>. + QML Schritt <i>%1</i>. + + + + Loading failed. + Laden fehlgeschlagen. + + Calamares::RequirementsChecker @@ -234,176 +252,176 @@ Calamares::ViewManager - - + + &Back &Zurück - - + + &Next &Weiter - - + + &Cancel &Abbrechen - + Cancel setup without changing the system. Installation abbrechen ohne das System zu verändern. - + Cancel installation without changing the system. Installation abbrechen, ohne das System zu verändern. - + Setup Failed Setup fehlgeschlagen - + Would you like to paste the install log to the web? Möchten Sie das Installationsprotokoll an eine Internetadresse senden? - + Install Log Paste URL Internetadresse für das Senden des Installationsprotokolls - + The upload was unsuccessful. No web-paste was done. Das Hochladen ist fehlgeschlagen. Es wurde nichts an eine Internetadresse gesendet. - + Calamares Initialization Failed Initialisierung von Calamares fehlgeschlagen - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 kann nicht installiert werden. Calamares war nicht in der Lage, alle konfigurierten Module zu laden. Dieses Problem hängt mit der Art und Weise zusammen, wie Calamares von der jeweiligen Distribution eingesetzt wird. - + <br/>The following modules could not be loaded: <br/>Die folgenden Module konnten nicht geladen werden: - + Continue with installation? Installation fortsetzen? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> Das %1 Installationsprogramm ist dabei, Änderungen an Ihrer Festplatte vorzunehmen, um %2 einzurichten.<br/><strong> Sie werden diese Änderungen nicht rückgängig machen können.</strong> - + &Set up now &Jetzt einrichten - + &Set up &Einrichten - + &Install &Installieren - + Setup is complete. Close the setup program. Setup ist abgeschlossen. Schließe das Installationsprogramm. - + Cancel setup? Installation abbrechen? - + Cancel installation? Installation abbrechen? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Wollen Sie die Installation wirklich abbrechen? Dadurch wird das Installationsprogramm beendet und alle Änderungen gehen verloren. - + 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 - + &Done &Erledigt - + The installation is complete. Close the installer. Die Installation ist abgeschlossen. Schließe das Installationsprogramm. - + Error Fehler - + Installation Failed Installation gescheitert @@ -411,22 +429,22 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. CalamaresPython::Helper - + Unknown exception type Unbekannter Ausnahmefehler - + unparseable Python error Nicht analysierbarer Python-Fehler - + unparseable Python traceback Nicht analysierbarer Python-Traceback - + Unfetchable Python error. Nicht zuzuordnender Python-Fehler @@ -733,22 +751,22 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Verschlü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. @@ -756,22 +774,22 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. Erstelle eine neue Partition mit einer Größe von %2MiB auf %4 (%3) mit dem Dateisystem %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Erstelle eine neue Partition mit einer Größe von <strong>%2MiB</strong> auf <strong>%4</strong> (%3) mit dem Dateisystem <strong>%1</strong>. - + Creating new %1 partition on %2. Erstelle eine neue %1 Partition auf %2. - + The installer failed to create partition on disk '%1'. Das Installationsprogramm scheiterte beim Erstellen der Partition auf Datenträger '%1'. @@ -1065,7 +1083,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Markierungen: - + Mountpoint already in use. Please select another one. Der Einhängepunkt wird schon benutzt. Bitte wählen Sie einen anderen. @@ -1101,37 +1119,37 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. FillGlobalStorageJob - + Set partition information Setze Partitionsinformationen - + Install %1 on <strong>new</strong> %2 system partition. 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. @@ -1215,22 +1233,22 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. Formatiere Partition %1 (Dateisystem: %2, Größe: %3 MiB) auf %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. Formatiere <strong>%3MiB</strong> Partition <strong>%1</strong> mit dem Dateisystem <strong>%2</strong>. - + Formatting partition %1 with file system %2. Formatiere Partition %1 mit Dateisystem %2. - + The installer failed to format partition %1 on disk '%2'. Das Formatieren von Partition %1 auf Datenträger '%2' ist fehlgeschlagen. @@ -1613,8 +1631,8 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. - Could configure LUKS key file on partition %1. - Konnte die LUKS-Schlüsseldatei auf der Root-Partition %1 konfigurieren. + Could not configure LUKS key file on partition %1. + Die LUKS-Schlüsseldatei konnte nicht auf Partition %1 eingerichtet werden. @@ -1638,27 +1656,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) Netwerk-Installation. (Deaktiviert: Ungültige Gruppen-Daten eingegeben) - + Network Installation. (Disabled: Incorrect configuration) Netzwerk-Installation. (Deaktiviert: Ungültige Konfiguration) @@ -1666,10 +1684,69 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. NetInstallViewStep - + + Package selection Paketauswahl + + + Office software + Office-Software + + + + Office package + Office-Paket + + + + Browser software + Browser-Software + + + + Browser package + Browser-Paket + + + + Web browser + Webbrowser + + + + Kernel + Kernel + + + + Services + Dienste + + + + Login + Anmeldung + + + + Desktop + Desktop + + + + Applications + Anwendungen + + + + NotesQmlViewStep + + + Notes + Anmerkungen + OEMPage @@ -1945,7 +2022,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Unbekannter Fehler - + Password is empty Passwort nicht vergeben @@ -2367,8 +2444,8 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. - There are no partitons to install on. - Es gibt keine Partitionen, auf denen man installieren könnte. + There are no partitions to install on. + Keine Partitionen für die Installation verfügbar. @@ -2432,14 +2509,14 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. ProcessResult - + There was no output from the command. Dieser Befehl hat keine Ausgabe erzeugt. - + Output: @@ -2448,52 +2525,52 @@ Ausgabe: - + External command crashed. Externes Programm abgestürzt. - + Command <i>%1</i> crashed. Programm <i>%1</i> abgestürzt. - + External command failed to start. Externes Programm konnte nicht gestartet werden. - + Command <i>%1</i> failed to start. Das Programm <i>%1</i> konnte nicht gestartet werden. - + Internal error when starting command. Interner Fehler beim Starten des Programms. - + Bad parameters for process job call. Ungültige Parameter für Prozessaufruf. - + External command failed to finish. Externes Programm konnte nicht abgeschlossen werden. - + Command <i>%1</i> failed to finish in %2 seconds. Programm <i>%1</i> konnte nicht innerhalb von %2 Sekunden abgeschlossen werden. - + External command finished with errors. Externes Programm mit Fehlern beendet. - + Command <i>%1</i> finished with exit code %2. Befehl <i>%1</i> beendet mit Exit-Code %2. @@ -2547,7 +2624,7 @@ Ausgabe: Die Anforderungsprüfung für das Modul <i>%1</i> ist abgeschlossen. - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2563,29 +2640,23 @@ Ausgabe: Keine Beschreibung vorhanden. - - - - - + + + + File not found Datei nicht gefunden - + Path <pre>%1</pre> must be an absolute path. Der Pfad <pre>%1</pre> muss ein absoluter Pfad sein. - + Could not create new random file <pre>%1</pre>. Die neue Zufallsdatei <pre>%1</pre> konnte nicht erstellt werden. - - - Could not read random file <pre>%1</pre>. - Die Zufallsdatei <pre>%1</pre> konnte nicht gelesen werden. - RemoveVolumeGroupJob @@ -2614,69 +2685,69 @@ Ausgabe: Form - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. 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: @@ -2859,29 +2930,29 @@ Ausgabe: SetHostNameJob - + Set hostname %1 Setze Computername auf %1 - + Set hostname <strong>%1</strong>. Setze Computernamen <strong>%1</strong>. - + Setting hostname %1. Setze Computernamen %1. - - + + Internal Error Interner Fehler - - + + Cannot write hostname to target system Kann den Computernamen nicht auf das Zielsystem schreiben @@ -2919,82 +2990,82 @@ Ausgabe: SetPartFlagsJob - + Set flags on partition %1. Setze Markierungen für Partition %1. - + Set flags on %1MiB %2 partition. Setze Markierungen für %1MiB %2 Partition. - + Set flags on new partition. Setze Markierungen für neue Partition. - + Clear flags on partition <strong>%1</strong>. Markierungen für Partition <strong>%1</strong> entfernen. - + Clear flags on %1MiB <strong>%2</strong> partition. Markierungen für %1MiB <strong>%2</strong> Partition entfernen. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. Markiere %1MiB <strong>%2</strong> Partition als <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. Lösche Markierungen für %1MiB <strong>%2</strong> Partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. Setze Markierungen <strong>%3</strong> für %1MiB <strong>%2</strong> Partition. - + Clear flags on new partition. Markierungen für neue Partition entfernen. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Partition markieren <strong>%1</strong> als <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. Markiere neue Partition als <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. Lösche Markierungen für Partition <strong>%1</strong>. - + Clearing flags on new partition. Lösche Markierungen für neue Partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Setze Markierungen <strong>%2</strong> für Partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. Setze Markierungen <strong>%1</strong> für neue Partition. - + The installer failed to set flags on partition %1. Das Installationsprogramm konnte keine Markierungen für Partition %1 setzen. @@ -3002,42 +3073,42 @@ Ausgabe: 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. @@ -3234,37 +3305,37 @@ Ausgabe: <small>Falls dieser Computer von mehr als einer Person benutzt werden soll, können weitere Benutzerkonten nach der Installation eingerichtet werden.</small> - + Your username is too long. Ihr Nutzername ist zu lang. - + Your username must start with a lowercase letter or underscore. Ihr Benutzername muss mit einem Kleinbuchstaben oder Unterstrich beginnen. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Es sind nur Kleinbuchstaben, Zahlen, Unterstrich und Bindestrich erlaubt. - + Only letters, numbers, underscore and hyphen are allowed. Es sind nur Buchstaben, Zahlen, Unter- und Bindestriche erlaubt. - + Your hostname is too short. Ihr Computername ist zu kurz. - + Your hostname is too long. Ihr Computername ist zu lang. - + Your passwords do not match! Ihre Passwörter stimmen nicht überein! @@ -3272,7 +3343,7 @@ Ausgabe: UsersViewStep - + Users Benutzer @@ -3442,6 +3513,14 @@ Ausgabe: Unterstützung für %1 + + WelcomeQmlViewStep + + + Welcome + Willkommen + + WelcomeViewStep @@ -3450,4 +3529,47 @@ Ausgabe: Willkommen + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + <h3>%1</h3> + <p>Dies sind beispielhafte Veröffentlichungshinweise.</p> + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + <h3>%1 <quote>%2</quote></h3> + + + + About + Über + + + + Support + Unterstützung + + + + Known issues + Bekannte Probleme + + + + Release notes + Veröffentlichungshinweise + + + + Donate + Spenden + + diff --git a/lang/calamares_el.ts b/lang/calamares_el.ts index 9fd94ad5e..73c565140 100644 --- a/lang/calamares_el.ts +++ b/lang/calamares_el.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Εγκατάσταση @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Ολοκληρώθηκε @@ -177,36 +177,54 @@ 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::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,175 +252,175 @@ Calamares::ViewManager - - + + &Back &Προηγούμενο - - + + &Next &Επόμενο - - + + &Cancel &Ακύρωση - + Cancel setup without changing the system. - + Cancel installation without changing the system. Ακύρωση της εγκατάστασης χωρίς αλλαγές στο σύστημα. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed Η αρχικοποίηση του Calamares απέτυχε - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install &Εγκατάσταση - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? Ακύρωση της εγκατάστασης; - + Do you really want to cancel the current setup process? The setup program 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? Συνέχεια με την εγκατάσταση; - + 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 Η εγκατάσταση απέτυχε @@ -410,22 +428,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type Άγνωστος τύπος εξαίρεσης - + unparseable Python error Μη αναγνώσιμο σφάλμα Python - + unparseable Python traceback Μη αναγνώσιμη ανίχνευση Python - + Unfetchable Python error. Μη ανακτήσιµο σφάλμα Python. @@ -731,22 +749,22 @@ The installer will quit and all changes will be lost. - + Logical Λογική - + Primary Πρωτεύουσα - + GPT GPT - + Mountpoint already in use. Please select another one. @@ -754,22 +772,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. Δημιουργείται νέα %1 κατάτμηση στο %2. - + The installer failed to create partition on disk '%1'. Η εγκατάσταση απέτυχε να δημιουργήσει μία κατάτμηση στον δίσκο '%1'. @@ -1063,7 +1081,7 @@ The installer will quit and all changes will be lost. Σημαίες: - + Mountpoint already in use. Please select another one. @@ -1099,37 +1117,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information Ορισμός πληροφοριών κατάτμησης - + Install %1 on <strong>new</strong> %2 system partition. Εγκατάσταση %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. @@ -1213,22 +1231,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1611,7 +1629,7 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1636,27 +1654,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) @@ -1664,10 +1682,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection Επιλογή πακέτου + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1943,7 +2020,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2365,7 +2442,7 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. + There are no partitions to install on. @@ -2430,65 +2507,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. Λανθασμένοι παράμετροι για την κλήση διεργασίας. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -2542,7 +2619,7 @@ Output: - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2558,29 +2635,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2609,69 +2680,69 @@ Output: Τύπος - + 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. Το επιλεγμένο στοιχείο φαίνεται να μην είναι ένα έγκυρο διαμέρισμα. - + %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: @@ -2854,29 +2925,29 @@ Output: 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 Δεν είναι δυνατή η εγγραφή του ονόματος υπολογιστή στο σύστημα @@ -2914,82 +2985,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. - + Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. Ο εγκαταστάτης απέτυχε να θέσει τις σημαίες στο διαμέρισμα %1. @@ -2997,42 +3068,42 @@ Output: 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. @@ -3229,37 +3300,37 @@ Output: - + Your username is too long. Το όνομα χρήστη είναι πολύ μακρύ. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Το όνομα υπολογιστή είναι πολύ σύντομο. - + Your hostname is too long. Το όνομα υπολογιστή είναι πολύ μακρύ. - + Your passwords do not match! Οι κωδικοί πρόσβασης δεν ταιριάζουν! @@ -3267,7 +3338,7 @@ Output: UsersViewStep - + Users Χρήστες @@ -3437,6 +3508,14 @@ Output: Υποστήριξη %1 + + WelcomeQmlViewStep + + + Welcome + Καλώς ήλθατε + + WelcomeViewStep @@ -3445,4 +3524,46 @@ Output: Καλώς ήλθατε + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts index 0a0402e74..415225480 100644 --- a/lang/calamares_en.ts +++ b/lang/calamares_en.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up Set up - + Install Install @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Done @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + Loading ... + + + + QML Step <i>%1</i>. + QML Step <i>%1</i>. + + + + Loading failed. + Loading failed. + + Calamares::RequirementsChecker @@ -234,176 +252,176 @@ Calamares::ViewManager - - + + &Back &Back - - + + &Next &Next - - + + &Cancel &Cancel - + Cancel setup without changing the system. Cancel setup without changing the system. - + Cancel installation without changing the system. Cancel installation without changing the system. - + Setup Failed Setup Failed - + Would you like to paste the install log to the web? Would you like to paste the install log to the web? - + Install Log Paste URL Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: <br/>The following modules could not be loaded: - + Continue with installation? Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now &Set up now - + &Set up &Set up - + &Install &Install - + Setup is complete. Close the setup program. Setup is complete. Close the setup program. - + Cancel setup? Cancel setup? - + Cancel installation? Cancel installation? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Do you really want to cancel the current setup process? The setup program 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. 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 - + &Done &Done - + The installation is complete. Close the installer. The installation is complete. Close the installer. - + Error Error - + Installation Failed Installation Failed @@ -411,22 +429,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type Unknown exception type - + unparseable Python error unparseable Python error - + unparseable Python traceback unparseable Python traceback - + Unfetchable Python error. Unfetchable Python error. @@ -733,22 +751,22 @@ The installer will quit and all changes will be lost. En&crypt - + Logical Logical - + Primary Primary - + GPT GPT - + Mountpoint already in use. Please select another one. Mountpoint already in use. Please select another one. @@ -756,22 +774,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. The installer failed to create partition on disk '%1'. @@ -1065,7 +1083,7 @@ The installer will quit and all changes will be lost. Flags: - + Mountpoint already in use. Please select another one. Mountpoint already in use. Please select another one. @@ -1101,37 +1119,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information Set partition information - + Install %1 on <strong>new</strong> %2 system partition. 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. @@ -1215,22 +1233,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. The installer failed to format partition %1 on disk '%2'. @@ -1613,8 +1631,8 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1638,27 +1656,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) Network Installation. (Disabled: Incorrect configuration) @@ -1666,10 +1684,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection Package selection + + + Office software + Office software + + + + Office package + Office package + + + + Browser software + Browser software + + + + Browser package + Browser package + + + + Web browser + Web browser + + + + Kernel + Kernel + + + + Services + Services + + + + Login + Login + + + + Desktop + Desktop + + + + Applications + Applications + + + + NotesQmlViewStep + + + Notes + Notes + OEMPage @@ -1945,7 +2022,7 @@ The installer will quit and all changes will be lost. Unknown error - + Password is empty Password is empty @@ -2367,8 +2444,8 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. - There are no partitons to install on. + There are no partitions to install on. + There are no partitions to install on. @@ -2432,14 +2509,14 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. There was no output from the command. - + Output: @@ -2448,52 +2525,52 @@ Output: - + External command crashed. External command crashed. - + Command <i>%1</i> crashed. Command <i>%1</i> crashed. - + External command failed to start. External command failed to start. - + Command <i>%1</i> failed to start. Command <i>%1</i> failed to start. - + Internal error when starting command. Internal error when starting command. - + Bad parameters for process job call. Bad parameters for process job call. - + External command failed to finish. External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. External command finished with errors. - + Command <i>%1</i> finished with exit code %2. Command <i>%1</i> finished with exit code %2. @@ -2547,7 +2624,7 @@ Output: Requirements checking for module <i>%1</i> is complete. - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2563,29 +2640,23 @@ Output: No description provided. - - - - - + + + + File not found File not found - + Path <pre>%1</pre> must be an absolute path. Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - Could not read random file <pre>%1</pre>. - RemoveVolumeGroupJob @@ -2614,69 +2685,69 @@ Output: Form - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. 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: @@ -2859,29 +2930,29 @@ Output: SetHostNameJob - + Set hostname %1 Set hostname %1 - + Set hostname <strong>%1</strong>. Set hostname <strong>%1</strong>. - + Setting hostname %1. Setting hostname %1. - - + + Internal Error Internal Error - - + + Cannot write hostname to target system Cannot write hostname to target system @@ -2919,82 +2990,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. Set flags on partition %1. - + Set flags on %1MiB %2 partition. Set flags on %1MiB %2 partition. - + Set flags on new partition. Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. Clearing flags on partition <strong>%1</strong>. - + Clearing flags on new partition. Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. The installer failed to set flags on partition %1. @@ -3002,42 +3073,42 @@ Output: 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. @@ -3234,37 +3305,37 @@ Output: <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> - + Your username is too long. Your username is too long. - + Your username must start with a lowercase letter or underscore. Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Your hostname is too short. - + Your hostname is too long. Your hostname is too long. - + Your passwords do not match! Your passwords do not match! @@ -3272,7 +3343,7 @@ Output: UsersViewStep - + Users Users @@ -3442,6 +3513,14 @@ Output: %1 support + + WelcomeQmlViewStep + + + Welcome + Welcome + + WelcomeViewStep @@ -3450,4 +3529,47 @@ Output: Welcome + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + <h3>%1</h3> + <p>These are example release notes.</p> + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + <h3>%1 <quote>%2</quote></h3> + + + + About + About + + + + Support + Support + + + + Known issues + Known issues + + + + Release notes + Release notes + + + + Donate + Donate + + diff --git a/lang/calamares_en_GB.ts b/lang/calamares_en_GB.ts index 6c732d443..90009c582 100644 --- a/lang/calamares_en_GB.ts +++ b/lang/calamares_en_GB.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Install @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Done @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,175 +252,175 @@ Calamares::ViewManager - - + + &Back &Back - - + + &Next &Next - - + + &Cancel &Cancel - + Cancel setup without changing the system. - + Cancel installation without changing the system. Cancel installation without changing the system. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed Calamares Initialisation Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: <br/>The following modules could not be loaded: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install &Install - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? Cancel installation? - + Do you really want to cancel the current setup process? The setup program 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. 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 - + &Done &Done - + The installation is complete. Close the installer. The installation is complete. Close the installer. - + Error Error - + Installation Failed Installation Failed @@ -410,22 +428,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type Unknown exception type - + unparseable Python error unparseable Python error - + unparseable Python traceback unparseable Python traceback - + Unfetchable Python error. Unfetchable Python error. @@ -731,22 +749,22 @@ The installer will quit and all changes will be lost. En&crypt - + Logical Logical - + Primary Primary - + GPT GPT - + Mountpoint already in use. Please select another one. Mountpoint already in use. Please select another one. @@ -754,22 +772,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. The installer failed to create partition on disk '%1'. @@ -1063,7 +1081,7 @@ The installer will quit and all changes will be lost. Flags: - + Mountpoint already in use. Please select another one. Mountpoint already in use. Please select another one. @@ -1099,37 +1117,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information Set partition information - + Install %1 on <strong>new</strong> %2 system partition. 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. @@ -1213,22 +1231,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. The installer failed to format partition %1 on disk '%2'. @@ -1611,7 +1629,7 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1636,27 +1654,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) @@ -1664,10 +1682,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection Package selection + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1943,7 +2020,7 @@ The installer will quit and all changes will be lost. Unknown error - + Password is empty @@ -2365,7 +2442,7 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. + There are no partitions to install on. @@ -2430,14 +2507,14 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. There was no output from the command. - + Output: @@ -2446,52 +2523,52 @@ Output: - + External command crashed. External command crashed. - + Command <i>%1</i> crashed. Command <i>%1</i> crashed. - + External command failed to start. External command failed to start. - + Command <i>%1</i> failed to start. Command <i>%1</i> failed to start. - + Internal error when starting command. Internal error when starting command. - + Bad parameters for process job call. Bad parameters for process job call. - + External command failed to finish. External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. External command finished with errors. - + Command <i>%1</i> finished with exit code %2. Command <i>%1</i> finished with exit code %2. @@ -2545,7 +2622,7 @@ Output: - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2561,29 +2638,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2612,69 +2683,69 @@ Output: Form - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. 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: @@ -2857,29 +2928,29 @@ Output: SetHostNameJob - + Set hostname %1 Set hostname %1 - + Set hostname <strong>%1</strong>. Set hostname <strong>%1</strong>. - + Setting hostname %1. Setting hostname %1. - - + + Internal Error Internal Error - - + + Cannot write hostname to target system Cannot write hostname to target system @@ -2917,82 +2988,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. Set flags on partition %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. Clearing flags on partition <strong>%1</strong>. - + Clearing flags on new partition. Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. The installer failed to set flags on partition %1. @@ -3000,42 +3071,42 @@ Output: 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. @@ -3232,37 +3303,37 @@ Output: - + Your username is too long. Your username is too long. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Your hostname is too short. - + Your hostname is too long. Your hostname is too long. - + Your passwords do not match! Your passwords do not match! @@ -3270,7 +3341,7 @@ Output: UsersViewStep - + Users Users @@ -3440,6 +3511,14 @@ Output: %1 support + + WelcomeQmlViewStep + + + Welcome + Welcome + + WelcomeViewStep @@ -3448,4 +3527,46 @@ Output: Welcome + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_eo.ts b/lang/calamares_eo.ts index 46369555a..386b98a85 100644 --- a/lang/calamares_eo.ts +++ b/lang/calamares_eo.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up Aranĝu - + Install Instali @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Finita @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,175 +252,175 @@ Calamares::ViewManager - - + + &Back &Reen - - + + &Next &Sekva - - + + &Cancel &Nuligi - + Cancel setup without changing the system. - + Cancel installation without changing the system. Nuligi instalado sen ŝanĝante la sistemo. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now &Aranĝu nun - + &Set up &Aranĝu - + &Install &Instali - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? Nuligi instalado? - + Do you really want to cancel the current setup process? The setup program 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. Ĉu vi vere volas nuligi la instalan procedon? La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. - - + + &Yes &Jes - - + + &No &Ne - + &Close &Fermi - + 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 &Instali nun - + Go &back Iru &Reen - + &Done &Finita - + The installation is complete. Close the installer. - + Error Eraro - + Installation Failed @@ -410,22 +428,22 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. CalamaresPython::Helper - + Unknown exception type - + unparseable Python error - + unparseable Python traceback - + Unfetchable Python error. @@ -731,22 +749,22 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. &Ĉifras - + Logical Logika - + Primary Ĉefa - + GPT - + Mountpoint already in use. Please select another one. Muntopunkto jam utiliĝi. Bonvolu elektu alian. @@ -754,22 +772,22 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1063,7 +1081,7 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. &Flagoj: - + Mountpoint already in use. Please select another one. Muntopunkto jam utiliĝi. Bonvolu elektu alian. @@ -1099,37 +1117,37 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. FillGlobalStorageJob - + Set partition information - + Install %1 on <strong>new</strong> %2 system partition. - + 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. @@ -1213,22 +1231,22 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1611,7 +1629,7 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1636,27 +1654,27 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) - + Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) @@ -1664,10 +1682,69 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. NetInstallViewStep - + + Package selection + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1943,7 +2020,7 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. - + Password is empty @@ -2365,7 +2442,7 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. - There are no partitons to install on. + There are no partitions to install on. @@ -2430,65 +2507,65 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -2542,7 +2619,7 @@ Output: - + %1 (%2) language[name] (country[name]) %1(%2) @@ -2558,29 +2635,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2609,69 +2680,69 @@ Output: Formularo - + 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. - + %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: @@ -2854,29 +2925,29 @@ Output: SetHostNameJob - + Set hostname %1 - + Set hostname <strong>%1</strong>. - + Setting hostname %1. - - + + Internal Error - - + + Cannot write hostname to target system @@ -2914,82 +2985,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. - + Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. @@ -2997,42 +3068,42 @@ Output: 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. @@ -3229,37 +3300,37 @@ Output: - + Your username is too long. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + Your passwords do not match! @@ -3267,7 +3338,7 @@ Output: UsersViewStep - + Users @@ -3437,6 +3508,14 @@ Output: + + WelcomeQmlViewStep + + + Welcome + + + WelcomeViewStep @@ -3445,4 +3524,46 @@ Output: + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_es.ts b/lang/calamares_es.ts index 946b294f9..15da55c41 100644 --- a/lang/calamares_es.ts +++ b/lang/calamares_es.ts @@ -118,12 +118,12 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar Calamares::ExecutionViewStep - + Set up - + Install Instalar @@ -144,7 +144,7 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar Calamares::JobThread - + Done Hecho @@ -178,36 +178,54 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -235,175 +253,175 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar Calamares::ViewManager - - + + &Back &Atrás - - + + &Next &Siguiente - - + + &Cancel &Cancelar - + Cancel setup without changing the system. - + Cancel installation without changing the system. Cancelar instalación sin cambiar el sistema. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed La inicialización de Calamares falló - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 no se pudo instalar. Calamares no fue capaz de cargar todos los módulos configurados. Esto es un problema con la forma en que Calamares es usado por la distribución - + <br/>The following modules could not be loaded: Los siguientes módulos no se pudieron cargar: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install &Instalar - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? ¿Cancelar la instalación? - + Do you really want to cancel the current setup process? The setup program 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. ¿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 - + &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 @@ -411,22 +429,22 @@ Saldrá del instalador y se perderán todos los cambios. CalamaresPython::Helper - + Unknown exception type Excepción desconocida - + unparseable Python error error unparseable Python - + unparseable Python traceback rastreo de Python unparseable - + Unfetchable Python error. Error de Python Unfetchable. @@ -732,22 +750,22 @@ Saldrá del instalador y se perderán todos los cambios. &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. @@ -755,22 +773,22 @@ Saldrá del instalador y se perderán todos los cambios. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. Creando nueva %1 partición en %2 - + The installer failed to create partition on disk '%1'. El instalador fallo al crear la partición en el disco '%1'. @@ -1064,7 +1082,7 @@ Saldrá del instalador y se perderán todos los cambios. Banderas: - + Mountpoint already in use. Please select another one. Punto de montaje ya en uso. Por favor, seleccione otro. @@ -1100,37 +1118,37 @@ Saldrá del instalador y se perderán todos los cambios. FillGlobalStorageJob - + Set partition information Establecer la información de la partición - + Install %1 on <strong>new</strong> %2 system partition. 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. @@ -1214,22 +1232,22 @@ Saldrá del instalador y se perderán todos los cambios. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. Formateando partición %1 con sistema de ficheros %2. - + The installer failed to format partition %1 on disk '%2'. El instalador falló al formatear la partición %1 del disco '%2'. @@ -1612,7 +1630,7 @@ Saldrá del instalador y se perderán todos los cambios. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1637,27 +1655,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) Instalación de red. (Deshabilitada: Se recibieron grupos de datos no válidos) - + Network Installation. (Disabled: Incorrect configuration) @@ -1665,10 +1683,69 @@ Saldrá del instalador y se perderán todos los cambios. NetInstallViewStep - + + Package selection Selección de paquetes + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1944,7 +2021,7 @@ Saldrá del instalador y se perderán todos los cambios. Error desconocido - + Password is empty @@ -2366,7 +2443,7 @@ Saldrá del instalador y se perderán todos los cambios. - There are no partitons to install on. + There are no partitions to install on. @@ -2431,14 +2508,14 @@ Saldrá del instalador y se perderán todos los cambios. ProcessResult - + There was no output from the command. No hubo salida del comando. - + Output: @@ -2447,52 +2524,52 @@ Salida: - + External command crashed. El comando externo falló. - + Command <i>%1</i> crashed. El comando <i>%1</i> falló. - + External command failed to start. El comando externo no se pudo iniciar. - + Command <i>%1</i> failed to start. El comando <i>%1</i> no se pudo iniciar. - + Internal error when starting command. Error interno al iniciar el comando. - + Bad parameters for process job call. Parámetros erróneos para la llamada de la tarea del procreso. - + External command failed to finish. El comando externo no se pudo finalizar. - + Command <i>%1</i> failed to finish in %2 seconds. El comando <i>%1</i> no se pudo finalizar en %2 segundos. - + External command finished with errors. El comando externo finalizó con errores. - + Command <i>%1</i> finished with exit code %2. El comando <i>%1</i> finalizó con un código de salida %2. @@ -2546,7 +2623,7 @@ Salida: - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2562,29 +2639,23 @@ Salida: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2613,69 +2684,69 @@ Salida: Formulario - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. 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: @@ -2858,29 +2929,29 @@ Salida: SetHostNameJob - + Set hostname %1 Hostname: %1 - + Set hostname <strong>%1</strong>. Configurar hostname <strong>%1</strong>. - + Setting hostname %1. Configurando hostname %1. - - + + Internal Error Error interno - - + + Cannot write hostname to target system No es posible escribir el hostname en el sistema de destino @@ -2918,82 +2989,82 @@ Salida: SetPartFlagsJob - + Set flags on partition %1. Establecer indicadores en la partición %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. Establecer indicadores en una nueva partición. - + Clear flags on partition <strong>%1</strong>. Limpiar indicadores en la partición <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. Limpiar indicadores en la nueva partición. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Indicar partición <strong>%1</strong> como <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. Indicar nueva partición como <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. Limpiando indicadores en la partición <strong>%1</strong>. - + Clearing flags on new partition. Limpiando indicadores en la nueva partición. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Estableciendo indicadores <strong>%2</strong> en la partición <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. Estableciendo indicadores <strong>%1</strong> en una nueva partición. - + The installer failed to set flags on partition %1. El instalador no pudo establecer indicadores en la partición %1. @@ -3001,42 +3072,42 @@ Salida: 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 @@ -3233,37 +3304,37 @@ Salida: - + Your username is too long. Su nombre de usuario es demasiado largo. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. El nombre del Host es demasiado corto. - + Your hostname is too long. El nombre del Host es demasiado largo. - + Your passwords do not match! ¡Sus contraseñas no coinciden! @@ -3271,7 +3342,7 @@ Salida: UsersViewStep - + Users Usuarios @@ -3441,6 +3512,14 @@ Salida: %1 ayuda + + WelcomeQmlViewStep + + + Welcome + Bienvenido + + WelcomeViewStep @@ -3449,4 +3528,46 @@ Salida: Bienvenido + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_es_MX.ts b/lang/calamares_es_MX.ts index d2b483bd2..9baa56f1a 100644 --- a/lang/calamares_es_MX.ts +++ b/lang/calamares_es_MX.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up Preparar - + Install Instalar @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Hecho @@ -177,36 +177,54 @@ 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 es accesible. - + 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,176 +252,176 @@ Calamares::ViewManager - - + + &Back &Atrás - - + + &Next &Siguiente - - + + &Cancel &Cancelar - + Cancel setup without changing the system. Cancelar la configuración sin cambiar el sistema. - + Cancel installation without changing the system. Cancelar instalación sin cambiar el sistema. - + Setup Failed Fallo en la configuración. - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed La inicialización de Calamares ha fallado - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 no pudo ser instalado. Calamares no pudo cargar todos los módulos configurados. Este es un problema con la forma en que Calamares esta siendo usada por la distribución. - + <br/>The following modules could not be loaded: <br/>Los siguientes módulos no pudieron ser cargados: - + Continue with installation? ¿Continuar con la instalación? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> El %1 programa de instalación esta a punto de realizar cambios a su disco con el fin de establecer %2.<br/><strong>Usted no podrá deshacer estos cambios.</strong> - + &Set up now &Configurar ahora - + &Set up &Configurar - + &Install &Instalar - + Setup is complete. Close the setup program. Configuración completa. Cierre el programa de instalación. - + Cancel setup? ¿Cancelar la configuración? - + Cancel installation? ¿Cancelar la instalación? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. ¿Realmente desea cancelar el actual proceso de configuración? El programa de instalación se cerrará y todos los cambios se perderá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 &Si - - + + &No &No - + &Close &Cerrar - + 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 - + &Done &Hecho - + The installation is complete. Close the installer. Instalación completa. Cierre el instalador. - + Error Error - + Installation Failed Instalación Fallida @@ -411,22 +429,22 @@ El instalador terminará y se perderán todos los cambios. CalamaresPython::Helper - + Unknown exception type Tipo de excepción desconocida - + unparseable Python error error Python no analizable - + unparseable Python traceback rastreo de Python no analizable - + Unfetchable Python error. Error de Python inalcanzable. @@ -733,22 +751,22 @@ El instalador terminará y se perderán todos los cambios. En&criptar - + Logical Lógica - + Primary Primaria - + GPT GPT - + Mountpoint already in use. Please select another one. Punto de montaje ya esta en uso. Por favor seleccione otro. @@ -756,22 +774,22 @@ El instalador terminará y se perderán todos los cambios. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. Crear nueva %2MiB partición en %4 (%3) con el sistema de archivos %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Crear nueva<strong>%2MiB</strong> partición en<strong>%2MiB</strong> (%3) con el sistema de archivos <strong>%1</strong>. - + Creating new %1 partition on %2. Creando nueva partición %1 en %2 - + The installer failed to create partition on disk '%1'. El instalador falló en crear la partición en el disco '%1'. @@ -1065,7 +1083,7 @@ El instalador terminará y se perderán todos los cambios. Indicadores: - + Mountpoint already in use. Please select another one. Punto de montaje ya esta en uso. Por favor seleccione otro. @@ -1101,37 +1119,37 @@ El instalador terminará y se perderán todos los cambios. FillGlobalStorageJob - + Set partition information Fijar información de la partición. - + Install %1 on <strong>new</strong> %2 system partition. Instalar %1 en <strong>nueva</strong> %2 partición de 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 el cargador de arranque en <strong>%1</strong>. - + Setting up mount points. Configurando puntos de montaje. @@ -1215,22 +1233,22 @@ El instalador terminará y se perderán todos los cambios. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. Formateando partición %1 con sistema de archivos %2. - + The installer failed to format partition %1 on disk '%2'. El instalador no ha podido formatear la partición %1 en el disco '%2' @@ -1613,7 +1631,7 @@ El instalador terminará y se perderán todos los cambios. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1638,27 +1656,27 @@ El instalador terminará 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 de Red. (Deshabilitada: No se puede acceder a la lista de paquetes, verifique su conección de red) - + Network Installation. (Disabled: Received invalid groups data) Instalación de Red. (Deshabilitada: Grupos de datos invalidos recibidos) - + Network Installation. (Disabled: Incorrect configuration) @@ -1666,10 +1684,69 @@ El instalador terminará y se perderán todos los cambios. NetInstallViewStep - + + Package selection Selección de paquete + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1945,7 +2022,7 @@ El instalador terminará y se perderán todos los cambios. Error desconocido - + Password is empty @@ -2367,7 +2444,7 @@ El instalador terminará y se perderán todos los cambios. - There are no partitons to install on. + There are no partitions to install on. @@ -2432,14 +2509,14 @@ El instalador terminará y se perderán todos los cambios. ProcessResult - + There was no output from the command. No hubo salida desde el comando. - + Output: @@ -2448,52 +2525,52 @@ Salida - + External command crashed. El comando externo ha fallado. - + Command <i>%1</i> crashed. El comando <i>%1</i> ha fallado. - + External command failed to start. El comando externo falló al iniciar. - + Command <i>%1</i> failed to start. El comando <i>%1</i> Falló al iniciar. - + Internal error when starting command. Error interno al iniciar el comando. - + Bad parameters for process job call. Parámetros erróneos en la llamada al proceso. - + External command failed to finish. Comando externo falla al finalizar - + Command <i>%1</i> failed to finish in %2 seconds. Comando <i>%1</i> falló al finalizar en %2 segundos. - + External command finished with errors. Comando externo finalizado con errores - + Command <i>%1</i> finished with exit code %2. Comando <i>%1</i> finalizó con código de salida %2. @@ -2547,7 +2624,7 @@ Salida - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2563,29 +2640,23 @@ Salida - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2614,70 +2685,70 @@ Salida Formulario - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. Selecciona donde instalar %1.<br/><font color="red">Aviso: </font>Se borrarán todos los archivos de 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 un espacio vacío. Selecciona 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. Selecciona una partición primaria o lógica. - + %1 cannot be installed on this partition. No se puede instalar %1 en esta partición. - + Data partition (%1) Partición de datos (%1) - + Unknown system partition (%1) Partición de sistema desconocida (%1) - + %1 system partition (%2) %1 partición 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ón %1 es muy pequeña para %2. Selecciona otra partición que tenga 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 EFI en este sistema. Por favor vuelva atrás y use el particionamiento 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 sera instalado en %2.<br/><font color="red">Advertencia: </font>toda la información en la partición %2 se perdera. - + 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: @@ -2860,29 +2931,29 @@ Salida SetHostNameJob - + Set hostname %1 Hostname: %1 - + Set hostname <strong>%1</strong>. Establecer nombre del equipo <strong>%1</strong>. - + Setting hostname %1. Configurando nombre de host %1. - - + + Internal Error Error interno - - + + Cannot write hostname to target system No es posible escribir el hostname en el sistema de destino @@ -2920,82 +2991,82 @@ Salida SetPartFlagsJob - + Set flags on partition %1. Establecer indicadores en la partición% 1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. Establecer indicadores en la nueva partición. - + Clear flags on partition <strong>%1</strong>. Borrar indicadores en la partición <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. Borrar indicadores en la nueva partición. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Indicador de partición <strong>%1</strong> como <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. Marcar la nueva partición como <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. Borrar indicadores en la partición <strong>%1</strong>. - + Clearing flags on new partition. Borrar indicadores en la nueva partición. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Establecer indicadores <strong>%2</strong> en la partición <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. Establecer indicadores <strong>%1</strong> en nueva partición. - + The installer failed to set flags on partition %1. El instalador no pudo establecer indicadores en la partición% 1. @@ -3003,42 +3074,42 @@ Salida 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. No se puede deshabilitar la cuenta root. - + passwd terminated with error code %1. Contraseña terminada con un error de código %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 @@ -3235,37 +3306,37 @@ Salida <small>Si más de una persona usará esta computadora, puede crear varias cuentas después de la instalación.</small> - + Your username is too long. Tu nombre de usuario es demasiado largo. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. El nombre de tu equipo es demasiado corto. - + Your hostname is too long. El nombre de tu equipo es demasiado largo. - + Your passwords do not match! Las contraseñas no coinciden! @@ -3273,7 +3344,7 @@ Salida UsersViewStep - + Users Usuarios @@ -3443,6 +3514,14 @@ Salida %1 Soporte + + WelcomeQmlViewStep + + + Welcome + Bienvenido + + WelcomeViewStep @@ -3451,4 +3530,46 @@ Salida Bienvenido + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_es_PR.ts b/lang/calamares_es_PR.ts index 495a6e58c..f7f3c7e91 100644 --- a/lang/calamares_es_PR.ts +++ b/lang/calamares_es_PR.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Instalar @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Hecho @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,174 +252,174 @@ Calamares::ViewManager - - + + &Back &Atrás - - + + &Next &Próximo - - + + &Cancel - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? - + Do you really want to cancel the current setup process? The setup program 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? - + 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 - + &Done - + The installation is complete. Close the installer. - + Error Error - + Installation Failed Falló la instalación @@ -409,22 +427,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type - + unparseable Python error - + unparseable Python traceback - + Unfetchable Python error. @@ -730,22 +748,22 @@ The installer will quit and all changes will be lost. - + Logical - + Primary - + GPT - + Mountpoint already in use. Please select another one. @@ -753,22 +771,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1062,7 +1080,7 @@ The installer will quit and all changes will be lost. - + Mountpoint already in use. Please select another one. @@ -1098,37 +1116,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information - + Install %1 on <strong>new</strong> %2 system partition. - + 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. @@ -1212,22 +1230,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1610,7 +1628,7 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1635,27 +1653,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) @@ -1663,10 +1681,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1942,7 +2019,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2364,7 +2441,7 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. + There are no partitions to install on. @@ -2429,65 +2506,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. Parámetros erróneos para el trabajo en proceso. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -2541,7 +2618,7 @@ Output: - + %1 (%2) language[name] (country[name]) @@ -2557,29 +2634,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2608,69 +2679,69 @@ Output: Formulario - + 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. - + %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: @@ -2853,29 +2924,29 @@ Output: SetHostNameJob - + Set hostname %1 - + Set hostname <strong>%1</strong>. - + Setting hostname %1. - - + + Internal Error - - + + Cannot write hostname to target system @@ -2913,82 +2984,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. - + Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. @@ -2996,42 +3067,42 @@ Output: 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. @@ -3228,37 +3299,37 @@ Output: - + Your username is too long. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + Your passwords do not match! @@ -3266,7 +3337,7 @@ Output: UsersViewStep - + Users @@ -3436,6 +3507,14 @@ Output: + + WelcomeQmlViewStep + + + Welcome + + + WelcomeViewStep @@ -3444,4 +3523,46 @@ Output: + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_et.ts b/lang/calamares_et.ts index 9da3e510b..17a50562b 100644 --- a/lang/calamares_et.ts +++ b/lang/calamares_et.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Paigalda @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Valmis @@ -177,36 +177,54 @@ Calamares::PythonJob - + Running %1 operation. Käivitan %1 tegevust. - + Bad working directory path Halb töökausta tee - + Working directory %1 for python job %2 is not readable. Töökaust %1 python tööle %2 pole loetav. - + Bad main script file Halb põhiskripti fail - + Main script file %1 for python job %2 is not readable. Põhiskripti fail %1 python tööle %2 pole loetav. - + Boost.Python error in job "%1". Boost.Python viga töös "%1". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,175 +252,175 @@ Calamares::ViewManager - - + + &Back &Tagasi - - + + &Next &Edasi - - + + &Cancel &Tühista - + Cancel setup without changing the system. - + Cancel installation without changing the system. Tühista paigaldamine ilma süsteemi muutmata. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed Calamarese alglaadimine ebaõnnestus - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 ei saa paigaldada. Calamares ei saanud laadida kõiki konfigureeritud mooduleid. See on distributsiooni põhjustatud Calamarese kasutamise viga. - + <br/>The following modules could not be loaded: <br/>Järgnevaid mooduleid ei saanud laadida: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now &Seadista kohe - + &Set up &Seadista - + &Install &Paigalda - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? Tühista paigaldamine? - + Do you really want to cancel the current setup process? The setup program 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. Kas sa tõesti soovid tühistada praeguse paigaldusprotsessi? Paigaldaja sulgub ning kõik muutused kaovad. - - + + &Yes &Jah - - + + &No &Ei - + &Close &Sulge - + Continue with setup? Jätka seadistusega? - + 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 paigaldaja on tegemas muudatusi sinu kettale, et paigaldada %2.<br/><strong>Sa ei saa neid muudatusi tagasi võtta.</strong> - + &Install now &Paigalda kohe - + Go &back Mine &tagasi - + &Done &Valmis - + The installation is complete. Close the installer. Paigaldamine on lõpetatud. Sulge paigaldaja. - + Error Viga - + Installation Failed Paigaldamine ebaõnnestus @@ -410,22 +428,22 @@ Paigaldaja sulgub ning kõik muutused kaovad. CalamaresPython::Helper - + Unknown exception type Tundmatu veateade - + unparseable Python error mittetöödeldav Python'i viga - + unparseable Python traceback mittetöödeldav Python'i traceback - + Unfetchable Python error. Kättesaamatu Python'i viga. @@ -731,22 +749,22 @@ Paigaldaja sulgub ning kõik muutused kaovad. &Krüpti - + Logical Loogiline - + Primary Peamine - + GPT GPT - + Mountpoint already in use. Please select another one. Monteerimispunkt on juba kasutusel. Palun vali mõni teine. @@ -754,22 +772,22 @@ Paigaldaja sulgub ning kõik muutused kaovad. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. Loon uut %1 partitsiooni kettal %2. - + The installer failed to create partition on disk '%1'. Paigaldaja ei suutnud luua partitsiooni kettale "%1". @@ -1063,7 +1081,7 @@ Paigaldaja sulgub ning kõik muutused kaovad. Sildid: - + Mountpoint already in use. Please select another one. Monteerimispunkt on juba kasutusel. Palun vali mõni teine. @@ -1099,37 +1117,37 @@ Paigaldaja sulgub ning kõik muutused kaovad. FillGlobalStorageJob - + Set partition information Sea partitsiooni teave - + Install %1 on <strong>new</strong> %2 system partition. Paigalda %1 <strong>uude</strong> %2 süsteemipartitsiooni. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Seadista <strong>uus</strong> %2 partitsioon monteerimiskohaga <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. Paigalda %2 %3 süsteemipartitsioonile <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Seadista %3 partitsioon <strong>%1</strong> monteerimiskohaga <strong>%2</strong> - + Install boot loader on <strong>%1</strong>. Paigalda käivituslaadur kohta <strong>%1</strong>. - + Setting up mount points. Seadistan monteerimispunkte. @@ -1213,22 +1231,22 @@ Paigaldaja sulgub ning kõik muutused kaovad. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. Vormindan partitsiooni %1 failisüsteemiga %2. - + The installer failed to format partition %1 on disk '%2'. Paigaldaja ei suutnud vormindada partitsiooni %1 kettal "%2". @@ -1611,7 +1629,7 @@ Paigaldaja sulgub ning kõik muutused kaovad. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1636,27 +1654,27 @@ Paigaldaja sulgub ning kõik muutused kaovad. NetInstallPage - + Name Nimi - + Description Kirjeldus - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Võrgupaigaldus. (Keelatud: paketinimistute saamine ebaõnnestus, kontrolli oma võrguühendust) - + Network Installation. (Disabled: Received invalid groups data) Võrgupaigaldus. (Keelatud: vastu võetud sobimatud grupiandmed) - + Network Installation. (Disabled: Incorrect configuration) @@ -1664,10 +1682,69 @@ Paigaldaja sulgub ning kõik muutused kaovad. NetInstallViewStep - + + Package selection Paketivalik + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1943,7 +2020,7 @@ Paigaldaja sulgub ning kõik muutused kaovad. Tundmatu viga - + Password is empty @@ -2365,7 +2442,7 @@ Paigaldaja sulgub ning kõik muutused kaovad. - There are no partitons to install on. + There are no partitions to install on. @@ -2430,14 +2507,14 @@ Paigaldaja sulgub ning kõik muutused kaovad. ProcessResult - + There was no output from the command. Käsul polnud väljundit. - + Output: @@ -2446,52 +2523,52 @@ Väljund: - + External command crashed. Väline käsk jooksis kokku. - + Command <i>%1</i> crashed. Käsk <i>%1</i> jooksis kokku. - + External command failed to start. Välise käsu käivitamine ebaõnnestus. - + Command <i>%1</i> failed to start. Käsu <i>%1</i> käivitamine ebaõnnestus. - + Internal error when starting command. Käsu käivitamisel esines sisemine viga. - + Bad parameters for process job call. Protsessi töö kutsel olid halvad parameetrid. - + External command failed to finish. Väline käsk ei suutnud lõpetada. - + Command <i>%1</i> failed to finish in %2 seconds. Käsk <i>%1</i> ei suutnud lõpetada %2 sekundi jooksul. - + External command finished with errors. Väline käsk lõpetas vigadega. - + Command <i>%1</i> finished with exit code %2. Käsk <i>%1</i> lõpetas sulgemiskoodiga %2. @@ -2545,7 +2622,7 @@ Väljund: - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2561,29 +2638,23 @@ Väljund: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2612,69 +2683,69 @@ Väljund: Form - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. Vali, kuhu soovid %1 paigaldada.<br/><font color="red">Hoiatus: </font>see kustutab valitud partitsioonilt kõik failid. - + The selected item does not appear to be a valid partition. Valitud üksus ei paista olevat sobiv partitsioon. - + %1 cannot be installed on empty space. Please select an existing partition. %1 ei saa paigldada tühjale kohale. Palun vali olemasolev partitsioon. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 ei saa paigaldada laiendatud partitsioonile. Palun vali olemasolev põhiline või loogiline partitsioon. - + %1 cannot be installed on this partition. %1 ei saa sellele partitsioonile paigaldada. - + Data partition (%1) Andmepartitsioon (%1) - + Unknown system partition (%1) Tundmatu süsteemipartitsioon (%1) - + %1 system partition (%2) %1 süsteemipartitsioon (%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/>Partitsioon %1 on liiga väike %2 jaoks. Palun vali partitsioon suurusega vähemalt %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/>Sellest süsteemist ei leitud EFI süsteemipartitsiooni. Palun mine tagasi ja kasuta käsitsi partitsioneerimist, et seadistada %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 paigaldatakse partitsioonile %2.<br/><font color="red">Hoiatus: </font>kõik andmed partitsioonil %2 kaovad. - + The EFI system partition at %1 will be used for starting %2. EFI süsteemipartitsioon asukohas %1 kasutatakse %2 käivitamiseks. - + EFI system partition: EFI süsteemipartitsioon: @@ -2857,29 +2928,29 @@ Väljund: SetHostNameJob - + Set hostname %1 Määra hostinimi %1 - + Set hostname <strong>%1</strong>. Määra hostinimi <strong>%1</strong>. - + Setting hostname %1. Määran hostinime %1. - - + + Internal Error Sisemine viga - - + + Cannot write hostname to target system Hostinime ei saa sihtsüsteemile kirjutada @@ -2917,82 +2988,82 @@ Väljund: SetPartFlagsJob - + Set flags on partition %1. Määratud sildid partitsioonil %1: - + Set flags on %1MiB %2 partition. - + Set flags on new partition. Määra sildid uuele partitsioonile. - + Clear flags on partition <strong>%1</strong>. Tühjenda sildid partitsioonil <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. Tühjenda sildid uuel partitsioonil - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Määra partitsioonile <strong>%1</strong> silt <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. Määra uuele partitsioonile silt <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. Eemaldan sildid partitsioonilt <strong>%1</strong>. - + Clearing flags on new partition. Eemaldan uuelt partitsioonilt sildid. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Määran sildid <strong>%1</strong> partitsioonile <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. Määran sildid <strong>%1</strong> uuele partitsioonile. - + The installer failed to set flags on partition %1. Paigaldaja ei suutnud partitsioonile %1 silte määrata. @@ -3000,42 +3071,42 @@ Väljund: SetPasswordJob - + Set password for user %1 Määra kasutajale %1 parool - + Setting password for user %1. Määran kasutajale %1 parooli. - + Bad destination system path. Halb sihtsüsteemi tee. - + rootMountPoint is %1 rootMountPoint on %1 - + Cannot disable root account. Juurkasutajat ei saa keelata. - + passwd terminated with error code %1. passwd peatatud veakoodiga %1. - + Cannot set password for user %1. Kasutajale %1 ei saa parooli määrata. - + usermod terminated with error code %1. usermod peatatud veateatega %1. @@ -3232,37 +3303,37 @@ Väljund: - + Your username is too long. Sinu kasutajanimi on liiga pikk. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Sinu hostinimi on liiga lühike. - + Your hostname is too long. Sinu hostinimi on liiga pikk. - + Your passwords do not match! Sinu paroolid ei ühti! @@ -3270,7 +3341,7 @@ Väljund: UsersViewStep - + Users Kasutajad @@ -3440,6 +3511,14 @@ Väljund: %1 tugi + + WelcomeQmlViewStep + + + Welcome + Tervist + + WelcomeViewStep @@ -3448,4 +3527,46 @@ Väljund: Tervist + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_eu.ts b/lang/calamares_eu.ts index 893734392..b557d5874 100644 --- a/lang/calamares_eu.ts +++ b/lang/calamares_eu.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Instalatu @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Egina @@ -177,36 +177,54 @@ 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. %1 lanerako direktorioa %2 python lanak ezin du irakurri. - + 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". Boost.Python errorea "%1" lanean. + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,175 +252,175 @@ Calamares::ViewManager - - + + &Back &Atzera - - + + &Next &Hurrengoa - - + + &Cancel &Utzi - + Cancel setup without changing the system. - + Cancel installation without changing the system. Instalazioa bertan behera utsi da sisteman aldaketarik gabe. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed Calamares instalazioak huts egin du - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 ezin da instalatu. Calamares ez da gai konfiguratutako modulu guztiak kargatzeko. Arazao hau banaketak Calamares erabiltzen duen eragatik da. - + <br/>The following modules could not be loaded: <br/> Ondorengo moduluak ezin izan dira kargatu: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install &Instalatu - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? Bertan behera utzi instalazioa? - + Do you really want to cancel the current setup process? The setup program 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. Ziur uneko instalazio prozesua bertan behera utzi nahi duzula? Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. - - + + &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> %1 instalatzailea zure diskoan aldaketak egitera doa %2 instalatzeko.<br/><strong>Ezingo dituzu desegin aldaketa hauek.</strong> - + &Install now &Instalatu orain - + Go &back &Atzera - + &Done E&ginda - + The installation is complete. Close the installer. Instalazioa burutu da. Itxi instalatzailea. - + Error Akatsa - + Installation Failed Instalazioak huts egin du @@ -410,22 +428,22 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. CalamaresPython::Helper - + Unknown exception type Salbuespen-mota ezezaguna - + unparseable Python error - + unparseable Python traceback - + Unfetchable Python error. @@ -731,22 +749,22 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. En%kriptatu - + Logical Logikoa - + Primary Primarioa - + GPT GPT - + Mountpoint already in use. Please select another one. Muntatze-puntua erabiltzen. Mesedez aukeratu beste bat. @@ -754,22 +772,22 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. %1 partizioa berria sortzen %2n. - + The installer failed to create partition on disk '%1'. Huts egin du instalatzaileak '%1' diskoan partizioa sortzen. @@ -1063,7 +1081,7 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. Banderak: - + Mountpoint already in use. Please select another one. Muntatze-puntua erabiltzen. Mesedez aukeratu beste bat. @@ -1099,37 +1117,37 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. FillGlobalStorageJob - + Set partition information Ezarri partizioaren informazioa - + Install %1 on <strong>new</strong> %2 system partition. Instalatu %1 sistemako %2 partizio <strong>berrian</strong>. - + 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>. Instalatu abio kargatzailea <strong>%1</strong>-(e)n. - + Setting up mount points. Muntatze puntuak ezartzen. @@ -1213,22 +1231,22 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. %1 partizioa formateatzen %2 sistemaz. - + The installer failed to format partition %1 on disk '%2'. Huts egin du instalatzaileak %1 partizioa sortzen '%2' diskoan. @@ -1611,7 +1629,7 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1636,27 +1654,27 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. NetInstallPage - + Name Izena - + Description Deskribapena - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) - + Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) @@ -1664,10 +1682,69 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. NetInstallViewStep - + + Package selection Pakete aukeraketa + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1943,7 +2020,7 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. Hutsegite ezezaguna - + Password is empty @@ -2365,7 +2442,7 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. - There are no partitons to install on. + There are no partitions to install on. @@ -2430,13 +2507,13 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. ProcessResult - + There was no output from the command. - + Output: @@ -2445,52 +2522,52 @@ Irteera: - + External command crashed. Kanpo-komandoak huts egin du. - + Command <i>%1</i> crashed. <i>%1</i> komandoak huts egin du. - + External command failed to start. Ezin izan da %1 kanpo-komandoa abiarazi. - + Command <i>%1</i> failed to start. Ezin izan da <i>%1</i> komandoa abiarazi. - + Internal error when starting command. Barne-akatsa komandoa abiarazterakoan. - + Bad parameters for process job call. - + External command failed to finish. Kanpo-komandoa ez da bukatu. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. Kanpo-komandoak akatsekin bukatu da. - + Command <i>%1</i> finished with exit code %2. @@ -2544,7 +2621,7 @@ Irteera: - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2560,29 +2637,23 @@ Irteera: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2611,69 +2682,69 @@ Irteera: Formulario - + 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. - + %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. %1eko EFI partizio sistema erabiliko da abiarazteko %2. - + EFI system partition: EFI sistema-partizioa: @@ -2856,29 +2927,29 @@ Irteera: SetHostNameJob - + Set hostname %1 - + Set hostname <strong>%1</strong>. - + Setting hostname %1. - - + + Internal Error Barne errorea - - + + Cannot write hostname to target system @@ -2916,82 +2987,82 @@ Irteera: SetPartFlagsJob - + Set flags on partition %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. - + Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. @@ -2999,42 +3070,42 @@ Irteera: 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. Ezin da desgaitu root kontua. - + passwd terminated with error code %1. - + Cannot set password for user %1. - + usermod terminated with error code %1. @@ -3231,37 +3302,37 @@ Irteera: - + Your username is too long. Zure erabiltzaile-izena luzeegia da. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Zure ostalari-izena laburregia da. - + Your hostname is too long. Zure ostalari-izena luzeegia da. - + Your passwords do not match! Pasahitzak ez datoz bat! @@ -3269,7 +3340,7 @@ Irteera: UsersViewStep - + Users Erabiltzaileak @@ -3439,6 +3510,14 @@ Irteera: %1 euskarria + + WelcomeQmlViewStep + + + Welcome + Ongi etorri + + WelcomeViewStep @@ -3447,4 +3526,46 @@ Irteera: Ongi etorri + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_fa.ts b/lang/calamares_fa.ts index 96db712fe..90ecaf02b 100644 --- a/lang/calamares_fa.ts +++ b/lang/calamares_fa.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install @@ -143,7 +143,7 @@ Calamares::JobThread - + Done @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,174 +252,174 @@ Calamares::ViewManager - - + + &Back - - + + &Next - - + + &Cancel - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? - + Do you really want to cancel the current setup process? The setup program 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? - + 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 - + &Done - + The installation is complete. Close the installer. - + Error - + Installation Failed @@ -409,22 +427,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type - + unparseable Python error - + unparseable Python traceback - + Unfetchable Python error. @@ -730,22 +748,22 @@ The installer will quit and all changes will be lost. - + Logical - + Primary - + GPT - + Mountpoint already in use. Please select another one. @@ -753,22 +771,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1062,7 +1080,7 @@ The installer will quit and all changes will be lost. - + Mountpoint already in use. Please select another one. @@ -1098,37 +1116,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information - + Install %1 on <strong>new</strong> %2 system partition. - + 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. @@ -1212,22 +1230,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1610,7 +1628,7 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1635,27 +1653,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) @@ -1663,10 +1681,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1942,7 +2019,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2364,7 +2441,7 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. + There are no partitions to install on. @@ -2429,65 +2506,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -2541,7 +2618,7 @@ Output: - + %1 (%2) language[name] (country[name]) @@ -2557,29 +2634,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2608,69 +2679,69 @@ Output: - + 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. - + %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: @@ -2853,29 +2924,29 @@ Output: SetHostNameJob - + Set hostname %1 - + Set hostname <strong>%1</strong>. - + Setting hostname %1. - - + + Internal Error - - + + Cannot write hostname to target system @@ -2913,82 +2984,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. - + Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. @@ -2996,42 +3067,42 @@ Output: 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. @@ -3228,37 +3299,37 @@ Output: - + Your username is too long. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + Your passwords do not match! @@ -3266,7 +3337,7 @@ Output: UsersViewStep - + Users @@ -3436,6 +3507,14 @@ Output: + + WelcomeQmlViewStep + + + Welcome + + + WelcomeViewStep @@ -3444,4 +3523,46 @@ Output: + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_fi_FI.ts b/lang/calamares_fi_FI.ts index 0fd0365c9..a616a4fdc 100644 --- a/lang/calamares_fi_FI.ts +++ b/lang/calamares_fi_FI.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up Määritä - + Install Asenna @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Valmis @@ -177,36 +177,54 @@ Calamares::PythonJob - + Running %1 operation. Suoritetaan %1 toimenpidettä. - + 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". + + Calamares::QmlViewStep + + + Loading ... + Ladataan ... + + + + QML Step <i>%1</i>. + QML-vaihe <i>%1</i>. + + + + Loading failed. + Lataus epäonnistui. + + Calamares::RequirementsChecker @@ -234,176 +252,176 @@ Calamares::ViewManager - - + + &Back &Takaisin - - + + &Next &Seuraava - - + + &Cancel &Peruuta - + Cancel setup without changing the system. Peruuta asennus muuttamatta järjestelmää. - + Cancel installation without changing the system. Peruuta asennus tekemättä muutoksia järjestelmään. - + Setup Failed Asennus epäonnistui - + Would you like to paste the install log to the web? Haluatko liittää asennuslokin verkkoon? - + Install Log Paste URL Asenna lokitiedon URL-osoite - + The upload was unsuccessful. No web-paste was done. Lähettäminen epäonnistui. Web-liittämistä ei tehty. - + Calamares Initialization Failed Calamares-alustustaminen epäonnistui - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 ei voida asentaa. Calamares ei voinut ladata kaikkia määritettyjä moduuleja. Ongelma on siinä, miten jakelu käyttää Calamaresia. - + <br/>The following modules could not be loaded: <br/>Seuraavia moduuleja ei voitu ladata: - + Continue with installation? Jatka asennusta? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> %1 asennusohjelma on aikeissa tehdä muutoksia levylle, jotta voit määrittää kohteen %2.<br/><strong>Et voi kumota näitä muutoksia.</strong> - + &Set up now &Määritä nyt - + &Set up &Määritä - + &Install &Asenna - + Setup is complete. Close the setup program. Asennus on valmis. Sulje asennusohjelma. - + Cancel setup? Peruuta asennus? - + Cancel installation? Peruuta asennus? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Haluatko todella peruuttaa nykyisen asennuksen? Asennusohjelma lopetetaan ja kaikki muutokset menetetään. - + 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 &Kyllä - - + + &No &Ei - + &Close &Sulje - + Continue with setup? Jatka asennusta? - + 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> Asennus ohjelman %1 on tehtävä muutoksia levylle, jotta %2 voidaan asentaa.<br/><strong>Et voi kumota näitä muutoksia.</strong> - + &Install now &Asenna nyt - + Go &back Mene &takaisin - + &Done &Valmis - + The installation is complete. Close the installer. Asennus on valmis. Sulje asennusohjelma. - + Error Virhe - + Installation Failed Asennus Epäonnistui @@ -411,22 +429,22 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. CalamaresPython::Helper - + Unknown exception type Tuntematon poikkeustyyppi - + unparseable Python error jäsentämätön Python virhe - + unparseable Python traceback jäsentämätön Python jäljitys - + Unfetchable Python error. Python virhettä ei voitu hakea. @@ -733,22 +751,22 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. Sa&laa - + Logical Looginen - + Primary Ensisijainen - + GPT GPT - + Mountpoint already in use. Please select another one. Asennuskohde on jo käytössä. Valitse toinen. @@ -756,22 +774,22 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. Luo uusi %2Mib-osio %4 (%3) tiedostojärjestelmällä %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Luo uusi <strong>%2Mib</strong> osio <strong>%4</strong> (%3) tiedostojärjestelmällä <strong>%1</strong>. - + Creating new %1 partition on %2. Luodaan uutta %1-osiota kohteessa %2. - + The installer failed to create partition on disk '%1'. Asennusohjelma epäonnistui osion luonnissa levylle '%1'. @@ -1065,7 +1083,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. Liput: - + Mountpoint already in use. Please select another one. Asennuskohde on jo käytössä. Valitse toinen. @@ -1101,37 +1119,37 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. FillGlobalStorageJob - + Set partition information Aseta osion tiedot - + Install %1 on <strong>new</strong> %2 system partition. Asenna %1 <strong>uusi</strong> %2 järjestelmä osio. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Määritä <strong>uusi</strong> %2 -osio liitepisteellä<strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. Asenna %2 - %3 -järjestelmän osioon <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Määritä %3 osio <strong>%1</strong> jossa on liitäntäpiste <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Asenna käynnistyslatain <strong>%1</strong>. - + Setting up mount points. Liitosten määrittäminen. @@ -1215,22 +1233,22 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. Alustaa osiota %1 (tiedostojärjestelmä: %2, koko: %3 MiB) - %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. Alustus <strong>%3MiB</strong> osio <strong>%1</strong> tiedostojärjestelmällä <strong>%2</strong>. - + Formatting partition %1 with file system %2. Alustaa osiota %1 tiedostojärjestelmällä %2. - + The installer failed to format partition %1 on disk '%2'. Levyn '%2' osion %1 alustus epäonnistui. @@ -1613,8 +1631,8 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. - Could configure LUKS key file on partition %1. - Voit määrittää LUKS-avaimen osioon %1. + Could not configure LUKS key file on partition %1. + LUKS-avaintiedostoa ei voi määrittää osiossa %1. @@ -1638,27 +1656,27 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. NetInstallPage - + Name Nimi - + Description Kuvaus - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Verkkoasennus. (Ei käytössä: Pakettiluetteloita ei voi hakea, tarkista verkkoyhteys) - + Network Installation. (Disabled: Received invalid groups data) Verkkoasennus. (Ei käytössä: Vastaanotettiin virheellisiä ryhmän tietoja) - + Network Installation. (Disabled: Incorrect configuration) Verkko asennus. (Ei käytössä: virheellinen määritys) @@ -1666,10 +1684,69 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. NetInstallViewStep - + + Package selection Paketin valinta + + + Office software + Office-ohjelmisto + + + + Office package + Office-paketti + + + + Browser software + Selainohjelmisto + + + + Browser package + Selainpaketti + + + + Web browser + Nettiselain + + + + Kernel + Kernel + + + + Services + Palvelut + + + + Login + Kirjaudu + + + + Desktop + Työpöytä + + + + Applications + Sovellukset + + + + NotesQmlViewStep + + + Notes + Huomautuksia + OEMPage @@ -1945,7 +2022,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. Tuntematon virhe - + Password is empty Salasana on tyhjä @@ -2367,7 +2444,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. - There are no partitons to install on. + There are no partitions to install on. Asennettavia osioita ei ole. @@ -2432,14 +2509,14 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. ProcessResult - + There was no output from the command. Komentoa ei voitu ajaa. - + Output: @@ -2448,52 +2525,52 @@ Ulostulo: - + External command crashed. Ulkoinen komento kaatui. - + Command <i>%1</i> crashed. Komento <i>%1</i> kaatui. - + External command failed to start. Ulkoisen komennon käynnistäminen epäonnistui. - + Command <i>%1</i> failed to start. Komennon <i>%1</i> käynnistäminen epäonnistui. - + Internal error when starting command. Sisäinen virhe käynnistettäessä komentoa. - + Bad parameters for process job call. Huonot parametrit prosessin kutsuun. - + External command failed to finish. Ulkoinen komento ei onnistunut. - + Command <i>%1</i> failed to finish in %2 seconds. Komento <i>%1</i> epäonnistui %2 sekunnissa. - + External command finished with errors. Ulkoinen komento päättyi virheisiin. - + Command <i>%1</i> finished with exit code %2. Komento <i>%1</i> päättyi koodiin %2. @@ -2547,7 +2624,7 @@ Ulostulo: Moduulin vaatimusten tarkistaminen <i>%1</i> on valmis. - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2563,29 +2640,23 @@ Ulostulo: Kuvausta ei ole. - - - - - + + + + File not found Tiedostoa ei löytynyt - + Path <pre>%1</pre> must be an absolute path. Polku <pre>%1</pre> täytyy olla ehdoton polku. - + Could not create new random file <pre>%1</pre>. Uutta satunnaista tiedostoa ei voitu luoda <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - Satunnaista tiedostoa ei voitu lukea <pre>%1</pre>. - RemoveVolumeGroupJob @@ -2614,69 +2685,69 @@ Ulostulo: Lomake - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. Valitse minne %1 asennetaan.<br/><font color="red">Varoitus: </font>tämä poistaa kaikki tiedostot valitulta osiolta. - + The selected item does not appear to be a valid partition. Valitsemaasi kohta ei näytä olevan kelvollinen osio. - + %1 cannot be installed on empty space. Please select an existing partition. %1 ei voi asentaa tyhjään tilaan. Valitse olemassa oleva osio. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 ei voida asentaa jatketun osion. Valitse olemassa oleva ensisijainen tai looginen osio. - + %1 cannot be installed on this partition. %1 ei voida asentaa tähän osioon. - + Data partition (%1) Data osio (%1) - + Unknown system partition (%1) Tuntematon järjestelmä osio (%1) - + %1 system partition (%2) %1 järjestelmäosio (%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/>Osio %1 on liian pieni %2. Valitse osio, jonka kapasiteetti on vähintään %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-järjestelmäosiota ei löydy mistään tässä järjestelmässä. Palaa takaisin ja käytä manuaalista osiointia määrittämällä %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 asennetaan %2.<br/><font color="red">Varoitus: </font>kaikki osion %2 tiedot katoavat. - + The EFI system partition at %1 will be used for starting %2. EFI-järjestelmän osiota %1 käytetään käynnistettäessä %2. - + EFI system partition: EFI järjestelmäosio @@ -2860,29 +2931,29 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. SetHostNameJob - + Set hostname %1 Aseta isäntänimi %1 - + Set hostname <strong>%1</strong>. Aseta koneellenimi <strong>%1</strong>. - + Setting hostname %1. Asetetaan koneellenimi %1. - - + + Internal Error Sisäinen Virhe - - + + Cannot write hostname to target system Ei voida kirjoittaa isäntänimeä kohdejärjestelmään. @@ -2920,82 +2991,82 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. SetPartFlagsJob - + Set flags on partition %1. Aseta liput osioon %1. - + Set flags on %1MiB %2 partition. Aseta liput %1MiB %2 osioon. - + Set flags on new partition. Aseta liput uuteen osioon. - + Clear flags on partition <strong>%1</strong>. Poista liput osiosta <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. Poista liput %1MiB <strong>%2</strong> osiosta. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. Lippu %1MiB <strong>%2</strong> osiosta <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. Tyhjennä liput %1MiB <strong>%2</strong> osiossa. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. Asetetaan liput <strong>%3</strong> %1MiB <strong>%2</strong> osioon. - + Clear flags on new partition. Tyhjennä liput uuteen osioon. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Merkitse osio <strong>%1</strong> - <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. Merkitse uusi osio <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. Lipun poisto osiosta <strong>%1</strong>. - + Clearing flags on new partition. Uusien osioiden lippujen poistaminen. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Lippujen <strong>%2</strong> asettaminen osioon <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. Asetetaan liput <strong>%1</strong> uuteen osioon. - + The installer failed to set flags on partition %1. Asennusohjelma ei voinut asettaa lippuja osioon %1. @@ -3003,42 +3074,42 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. SetPasswordJob - + Set password for user %1 Aseta salasana käyttäjälle %1 - + Setting password for user %1. Salasanan asettaminen käyttäjälle %1. - + Bad destination system path. Huono kohteen järjestelmäpolku - + rootMountPoint is %1 rootMountPoint on %1 - + Cannot disable root account. Root-tiliä ei voi poistaa. - + passwd terminated with error code %1. passwd päättyi virhekoodiin %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. @@ -3235,37 +3306,37 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.<small>Jos useampi kuin yksi henkilö käyttää tätä tietokonetta, voit luoda useita tilejä asennuksen jälkeen.</small> - + Your username is too long. Käyttäjänimesi on liian pitkä. - + Your username must start with a lowercase letter or underscore. Käyttäjätunnuksesi täytyy alkaa pienillä kirjaimilla tai alaviivoilla. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Vain pienet kirjaimet, numerot, alaviivat ja tavuviivat ovat sallittuja. - + Only letters, numbers, underscore and hyphen are allowed. Vain kirjaimet, numerot, alaviivat ja tavuviivat ovat sallittuja. - + Your hostname is too short. Isäntänimesi on liian lyhyt. - + Your hostname is too long. Isäntänimesi on liian pitkä. - + Your passwords do not match! Salasanasi eivät täsmää! @@ -3273,7 +3344,7 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. UsersViewStep - + Users Käyttäjät @@ -3443,6 +3514,14 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.%1 tuki + + WelcomeQmlViewStep + + + Welcome + Tervetuloa + + WelcomeViewStep @@ -3451,4 +3530,47 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.Tervetuloa + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + <h3>%1</h3> + <p>Nämä ovat esimerkkejä julkaisutiedoista.</p> + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + <h3>%1 <quote>%2</quote></h3> + + + + About + Tietoa + + + + Support + Tuki + + + + Known issues + Tunnetut ongelmat + + + + Release notes + Julkaisutiedot + + + + Donate + Lahjoita + + diff --git a/lang/calamares_fr.ts b/lang/calamares_fr.ts index 1c5b5a043..593d68f5a 100644 --- a/lang/calamares_fr.ts +++ b/lang/calamares_fr.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up Configurer - + Install Installer @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Fait @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + Chargement... + + + + QML Step <i>%1</i>. + + + + + Loading failed. + Échec de chargement + + Calamares::RequirementsChecker @@ -234,176 +252,176 @@ Calamares::ViewManager - - + + &Back &Précédent - - + + &Next &Suivant - - + + &Cancel &Annuler - + Cancel setup without changing the system. Annuler la configuration sans toucher au système. - + Cancel installation without changing the system. Annuler l'installation sans modifier votre système. - + Setup Failed Échec de la configuration - + Would you like to paste the install log to the web? Voulez-vous copier le journal d'installation sur le Web ? - + Install Log Paste URL URL de copie du journal d'installation - + The upload was unsuccessful. No web-paste was done. L'envoi a échoué. La copie sur le web n'a pas été effectuée. - + Calamares Initialization Failed L'initialisation de Calamares a échoué - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 n'a pas pu être installé. Calamares n'a pas pu charger tous les modules configurés. C'est un problème avec la façon dont Calamares est utilisé par la distribution. - + <br/>The following modules could not be loaded: Les modules suivants n'ont pas pu être chargés : - + Continue with installation? Continuer avec l'installation ? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> Le programme de configuration de %1 est sur le point de procéder aux changements sur le disque afin de configurer %2.<br/> <strong>Vous ne pourrez pas annulez ces changements.</strong> - + &Set up now &Configurer maintenant - + &Set up &Configurer - + &Install &Installer - + Setup is complete. Close the setup program. La configuration est terminée. Fermer le programme de configuration. - + Cancel setup? Annuler la configuration ? - + Cancel installation? Abandonner l'installation ? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Voulez-vous réellement abandonner le processus de configuration ? Le programme de configuration se fermera et les changements seront perdus. - + 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 - + &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é @@ -411,22 +429,22 @@ L'installateur se fermera et les changements seront perdus. CalamaresPython::Helper - + Unknown exception type Type d'exception inconnue - + unparseable Python error Erreur Python non analysable - + unparseable Python traceback Traçage Python non exploitable - + Unfetchable Python error. Erreur Python non rapportable. @@ -733,22 +751,22 @@ L'installateur se fermera et les changements seront perdus. 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. @@ -756,22 +774,22 @@ L'installateur se fermera et les changements seront perdus. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. Créer une nouvelle partition de %2Mio sur %4 (%3) avec le système de fichier %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Créer une nouvelle partition de <strong>%2Mio</strong> sur <strong>%4</strong> (%3) avec le système de fichiers <strong>%1</strong>. - + Creating new %1 partition on %2. Création d'une nouvelle partition %1 sur %2. - + The installer failed to create partition on disk '%1'. Le programme d'installation n'a pas pu créer la partition sur le disque '%1'. @@ -1065,7 +1083,7 @@ L'installateur se fermera et les changements seront perdus. Drapeaux: - + Mountpoint already in use. Please select another one. Le point de montage est déjà utilisé. Merci d'en sélectionner un autre. @@ -1101,37 +1119,37 @@ L'installateur se fermera et les changements seront perdus. FillGlobalStorageJob - + Set partition information Configurer les informations de la partition - + Install %1 on <strong>new</strong> %2 system partition. 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. @@ -1215,22 +1233,22 @@ L'installateur se fermera et les changements seront perdus. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. Formater la partition %1 (système de fichiers : %2, taille : %3 Mio) sur %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. Formater la partition <strong>%1</strong> de <strong>%3Mio</strong>avec le système de fichier <strong>%2</strong>. - + Formatting partition %1 with file system %2. Formatage de la partition %1 avec le système de fichiers %2. - + The installer failed to format partition %1 on disk '%2'. Le programme d'installation n'a pas pu formater la partition %1 sur le disque '%2'. @@ -1613,8 +1631,8 @@ L'installateur se fermera et les changements seront perdus. - Could configure LUKS key file on partition %1. - Succès de la création du fichier de clé LUKS pour la partition racine %1. + Could not configure LUKS key file on partition %1. + La clé LUKS n'a pas pu être configurée sur la partition %1. @@ -1638,27 +1656,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) Installation par le réseau. (Désactivée : données de groupes reçues invalides) - + Network Installation. (Disabled: Incorrect configuration) Installation réseau. (Désactivée : configuration incorrecte) @@ -1666,10 +1684,69 @@ L'installateur se fermera et les changements seront perdus. NetInstallViewStep - + + Package selection Sélection des paquets + + + Office software + Logiciel de bureau + + + + Office package + + + + + Browser software + Logiciel de navigation + + + + Browser package + + + + + Web browser + Navigateur web + + + + Kernel + Noyau + + + + Services + Services + + + + Login + Connexion + + + + Desktop + Bureau + + + + Applications + Applications + + + + NotesQmlViewStep + + + Notes + Notes + OEMPage @@ -1945,7 +2022,7 @@ L'installateur se fermera et les changements seront perdus. Erreur inconnue - + Password is empty Le mot de passe est vide @@ -2367,8 +2444,8 @@ L'installateur se fermera et les changements seront perdus. - There are no partitons to install on. - Il n'y a aucune partition pour l'installation. + There are no partitions to install on. + Il n'y a pas de partition pour l'installation @@ -2433,14 +2510,14 @@ Vous pouvez obtenir un aperçu des différentes apparences en cliquant sur celle ProcessResult - + There was no output from the command. Il y a eu aucune sortie de la commande - + Output: @@ -2449,52 +2526,52 @@ Sortie - + External command crashed. La commande externe s'est mal terminée. - + Command <i>%1</i> crashed. La commande <i>%1</i> s'est arrêtée inopinément. - + External command failed to start. La commande externe n'a pas pu être lancée. - + Command <i>%1</i> failed to start. La commande <i>%1</i> n'a pas pu être lancée. - + Internal error when starting command. Erreur interne au lancement de la commande - + Bad parameters for process job call. Mauvais paramètres pour l'appel au processus de job. - + External command failed to finish. La commande externe ne s'est pas terminée. - + Command <i>%1</i> failed to finish in %2 seconds. La commande <i>%1</i> ne s'est pas terminée en %2 secondes. - + External command finished with errors. La commande externe s'est terminée avec des erreurs. - + Command <i>%1</i> finished with exit code %2. La commande <i>%1</i> s'est terminée avec le code de sortie %2. @@ -2548,7 +2625,7 @@ Sortie La vérification des prérequis pour le module <i>%1</i> est terminée. - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2564,29 +2641,23 @@ Sortie Aucune description fournie. - - - - - + + + + File not found Fichier non trouvé - + Path <pre>%1</pre> must be an absolute path. Le chemin <pre>%1</pre> doit être un chemin absolu. - + Could not create new random file <pre>%1</pre>. Impossible de créer le nouveau fichier aléatoire <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - Impossible de lire le fichier aléatoire <pre>%1</pre>. - RemoveVolumeGroupJob @@ -2615,69 +2686,69 @@ Sortie Formulaire - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. 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: @@ -2860,29 +2931,29 @@ Sortie SetHostNameJob - + Set hostname %1 Définir le nom d'hôte %1 - + Set hostname <strong>%1</strong>. Configurer le nom d'hôte <strong>%1</strong>. - + Setting hostname %1. Configuration du nom d'hôte %1. - - + + Internal Error Erreur interne - - + + Cannot write hostname to target system Impossible d'écrire le nom d'hôte sur le système cible. @@ -2920,82 +2991,82 @@ Sortie SetPartFlagsJob - + Set flags on partition %1. Configurer les drapeaux sur la partition %1. - + Set flags on %1MiB %2 partition. Configurer les drapeaux sur la partition %2 de %1 Mio. - + Set flags on new partition. Configurer les drapeaux sur la nouvelle partition. - + Clear flags on partition <strong>%1</strong>. Réinitialisez les drapeaux sur la partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. Réinitialisez les drapeaux sur la partition <strong>%2</strong> de %1Mio. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. Marquer la partition <strong>%2</strong> de %1 Mio comme <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. Réinitialisez les drapeaux sur la partition <strong>%2</strong> de %1 Mio. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. Configuration des drapeaux <strong>%3</strong> pour la partition <strong>%2</strong> de %1 Mio. - + Clear flags on new partition. Réinitialisez les drapeaux sur la nouvelle partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Marquer la partition <strong>%1</strong> comme <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. Marquer la nouvelle partition comme <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. Réinitialisation des drapeaux pour la partition <strong>%1</strong>. - + Clearing flags on new partition. Réinitialisez les drapeaux sur la nouvelle partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Configuration des drapeaux <strong>%2</strong> pour la partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. Configuration des drapeaux <strong>%1</strong> pour la nouvelle partition. - + The installer failed to set flags on partition %1. L'installateur n'a pas pu activer les drapeaux sur la partition %1. @@ -3003,42 +3074,42 @@ Sortie 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. @@ -3235,37 +3306,37 @@ Sortie <small>si plusieurs personnes utilisent cet ordinateur, vous pourrez créer plusieurs comptes après l'installation.</small> - + Your username is too long. Votre nom d'utilisateur est trop long. - + Your username must start with a lowercase letter or underscore. Votre nom d'utilisateur doit commencer avec une lettre minuscule ou un underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Seuls les minuscules, nombres, underscores et tirets sont autorisés. - + Only letters, numbers, underscore and hyphen are allowed. Seuls les lettres, nombres, underscores et tirets sont autorisés. - + Your hostname is too short. Le nom d'hôte est trop petit. - + Your hostname is too long. Le nom d'hôte est trop long. - + Your passwords do not match! Vos mots de passe ne correspondent pas ! @@ -3273,7 +3344,7 @@ Sortie UsersViewStep - + Users Utilisateurs @@ -3443,6 +3514,14 @@ Sortie Support de %1 + + WelcomeQmlViewStep + + + Welcome + Bienvenue + + WelcomeViewStep @@ -3451,4 +3530,46 @@ Sortie Bienvenue + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + À propos + + + + Support + + + + + Known issues + Problèmes connus + + + + Release notes + + + + + Donate + Faites un don + + diff --git a/lang/calamares_fr_CH.ts b/lang/calamares_fr_CH.ts index 70b1b10bc..12da3a302 100644 --- a/lang/calamares_fr_CH.ts +++ b/lang/calamares_fr_CH.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install @@ -143,7 +143,7 @@ Calamares::JobThread - + Done @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,174 +252,174 @@ Calamares::ViewManager - - + + &Back - - + + &Next - - + + &Cancel - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? - + Do you really want to cancel the current setup process? The setup program 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? - + 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 - + &Done - + The installation is complete. Close the installer. - + Error - + Installation Failed @@ -409,22 +427,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type - + unparseable Python error - + unparseable Python traceback - + Unfetchable Python error. @@ -730,22 +748,22 @@ The installer will quit and all changes will be lost. - + Logical - + Primary - + GPT - + Mountpoint already in use. Please select another one. @@ -753,22 +771,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1062,7 +1080,7 @@ The installer will quit and all changes will be lost. - + Mountpoint already in use. Please select another one. @@ -1098,37 +1116,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information - + Install %1 on <strong>new</strong> %2 system partition. - + 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. @@ -1212,22 +1230,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1610,7 +1628,7 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1635,27 +1653,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) @@ -1663,10 +1681,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1942,7 +2019,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2364,7 +2441,7 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. + There are no partitions to install on. @@ -2429,65 +2506,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -2541,7 +2618,7 @@ Output: - + %1 (%2) language[name] (country[name]) @@ -2557,29 +2634,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2608,69 +2679,69 @@ Output: - + 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. - + %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: @@ -2853,29 +2924,29 @@ Output: SetHostNameJob - + Set hostname %1 - + Set hostname <strong>%1</strong>. - + Setting hostname %1. - - + + Internal Error - - + + Cannot write hostname to target system @@ -2913,82 +2984,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. - + Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. @@ -2996,42 +3067,42 @@ Output: 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. @@ -3228,37 +3299,37 @@ Output: - + Your username is too long. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + Your passwords do not match! @@ -3266,7 +3337,7 @@ Output: UsersViewStep - + Users @@ -3436,6 +3507,14 @@ Output: + + WelcomeQmlViewStep + + + Welcome + + + WelcomeViewStep @@ -3444,4 +3523,46 @@ Output: + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_gl.ts b/lang/calamares_gl.ts index 605d9c88c..90dd1b5af 100644 --- a/lang/calamares_gl.ts +++ b/lang/calamares_gl.ts @@ -118,12 +118,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Instalar @@ -144,7 +144,7 @@ Calamares::JobThread - + Done Feito @@ -178,36 +178,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -235,175 +253,175 @@ Calamares::ViewManager - - + + &Back &Atrás - - + + &Next &Seguinte - - + + &Cancel &Cancelar - + Cancel setup without changing the system. - + Cancel installation without changing the system. Cancelar a instalación sen cambiar o sistema - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed Fallou a inicialización do Calamares - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. Non é posíbel instalar %1. O calamares non foi quen de cargar todos os módulos configurados. Este é un problema relacionado con como esta distribución utiliza o Calamares. - + <br/>The following modules could not be loaded: <br/> Non foi posíbel cargar os módulos seguintes: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install &Instalar - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? Cancelar a instalación? - + Do you really want to cancel the current setup process? The setup program 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. 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 - + &Done &Feito - + The installation is complete. Close the installer. Completouse a instalacion. Peche o instalador - + Error Erro - + Installation Failed Erro na instalación @@ -411,22 +429,22 @@ O instalador pecharase e perderanse todos os cambios. CalamaresPython::Helper - + Unknown exception type Excepción descoñecida - + unparseable Python error Erro de Python descoñecido - + unparseable Python traceback O rastreo de Python non é analizable. - + Unfetchable Python error. Erro de Python non recuperable @@ -732,22 +750,22 @@ O instalador pecharase e perderanse todos os cambios. 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 @@ -755,22 +773,22 @@ O instalador pecharase e perderanse todos os cambios. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. Creando unha nova partición %1 en %2. - + The installer failed to create partition on disk '%1'. O instalador fallou ó crear a partición no disco '%1'. @@ -1064,7 +1082,7 @@ O instalador pecharase e perderanse todos os cambios. Bandeiras: - + Mountpoint already in use. Please select another one. Punto de montaxe xa en uso. Faga o favor de escoller outro. @@ -1100,37 +1118,37 @@ O instalador pecharase e perderanse todos os cambios. FillGlobalStorageJob - + 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. @@ -1214,22 +1232,22 @@ O instalador pecharase e perderanse todos os cambios. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <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'. @@ -1612,7 +1630,7 @@ O instalador pecharase e perderanse todos os cambios. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1637,27 +1655,27 @@ O instalador pecharase e perderanse todos os cambios. NetInstallPage - + Name Nome - + Description Descripción - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Installación por rede. (Desactivadas. Non se pudo recupera-la lista de pacotes, comprobe a sua conexión a rede) - + Network Installation. (Disabled: Received invalid groups data) Instalación de rede. (Desactivado: Recibírense datos de grupos incorrectos) - + Network Installation. (Disabled: Incorrect configuration) @@ -1665,10 +1683,69 @@ O instalador pecharase e perderanse todos os cambios. NetInstallViewStep - + + Package selection Selección de pacotes. + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1944,7 +2021,7 @@ O instalador pecharase e perderanse todos os cambios. Erro descoñecido - + Password is empty @@ -2366,7 +2443,7 @@ O instalador pecharase e perderanse todos os cambios. - There are no partitons to install on. + There are no partitions to install on. @@ -2431,14 +2508,14 @@ O instalador pecharase e perderanse todos os cambios. ProcessResult - + There was no output from the command. A saída non produciu ningunha saída. - + Output: @@ -2447,52 +2524,52 @@ Saída: - + External command crashed. A orde externa fallou - + Command <i>%1</i> crashed. A orde <i>%1</i> fallou. - + External command failed to start. Non foi posíbel iniciar a orde externa. - + Command <i>%1</i> failed to start. Non foi posíbel iniciar a orde <i>%1</i>. - + Internal error when starting command. Produciuse un erro interno ao iniciar a orde. - + Bad parameters for process job call. Erro nos parámetros ao chamar o traballo - + External command failed to finish. A orde externa non se puido rematar. - + Command <i>%1</i> failed to finish in %2 seconds. A orde <i>%1</i> non se puido rematar en %2s segundos. - + External command finished with errors. A orde externa rematou con erros. - + Command <i>%1</i> finished with exit code %2. A orde <i>%1</i> rematou co código de erro %2. @@ -2546,7 +2623,7 @@ Saída: - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2562,29 +2639,23 @@ Saída: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2613,69 +2684,69 @@ Saída: Formulario - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. Seleccione onde instalar %1.<br/><font color="red">Advertencia: </font>isto elimina todos os ficheiros da partición seleccionada. - + The selected item does not appear to be a valid partition. O elemento seleccionado non parece ser unha partición válida. - + %1 cannot be installed on empty space. Please select an existing partition. Non é posíbel instalar %1 nun espazo baleiro. Seleccione unha partición existente. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. Non é posíbel instalar %1 nunha partición estendida. Seleccione unha partición primaria ou lóxica existente. - + %1 cannot be installed on this partition. Non é posíbel instalar %1 nesta partición - + Data partition (%1) Partición de datos (%1) - + Unknown system partition (%1) Partición de sistema descoñecida (%1) - + %1 system partition (%2) %1 partición do 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 partición %1 é demasiado pequena para %2. Seleccione unha partición cunha 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/>Non foi posíbel atopar ningunha partición de sistema EFI neste sistema. Recúe e empregue 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 vai ser instalado en %2. <br/><font color="red">Advertencia: </font>vanse perder todos os datos da partición %2. - + 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: @@ -2858,29 +2929,29 @@ Saída: SetHostNameJob - + Set hostname %1 Hostname: %1 - + Set hostname <strong>%1</strong>. Configurar hostname <strong>%1</strong>. - + Setting hostname %1. Configurando hostname %1. - - + + Internal Error Erro interno - - + + Cannot write hostname to target system Non foi posíbel escreber o nome do servidor do sistema obxectivo @@ -2918,82 +2989,82 @@ Saída: SetPartFlagsJob - + Set flags on partition %1. Configurar as bandeiras na partición %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. Configurar as bandeiras na nova partición. - + Clear flags on partition <strong>%1</strong>. Limpar as bandeiras da partición <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. Limpar as bandeiras da nova partición. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Marcar a partición <strong>%1</strong> coa bandeira <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. Marcar a nova partición coa bandeira <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. A limpar as bandeiras da partición <strong>%1</strong>. - + Clearing flags on new partition. A limpar as bandeiras da nova partición. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. A configurar as bandeiras <strong>%2</strong> na partición <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. A configurar as bandeiras <strong>%1</strong> na nova partición. - + The installer failed to set flags on partition %1. O instalador non foi quen de configurar as bandeiras na partición %1. @@ -3001,42 +3072,42 @@ Saída: SetPasswordJob - + Set password for user %1 Configurar contrasinal do usuario %1 - + Setting password for user %1. A configurar o contrasinal do usuario %1. - + Bad destination system path. Ruta incorrecta ao sistema de destino. - + rootMountPoint is %1 rootMountPoint é %1 - + Cannot disable root account. Non é posíbel desactivar a conta do superusuario. - + passwd terminated with error code %1. passwd terminou co código de erro %1. - + Cannot set password for user %1. Non é posíbel configurar o contrasinal do usuario %1. - + usermod terminated with error code %1. usermod terminou co código de erro %1. @@ -3233,37 +3304,37 @@ Saída: - + Your username is too long. O nome de usuario é demasiado longo. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. O nome do computador é demasiado curto. - + Your hostname is too long. O nome do computador é demasiado longo. - + Your passwords do not match! Os contrasinais non coinciden! @@ -3271,7 +3342,7 @@ Saída: UsersViewStep - + Users Usuarios @@ -3441,6 +3512,14 @@ Saída: %1 axuda + + WelcomeQmlViewStep + + + Welcome + Benvido + + WelcomeViewStep @@ -3449,4 +3528,46 @@ Saída: Benvido + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_gu.ts b/lang/calamares_gu.ts index 3ba328da6..1428b64da 100644 --- a/lang/calamares_gu.ts +++ b/lang/calamares_gu.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install @@ -143,7 +143,7 @@ Calamares::JobThread - + Done @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,174 +252,174 @@ Calamares::ViewManager - - + + &Back - - + + &Next - - + + &Cancel - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? - + Do you really want to cancel the current setup process? The setup program 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? - + 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 - + &Done - + The installation is complete. Close the installer. - + Error - + Installation Failed @@ -409,22 +427,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type - + unparseable Python error - + unparseable Python traceback - + Unfetchable Python error. @@ -730,22 +748,22 @@ The installer will quit and all changes will be lost. - + Logical - + Primary - + GPT - + Mountpoint already in use. Please select another one. @@ -753,22 +771,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1062,7 +1080,7 @@ The installer will quit and all changes will be lost. - + Mountpoint already in use. Please select another one. @@ -1098,37 +1116,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information - + Install %1 on <strong>new</strong> %2 system partition. - + 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. @@ -1212,22 +1230,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1610,7 +1628,7 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1635,27 +1653,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) @@ -1663,10 +1681,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1942,7 +2019,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2364,7 +2441,7 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. + There are no partitions to install on. @@ -2429,65 +2506,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -2541,7 +2618,7 @@ Output: - + %1 (%2) language[name] (country[name]) @@ -2557,29 +2634,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2608,69 +2679,69 @@ Output: - + 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. - + %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: @@ -2853,29 +2924,29 @@ Output: SetHostNameJob - + Set hostname %1 - + Set hostname <strong>%1</strong>. - + Setting hostname %1. - - + + Internal Error - - + + Cannot write hostname to target system @@ -2913,82 +2984,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. - + Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. @@ -2996,42 +3067,42 @@ Output: 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. @@ -3228,37 +3299,37 @@ Output: - + Your username is too long. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + Your passwords do not match! @@ -3266,7 +3337,7 @@ Output: UsersViewStep - + Users @@ -3436,6 +3507,14 @@ Output: + + WelcomeQmlViewStep + + + Welcome + + + WelcomeViewStep @@ -3444,4 +3523,46 @@ Output: + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts index 339479245..ff549ff46 100644 --- a/lang/calamares_he.ts +++ b/lang/calamares_he.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up הקמה - + Install התקנה @@ -143,7 +143,7 @@ Calamares::JobThread - + Done הסתיים @@ -177,36 +177,54 @@ 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::QmlViewStep + + + Loading ... + בטעינה… + + + + QML Step <i>%1</i>. + צעד QML‏ <i>%1</i>. + + + + Loading failed. + הטעינה נכשלה… + + Calamares::RequirementsChecker @@ -238,176 +256,176 @@ Calamares::ViewManager - - + + &Back ה&קודם - - + + &Next הב&א - - + + &Cancel &ביטול - + Cancel setup without changing the system. ביטול ההתקנה ללא שינוי המערכת. - + Cancel installation without changing the system. ביטול התקנה ללא ביצוע שינוי במערכת. - + Setup Failed ההתקנה נכשלה - + Would you like to paste the install log to the web? להדביק את יומן ההתקנה לאינטרנט? - + Install Log Paste URL כתובת הדבקת יומן התקנה - + The upload was unsuccessful. No web-paste was done. ההעלאה לא הצליחה. לא בוצעה הדבקה לאינטרנט. - + Calamares Initialization Failed הפעלת Calamares נכשלה - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. אין אפשרות להתקין את %1. ל־Calamares אין אפשרות לטעון את המודולים המוגדרים. מדובר בתקלה באופן בו ההפצה משתמשת ב־Calamares. - + <br/>The following modules could not be loaded: <br/>לא ניתן לטעון את המודולים הבאים: - + Continue with installation? להמשיך בהתקנה? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> תכנית ההתקנה של %1 עומדת לבצע שינויים בכונן הקשיח שלך לטובת התקנת %2.<br/><strong>לא תהיה לך אפשרות לבטל את השינויים האלה.</strong> - + &Set up now להת&קין כעת - + &Set up להת&קין - + &Install הת&קנה - + Setup is complete. Close the setup program. ההתקנה הושלמה. נא לסגור את תכנית ההתקנה. - + Cancel setup? לבטל את ההתקנה? - + Cancel installation? לבטל את ההתקנה? - + Do you really want to cancel the current setup process? The setup program 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? להמשיך בהתקנה? - + 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 ההתקנה נכשלה @@ -415,22 +433,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type טיפוס חריגה אינו מוכר - + unparseable Python error שגיאת Python לא ניתנת לניתוח - + unparseable Python traceback עקבה לאחור של Python לא ניתנת לניתוח - + Unfetchable Python error. שגיאת Python לא ניתנת לאחזור. @@ -737,22 +755,22 @@ The installer will quit and all changes will be lost. ה&צפנה - + Logical לוגי - + Primary ראשי - + GPT GPT - + Mountpoint already in use. Please select another one. נקודת העיגון בשימוש. נא לבחור בנקודת עיגון אחרת. @@ -760,22 +778,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. יצירת מחיצה חדשה בגודל %2MiB על גבי %4 (%3) עם מערכת הקבצים %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. יצירת מחיצה חדשה בגודל <strong>%2MiB</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’. @@ -1069,7 +1087,7 @@ The installer will quit and all changes will be lost. סימונים: - + Mountpoint already in use. Please select another one. נקודת העיגון בשימוש. נא לבחור בנקודת עיגון אחרת. @@ -1105,37 +1123,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information הגדרת מידע עבור המחיצה - + Install %1 on <strong>new</strong> %2 system partition. התקנת %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 על מחיצת מערכת <strong>%1</strong> מסוג %3. - + 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. נקודות עיגון מוגדרות. @@ -1219,22 +1237,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. לאתחל את המחיצה %1 (מערכת קבצים: %2, גודל: %3 MiB) על גבי %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. אתחול מחיצה בגודל <strong>%3MiB</strong> בנתיב <strong>%1</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’. @@ -1617,7 +1635,7 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. לא ניתן להגדיר קובץ מפתח LUKS למחיצה %1. @@ -1642,27 +1660,27 @@ 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) התקנה מהרשת. (מושבתת: לא ניתן לקבל רשימות של חבילות תכנה, נא לבדוק את החיבור לרשת) - + Network Installation. (Disabled: Received invalid groups data) התקנה מהרשת. (מושבתת: המידע שהתקבל על קבוצות שגוי) - + Network Installation. (Disabled: Incorrect configuration) התקנת רשת. (מושבתת: תצורה שגויה) @@ -1670,10 +1688,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection בחירת חבילות + + + Office software + תכנה של כלים משרדיים + + + + Office package + חבילת כלים משרדיים + + + + Browser software + תכנה של דפדפן + + + + Browser package + חבילת דפדפן + + + + Web browser + דפדפן + + + + Kernel + ליבה + + + + Services + שירותים + + + + Login + כניסה + + + + Desktop + שולחן עבודה + + + + Applications + יישומים + + + + NotesQmlViewStep + + + Notes + הערות + OEMPage @@ -1949,7 +2026,7 @@ The installer will quit and all changes will be lost. שגיאה לא ידועה - + Password is empty הססמה ריקה @@ -2371,7 +2448,7 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. + There are no partitions to install on. אין מחיצות להתקין עליהן. @@ -2436,14 +2513,14 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. לא היה פלט מהפקודה. - + Output: @@ -2452,52 +2529,52 @@ Output: - + External command crashed. הפקודה החיצונית נכשלה. - + Command <i>%1</i> crashed. הפקודה <i>%1</i> קרסה. - + External command failed to start. הפעלת הפעולה החיצונית נכשלה. - + Command <i>%1</i> failed to start. הפעלת הפקודה <i>%1</i> נכשלה. - + Internal error when starting command. שגיאה פנימית בעת הפעלת פקודה. - + Bad parameters for process job call. פרמטרים לא תקינים עבור קריאת עיבוד פעולה. - + External command failed to finish. סיום הפקודה החיצונית נכשל. - + Command <i>%1</i> failed to finish in %2 seconds. הפקודה <i>%1</i> לא הסתיימה תוך %2 שניות. - + External command finished with errors. הפקודה החיצונית הסתיימה עם שגיאות. - + Command <i>%1</i> finished with exit code %2. הפקודה <i>%1</i> הסתיימה עם קוד היציאה %2. @@ -2551,7 +2628,7 @@ Output: בדיקת הדרישות למודול <i>%1</i> הושלמה. - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2567,29 +2644,23 @@ Output: לא סופק תיאור. - - - - - + + + + File not found הקובץ לא נמצא - + Path <pre>%1</pre> must be an absolute path. הנתיב <pre>%1</pre> חייב להיות נתיב מלא. - + Could not create new random file <pre>%1</pre>. לא ניתן ליצור קובץ אקראי חדש <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - לא ניתן לקרוא קובץ אקראי <pre>%1</pre>. - RemoveVolumeGroupJob @@ -2618,69 +2689,69 @@ Output: 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: @@ -2863,29 +2934,29 @@ Output: 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 כתיבת שם העמדה למערכת היעד נכשלה @@ -2923,82 +2994,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. הגדר סימונים על מחיצה %1. - + Set flags on %1MiB %2 partition. הגדרת דגלונים על מחיצה מסוג %2 בגודל %1MiB. - + Set flags on new partition. הגדרת סימונים על מחיצה חדשה. - + Clear flags on partition <strong>%1</strong>. מחיקת סימונים מהמחיצה <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. לבטל דגלונים על מחיצת <strong>%2</strong> בגודל %1MiB. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. סימון מחיצת <strong>%2</strong> בגודל %1MiB בתור <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. לבטל דגלונים על מחיצת <strong>%2</strong> בגודל %1MiB. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. הדגלונים <strong>%3</strong> על מחיצת <strong>%2</strong> בגודל %1MiB. - + Clear flags on new partition. מחק סימונים על המחיצה החדשה. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. סמן מחיצה <strong>%1</strong> כ <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. סמן מחיצה חדשה כ <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. מוחק סימונים על מחיצה <strong>%1</strong>. - + Clearing flags on new partition. מוחק סימונים על מחיצה חדשה. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. מגדיר סימונים <strong>%2</strong> על מחיצה <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. מגדיר סימונים <strong>%1</strong> על מחיצה חדשה. - + The installer failed to set flags on partition %1. תהליך ההתקנה נכשל בעת הצבת סימונים במחיצה %1. @@ -3006,42 +3077,42 @@ Output: 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. @@ -3238,37 +3309,37 @@ Output: <small>אם מחשב זה מיועד לשימוש לטובת למעלה ממשתמש אחד, ניתן ליצור מגוון חשבונות לאחר ההתקנה.</small> - + Your username is too long. שם המשתמש ארוך מדי. - + Your username must start with a lowercase letter or underscore. שם המשתמש שלך חייב להתחיל באות קטנה או בקו תחתי. - + Only lowercase letters, numbers, underscore and hyphen are allowed. מותר להשתמש רק באותיות קטנות, ספרות, קווים תחתיים ומינוסים. - + Only letters, numbers, underscore and hyphen are allowed. מותר להשתמש רק באותיות, ספרות, קווים תחתיים ומינוסים. - + Your hostname is too short. שם המחשב קצר מדי. - + Your hostname is too long. שם המחשב ארוך מדי. - + Your passwords do not match! הססמאות לא תואמות! @@ -3276,7 +3347,7 @@ Output: UsersViewStep - + Users משתמשים @@ -3388,7 +3459,7 @@ Output: &Release notes - &הערות הפצה + ה&ערות מהדורה @@ -3446,6 +3517,14 @@ Output: תמיכה ב־%1 + + WelcomeQmlViewStep + + + Welcome + ברוך בואך + + WelcomeViewStep @@ -3454,4 +3533,47 @@ Output: ברוך בואך + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + <h3>%1</h3> + <p>אלו הערות מהדורה לדוגמה.</p> + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + <h3>%1 <quote>%2</quote></h3> + + + + About + על אודות + + + + Support + תמיכה + + + + Known issues + בעיות נפוצות + + + + Release notes + הערות מהדורה + + + + Donate + תרומה + + diff --git a/lang/calamares_hi.ts b/lang/calamares_hi.ts index 41c644a42..a81ce60b3 100644 --- a/lang/calamares_hi.ts +++ b/lang/calamares_hi.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up सेटअप - + Install इंस्टॉल करें @@ -143,7 +143,7 @@ Calamares::JobThread - + Done पूर्ण हुआ @@ -177,36 +177,54 @@ Calamares::PythonJob - + Running %1 operation. %1 चल रहा है। - + Bad working directory path कार्यरत फोल्डर का पथ गलत है - + Working directory %1 for python job %2 is not readable. पाइथन कार्य %2 के लिए कार्यरत डायरेक्टरी %1 रीड करने योग्य नहीं है। - + Bad main script file ख़राब मुख्य स्क्रिप्ट फ़ाइल - + Main script file %1 for python job %2 is not readable. पाइथन कार्य %2 हेतु मुख्य स्क्रिप्ट फ़ाइल %1 रीड करने योग्य नहीं है। - + Boost.Python error in job "%1". कार्य "%1" में Boost.Python त्रुटि। + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,176 +252,176 @@ Calamares::ViewManager - - + + &Back वापस (&B) - - + + &Next आगे (&N) - - + + &Cancel रद्द करें (&C) - + Cancel setup without changing the system. सिस्टम में बदलाव किये बिना सेटअप रद्द करें। - + Cancel installation without changing the system. सिस्टम में बदलाव किये बिना इंस्टॉल रद्द करें। - + Setup Failed सेटअप विफल रहा - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. अपलोड असफल रहा। कोई वेब-पेस्ट नही किया गया। - + Calamares Initialization Failed Calamares का आरंभीकरण विफल रहा - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 को इनस्टॉल नहीं किया जा सका। Calamares सभी विन्यस्त मापांकों को लोड करने में विफल रहा। यह आपके लिनक्स वितरण द्वारा Calamares के उपयोग से संबंधित एक समस्या है। - + <br/>The following modules could not be loaded: <br/>निम्नलिखित मापांक लोड नहीं हो सकें : - + Continue with installation? इंस्टॉल प्रक्रिया जारी रखें? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> %2 सेटअप करने हेतु %1 सेटअप प्रोग्राम आपकी डिस्क में बदलाव करने वाला है।<br/><strong>आप इन बदलावों को पूर्ववत नहीं कर पाएंगे।</strong> - + &Set up now अभी सेटअप करें (&S) - + &Set up सेटअप करें (&S) - + &Install इंस्टॉल करें (&I) - + Setup is complete. Close the setup program. सेटअप पूर्ण हुआ। सेटअप प्रोग्राम बंद कर दें। - + Cancel setup? सेटअप रद्द करें? - + Cancel installation? इंस्टॉल रद्द करें? - + Do you really want to cancel the current setup process? The setup program 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 हाँ (&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> %2 इंस्टॉल करने हेतु %1 इंस्टॉलर आपकी डिस्क में बदलाव करने वाला है।<br/><strong>आप इन बदलावों को पूर्ववत नहीं कर पाएंगे।</strong> - + &Install now अभी इंस्टॉल करें (&I) - + Go &back वापस जाएँ (&b) - + &Done हो गया (&D) - + The installation is complete. Close the installer. इंस्टॉल पूर्ण हुआ।अब इंस्टॉलर को बंद करें। - + Error त्रुटि - + Installation Failed इंस्टॉल विफल रहा @@ -411,22 +429,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type अपवाद का प्रकार अज्ञात - + unparseable Python error अप्राप्य पाइथन त्रुटि - + unparseable Python traceback अप्राप्य पाइथन ट्रेसबैक - + Unfetchable Python error. पहुँच से बाहर पाइथन त्रुटि। @@ -732,22 +750,22 @@ The installer will quit and all changes will be lost. एन्क्रिप्ट (&c) - + Logical तार्किक - + Primary मुख्य - + GPT GPT - + Mountpoint already in use. Please select another one. माउंट पॉइंट पहले से उपयोग में है । कृपया दूसरा चुनें। @@ -755,22 +773,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. फ़ाइल सिस्टम %1 के साथ %4 (%3) पर नया %2MiB का विभाजन बनाएँ। - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. फ़ाइल सिस्टम <strong>%1</strong> के साथ <strong>%4</strong> (%3) पर नया <strong>%2MiB</strong> का विभाजन बनाएँ। - + Creating new %1 partition on %2. %2 पर नया %1 विभाजन बनाया जा रहा है। - + The installer failed to create partition on disk '%1'. इंस्टॉलर डिस्क '%1' पर विभाजन बनाने में विफल रहा। @@ -1064,7 +1082,7 @@ The installer will quit and all changes will be lost. फ्लैग : - + Mountpoint already in use. Please select another one. माउंट पॉइंट पहले से उपयोग में है । कृपया दूसरा चुनें। @@ -1100,37 +1118,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information विभाजन संबंधी जानकारी सेट करें - + Install %1 on <strong>new</strong> %2 system partition. <strong>नए</strong> %2 सिस्टम विभाजन पर %1 इंस्टॉल करें। - + 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>. %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. माउंट पॉइंट सेट किए जा रहे हैं। @@ -1214,22 +1232,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. विभाजन %1 (फ़ाइल सिस्टम: %2, आकार: %3 MiB) को %4 पर फॉर्मेट करें। - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. फ़ाइल सिस्टम <strong>%2</strong> के साथ <strong>%3MiB</strong> के विभाजन <strong>%1</strong> को फॉर्मेट करें। - + Formatting partition %1 with file system %2. फ़ाइल सिस्टम %2 के साथ विभाजन %1 को फॉर्मेट किया जा रहा है। - + The installer failed to format partition %1 on disk '%2'. इंस्टॉलर डिस्क '%2' पर विभाजन %1 को फॉर्मेट करने में विफल रहा। @@ -1612,8 +1630,8 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. - विभाजन %1 पर LUKS कुंजी फ़ाइल को विन्यस्त कर सकता है। + Could not configure LUKS key file on partition %1. + @@ -1637,27 +1655,27 @@ 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) नेटवर्क इंस्टॉल। (निष्क्रिय है : पैकेज सूची प्राप्त करने में असमर्थ, अपना नेटवर्क कनेक्शन जाँचें) - + Network Installation. (Disabled: Received invalid groups data) नेटवर्क इंस्टॉल (निष्क्रिय है : प्राप्त किया गया समूह डाटा अमान्य है) - + Network Installation. (Disabled: Incorrect configuration) @@ -1665,10 +1683,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection पैकेज चयन + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1944,7 +2021,7 @@ The installer will quit and all changes will be lost. अज्ञात त्रुटि - + Password is empty पासवर्ड खाली है @@ -2366,8 +2443,8 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. - इनस्टॉल हेतु कोई विभाजन नहीं हैं। + There are no partitions to install on. + @@ -2431,14 +2508,14 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. कमांड से कोई आउटपुट नहीं मिला। - + Output: @@ -2447,52 +2524,52 @@ Output: - + External command crashed. बाह्य कमांड क्रैश हो गई। - + Command <i>%1</i> crashed. कमांड <i>%1</i> क्रैश हो गई। - + External command failed to start. बाह्य​ कमांड शुरू होने में विफल। - + Command <i>%1</i> failed to start. कमांड <i>%1</i> शुरू होने में विफल। - + Internal error when starting command. कमांड शुरू करते समय आंतरिक त्रुटि। - + Bad parameters for process job call. प्रक्रिया कार्य कॉल के लिए गलत मापदंड। - + External command failed to finish. बाहरी कमांड समाप्त करने में विफल। - + Command <i>%1</i> failed to finish in %2 seconds. कमांड <i>%1</i> %2 सेकंड में समाप्त होने में विफल। - + External command finished with errors. बाहरी कमांड त्रुटि के साथ समाप्त। - + Command <i>%1</i> finished with exit code %2. कमांड <i>%1</i> exit कोड %2 के साथ समाप्त। @@ -2546,7 +2623,7 @@ Output: मापांक <i>%1</i> हेतु आवश्यकताओं की जाँच पूर्ण हुई। - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2562,29 +2639,23 @@ Output: कोई विवरण मौजूद नहीं - - - - - + + + + File not found फाइल नहीं मिली - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2613,69 +2684,69 @@ Output: रूप - + 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/>%2 के लिए विभाजन %1 काफ़ी छोटा है। कृपया कम-से-कम %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/>%2 पर %1 इंस्टॉल किया जाएगा।<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 सिस्टम विभाजन : @@ -2858,29 +2929,29 @@ Output: 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 लक्षित सिस्टम पर होस्ट नाम लिखा नहीं जा सकता। @@ -2918,82 +2989,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. %1 विभाजन पर फ्लैग सेट करें। - + Set flags on %1MiB %2 partition. %1MiB के %2 विभाजन पर फ्लैग सेट करें। - + Set flags on new partition. नए विभाजन पर फ्लैग सेट करें। - + Clear flags on partition <strong>%1</strong>. <strong>%1</strong> विभाजन पर से फ्लैग हटाएँ। - + Clear flags on %1MiB <strong>%2</strong> partition. %1MiB के <strong>%2</strong> विभाजन पर से फ्लैग हटाएँ। - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. %1MiB के <strong>%2</strong> विभाजन पर <strong>%3</strong> का फ्लैग लगाएँ। - + Clearing flags on %1MiB <strong>%2</strong> partition. %1MiB के <strong>%2</strong> विभाजन पर से फ्लैग हटाएँ जा रहे हैं। - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. %1MiB के <strong>%2</strong> विभाजन पर फ्लैग <strong>%3</strong> सेट किए जा रहे हैं। - + Clear flags on new partition. नए विभाजन पर से फ्लैग हटाएँ। - + Flag partition <strong>%1</strong> as <strong>%2</strong>. <strong>%1</strong> विभाजन पर <strong>%2</strong> का फ्लैग लगाएँ। - + Flag new partition as <strong>%1</strong>. नए विभाजन पर<strong>%1</strong>का फ्लैग लगाएँ। - + Clearing flags on partition <strong>%1</strong>. <strong>%1</strong> विभाजन पर से फ्लैग हटाएँ जा रहे हैं। - + Clearing flags on new partition. नए विभाजन पर से फ्लैग हटाएँ जा रहे हैं। - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. <strong>%1</strong> विभाजन पर फ्लैग <strong>%2</strong> सेट किए जा रहे हैं। - + Setting flags <strong>%1</strong> on new partition. नए विभाजन पर फ्लैग <strong>%1</strong> सेट किए जा रहे हैं। - + The installer failed to set flags on partition %1. इंस्टॉलर विभाजन %1 पर फ्लैग सेट करने में विफल रहा। @@ -3001,42 +3072,42 @@ Output: 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. रुट अकाउंट निष्क्रिय नहीं किया जा सकता । - + passwd terminated with error code %1. passwd त्रुटि कोड %1 के साथ समाप्त। - + Cannot set password for user %1. उपयोक्ता %1 हेतु पासवर्ड सेट नहीं किया जा सकता। - + usermod terminated with error code %1. usermod त्रुटि कोड %1 के साथ समाप्त। @@ -3233,37 +3304,37 @@ Output: <small>यदि एक से अधिक व्यक्ति इस कंप्यूटर का उपयोग करेंगे, तो आप इंस्टॉल के उपरांत एकाधिक अकाउंट बना सकते हैं।</small> - + Your username is too long. आपका उपयोक्ता नाम काफ़ी लंबा है। - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. आपका होस्ट नाम काफ़ी छोटा है। - + Your hostname is too long. आपका होस्ट नाम काफ़ी लंबा है। - + Your passwords do not match! आपके कूटशब्द मेल नहीं खाते! @@ -3271,7 +3342,7 @@ Output: UsersViewStep - + Users उपयोक्ता @@ -3441,6 +3512,14 @@ Output: %1 सहायता + + WelcomeQmlViewStep + + + Welcome + स्वागत है + + WelcomeViewStep @@ -3449,4 +3528,46 @@ Output: स्वागत है + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_hr.ts b/lang/calamares_hr.ts index ec6f5c924..b36886885 100644 --- a/lang/calamares_hr.ts +++ b/lang/calamares_hr.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up Postaviti - + Install Instaliraj @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Gotovo @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + Učitavanje ... + + + + QML Step <i>%1</i>. + QML korak <i>%1</i>. + + + + Loading failed. + Učitavanje nije uspjelo. + + Calamares::RequirementsChecker @@ -236,176 +254,176 @@ Calamares::ViewManager - - + + &Back &Natrag - - + + &Next &Sljedeće - - + + &Cancel &Odustani - + Cancel setup without changing the system. Odustanite od instalacije bez promjena na sustavu. - + Cancel installation without changing the system. Odustanite od instalacije bez promjena na sustavu. - + Setup Failed Instalacija nije uspjela - + Would you like to paste the install log to the web? Želite li objaviti dnevnik instaliranja na web? - + Install Log Paste URL URL za objavu dnevnika instaliranja - + The upload was unsuccessful. No web-paste was done. Objava dnevnika instaliranja na web nije uspjela. - + Calamares Initialization Failed Inicijalizacija Calamares-a nije uspjela - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 se ne može se instalirati. Calamares nije mogao učitati sve konfigurirane module. Ovo je problem s načinom na koji se Calamares koristi u distribuciji. - + <br/>The following modules could not be loaded: <br/>Sljedeći moduli se nisu mogli učitati: - + Continue with installation? Nastaviti sa instalacijom? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> Instalacijski program %1 će izvršiti promjene na vašem disku kako bi postavio %2. <br/><strong>Ne možete poništiti te promjene.</strong> - + &Set up now &Postaviti odmah - + &Set up &Postaviti - + &Install &Instaliraj - + Setup is complete. Close the setup program. Instalacija je završena. Zatvorite instalacijski program. - + Cancel setup? Prekinuti instalaciju? - + Cancel installation? Prekinuti instalaciju? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Stvarno želite prekinuti instalacijski proces? Instalacijski program će izaći i sve promjene će biti izgubljene. - + 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 - + &Done &Gotovo - + The installation is complete. Close the installer. Instalacija je završena. Zatvorite instalacijski program. - + Error Greška - + Installation Failed Instalacija nije uspjela @@ -413,22 +431,22 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. CalamaresPython::Helper - + Unknown exception type Nepoznati tip iznimke - + unparseable Python error unparseable Python greška - + unparseable Python traceback unparseable Python traceback - + Unfetchable Python error. Nedohvatljiva Python greška. @@ -735,22 +753,22 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Š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. @@ -758,22 +776,22 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. Stvori novu %2MB particiju na %4 (%3) s datotečnim sustavom %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Stvori novu <strong>%2MB</strong> particiju na <strong>%4</strong> (%3) s datotečnim sustavom <strong>%1</strong>. - + Creating new %1 partition on %2. Stvaram novu %1 particiju na %2. - + The installer failed to create partition on disk '%1'. Instalacijski program nije uspio stvoriti particiju na disku '%1'. @@ -1067,7 +1085,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Oznake: - + Mountpoint already in use. Please select another one. Točka montiranja se već koristi. Odaberite drugu. @@ -1103,37 +1121,37 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. FillGlobalStorageJob - + Set partition information Postavi informacije o particiji - + Install %1 on <strong>new</strong> %2 system partition. 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. @@ -1217,22 +1235,22 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. Formatiraj particiju %1 (datotečni sustav: %2, veličina: %3 MB) na %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. Formatiraj <strong>%3MB</strong>particiju <strong>%1</strong> na datotečni sustav <strong>%2</strong>. - + Formatting partition %1 with file system %2. Formatiraj particiju %1 na datotečni sustav %2. - + The installer failed to format partition %1 on disk '%2'. Instalacijski program nije uspio formatirati particiju %1 na disku '%2'. @@ -1615,8 +1633,8 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. - Could configure LUKS key file on partition %1. - Moguće je konfigurirati LUKS ključnu datoteku na particiji %1. + Could not configure LUKS key file on partition %1. + Nije moguće konfigurirati datoteku LUKS ključevima na particiji %1. @@ -1640,27 +1658,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) Mrežna instalacija. (Onemogućeno: Primanje nevažećih podataka o grupama) - + Network Installation. (Disabled: Incorrect configuration) Mrežna instalacija. (Onemogućeno: Neispravna konfiguracija) @@ -1668,10 +1686,69 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. NetInstallViewStep - + + Package selection Odabir paketa + + + Office software + Uredski softver + + + + Office package + Uredski paket + + + + Browser software + Preglednici + + + + Browser package + Paket preglednika + + + + Web browser + Web preglednik + + + + Kernel + Kernel + + + + Services + Servisi + + + + Login + Prijava + + + + Desktop + Radna površina + + + + Applications + Aplikacije + + + + NotesQmlViewStep + + + Notes + Bilješke + OEMPage @@ -1947,7 +2024,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Nepoznata greška - + Password is empty Lozinka je prazna @@ -2369,8 +2446,8 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. - There are no partitons to install on. - Nema particija na koje bi se izvršila instalacija. + There are no partitions to install on. + Ne postoje particije na koje bi se instalirao sustav. @@ -2434,14 +2511,14 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. ProcessResult - + There was no output from the command. Nema izlazne informacije od naredbe. - + Output: @@ -2450,52 +2527,52 @@ Izlaz: - + External command crashed. Vanjska naredba je prekinula s radom. - + Command <i>%1</i> crashed. Naredba <i>%1</i> je prekinula s radom. - + External command failed to start. Vanjska naredba nije uspješno pokrenuta. - + Command <i>%1</i> failed to start. Naredba <i>%1</i> nije uspješno pokrenuta. - + Internal error when starting command. Unutrašnja greška pri pokretanju naredbe. - + Bad parameters for process job call. Krivi parametri za proces poziva posla. - + External command failed to finish. Vanjska naredba se nije uspjela izvršiti. - + Command <i>%1</i> failed to finish in %2 seconds. Naredba <i>%1</i> nije uspjela završiti za %2 sekundi. - + External command finished with errors. Vanjska naredba je završila sa pogreškama. - + Command <i>%1</i> finished with exit code %2. Naredba <i>%1</i> je završila sa izlaznim kodom %2. @@ -2549,7 +2626,7 @@ Izlaz: Provjera zahtjeva za modul <i>%1</i> je dovršena. - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2565,29 +2642,23 @@ Izlaz: Nije naveden opis. - - - - - + + + + File not found Datoteka nije pronađena - + Path <pre>%1</pre> must be an absolute path. Putanja <pre>%1</pre> mora biti apsolutna putanja. - + Could not create new random file <pre>%1</pre>. Ne mogu stvoriti slučajnu datoteku <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - Ne mogu pročitati slučajnu datoteku <pre>%1</pre>. - RemoveVolumeGroupJob @@ -2616,69 +2687,69 @@ Izlaz: Oblik - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. 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: @@ -2861,29 +2932,29 @@ Izlaz: SetHostNameJob - + Set hostname %1 Postavi ime računala %1 - + Set hostname <strong>%1</strong>. Postavi ime računala <strong>%1</strong>. - + Setting hostname %1. Postavljam ime računala %1. - - + + Internal Error Unutarnja pogreška - - + + Cannot write hostname to target system Ne mogu zapisati ime računala na ciljni sustav. @@ -2921,82 +2992,82 @@ Izlaz: SetPartFlagsJob - + Set flags on partition %1. Postavi oznake na particiji %1. - + Set flags on %1MiB %2 partition. Postavi oznake na %1MB %2 particiji. - + Set flags on new partition. Postavi oznake na novoj particiji. - + Clear flags on partition <strong>%1</strong>. Obriši oznake na particiji <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. Obriši oznake na %1MB <strong>%2</strong> particiji. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. Označi %1MB <strong>%2</strong> particiju kao <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. Brišem oznake na %1MB <strong>%2</strong> particiji. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. Postavljam oznake <strong>%3</strong> na %1MB <strong>%2</strong> particiji. - + Clear flags on new partition. Obriši oznake na novoj particiji. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Označi particiju <strong>%1</strong> kao <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. Označi novu particiju kao <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. Brišem oznake na particiji <strong>%1</strong>. - + Clearing flags on new partition. Brišem oznake na novoj particiji. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Postavljam oznake <strong>%2</strong> na particiji <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. Postavljam oznake <strong>%1</strong> na novoj particiji. - + The installer failed to set flags on partition %1. Instalacijski program nije uspio postaviti oznake na particiji %1. @@ -3004,42 +3075,42 @@ Izlaz: 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 Root točka montiranja 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. @@ -3236,37 +3307,37 @@ Izlaz: <small>Ako će više osoba koristiti ovo računalo, možete postaviti više korisničkih računa poslije instalacije.</small> - + Your username is too long. Vaše korisničko ime je predugačko. - + Your username must start with a lowercase letter or underscore. Vaše korisničko ime mora započeti malim slovom ili podvlakom. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Dopuštena su samo mala slova, brojevi, podvlake i crtice. - + Only letters, numbers, underscore and hyphen are allowed. Dopuštena su samo slova, brojevi, podvlake i crtice. - + Your hostname is too short. Ime računala je kratko. - + Your hostname is too long. Ime računala je predugačko. - + Your passwords do not match! Lozinke se ne podudaraju! @@ -3274,7 +3345,7 @@ Izlaz: UsersViewStep - + Users Korisnici @@ -3444,6 +3515,14 @@ Izlaz: %1 podrška + + WelcomeQmlViewStep + + + Welcome + Dobrodošli + + WelcomeViewStep @@ -3452,4 +3531,47 @@ Izlaz: Dobrodošli + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + <h3>%1</h3> + <p> Ovo su primjeri bilješki izdanja.</p> + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + <h3>%1<quote>%2</quote></h3> + + + + About + O programu + + + + Support + Podrška + + + + Known issues + Poznati problemi + + + + Release notes + Bilješke o izdanju + + + + Donate + Doniraj + + diff --git a/lang/calamares_hu.ts b/lang/calamares_hu.ts index 1468793ef..593870453 100644 --- a/lang/calamares_hu.ts +++ b/lang/calamares_hu.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up Összeállítás - + Install Telepít @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Kész @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + Betöltés ... + + + + QML Step <i>%1</i>. + QML lépés <i>%1</i>. + + + + Loading failed. + A betöltés sikertelen. + + Calamares::RequirementsChecker @@ -234,176 +252,176 @@ Calamares::ViewManager - - + + &Back &Vissza - - + + &Next &Következő - - + + &Cancel &Mégse - + Cancel setup without changing the system. Telepítés megszakítása a rendszer módosítása nélkül. - + Cancel installation without changing the system. Kilépés a telepítőből a rendszer megváltoztatása nélkül. - + Setup Failed Telepítési hiba - + Would you like to paste the install log to the web? - + Install Log Paste URL - + Telepítési napló beillesztési URL-je. - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed A Calamares előkészítése meghiúsult - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. A(z) %1 nem telepíthető. A Calamares nem tudta betölteni a konfigurált modulokat. Ez a probléma abból fakad, ahogy a disztribúció a Calamarest használja. - + <br/>The following modules could not be loaded: <br/>A következő modulok nem tölthetőek be: - + Continue with installation? Folytatja a telepítést? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> A %1 telepítő változtatásokat fog végrehajtani a lemezen a %2 telepítéséhez. <br/><strong>Ezután már nem tudja visszavonni a változtatásokat.</strong> - + &Set up now &Telepítés most - + &Set up &Telepítés - + &Install &Telepítés - + Setup is complete. Close the setup program. Telepítés sikerült. Zárja be a telepítőt. - + Cancel setup? Megszakítja a telepítést? - + Cancel installation? Abbahagyod a telepítést? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Valóban megszakítod a telepítési eljárást? A telepítő ki fog lépni és minden változtatás elveszik. - + 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 - + &Done &Befejez - + The installation is complete. Close the installer. A telepítés befejeződött, Bezárhatod a telepítőt. - + Error Hiba - + Installation Failed Telepítés nem sikerült @@ -411,22 +429,22 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. CalamaresPython::Helper - + Unknown exception type Ismeretlen kivétel típus - + unparseable Python error nem egyeztethető Python hiba - + unparseable Python traceback nem egyeztethető Python visszakövetés - + Unfetchable Python error. Összehasonlíthatatlan Python hiba. @@ -732,22 +750,22 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. 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érlek, válassz másikat. @@ -755,22 +773,22 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. Új partíció létrehozása %2MiB partíción a %4 (%3) %1 fájlrendszerrel - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Új <strong>%2MiB </strong>partíció létrehozása itt <strong>%4</strong> (%3) fájlrendszer típusa <strong>%1</strong>. - + Creating new %1 partition on %2. Új %1 partíció létrehozása a következőn: %2. - + The installer failed to create partition on disk '%1'. A telepítő nem tudta létrehozni a partíciót ezen a lemezen '%1'. @@ -1064,7 +1082,7 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. Zászlók: - + Mountpoint already in use. Please select another one. A csatolási pont már használatban van. Kérlek, válassz másikat. @@ -1100,37 +1118,37 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. FillGlobalStorageJob - + Set partition information Partíció információk beállítása - + Install %1 on <strong>new</strong> %2 system partition. %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 @@ -1214,22 +1232,22 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. Partíció formázása %1 (fájlrendszer: %2, méret: %3 MiB) itt %4 - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. <strong>%3MiB</strong> <strong>%1</strong> partíció formázása <strong>%2</strong> fájlrendszerrel. - + Formatting partition %1 with file system %2. %1 partíció formázása %2 fájlrendszerrel. - + The installer failed to format partition %1 on disk '%2'. A telepítő nem tudta formázni a %1 partíciót a %2 lemezen. @@ -1612,8 +1630,8 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. - Could configure LUKS key file on partition %1. - Nem sikerült beállítani a LUKS kulcs fájlt a %1 root partíción. + Could not configure LUKS key file on partition %1. + @@ -1637,27 +1655,27 @@ Minden változtatás elveszik, ha kilépsz a telepítőbő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) - + Network Installation. (Disabled: Received invalid groups data) Hálózati Telepítés. (Letiltva: Hibás adat csoportok fogadva) - + Network Installation. (Disabled: Incorrect configuration) @@ -1665,10 +1683,69 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. NetInstallViewStep - + + Package selection Csomag választása + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1944,7 +2021,7 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. Ismeretlen hiba - + Password is empty @@ -2366,8 +2443,8 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. - There are no partitons to install on. - Nincsenek partíciók a telepítéshez. + There are no partitions to install on. + @@ -2431,14 +2508,14 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. ProcessResult - + There was no output from the command. A parancsnak nem volt kimenete. - + Output: @@ -2447,52 +2524,52 @@ Kimenet: - + External command crashed. Külső parancs összeomlott. - + Command <i>%1</i> crashed. Parancs <i>%1</i> összeomlott. - + External command failed to start. A külső parancsot nem sikerült elindítani. - + Command <i>%1</i> failed to start. A(z) <i>%1</i> parancsot nem sikerült elindítani. - + Internal error when starting command. Belső hiba a parancs végrehajtásakor. - + Bad parameters for process job call. Hibás paraméterek a folyamat hívásához. - + External command failed to finish. Külső parancs nem fejeződött be. - + Command <i>%1</i> failed to finish in %2 seconds. A(z) <i>%1</i> parancsot nem sikerült befejezni %2 másodperc alatt. - + External command finished with errors. A külső parancs hibával fejeződött be. - + Command <i>%1</i> finished with exit code %2. A(z) <i>%1</i> parancs hibakóddal lépett ki: %2. @@ -2546,7 +2623,7 @@ Kimenet: Követelmények ellenőrzése a <i>%1</i>modulhoz kész. - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2562,29 +2639,23 @@ Kimenet: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2613,69 +2684,69 @@ Kimenet: Adatlap - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. 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ó: @@ -2859,29 +2930,29 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a> SetHostNameJob - + Set hostname %1 Hálózati név beállítása a %1 -en - + Set hostname <strong>%1</strong>. Hálózati név beállítása a következőhöz: <strong>%1</strong>. - + Setting hostname %1. Hálózati név beállítása a %1 -hez - - + + Internal Error Belső hiba - - + + Cannot write hostname to target system Nem lehet a hálózati nevet írni a célrendszeren @@ -2919,82 +2990,82 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a> SetPartFlagsJob - + Set flags on partition %1. Zászlók beállítása a partíción %1. - + Set flags on %1MiB %2 partition. flags beállítása a %1MiB %2 partíción. - + Set flags on new partition. Jelzők beállítása az új partíción. - + Clear flags on partition <strong>%1</strong>. Zászlók törlése a partíción: <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. flags eltávolítása a %1MiB <strong>%2</strong> partíción. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. Flag %1MiB <strong>%2</strong> partíción mint <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. Flag-ek eltávolítása a %1MiB <strong>%2</strong> partíción. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. Flag-ek beállítása <strong>%3</strong> a %1MiB <strong>%2</strong> partíción. - + Clear flags on new partition. Jelzők törlése az új partíción. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Zászlók beállítása <strong>%1</strong> ,mint <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. Jelző beállítása mint <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. Zászlók törlése a partíción: <strong>%1</strong>. - + Clearing flags on new partition. jelzők törlése az új partíción. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Zászlók beállítása <strong>%2</strong> a <strong>%1</strong> partíción. - + Setting flags <strong>%1</strong> on new partition. Jelzők beállítása az új <strong>%1</strong> partíción. - + The installer failed to set flags on partition %1. A telepítőnek nem sikerült a zászlók beállítása a partíción %1. @@ -3002,42 +3073,42 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a> 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. @@ -3235,37 +3306,37 @@ Calamares hiba %1. <small>Ha egynél több személy használja a számítógépet akkor létrehozhat több felhasználói fiókot telepítés után.</small> - + Your username is too long. A felhasználónév túl hosszú. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. A hálózati név túl rövid. - + Your hostname is too long. A hálózati név túl hosszú. - + Your passwords do not match! A két jelszó nem egyezik! @@ -3273,7 +3344,7 @@ Calamares hiba %1. UsersViewStep - + Users Felhasználók @@ -3443,6 +3514,14 @@ Calamares hiba %1. %1 támogatás + + WelcomeQmlViewStep + + + Welcome + Üdvözlet + + WelcomeViewStep @@ -3451,4 +3530,46 @@ Calamares hiba %1. Üdvözlet + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_id.ts b/lang/calamares_id.ts index de20265c6..61801031e 100644 --- a/lang/calamares_id.ts +++ b/lang/calamares_id.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Instal @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Selesai @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -232,175 +250,175 @@ Calamares::ViewManager - - + + &Back &Kembali - - + + &Next &Berikutnya - - + + &Cancel &Batal - + Cancel setup without changing the system. - + Cancel installation without changing the system. Batalkan instalasi tanpa mengubah sistem yang ada. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed Inisialisasi Calamares Gagal - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 tidak dapat terinstal. Calamares tidak dapat memuat seluruh modul konfigurasi. Terdapat masalah dengan Calamares karena sedang digunakan oleh distribusi. - + <br/>The following modules could not be loaded: <br/>Modul berikut tidak dapat dimuat. - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install &Instal - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? Batalkan instalasi? - + Do you really want to cancel the current setup process? The setup program 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. Apakah Anda benar-benar ingin membatalkan proses instalasi ini? Instalasi 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> Installer %1 akan membuat perubahan ke disk Anda untuk memasang %2.<br/><strong>Anda tidak dapat membatalkan perubahan tersebut.</strong> - + &Install now &Instal sekarang - + Go &back &Kembali - + &Done &Kelar - + The installation is complete. Close the installer. Instalasi sudah lengkap. Tutup installer. - + Error Kesalahan - + Installation Failed Instalasi Gagal @@ -408,22 +426,22 @@ Instalasi akan ditutup dan semua perubahan akan hilang. CalamaresPython::Helper - + Unknown exception type Tipe pengecualian tidak dikenal - + unparseable Python error tidak dapat mengurai pesan kesalahan Python - + unparseable Python traceback tidak dapat mengurai penelusuran balik Python - + Unfetchable Python error. Tidak dapat mengambil pesan kesalahan Python. @@ -729,22 +747,22 @@ Instalasi akan ditutup dan semua perubahan akan hilang. Enkripsi - + Logical Logikal - + Primary Utama - + GPT GPT - + Mountpoint already in use. Please select another one. Titik-kait sudah digunakan. Silakan pilih yang lainnya. @@ -752,22 +770,22 @@ Instalasi akan ditutup dan semua perubahan akan hilang. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. Membuat partisi %1 baru di %2. - + The installer failed to create partition on disk '%1'. Installer gagal untuk membuat partisi di disk '%1'. @@ -1061,7 +1079,7 @@ Instalasi akan ditutup dan semua perubahan akan hilang. Bendera: - + Mountpoint already in use. Please select another one. Titik-kait sudah digunakan. Silakan pilih yang lainnya. @@ -1097,37 +1115,37 @@ Instalasi akan ditutup dan semua perubahan akan hilang. FillGlobalStorageJob - + Set partition information Tetapkan informasi partisi - + Install %1 on <strong>new</strong> %2 system partition. Instal %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>. Instal %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>. Instal boot loader di <strong>%1</strong>. - + Setting up mount points. Menyetel tempat kait. @@ -1211,22 +1229,22 @@ Instalasi akan ditutup dan semua perubahan akan hilang. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. Memformat partisi %1 dengan sistem berkas %2. - + The installer failed to format partition %1 on disk '%2'. Installer gagal memformat partisi %1 pada disk '%2'.'%2'. @@ -1609,7 +1627,7 @@ Instalasi akan ditutup dan semua perubahan akan hilang. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1634,27 +1652,27 @@ Instalasi akan ditutup dan semua perubahan akan hilang. NetInstallPage - + Name Nama - + Description Deskripsi - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalasi Jaringan. (Dinonfungsikan: Tak mampu menarik daftar paket, periksa sambungan jaringanmu) - + Network Installation. (Disabled: Received invalid groups data) Instalasi jaringan. (Menonaktifkan: Penerimaan kelompok data yang tidak sah) - + Network Installation. (Disabled: Incorrect configuration) @@ -1662,10 +1680,69 @@ Instalasi akan ditutup dan semua perubahan akan hilang. NetInstallViewStep - + + Package selection Pemilihan paket + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1941,7 +2018,7 @@ Instalasi akan ditutup dan semua perubahan akan hilang. Ada kesalahan yang tidak diketahui - + Password is empty @@ -2363,7 +2440,7 @@ Instalasi akan ditutup dan semua perubahan akan hilang. - There are no partitons to install on. + There are no partitions to install on. @@ -2428,14 +2505,14 @@ Instalasi akan ditutup dan semua perubahan akan hilang. ProcessResult - + There was no output from the command. Tidak ada keluaran dari perintah. - + Output: @@ -2444,52 +2521,52 @@ Keluaran: - + External command crashed. Perintah eksternal rusak. - + Command <i>%1</i> crashed. Perintah <i>%1</i> mogok. - + External command failed to start. Perintah eksternal gagal dimulai - + Command <i>%1</i> failed to start. Perintah <i>%1</i> gagal dimulai. - + Internal error when starting command. Terjadi kesalahan internal saat menjalankan perintah. - + Bad parameters for process job call. Parameter buruk untuk memproses panggilan tugas, - + External command failed to finish. Perintah eksternal gagal diselesaikan . - + Command <i>%1</i> failed to finish in %2 seconds. Perintah <i>%1</i> gagal untuk diselesaikan dalam %2 detik. - + External command finished with errors. Perintah eksternal diselesaikan dengan kesalahan . - + Command <i>%1</i> finished with exit code %2. Perintah <i>%1</i> diselesaikan dengan kode keluar %2. @@ -2543,7 +2620,7 @@ Keluaran: - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2559,29 +2636,23 @@ Keluaran: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2610,69 +2681,69 @@ Keluaran: Isian - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. Pilih tempat instalasi %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 diinstal 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 diinstal pada Partisi Extended. Mohon pilih Partisi Primary atau Logical yang tersedia. - + %1 cannot be installed on this partition. %1 tidak dapat diinstal 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 diinstal 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: @@ -2857,29 +2928,29 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. SetHostNameJob - + Set hostname %1 Pengaturan hostname %1 - + Set hostname <strong>%1</strong>. Atur hostname <strong>%1</strong>. - + Setting hostname %1. Mengatur hostname %1. - - + + Internal Error Kesalahan Internal - - + + Cannot write hostname to target system Tidak dapat menulis nama host untuk sistem target @@ -2917,82 +2988,82 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. SetPartFlagsJob - + Set flags on partition %1. Setel bendera pada partisi %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. Setel bendera pada partisi baru. - + Clear flags on partition <strong>%1</strong>. Bersihkan bendera pada partisi <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. Bersihkan bendera pada partisi baru. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Benderakan partisi <strong>%1</strong> sebagai <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. Benderakan partisi baru sebagai <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. Membersihkan bendera pada partisi <strong>%1</strong>. - + Clearing flags on new partition. Membersihkan bendera pada partisi baru. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Menyetel bendera <strong>%2</strong> pada partisi <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. Menyetel bendera <strong>%1</strong> pada partisi baru. - + The installer failed to set flags on partition %1. Installer gagal menetapkan bendera pada partisi %1. @@ -3000,42 +3071,42 @@ Instalasi 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. @@ -3232,37 +3303,37 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. - + Your username is too long. Nama pengguna Anda terlalu panjang. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Hostname Anda terlalu pendek. - + Your hostname is too long. Hostname Anda terlalu panjang. - + Your passwords do not match! Sandi Anda tidak sama! @@ -3270,7 +3341,7 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. UsersViewStep - + Users Pengguna @@ -3440,6 +3511,14 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Dukungan %1 + + WelcomeQmlViewStep + + + Welcome + Selamat Datang + + WelcomeViewStep @@ -3448,4 +3527,46 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Selamat Datang + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_is.ts b/lang/calamares_is.ts index a8df6e56a..64118477b 100644 --- a/lang/calamares_is.ts +++ b/lang/calamares_is.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up Setja upp - + Install Setja upp @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Búið @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,175 +252,175 @@ Calamares::ViewManager - - + + &Back &Til baka - - + + &Next &Næst - - + + &Cancel &Hætta við - + Cancel setup without changing the system. - + Cancel installation without changing the system. Hætta við uppsetningu ánþess að breyta kerfinu. - + Setup Failed Uppsetning mistókst - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed Calamares uppsetning mistókst - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with installation? Halda áfram með uppsetningu? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now &Setja upp núna - + &Set up &Setja upp - + &Install &Setja upp - + Setup is complete. Close the setup program. - + Cancel setup? Hætta við uppsetningu? - + Cancel installation? Hætta við uppsetningu? - + Do you really want to cancel the current setup process? The setup program 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. 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 - + &Done &Búið - + The installation is complete. Close the installer. Uppsetning er lokið. Lokaðu uppsetningarforritinu. - + Error Villa - + Installation Failed Uppsetning mistókst @@ -410,22 +428,22 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. CalamaresPython::Helper - + Unknown exception type Óþekkt tegund fráviks - + unparseable Python error óþáttanleg Python villa - + unparseable Python traceback óþáttanleg Python reki - + Unfetchable Python error. Ósækjanleg Python villa. @@ -731,22 +749,22 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. &Dulrita - + Logical Rökleg - + Primary Aðal - + GPT GPT - + Mountpoint already in use. Please select another one. Tengipunktur er þegar í notkun. Veldu einhvern annan. @@ -754,22 +772,22 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. Búa til nýja %1 disksneiðatöflu á %2. - + The installer failed to create partition on disk '%1'. Uppsetningarforritinu mistókst að búa til disksneið á diski '%1'. @@ -1063,7 +1081,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Flögg: - + Mountpoint already in use. Please select another one. Tengipunktur er þegar í notkun. Veldu einhvern annan. @@ -1099,37 +1117,37 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. FillGlobalStorageJob - + Set partition information Setja upplýsingar um disksneið - + Install %1 on <strong>new</strong> %2 system partition. 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. @@ -1213,22 +1231,22 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. Forsníða disksneið %1 með %2 skráakerfinu. - + The installer failed to format partition %1 on disk '%2'. Uppsetningarforritinu mistókst að forsníða disksneið %1 á diski '%2'. @@ -1611,7 +1629,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1636,27 +1654,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) @@ -1664,10 +1682,69 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. NetInstallViewStep - + + Package selection Valdir pakkar + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1943,7 +2020,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Óþekkt villa - + Password is empty @@ -2365,7 +2442,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. - There are no partitons to install on. + There are no partitions to install on. @@ -2430,65 +2507,65 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -2542,7 +2619,7 @@ Output: - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2558,29 +2635,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2609,69 +2680,69 @@ Output: Eyðublað - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. 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ð: @@ -2854,29 +2925,29 @@ Output: SetHostNameJob - + Set hostname %1 Setja vélarheiti %1 - + Set hostname <strong>%1</strong>. Setja vélarheiti <strong>%1</strong>. - + Setting hostname %1. Stilla vélarheiti %1. - - + + Internal Error Innri Villa - - + + Cannot write hostname to target system @@ -2914,82 +2985,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. - + Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. Uppsetningarforritinu mistókst að setja flögg á disksneið %1. @@ -2997,42 +3068,42 @@ Output: 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. @@ -3229,37 +3300,37 @@ Output: - + Your username is too long. Notandanafnið þitt er of langt. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Notandanafnið þitt er of stutt. - + Your hostname is too long. Notandanafnið þitt er of langt. - + Your passwords do not match! Lykilorð passa ekki! @@ -3267,7 +3338,7 @@ Output: UsersViewStep - + Users Notendur @@ -3437,6 +3508,14 @@ Output: %1 stuðningur + + WelcomeQmlViewStep + + + Welcome + Velkomin(n) + + WelcomeViewStep @@ -3445,4 +3524,46 @@ Output: Velkomin(n) + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_it_IT.ts b/lang/calamares_it_IT.ts index e3305ca4d..991746f7b 100644 --- a/lang/calamares_it_IT.ts +++ b/lang/calamares_it_IT.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up Installazione - + Install Installa @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Fatto @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + Caricamento fallito. + + Calamares::RequirementsChecker @@ -234,175 +252,175 @@ Calamares::ViewManager - - + + &Back &Indietro - - + + &Next &Avanti - - + + &Cancel &Annulla - + Cancel setup without changing the system. Annulla l'installazione senza modificare il computer - + Cancel installation without changing the system. Annullare l'installazione senza modificare il sistema. - + Setup Failed Installazione fallita - + Would you like to paste the install log to the web? Vuoi incollare il log di installazione nel web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed Inizializzazione di Calamares Fallita - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 non può essere installato. Calamares non è stato in grado di caricare tutti i moduli configurati. Questo è un problema del modo in cui Calamares viene utilizzato dalla distribuzione. - + <br/>The following modules could not be loaded: <br/>Non è stato possibile caricare il seguente modulo: - + Continue with installation? Continuare l'installazione? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> Il %1 programma di installazione sta per fare dei cambiamenti sul tuo disco per installare %2. Non sarà possibile annullare questi cambiamenti. - + &Set up now &Installa adesso - + &Set up &Installazione - + &Install &Installa - + Setup is complete. Close the setup program. Installazione completata. Chiudere il programma di installazione. - + Cancel setup? Annullare l'installazione? - + Cancel installation? Annullare l'installazione? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Vuoi davvero annullare il processo di installazione? Il programma di installazione verrrà terminato e tutti i cambiamenti verranno persi. - + 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 &Si - - + + &No &No - + &Close &Chiudi - + 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 - + &Done &Fatto - + The installation is complete. Close the installer. L'installazione è terminata. Chiudere il programma d'installazione. - + Error Errore - + Installation Failed Installazione non riuscita @@ -410,22 +428,22 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse CalamaresPython::Helper - + Unknown exception type Tipo di eccezione sconosciuto - + unparseable Python error Errore Python non definibile - + unparseable Python traceback Traceback Python non definibile - + Unfetchable Python error. Errore di Python non definibile. @@ -731,22 +749,22 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse 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. @@ -754,22 +772,22 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. Crea una nuova partizione da %2MiB su %4 (%3) con file system %1 - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. Creazione della nuova partizione %1 su %2. - + The installer failed to create partition on disk '%1'. Il programma di installazione non è riuscito a creare la partizione sul disco '%1'. @@ -1063,7 +1081,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse Flag: - + Mountpoint already in use. Please select another one. Il punto di mount è già in uso. Sceglierne un altro. @@ -1099,37 +1117,37 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse FillGlobalStorageJob - + Set partition information Impostare informazioni partizione - + Install %1 on <strong>new</strong> %2 system partition. 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. @@ -1213,22 +1231,22 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. Formatta la partitione %1 (file system: %2, dimensione: %3 MiB) su %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. Formatta la partizione <strong>%1</strong> di dimensione <strong>%3MiB </strong> con il file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. Formattazione della partizione %1 con file system %2. - + The installer failed to format partition %1 on disk '%2'. Il programma di installazione non è riuscito a formattare la partizione %1 sul disco '%2'. @@ -1611,7 +1629,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1636,27 +1654,27 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse 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) - + Network Installation. (Disabled: Received invalid groups data) Installazione di rete. (Disabilitata: Ricevuti dati non validi dei gruppi) - + Network Installation. (Disabled: Incorrect configuration) @@ -1664,10 +1682,69 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse NetInstallViewStep - + + Package selection Selezione del pacchetto + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1943,7 +2020,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse Errore sconosciuto - + Password is empty @@ -2365,8 +2442,8 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse - There are no partitons to install on. - Non ci sono partizioni su cui installare + There are no partitions to install on. + @@ -2430,13 +2507,13 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse ProcessResult - + There was no output from the command. Non c'era output dal comando. - + Output: @@ -2445,53 +2522,53 @@ Output: - + External command crashed. Il comando esterno si è arrestato. - + Command <i>%1</i> crashed. Il comando <i>%1</i> si è arrestato. - + External command failed to start. Il comando esterno non si è avviato. - + Command <i>%1</i> failed to start. Il comando %1 non si è avviato. - + Internal error when starting command. Errore interno all'avvio del comando. - + Bad parameters for process job call. Parametri errati per elaborare la chiamata al job. - + External command failed to finish. Il comando esterno non è stato portato a termine. - + Command <i>%1</i> failed to finish in %2 seconds. Il comando <i>%1</i> non è stato portato a termine in %2 secondi. - + External command finished with errors. Il comando esterno è terminato con errori. - + Command <i>%1</i> finished with exit code %2. Il comando <i>%1</i> è terminato con codice di uscita %2. @@ -2545,7 +2622,7 @@ Output: - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2561,29 +2638,23 @@ Output: Non è stata fornita alcuna descrizione. - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2612,69 +2683,69 @@ Output: Modulo - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. 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: @@ -2857,29 +2928,29 @@ Output: SetHostNameJob - + Set hostname %1 Impostare hostname %1 - + Set hostname <strong>%1</strong>. Impostare hostname <strong>%1</strong>. - + Setting hostname %1. Impostare hostname %1. - - + + Internal Error Errore interno - - + + Cannot write hostname to target system Impossibile scrivere l'hostname nel sistema di destinazione @@ -2917,82 +2988,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. Impostare i flag sulla partizione: %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. Impostare i flag sulla nuova partizione. - + Clear flags on partition <strong>%1</strong>. Rimuovere i flag sulla partizione <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. Rimuovere i flag dalla nuova partizione. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Flag di partizione <strong>%1</strong> come <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. Flag della nuova partizione come <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. Rimozione dei flag sulla partizione <strong>%1</strong>. - + Clearing flags on new partition. Rimozione dei flag dalla nuova partizione. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Impostazione dei flag <strong>%2</strong> sulla partizione <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. Impostazione dei flag <strong>%1</strong> sulla nuova partizione. - + The installer failed to set flags on partition %1. Impossibile impostare i flag sulla partizione %1. @@ -3000,42 +3071,42 @@ Output: 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. @@ -3232,37 +3303,37 @@ Output: - + Your username is too long. Il nome utente è troppo lungo. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Hostname è troppo corto. - + Your hostname is too long. Hostname è troppo lungo. - + Your passwords do not match! Le password non corrispondono! @@ -3270,7 +3341,7 @@ Output: UsersViewStep - + Users Utenti @@ -3440,6 +3511,14 @@ Output: supporto %1 + + WelcomeQmlViewStep + + + Welcome + Benvenuti + + WelcomeViewStep @@ -3448,4 +3527,46 @@ Output: Benvenuti + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts index bd0c64ce4..97d33a7d9 100644 --- a/lang/calamares_ja.ts +++ b/lang/calamares_ja.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up セットアップ - + Install インストール @@ -143,7 +143,7 @@ Calamares::JobThread - + Done 完了 @@ -177,36 +177,54 @@ 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 エラー。 + + Calamares::QmlViewStep + + + Loading ... + ロードしています... + + + + QML Step <i>%1</i>. + QML ステップ <i>%1</i>。 + + + + Loading failed. + ロードが失敗しました。 + + Calamares::RequirementsChecker @@ -232,176 +250,176 @@ Calamares::ViewManager - - + + &Back 戻る (&B) - - + + &Next 次へ (&N) - - + + &Cancel 中止 (&C) - + Cancel setup without changing the system. システムを変更することなくセットアップを中断します。 - + Cancel installation without changing the system. システムを変更しないでインストールを中止します。 - + Setup Failed セットアップに失敗しました。 - + Would you like to paste the install log to the web? インストールログをWebに貼り付けますか？ - + Install Log Paste URL インストールログを貼り付けるURL - + The upload was unsuccessful. No web-paste was done. アップロードは失敗しました。 ウェブへの貼り付けは行われませんでした。 - + Calamares Initialization Failed Calamares によるインストールに失敗しました。 - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 をインストールできません。Calamares はすべてのモジュールをロードすることをできませんでした。これは、Calamares のこのディストリビューションでの使用法による問題です。 - + <br/>The following modules could not be loaded: <br/>以下のモジュールがロードできませんでした。: - + Continue with installation? インストールを続行しますか？ - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> %1 のセットアッププログラムは %2 のセットアップのためディスクの内容を変更します。<br/><strong>これらの変更は取り消しできません。</strong> - + &Set up now セットアップしています (&S) - + &Set up セットアップ （&S） - + &Install インストール (&I) - + Setup is complete. Close the setup program. セットアップが完了しました。プログラムを閉じます。 - + Cancel setup? セットアップを中止しますか？ - + Cancel installation? インストールを中止しますか？ - + Do you really want to cancel the current setup process? The setup program 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 はい (&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) - + &Done 実行 (&D) - + The installation is complete. Close the installer. インストールが完了しました。インストーラーを閉じます。 - + Error エラー - + Installation Failed インストールに失敗 @@ -409,22 +427,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type 不明な例外型 - + unparseable Python error 解析不能なPythonエラー - + unparseable Python traceback 解析不能な Python トレースバック - + Unfetchable Python error. 取得不能なPythonエラー。 @@ -731,22 +749,22 @@ The installer will quit and all changes will be lost. 暗号化 (&C) - + Logical 論理 - + Primary プライマリ - + GPT GPT - + Mountpoint already in use. Please select another one. マウントポイントは既に使用されています。他を選択してください。 @@ -754,22 +772,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. %4 (%3) に新たにファイルシステム %1 の %2MiB のパーティションが作成されます。 - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Create new <strong>%4</strong> (%3) に新たにファイルシステム<strong>%1</strong>の <strong>%2MiB</strong> のパーティションが作成されます。 - + Creating new %1 partition on %2. %2 に新しく %1 パーティションを作成しています。 - + The installer failed to create partition on disk '%1'. インストーラーはディスク '%1' にパーティションを作成することに失敗しました。 @@ -1063,7 +1081,7 @@ The installer will quit and all changes will be lost. フラグ: - + Mountpoint already in use. Please select another one. マウントポイントは既に使用されています。他を選択してください。 @@ -1099,37 +1117,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information パーティション情報の設定 - + Install %1 on <strong>new</strong> %2 system partition. <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. マウントポイントを設定する。 @@ -1214,22 +1232,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. %4 のパーティション %1 (ファイルシステム: %2、サイズ: %3 MiB) をフォーマットする。 - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. <strong>%3MiB</strong> のパーティション <strong>%1</strong> をファイルシステム <strong>%2</strong> でフォーマットする。 - + Formatting partition %1 with file system %2. ファイルシステム %2 でパーティション %1 をフォーマットしています。 - + The installer failed to format partition %1 on disk '%2'. インストーラーはディスク '%2' 上のパーティション %1 のフォーマットに失敗しました。 @@ -1612,8 +1630,8 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. - パーティション %1 にLUKSキーファイルを設定できました。 + Could not configure LUKS key file on partition %1. + パーティション %1 でLUKSキーファイルを設定できませんでした。 @@ -1637,27 +1655,27 @@ 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) ネットワークインストール。(無効: パッケージリストを取得できません。ネットワーク接続を確認してください。) - + Network Installation. (Disabled: Received invalid groups data) ネットワークインストール (不可: 無効なグループデータを受け取りました) - + Network Installation. (Disabled: Incorrect configuration) ネットワークインストール。(無効: 不正な設定) @@ -1665,10 +1683,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection パッケージの選択 + + + Office software + オフィスソフトウェア + + + + Office package + オフィスパッケージ + + + + Browser software + ブラウザソフトウェア + + + + Browser package + ブラウザパッケージ + + + + Web browser + ウェブブラウザ + + + + Kernel + カーネル + + + + Services + サービス + + + + Login + ログイン + + + + Desktop + デスクトップ + + + + Applications + アプリケーション + + + + NotesQmlViewStep + + + Notes + ノート + OEMPage @@ -1944,7 +2021,7 @@ The installer will quit and all changes will be lost. 未知のエラー - + Password is empty パスワードが空です @@ -2366,7 +2443,7 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. + There are no partitions to install on. インストールするパーティションがありません。 @@ -2431,14 +2508,14 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. コマンドから出力するものがありませんでした。 - + Output: @@ -2447,52 +2524,52 @@ Output: - + External command crashed. 外部コマンドがクラッシュしました。 - + Command <i>%1</i> crashed. コマンド <i>%1</i> がクラッシュしました。 - + External command failed to start. 外部コマンドの起動に失敗しました。 - + Command <i>%1</i> failed to start. コマンド <i>%1</i> の起動に失敗しました。 - + Internal error when starting command. コマンドが起動する際に内部エラーが発生しました。 - + Bad parameters for process job call. ジョブ呼び出しにおける不正なパラメータ - + External command failed to finish. 外部コマンドの終了に失敗しました。 - + Command <i>%1</i> failed to finish in %2 seconds. コマンド<i>%1</i> %2 秒以内に終了することに失敗しました。 - + External command finished with errors. 外部のコマンドがエラーで停止しました。 - + Command <i>%1</i> finished with exit code %2. コマンド <i>%1</i> が終了コード %2 で終了しました。. @@ -2546,7 +2623,7 @@ Output: モジュール <i>%1</i> に必要なパッケージの確認が完了しました。 - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2562,29 +2639,23 @@ Output: 説明はありません。 - - - - - + + + + File not found ファイルが見つかりません - + Path <pre>%1</pre> must be an absolute path. パス <pre>%1</pre> は絶対パスにしてください。 - + Could not create new random file <pre>%1</pre>. 新しいランダムファイル <pre>%1</pre> を作成できませんでした。 - - - Could not read random file <pre>%1</pre>. - ランダムファイル <pre>%1</pre> を読み取れませんでした。 - RemoveVolumeGroupJob @@ -2613,69 +2684,69 @@ Output: フォーム - + 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 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 システムパーティション: @@ -2858,29 +2929,29 @@ Output: 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 ターゲットとするシステムにホスト名を書き込めません @@ -2918,82 +2989,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. パーティション %1 にフラグを設定する。 - + Set flags on %1MiB %2 partition. %1MiB %2 パーティションにフラグを設定する。 - + Set flags on new partition. 新しいパーティションにフラグを設定する。 - + Clear flags on partition <strong>%1</strong>. パーティション <strong>%1</strong> 上のフラグを消去。 - + Clear flags on %1MiB <strong>%2</strong> partition. %1MiB <strong>%2</strong> パーティション上のフラグを消去。 - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. %1MiB <strong>%2</strong> パーティションに <strong>%3</strong> フラグを設定する。 - + Clearing flags on %1MiB <strong>%2</strong> partition. %1MiB <strong>%2</strong> パーティション上のフラグを消去しています。 - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. %1MiB <strong>%2</strong> パーティションに <strong>%3</strong> フラグを設定しています。 - + Clear flags on new partition. 新しいパーティション上のフラグを消去。 - + Flag partition <strong>%1</strong> as <strong>%2</strong>. パーティション <strong>%1</strong> に <strong>%2</strong>フラグを設定する。 - + Flag new partition as <strong>%1</strong>. 新しいパーティションに <strong>%1</strong> フラグを設定する。 - + Clearing flags on partition <strong>%1</strong>. パーティション <strong>%1</strong> のフラグを消去しています。 - + Clearing flags on new partition. 新しいパーティション上のフラグを消去しています。 - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. パーティション <strong>%1</strong> に <strong>%2</strong> フラグを設定する。 - + Setting flags <strong>%1</strong> on new partition. 新しいパーティションに <strong>%1</strong> フラグを設定しています。 - + The installer failed to set flags on partition %1. インストーラーはパーティション %1 上のフラグの設定に失敗しました。 @@ -3001,42 +3072,42 @@ Output: 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が停止しました。 @@ -3233,37 +3304,37 @@ Output: <small>もし複数の人間がこのコンピュータを使用する場合、インストールの後で複数のアカウントを作成できます。</small> - + Your username is too long. ユーザー名が長すぎます。 - + Your username must start with a lowercase letter or underscore. ユーザー名はアルファベットの小文字または _ で始めてください。 - + Only lowercase letters, numbers, underscore and hyphen are allowed. 使用できるのはアルファベットの小文字と数字と _ と - だけです。 - + Only letters, numbers, underscore and hyphen are allowed. 使用できるのはアルファベットと数字と _ と - だけです。 - + Your hostname is too short. ホスト名が短すぎます。 - + Your hostname is too long. ホスト名が長過ぎます。 - + Your passwords do not match! パスワードが一致していません！ @@ -3271,7 +3342,7 @@ Output: UsersViewStep - + Users ユーザー情報 @@ -3441,6 +3512,14 @@ Output: %1 サポート + + WelcomeQmlViewStep + + + Welcome + ようこそ + + WelcomeViewStep @@ -3449,4 +3528,47 @@ Output: ようこそ + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + <h3>%1</h3> + <p>これらはリリースノートの例です。</p> + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + <h3>%1 <quote>%2</quote></h3> + + + + About + About + + + + Support + サポート + + + + Known issues + 既知の問題点 + + + + Release notes + リリースノート + + + + Donate + 寄付 + + diff --git a/lang/calamares_kk.ts b/lang/calamares_kk.ts index 6c493d0a5..72c51fdd9 100644 --- a/lang/calamares_kk.ts +++ b/lang/calamares_kk.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Орнату @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Дайын @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,174 +252,174 @@ Calamares::ViewManager - - + + &Back А&ртқа - - + + &Next &Алға - - + + &Cancel Ба&с тарту - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? Орнатудан бас тарту керек пе? - + Do you really want to cancel the current setup process? The setup program 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? - + 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 - + &Done - + The installation is complete. Close the installer. - + Error - + Installation Failed @@ -409,22 +427,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type - + unparseable Python error - + unparseable Python traceback - + Unfetchable Python error. @@ -730,22 +748,22 @@ The installer will quit and all changes will be lost. - + Logical - + Primary - + GPT - + Mountpoint already in use. Please select another one. @@ -753,22 +771,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1062,7 +1080,7 @@ The installer will quit and all changes will be lost. - + Mountpoint already in use. Please select another one. @@ -1098,37 +1116,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information - + Install %1 on <strong>new</strong> %2 system partition. - + 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. @@ -1212,22 +1230,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1610,7 +1628,7 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1635,27 +1653,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) @@ -1663,10 +1681,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1942,7 +2019,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2364,7 +2441,7 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. + There are no partitions to install on. @@ -2429,65 +2506,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -2541,7 +2618,7 @@ Output: - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2557,29 +2634,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2608,69 +2679,69 @@ Output: - + 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. - + %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: EFI жүйелік бөлімі: @@ -2853,29 +2924,29 @@ Output: SetHostNameJob - + Set hostname %1 - + Set hostname <strong>%1</strong>. - + Setting hostname %1. - - + + Internal Error - - + + Cannot write hostname to target system @@ -2913,82 +2984,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. - + Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. @@ -2996,42 +3067,42 @@ Output: 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. @@ -3228,37 +3299,37 @@ Output: - + Your username is too long. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + Your passwords do not match! @@ -3266,7 +3337,7 @@ Output: UsersViewStep - + Users Пайдаланушылар @@ -3436,6 +3507,14 @@ Output: %1 қолдауы + + WelcomeQmlViewStep + + + Welcome + Қош келдіңіз + + WelcomeViewStep @@ -3444,4 +3523,46 @@ Output: Қош келдіңіз + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_kn.ts b/lang/calamares_kn.ts index e48841a7f..5ce724633 100644 --- a/lang/calamares_kn.ts +++ b/lang/calamares_kn.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install ಸ್ಥಾಪಿಸು @@ -143,7 +143,7 @@ Calamares::JobThread - + Done @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,174 +252,174 @@ Calamares::ViewManager - - + + &Back ಹಿಂದಿನ - - + + &Next ಮುಂದಿನ - - + + &Cancel ರದ್ದುಗೊಳಿಸು - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? ಅನುಸ್ಥಾಪನೆಯನ್ನು ರದ್ದುಮಾಡುವುದೇ? - + Do you really want to cancel the current setup process? The setup program 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? - + 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 - + &Done - + The installation is complete. Close the installer. - + Error ದೋಷ - + Installation Failed ಅನುಸ್ಥಾಪನೆ ವಿಫಲವಾಗಿದೆ @@ -409,22 +427,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type - + unparseable Python error - + unparseable Python traceback - + Unfetchable Python error. @@ -730,22 +748,22 @@ The installer will quit and all changes will be lost. - + Logical - + Primary - + GPT - + Mountpoint already in use. Please select another one. @@ -753,22 +771,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1062,7 +1080,7 @@ The installer will quit and all changes will be lost. - + Mountpoint already in use. Please select another one. @@ -1098,37 +1116,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information - + Install %1 on <strong>new</strong> %2 system partition. - + 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. @@ -1212,22 +1230,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1610,7 +1628,7 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1635,27 +1653,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) @@ -1663,10 +1681,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1942,7 +2019,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2364,7 +2441,7 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. + There are no partitions to install on. @@ -2429,65 +2506,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -2541,7 +2618,7 @@ Output: - + %1 (%2) language[name] (country[name]) @@ -2557,29 +2634,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2608,69 +2679,69 @@ Output: - + 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. - + %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: @@ -2853,29 +2924,29 @@ Output: SetHostNameJob - + Set hostname %1 - + Set hostname <strong>%1</strong>. - + Setting hostname %1. - - + + Internal Error - - + + Cannot write hostname to target system @@ -2913,82 +2984,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. - + Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. @@ -2996,42 +3067,42 @@ Output: 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. @@ -3228,37 +3299,37 @@ Output: - + Your username is too long. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + Your passwords do not match! @@ -3266,7 +3337,7 @@ Output: UsersViewStep - + Users @@ -3436,6 +3507,14 @@ Output: + + WelcomeQmlViewStep + + + Welcome + + + WelcomeViewStep @@ -3444,4 +3523,46 @@ Output: + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_ko.ts b/lang/calamares_ko.ts index 2ee9b3b8f..d636a723e 100644 --- a/lang/calamares_ko.ts +++ b/lang/calamares_ko.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up 설정 - + Install 설치 @@ -143,7 +143,7 @@ Calamares::JobThread - + Done 완료 @@ -177,36 +177,54 @@ Calamares::PythonJob - + Running %1 operation. %1 명령을 실행중 - + Bad working directory path 잘못된 작업 디렉터리 경로 - + Working directory %1 for python job %2 is not readable. 파이썬 작업 %2에 대한 작업 디렉터리 %1을 읽을 수 없습니다. - + Bad main script file 잘못된 주 스크립트 파일 - + Main script file %1 for python job %2 is not readable. 파이썬 작업 %2에 대한 주 스크립트 파일 %1을 읽을 수 없습니다. - + Boost.Python error in job "%1". 작업 "%1"에서 Boost.Python 오류 + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -232,176 +250,176 @@ Calamares::ViewManager - - + + &Back 뒤로 (&B) - - + + &Next 다음 (&N) - - + + &Cancel 취소 (&C) - + Cancel setup without changing the system. 시스템을 변경 하지 않고 설치를 취소합니다. - + Cancel installation without changing the system. 시스템 변경 없이 설치를 취소합니다. - + Setup Failed 설치 실패 - + Would you like to paste the install log to the web? 설치 로그를 웹에 붙여넣으시겠습니까? - + Install Log Paste URL 로그 붙여넣기 URL 설치 - + The upload was unsuccessful. No web-paste was done. 업로드에 실패했습니다. 웹 붙여넣기가 수행되지 않았습니다. - + Calamares Initialization Failed Calamares 초기화 실패 - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 가 설치될 수 없습니다. Calamares가 모든 구성된 모듈을 불러올 수 없었습니다. 이것은 Calamares가 분포에 의해 사용되는 방식에서 비롯된 문제입니다. - + <br/>The following modules could not be loaded: 다음 모듈 불러오기 실패: - + Continue with installation? 설치를 계속하시겠습니까? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> %1 설치 프로그램이 %2을(를) 설정하기 위해 디스크를 변경하려고 하는 중입니다.<br/><strong>이러한 변경은 취소할 수 없습니다.</strong> - + &Set up now 지금 설치 (&S) - + &Set up 설치 (&S) - + &Install 설치(&I) - + Setup is complete. Close the setup program. 설치가 완료 되었습니다. 설치 프로그램을 닫습니다. - + Cancel setup? 설치를 취소 하시겠습니까? - + Cancel installation? 설치를 취소하시겠습니까? - + Do you really want to cancel the current setup process? The setup program 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 예(&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) - + &Done 완료 (&D) - + The installation is complete. Close the installer. 설치가 완료되었습니다. 설치 관리자를 닫습니다. - + Error 오류 - + Installation Failed 설치 실패 @@ -409,22 +427,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type 알 수 없는 예외 유형 - + unparseable Python error 구문 분석할 수 없는 파이썬 오류 - + unparseable Python traceback 구문 분석할 수 없는 파이썬 역추적 정보 - + Unfetchable Python error. 가져올 수 없는 파이썬 오류 @@ -731,22 +749,22 @@ The installer will quit and all changes will be lost. 암호화 (&c) - + Logical 논리 파티션 - + Primary 파티션 - + GPT GPT - + Mountpoint already in use. Please select another one. 마운트 위치가 이미 사용 중입니다. 다른 위치를 선택해주세요. @@ -754,22 +772,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. %1 파일 시스템으로 %4(%3)에 새 %2MiB 파티션을 만듭니다. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. <strong>%1</strong> 파일 시스템으로 <strong>%4</strong> (%3)에 새 <strong>%2MiB</strong> 파티션을 만듭니다. - + Creating new %1 partition on %2. %2에 새로운 %1 파티션 테이블을 만드는 중입니다. - + The installer failed to create partition on disk '%1'. 디스크 '%1'에 파티션을 생성하지 못했습니다. @@ -1063,7 +1081,7 @@ The installer will quit and all changes will be lost. 플래그: - + Mountpoint already in use. Please select another one. 마운트 위치가 이미 사용 중입니다. 다른 위치를 선택해주세요. @@ -1099,37 +1117,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information 파티션 정보 설정 - + Install %1 on <strong>new</strong> %2 system partition. <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>. 시스템 파티션 <strong>%1</strong>의 %3에 %2를 설치합니다. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. <strong>%2</strong> 마운트 위치를 사용하여 파티션 <strong>%1</strong>의 %3 을 설정합니다. - + Install boot loader on <strong>%1</strong>. <strong>%1</strong>에 부트 로더를 설치합니다. - + Setting up mount points. 마운트 위치를 설정 중입니다. @@ -1213,22 +1231,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. %4의 %1 포맷 파티션(파일 시스템: %2, 크기: %3 MiB) - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. <strong>%3MiB</strong> 파티션 <strong>%1</strong>을 파일 시스템 <strong>%2</strong>로 포맷합니다. - + Formatting partition %1 with file system %2. %1 파티션을 %2 파일 시스템으로 포맷하는 중입니다. - + The installer failed to format partition %1 on disk '%2'. 설치 관리자가 '%2' 디스크에 있는 %1 파티션을 포맷하지 못했습니다. @@ -1278,7 +1296,7 @@ The installer will quit and all changes will be lost. is running the installer as an administrator (root) - + 설치 프로그램을 관리자(루트)로 실행 중입니다 @@ -1293,7 +1311,7 @@ The installer will quit and all changes will be lost. has a screen large enough to show the whole installer - + 전체 설치 프로그램을 표시할 수 있을 만큼 큰 화면이 있습니다 @@ -1436,7 +1454,7 @@ The installer will quit and all changes will be lost. <h1>License Agreement</h1> - + <h1>라이센스 계약</h1> @@ -1446,27 +1464,27 @@ The installer will quit and all changes will be lost. Please review the End User License Agreements (EULAs). - + 최종 사용자 사용권 계약(EULA)을 검토하십시오. This setup procedure will install proprietary software that is subject to licensing terms. - + 이 설정 절차에서는 라이센스 조건에 해당하는 독점 소프트웨어를 설치합니다. If you do not agree with the terms, the setup procedure cannot continue. - + 약관에 동의하지 않으면 설치 절차를 계속할 수 없습니다. This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience. - + 이 설치 절차는 추가 기능을 제공하고 사용자 환경을 향상시키기 위해 라이선스 조건에 따라 독점 소프트웨어를 설치할 수 있습니다. If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead. - + 조건에 동의하지 않으면 독점 소프트웨어가 설치되지 않으며 대신 오픈 소스 대체 소프트웨어가 사용됩니다. @@ -1482,7 +1500,7 @@ The installer will quit and all changes will be lost. URL: %1 - + URL: %1 @@ -1519,17 +1537,17 @@ The installer will quit and all changes will be lost. File: %1 - + 파일: %1 Show the license text - + 라이센스 텍스트 표시 Open license agreement in browser. - + 브라우저에서 라이센스 계약 열기 @@ -1611,8 +1629,8 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. - %1 파티션에서 LUKS 키 파일을 구성할 수 있습니다. + Could not configure LUKS key file on partition %1. + @@ -1636,27 +1654,27 @@ 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) 네트워크 설치. (불가: 패키지 목록을 가져올 수 없습니다. 네트워크 연결을 확인해주세요) - + Network Installation. (Disabled: Received invalid groups data) 네트워크 설치. (불가: 유효하지 않은 그룹 데이터를 수신했습니다) - + Network Installation. (Disabled: Incorrect configuration) 네트워크 설치. (사용안함: 잘못된 환경설정) @@ -1664,10 +1682,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection 패키지 선택 + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1943,7 +2020,7 @@ The installer will quit and all changes will be lost. 알 수 없는 오류 - + Password is empty 비밀번호가 비어 있습니다 @@ -2365,8 +2442,8 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. - 설치할 파티션이 없습니다. + There are no partitions to install on. + @@ -2430,14 +2507,14 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. 명령으로부터 아무런 출력이 없습니다. - + Output: @@ -2446,52 +2523,52 @@ Output: - + External command crashed. 외부 명령이 실패했습니다. - + Command <i>%1</i> crashed. <i>%1</i> 명령이 실패했습니다. - + External command failed to start. 외부 명령을 시작하지 못했습니다. - + Command <i>%1</i> failed to start. <i>%1</i> 명령을 시작하지 못했습니다. - + Internal error when starting command. 명령을 시작하는 중에 내부 오류가 발생했습니다. - + Bad parameters for process job call. 프로세스 작업 호출에 대한 잘못된 매개 변수입니다. - + External command failed to finish. 외부 명령을 완료하지 못했습니다. - + Command <i>%1</i> failed to finish in %2 seconds. <i>%1</i> 명령을 %2초 안에 완료하지 못했습니다. - + External command finished with errors. 외부 명령이 오류와 함께 완료되었습니다. - + Command <i>%1</i> finished with exit code %2. <i>%1</i> 명령이 종료 코드 %2와 함께 완료되었습니다. @@ -2545,7 +2622,7 @@ Output: <i>%1</i> 모듈에 대한 요구사항 검사가 완료되었습니다. - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2561,29 +2638,23 @@ Output: 설명이 제공되지 않았습니다. - - - - - + + + + File not found 파일을 찾을 수 없음 - + Path <pre>%1</pre> must be an absolute path. <pre>%1</pre> 경로는 절대 경로여야 합니다. - + Could not create new random file <pre>%1</pre>. 새 임의 파일 <pre>%1</pre>을(를) 만들 수 없습니다. - - - Could not read random file <pre>%1</pre>. - 임의 파일 <pre>%1</pre>을(를) 읽을 수 없습니다. - RemoveVolumeGroupJob @@ -2612,69 +2683,69 @@ Output: 형식 - + 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. %1의 EFI 시스템 파티션은 %2의 시작으로 사용될 것입니다. - + EFI system partition: EFI 시스템 파티션: @@ -2857,29 +2928,29 @@ Output: 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 시스템의 호스트 이름을 저장할 수 없습니다 @@ -2917,82 +2988,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. 파티션 %1에 플래그를 설정합니다. - + Set flags on %1MiB %2 partition. %1MiB %2 파티션에 플래그 설정. - + Set flags on new partition. 새 파티션에 플래그를 설정합니다. - + Clear flags on partition <strong>%1</strong>. 파티션 <strong>%1</strong>에서 플래그를 지웁니다. - + Clear flags on %1MiB <strong>%2</strong> partition. %1MiB <strong>%2</strong> 파티션에서 플래그를 지웁니다. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. %1MiB <strong>%2</strong> 파티션을 <strong>%3</strong>으로 플래그합니다. - + Clearing flags on %1MiB <strong>%2</strong> partition. %1MiB <strong>%2</strong> 파티션에서 플래그를 지우는 중입니다. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. %1MiB <strong>%2</strong> 파티션에서 플래그 <strong>%3</strong>을 설정합니다. - + Clear flags on new partition. 새 파티션에서 플래그를 지웁니다. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. 파티션 <strong>%1</strong>을 <strong>%2</strong>로 플래그 지정합니다. - + Flag new partition as <strong>%1</strong>. 파티션을 <strong>%1</strong>로 플래그 지정합니다 - + Clearing flags on partition <strong>%1</strong>. 파티션 <strong>%1</strong>에서 플래그를 지우는 중입니다. - + Clearing flags on new partition. 새 파티션에서 플래그를 지우는 중입니다. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. 파티션 <strong>%1</strong>에 플래그를 .<strong>%2</strong>로 설정합니다. - + Setting flags <strong>%1</strong> on new partition. 새 파티션에서 플래그를 <strong>%1</strong>으로 설정합니다. - + The installer failed to set flags on partition %1. 설치 프로그램이 파티션 %1에서 플래그를 설정하지 못했습니다.. @@ -3000,42 +3071,42 @@ Output: 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 오류 코드로 종료되었습니다 @@ -3232,37 +3303,37 @@ Output: <small>둘 이상의 사용자가 이 컴퓨터를 사용할 경우 설치 후 계정을 여러 개 만들 수 있습니다.</small> - + Your username is too long. 사용자 이름이 너무 깁니다. - + Your username must start with a lowercase letter or underscore. 사용자 이름은 소문자 또는 밑줄로 시작해야 합니다. - + Only lowercase letters, numbers, underscore and hyphen are allowed. 소문자, 숫자, 밑줄 및 하이픈만 허용됩니다. - + Only letters, numbers, underscore and hyphen are allowed. 문자, 숫자, 밑줄 및 하이픈만 허용됩니다. - + Your hostname is too short. 호스트 이름이 너무 짧습니다. - + Your hostname is too long. 호스트 이름이 너무 깁니다. - + Your passwords do not match! 암호가 일치하지 않습니다! @@ -3270,7 +3341,7 @@ Output: UsersViewStep - + Users 사용자 @@ -3440,6 +3511,14 @@ Output: %1 지원 + + WelcomeQmlViewStep + + + Welcome + 환영합니다 + + WelcomeViewStep @@ -3448,4 +3527,46 @@ Output: 환영합니다 + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_lo.ts b/lang/calamares_lo.ts index 6d6cddb98..95f3e9a44 100644 --- a/lang/calamares_lo.ts +++ b/lang/calamares_lo.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install @@ -143,7 +143,7 @@ Calamares::JobThread - + Done @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -232,174 +250,174 @@ Calamares::ViewManager - - + + &Back - - + + &Next - - + + &Cancel - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? - + Do you really want to cancel the current setup process? The setup program 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? - + 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 - + &Done - + The installation is complete. Close the installer. - + Error - + Installation Failed @@ -407,22 +425,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type - + unparseable Python error - + unparseable Python traceback - + Unfetchable Python error. @@ -728,22 +746,22 @@ The installer will quit and all changes will be lost. - + Logical - + Primary - + GPT - + Mountpoint already in use. Please select another one. @@ -751,22 +769,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1060,7 +1078,7 @@ The installer will quit and all changes will be lost. - + Mountpoint already in use. Please select another one. @@ -1096,37 +1114,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information - + Install %1 on <strong>new</strong> %2 system partition. - + 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. @@ -1210,22 +1228,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1608,7 +1626,7 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1633,27 +1651,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) @@ -1661,10 +1679,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1940,7 +2017,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2362,7 +2439,7 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. + There are no partitions to install on. @@ -2427,65 +2504,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -2539,7 +2616,7 @@ Output: - + %1 (%2) language[name] (country[name]) @@ -2555,29 +2632,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2606,69 +2677,69 @@ Output: - + 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. - + %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: @@ -2851,29 +2922,29 @@ Output: SetHostNameJob - + Set hostname %1 - + Set hostname <strong>%1</strong>. - + Setting hostname %1. - - + + Internal Error - - + + Cannot write hostname to target system @@ -2911,82 +2982,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. - + Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. @@ -2994,42 +3065,42 @@ Output: 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. @@ -3226,37 +3297,37 @@ Output: - + Your username is too long. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + Your passwords do not match! @@ -3264,7 +3335,7 @@ Output: UsersViewStep - + Users @@ -3434,6 +3505,14 @@ Output: + + WelcomeQmlViewStep + + + Welcome + + + WelcomeViewStep @@ -3442,4 +3521,46 @@ Output: + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_lt.ts b/lang/calamares_lt.ts index 8f084c969..c0e28c132 100644 --- a/lang/calamares_lt.ts +++ b/lang/calamares_lt.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up Sąranka - + Install Diegimas @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Atlikta @@ -177,36 +177,54 @@ 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 scenarijus %1 dėl python %2 užduoties yra neskaitomas - + Boost.Python error in job "%1". Boost.Python klaida užduotyje "%1". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -238,176 +256,176 @@ Calamares::ViewManager - - + + &Back &Atgal - - + + &Next &Toliau - - + + &Cancel A&tsisakyti - + Cancel setup without changing the system. Atsisakyti sąrankos, nieko sistemoje nekeičiant. - + Cancel installation without changing the system. Atsisakyti diegimo, nieko sistemoje nekeičiant. - + Setup Failed Sąranka patyrė nesėkmę - + Would you like to paste the install log to the web? Ar norėtumėte įdėti diegimo žurnalą į saityną? - + Install Log Paste URL Diegimo žurnalo įdėjimo URL - + The upload was unsuccessful. No web-paste was done. Įkėlimas buvo nesėkmingas. Nebuvo atlikta jokio įdėjimo į saityną. - + Calamares Initialization Failed Calamares inicijavimas nepavyko - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. Nepavyksta įdiegti %1. Calamares nepavyko įkelti visų sukonfigūruotų modulių. Tai yra problema, susijusi su tuo, kaip distribucija naudoja diegimo programą Calamares. - + <br/>The following modules could not be loaded: <br/>Nepavyko įkelti šių modulių: - + Continue with installation? Tęsti diegimą? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> %1 sąrankos programa, siekdama nustatyti %2, ketina atlikti pakeitimus diske.<br/><strong>Šių pakeitimų nebegalėsite atšaukti.</strong> - + &Set up now Nu&statyti dabar - + &Set up Nu&statyti - + &Install Į&diegti - + Setup is complete. Close the setup program. Sąranka užbaigta. Užverkite sąrankos programą. - + Cancel setup? Atsisakyti sąrankos? - + Cancel installation? Atsisakyti diegimo? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Ar tikrai norite atsisakyti dabartinio sąrankos proceso? Sąrankos programa užbaigs darbą ir visi pakeitimai bus prarasti. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Ar tikrai norite atsisakyti dabartinio diegimo proceso? 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>Šių pakeitimų nebegalėsite atšaukti.</strong> - + &Install now Į&diegti dabar - + Go &back &Grįžti - + &Done A&tlikta - + The installation is complete. Close the installer. Diegimas užbaigtas. Užverkite diegimo programą. - + Error Klaida - + Installation Failed Diegimas nepavyko @@ -415,22 +433,22 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. CalamaresPython::Helper - + Unknown exception type Nežinomas išimties tipas - + unparseable Python error Nepalyginama Python klaida - + unparseable Python traceback Nepalyginamas Python atsekimas - + Unfetchable Python error. Neatgaunama Python klaida. @@ -737,22 +755,22 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Užši&fruoti - + Logical Loginis - + Primary Pirminis - + GPT GPT - + Mountpoint already in use. Please select another one. Prijungimo taškas jau yra naudojamas. Prašome pasirinkti kitą. @@ -760,22 +778,22 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. Sukurti naują %2MiB skaidinį diske %4 (%3) su %1 failų sistema. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Sukurti naują <strong>%2MiB</strong> skaidinį diske <strong>%4</strong> (%3) su <strong>%1</strong> failų sistema. - + Creating new %1 partition on %2. Kuriamas naujas %1 skaidinys ties %2. - + The installer failed to create partition on disk '%1'. Diegimo programai nepavyko sukurti skaidinio diske '%1'. @@ -1069,7 +1087,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Vėliavėlės: - + Mountpoint already in use. Please select another one. Prijungimo taškas jau yra naudojamas. Prašome pasirinkti kitą. @@ -1105,37 +1123,37 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. FillGlobalStorageJob - + Set partition information Nustatyti skaidinio informaciją - + Install %1 on <strong>new</strong> %2 system partition. Į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. @@ -1219,22 +1237,22 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. Formatuoti skaidinį %1 (failų sistema: %2, dydis: %3 MiB) diske %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. Formatuoti <strong>%3MiB</strong> skaidinį <strong>%1</strong> su <strong>%2</strong> failų sistema. - + Formatting partition %1 with file system %2. Formatuojamas skaidinys %1 su %2 failų sistema. - + The installer failed to format partition %1 on disk '%2'. Diegimo programai nepavyko formatuoti „%2“ disko skaidinio %1. @@ -1617,8 +1635,8 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. - Could configure LUKS key file on partition %1. - Nepavyko konfigūruoti LUKS rakto failo skaidinyje %1. + Could not configure LUKS key file on partition %1. + @@ -1642,27 +1660,27 @@ 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šį) - + Network Installation. (Disabled: Received invalid groups data) Tinklo diegimas. (Išjungtas: Gauti neteisingi grupių duomenys) - + Network Installation. (Disabled: Incorrect configuration) Tinklo diegimas. (Išjungtas: Neteisinga konfigūracija) @@ -1670,10 +1688,69 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. NetInstallViewStep - + + Package selection Paketų pasirinkimas + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1949,7 +2026,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Nežinoma klaida - + Password is empty Slaptažodis yra tuščias @@ -2371,8 +2448,8 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. - There are no partitons to install on. - Nėra skaidinių į kuriuos diegti. + There are no partitions to install on. + @@ -2436,14 +2513,14 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. ProcessResult - + There was no output from the command. Nebuvo jokios išvesties iš komandos. - + Output: @@ -2452,52 +2529,52 @@ Išvestis: - + External command crashed. Išorinė komanda užstrigo. - + Command <i>%1</i> crashed. Komanda <i>%1</i> užstrigo. - + External command failed to start. Nepavyko paleisti išorinės komandos. - + Command <i>%1</i> failed to start. Nepavyko paleisti komandos <i>%1</i>. - + Internal error when starting command. Paleidžiant komandą, įvyko vidinė klaida. - + Bad parameters for process job call. Blogi parametrai proceso užduoties iškvietai. - + External command failed to finish. Nepavyko pabaigti išorinės komandos. - + Command <i>%1</i> failed to finish in %2 seconds. Nepavyko per %2 sek. pabaigti komandos <i>%1</i>. - + External command finished with errors. Išorinė komanda pabaigta su klaidomis. - + Command <i>%1</i> finished with exit code %2. Komanda <i>%1</i> pabaigta su išėjimo kodu %2. @@ -2551,7 +2628,7 @@ Išvestis: Reikalavimų tikrinimas <i>%1</i> moduliui yra užbaigtas. - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2567,29 +2644,23 @@ Išvestis: Nepateikta jokio aprašo. - - - - - + + + + File not found Failas nerastas - + Path <pre>%1</pre> must be an absolute path. Kelias <pre>%1</pre> privalo būti absoliutus kelias. - + Could not create new random file <pre>%1</pre>. Nepavyko sukurti naujo atsitiktinio failo <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - Nepavyko perskaityti atsitiktinio failo <pre>%1</pre>. - RemoveVolumeGroupJob @@ -2618,69 +2689,69 @@ Išvestis: Forma - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. 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: @@ -2863,29 +2934,29 @@ Išvestis: SetHostNameJob - + Set hostname %1 Nustatyti kompiuterio vardą %1 - + Set hostname <strong>%1</strong>. Nustatyti kompiuterio vardą <strong>%1</strong>. - + Setting hostname %1. Nustatomas kompiuterio vardas %1. - - + + Internal Error Vidinė klaida - - + + Cannot write hostname to target system Nepavyko įrašyti kompiuterio vardo į paskirties sistemą @@ -2923,82 +2994,82 @@ Išvestis: SetPartFlagsJob - + Set flags on partition %1. Nustatyti vėliavėles skaidinyje %1. - + Set flags on %1MiB %2 partition. Nustatyti vėliavėles %1MiB skaidinyje %2. - + Set flags on new partition. Nustatyti vėliavėles naujame skaidinyje. - + Clear flags on partition <strong>%1</strong>. Išvalyti vėliavėles skaidinyje <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. Išvalyti vėliavėles %1MiB skaidinyje <strong>%2</strong>. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. Pažymėti vėliavėle %1MiB skaidinį <strong>%2</strong> kaip <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. Išvalomos vėliavėlės %1MiB skaidinyje<strong>%2</strong>. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. Nustatomos vėliavėlės <strong>%3</strong>, %1MiB skaidinyje <strong>%2</strong>. - + Clear flags on new partition. Išvalyti vėliavėles naujame skaidinyje. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Pažymėti vėliavėle skaidinį <strong>%1</strong> kaip <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. Pažymėti vėliavėle naują skaidinį kaip <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. Išvalomos vėliavėlės skaidinyje <strong>%1</strong>. - + Clearing flags on new partition. Išvalomos vėliavėlės naujame skaidinyje. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Nustatomos <strong>%2</strong> vėliavėlės skaidinyje <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. Nustatomos vėliavėlės <strong>%1</strong> naujame skaidinyje. - + The installer failed to set flags on partition %1. Diegimo programai nepavyko nustatyti vėliavėlių skaidinyje %1. @@ -3006,42 +3077,42 @@ Išvestis: 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 rootMountPoint 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. @@ -3238,37 +3309,37 @@ Išvestis: <small>Jei šiuo kompiuteriu naudosis keli žmonės, po diegimo galite sukurti papildomas paskyras.</small> - + Your username is too long. Jūsų naudotojo vardas yra pernelyg ilgas. - + Your username must start with a lowercase letter or underscore. Jūsų naudotojo vardas privalo prasidėti mažąja raide arba pabraukimo brūkšniu. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Yra leidžiamos tik mažosios raidės, skaitmenys, pabraukimo brūkšniai ir brūkšneliai. - + Only letters, numbers, underscore and hyphen are allowed. Yra leidžiamos tik raidės, skaitmenys, pabraukimo brūkšniai ir brūkšneliai. - + Your hostname is too short. Jūsų kompiuterio vardas yra pernelyg trumpas. - + Your hostname is too long. Jūsų kompiuterio vardas yra pernelyg ilgas. - + Your passwords do not match! Jūsų slaptažodžiai nesutampa! @@ -3276,7 +3347,7 @@ Išvestis: UsersViewStep - + Users Naudotojai @@ -3446,6 +3517,14 @@ Išvestis: %1 palaikymas + + WelcomeQmlViewStep + + + Welcome + Pasisveikinimas + + WelcomeViewStep @@ -3454,4 +3533,46 @@ Išvestis: Pasisveikinimas + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_mk.ts b/lang/calamares_mk.ts index f07acb7e2..69409b0f3 100644 --- a/lang/calamares_mk.ts +++ b/lang/calamares_mk.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Инсталирај @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Готово @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,174 +252,174 @@ Calamares::ViewManager - - + + &Back - - + + &Next - - + + &Cancel - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? - + Do you really want to cancel the current setup process? The setup program 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? - + 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 - + &Done - + The installation is complete. Close the installer. Инсталацијата е готова. Исклучете го инсталерот. - + Error Грешка - + Installation Failed @@ -409,22 +427,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type - + unparseable Python error - + unparseable Python traceback - + Unfetchable Python error. @@ -730,22 +748,22 @@ The installer will quit and all changes will be lost. - + Logical - + Primary - + GPT - + Mountpoint already in use. Please select another one. @@ -753,22 +771,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1062,7 +1080,7 @@ The installer will quit and all changes will be lost. - + Mountpoint already in use. Please select another one. @@ -1098,37 +1116,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information - + Install %1 on <strong>new</strong> %2 system partition. - + 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. @@ -1212,22 +1230,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1610,7 +1628,7 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1635,27 +1653,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) @@ -1663,10 +1681,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1942,7 +2019,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2364,7 +2441,7 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. + There are no partitions to install on. @@ -2429,65 +2506,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -2541,7 +2618,7 @@ Output: - + %1 (%2) language[name] (country[name]) @@ -2557,29 +2634,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2608,69 +2679,69 @@ Output: - + 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. - + %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: @@ -2853,29 +2924,29 @@ Output: SetHostNameJob - + Set hostname %1 - + Set hostname <strong>%1</strong>. - + Setting hostname %1. - - + + Internal Error - - + + Cannot write hostname to target system @@ -2913,82 +2984,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. - + Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. @@ -2996,42 +3067,42 @@ Output: 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. @@ -3228,37 +3299,37 @@ Output: - + Your username is too long. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + Your passwords do not match! @@ -3266,7 +3337,7 @@ Output: UsersViewStep - + Users @@ -3436,6 +3507,14 @@ Output: + + WelcomeQmlViewStep + + + Welcome + + + WelcomeViewStep @@ -3444,4 +3523,46 @@ Output: + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_ml.ts b/lang/calamares_ml.ts index ee1b37bea..36fed6ecb 100644 --- a/lang/calamares_ml.ts +++ b/lang/calamares_ml.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up സജ്ജമാക്കുക - + Install ഇൻസ്റ്റാൾ ചെയ്യുക @@ -143,7 +143,7 @@ Calamares::JobThread - + Done പൂർത്തിയായി @@ -177,36 +177,54 @@ Calamares::PythonJob - + Running %1 operation. %1 ക്രിയ നടപ്പിലാക്കുന്നു. - + Bad working directory path പ്രവർത്ഥനരഹിതമായ ഡയറക്ടറി പാത - + Working directory %1 for python job %2 is not readable. പൈതൺ ജോബ് %2 യുടെ പ്രവർത്തന പാതയായ %1 വായിക്കുവാൻ കഴിയുന്നില്ല - + Bad main script file മോശമായ പ്രധാന സ്ക്രിപ്റ്റ് ഫയൽ - + Main script file %1 for python job %2 is not readable. പൈത്തൺ ജോബ് %2 നായുള്ള പ്രധാന സ്ക്രിപ്റ്റ് ഫയൽ %1 വായിക്കാൻ കഴിയുന്നില്ല. - + Boost.Python error in job "%1". "%1" എന്ന പ്രവൃത്തിയില്‍ ബൂസ്റ്റ്.പൈതണ്‍ പിശക് + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,176 +252,176 @@ Calamares::ViewManager - - + + &Back പുറകോട്ട് (&B) - - + + &Next അടുത്തത് (&N) - - + + &Cancel റദ്ദാക്കുക (&C) - + Cancel setup without changing the system. സിസ്റ്റത്തിന് മാറ്റമൊന്നും വരുത്താതെ സജ്ജീകരണപ്രക്രിയ റദ്ദാക്കുക. - + Cancel installation without changing the system. സിസ്റ്റത്തിന് മാറ്റമൊന്നും വരുത്താതെ ഇൻസ്റ്റളേഷൻ റദ്ദാക്കുക. - + Setup Failed സജ്ജീകരണപ്രക്രിയ പരാജയപ്പെട്ടു - + Would you like to paste the install log to the web? ഇൻസ്റ്റാൾ ലോഗ് വെബിലേക്ക് പകർത്തണോ? - + Install Log Paste URL ഇൻസ്റ്റാൾ ലോഗ് പകർപ്പിന്റെ വിലാസം - + The upload was unsuccessful. No web-paste was done. അപ്‌ലോഡ് പരാജയമായിരുന്നു. വെബിലേക്ക് പകർത്തിയില്ല. - + Calamares Initialization Failed കലാമാരേസ് സമാരംഭിക്കൽ പരാജയപ്പെട്ടു - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 ഇൻസ്റ്റാൾ ചെയ്യാൻ കഴിയില്ല. ക്രമീകരിച്ച എല്ലാ മൊഡ്യൂളുകളും ലോഡുചെയ്യാൻ കാലാമറെസിന് കഴിഞ്ഞില്ല. വിതരണത്തിൽ കാലാമറെസ് ഉപയോഗിക്കുന്ന രീതിയിലുള്ള ഒരു പ്രശ്നമാണിത്. - + <br/>The following modules could not be loaded: <br/>താഴെ പറയുന്ന മൊഡ്യൂളുകൾ ലഭ്യമാക്കാനായില്ല: - + Continue with installation? ഇൻസ്റ്റളേഷൻ തുടരണോ? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> %2 സജ്ജീകരിക്കുന്നതിന് %1 സജ്ജീകരണ പ്രോഗ്രാം നിങ്ങളുടെ ഡിസ്കിൽ മാറ്റങ്ങൾ വരുത്താൻ പോകുന്നു.<br/><strong>നിങ്ങൾക്ക് ഈ മാറ്റങ്ങൾ പഴയപടിയാക്കാൻ കഴിയില്ല</strong> - + &Set up now ഉടൻ സജ്ജീകരിക്കുക (&S) - + &Set up സജ്ജീകരിക്കുക (&S) - + &Install ഇൻസ്റ്റാൾ (&I) - + Setup is complete. Close the setup program. സജ്ജീകരണം പൂർത്തിയായി. പ്രയോഗം അടയ്ക്കുക. - + Cancel setup? സജ്ജീകരണം റദ്ദാക്കണോ? - + Cancel installation? ഇൻസ്റ്റളേഷൻ റദ്ദാക്കണോ? - + Do you really want to cancel the current setup process? The setup program 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 വേണം (&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> %2 ഇൻസ്റ്റാളുചെയ്യുന്നതിന് %1 ഇൻസ്റ്റാളർ നിങ്ങളുടെ ഡിസ്കിൽ മാറ്റങ്ങൾ വരുത്താൻ പോകുന്നു.<br/><strong>നിങ്ങൾക്ക് ഈ മാറ്റങ്ങൾ പഴയപടിയാക്കാൻ കഴിയില്ല.</strong> - + &Install now ഉടൻ ഇൻസ്റ്റാൾ ചെയ്യുക (&I) - + Go &back പുറകോട്ടു പോകുക - + &Done ചെയ്‌തു - + The installation is complete. Close the installer. ഇൻസ്റ്റളേഷൻ പൂർത്തിയായി. ഇൻസ്റ്റാളർ അടയ്ക്കുക - + Error പിശക് - + Installation Failed ഇൻസ്റ്റളേഷൻ പരാജയപ്പെട്ടു @@ -411,22 +429,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type അജ്ഞാതമായ പിശക് - + unparseable Python error മനസ്സിലാക്കാനാവാത്ത പൈത്തൺ പിഴവ് - + unparseable Python traceback മനസ്സിലാക്കാനാവാത്ത പൈത്തൺ ട്രേസ്ബാക്ക് - + Unfetchable Python error. ലഭ്യമാക്കാനാവാത്ത പൈത്തൺ പിഴവ്. @@ -733,22 +751,22 @@ The installer will quit and all changes will be lost. എൻക്രിപ്റ്റ് (&c) - + Logical ലോജിക്കൽ - + Primary പ്രാഥമികം - + GPT ജിപിറ്റി - + Mountpoint already in use. Please select another one. മൗണ്ട്പോയിന്റ് നിലവിൽ ഉപയോഗിക്കപ്പെട്ടിരിക്കുന്നു. ദയവായി മറ്റൊരെണ്ണം തിരഞ്ഞെടുക്കൂ. @@ -756,22 +774,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. ഫയൽ സിസ്റ്റം %1 ഉപയോഗിച്ച് %4 (%3) ൽ പുതിയ %2MiB പാർട്ടീഷൻ സൃഷ്ടിക്കുക. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. ഫയൽ സിസ്റ്റം <strong>%1</strong> ഉപയോഗിച്ച് <strong>%4</strong> (%3) ൽ പുതിയ <strong>%2MiB</strong> പാർട്ടീഷൻ സൃഷ്ടിക്കുക. - + Creating new %1 partition on %2. %2 ൽ പുതിയ %1 പാർട്ടീഷൻ സൃഷ്ടിക്കുന്നു. - + The installer failed to create partition on disk '%1'. '%1' ഡിസ്കിൽ പാർട്ടീഷൻ സൃഷ്ടിക്കുന്നതിൽ ഇൻസ്റ്റാളർ പരാജയപ്പെട്ടു. @@ -1065,7 +1083,7 @@ The installer will quit and all changes will be lost. ഫ്ലാഗുകൾ: - + Mountpoint already in use. Please select another one. മൗണ്ട്പോയിന്റ് നിലവിൽ ഉപയോഗിക്കപ്പെട്ടിരിക്കുന്നു. ദയവായി മറ്റൊരെണ്ണം തിരഞ്ഞെടുക്കൂ. @@ -1101,37 +1119,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information പാർട്ടീഷൻ വിവരങ്ങൾ ക്രമീകരിക്കുക - + Install %1 on <strong>new</strong> %2 system partition. <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>%2</strong> മൗണ്ട് പോയിന്റോട് കൂടി %3 പാർട്ടീഷൻ %1 സജ്ജീകരിക്കുക. - + Install boot loader on <strong>%1</strong>. <strong>%1-ൽ</strong> ബൂട്ട് ലോഡർ ഇൻസ്റ്റാൾ ചെയ്യുക. - + Setting up mount points. മൗണ്ട് പോയിന്റുകൾ സജ്ജീകരിക്കുക. @@ -1215,22 +1233,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. %4 -ലുള്ള പാർട്ടീഷൻ %1 (ഫയൽ സിസ്റ്റം: %2, വലുപ്പം:‌%3 MiB) ഫോർമാറ്റ് ചെയ്യുക. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. ഫയൽ സിസ്റ്റം <strong>%2</strong> ഉപയോഗിച്ച് %3 MiB പാർട്ടീഷൻ <strong>%1</strong> ഫോർമാറ്റ് ചെയ്യുക. - + Formatting partition %1 with file system %2. ഫയൽ സിസ്റ്റം %2 ഉപയോഗിച്ച് പാർട്ടീഷൻ‌%1 ഫോർമാറ്റ് ചെയ്യുന്നു. - + The installer failed to format partition %1 on disk '%2'. ഡിസ്ക് '%2'ൽ ഉള്ള പാർട്ടീഷൻ‌ %1 ഫോർമാറ്റ് ചെയ്യുന്നതിൽ ഇൻസ്റ്റാളർ പരാജയപ്പെട്ടു. @@ -1613,8 +1631,8 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. - പാർട്ടീഷൻ %1ൽ LUKS കീ ഫയൽ ക്രമീകരിക്കാം. + Could not configure LUKS key file on partition %1. + @@ -1638,27 +1656,27 @@ 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) നെറ്റ്‌വർക്ക് ഇൻസ്റ്റാളേഷൻ. (അപ്രാപ്‌തമാക്കി: പാക്കേജ് ലിസ്റ്റുകൾ നേടാനായില്ല, നിങ്ങളുടെ നെറ്റ്‌വർക്ക് കണക്ഷൻ പരിശോധിക്കുക) - + Network Installation. (Disabled: Received invalid groups data) നെറ്റ്‌വർക്ക് ഇൻസ്റ്റാളേഷൻ. (അപ്രാപ്‌തമാക്കി: അസാധുവായ ഗ്രൂപ്പുകളുടെ ഡാറ്റ ലഭിച്ചു) - + Network Installation. (Disabled: Incorrect configuration) നെറ്റ്‌വർക്ക് ഇൻസ്റ്റാളേഷൻ. (പ്രവർത്തനരഹിതമാക്കി: തെറ്റായ ക്രമീകരണം) @@ -1666,10 +1684,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection പാക്കേജു് തിരഞ്ഞെടുക്കല്‍ + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1945,7 +2022,7 @@ The installer will quit and all changes will be lost. അപരിചിതമായ പിശക് - + Password is empty രഹസ്യവാക്ക് ശൂന്യമാണ് @@ -2367,8 +2444,8 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. - ഇൻസ്റ്റാൾ ചെയ്യാനായി പാർട്ടീഷനുകളൊന്നുമില്ല. + There are no partitions to install on. + @@ -2432,14 +2509,14 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. ആജ്ഞയിൽ നിന്നും ഔട്ട്പുട്ടൊന്നുമില്ല. - + Output: @@ -2448,52 +2525,52 @@ Output: - + External command crashed. ബാഹ്യമായ ആജ്ഞ തകർന്നു. - + Command <i>%1</i> crashed. ആജ്ഞ <i>%1</i> പ്രവർത്തനരഹിതമായി. - + External command failed to start. ബാഹ്യമായ ആജ്ഞ ആരംഭിക്കുന്നതിൽ പരാജയപ്പെട്ടു. - + Command <i>%1</i> failed to start. <i>%1</i>ആജ്ഞ ആരംഭിക്കുന്നതിൽ പരാജയപ്പെട്ടു. - + Internal error when starting command. ആജ്ഞ ആരംഭിക്കുന്നതിൽ ആന്തരികമായ പിഴവ്. - + Bad parameters for process job call. പ്രക്രിയ ജോലി വിളിയ്ക്ക് ശരിയല്ലാത്ത പരാമീറ്ററുകൾ. - + External command failed to finish. ബാഹ്യമായ ആജ്ഞ പൂർത്തിയാവുന്നതിൽ പരാജയപ്പെട്ടു. - + Command <i>%1</i> failed to finish in %2 seconds. ആജ്ഞ <i>%1</i> %2 സെക്കൻഡുകൾക്കുള്ളിൽ പൂർത്തിയാവുന്നതിൽ പരാജയപ്പെട്ടു. - + External command finished with errors. ബാഹ്യമായ ആജ്ഞ പിഴവുകളോട് കൂടീ പൂർത്തിയായി. - + Command <i>%1</i> finished with exit code %2. ആജ്ഞ <i>%1</i> എക്സിറ്റ് കോഡ് %2ഓട് കൂടി പൂർത്തിയായി. @@ -2547,7 +2624,7 @@ Output: <i>%1</i>മൊഡ്യൂളിനായുള്ള ആവശ്യകതകൾ പരിശോധിക്കൽ പൂർത്തിയായിരിക്കുന്നു. - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2563,29 +2640,23 @@ Output: വിവരണമൊന്നും നൽകിയിട്ടില്ല. - - - - - + + + + File not found ഫയൽ കണ്ടെത്താനായില്ല - + Path <pre>%1</pre> must be an absolute path. <pre>%1</pre> പാഥ് ഒരു പൂർണ്ണമായ പാഥ് ആയിരിക്കണം. - + Could not create new random file <pre>%1</pre>. റാൻഡം ഫയൽ <pre>%1</pre> നിർമ്മിക്കാനായില്ല. - - - Could not read random file <pre>%1</pre>. - റാൻഡം ഫയൽ <pre>%1</pre> വായിക്കാനായില്ല. - RemoveVolumeGroupJob @@ -2614,69 +2685,69 @@ Output: ഫോം - + 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ജിബി എങ്കീലും ഇടമുള്ള ഒരു പാർട്ടീഷൻ തിരഞ്ഞെടുക്കൂ. - + <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/>ഈ സിസ്റ്റത്തിൽ എവിടേയും ഒരു ഇഎഫ്ഐ സിസ്റ്റം പർട്ടീഷൻ കണ്ടെത്താനായില്ല. %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 ലെ ഇഎഫ്ഐ സിസ്റ്റം പാർട്ടീഷൻ %2 ആരംഭിക്കുന്നതിന് ഉപയോഗിക്കും. - + EFI system partition: ഇഎഫ്ഐ സിസ്റ്റം പാർട്ടീഷൻ @@ -2859,29 +2930,29 @@ Output: 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 ടാർഗെറ്റ് സിസ്റ്റത്തിലേക്ക് ഹോസ്റ്റ്നാമം എഴുതാൻ കഴിയില്ല @@ -2919,82 +2990,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. പാർട്ടീഷൻ %1ൽ ഫ്ലാഗുകൾ ക്രമീകരിക്കുക. - + Set flags on %1MiB %2 partition. %1എംബി പാർട്ടീഷൻ %2ൽ ഫ്ലാഗുകൾ ക്രമീകരിക്കുക. - + Set flags on new partition. പുതിയ പാർട്ടീഷനിൽ ഫ്ലാഗുകൾ ക്രമീകരിക്കുക. - + Clear flags on partition <strong>%1</strong>. <strong>%1</strong> പാർട്ടീഷനിലെ ഫ്ലാഗുകൾ നീക്കം ചെയ്യുക. - + Clear flags on %1MiB <strong>%2</strong> partition. %1എംബി <strong>%2</strong> പാർട്ടീഷനിലെ ഫ്ലാഗുകൾ ക്രമീകരിക്കുക. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. %1MiB <strong>%2</strong> പാർട്ടീഷൻ <strong>%3</strong> ആയി ഫ്ലാഗ് ചെയ്യുക. - + Clearing flags on %1MiB <strong>%2</strong> partition. ഫ്ലാഗുകൾ %1MiB <strong>%2</strong> പാർട്ടീഷനിൽ നിർമ്മിക്കുന്നു. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. <strong>%3</strong> ഫ്ലാഗുകൾ %1MiB <strong>%2</strong> പാർട്ടീഷനിൽ ക്രമീകരിക്കുന്നു. - + Clear flags on new partition. പുതിയ പാർട്ടീഷനിലെ ഫ്ലാഗുകൾ മായ്ക്കുക. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. <strong>%1</strong> പാർട്ടീഷനെ <strong>%2</strong> ആയി ഫ്ലാഗ് ചെയ്യുക - + Flag new partition as <strong>%1</strong>. പുതിയ പാർട്ടീഷൻ <strong>%1 </strong>ആയി ഫ്ലാഗുചെയ്യുക. - + Clearing flags on partition <strong>%1</strong>. പാർട്ടീഷൻ <strong>%1</strong>ലെ ഫ്ലാഗുകൾ മായ്ക്കുന്നു. - + Clearing flags on new partition. പുതിയ പാർട്ടീഷനിലെ ഫ്ലാഗുകൾ മായ്ക്കുന്നു. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. <strong>%2</strong> ഫ്ലാഗുകൾ <strong>%1</strong> പാർട്ടീഷനിൽ ക്രമീകരിക്കുക. - + Setting flags <strong>%1</strong> on new partition. <strong>%1</strong> ഫ്ലാഗുകൾ പുതിയ പാർട്ടീഷനിൽ ക്രമീകരിക്കുക. - + The installer failed to set flags on partition %1. പാർട്ടീഷൻ %1ൽ ഫ്ലാഗുകൾ ക്രമീകരിക്കുന്നതിൽ ഇൻസ്റ്റാളർ പരാജയപ്പെട്ടു. @@ -3002,42 +3073,42 @@ Output: 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. passwd പിഴവ് കോഡ്‌ %1 ഓട് കൂടീ അവസാനിച്ചു. - + Cannot set password for user %1. ഉപയോക്താവ് %1നായി രഹസ്യവാക്ക് ക്രമീകരിക്കാനായില്ല. - + usermod terminated with error code %1. usermod പിഴവ് കോഡ്‌ %1 ഓട് കൂടീ അവസാനിച്ചു. @@ -3234,37 +3305,37 @@ Output: <small>ഒന്നിലധികം ആളുകൾ ഈ കമ്പ്യൂട്ടർ ഉപയോഗിക്കുമെങ്കിൽ, താങ്കൾക്ക് ഇൻസ്റ്റളേഷന് ശേഷം നിരവധി അക്കൗണ്ടുകൾ സൃഷ്ടിക്കാം.</small> - + Your username is too long. നിങ്ങളുടെ ഉപയോക്തൃനാമം വളരെ വലുതാണ്. - + Your username must start with a lowercase letter or underscore. താങ്കളുടെ ഉപയോക്തൃനാമം ഒരു ചെറിയ അക്ഷരമോ അണ്ടർസ്കോറോ ഉപയോഗിച്ച് വേണം തുടങ്ങാൻ. - + Only lowercase letters, numbers, underscore and hyphen are allowed. ചെറിയ അക്ഷരങ്ങൾ, അക്കങ്ങൾ, അണ്ടർസ്കോർ, ഹൈഫൺ എന്നിവയേ അനുവദിച്ചിട്ടുള്ളൂ. - + Only letters, numbers, underscore and hyphen are allowed. അക്ഷരങ്ങൾ, അക്കങ്ങൾ, അണ്ടർസ്കോർ, ഹൈഫൺ എന്നിവയേ അനുവദിച്ചിട്ടുള്ളൂ. - + Your hostname is too short. നിങ്ങളുടെ ഹോസ്റ്റ്നാമം വളരെ ചെറുതാണ് - + Your hostname is too long. നിങ്ങളുടെ ഹോസ്റ്റ്നാമം ദൈർഘ്യമേറിയതാണ് - + Your passwords do not match! നിങ്ങളുടെ പാസ്‌വേഡുകൾ പൊരുത്തപ്പെടുന്നില്ല! @@ -3272,7 +3343,7 @@ Output: UsersViewStep - + Users ഉപയോക്താക്കൾ @@ -3442,6 +3513,14 @@ Output: %1 പിന്തുണ + + WelcomeQmlViewStep + + + Welcome + സ്വാഗതം + + WelcomeViewStep @@ -3450,4 +3529,46 @@ Output: സ്വാഗതം + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_mr.ts b/lang/calamares_mr.ts index f472aa7c4..c04841659 100644 --- a/lang/calamares_mr.ts +++ b/lang/calamares_mr.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install अधिष्ठापना @@ -143,7 +143,7 @@ Calamares::JobThread - + Done पूर्ण झाली @@ -177,36 +177,54 @@ Calamares::PythonJob - + Running %1 operation. %1 क्रिया चालवला जातोय - + 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,174 +252,174 @@ Calamares::ViewManager - - + + &Back &मागे - - + + &Next &पुढे - - + + &Cancel &रद्द करा - + Cancel setup without changing the system. - + Cancel installation without changing the system. प्रणालीत बदल न करता अधिष्टापना रद्द करा. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? अधिष्ठापना रद्द करायचे? - + Do you really want to cancel the current setup process? The setup program 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? - + 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 &मागे जा - + &Done &पूर्ण झाली - + The installation is complete. Close the installer. अधिष्ठापना संपूर्ण झाली. अधिष्ठापक बंद करा. - + Error त्रुटी - + Installation Failed अधिष्ठापना अयशस्वी झाली @@ -409,22 +427,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type - + unparseable Python error - + unparseable Python traceback - + Unfetchable Python error. @@ -730,22 +748,22 @@ The installer will quit and all changes will be lost. - + Logical तार्किक - + Primary प्राथमिक - + GPT - + Mountpoint already in use. Please select another one. @@ -753,22 +771,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. %2 वर %1 हे नवीन विभाजन निर्माण करत आहे - + The installer failed to create partition on disk '%1'. @@ -1062,7 +1080,7 @@ The installer will quit and all changes will be lost. - + Mountpoint already in use. Please select another one. @@ -1098,37 +1116,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information - + Install %1 on <strong>new</strong> %2 system partition. - + 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. @@ -1212,22 +1230,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1610,7 +1628,7 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1635,27 +1653,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) @@ -1663,10 +1681,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1942,7 +2019,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2364,7 +2441,7 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. + There are no partitions to install on. @@ -2429,65 +2506,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -2541,7 +2618,7 @@ Output: - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2557,29 +2634,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2608,69 +2679,69 @@ Output: स्वरुप - + 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. - + %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: @@ -2853,29 +2924,29 @@ Output: SetHostNameJob - + Set hostname %1 - + Set hostname <strong>%1</strong>. - + Setting hostname %1. - - + + Internal Error अंतर्गत त्रूटी  - - + + Cannot write hostname to target system @@ -2913,82 +2984,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. - + Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. @@ -2996,42 +3067,42 @@ Output: 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.  %1 या एरर कोडसहित usermod रद्द केले. @@ -3228,37 +3299,37 @@ Output: - + Your username is too long. तुमचा वापरकर्तानाव खूप लांब आहे - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. तुमचा संगणकनाव खूप लहान आहे - + Your hostname is too long. तुमचा संगणकनाव खूप लांब आहे - + Your passwords do not match! तुमचा परवलीशब्द जुळत नाही @@ -3266,7 +3337,7 @@ Output: UsersViewStep - + Users वापरकर्ते @@ -3436,6 +3507,14 @@ Output: %1 पाठबळ + + WelcomeQmlViewStep + + + Welcome + स्वागत + + WelcomeViewStep @@ -3444,4 +3523,46 @@ Output: स्वागत + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_nb.ts b/lang/calamares_nb.ts index dbcdd09e8..87c7aec8d 100644 --- a/lang/calamares_nb.ts +++ b/lang/calamares_nb.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Installer @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Ferdig @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,175 +252,175 @@ Calamares::ViewManager - - + + &Back &Tilbake - - + + &Next &Neste - - + + &Cancel &Avbryt - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? Avbryte installasjon? - + Do you really want to cancel the current setup process? The setup program 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. Vil du virkelig avbryte installasjonen? Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - - + + &Yes &Ja - - + + &No &Nei - + &Close &Lukk - + 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 - + &Done &Ferdig - + The installation is complete. Close the installer. Installasjonen er fullført. Lukk installeringsprogrammet. - + Error Feil - + Installation Failed Installasjon feilet @@ -410,22 +428,22 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. CalamaresPython::Helper - + Unknown exception type Ukjent unntakstype - + unparseable Python error Ikke-kjørbar Python feil - + unparseable Python traceback Ikke-kjørbar Python tilbakesporing - + Unfetchable Python error. Ukjent Python feil. @@ -731,22 +749,22 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + Logical Logisk - + Primary Primær - + GPT GPT - + Mountpoint already in use. Please select another one. @@ -754,22 +772,22 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1063,7 +1081,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + Mountpoint already in use. Please select another one. @@ -1099,37 +1117,37 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. FillGlobalStorageJob - + Set partition information - + Install %1 on <strong>new</strong> %2 system partition. - + 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. @@ -1213,22 +1231,22 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. Formaterer partisjon %1 med filsystem %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1611,7 +1629,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1636,27 +1654,27 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) - + Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) @@ -1664,10 +1682,69 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. NetInstallViewStep - + + Package selection + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1943,7 +2020,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.Ukjent feil - + Password is empty @@ -2365,7 +2442,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - There are no partitons to install on. + There are no partitions to install on. @@ -2430,65 +2507,65 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. Ugyldige parametere for prosessens oppgavekall - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -2542,7 +2619,7 @@ Output: - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2558,29 +2635,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2609,69 +2680,69 @@ Output: Form - + 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. - + %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 kan ikke bli installert på denne partisjonen. - + 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: @@ -2854,29 +2925,29 @@ Output: SetHostNameJob - + Set hostname %1 - + Set hostname <strong>%1</strong>. - + Setting hostname %1. - - + + Internal Error Intern feil - - + + Cannot write hostname to target system @@ -2914,82 +2985,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. - + Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. @@ -2997,42 +3068,42 @@ Output: 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. @@ -3229,37 +3300,37 @@ Output: - + Your username is too long. Brukernavnet ditt er for langt. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + Your passwords do not match! @@ -3267,7 +3338,7 @@ Output: UsersViewStep - + Users Brukere @@ -3437,6 +3508,14 @@ Output: + + WelcomeQmlViewStep + + + Welcome + Velkommen + + WelcomeViewStep @@ -3445,4 +3524,46 @@ Output: Velkommen + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_ne_NP.ts b/lang/calamares_ne_NP.ts index 39de19a3c..aaa6b12b3 100644 --- a/lang/calamares_ne_NP.ts +++ b/lang/calamares_ne_NP.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install @@ -143,7 +143,7 @@ Calamares::JobThread - + Done @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,174 +252,174 @@ Calamares::ViewManager - - + + &Back - - + + &Next - - + + &Cancel - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? - + Do you really want to cancel the current setup process? The setup program 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? - + 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 - + &Done - + The installation is complete. Close the installer. - + Error - + Installation Failed @@ -409,22 +427,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type - + unparseable Python error - + unparseable Python traceback - + Unfetchable Python error. @@ -730,22 +748,22 @@ The installer will quit and all changes will be lost. - + Logical - + Primary - + GPT - + Mountpoint already in use. Please select another one. @@ -753,22 +771,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1062,7 +1080,7 @@ The installer will quit and all changes will be lost. - + Mountpoint already in use. Please select another one. @@ -1098,37 +1116,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information - + Install %1 on <strong>new</strong> %2 system partition. - + 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. @@ -1212,22 +1230,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1610,7 +1628,7 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1635,27 +1653,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) @@ -1663,10 +1681,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1942,7 +2019,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2364,7 +2441,7 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. + There are no partitions to install on. @@ -2429,65 +2506,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -2541,7 +2618,7 @@ Output: - + %1 (%2) language[name] (country[name]) @@ -2557,29 +2634,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2608,69 +2679,69 @@ Output: - + 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. - + %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: @@ -2853,29 +2924,29 @@ Output: SetHostNameJob - + Set hostname %1 - + Set hostname <strong>%1</strong>. - + Setting hostname %1. - - + + Internal Error - - + + Cannot write hostname to target system @@ -2913,82 +2984,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. - + Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. @@ -2996,42 +3067,42 @@ Output: 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. @@ -3228,37 +3299,37 @@ Output: - + Your username is too long. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + Your passwords do not match! @@ -3266,7 +3337,7 @@ Output: UsersViewStep - + Users @@ -3436,6 +3507,14 @@ Output: + + WelcomeQmlViewStep + + + Welcome + + + WelcomeViewStep @@ -3444,4 +3523,46 @@ Output: + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_nl.ts b/lang/calamares_nl.ts index 8ffb382af..6ced05850 100644 --- a/lang/calamares_nl.ts +++ b/lang/calamares_nl.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Installeer @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Gereed @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,175 +252,175 @@ Calamares::ViewManager - - + + &Back &Terug - - + + &Next &Volgende - - + + &Cancel &Afbreken - + Cancel setup without changing the system. - + Cancel installation without changing the system. Installatie afbreken zonder aanpassingen aan het systeem. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed Calamares Initialisatie mislukt - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 kan niet worden geïnstalleerd. Calamares kon niet alle geconfigureerde modules laden. Dit is een probleem met hoe Calamares wordt gebruikt door de distributie. - + <br/>The following modules could not be loaded: <br/>The volgende modules konden niet worden geladen: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install &Installeer - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? Installatie afbreken? - + Do you really want to cancel the current setup process? The setup program 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. 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 - + &Done Voltooi&d - + The installation is complete. Close the installer. De installatie is voltooid. Sluit het installatie-programma. - + Error Fout - + Installation Failed Installatie Mislukt @@ -410,22 +428,22 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. CalamaresPython::Helper - + Unknown exception type Onbekend uitzonderingstype - + unparseable Python error onuitvoerbare Python fout - + unparseable Python traceback onuitvoerbare Python traceback - + Unfetchable Python error. Onbekende Python fout. @@ -731,22 +749,22 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. &Versleutelen - + Logical Logisch - + Primary Primair - + GPT GPT - + Mountpoint already in use. Please select another one. Aankoppelpunt reeds in gebruik. Gelieve een andere te kiezen. @@ -754,22 +772,22 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. Nieuwe %1 partitie aanmaken op %2. - + The installer failed to create partition on disk '%1'. Het installatieprogramma kon geen partitie aanmaken op schijf '%1'. @@ -1063,7 +1081,7 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Vlaggen: - + Mountpoint already in use. Please select another one. Aankoppelpunt reeds in gebruik. Gelieve een andere te kiezen. @@ -1099,37 +1117,37 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. FillGlobalStorageJob - + Set partition information Instellen partitie-informatie - + Install %1 on <strong>new</strong> %2 system partition. 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. @@ -1213,22 +1231,22 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. Partitie %1 formatteren met bestandssysteem %2. - + The installer failed to format partition %1 on disk '%2'. Installatieprogramma heeft gefaald om partitie %1 op schijf %2 te formateren. @@ -1611,7 +1629,7 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1636,27 +1654,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) Netwerkinstallatie. (Uitgeschakeld: ongeldige gegevens over groepen) - + Network Installation. (Disabled: Incorrect configuration) @@ -1664,10 +1682,69 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. NetInstallViewStep - + + Package selection Pakketkeuze + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1943,7 +2020,7 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Onbekende fout - + Password is empty @@ -2365,7 +2442,7 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. - There are no partitons to install on. + There are no partitions to install on. @@ -2430,14 +2507,14 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. ProcessResult - + There was no output from the command. Er was geen uitvoer van de opdracht. - + Output: @@ -2446,52 +2523,52 @@ Uitvoer: - + External command crashed. Externe opdracht is vastgelopen. - + Command <i>%1</i> crashed. Opdracht <i>%1</i> is vastgelopen. - + External command failed to start. Externe opdracht kon niet worden gestart. - + Command <i>%1</i> failed to start. Opdracht <i>%1</i> kon niet worden gestart. - + Internal error when starting command. Interne fout bij het starten van de opdracht. - + Bad parameters for process job call. Onjuiste parameters voor procestaak - + External command failed to finish. Externe opdracht is niet correct beëindigd. - + Command <i>%1</i> failed to finish in %2 seconds. Opdracht <i>%1</i> is niet beëindigd in %2 seconden. - + External command finished with errors. Externe opdracht beëindigd met fouten. - + Command <i>%1</i> finished with exit code %2. Opdracht <i>%1</i> beëindigd met foutcode %2. @@ -2545,7 +2622,7 @@ Uitvoer: - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2561,29 +2638,23 @@ Uitvoer: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2612,69 +2683,69 @@ Uitvoer: Formulier - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. 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: @@ -2857,29 +2928,29 @@ Uitvoer: SetHostNameJob - + Set hostname %1 Instellen hostnaam %1 - + Set hostname <strong>%1</strong>. Instellen hostnaam <strong>%1</strong> - + Setting hostname %1. Hostnaam %1 instellen. - - + + Internal Error Interne Fout - - + + Cannot write hostname to target system Kan de hostnaam niet naar doelsysteem schrijven @@ -2917,82 +2988,82 @@ Uitvoer: SetPartFlagsJob - + Set flags on partition %1. Stel vlaggen in op partitie %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. Stel vlaggen in op nieuwe partitie. - + Clear flags on partition <strong>%1</strong>. Wis vlaggen op partitie <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. Wis vlaggen op nieuwe partitie. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Partitie <strong>%1</strong> als <strong>%2</strong> vlaggen. - + Flag new partition as <strong>%1</strong>. Vlag nieuwe partitie als <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. Vlaggen op partitie <strong>%1</strong> wissen. - + Clearing flags on new partition. Vlaggen op nieuwe partitie wissen. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Vlaggen <strong>%2</strong> op partitie <strong>%1</strong> instellen. - + Setting flags <strong>%1</strong> on new partition. Vlaggen <strong>%1</strong> op nieuwe partitie instellen. - + The installer failed to set flags on partition %1. Het installatieprogramma kon geen vlaggen instellen op partitie %1. @@ -3000,42 +3071,42 @@ Uitvoer: 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 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. @@ -3232,37 +3303,37 @@ Uitvoer: - + Your username is too long. De gebruikersnaam is te lang. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. De hostnaam is te kort. - + Your hostname is too long. De hostnaam is te lang. - + Your passwords do not match! Je wachtwoorden komen niet overeen! @@ -3270,7 +3341,7 @@ Uitvoer: UsersViewStep - + Users Gebruikers @@ -3440,6 +3511,14 @@ Uitvoer: %1 ondersteuning + + WelcomeQmlViewStep + + + Welcome + Welkom + + WelcomeViewStep @@ -3448,4 +3527,46 @@ Uitvoer: Welkom + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_pl.ts b/lang/calamares_pl.ts index e13d05dc1..1b6b69e46 100644 --- a/lang/calamares_pl.ts +++ b/lang/calamares_pl.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Zainstaluj @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Ukończono @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -238,175 +256,175 @@ Calamares::ViewManager - - + + &Back &Wstecz - - + + &Next &Dalej - - + + &Cancel &Anuluj - + Cancel setup without changing the system. - + Cancel installation without changing the system. Anuluj instalację bez dokonywania zmian w systemie. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed Błąd inicjacji programu Calamares - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 nie może zostać zainstalowany. Calamares nie mógł wczytać wszystkich skonfigurowanych modułów. Jest to problem ze sposobem, w jaki Calamares jest używany przez dystrybucję. - + <br/>The following modules could not be loaded: <br/>Następujące moduły nie mogły zostać wczytane: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install Za&instaluj - + Setup is complete. Close the setup program. - + Cancel setup? Anulować ustawianie? - + Cancel installation? Anulować instalację? - + Do you really want to cancel the current setup process? The setup program 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. 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ę - + &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 @@ -414,22 +432,22 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. CalamaresPython::Helper - + Unknown exception type Nieznany rodzaj wyjątku - + unparseable Python error nieparowalny błąd Pythona - + unparseable Python traceback nieparowalny traceback Pythona - + Unfetchable Python error. Nieosiągalny błąd Pythona. @@ -735,22 +753,22 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.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. @@ -758,22 +776,22 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. Tworzenie nowej partycji %1 na %2. - + The installer failed to create partition on disk '%1'. Instalator nie mógł utworzyć partycji na dysku '%1'. @@ -1067,7 +1085,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Flagi: - + Mountpoint already in use. Please select another one. Punkt montowania jest już używany. Proszę wybrać inny. @@ -1103,37 +1121,37 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. FillGlobalStorageJob - + Set partition information Ustaw informacje partycji - + Install %1 on <strong>new</strong> %2 system partition. 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. @@ -1217,22 +1235,22 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. Formatowanie partycji %1 z systemem plików %2. - + The installer failed to format partition %1 on disk '%2'. Instalator nie mógł sformatować partycji %1 na dysku '%2'. @@ -1615,7 +1633,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1640,27 +1658,27 @@ 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ą) - + Network Installation. (Disabled: Received invalid groups data) Instalacja sieciowa. (Niedostępna: Otrzymano nieprawidłowe dane grupowe) - + Network Installation. (Disabled: Incorrect configuration) @@ -1668,10 +1686,69 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. NetInstallViewStep - + + Package selection Wybór pakietów + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1947,7 +2024,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Nieznany błąd - + Password is empty @@ -2369,8 +2446,8 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. - There are no partitons to install on. - Brak partycji, na których można zainstalować. + There are no partitions to install on. + @@ -2434,14 +2511,14 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. ProcessResult - + There was no output from the command. W wyniku polecenia nie ma żadnego rezultatu. - + Output: @@ -2450,52 +2527,52 @@ Wyjście: - + External command crashed. Zewnętrzne polecenie zakończone niepowodzeniem. - + Command <i>%1</i> crashed. Wykonanie polecenia <i>%1</i> nie powiodło się. - + External command failed to start. Nie udało się uruchomić zewnętrznego polecenia. - + Command <i>%1</i> failed to start. Polecenie <i>%1</i> nie zostało uruchomione. - + Internal error when starting command. Wystąpił wewnętrzny błąd podczas uruchamiania polecenia. - + Bad parameters for process job call. Błędne parametry wywołania zadania. - + External command failed to finish. Nie udało się ukończyć zewnętrznego polecenia. - + Command <i>%1</i> failed to finish in %2 seconds. Nie udało się ukończyć polecenia <i>%1</i> w ciągu %2 sekund. - + External command finished with errors. Ukończono zewnętrzne polecenie z błędami. - + Command <i>%1</i> finished with exit code %2. Polecenie <i>%1</i> zostało ukończone z błędem o kodzie %2. @@ -2549,7 +2626,7 @@ Wyjście: - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2565,29 +2642,23 @@ Wyjście: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2616,69 +2687,69 @@ Wyjście: Formularz - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. 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: @@ -2862,29 +2933,29 @@ i nie uruchomi się SetHostNameJob - + Set hostname %1 Ustaw nazwę komputera %1 - + Set hostname <strong>%1</strong>. Ustaw nazwę komputera <strong>%1</strong>. - + Setting hostname %1. Ustawianie nazwy komputera %1. - - + + Internal Error Błąd wewnętrzny - - + + Cannot write hostname to target system Nie można zapisać nazwy komputera w docelowym systemie @@ -2922,82 +2993,82 @@ i nie uruchomi się SetPartFlagsJob - + Set flags on partition %1. Ustaw flagi na partycji %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. Ustaw flagi na nowej partycji. - + Clear flags on partition <strong>%1</strong>. Usuń flagi na partycji <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. Wyczyść flagi na nowej partycji. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Oflaguj partycję <strong>%1</strong> jako <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. Oflaguj nową partycję jako <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. Usuwanie flag na partycji <strong>%1</strong>. - + Clearing flags on new partition. Czyszczenie flag na nowej partycji. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Ustawianie flag <strong>%2</strong> na partycji <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. Ustawianie flag <strong>%1</strong> na nowej partycji. - + The installer failed to set flags on partition %1. Instalator nie mógł ustawić flag na partycji %1. @@ -3005,42 +3076,42 @@ i nie uruchomi się 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. @@ -3237,37 +3308,37 @@ i nie uruchomi się - + Your username is too long. Twoja nazwa użytkownika jest za długa. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Twoja nazwa komputera jest za krótka. - + Your hostname is too long. Twoja nazwa komputera jest za długa. - + Your passwords do not match! Twoje hasła nie są zgodne! @@ -3275,7 +3346,7 @@ i nie uruchomi się UsersViewStep - + Users Użytkownicy @@ -3445,6 +3516,14 @@ i nie uruchomi się Wsparcie %1 + + WelcomeQmlViewStep + + + Welcome + Witamy + + WelcomeViewStep @@ -3453,4 +3532,46 @@ i nie uruchomi się Witamy + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts index 874041e38..65c6c39bc 100644 --- a/lang/calamares_pt_BR.ts +++ b/lang/calamares_pt_BR.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up Configurar - + Install Instalar @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Concluído @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,176 +252,176 @@ Calamares::ViewManager - - + + &Back &Voltar - - + + &Next &Próximo - - + + &Cancel &Cancelar - + Cancel setup without changing the system. Cancelar configuração sem alterar o sistema. - + Cancel installation without changing the system. Cancelar instalação sem modificar o sistema. - + Setup Failed A Configuração Falhou - + Would you like to paste the install log to the web? Deseja colar o registro de instalação na web? - + Install Log Paste URL Colar URL de Registro de Instalação - + The upload was unsuccessful. No web-paste was done. Não foi possível fazer o upload. Nenhuma colagem foi feita na web. - + Calamares Initialization Failed Falha na inicialização do Calamares - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 não pôde ser instalado. O Calamares não conseguiu carregar todos os módulos configurados. Este é um problema com o modo em que o Calamares está sendo utilizado pela distribuição. - + <br/>The following modules could not be loaded: <br/>Os seguintes módulos não puderam ser carregados: - + Continue with installation? Continuar com a instalação? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> O programa de configuração %1 está prestes a fazer mudanças no seu disco de modo a configurar %2.<br/><strong>Você não será capaz de desfazer estas mudanças.</strong> - + &Set up now &Configurar agora - + &Set up &Configurar - + &Install &Instalar - + Setup is complete. Close the setup program. A configuração está completa. Feche o programa de configuração. - + Cancel setup? Cancelar a configuração? - + Cancel installation? Cancelar a instalação? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Você realmente quer cancelar o processo atual de configuração? O programa de configuração será fechado e todas as mudanças serão perdidas. - + 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 Fe&char - + 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 - + &Done Concluí&do - + The installation is complete. Close the installer. A instalação está completa. Feche o instalador. - + Error Erro - + Installation Failed Falha na Instalação @@ -411,22 +429,22 @@ O instalador será fechado e todas as alterações serão perdidas. CalamaresPython::Helper - + Unknown exception type Tipo de exceção desconhecida - + unparseable Python error erro inanalisável do Python - + unparseable Python traceback rastreamento inanalisável do Python - + Unfetchable Python error. Erro inbuscável do Python. @@ -733,22 +751,22 @@ O instalador será fechado e todas as alterações serão perdidas.&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. @@ -756,22 +774,22 @@ O instalador será fechado e todas as alterações serão perdidas. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. Criar nova partição de %2MiB em %4 (%3) com o sistema de arquivos %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Criar nova partição de <strong>%2MiB</strong> em <strong>%4</strong> (%3) com o sistema de arquivos <strong>%1</strong>. - + Creating new %1 partition on %2. Criando nova partição %1 em %2. - + The installer failed to create partition on disk '%1'. O instalador não conseguiu criar partições no disco '%1'. @@ -1065,7 +1083,7 @@ O instalador será fechado e todas as alterações serão perdidas.Marcadores: - + Mountpoint already in use. Please select another one. Ponto de montagem já em uso. Por favor, selecione outro. @@ -1101,37 +1119,37 @@ O instalador será fechado e todas as alterações serão perdidas. FillGlobalStorageJob - + Set partition information Definir informações da partição - + Install %1 on <strong>new</strong> %2 system partition. 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 na 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. @@ -1215,22 +1233,22 @@ O instalador será fechado e todas as alterações serão perdidas. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. Formatar partição %1 (sistema de arquivos: %2, tamanho: %3 MiB) em %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. Formatar partição de <strong>%3MiB</strong> <strong>%1</strong> com o sistema de arquivos <strong>%2</strong>. - + Formatting partition %1 with file system %2. Formatando partição %1 com o sistema de arquivos %2. - + The installer failed to format partition %1 on disk '%2'. O instalador falhou em formatar a partição %1 no disco '%2'. @@ -1613,8 +1631,8 @@ O instalador será fechado e todas as alterações serão perdidas. - Could configure LUKS key file on partition %1. - Pode configurar o arquivo de chave LUKS na partição% 1. + Could not configure LUKS key file on partition %1. + @@ -1638,27 +1656,27 @@ O instalador será fechado 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ção pela Rede. (Desabilitada: Não foi possível adquirir lista de pacotes, verifique sua conexão com a internet) - + Network Installation. (Disabled: Received invalid groups data) Instalação pela Rede. (Desabilitado: Recebidos dados de grupos inválidos) - + Network Installation. (Disabled: Incorrect configuration) Instalação via Rede. (Desabilitada: Configuração incorreta) @@ -1666,10 +1684,69 @@ O instalador será fechado e todas as alterações serão perdidas. NetInstallViewStep - + + Package selection Seleção de pacotes + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1945,7 +2022,7 @@ O instalador será fechado e todas as alterações serão perdidas.Erro desconhecido - + Password is empty A senha está em branco @@ -2367,8 +2444,8 @@ O instalador será fechado e todas as alterações serão perdidas. - There are no partitons to install on. - Não existem partições para a instalação. + There are no partitions to install on. + @@ -2432,14 +2509,14 @@ O instalador será fechado e todas as alterações serão perdidas. ProcessResult - + There was no output from the command. Não houve saída do comando. - + Output: @@ -2448,52 +2525,52 @@ Saída: - + External command crashed. O comando externo falhou. - + Command <i>%1</i> crashed. O comando <i>%1</i> falhou. - + External command failed to start. O comando externo falhou ao iniciar. - + Command <i>%1</i> failed to start. O comando <i>%1</i> falhou ao iniciar. - + Internal error when starting command. Erro interno ao iniciar o comando. - + Bad parameters for process job call. Parâmetros ruins para a chamada da tarefa do processo. - + External command failed to finish. O comando externo falhou ao finalizar. - + Command <i>%1</i> failed to finish in %2 seconds. O comando <i>%1</i> falhou ao finalizar em %2 segundos. - + External command finished with errors. O comando externo foi concluído com erros. - + Command <i>%1</i> finished with exit code %2. O comando <i>%1</i> foi concluído com o código %2. @@ -2547,7 +2624,7 @@ Saída: A verificação de requerimentos para o módulo <i>%1</i> está completa. - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2563,29 +2640,23 @@ Saída: Nenhuma descrição disponível. - - - - - + + + + File not found Arquivo não encontrado - + Path <pre>%1</pre> must be an absolute path. O caminho <pre>%1</pre> deve ser completo. - + Could not create new random file <pre>%1</pre>. Não foi possível criar um novo arquivo aleatório <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - Não foi possível ler o arquivo aleatório <pre>%1</pre>. - RemoveVolumeGroupJob @@ -2614,69 +2685,69 @@ Saída: Formulário - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. 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: @@ -2859,29 +2930,29 @@ Saída: SetHostNameJob - + Set hostname %1 Definir nome da máquina %1 - + Set hostname <strong>%1</strong>. Definir nome da máquina <strong>%1</strong>. - + Setting hostname %1. Definindo nome da máquina %1. - - + + Internal Error Erro interno - - + + Cannot write hostname to target system Não é possível gravar o nome da máquina para o sistema alvo @@ -2919,82 +2990,82 @@ Saída: SetPartFlagsJob - + Set flags on partition %1. Definir marcadores na partição %1. - + Set flags on %1MiB %2 partition. Definir marcadores na partição de %1MiB %2. - + Set flags on new partition. Definir marcadores na nova partição. - + Clear flags on partition <strong>%1</strong>. Limpar marcadores na partição <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. Limpar marcadores na partição de %1MiB <strong>%2</strong>. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. Marcar partição de %1MiB <strong>%2</strong> como <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. Limpando marcadores na partição de %1MiB <strong>%2</strong>. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. Definindo marcadores <strong>%3</strong> na partição de %1MiB <strong>%2</strong>. - + Clear flags on new partition. Limpar marcadores na nova partição. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Marcar partição <strong>%1</strong> como <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. Marcar nova partição como <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. Limpando marcadores na partição <strong>%1</strong>. - + Clearing flags on new partition. Limpando marcadores na nova partição. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Definindo marcadores <strong>%2</strong> na partição <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. Definindo marcadores <strong>%1</strong> na nova partição. - + The installer failed to set flags on partition %1. O instalador falhou em definir marcadores na partição %1. @@ -3002,42 +3073,42 @@ Saída: 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. @@ -3234,37 +3305,37 @@ Saída: <small>Se mais de uma pessoa for utilizar este computador, você poderá criar múltiplas contas após terminar de instalar.</small> - + Your username is too long. O nome de usuário é grande demais. - + Your username must start with a lowercase letter or underscore. Seu nome de usuário deve começar com uma letra maiúscula ou com um sublinhado. - + Only lowercase letters, numbers, underscore and hyphen are allowed. É permitido apenas letras minúsculas, números, sublinhado e hífen. - + Only letters, numbers, underscore and hyphen are allowed. É permitido apenas letras, números, sublinhado e hífen. - + Your hostname is too short. O nome da máquina é muito curto. - + Your hostname is too long. O nome da máquina é muito grande. - + Your passwords do not match! As senhas não estão iguais! @@ -3272,7 +3343,7 @@ Saída: UsersViewStep - + Users Usuários @@ -3442,6 +3513,14 @@ Saída: %1 suporte + + WelcomeQmlViewStep + + + Welcome + Bem-vindo + + WelcomeViewStep @@ -3450,4 +3529,46 @@ Saída: Bem-vindo + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts index 006fa85a3..47c952240 100644 --- a/lang/calamares_pt_PT.ts +++ b/lang/calamares_pt_PT.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up Configuração - + Install Instalar @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Concluído @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,176 +252,176 @@ Calamares::ViewManager - - + + &Back &Voltar - - + + &Next &Próximo - - + + &Cancel &Cancelar - + Cancel setup without changing the system. Cancelar instalação sem alterar o sistema. - + Cancel installation without changing the system. Cancelar instalar instalação sem modificar o sistema. - + Setup Failed Falha de Instalação - + Would you like to paste the install log to the web? Deseja colar o registo de instalação na Web? - + Install Log Paste URL Instalar o URL da pasta de registo - + The upload was unsuccessful. No web-paste was done. O carregamento não teve êxito. Nenhuma pasta da web foi feita. - + Calamares Initialization Failed Falha na Inicialização do Calamares - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 não pode ser instalado. O Calamares não foi capaz de carregar todos os módulos configurados. Isto é um problema da maneira como o Calamares é usado pela distribuição. - + <br/>The following modules could not be loaded: <br/>Os módulos seguintes não puderam ser carregados: - + Continue with installation? Continuar com a instalação? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> O programa de instalação %1 está prestes a fazer alterações no seu disco para configurar o %2.<br/><strong>Você não poderá desfazer essas alterações.</strong> - + &Set up now &Instalar agora - + &Set up &Instalar - + &Install &Instalar - + Setup is complete. Close the setup program. Instalação completa. Feche o programa de instalação. - + Cancel setup? Cancelar instalação? - + Cancel installation? Cancelar a instalação? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Quer mesmo cancelar o processo de instalação atual? O programa de instalação irá fechar todas as alterações serão perdidas. - + 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 - + &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 @@ -411,22 +429,22 @@ O instalador será encerrado e todas as alterações serão perdidas. CalamaresPython::Helper - + Unknown exception type Tipo de exceção desconhecido - + unparseable Python error erro inanalisável do Python - + unparseable Python traceback rasto inanalisável do Python - + Unfetchable Python error. Erro inatingível do Python. @@ -733,22 +751,22 @@ O instalador será encerrado e todas as alterações serão perdidas.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. @@ -756,22 +774,22 @@ O instalador será encerrado e todas as alterações serão perdidas. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. Criando nova partição %1 em %2. - + The installer failed to create partition on disk '%1'. O instalador falhou a criação da partição no disco '%1'. @@ -1065,7 +1083,7 @@ O instalador será encerrado e todas as alterações serão perdidas.Flags: - + Mountpoint already in use. Please select another one. Ponto de montagem já em uso. Por favor selecione outro. @@ -1101,37 +1119,37 @@ O instalador será encerrado e todas as alterações serão perdidas. FillGlobalStorageJob - + Set partition information Definir informação da partição - + Install %1 on <strong>new</strong> %2 system partition. 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. @@ -1215,22 +1233,22 @@ O instalador será encerrado e todas as alterações serão perdidas. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. A formatar partição %1 com sistema de ficheiros %2. - + The installer failed to format partition %1 on disk '%2'. O instalador falhou ao formatar a partição %1 no disco '%2'. @@ -1613,7 +1631,7 @@ O instalador será encerrado e todas as alterações serão perdidas. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1638,27 +1656,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) Instalação de Rede. (Desativada: Recebeu dados de grupos inválidos) - + Network Installation. (Disabled: Incorrect configuration) @@ -1666,10 +1684,69 @@ O instalador será encerrado e todas as alterações serão perdidas. NetInstallViewStep - + + Package selection Seleção de pacotes + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1945,7 +2022,7 @@ O instalador será encerrado e todas as alterações serão perdidas.Erro desconhecido - + Password is empty @@ -2367,8 +2444,8 @@ O instalador será encerrado e todas as alterações serão perdidas. - There are no partitons to install on. - Não há partições para onde instalar. + There are no partitions to install on. + @@ -2432,14 +2509,14 @@ O instalador será encerrado e todas as alterações serão perdidas. ProcessResult - + There was no output from the command. O comando não produziu saída de dados. - + Output: @@ -2448,52 +2525,52 @@ Saída de Dados: - + External command crashed. O comando externo "crashou". - + Command <i>%1</i> crashed. Comando <i>%1</i> "crashou". - + External command failed to start. Comando externo falhou ao iniciar. - + Command <i>%1</i> failed to start. Comando <i>%1</i> falhou a inicialização. - + Internal error when starting command. Erro interno ao iniciar comando. - + Bad parameters for process job call. Maus parâmetros para chamada de processamento de tarefa. - + External command failed to finish. Comando externo falhou a finalização. - + Command <i>%1</i> failed to finish in %2 seconds. Comando <i>%1</i> falhou ao finalizar em %2 segundos. - + External command finished with errors. Comando externo finalizou com erros. - + Command <i>%1</i> finished with exit code %2. Comando <i>%1</i> finalizou com código de saída %2. @@ -2547,7 +2624,7 @@ Saída de Dados: A verificação de requisitos para módulo <i>%1</i> está completa. - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2563,29 +2640,23 @@ Saída de Dados: Nenhuma descrição fornecida. - - - - - + + + + File not found Ficheiro não encontrado - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2614,69 +2685,69 @@ Saída de Dados: Formulário - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. 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: @@ -2859,29 +2930,29 @@ Saída de Dados: SetHostNameJob - + Set hostname %1 Configurar nome da máquina %1 - + Set hostname <strong>%1</strong>. Definir nome da máquina <strong>%1</strong>. - + Setting hostname %1. A definir nome da máquina %1. - - + + Internal Error Erro interno - - + + Cannot write hostname to target system Não é possível escrever o nome da máquina para o sistema selecionado @@ -2919,82 +2990,82 @@ Saída de Dados: SetPartFlagsJob - + Set flags on partition %1. Definir flags na partição %1. - + Set flags on %1MiB %2 partition. Definir flags na partição %1MiB %2. - + Set flags on new partition. Definir flags na nova partição. - + Clear flags on partition <strong>%1</strong>. Limpar flags na partitição <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. Limpar flags na nova partição. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Definir flag da partição <strong>%1</strong> como <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. Nova partição com flag <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. A limpar flags na partição <strong>%1</strong>. - + Clearing flags on new partition. A limpar flags na nova partição. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. A definir flags <strong>%2</strong> na partitição <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. A definir flags <strong>%1</strong> na nova partição. - + The installer failed to set flags on partition %1. O instalador falhou ao definir flags na partição %1. @@ -3002,42 +3073,42 @@ Saída de Dados: 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. @@ -3234,37 +3305,37 @@ Saída de Dados: <small>Se mais de uma pessoa usar este computador, você pode criar várias contas após a instalação.</small> - + Your username is too long. O seu nome de utilizador é demasiado longo. - + Your username must start with a lowercase letter or underscore. O seu nome de utilizador deve começar com uma letra minúscula ou underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Apenas letras minúsculas, números, underscore e hífen são permitidos. - + Only letters, numbers, underscore and hyphen are allowed. Apenas letras, números, underscore e hífen são permitidos. - + Your hostname is too short. O nome da sua máquina é demasiado curto. - + Your hostname is too long. O nome da sua máquina é demasiado longo. - + Your passwords do not match! As suas palavras-passe não coincidem! @@ -3272,7 +3343,7 @@ Saída de Dados: UsersViewStep - + Users Utilizadores @@ -3442,6 +3513,14 @@ Saída de Dados: %1 suporte + + WelcomeQmlViewStep + + + Welcome + Bem-vindo + + WelcomeViewStep @@ -3450,4 +3529,46 @@ Saída de Dados: Bem-vindo + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_ro.ts b/lang/calamares_ro.ts index fc9920802..32aadae02 100644 --- a/lang/calamares_ro.ts +++ b/lang/calamares_ro.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Instalează @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Gata @@ -177,36 +177,54 @@ 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”. + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -236,175 +254,175 @@ Calamares::ViewManager - - + + &Back &Înapoi - - + + &Next &Următorul - - + + &Cancel &Anulează - + Cancel setup without changing the system. - + Cancel installation without changing the system. Anulează instalarea fără schimbarea sistemului. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install Instalează - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? Anulez instalarea? - + Do you really want to cancel the current setup process? The setup program 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. Doriți să anulați procesul curent de instalare? Programul de instalare va ieși, iar toate modificările vor fi pierdute. - - + + &Yes &Da - - + + &No &Nu - + &Close În&chide - + 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 - + &Done &Gata - + The installation is complete. Close the installer. Instalarea este completă. Închide instalatorul. - + Error Eroare - + Installation Failed Instalare eșuată @@ -412,22 +430,22 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. CalamaresPython::Helper - + Unknown exception type Tip de excepție necunoscut - + unparseable Python error Eroare Python neanalizabilă - + unparseable Python traceback Traceback Python neanalizabil - + Unfetchable Python error. Eroare Python nepreluabilă @@ -733,22 +751,22 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.&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. @@ -756,22 +774,22 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. Se creează nouă partiție %1 pe %2. - + The installer failed to create partition on disk '%1'. Programul de instalare nu a putut crea partiția pe discul „%1”. @@ -1065,7 +1083,7 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Flags: - + Mountpoint already in use. Please select another one. Punct de montare existent. Vă rugăm alegeţi altul. @@ -1101,37 +1119,37 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. FillGlobalStorageJob - + Set partition information Setează informația pentru partiție - + Install %1 on <strong>new</strong> %2 system partition. 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. @@ -1215,22 +1233,22 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. Se formatează partiția %1 cu sistemul de fișiere %2. - + The installer failed to format partition %1 on disk '%2'. Programul de instalare nu a putut formata partiția %1 pe discul „%2”. @@ -1613,7 +1631,7 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1638,27 +1656,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) Instalare prin rețea. (Dezactivată: S-au recepționat grupuri de date invalide) - + Network Installation. (Disabled: Incorrect configuration) @@ -1666,10 +1684,69 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. NetInstallViewStep - + + Package selection Selecția pachetelor + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1948,7 +2025,7 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Eroare necunoscuta - + Password is empty @@ -2370,7 +2447,7 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. - There are no partitons to install on. + There are no partitions to install on. @@ -2435,14 +2512,14 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. ProcessResult - + There was no output from the command. Nu a existat nici o iesire din comanda - + Output: @@ -2451,52 +2528,52 @@ Output - + External command crashed. Comanda externă a eșuat. - + Command <i>%1</i> crashed. Comanda <i>%1</i> a eșuat. - + External command failed to start. Comanda externă nu a putut fi pornită. - + Command <i>%1</i> failed to start. Comanda <i>%1</i> nu a putut fi pornită. - + Internal error when starting command. Eroare internă la pornirea comenzii. - + Bad parameters for process job call. Parametri proști pentru apelul sarcinii de proces. - + External command failed to finish. Finalizarea comenzii externe a eșuat. - + Command <i>%1</i> failed to finish in %2 seconds. Comanda <i>%1</i> nu a putut fi finalizată în %2 secunde. - + External command finished with errors. Comanda externă finalizată cu erori. - + Command <i>%1</i> finished with exit code %2. Comanda <i>%1</i> finalizată cu codul de ieșire %2. @@ -2550,7 +2627,7 @@ Output - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2566,29 +2643,23 @@ Output - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2617,69 +2688,69 @@ Output Formular - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. 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: @@ -2862,29 +2933,29 @@ Output SetHostNameJob - + Set hostname %1 Setează hostname %1 - + Set hostname <strong>%1</strong>. Setați un hostname <strong>%1</strong>. - + Setting hostname %1. Se setează hostname %1. - - + + Internal Error Eroare internă - - + + Cannot write hostname to target system Nu se poate scrie hostname pe sistemul țintă @@ -2922,82 +2993,82 @@ Output SetPartFlagsJob - + Set flags on partition %1. Setează flag-uri pentru partiția %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. Setează flagurile pe noua partiție. - + Clear flags on partition <strong>%1</strong>. Șterge flag-urile partiției <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. Elimină flagurile pentru noua partiție. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Marchează partiția <strong>%1</strong> cu flag-ul <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. Marchează noua partiție ca <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. Se șterg flag-urile pentru partiția <strong>%1</strong>. - + Clearing flags on new partition. Se elimină flagurile de pe noua partiție. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Se setează flag-urile <strong>%2</strong> pentru partiția <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. Se setează flagurile <strong>%1</strong> pe noua partiție. - + The installer failed to set flags on partition %1. Programul de instalare a eșuat în setarea flag-urilor pentru partiția %1. @@ -3005,42 +3076,42 @@ Output 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. @@ -3237,37 +3308,37 @@ Output - + Your username is too long. Numele de utilizator este prea lung. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Hostname este prea scurt. - + Your hostname is too long. Hostname este prea lung. - + Your passwords do not match! Parolele nu se potrivesc! @@ -3275,7 +3346,7 @@ Output UsersViewStep - + Users Utilizatori @@ -3445,6 +3516,14 @@ Output %1 suport + + WelcomeQmlViewStep + + + Welcome + Bine ați venit + + WelcomeViewStep @@ -3453,4 +3532,46 @@ Output Bine ați venit + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_ru.ts b/lang/calamares_ru.ts index d8e57a5e7..a1da26312 100644 --- a/lang/calamares_ru.ts +++ b/lang/calamares_ru.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Установить @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Готово @@ -177,36 +177,54 @@ 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::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -238,175 +256,175 @@ Calamares::ViewManager - - + + &Back &Назад - - + + &Next &Далее - - + + &Cancel О&тмена - + Cancel setup without changing the system. Отменить установку без изменения системы. - + Cancel installation without changing the system. Отменить установку без изменения системы. - + Setup Failed Сбой установки - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed Ошибка инициализации Calamares - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. Не удалось установить %1. Calamares не удалось загрузить все сконфигурированные модули. Эта проблема вызвана тем, как ваш дистрибутив использует Calamares. - + <br/>The following modules could not be loaded: <br/>Не удалось загрузить следующие модули: - + Continue with installation? Продолжить установку? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> Программа установки %1 готова внести изменения на Ваш диск, чтобы установить %2.<br/><strong>Отменить эти изменения будет невозможно.</strong> - + &Set up now - + &Set up - + &Install &Установить - + Setup is complete. Close the setup program. Установка завершена. Закройте программу установки. - + Cancel setup? Отменить установку? - + Cancel installation? Отменить установку? - + Do you really want to cancel the current setup process? The setup program 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? Продолжить установку? - + 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 Установка завершилась неудачей @@ -414,22 +432,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type Неизвестный тип исключения - + unparseable Python error неподдающаяся обработке ошибка Python - + unparseable Python traceback неподдающийся обработке traceback Python - + Unfetchable Python error. Неизвестная ошибка Python @@ -735,22 +753,22 @@ The installer will quit and all changes will be lost. Ши&фровать - + Logical Логический - + Primary Основной - + GPT GPT - + Mountpoint already in use. Please select another one. Точка монтирования уже занята. Пожалуйста, выберете другую. @@ -758,22 +776,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. Создать новый раздел %2 MB на %4 (%3) с файловой системой %1. - + Create new <strong>%2MiB</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'. @@ -1067,7 +1085,7 @@ The installer will quit and all changes will be lost. Флаги: - + Mountpoint already in use. Please select another one. Точка монтирования уже занята. Пожалуйста, выберете другую. @@ -1103,37 +1121,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information Установить сведения о разделе - + Install %1 on <strong>new</strong> %2 system partition. Установить %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. Настраиваются точки монтирования. @@ -1217,22 +1235,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. Форматировать раздел %1 (файловая система: %2, размер: %3 МБ) на %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. Форматировать раздел <strong>%1</strong> размером <strong>%3MB</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'. @@ -1615,7 +1633,7 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1640,27 +1658,27 @@ 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) Установка по сети. (Отключено: не удается получить список пакетов, проверьте сетевое подключение) - + Network Installation. (Disabled: Received invalid groups data) Установка по сети. (Отключено: получены неверные сведения о группах) - + Network Installation. (Disabled: Incorrect configuration) @@ -1668,10 +1686,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection Выбор пакетов + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1947,7 +2024,7 @@ The installer will quit and all changes will be lost. Неизвестная ошибка - + Password is empty @@ -2369,8 +2446,8 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. - Нет разделов для установки. + There are no partitions to install on. + @@ -2434,14 +2511,14 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. Вывода из команды не последовало. - + Output: @@ -2450,52 +2527,52 @@ Output: - + External command crashed. Сбой внешней команды. - + Command <i>%1</i> crashed. Сбой команды <i>%1</i>. - + External command failed to start. Не удалось запустить внешнюю команду. - + Command <i>%1</i> failed to start. Не удалось запустить команду <i>%1</i>. - + Internal error when starting command. Внутренняя ошибка при запуске команды. - + Bad parameters for process job call. Неверные параметры для вызова процесса. - + External command failed to finish. Не удалось завершить внешнюю команду. - + Command <i>%1</i> failed to finish in %2 seconds. Команда <i>%1</i> не завершилась за %2 с. - + External command finished with errors. Внешняя команда завершилась с ошибками - + Command <i>%1</i> finished with exit code %2. Команда <i>%1</i> завершилась с кодом %2. @@ -2549,7 +2626,7 @@ Output: Проверка требований для модуля <i>%1</i> завершена. - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2565,29 +2642,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2616,69 +2687,69 @@ Output: Форма - + 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 Гиб. - + <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: @@ -2861,29 +2932,29 @@ Output: 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 Не возможно записать имя компьютера в целевую систему @@ -2921,82 +2992,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. Установить флаги на разделе %1. - + Set flags on %1MiB %2 partition. Установить флаги %1MiB раздела %2. - + Set flags on new partition. Установить флаги нового раздела. - + Clear flags on partition <strong>%1</strong>. Очистить флаги раздела <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. Снять флаги %1MiB раздела <strong>%2</strong>. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. Отметить %1MB раздел <strong>%2</strong> флагом как <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. Снятие флагов %1MiB раздела <strong>%2</strong>. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. Установка флагов <strong>%3</strong> %1MiB раздела <strong>%2</strong>. - + Clear flags on new partition. Сбросить флаги нового раздела. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Отметить раздел <strong>%1</strong> флагом как <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. Отметить новый раздел флагом как <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. Очистка флагов раздела <strong>%1</strong>. - + Clearing flags on new partition. Сброс флагов нового раздела. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Установка флагов <strong>%2</strong> на раздел <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. Установка флагов <strong>%1</strong> нового раздела. - + The installer failed to set flags on partition %1. Установщик не смог установить флаги на раздел %1. @@ -3004,42 +3075,42 @@ Output: 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. @@ -3236,37 +3307,37 @@ Output: <small>Если этот компьютер используется несколькими людьми, Вы сможете создать соответствующие учетные записи сразу после установки.</small> - + Your username is too long. Ваше имя пользователя слишком длинное. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Имя вашего компьютера слишком коротко. - + Your hostname is too long. Имя вашего компьютера слишком длинное. - + Your passwords do not match! Пароли не совпадают! @@ -3274,7 +3345,7 @@ Output: UsersViewStep - + Users Пользователи @@ -3444,6 +3515,14 @@ Output: %1 поддержка + + WelcomeQmlViewStep + + + Welcome + Добро пожаловать + + WelcomeViewStep @@ -3452,4 +3531,46 @@ Output: Добро пожаловать + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_sk.ts b/lang/calamares_sk.ts index 058aa632f..e9995d174 100644 --- a/lang/calamares_sk.ts +++ b/lang/calamares_sk.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up Inštalácia - + Install Inštalácia @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Hotovo @@ -177,36 +177,54 @@ 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“. + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -238,176 +256,176 @@ Calamares::ViewManager - - + + &Back &Späť - - + + &Next Ď&alej - - + + &Cancel &Zrušiť - + Cancel setup without changing the system. Zrušenie inštalácie bez zmien v systéme. - + Cancel installation without changing the system. Zruší inštaláciu bez zmeny systému. - + Setup Failed Inštalácia zlyhala - + Would you like to paste the install log to the web? Chceli by ste vložiť záznam z inštalácie na web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed Zlyhala inicializácia inštalátora Calamares - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. Nie je možné nainštalovať %1. Calamares nemohol načítať všetky konfigurované moduly. Je problém s tým, ako sa Calamares používa pri distribúcii. - + <br/>The following modules could not be loaded: <br/>Nebolo možné načítať nasledujúce moduly - + Continue with installation? Pokračovať v inštalácii? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> Inštalačný program 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> - + &Set up now &Inštalovať teraz - + &Set up &Inštalovať - + &Install _Inštalovať - + Setup is complete. Close the setup program. Inštalácia je dokončená. Zavrite inštalačný program. - + Cancel setup? Zrušiť inštaláciu? - + Cancel installation? Zrušiť inštaláciu? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Naozaj chcete zrušiť aktuálny priebeh inštalácie? Inštalačný program bude ukončený a zmeny budú stratené. - + 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äť - + &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 @@ -415,22 +433,22 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. CalamaresPython::Helper - + Unknown exception type Neznámy typ výnimky - + unparseable Python error Neanalyzovateľná chyba jazyka Python - + unparseable Python traceback Neanalyzovateľný ladiaci výstup jazyka Python - + Unfetchable Python error. Nezískateľná chyba jazyka Python. @@ -737,22 +755,22 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. 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ý. @@ -760,22 +778,22 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. Vytvorenie nového %2MiB oddielu na zariadení %4 (%3) so systémom súborov %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Vytvorenie nového <strong>%2MiB</strong> oddielu na zariadení <strong>%4</strong> (%3) so systémom súborov <strong>%1</strong>. - + Creating new %1 partition on %2. Vytvára sa nový %1 oddiel na zariadení %2. - + The installer failed to create partition on disk '%1'. Inštalátor zlyhal pri vytváraní oddielu na disku „%1“. @@ -1069,7 +1087,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Značky: - + Mountpoint already in use. Please select another one. Bod pripojenia sa už používa. Prosím, vyberte iný. @@ -1105,37 +1123,37 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. FillGlobalStorageJob - + Set partition information Nastaviť informácie o oddieli - + Install %1 on <strong>new</strong> %2 system partition. 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í. @@ -1219,22 +1237,22 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. Naformátovanie oddielu %1 (systém súborov: %2, veľkosť: %3 MiB) na %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. Naformátovanie <strong>%3MiB</strong> oddielu <strong>%1</strong> so systémom súborov <strong>%2</strong>. - + Formatting partition %1 with file system %2. Formátuje sa oddiel %1 so systémom súborov %2. - + The installer failed to format partition %1 on disk '%2'. Inštalátor zlyhal pri formátovaní oddielu %1 na disku „%2“. @@ -1617,7 +1635,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1642,27 +1660,27 @@ 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.) - + Network Installation. (Disabled: Received invalid groups data) Sieťová inštalácia. (Zakázaná: Boli prijaté neplatné údaje o skupinách) - + Network Installation. (Disabled: Incorrect configuration) Sieťová inštalácia. (Zakázaná: Nesprávna konfigurácia) @@ -1670,10 +1688,69 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. NetInstallViewStep - + + Package selection Výber balíkov + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1949,7 +2026,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Neznáma chyba - + Password is empty Heslo je prázdne @@ -2371,8 +2448,8 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. - There are no partitons to install on. - Neexistujú žiadne oddiely, na ktoré je možné vykonať inštaláciu. + There are no partitions to install on. + @@ -2436,14 +2513,14 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. ProcessResult - + There was no output from the command. Žiadny výstup z príkazu. - + Output: @@ -2452,52 +2529,52 @@ Výstup: - + External command crashed. Externý príkaz nečakane skončil. - + Command <i>%1</i> crashed. Príkaz <i>%1</i> nečakane skončil. - + External command failed to start. Zlyhalo spustenie externého príkazu. - + Command <i>%1</i> failed to start. Zlyhalo spustenie príkazu <i>%1</i> . - + Internal error when starting command. Počas spúšťania príkazu sa vyskytla interná chyba. - + Bad parameters for process job call. Nesprávne parametre pre volanie úlohy procesu. - + External command failed to finish. Zlyhalo dokončenie externého príkazu. - + Command <i>%1</i> failed to finish in %2 seconds. Zlyhalo dokončenie príkazu <i>%1</i> počas doby %2 sekúnd. - + External command finished with errors. Externý príkaz bol dokončený s chybami. - + Command <i>%1</i> finished with exit code %2. Príkaz <i>%1</i> skončil s ukončovacím kódom %2. @@ -2551,7 +2628,7 @@ Výstup: Kontrola požiadaviek modulu <i>%1</i> je dokončená. - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2567,29 +2644,23 @@ Výstup: Nie je poskytnutý żiadny popis. - - - - - + + + + File not found Súbor sa nenašiel - + Path <pre>%1</pre> must be an absolute path. Cesta <pre>%1</pre> musí byť úplnou cestou. - + Could not create new random file <pre>%1</pre>. Nepodarilo sa vytvoriť nový náhodný súbor <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - Nepodarilo sa čítať náhodný súbor <pre>%1</pre>. - RemoveVolumeGroupJob @@ -2618,69 +2689,69 @@ Výstup: Forma - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. Vyberte, kam sa má nainštalovať distribúcia %1.<br/><font color="red">Upozornenie: </font>týmto sa odstránia všetky súbory na vybranom oddieli. - + The selected item does not appear to be a valid partition. Zdá sa, že vybraná 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: @@ -2863,29 +2934,29 @@ Výstup: SetHostNameJob - + Set hostname %1 Nastavenie názvu hostiteľa %1 - + Set hostname <strong>%1</strong>. Nastavenie názvu hostiteľa <strong>%1</strong>. - + Setting hostname %1. Nastavuje sa názov hostiteľa %1. - - + + Internal Error Vnútorná chyba - - + + Cannot write hostname to target system Nedá sa zapísať názov hostiteľa do cieľového systému @@ -2923,82 +2994,82 @@ Výstup: SetPartFlagsJob - + Set flags on partition %1. Nastavenie značiek na oddieli %1. - + Set flags on %1MiB %2 partition. Nastavenie značiek na %1MiB oddieli %2. - + Set flags on new partition. Nastavenie značiek na novom oddieli. - + Clear flags on partition <strong>%1</strong>. Vymazanie značiek na oddieli <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. Vymazanie značiek na %1MiB oddieli <strong>%2</strong>. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. Označenie %1MiB oddielu <strong>%2</strong> ako <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. Vymazávajú sa značky na %1MiB oddieli <strong>%2</strong>. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. Nastavujú sa značky <strong>%3</strong> na %1MiB oddieli <strong>%2</strong>. - + Clear flags on new partition. Vymazanie značiek na novom oddieli. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Označenie oddielu <strong>%1</strong> ako <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. Označenie nového oddielu ako <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. Vymazávajú sa značky na oddieli <strong>%1</strong>. - + Clearing flags on new partition. Vymazávajú sa značky na novom oddieli. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Nastavujú sa značky <strong>%2</strong> na oddieli <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. Nastavujú sa značky <strong>%1</strong> na novom oddieli. - + The installer failed to set flags on partition %1. Inštalátor zlyhal pri nastavovaní značiek na oddieli %1. @@ -3006,42 +3077,42 @@ Výstup: 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. @@ -3238,37 +3309,37 @@ Výstup: <small>Ak bude tento počítač používať viac ako jedna osoba, môžete nastaviť viacero účtov po inštalácii.</small> - + Your username is too long. Vaše používateľské meno je príliš dlhé. - + Your username must start with a lowercase letter or underscore. Vaše používateľské meno musí začínať malým písmenom alebo podčiarkovníkom. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Váš názov hostiteľa je príliš krátky. - + Your hostname is too long. Váš názov hostiteľa je príliš dlhý. - + Your passwords do not match! Vaše heslá sa nezhodujú! @@ -3276,7 +3347,7 @@ Výstup: UsersViewStep - + Users Používatelia @@ -3446,6 +3517,14 @@ Výstup: Podpora distribúcie %1 + + WelcomeQmlViewStep + + + Welcome + Uvítanie + + WelcomeViewStep @@ -3454,4 +3533,46 @@ Výstup: Uvítanie + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_sl.ts b/lang/calamares_sl.ts index bc9ff4a94..f17ae2b0b 100644 --- a/lang/calamares_sl.ts +++ b/lang/calamares_sl.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Namesti @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Končano @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -238,175 +256,175 @@ Calamares::ViewManager - - + + &Back &Nazaj - - + + &Next &Naprej - - + + &Cancel - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? Preklic namestitve? - + Do you really want to cancel the current setup process? The setup program 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. 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 - + &Done - + The installation is complete. Close the installer. - + Error Napaka - + Installation Failed Namestitev je spodletela @@ -414,22 +432,22 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. CalamaresPython::Helper - + Unknown exception type Neznana vrsta izjeme - + unparseable Python error nerazčlenljiva napaka Python - + unparseable Python traceback - + Unfetchable Python error. @@ -735,22 +753,22 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + Logical Logičen - + Primary Primaren - + GPT GPT - + Mountpoint already in use. Please select another one. @@ -758,22 +776,22 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. Namestilniku ni uspelo ustvariti razdelka na disku '%1'. @@ -1067,7 +1085,7 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. Zastavice: - + Mountpoint already in use. Please select another one. @@ -1103,37 +1121,37 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. FillGlobalStorageJob - + Set partition information Nastavi informacije razdelka - + Install %1 on <strong>new</strong> %2 system partition. - + 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. @@ -1217,22 +1235,22 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. Namestilniku ni uspelo formatirati razdelka %1 na disku '%2'. @@ -1615,7 +1633,7 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1640,27 +1658,27 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. NetInstallPage - + Name Ime - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) - + Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) @@ -1668,10 +1686,69 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. NetInstallViewStep - + + Package selection + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1947,7 +2024,7 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + Password is empty @@ -2369,7 +2446,7 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - There are no partitons to install on. + There are no partitions to install on. @@ -2434,65 +2511,65 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. Nepravilni parametri za klic procesa opravila. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -2546,7 +2623,7 @@ Output: - + %1 (%2) language[name] (country[name]) @@ -2562,29 +2639,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2613,69 +2684,69 @@ Output: Oblika - + 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. - + %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: @@ -2858,29 +2929,29 @@ Output: SetHostNameJob - + Set hostname %1 - + Set hostname <strong>%1</strong>. - + Setting hostname %1. - - + + Internal Error - - + + Cannot write hostname to target system @@ -2918,82 +2989,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. - + Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. @@ -3001,42 +3072,42 @@ Output: 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. @@ -3233,37 +3304,37 @@ Output: - + Your username is too long. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + Your passwords do not match! @@ -3271,7 +3342,7 @@ Output: UsersViewStep - + Users @@ -3441,6 +3512,14 @@ Output: + + WelcomeQmlViewStep + + + Welcome + Dobrodošli + + WelcomeViewStep @@ -3449,4 +3528,46 @@ Output: Dobrodošli + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_sq.ts b/lang/calamares_sq.ts index ca29a662a..e1cbca6b5 100644 --- a/lang/calamares_sq.ts +++ b/lang/calamares_sq.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up Ujdise - + Install Instaloje @@ -143,7 +143,7 @@ Calamares::JobThread - + Done U bë @@ -177,36 +177,54 @@ Calamares::PythonJob - + Running %1 operation. Po xhirohet %1 veprim. - + Bad working directory path Shteg i gabuar drejtorie pune - + Working directory %1 for python job %2 is not readable. Drejtoria e punës %1 për aktin python %2 s’është e lexueshme. - + Bad main script file Kartelë kryesore programthi e dëmtuar - + Main script file %1 for python job %2 is not readable. Kartela kryesore e programthit file %1 për aktin python %2 s’është e lexueshme. - + Boost.Python error in job "%1". Gabim Boost.Python tek akti \"%1\". + + Calamares::QmlViewStep + + + Loading ... + Po ngarkohet … + + + + QML Step <i>%1</i>. + Hapi QML <i>%1</i>. + + + + Loading failed. + Ngarkimi dështoi. + + Calamares::RequirementsChecker @@ -234,176 +252,176 @@ Calamares::ViewManager - - + + &Back &Mbrapsht - - + + &Next Pas&uesi - - + + &Cancel &Anuloje - + Cancel setup without changing the system. Anuloje rregullimin pa ndryshuar sistemin. - + Cancel installation without changing the system. Anuloje instalimin pa ndryshuar sistemin. - + Setup Failed Rregullimi Dështoi - + Would you like to paste the install log to the web? Do të donit të hidhet në web regjistri i instalimit? - + Install Log Paste URL URL Ngjitjeje Regjistri Instalimi - + The upload was unsuccessful. No web-paste was done. Ngarkimi s’qe i suksesshëm. S’u bë hedhje në web. - + Calamares Initialization Failed Gatitja e Calamares-it Dështoi - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 s’mund të instalohet. Calamares s’qe në gjendje të ngarkonte krejt modulet e konfiguruar. Ky është një problem që lidhet me mënyrën se si përdoret Calamares nga shpërndarja. - + <br/>The following modules could not be loaded: <br/>S’u ngarkuan dot modulet vijues: - + Continue with installation? Të vazhdohet me instalimin? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> Programi i rregullimit %1 është një hap larg nga bërja e ndryshimeve në diskun tuaj, që të mund të rregullojë %2.<br/><strong>S’do të jeni në gjendje t’i zhbëni këto ndryshime.</strong> - + &Set up now &Rregulloje tani - + &Set up &Rregulloje - + &Install &Instaloje - + Setup is complete. Close the setup program. Rregullimi është i plotë. Mbylleni programin e rregullimit. - + Cancel setup? Të anulohet rregullimi? - + Cancel installation? Të anulohet instalimi? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Doni vërtet të anulohet procesi i tanishëm i rregullimit? Programi i rregullimit do të mbyllet dhe krejt ndryshimet do të humbin. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Doni vërtet të anulohet procesi i tanishëm i instalimit? Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. - - + + &Yes &Po - - + + &No &Jo - + &Close &Mbylle - + Continue with setup? Të vazhdohet me rregullimin? - + 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> Instaluesi %1 është një hap larg nga bërja e ndryshimeve në diskun tuaj, që të mund të instalojë %2.<br/><strong>S’do të jeni në gjendje t’i zhbëni këto ndryshime.</strong> - + &Install now &Instaloje tani - + Go &back Kthehu &mbrapsht - + &Done &U bë - + The installation is complete. Close the installer. Instalimi u plotësua. Mbylle instaluesin. - + Error Gabim - + Installation Failed Instalimi Dështoi @@ -411,22 +429,22 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. CalamaresPython::Helper - + Unknown exception type Lloj i panjohur përjashtimi - + unparseable Python error Gabim kodi Python të papërtypshëm - + unparseable Python traceback <i>Traceback</i> Python i papërtypshëm - + Unfetchable Python error. Gabim Python mosprurjeje kodi. @@ -733,22 +751,22 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. &Fshehtëzoje - + Logical Logjik - + Primary Parësor - + GPT GPT - + Mountpoint already in use. Please select another one. Pikë montimi tashmë e përdorur. Ju lutemi, përzgjidhni një tjetër. @@ -756,22 +774,22 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. Krijo pjesë të re %2MiB te %4 (%3) me sistem kartelash %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Krijo pjesë të re <strong>%2MiB</strong> te <strong>%4</strong> (%3) me sistem kartelash <strong>%1</strong>. - + Creating new %1 partition on %2. Po krijohet pjesë e re %1 te %2. - + The installer failed to create partition on disk '%1'. Instaluesi s’arriti të krijojë pjesë në diskun '%1'. @@ -1065,7 +1083,7 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Flamurka: - + Mountpoint already in use. Please select another one. Pikë montimi tashmë e përdorur. Ju lutemi, përzgjidhni një tjetër. @@ -1101,37 +1119,37 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. FillGlobalStorageJob - + Set partition information Caktoni të dhëna pjese - + Install %1 on <strong>new</strong> %2 system partition. Instaloje %1 në pjesë sistemi <strong>të re</strong> %2. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Rregullo pjesë të <strong>re</strong> %2 me pikë montimi <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. Instaloje %2 te pjesa e sistemit %3 <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Rregullo pjesë %3 <strong>%1</strong> me pikë montimi <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Instalo ngarkues nisjesh në <strong>%1</strong>. - + Setting up mount points. Po rregullohen pika montimesh. @@ -1215,22 +1233,22 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. Formatoje pjesën %1 (sistem kartelash: %2, madhësi: %3 MiB) në %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. Formato pjesën <strong>%3MiB</strong> <strong>%1</strong> me sistem kartelash <strong>%2</strong>. - + Formatting partition %1 with file system %2. Po formatohet pjesa %1 me sistem kartelash %2. - + The installer failed to format partition %1 on disk '%2'. Instaluesi s’arriti të formatojë pjesën %1 në diskun '%2'. @@ -1613,8 +1631,8 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. - Could configure LUKS key file on partition %1. - Mund të formësohej kartelë kyçesh LUKS në pjesën %1. + Could not configure LUKS key file on partition %1. + S’u formësua dot kartelë kyçesh LUKS te pjesën %1. @@ -1638,27 +1656,27 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. NetInstallPage - + Name Emër - + Description Përshkrim - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalim Nga Rrjeti. (U çaktivizua: S’arrihet të sillen lista paketash, kontrolloni lidhjen tuaj në rrjet) - + Network Installation. (Disabled: Received invalid groups data) Instalim Nga Rrjeti. (U çaktivizua: U morën të dhëna të pavlefshme grupesh) - + Network Installation. (Disabled: Incorrect configuration) Instalim Nga Rrjeti. (E çaktivizuar: Formësim i pasaktë) @@ -1666,10 +1684,69 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. NetInstallViewStep - + + Package selection Përzgjedhje paketash + + + Office software + Software zyrash + + + + Office package + Paketë zyrash + + + + Browser software + Software shfletuesi + + + + Browser package + Paketë shfletuesi + + + + Web browser + Shfletues + + + + Kernel + Kernel + + + + Services + Shërbime + + + + Login + Hyrje + + + + Desktop + Desktop + + + + Applications + Aplikacione + + + + NotesQmlViewStep + + + Notes + Shënime + OEMPage @@ -1945,7 +2022,7 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Gabim i panjohur - + Password is empty Fjalëkalimi është i zbrazët @@ -2367,7 +2444,7 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. - There are no partitons to install on. + There are no partitions to install on. S’ka pjesë ku të instalohet. @@ -2432,14 +2509,14 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. ProcessResult - + There was no output from the command. S’pati përfundim nga urdhri. - + Output: @@ -2448,52 +2525,52 @@ Përfundim: - + External command crashed. Urdhri i jashtëm u vithis. - + Command <i>%1</i> crashed. Urdhri <i>%1</i> u vithis. - + External command failed to start. Dështoi nisja e urdhrit të jashtëm. - + Command <i>%1</i> failed to start. Dështoi nisja e urdhrit <i>%1</i>. - + Internal error when starting command. Gabim i brendshëm kur niset urdhri. - + Bad parameters for process job call. Parametra të gabuar për thirrje akti procesi. - + External command failed to finish. S’u arrit të përfundohej urdhër i jashtëm. - + Command <i>%1</i> failed to finish in %2 seconds. Urdhri <i>%1</i> s’arriti të përfundohej në %2 sekonda. - + External command finished with errors. Urdhri i jashtë përfundoi me gabime. - + Command <i>%1</i> finished with exit code %2. Urdhri <i>%1</i> përfundoi me kod daljeje %2. @@ -2547,7 +2624,7 @@ Përfundim: Kontrolli i domosdoshmërive për modulin <i>%1</i> u plotësua. - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2563,29 +2640,23 @@ Përfundim: S’u dha përshkrim. - - - - - + + + + File not found S’u gjet kartelë - + Path <pre>%1</pre> must be an absolute path. Shtegu <pre>%1</pre> duhet të jetë shteg absolut. - + Could not create new random file <pre>%1</pre>. S’u krijua dot kartelë e re kuturu <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - S’u lexua dot kartelë kuturu <pre>%1</pre>. - RemoveVolumeGroupJob @@ -2614,69 +2685,69 @@ Përfundim: Formular - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. Përzgjidhni ku të instalohet %1.<br/><font color=\"red\">Kujdes: </font>kjo do të sjellë fshirjen e krejt kartelave në pjesën e përzgjedhur. - + The selected item does not appear to be a valid partition. Objekti i përzgjedhur s’duket se është pjesë e vlefshme. - + %1 cannot be installed on empty space. Please select an existing partition. %1 s’mund të instalohet në hapësirë të zbrazët. Ju lutemi, përzgjidhni një pjesë ekzistuese. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 s’mund të instalohet në një pjesë të llojit extended. Ju lutemi, përzgjidhni një pjesë parësore ose logjike ekzistuese. - + %1 cannot be installed on this partition. %1 s’mund të instalohet në këtë pjesë. - + Data partition (%1) Pjesë të dhënash (%1) - + Unknown system partition (%1) Pjesë sistemi e panjohur (%1) - + %1 system partition (%2) Pjesë sistemi %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/>Ndarja %1 është shumë e vogël për %2. Ju lutemi, përzgjidhni një pjesë me kapacitet të paktën %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ë këtë sistem s’gjendet dot ndonjë pjesë sistemi EFI. Ju lutemi, që të rregulloni %1, kthehuni mbrapsht dhe përdorni procesin e pjesëzimit dorazi. - - - + + + <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 do të instalohet në %2.<br/><font color=\"red\">Kujdes: </font>krejt të dhënat në pjesën %2 do të humbin. - + The EFI system partition at %1 will be used for starting %2. Për nisjen e %2 do të përdoret ndarja EFI e sistemit te %1. - + EFI system partition: Pjesë Sistemi EFI: @@ -2859,29 +2930,29 @@ Përfundim: SetHostNameJob - + Set hostname %1 Cakto strehëemër %1 - + Set hostname <strong>%1</strong>. Cakto strehëemër <strong>%1</strong>. - + Setting hostname %1. Po caktohet strehëemri %1. - - + + Internal Error Gabim i Brendshëm - - + + Cannot write hostname to target system S’shkruhet dot strehëemër te sistemi i synuar @@ -2919,82 +2990,82 @@ Përfundim: SetPartFlagsJob - + Set flags on partition %1. Vendos flamurka në pjesën %1. - + Set flags on %1MiB %2 partition. Vendos flamurka në pjesën %1MiB %2.` - + Set flags on new partition. Vendos flamurka në pjesë të re. - + Clear flags on partition <strong>%1</strong>. Hiqi flamurkat te ndarja <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. Hiqi flamurkat te pjesa %1MiB <strong>%2</strong>. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. Vëri flamurkë pjesës %1MiB <strong>%2</strong> si <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. Po hiqen flamurkat në pjesën %1MiB <strong>%2</strong>. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. Po vihen flamurkat <strong>%3</strong> në pjesën %1MiB <strong>%2</strong>. - + Clear flags on new partition. Hiqi flamurkat te ndarja e re. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Vëri flamurkë pjesës <strong>%1</strong> si <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. Vëri flamurkë pjesës së re si <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. Po hiqen flamurkat në pjesën <strong>%1</strong>. - + Clearing flags on new partition. Po hiqen flamurkat në pjesën e re. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Po vihen flamurkat <strong>%2</strong> në pjesën <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. Po vihen flamurkat <strong>%1</strong> në pjesën e re. - + The installer failed to set flags on partition %1. Instaluesi s’arriti të vërë flamurka në pjesën %1. @@ -3002,42 +3073,42 @@ Përfundim: SetPasswordJob - + Set password for user %1 Caktoni fjalëkalim për përdoruesin %1 - + Setting password for user %1. Po caktohet fjalëkalim për përdoruesin %1. - + Bad destination system path. Shteg i gabuar destinacioni sistemi. - + rootMountPoint is %1 rootMountPoint është %1 - + Cannot disable root account. S’mund të çaktivizohet llogaria rrënjë. - + passwd terminated with error code %1. passwd përfundoi me kod gabimi %1. - + Cannot set password for user %1. S’caktohet dot fjalëkalim për përdoruesin %1. - + usermod terminated with error code %1. usermod përfundoi me kod gabimi %1. @@ -3234,37 +3305,37 @@ Përfundim: <small>Nëse këtë kompjuter do ta përdorë më shumë se një person, mund të krijoni disa llogari, pas instalimit.</small> - + Your username is too long. Emri juaj i përdoruesit është shumë i gjatë. - + Your username must start with a lowercase letter or underscore. Emri juaj i përdoruesit duhet të fillojë me një shkronjë të vogël ose nënvijë. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Lejohen vetëm shkronja të vogla, numra, nënvijë dhe vijë ndarëse. - + Only letters, numbers, underscore and hyphen are allowed. Lejohen vetëm shkronja, numra, nënvijë dhe vijë ndarëse. - + Your hostname is too short. Strehëemri juaj është shumë i shkurtër. - + Your hostname is too long. Strehëemri juaj është shumë i gjatë. - + Your passwords do not match! Fjalëkalimet tuaj s’përputhen! @@ -3272,7 +3343,7 @@ Përfundim: UsersViewStep - + Users Përdorues @@ -3442,6 +3513,14 @@ Përfundim: Asistencë %1 + + WelcomeQmlViewStep + + + Welcome + Mirë se vini + + WelcomeViewStep @@ -3450,4 +3529,47 @@ Përfundim: Mirë se vini + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + <h3>%1</h3> + <p>Ky është një shembull shënimesh hedhjeje në qarkullim.</p> + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + <h3>%1 <quote>%2</quote></h3> + + + + About + Mbi + + + + Support + Asistencë + + + + Known issues + Probleme të njohura + + + + Release notes + Shënime hedhjeje në qarkullim + + + + Donate + Dhuroni + + diff --git a/lang/calamares_sr.ts b/lang/calamares_sr.ts index ccad2d11d..b96ae6055 100644 --- a/lang/calamares_sr.ts +++ b/lang/calamares_sr.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Инсталирај @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Завршено @@ -177,36 +177,54 @@ 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“. + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -236,175 +254,175 @@ Calamares::ViewManager - - + + &Back &Назад - - + + &Next &Следеће - - + + &Cancel &Откажи - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? Отказати инсталацију? - + Do you really want to cancel the current setup process? The setup program 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? Наставити са подешавањем? - + 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 Иди &назад - + &Done - + The installation is complete. Close the installer. - + Error Грешка - + Installation Failed Инсталација није успела @@ -412,22 +430,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type Непознат тип изузетка - + unparseable Python error - + unparseable Python traceback - + Unfetchable Python error. @@ -733,22 +751,22 @@ The installer will quit and all changes will be lost. - + Logical Логичка - + Primary Примарна - + GPT GPT - + Mountpoint already in use. Please select another one. @@ -756,22 +774,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. Инсталација није успела да направи партицију на диску '%1'. @@ -1065,7 +1083,7 @@ The installer will quit and all changes will be lost. - + Mountpoint already in use. Please select another one. @@ -1101,37 +1119,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information - + Install %1 on <strong>new</strong> %2 system partition. - + 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. @@ -1215,22 +1233,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1613,7 +1631,7 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1638,27 +1656,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) @@ -1666,10 +1684,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection Избор пакета + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1945,7 +2022,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2367,7 +2444,7 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. + There are no partitions to install on. @@ -2432,65 +2509,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. Лоши параметри при позиву посла процеса. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -2544,7 +2621,7 @@ Output: - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2560,29 +2637,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2611,69 +2682,69 @@ Output: Форма - + 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. - + %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: @@ -2856,29 +2927,29 @@ Output: SetHostNameJob - + Set hostname %1 - + Set hostname <strong>%1</strong>. - + Setting hostname %1. - - + + Internal Error Интерна грешка - - + + Cannot write hostname to target system @@ -2916,82 +2987,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. - + Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. @@ -2999,42 +3070,42 @@ Output: 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. @@ -3231,37 +3302,37 @@ Output: - + Your username is too long. Ваше корисничко име је предугачко. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Име вашег "домаћина" - hostname је прекратко. - + Your hostname is too long. Ваше име домаћина је предуго - hostname - + Your passwords do not match! Лозинке се не поклапају! @@ -3269,7 +3340,7 @@ Output: UsersViewStep - + Users Корисници @@ -3439,6 +3510,14 @@ Output: %1 подршка + + WelcomeQmlViewStep + + + Welcome + Добродошли + + WelcomeViewStep @@ -3447,4 +3526,46 @@ Output: Добродошли + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_sr@latin.ts b/lang/calamares_sr@latin.ts index 19d76b38a..f09df46f3 100644 --- a/lang/calamares_sr@latin.ts +++ b/lang/calamares_sr@latin.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install Instaliraj @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Gotovo @@ -177,36 +177,54 @@ 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 + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -236,175 +254,175 @@ Calamares::ViewManager - - + + &Back &Nazad - - + + &Next &Dalje - - + + &Cancel &Prekini - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? Prekini instalaciju? - + Do you really want to cancel the current setup process? The setup program 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. 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 - + &Done - + The installation is complete. Close the installer. - + Error Greška - + Installation Failed Neuspješna instalacija @@ -412,22 +430,22 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. CalamaresPython::Helper - + Unknown exception type Nepoznat tip izuzetka - + unparseable Python error unparseable Python error - + unparseable Python traceback unparseable Python traceback - + Unfetchable Python error. Unfetchable Python error. @@ -733,22 +751,22 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + Logical Logička - + Primary Primarna - + GPT GPT - + Mountpoint already in use. Please select another one. @@ -756,22 +774,22 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. Instaler nije uspeo napraviti particiju na disku '%1'. @@ -1065,7 +1083,7 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + Mountpoint already in use. Please select another one. @@ -1101,37 +1119,37 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. FillGlobalStorageJob - + Set partition information - + Install %1 on <strong>new</strong> %2 system partition. - + 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. @@ -1215,22 +1233,22 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. Instaler nije uspeo formatirati particiju %1 na disku '%2'. @@ -1613,7 +1631,7 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1638,27 +1656,27 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. NetInstallPage - + Name Naziv - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) - + Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) @@ -1666,10 +1684,69 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. NetInstallViewStep - + + Package selection + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1945,7 +2022,7 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + Password is empty @@ -2367,7 +2444,7 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - There are no partitons to install on. + There are no partitions to install on. @@ -2432,65 +2509,65 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. Pogrešni parametri kod poziva funkcije u procesu. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -2544,7 +2621,7 @@ Output: - + %1 (%2) language[name] (country[name]) @@ -2560,29 +2637,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2611,69 +2682,69 @@ Output: - + 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. - + %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: @@ -2856,29 +2927,29 @@ Output: SetHostNameJob - + Set hostname %1 Postavi ime računara %1 - + Set hostname <strong>%1</strong>. - + Setting hostname %1. - - + + Internal Error - - + + Cannot write hostname to target system @@ -2916,82 +2987,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. - + Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. @@ -2999,42 +3070,42 @@ Output: 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. @@ -3231,37 +3302,37 @@ Output: - + Your username is too long. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + Your passwords do not match! Vaše lozinke se ne poklapaju @@ -3269,7 +3340,7 @@ Output: UsersViewStep - + Users Korisnici @@ -3439,6 +3510,14 @@ Output: + + WelcomeQmlViewStep + + + Welcome + Dobrodošli + + WelcomeViewStep @@ -3447,4 +3526,46 @@ Output: Dobrodošli + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts index 844583a46..e640d6986 100644 --- a/lang/calamares_sv.ts +++ b/lang/calamares_sv.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up Inställningar - + Install Installera @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Klar @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,175 +252,175 @@ Calamares::ViewManager - - + + &Back &Bakåt - - + + &Next &Nästa - - + + &Cancel Avbryt - + Cancel setup without changing the system. Avbryt inställningarna utan att förändra systemet. - + Cancel installation without changing the system. Avbryt installationen utan att förändra systemet. - + Setup Failed Inställningarna misslyckades - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. Sändningen misslyckades. Ingenting sparades på webbplatsen. - + Calamares Initialization Failed Initieringen av Calamares misslyckades - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: <br/>Följande moduler kunde inte hämtas: - + Continue with installation? Vill du fortsätta med installationen? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install - + Setup is complete. Close the setup program. - + Cancel setup? Avbryt inställningarna? - + Cancel installation? Avbryt installation? - + Do you really want to cancel the current setup process? The setup program 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. Ä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 - + &Done - + The installation is complete. Close the installer. Installationen är klar. Du kan avsluta installationshanteraren. - + Error Fel - + Installation Failed Installationen misslyckades @@ -410,22 +428,22 @@ Alla ändringar kommer att gå förlorade. CalamaresPython::Helper - + Unknown exception type Okänd undantagstyp - + unparseable Python error Otolkbart Pythonfel - + unparseable Python traceback Otolkbar Python-traceback - + Unfetchable Python error. Ohämtbart Pythonfel @@ -731,22 +749,22 @@ Alla ändringar kommer att gå förlorade. 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. @@ -754,22 +772,22 @@ Alla ändringar kommer att gå förlorade. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. Skapar ny %1 partition på %2. - + The installer failed to create partition on disk '%1'. Installationsprogrammet kunde inte skapa partition på disk '%1'. @@ -1063,7 +1081,7 @@ Alla ändringar kommer att gå förlorade. Flaggor: - + Mountpoint already in use. Please select another one. Monteringspunkt används redan. Välj en annan. @@ -1099,37 +1117,37 @@ Alla ändringar kommer att gå förlorade. FillGlobalStorageJob - + Set partition information Ange partitionsinformation - + Install %1 on <strong>new</strong> %2 system partition. - + 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. @@ -1213,22 +1231,22 @@ Alla ändringar kommer att gå förlorade. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. Formatera partition %1 med filsystem %2. - + The installer failed to format partition %1 on disk '%2'. Installationsprogrammet misslyckades att formatera partition %1 på disk '%2'. @@ -1611,7 +1629,7 @@ Alla ändringar kommer att gå förlorade. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1636,27 +1654,27 @@ Alla ändringar kommer att gå förlorade. NetInstallPage - + Name Namn - + Description Beskrivning - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Nätverksinstallation. (Inaktiverad: Kan inte hämta paketlistor, kontrollera nätverksanslutningen) - + Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) @@ -1664,10 +1682,69 @@ Alla ändringar kommer att gå förlorade. NetInstallViewStep - + + Package selection Paketval + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1943,7 +2020,7 @@ Alla ändringar kommer att gå förlorade. - + Password is empty @@ -2365,7 +2442,7 @@ Alla ändringar kommer att gå förlorade. - There are no partitons to install on. + There are no partitions to install on. @@ -2430,65 +2507,65 @@ Alla ändringar kommer att gå förlorade. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. Ogiltiga parametrar för processens uppgiftsanrop. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -2542,7 +2619,7 @@ Output: - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2558,29 +2635,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2609,69 +2680,69 @@ Output: Formulär - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. 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: @@ -2854,29 +2925,29 @@ Output: SetHostNameJob - + Set hostname %1 Ange värdnamn %1 - + Set hostname <strong>%1</strong>. Ange värdnamn <strong>%1</strong>. - + Setting hostname %1. Anger värdnamn %1. - - + + Internal Error Internt fel - - + + Cannot write hostname to target system Kan inte skriva värdnamn till målsystem @@ -2914,82 +2985,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. - + Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. @@ -2997,42 +3068,42 @@ Output: 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. passwd stoppades med felkod %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. @@ -3229,37 +3300,37 @@ Output: <small>Om mer än en person skall använda datorn så kan du skapa flera användarkonton när installationen är klar.</small> - + Your username is too long. Ditt användarnamn är för långt. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Ditt värdnamn är för kort. - + Your hostname is too long. Ditt värdnamn är för långt. - + Your passwords do not match! Lösenorden överensstämmer inte! @@ -3267,7 +3338,7 @@ Output: UsersViewStep - + Users Användare @@ -3437,6 +3508,14 @@ Output: %1-support + + WelcomeQmlViewStep + + + Welcome + Välkommen + + WelcomeViewStep @@ -3445,4 +3524,46 @@ Output: Välkommen + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_th.ts b/lang/calamares_th.ts index 4c42da24f..e0e3d7b6d 100644 --- a/lang/calamares_th.ts +++ b/lang/calamares_th.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install ติดตั้ง @@ -143,7 +143,7 @@ Calamares::JobThread - + Done เสร็จสิ้น @@ -177,36 +177,54 @@ 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::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -232,175 +250,175 @@ Calamares::ViewManager - - + + &Back &B ย้อนกลับ - - + + &Next &N ถัดไป - - + + &Cancel &C ยกเลิก - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? ยกเลิกการติดตั้ง? - + Do you really want to cancel the current setup process? The setup program 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? ดำเนินการติดตั้งต่อหรือไม่? - + 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 การติดตั้งล้มเหลว @@ -408,22 +426,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type ข้อผิดพลาดไม่ทราบประเภท - + unparseable Python error ข้อผิดพลาด unparseable Python - + unparseable Python traceback ประวัติย้อนหลัง unparseable Python - + Unfetchable Python error. ข้อผิดพลาด Unfetchable Python @@ -729,22 +747,22 @@ The installer will quit and all changes will be lost. - + Logical โลจิคอล - + Primary หลัก - + GPT GPT - + Mountpoint already in use. Please select another one. @@ -752,22 +770,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. ตัวติดตั้งไม่สามารถสร้างพาร์ทิชันบนดิสก์ '%1' @@ -1061,7 +1079,7 @@ The installer will quit and all changes will be lost. Flags: - + Mountpoint already in use. Please select another one. @@ -1097,37 +1115,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information ตั้งค่าข้อมูลพาร์ทิชัน - + Install %1 on <strong>new</strong> %2 system partition. - + 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. @@ -1211,22 +1229,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. ตัวติดตั้งไม่สามารถฟอร์แมทพาร์ทิชัน %1 บนดิสก์ '%2' @@ -1609,7 +1627,7 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1634,27 +1652,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) @@ -1662,10 +1680,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1941,7 +2018,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2363,7 +2440,7 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. + There are no partitions to install on. @@ -2428,65 +2505,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. พารามิเตอร์ไม่ถูกต้องสำหรับการเรียกการทำงาน - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -2540,7 +2617,7 @@ Output: - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2556,29 +2633,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2607,69 +2678,69 @@ Output: ฟอร์ม - + 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 บนพาร์ทิชัน extended กรุณาเลือกพาร์ทิชันหลักหรือพาร์ทิชันโลจิคัลที่มีอยู่ - + %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>%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: @@ -2852,29 +2923,29 @@ Output: SetHostNameJob - + Set hostname %1 ตั้งค่าชื่อโฮสต์ %1 - + Set hostname <strong>%1</strong>. - + Setting hostname %1. - - + + Internal Error ข้อผิดพลาดภายใน - - + + Cannot write hostname to target system ไม่สามารถเขียนชื่อโฮสต์ไปที่ระบบเป้าหมาย @@ -2912,82 +2983,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. - + Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. @@ -2995,42 +3066,42 @@ Output: 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 @@ -3227,37 +3298,37 @@ Output: - + Your username is too long. ชื่อผู้ใช้ของคุณยาวเกินไป - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. ชื่อโฮสต์ของคุณสั้นเกินไป - + Your hostname is too long. ชื่อโฮสต์ของคุณยาวเกินไป - + Your passwords do not match! รหัสผ่านของคุณไม่ตรงกัน! @@ -3265,7 +3336,7 @@ Output: UsersViewStep - + Users ผู้ใช้ @@ -3435,6 +3506,14 @@ Output: + + WelcomeQmlViewStep + + + Welcome + ยินดีต้อนรับ + + WelcomeViewStep @@ -3443,4 +3522,46 @@ Output: ยินดีต้อนรับ + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_tr_TR.ts b/lang/calamares_tr_TR.ts index bdd55dd48..20f696932 100644 --- a/lang/calamares_tr_TR.ts +++ b/lang/calamares_tr_TR.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up Kur - + Install Sistem Kuruluyor @@ -143,7 +143,7 @@ Calamares::JobThread - + Done Sistem kurulumu tamamlandı, kurulum aracından çıkabilirsiniz. @@ -177,36 +177,54 @@ 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 betik dosyası - + Main script file %1 for python job %2 is not readable. %2 python işleri için %1 sorunlu betik okunamadı. - + Boost.Python error in job "%1". Boost.Python iş hatası "%1". + + Calamares::QmlViewStep + + + Loading ... + Yükleniyor ... + + + + QML Step <i>%1</i>. + QML Adımı <i>%1</i>. + + + + Loading failed. + Yükleme başarısız. + + Calamares::RequirementsChecker @@ -234,176 +252,176 @@ Calamares::ViewManager - - + + &Back &Geri - - + + &Next &Sonraki - - + + &Cancel &Vazgeç - + Cancel setup without changing the system. Sistemi değiştirmeden kurulumu iptal edin. - + Cancel installation without changing the system. Sistemi değiştirmeden kurulumu iptal edin. - + Setup Failed Kurulum Başarısız - + Would you like to paste the install log to the web? Yükleme günlüğünü web'e yapıştırmak ister misiniz? - + Install Log Paste URL Günlük Yapıştırma URL'sini Yükle - + The upload was unsuccessful. No web-paste was done. Yükleme başarısız oldu. Web yapıştırması yapılmadı. - + Calamares Initialization Failed Calamares Başlatılamadı - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 yüklenemedi. Calamares yapılandırılmış modüllerin bazılarını yükleyemedi. Bu, Calamares'in kullandığınız dağıtıma uyarlamasından kaynaklanan bir sorundur. - + <br/>The following modules could not be loaded: <br/>Aşağıdaki modüller yüklenemedi: - + Continue with installation? Kuruluma devam edilsin mi? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> %1 sistem kurulum uygulaması,%2 ayarlamak için diskinizde değişiklik yapmak üzere. <br/><strong>Bu değişiklikleri geri alamayacaksınız.</strong> - + &Set up now &Şimdi kur - + &Set up &Kur - + &Install &Yükle - + Setup is complete. Close the setup program. Kurulum tamamlandı. Kurulum programını kapatın. - + Cancel setup? Kurulum iptal edilsin mi? - + Cancel installation? Yüklemeyi iptal et? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Mevcut kurulum işlemini gerçekten iptal etmek istiyor musunuz? Kurulum uygulaması sonlandırılacak ve tüm değişiklikler kaybedilecek. - + 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 - + &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 @@ -411,22 +429,22 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. CalamaresPython::Helper - + Unknown exception type Bilinmeyen Özel Durum Tipi - + unparseable Python error Python hata ayıklaması - + unparseable Python traceback Python geri çekme ayıklaması - + Unfetchable Python error. Okunamayan Python hatası. @@ -734,22 +752,22 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. Ş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. @@ -757,22 +775,22 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. %4 üzerinde (%3) ile %1 dosya sisteminde %2MB disk bölümü oluştur. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. <strong>%4</strong> üzerinde (%3) ile <strong>%1</strong> dosya sisteminde <strong>%2MB</strong> disk bölümü oluştur. - + Creating new %1 partition on %2. %2 üzerinde %1 yeni disk bölümü oluştur. - + The installer failed to create partition on disk '%1'. Yükleyici '%1' diski üzerinde yeni bölüm oluşturamadı. @@ -1066,7 +1084,7 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. Bayraklar: - + Mountpoint already in use. Please select another one. Bağlama noktası zaten kullanımda. Lütfen diğerini seçiniz. @@ -1102,37 +1120,37 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. FillGlobalStorageJob - + Set partition information Bölüm bilgilendirmesini ayarla - + Install %1 on <strong>new</strong> %2 system partition. %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. @@ -1216,22 +1234,22 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. %1 disk bölümü biçimle (dosya sistemi: %2 boyut: %3) %4 üzerinde. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. <strong>%1</strong> diskine <strong>%2</strong> dosya sistemi ile <strong>%3MB</strong> disk bölümü oluştur. - + Formatting partition %1 with file system %2. %1 disk bölümü %2 dosya sistemi ile biçimlendiriliyor. - + The installer failed to format partition %1 on disk '%2'. Yükleyici %1 bölümünü '%2' diski üzerinde biçimlendiremedi. @@ -1615,8 +1633,8 @@ Sistem güç kaynağına bağlı değil. - Could configure LUKS key file on partition %1. - %1 disk bölümü LUKS anahtar dosyası yapılandırılabilir. + Could not configure LUKS key file on partition %1. + %1 disk bölümü LUKS anahtar dosyası yapılandırılamadı. @@ -1640,27 +1658,27 @@ Sistem güç kaynağına bağlı değil. 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) - + Network Installation. (Disabled: Received invalid groups data) Ağ Kurulum. (Devre dışı: Geçersiz grup verileri alındı) - + Network Installation. (Disabled: Incorrect configuration) Ağ Kurulumu. (Devre dışı: Yanlış yapılandırma) @@ -1668,10 +1686,69 @@ Sistem güç kaynağına bağlı değil. NetInstallViewStep - + + Package selection Paket seçimi + + + Office software + Ofis yazılımı + + + + Office package + Ofis paketi + + + + Browser software + Tarayıcı yazılımı + + + + Browser package + Tarayıcı paketi + + + + Web browser + İnternet tarayıcısı + + + + Kernel + Çekirdek + + + + Services + Servisler + + + + Login + Oturum aç + + + + Desktop + Masaüstü + + + + Applications + Uygulamalar + + + + NotesQmlViewStep + + + Notes + Notlar + OEMPage @@ -1947,7 +2024,7 @@ Sistem güç kaynağına bağlı değil. Bilinmeyen hata - + Password is empty Şifre boş @@ -2370,8 +2447,8 @@ Sistem güç kaynağına bağlı değil. - There are no partitons to install on. - Yüklenecek disk bölümü yok. + There are no partitions to install on. + Kurulacak disk bölümü yok. @@ -2435,14 +2512,14 @@ Sistem güç kaynağına bağlı değil. ProcessResult - + There was no output from the command. Komut çıktısı yok. - + Output: @@ -2451,52 +2528,52 @@ Output: - + External command crashed. Harici komut çöktü. - + Command <i>%1</i> crashed. Komut <i>%1</i> çöktü. - + External command failed to start. Harici komut başlatılamadı. - + Command <i>%1</i> failed to start. Komut <i>%1</i> başlatılamadı. - + Internal error when starting command. Komut başlatılırken dahili hata. - + Bad parameters for process job call. Çalışma adımları başarısız oldu. - + External command failed to finish. Harici komut başarısız oldu. - + Command <i>%1</i> failed to finish in %2 seconds. Komut <i>%1</i> %2 saniyede başarısız oldu. - + External command finished with errors. Harici komut hatalarla bitti. - + Command <i>%1</i> finished with exit code %2. Komut <i>%1</i> %2 çıkış kodu ile tamamlandı @@ -2550,7 +2627,7 @@ Output: <i>%1</i> modülü için gerekenler tamamlandı. - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2566,29 +2643,23 @@ Output: Açıklama bulunamadı. - - - - - + + + + File not found Dosya bulunamadı - + Path <pre>%1</pre> must be an absolute path. <pre>%1</pre> yolu mutlak bir yol olmalı. - + Could not create new random file <pre>%1</pre>. <pre>%1</pre>yeni rasgele dosya oluşturulamadı. - - - Could not read random file <pre>%1</pre>. - <pre>%1</pre>rasgele dosya okunamadı. - RemoveVolumeGroupJob @@ -2617,69 +2688,69 @@ Output: Biçim - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. %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ü: @@ -2864,29 +2935,29 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir. SetHostNameJob - + Set hostname %1 %1 sunucu-adı ayarla - + Set hostname <strong>%1</strong>. <strong>%1</strong> sunucu-adı ayarla. - + Setting hostname %1. %1 sunucu-adı ayarlanıyor. - - + + Internal Error Dahili Hata - - + + Cannot write hostname to target system Hedef sisteme sunucu-adı yazılamadı @@ -2924,82 +2995,82 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir. SetPartFlagsJob - + Set flags on partition %1. %1 bölüm bayrağını ayarla. - + Set flags on %1MiB %2 partition. %1MB %2 disk bölümüne bayrak ayarla. - + Set flags on new partition. Yeni disk bölümüne bayrak ayarla. - + Clear flags on partition <strong>%1</strong>. <strong>%1</strong> bölüm bayrağını kaldır. - + Clear flags on %1MiB <strong>%2</strong> partition. %1MB <strong>%2</strong> disk bölümünden bayrakları temizle. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. %1MB <strong>%2</strong> disk bölüm bayrağı <strong>%3</strong> olarak belirlendi. - + Clearing flags on %1MiB <strong>%2</strong> partition. %1MB <strong>%2</strong> disk bölümünden bayraklar temizleniyor. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. <strong>%3</strong> bayrağı %1MB <strong>%2</strong> disk bölümüne ayarlanıyor. - + Clear flags on new partition. Yeni disk bölümünden bayrakları temizle. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Bayrak bölüm <strong>%1</strong> olarak <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. Yeni disk bölümü <strong>%1</strong> olarak belirlendi. - + Clearing flags on partition <strong>%1</strong>. <strong>%1</strong> bölümünden bayraklar kaldırılıyor. - + Clearing flags on new partition. Yeni disk bölümünden bayraklar temizleniyor. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. <strong>%2</strong> bayrakları <strong>%1</strong> bölümüne ayarlandı. - + Setting flags <strong>%1</strong> on new partition. Yeni disk bölümüne <strong>%1</strong> bayrağı ayarlanıyor. - + The installer failed to set flags on partition %1. Yükleyici %1 bölüm bayraklarını ayarlamakta başarısız oldu. @@ -3007,42 +3078,42 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir. 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ü. @@ -3239,37 +3310,37 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.<small>Bu bilgisayarı birden fazla kişi kullanacaksa, yükleme bittikten sonra birden fazla kullanıcı hesabı oluşturabilirsiniz.</small> - + Your username is too long. Kullanıcı adınız çok uzun. - + Your username must start with a lowercase letter or underscore. Kullanıcı adınız küçük harf veya alt çizgi ile başlamalıdır. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Sadece küçük harflere, sayılara, alt çizgi ve kısa çizgilere izin verilir. - + Only letters, numbers, underscore and hyphen are allowed. Sadece harfler, rakamlar, alt çizgi ve kısa çizgi izin verilir. - + Your hostname is too short. Makine adınız çok kısa. - + Your hostname is too long. Makine adınız çok uzun. - + Your passwords do not match! Parolanız eşleşmiyor! @@ -3277,7 +3348,7 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir. UsersViewStep - + Users Kullanıcı Tercihleri @@ -3447,6 +3518,14 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.%1 destek + + WelcomeQmlViewStep + + + Welcome + Hoşgeldiniz + + WelcomeViewStep @@ -3455,4 +3534,47 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.Hoşgeldiniz + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + <h3>%1</h3> + <p>Bunlar örnek sürüm notlarıdır.</p> + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + <h3>%1 <quote>%2</quote></h3> + + + + About + Hakkında + + + + Support + Destek + + + + Known issues + Bilinen sorunlar + + + + Release notes + Sürüm notları + + + + Donate + Bağış + + diff --git a/lang/calamares_uk.ts b/lang/calamares_uk.ts index 71c71721d..b6b7ae80b 100644 --- a/lang/calamares_uk.ts +++ b/lang/calamares_uk.ts @@ -6,17 +6,17 @@ 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, якщо запущені у режимі сумісності. + <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>. Це буде зроблено автоматично, якщо ви не обрали розподілення диску вручну. В останньому випадку вам потрібно обрати завантажувач або встановити його власноруч. + Цю систему було запущено із завантажувальним середовищем <strong>EFI</strong>.<br><br>Щоб налаштувати завантаження з середовища EFI, засіб встановлення повинен встановити на <strong>Системний Розділ EFI</strong> програму-завантажувач таку, як <strong>GRUB</strong> або <strong>systemd-boot</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> біля початку таблиці розділів (рекомендовано). Це буде зроблено автотматично, якщо ви не обрали розподілення диску вручну. В останньому випадку вам потрібно встановити завантажувач власноруч. + Цю систему було запущено із завантажувальним середовищем <strong>BIOS</strong>.<br><br>Щоб налаштувати завантаження з середовища BIOS, засіб встановлення повинен встановити завантажувач, такий, як <strong>GRUB</strong> або на початку розділу або у <strong>Головний Завантажувальний Запис (Master Boot Record)</strong> біля початку таблиці розділів (рекомендовано). Це буде зроблено автоматично, якщо вами не вибрано поділ диска вручну. В останньому випадку вам потрібно встановити завантажувач власноруч. @@ -29,7 +29,7 @@ Boot Partition - Розділ Boot + Завантажувальний розділ @@ -52,7 +52,7 @@ Blank Page - Пуста сторінка + Порожня сторінка @@ -101,28 +101,28 @@ Reload Stylesheet - + Перезавантажити таблицю стилів Widget Tree - + Дерево віджетів Debug information - Відлагоджувальна інформація + Діагностична інформація Calamares::ExecutionViewStep - + Set up Налаштувати - + Install Встановити @@ -132,7 +132,7 @@ Job failed (%1) - Невдало виконане завдання (%1) + Не вдалося виконати завдання (%1) @@ -143,9 +143,9 @@ Calamares::JobThread - + Done - Зроблено + Готово @@ -161,52 +161,70 @@ Run command '%1' in target system. - + Виконати команду «%1» у системі призначення. Run command '%1'. - + Виконати команду «%1». Running command %1 %2 - Запуск команди %1 %2 + Виконуємо команду %1 %2 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::QmlViewStep + + + Loading ... + Завантаження… + + + + QML Step <i>%1</i>. + Крок QML <i>%1</i>. + + + + Loading failed. + Не вдалося завантажити. + + Calamares::RequirementsChecker @@ -238,198 +256,199 @@ Calamares::ViewManager - - + + &Back &Назад - - + + &Next &Вперед - - + + &Cancel &Скасувати - + Cancel setup without changing the system. Скасувати налаштування без зміни системи. - + Cancel installation without changing the system. Скасувати встановлення без зміни системи. - + Setup Failed Помилка встановлення - + Would you like to paste the install log to the web? - - - - - Install Log Paste URL - + Хочете викласти журнал встановлення у мережі? - The upload was unsuccessful. No web-paste was done. - + Install Log Paste URL + Адреса для вставлення журналу встановлення - + + The upload was unsuccessful. No web-paste was done. + Не вдалося вивантажити дані. + + + Calamares Initialization Failed Помилка ініціалізації Calamares - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 неможливо встановити. Calamares не зміг завантажити всі налаштовані модулі. Ця проблема зв'язана з тим, як Calamares використовується дистрибутивом. - + <br/>The following modules could not be loaded: <br/>Не вдалося завантажити наступні модулі: - + Continue with installation? Продовжити встановлення? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> Програма налаштування %1 збирається внести зміни до вашого диска, щоб налаштувати %2. <br/><strong> Ви не зможете скасувати ці зміни.</strong> - + &Set up now &Налаштувати зараз - + &Set up &Налаштувати - + &Install &Встановити - + Setup is complete. Close the setup program. Встановлення виконано. Закрити програму встановлення. - + Cancel setup? Скасувати налаштування? - + Cancel installation? Скасувати встановлення? - + Do you really want to cancel the current setup process? The setup program 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? Продовжити встановлення? - + 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> + Засіб встановлення %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, інформацію про яку неможливо отримати. @@ -440,7 +459,8 @@ The installer will quit and all changes will be lost. Install log posted to: %1 - + Журнал встановлення викладено за адресою: +%1 @@ -448,17 +468,17 @@ The installer will quit and all changes will be lost. %1 Setup Program - + Програма для налаштовування %1 %1 Installer - Установник %1 + Засіб встановлення %1 Show debug information - Показати відлагоджувальну інформацію + Показати діагностичну інформацію @@ -489,7 +509,7 @@ The installer will quit and all changes will be lost. Boot loader location: - Місцезнаходження завантажувача: + Розташування завантажувача: @@ -512,12 +532,12 @@ The installer will quit and all changes will be lost. <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - <strong>Оберіть розділ для зменьшення, потім тягніть повзунок, щоб змінити розмір</strong> + <strong>Оберіть розділ для зменшення, потім тягніть повзунок, щоб змінити розмір</strong> %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + %1 буде стиснуто до %2 МіБ. Натомість буде створено розділ розміром %3 МіБ для %4. @@ -560,27 +580,27 @@ The installer will quit and all changes will be lost. No Swap - + Без резервної пам'яті Reuse Swap - + Повторно використати резервну пам'ять Swap (no Hibernate) - + Резервна пам'ять (без присипляння) Swap (with Hibernate) - + Резервна пам'ять (із присиплянням) Swap to file - + Резервна пам'ять у файлі @@ -588,7 +608,7 @@ The installer will quit and all changes will be lost. <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - <strong>Встановити поруч</strong><br/>Установник зменьшить розмір розділу, щоб вивільнити простір для %1. + <strong>Встановити поруч</strong><br/>Засіб встановлення зменшить розмір розділу, щоб вивільнити простір для %1. @@ -656,17 +676,17 @@ The installer will quit and all changes will be lost. Could not run command. - + Не вдалося виконати команду. The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined. - + Програма запускається у середовищі основної системи і потребує даних щодо кореневої теки, але не визначено rootMountPoint. The command needs to know the user's name, but no username is defined. - + Команді потрібні дані щодо імені користувача, але ім'я користувача не визначено. @@ -674,7 +694,7 @@ The installer will quit and all changes will be lost. Contextual Processes Job - + Завдання контекстових процесів @@ -712,7 +732,7 @@ The installer will quit and all changes will be lost. LVM LV name - + Назва логічного тому LVM @@ -735,22 +755,22 @@ The installer will quit and all changes will be lost. За&шифрувати - + Logical Логічний - + Primary Основний - + GPT GPT - + Mountpoint already in use. Please select another one. Точка підключення наразі використовується. Оберіть, будь ласка, іншу. @@ -758,24 +778,24 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Створити розділ у %2 МіБ на %4 (%3) із файловою системою %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Створити розділ у <strong>%2 МіБ</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'. + Засобу встановлення не вдалося створити розділ на диску «%1». @@ -788,7 +808,7 @@ The installer will quit and all changes will be lost. Creating a new partition table will delete all existing data on the disk. - Створення нової таблиці розділів знищить всі данні, присутні на диску. + Створення нової таблиці розділів знищить всі данні, які зберігалися на диску. @@ -826,7 +846,7 @@ The installer will quit and all changes will be lost. The installer failed to create a partition table on %1. - Установник зазнав невдачі під час створення таблиці розділів на %1. + Засобу встановлення не вдалося створити таблицю розділів на %1. @@ -849,7 +869,7 @@ The installer will quit and all changes will be lost. Sudoers dir is not writable. - Неможливо запиcати у директорію sudoers. + Каталог sudoers є непридатним до запису. @@ -872,7 +892,7 @@ The installer will quit and all changes will be lost. Create Volume Group - + Створити групу томів @@ -880,22 +900,22 @@ The installer will quit and all changes will be lost. Create new volume group named %1. - + Створити групу томів із назвою %1. Create new volume group named <strong>%1</strong>. - + Створити групу томів із назвою <strong>%1</strong>. Creating new volume group named %1. - + Створення групи томів із назвою %1. The installer failed to create a volume group named '%1'. - + Засобу встановлення не вдалося створити групу томів із назвою «%1». @@ -904,17 +924,17 @@ The installer will quit and all changes will be lost. Deactivate volume group named %1. - + Скасувати активацію групи томів із назвою %1. Deactivate volume group named <strong>%1</strong>. - + Скасувати активацію групи томів із назвою <strong>%1</strong>. The installer failed to deactivate a volume group named %1. - + Засобу встановлення не вдалося скасувати активацію групи томів із назвою «%1». @@ -937,7 +957,7 @@ The installer will quit and all changes will be lost. The installer failed to delete partition %1. - Установник зазнав невдачі під час видалення розділу %1. + Засобу встановлення не вдалося вилучити розділ %1. @@ -945,7 +965,7 @@ The installer will quit and all changes will be lost. The type of <strong>partition table</strong> on the selected storage device.<br><br>The only way to change the partition table type is to erase and recreate the partition table from scratch, which destroys all data on the storage device.<br>This installer will keep the current partition table unless you explicitly choose otherwise.<br>If unsure, on modern systems GPT is preferred. - Тип <strong>таблиці розділів</strong> на обраному пристрої зберігання.<br><br>Єдиний спосіб змінити таблицю розділів - це очистити і створити таблицю розділів з нуля, що знищить всі дані на пристрої зберігання.<br>Установник залишить поточну таблицю розділів, якщо ви явно не оберете інше.<br>Якщо не впевнені, на більш сучасних системах надайте перевагу GPT. + Тип <strong>таблиці розділів</strong> на вибраному пристрої зберігання даних.<br><br>Єдиний спосіб змінити таблицю розділів — це очистити і створити таблицю розділів з нуля, що знищить всі дані на пристрої зберігання.<br>Засіб встановлення залишить поточну таблицю розділів, якщо ви явно не виберете інше.<br>Якщо не впевнені, на більш сучасних системах надайте перевагу GPT. @@ -960,7 +980,7 @@ The installer will quit and all changes will be lost. This installer <strong>cannot detect a partition table</strong> on the selected storage device.<br><br>The device either has no partition table, or the partition table is corrupted or of an unknown type.<br>This installer can create a new partition table for you, either automatically, or through the manual partitioning page. - Установник <strong>не може визначити таблицю розділів</strong> на обраному пристрої зберігання.<br><br>Пристрій або на має таблиці розділів, або таблицю розділів пошкоджено чи вона невідомого типу.<br>Установник може створити нову таблицю розділів для вас, автоматично або за допомогою сторінки розподілення вручну. + Засобу встановлення <strong>не вдалося визначити таблицю розділів</strong> на обраному пристрої зберігання.<br><br>Пристрій або на має таблиці розділів, або таблицю розділів пошкоджено чи вона невідомого типу.<br>Засіб встановлення може створити нову таблицю розділів для вас, автоматично або за допомогою сторінки розподілення вручну. @@ -985,7 +1005,7 @@ The installer will quit and all changes will be lost. %1 - (%2) device[name] - (device-node[name]) - + %1 – (%2) @@ -1067,7 +1087,7 @@ The installer will quit and all changes will be lost. Прапорці: - + Mountpoint already in use. Please select another one. Точка підключення наразі використовується. Оберіть, будь ласка, іншу. @@ -1103,37 +1123,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information Ввести інформацію про розділ - + Install %1 on <strong>new</strong> %2 system partition. Встановити %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. Налаштування точок підключення. @@ -1148,7 +1168,7 @@ The installer will quit and all changes will be lost. <Restart checkbox tooltip> - + <Підказка до пункту позначки перезапуску> @@ -1158,12 +1178,12 @@ The installer will quit and all changes will be lost. <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <h1>Виконано.</h1><br/>На вашому комп'ютері було налаштовано %1.<br/>Можете починати користуватися вашою новою системою. <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <html><head/><body><p>Якщо позначено цей пункт, вашу систему буде негайно перезапущено після натискання кнопки <span style="font-style:italic;">Закінчити</span> або закриття вікна програми для налаштовування.</p></body></html> @@ -1173,12 +1193,12 @@ The installer will quit and all changes will be lost. <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <html><head/><body><p>Якщо позначено цей пункт, вашу систему буде негайно перезапущено після натискання кнопки <span style="font-style:italic;">Закінчити</span> або закриття вікна засобу встановлення.</p></body></html> <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Не вдалося налаштувати</h1><br/>%1 не було налаштовано на вашому комп'ютері.<br/>Повідомлення про помилку: %2. @@ -1196,7 +1216,7 @@ The installer will quit and all changes will be lost. Setup Complete - + Налаштовування завершено @@ -1206,7 +1226,7 @@ The installer will quit and all changes will be lost. The setup of %1 is complete. - + Налаштовування %1 завершено. @@ -1217,24 +1237,24 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Форматувати розділ %1 (файлова система: %2, розмір: %3 МіБ) на %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Форматувати розділ у <strong>%3 МіБ</strong> <strong>%1</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'. + Засобу встановлення не вдалося виконати форматування розділу %1 на диску «%2». @@ -1242,22 +1262,22 @@ The installer will quit and all changes will be lost. has at least %1 GiB available drive space - + містить принаймні %1 ГіБ місця на диску There is not enough drive space. At least %1 GiB is required. - + На диску недостатньо місця. Потрібно принаймні %1 ГіБ. has at least %1 GiB working memory - + має принаймні %1 ГіБ робочої пам'яті The system does not have enough working memory. At least %1 GiB is required. - + У системі немає достатнього об'єму робочої пам'яті. Потрібно принаймні %1 ГіБ. @@ -1282,32 +1302,32 @@ The installer will quit and all changes will be lost. is running the installer as an administrator (root) - + виконує засіб встановлення від імені адміністратора (root) The setup program is not running with administrator rights. - + Програму для налаштовування запущено не від імені адміністратора. The installer is not running with administrator rights. - Установник запущено без прав адміністратора. + Засіб встановлення запущено без прав адміністратора. has a screen large enough to show the whole installer - + має достатньо великий для усього вікна засобу встановлення екран The screen is too small to display the setup program. - + Екран є замалим для показу вікна засобу налаштовування. The screen is too small to display the installer. - Екран замалий для відображення установника. + Екран замалий для показу вікна засобу встановлення. @@ -1315,7 +1335,7 @@ The installer will quit and all changes will be lost. Collecting information about your machine. - + Збираємо дані щодо вашого комп'ютера. @@ -1326,22 +1346,22 @@ The installer will quit and all changes will be lost. OEM Batch Identifier - + Пакетний ідентифікатор OEM Could not create directories <code>%1</code>. - + Не вдалося створити каталоги <code>%1</code>. Could not open file <code>%1</code>. - + Не вдалося відкрити файл <code>%1</code>. Could not write to file <code>%1</code>. - + Не вдалося виконати запис до файла <code>%1</code>. @@ -1349,7 +1369,7 @@ The installer will quit and all changes will be lost. Creating initramfs with mkinitcpio. - + Створення initramfs за допомогою mkinitcpio. @@ -1357,7 +1377,7 @@ The installer will quit and all changes will be lost. Creating initramfs. - + Створюємо initramfs. @@ -1440,7 +1460,7 @@ The installer will quit and all changes will be lost. <h1>License Agreement</h1> - + <h1>Ліцензійна угода</h1> @@ -1450,27 +1470,27 @@ The installer will quit and all changes will be lost. Please review the End User License Agreements (EULAs). - + Будь ласка, перегляньте ліцензійні угоди із кінцевим користувачем (EULA). This setup procedure will install proprietary software that is subject to licensing terms. - + Під час цієї процедури налаштовування буде встановлено закрите програмне забезпечення, використання якого передбачає згоду із умовами ліцензійної угоди. If you do not agree with the terms, the setup procedure cannot continue. - + Якщо ви не погодитеся із умовами, виконання подальшої процедури налаштовування стане неможливим. This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience. - + Під час цієї процедури налаштовування може бути встановлено закрите програмне забезпечення з метою забезпечення реалізації та розширення додаткових можливостей. Використання цього програмного забезпечення передбачає згоду із умовами ліцензійної угоди. If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead. - + Якщо ви не погодитеся із умовами ліцензування, закрите програмне забезпечення не буде встановлено. Замість нього буде використано альтернативи із відкритим кодом. @@ -1486,7 +1506,7 @@ The installer will quit and all changes will be lost. URL: %1 - + Адреса: %1 @@ -1503,7 +1523,7 @@ The installer will quit and all changes will be lost. <strong>%1 browser plugin</strong><br/><font color="Grey">by %2</font> - <strong>Плагін для переглядача тенет %1</strong><br/><font color="Grey">від %2</font> + <strong>Додаток для програми для перегляду інтернету %1</strong><br/><font color="Grey">%2</font> @@ -1523,22 +1543,22 @@ The installer will quit and all changes will be lost. File: %1 - + Файл: %1 Show the license text - + Показати текст ліцензійної угоди Open license agreement in browser. - + Відкрити ліцензійну угоду у програмі для перегляду. Hide license text - + Сховати текст ліцензійної угоди @@ -1580,7 +1600,7 @@ The installer will quit and all changes will be lost. Location - Місцезнаходження + Розташування @@ -1588,35 +1608,35 @@ The installer will quit and all changes will be lost. Configuring LUKS key file. - + Налаштовуємо файл ключа LUKS. No partitions are defined. - + Не визначено жодного розділу. Encrypted rootfs setup error - + Помилка налаштовування зашифрованих rootfs Root partition %1 is LUKS but no passphrase has been set. - + Кореневим розділом %1 є розділ LUKS, але пароль до нього не встановлено. Could not create LUKS key file for root partition %1. - + Не вдалося створити файл ключа LUKS для кореневого розділу %1. - Could configure LUKS key file on partition %1. - + Could not configure LUKS key file on partition %1. + Не вдалося налаштувати файл ключа LUKS на розділі %1. @@ -1624,71 +1644,130 @@ The installer will quit and all changes will be lost. Generate machine-id. - + Створити ідентифікатор машини. Configuration Error - + Помилка налаштовування No root mount point is set for MachineId. - + Не встановлено точки монтування кореневої файлової системи для MachineId. NetInstallPage - + Name Ім'я - + Description Опис - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Встановлення через мережу. (Вимкнено: Неможливо отримати список пакетів, перевірте ваше підключення до мережі) - + Network Installation. (Disabled: Received invalid groups data) Встановлення через мережу. (Вимкнено: Отримано неправильні дані про групи) - + Network Installation. (Disabled: Incorrect configuration) - + Встановлення за допомогою мережі. (Вимкнено: помилкові налаштування) NetInstallViewStep - + + Package selection Вибір пакетів + + + Office software + Офісні програми + + + + Office package + Офісний пакунок + + + + Browser software + Браузери + + + + Browser package + Пакунок браузера + + + + Web browser + Переглядач інтернету + + + + Kernel + Ядро + + + + Services + Служби + + + + Login + Вхід до системи + + + + Desktop + Стільниця + + + + Applications + Програми + + + + NotesQmlViewStep + + + Notes + Нотатки + OEMPage Ba&tch: - + П&акетна обробка: <html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html> - + <html><head/><body><p>Тут слід вказати пакетний ідентифікатор. Його буде збережено у системі призначення.</p></body></html> <html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html> - + <html><head/><body><h1>Налаштовування параметрів OEM</h1><p>Calamares використовуватиме параметри OEM під час налаштовування системи призначення.</p></body></html> @@ -1696,12 +1775,12 @@ The installer will quit and all changes will be lost. OEM Configuration - + Налаштування OEM Set the OEM Batch Identifier to <code>%1</code>. - + Встановити пакетний ідентифікатор OEM у значення <code>%1</code>. @@ -1724,7 +1803,7 @@ The installer will quit and all changes will be lost. Memory allocation error when setting '%1' - + Помилка під час спроби отримати пам'ять для налаштовування «%1» @@ -1739,12 +1818,12 @@ The installer will quit and all changes will be lost. The password is a palindrome - + Пароль є паліндромом The password differs with case changes only - + Паролі відрізняються лише регістром літер @@ -1765,7 +1844,7 @@ The installer will quit and all changes will be lost. The password contains forbidden words in some form - + Пароль містить певні форми заборонених слів @@ -1780,37 +1859,37 @@ The installer will quit and all changes will be lost. The password contains less than %1 uppercase letters - + У паролі міститься менше за %1 літер верхнього регістру The password contains too few uppercase letters - + У паролі міститься надто мало літер верхнього регістру The password contains less than %1 lowercase letters - + У паролі міститься менше за %1 літер нижнього регістру The password contains too few lowercase letters - + У паролі міститься надто мало літер нижнього регістру The password contains less than %1 non-alphanumeric characters - + Цей пароль містить менше ніж %1 символів, які не є літерами або цифрами The password contains too few non-alphanumeric characters - + Цей пароль містить надто мало символів, які не є літерами або цифрами The password is shorter than %1 characters - + Пароль є коротшим за %1 символів @@ -1820,122 +1899,122 @@ The installer will quit and all changes will be lost. The password is just rotated old one - + Пароль є оберненою версією старого пароля The password contains less than %1 character classes - + Пароль складається із символів, які належать до класів, кількість яких менша за %1 The password does not contain enough character classes - + Кількість класів, до яких належать символи пароля, є надто малою The password contains more than %1 same characters consecutively - + У паролі міститься послідовність із понад %1 однакових символів The password contains too many same characters consecutively - + У паролі міститься надто довга послідовність із однакових символів The password contains more than %1 characters of the same class consecutively - + У паролі міститься послідовність із понад %1 символів одного класу The password contains too many characters of the same class consecutively - + У паролі міститься надто довга послідовність із символів одного класу The password contains monotonic sequence longer than %1 characters - + У паролі міститься послідовність із одного символу, яка є довшою за %1 символів The password contains too long of a monotonic character sequence - + У паролі міститься надто довга послідовність із одного символу No password supplied - + Пароль не надано Cannot obtain random numbers from the RNG device - + Не вдалося отримати випадкові числа з пристрою RNG Password generation failed - required entropy too low for settings - + Не вдалося створити пароль — не досягнуто вказаного у параметрах рівня ентропії The password fails the dictionary check - %1 - + Пароль не пройшов перевірки за словником — %1 The password fails the dictionary check - + Пароль не пройшов перевірки за словником Unknown setting - %1 - + Невідомий параметр – %1 Unknown setting - + Невідомий параметр Bad integer value of setting - %1 - + Помилкове цілочисельне значення параметра — %1 Bad integer value - + Помилкове ціле значення Setting %1 is not of integer type - + Значення параметра %1 не належить до типу цілих чисел Setting is not of integer type - + Значення параметра не належить до типу цілих чисел Setting %1 is not of string type - + Значення параметра %1 не належить до рядкового типу Setting is not of string type - + Значення параметра не належить до рядкового типу Opening the configuration file failed - + Не вдалося відкрити файл налаштувань The configuration file is malformed - + Форматування файла налаштувань є помилковим @@ -1948,9 +2027,9 @@ The installer will quit and all changes will be lost. Невідома помилка - + Password is empty - + Пароль є порожнім @@ -1963,27 +2042,27 @@ The installer will quit and all changes will be lost. Product Name - + Назва продукту TextLabel - + Текстова мітка Long Product Description - + Довгий опис продукту Package Selection - + Вибір пакетів Please pick a product from the list. The selected product will be installed. - + Будь ласка, виберіть продукт зі списку. Буде встановлено вибраний продукт. @@ -1991,7 +2070,7 @@ The installer will quit and all changes will be lost. Packages - + Пакунки @@ -2043,49 +2122,49 @@ The installer will quit and all changes will be lost. What is the name of this computer? - Ім'я цього комп'ютера? + Назва цього комп'ютера? Your Full Name - + Ваше ім'я повністю login - + запис <small>This name will be used if you make the computer visible to others on a network.</small> - <small>Це ім'я буде використовуватись, якщо ви зробите комп'ютер видимим іншим у мережі.</small> + <small>Цю назву буде використано, якщо ви зробите комп'ютер видимим іншим у мережі.</small> Computer Name - + Назва комп'ютера Password - + Пароль Repeat Password - + Повторіть пароль When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Якщо позначено цей пункт, буде виконано перевірку складності пароля. Ви не зможете скористатися надто простим паролем. Require strong passwords. - + Вимагати складні паролі. @@ -2134,7 +2213,7 @@ The installer will quit and all changes will be lost. Swap - Область підкачки + Резервна пам'ять @@ -2170,7 +2249,7 @@ The installer will quit and all changes will be lost. Name - Ім'я + Назва @@ -2213,42 +2292,42 @@ The installer will quit and all changes will be lost. Cre&ate - + С&творити &Edit - &Редагувати + З&мінити &Delete - &Видалити + &Вилучити New Volume Group - + Створити групу томів Resize Volume Group - + Змінити розміри групи томів Deactivate Volume Group - + Вимкнути групу томів Remove Volume Group - + Вилучити групу томів I&nstall boot loader on: - + Місце вст&ановлення завантажувача: @@ -2258,12 +2337,12 @@ The installer will quit and all changes will be lost. Can not create new partition - + Не вдалося створити новий розділ The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead. - + Таблиця розділів на %1 вже містить %2 основних розділи. Додавання основних розділів неможливе. Будь ласка, вилучіть один основний розділ або додайте замість нього розширений розділ. @@ -2296,7 +2375,7 @@ The installer will quit and all changes will be lost. <strong>Manual</strong> partitioning. - Розподілення диску <strong>власноруч</strong>. + Розподіл диска <strong>вручну</strong>. @@ -2316,7 +2395,7 @@ The installer will quit and all changes will be lost. <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - Розподілення диску <strong>%1</strong> (%2) <strong>власноруч</strong>. + Розподіл диска <strong>%1</strong> (%2) <strong>вручну</strong>. @@ -2341,7 +2420,7 @@ The installer will quit and all changes will be lost. 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, поверніться та оберіть або створіть файлову систему FAT32 з увімкненною опцією <strong>esp</strong> та точкою підключення <strong>%2</strong>.<br/><br/>Ви можете продовжити не налаштовуючи системний розділ EFI, але ваша система може не запускатись. + Щоб запустити %1, потрібен системний розділ EFI.<br/><br/>Щоб налаштувати системний розділ EFI, поверніться і виберіть або створіть файлову систему FAT32 з увімкненим параметром <strong>esp</strong> та точкою монтування <strong>%2</strong>.<br/><br/>Ви можете продовжити, не налаштовуючи системний розділ EFI, але тоді у вашої системи можуть виникнути проблеми із запуском. @@ -2366,12 +2445,12 @@ The installer will quit and all changes will be lost. has at least one disk device available. - + має принаймні один доступний дисковий пристрій. - There are no partitons to install on. - + There are no partitions to install on. + Немає розділів для встановлення. @@ -2379,13 +2458,13 @@ The installer will quit and all changes will be lost. Plasma Look-and-Feel Job - + Завдання із налаштовування вигляду і поведінки Плазми Could not select KDE Plasma Look-and-Feel package - + Не вдалося вибрати пакунок вигляду і поведінки Плазми KDE @@ -2398,12 +2477,12 @@ The installer will quit and all changes will be lost. Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. - + Будь ласка, виберіть параметри вигляду і поведінки стільниці Плазми KDE. Ви також можете пропустити цей крок і налаштувати вигляд і поведінку після налаштовування системи. Натискання пункту вибору вигляду і поведінки відкриє вікно із інтерактивним переглядом відповідних параметрів. Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is installed. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. - + Будь ласка, виберіть параметри вигляду і поведінки стільниці Плазми KDE Ви також можете пропустити цей крок і налаштувати вигляд і поведінку після встановлення системи. Натискання пункту вибору вигляду і поведінки відкриє вікно із інтерактивним переглядом відповідних параметрів. @@ -2411,7 +2490,7 @@ The installer will quit and all changes will be lost. Look-and-Feel - + Вигляд і поведінка @@ -2424,78 +2503,81 @@ The installer will quit and all changes will be lost. No files configured to save for later. - + Не налаштовано файлів для зберігання на майбутнє. Not all of the configured files could be preserved. - + Не усі налаштовані файли може бути збережено. ProcessResult - + There was no output from the command. - + +У результаті виконання команди не отримано виведених даних. - + Output: - + +Виведені дані: + - + External command crashed. - + Виконання зовнішньої команди завершилося помилкою. - + Command <i>%1</i> crashed. - + Аварійне завершення виконання команди <i>%1</i>. - + External command failed to start. - + Не вдалося виконати зовнішню команду. - + Command <i>%1</i> failed to start. - + Не вдалося виконати команду <i>%1</i>. - + Internal error when starting command. - + Внутрішня помилка під час спроби виконати команду. - + Bad parameters for process job call. - Неправильні параметри визову завдання обробки. + Неправильні параметри виклику завдання обробки. - + External command failed to finish. - + Не вдалося завершити виконання зовнішньої команди. - + Command <i>%1</i> failed to finish in %2 seconds. - + Не вдалося завершити виконання команди <i>%1</i> за %2 секунд. - + External command finished with errors. - + Виконання зовнішньої команди завершено із помилками. - + Command <i>%1</i> finished with exit code %2. - + Виконання команди <i>%1</i> завершено повідомленням із кодом виходу %2. @@ -2503,13 +2585,13 @@ Output: Default Keyboard Model - Модель клавіатури за замовченням + Типова модель клавіатури Default - За замовченням + Типовий @@ -2519,17 +2601,17 @@ Output: extended - розширена + розширений unformatted - неформатовано + не форматовано swap - область підкачки + резервна пам'ять @@ -2539,15 +2621,15 @@ Output: (no mount point) - + (немає точки монтування) Requirements checking for module <i>%1</i> is complete. - + Перевірку виконання вимог щодо модуля <i>%1</i> завершено. - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2555,36 +2637,30 @@ Output: No product - + Немає продукту No description provided. - + Опису не надано. - - - - - + + + + File not found - + Файл не знайдено - + Path <pre>%1</pre> must be an absolute path. - + Шлях <pre>%1</pre> має бути абсолютним. - + Could not create new random file <pre>%1</pre>. - - - - - Could not read random file <pre>%1</pre>. - + Не вдалося створити випадковий файл <pre>%1</pre>. @@ -2593,17 +2669,17 @@ Output: Remove Volume Group named %1. - + Вилучити групу томів із назвою %1. Remove Volume Group named <strong>%1</strong>. - + Вилучити групу томів із назвою <strong>%1</strong>. The installer failed to remove a volume group named '%1'. - + Засобу встановлення не вдалося вилучити групу томів із назвою «%1». @@ -2614,69 +2690,69 @@ Output: Форма - + 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>це знищить всі файли на обраному розділі. + Виберіть місце встановлення %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 не можна встановити на розширений розділ. Будь ласка, оберіть дійсний первинний або логічний розділ. - + %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: @@ -2686,29 +2762,29 @@ Output: Resize Filesystem Job - + Завдання зі зміни розмірів файлової системи Invalid configuration - + Некоректні налаштування The file-system resize job has an invalid configuration and will not run. - + Завдання зі зміни розмірів файлової системи налаштовано некоректно. Його не буде виконано. KPMCore not Available - + Немає доступу до KPMCore Calamares cannot start KPMCore for the file-system resize job. - + Calamares не вдалося запустити KPMCore для виконання завдання зі зміни розмірів файлової системи. @@ -2717,39 +2793,39 @@ Output: Resize Failed - + Помилка під час зміни розмірів The filesystem %1 could not be found in this system, and cannot be resized. - + Не вдалося знайти файлову систему %1 у цій системі. Зміна розмірів цієї файлової системи неможлива. The device %1 could not be found in this system, and cannot be resized. - + Не вдалося знайти пристрій %1 у цій системі. Зміна розмірів файлової системи на пристрої неможлива. The filesystem %1 cannot be resized. - + Не вдалося виконати зміну розмірів файлової системи %1. The device %1 cannot be resized. - + Не вдалося змінити розміри пристрою %1. The filesystem %1 must be resized, but cannot. - + Розміри файлової системи %1 має бути змінено, але виконати зміну не вдалося. The device %1 must be resized, but cannot - + Розміри пристрою %1 має бути змінено, але виконати зміну не вдалося @@ -2762,17 +2838,17 @@ Output: Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>. - + Змінити розміри розділу у <strong>%2 МіБ</strong> <strong>%1</strong> до <strong>%3 МіБ</strong>. Resizing %2MiB partition %1 to %3MiB. - + Змінюємо розміри розділу %2 МіБ %1 до %3 МіБ. The installer failed to resize partition %1 on disk '%2'. - Установник зазнав невдачі під час зміни розміру розділу %1 на диску '%2'. + Засобу встановлення не вдалося змінити розміри розділу %1 на диску «%2». @@ -2780,7 +2856,7 @@ Output: Resize Volume Group - + Змінити розміри групи томів @@ -2789,17 +2865,17 @@ Output: Resize volume group named %1 from %2 to %3. - + Змінити розміри групи томів із назвою %1 з %2 до %3. Resize volume group named <strong>%1</strong> from <strong>%2</strong> to <strong>%3</strong>. - + Змінити розміри групи томів із назвою <strong>%1</strong> з <strong>%2</strong> до <strong>%3</strong>. The installer failed to resize a volume group named '%1'. - + Засобу встановлення не вдалося змінити розміри групи томів із назвою «%1». @@ -2807,12 +2883,12 @@ Output: For best results, please ensure that this computer: - Щоб отримати найкращий результат, будь-ласка переконайтеся, що цей комп'ютер: + Щоб отримати найкращий результат, будь ласка, переконайтеся, що цей комп'ютер: System requirements - Системні вимоги + Вимоги до системи @@ -2820,22 +2896,22 @@ Output: This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + Цей комп'ютер не задовольняє мінімальні вимоги для налаштовування %1.<br/>Налаштовування неможливо продовжити. <a href="#details">Докладніше...</a> 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> + Цей комп'ютер не задовольняє мінімальні вимоги для встановлення %1.<br/>Встановлення неможливо продовжити. <a href="#details">Докладніше...</a> This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + Цей комп'ютер не задовольняє рекомендовані вимоги щодо налаштовування %1. Встановлення можна продовжити, але деякі можливості можуть виявитися недоступними. 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/>Встановлення можна продовжити, але деякі особливості можуть бути вимкненими. + Цей комп'ютер не задовольняє рекомендовані вимоги для встановлення %1.<br/>Встановлення можна продовжити, але деякі можливості можуть виявитися недоступними. @@ -2853,37 +2929,37 @@ Output: Partitioning - Розподілюємо на розділи + Поділ на розділи SetHostNameJob - + Set hostname %1 - Встановити ім'я машини %1 + Встановити назву вузла %1 - + Set hostname <strong>%1</strong>. - Встановити ім'я машини <strong>%1</strong>. + Встановити назву вузла <strong>%1</strong>. - + Setting hostname %1. - Встановлення імені машини %1. + Встановлення назви вузла %1. - - + + Internal Error Внутрішня помилка - - + + Cannot write hostname to target system - Не можу записати ім'я машини до системи + Не вдалося записати назву вузла до системи призначення @@ -2896,7 +2972,7 @@ Output: Failed to write keyboard configuration for the virtual console. - Невдача під час запису кофігурації клавіатури для віртуальної консолі. + Не вдалося записати налаштування клавіатури для віртуальної консолі. @@ -2913,131 +2989,131 @@ Output: Failed to write keyboard configuration to existing /etc/default directory. - Невдача під час запису кофігурації клавіатури до наявної директорії /etc/default. + Не вдалося записати налаштування клавіатури до наявного каталогу /etc/default. SetPartFlagsJob - + Set flags on partition %1. Встановити прапорці на розділі %1. - + Set flags on %1MiB %2 partition. - + Встановити прапорці для розділу у %1 МіБ %2. - + Set flags on new partition. Встановити прапорці на новому розділі. - + Clear flags on partition <strong>%1</strong>. Очистити прапорці на розділі <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Зняти прапорці на розділі у %1 МіБ <strong>%2</strong>. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Встановлення прапорця на розділі у %1 МіБ <strong>%2</strong> як <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Знімаємо прапорці на розділі у %1 МіБ <strong>%2</strong>. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Встановлюємо прапорці <strong>%3</strong> на розділі у %1 МіБ <strong>%2</strong>. - + Clear flags on new partition. Очистити прапорці на новому розділі. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Встановити прапорці <strong>%2</strong> для розділу <strong>%1</strong>. - + Flag new partition as <strong>%1</strong>. Встановити прапорці <strong>%1</strong> для нового розділу. - + Clearing flags on partition <strong>%1</strong>. Очищуємо прапорці для розділу <strong>%1</strong>. - + Clearing flags on new partition. Очищуємо прапорці для нового розділу. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Встановлюємо прапорці <strong>%2</strong> для розділу <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. Встановлюємо прапорці <strong>%1</strong> для нового розділу. - + The installer failed to set flags on partition %1. - Установник зазнав невдачі під час встановлення прапорців для розділу %1. + Засобу встановлення не вдалося встановити прапорці для розділу %1. 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. + Неможливо вимкнути обліковий запис root. - + passwd terminated with error code %1. passwd завершив роботу з кодом помилки %1. - + Cannot set password for user %1. Не можу встановити пароль для користувача %1. - + usermod terminated with error code %1. usermod завершилася з кодом помилки %1. @@ -3072,7 +3148,7 @@ Output: Cannot set timezone, - Не можу встановити часову зону, + Не вдалося встановити часовий пояс. @@ -3085,7 +3161,7 @@ Output: Shell Processes Job - + Завдання для процесів командної оболонки @@ -3094,7 +3170,7 @@ Output: %L1 / %L2 slide counter, %1 of %2 (numeric) - + %L1 з %L2 @@ -3102,7 +3178,7 @@ Output: This is an overview of what will happen once you start the setup procedure. - + Це огляд того, що трапиться коли ви почнете процедуру налаштовування. @@ -3123,22 +3199,22 @@ Output: Installation feedback - + Відгуки щодо встановлення Sending installation feedback. - + Надсилання відгуків щодо встановлення. Internal error in install-tracking. - + Внутрішня помилка під час стеження за встановленням. HTTP request timed out. - + Перевищено час очікування на обробку запиту HTTP. @@ -3146,28 +3222,28 @@ Output: Machine feedback - + Дані щодо комп'ютера Configuring machine feedback. - + Налаштовування надсилання даних щодо комп'ютера. Error in machine feedback configuration. - + Помилка у налаштуваннях надсилання даних щодо комп'ютера. Could not configure machine feedback correctly, script error %1. - + Не вдалося налаштувати надсилання даних щодо комп'ютера належним чином. Помилка скрипту: %1. Could not configure machine feedback correctly, Calamares error %1. - + Не вдалося налаштувати надсилання даних щодо комп'ютера належним чином. Помилка у Calamares: %1. @@ -3180,37 +3256,37 @@ Output: Placeholder - + Замінник <html><head/><body><p>By selecting this, you will send <span style=" font-weight:600;">no information at all</span> about your installation.</p></body></html> - + <html><head/><body><p>Якщо буде позначено цей пункт, програма <span style=" font-weight:600;">не надсилатиме ніяких даних</span> щодо встановленої системи.</p></body></html> <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Click here for more information about user feedback</span></a></p></body></html> - + <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Натисніть, щоб дізнатися більше про відгуки користувачів</span></a></p></body></html> Install tracking helps %1 to see how many users they have, what hardware they install %1 to and (with the last two options below), get continuous information about preferred applications. To see what will be sent, please click the help icon next to each area. - + Стеження за встановленням допоможе визначити %1 кількість користувачів, параметри обладнання, на якому встановлюють %1 і (якщо позначено останні два пункти нижче) неперервно отримувати дані щодо програм, які використовуються у системі. Щоб ознайомитися із даними, які буде надіслано, натисніть піктограму довідки, розташовану поряд із кожним із варіантів. By selecting this you will send information about your installation and hardware. This information will <b>only be sent once</b> after the installation finishes. - + Якщо буде позначено цей пункт, програма надішле дані щодо встановленої системи та обладнання. Ці дані буде <b>надіслано лише один раз</b> після завершення встановлення. By selecting this you will <b>periodically</b> send information about your installation, hardware and applications, to %1. - + Якщо позначити цей пункт, програма <b>періодично</b> надсилатиме дані щодо встановленої вами системи, обладнання і програм до %1. By selecting this you will <b>regularly</b> send information about your installation, hardware, applications and usage patterns, to %1. - + Якщо позначити цей пункт, програма <b>регулярно</b> надсилатиме дані щодо встановленої вами системи, обладнання, програм та користування системою до %1. @@ -3218,7 +3294,7 @@ Output: Feedback - + Відгуки @@ -3226,45 +3302,45 @@ Output: <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>Якщо за цим комп'ютером працюватимуть декілька користувачів, ви можете створити декілька облікових записів після налаштовування.</small> <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> - + <small>Якщо за цим комп'ютером працюватимуть декілька користувачів, ви можете створити декілька облікових записів після встановлення.</small> - + Your username is too long. Ваше ім'я задовге. - - - Your username must start with a lowercase letter or underscore. - - - - - Only lowercase letters, numbers, underscore and hyphen are allowed. - - - - - Only letters, numbers, underscore and hyphen are allowed. - - + Your username must start with a lowercase letter or underscore. + Ваше ім'я користувача має починатися із малої літери або символу підкреслювання. + + + + Only lowercase letters, numbers, underscore and hyphen are allowed. + Можна використовувати лише латинські літери нижнього регістру, цифри, символи підкреслювання та дефіси. + + + + Only letters, numbers, underscore and hyphen are allowed. + Можна використовувати лише латинські літери, цифри, символи підкреслювання та дефіси. + + + Your hostname is too short. - Ім'я машини занадто коротке. + Назва вузла є надто короткою. - + Your hostname is too long. - Ім'я машини задовге. + Назва вузла є надто довгою. - + Your passwords do not match! Паролі не збігаються! @@ -3272,7 +3348,7 @@ Output: UsersViewStep - + Users Користувачі @@ -3282,12 +3358,12 @@ Output: Key - + Ключ Value - + Значення @@ -3295,27 +3371,27 @@ Output: Create Volume Group - + Створити групу томів List of Physical Volumes - + Список фізичний томів Volume Group Name: - + Назва групи томів: Volume Group Type: - + Тип групи томів: Physical Extent Size: - + Розмір фізичного розширення: @@ -3325,22 +3401,22 @@ Output: Total Size: - + Загальний розмір: Used Size: - + Використано: Total Sectors: - + Загалом секторів: Quantity of LVs: - + Кількість логічних томів: @@ -3354,32 +3430,32 @@ Output: Select application and system language - + Виберіть мову програм і системи Open donations website - + Відкрити сторінку сайта із посиланнями для фінансової підтримки &Donate - + Підтримати &фінансово Open help and support website - + Відкрити сторінку сайта із посиланнями на довідку та технічну підтримку Open issues and bug-tracking website - + Відкрити сторінку сайта стеження за вадами у програмі Open release notes website - + Відкрити сторінку сайта із нотатками щодо випуску @@ -3399,42 +3475,42 @@ Output: &About - &Про + &Про програму <h1>Welcome to the %1 installer.</h1> - <h1>Ласкаво просимо до установника %1.</h1> + <h1>Ласкаво просимо до засобу встановлення %1.</h1> <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Ласкаво просимо до установника для %1 Calamares.</h1> + <h1>Ласкаво просимо до засобу встановлення Calamares для %1.</h1> <h1>Welcome to the Calamares setup program for %1.</h1> - + <h1>Вітаємо у програмі налаштовування Calamares для %1.</h1> <h1>Welcome to %1 setup.</h1> - + <h1>Вітаємо у програмі для налаштовування %1.</h1> About %1 setup - + Про засіб налаштовування %1 About %1 installer - Про втановлювач %1 + Про засіб встановлення %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-2019 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + <h1>%1</h1><br/><strong>%2<br/>для %3</strong><br/><br/>© Teo Mrnjavac &lt;teo@kde.org&gt;, 2014–2017<br/>© Adriaan de Groot &lt;groot@kde.org&gt;, 2017–2019<br/>Дякуємо <a href="https://calamares.io/team/">команді розробників Calamares</a> та <a href="https://www.transifex.com/calamares/calamares/">команді перекладачів Calamares</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> розроблено за фінансової підтримки <br/><a href="http://www.blue-systems.com/">Blue Systems</a> — Liberating Software. @@ -3442,6 +3518,14 @@ Output: Підтримка %1 + + WelcomeQmlViewStep + + + Welcome + Вітаємо + + WelcomeViewStep @@ -3450,4 +3534,47 @@ Output: Вітаємо + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + <h3>%1</h3> + <p>Це приклад нотаток щодо випуску.</p> + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + <h3>%1 <quote>%2</quote></h3> + + + + About + Про програму + + + + Support + Підтримка + + + + Known issues + Відомі вади + + + + Release notes + Нотатки щодо випуску + + + + Donate + Підтримати фінансово + + diff --git a/lang/calamares_ur.ts b/lang/calamares_ur.ts index 751d1b4ce..da19560e4 100644 --- a/lang/calamares_ur.ts +++ b/lang/calamares_ur.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install @@ -143,7 +143,7 @@ Calamares::JobThread - + Done @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -234,174 +252,174 @@ Calamares::ViewManager - - + + &Back - - + + &Next - - + + &Cancel - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? - + Do you really want to cancel the current setup process? The setup program 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? - + 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 - + &Done - + The installation is complete. Close the installer. - + Error - + Installation Failed @@ -409,22 +427,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type - + unparseable Python error - + unparseable Python traceback - + Unfetchable Python error. @@ -730,22 +748,22 @@ The installer will quit and all changes will be lost. - + Logical - + Primary - + GPT - + Mountpoint already in use. Please select another one. @@ -753,22 +771,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1062,7 +1080,7 @@ The installer will quit and all changes will be lost. - + Mountpoint already in use. Please select another one. @@ -1098,37 +1116,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information - + Install %1 on <strong>new</strong> %2 system partition. - + 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. @@ -1212,22 +1230,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1610,7 +1628,7 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1635,27 +1653,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) @@ -1663,10 +1681,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1942,7 +2019,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2364,7 +2441,7 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. + There are no partitions to install on. @@ -2429,65 +2506,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -2541,7 +2618,7 @@ Output: - + %1 (%2) language[name] (country[name]) @@ -2557,29 +2634,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2608,69 +2679,69 @@ Output: - + 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. - + %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: @@ -2853,29 +2924,29 @@ Output: SetHostNameJob - + Set hostname %1 - + Set hostname <strong>%1</strong>. - + Setting hostname %1. - - + + Internal Error - - + + Cannot write hostname to target system @@ -2913,82 +2984,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. - + Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. @@ -2996,42 +3067,42 @@ Output: 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. @@ -3228,37 +3299,37 @@ Output: - + Your username is too long. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + Your passwords do not match! @@ -3266,7 +3337,7 @@ Output: UsersViewStep - + Users @@ -3436,6 +3507,14 @@ Output: + + WelcomeQmlViewStep + + + Welcome + + + WelcomeViewStep @@ -3444,4 +3523,46 @@ Output: + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_uz.ts b/lang/calamares_uz.ts index 5b668dbee..714b91159 100644 --- a/lang/calamares_uz.ts +++ b/lang/calamares_uz.ts @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up - + Install @@ -143,7 +143,7 @@ Calamares::JobThread - + Done @@ -177,36 +177,54 @@ 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". + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -232,174 +250,174 @@ Calamares::ViewManager - - + + &Back - - + + &Next - - + + &Cancel - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? - + Do you really want to cancel the current setup process? The setup program 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? - + 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 - + &Done - + The installation is complete. Close the installer. - + Error - + Installation Failed @@ -407,22 +425,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type - + unparseable Python error - + unparseable Python traceback - + Unfetchable Python error. @@ -728,22 +746,22 @@ The installer will quit and all changes will be lost. - + Logical - + Primary - + GPT - + Mountpoint already in use. Please select another one. @@ -751,22 +769,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. @@ -1060,7 +1078,7 @@ The installer will quit and all changes will be lost. - + Mountpoint already in use. Please select another one. @@ -1096,37 +1114,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information - + Install %1 on <strong>new</strong> %2 system partition. - + 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. @@ -1210,22 +1228,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1608,7 +1626,7 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1633,27 +1651,27 @@ 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) - + Network Installation. (Disabled: Received invalid groups data) - + Network Installation. (Disabled: Incorrect configuration) @@ -1661,10 +1679,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1940,7 +2017,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2362,7 +2439,7 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. + There are no partitions to install on. @@ -2427,65 +2504,65 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. - + Output: - + External command crashed. - + Command <i>%1</i> crashed. - + External command failed to start. - + Command <i>%1</i> failed to start. - + Internal error when starting command. - + Bad parameters for process job call. - + External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. - + Command <i>%1</i> finished with exit code %2. @@ -2539,7 +2616,7 @@ Output: - + %1 (%2) language[name] (country[name]) @@ -2555,29 +2632,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2606,69 +2677,69 @@ Output: - + 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. - + %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: @@ -2851,29 +2922,29 @@ Output: SetHostNameJob - + Set hostname %1 - + Set hostname <strong>%1</strong>. - + Setting hostname %1. - - + + Internal Error - - + + Cannot write hostname to target system @@ -2911,82 +2982,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. - + Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. @@ -2994,42 +3065,42 @@ Output: 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. @@ -3226,37 +3297,37 @@ Output: - + Your username is too long. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + Your passwords do not match! @@ -3264,7 +3335,7 @@ Output: UsersViewStep - + Users @@ -3434,6 +3505,14 @@ Output: + + WelcomeQmlViewStep + + + Welcome + + + WelcomeViewStep @@ -3442,4 +3521,46 @@ Output: + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_zh_CN.ts b/lang/calamares_zh_CN.ts index 5764356c9..f2aefd09c 100644 --- a/lang/calamares_zh_CN.ts +++ b/lang/calamares_zh_CN.ts @@ -118,12 +118,12 @@ Calamares::ExecutionViewStep - + Set up 建立 - + Install 安装 @@ -144,7 +144,7 @@ Calamares::JobThread - + Done 完成 @@ -178,36 +178,54 @@ 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 错误。 + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + Calamares::RequirementsChecker @@ -233,175 +251,175 @@ Calamares::ViewManager - - + + &Back 后退(&B) - - + + &Next 下一步(&N) - - + + &Cancel 取消(&C) - + Cancel setup without changing the system. - + Cancel installation without changing the system. 取消安装，并不做任何更改。 - + Setup Failed - + Would you like to paste the install log to the web? - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Calamares Initialization Failed Calamares安装失败 - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. ％1无法安装。 Calamares无法加载所有已配置的模块。这是分配使用Calamares的方式的问题。 - + <br/>The following modules could not be loaded: <br/>无法加载以下模块： - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Set up - + &Install 安装(&I) - + Setup is complete. Close the setup program. - + Cancel setup? - + Cancel installation? 取消安装？ - + Do you really want to cancel the current setup process? The setup program 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? 要继续安装吗？ - + 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) - + &Done &完成 - + The installation is complete. Close the installer. 安装已完成。请关闭安装程序。 - + Error 错误 - + Installation Failed 安装失败 @@ -409,22 +427,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type 未知异常类型 - + unparseable Python error 无法解析的 Python 错误 - + unparseable Python traceback 无法解析的 Python 回溯 - + Unfetchable Python error. 无法获取的 Python 错误。 @@ -730,22 +748,22 @@ The installer will quit and all changes will be lost. 加密(&C) - + Logical 逻辑分区 - + Primary 主分区 - + GPT GPT - + Mountpoint already in use. Please select another one. 挂载点已被占用。请选择另一个。 @@ -753,22 +771,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Creating new %1 partition on %2. 正在 %2 上创建新的 %1 分区。 - + The installer failed to create partition on disk '%1'. 安装程序在磁盘“%1”创建分区失败。 @@ -1063,7 +1081,7 @@ The installer will quit and all changes will be lost. 标记： - + Mountpoint already in use. Please select another one. 挂载点已被占用。请选择另一个。 @@ -1099,37 +1117,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information 设置分区信息 - + Install %1 on <strong>new</strong> %2 system partition. 在 <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. 正在设置挂载点。 @@ -1213,22 +1231,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatting partition %1 with file system %2. 正在使用 %2 文件系统格式化分区 %1。 - + The installer failed to format partition %1 on disk '%2'. 安装程序格式化磁盘“%2”上的分区 %1 失败。 @@ -1611,7 +1629,7 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. + Could not configure LUKS key file on partition %1. @@ -1636,27 +1654,27 @@ 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) 网络安装。（已禁用：无法获取软件包列表，请检查网络连接） - + Network Installation. (Disabled: Received invalid groups data) 联网安装。（已禁用：收到无效组数据） - + Network Installation. (Disabled: Incorrect configuration) @@ -1664,10 +1682,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection 软件包选择 + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + NotesQmlViewStep + + + Notes + + OEMPage @@ -1943,7 +2020,7 @@ The installer will quit and all changes will be lost. 未知错误 - + Password is empty @@ -2365,7 +2442,7 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. + There are no partitions to install on. @@ -2430,14 +2507,14 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. 命令没有输出。 - + Output: @@ -2446,52 +2523,52 @@ Output: - + External command crashed. 外部命令已崩溃。 - + Command <i>%1</i> crashed. 命令 <i>%1</i> 已崩溃。 - + External command failed to start. 无法启动外部命令。 - + Command <i>%1</i> failed to start. 无法启动命令 <i>%1</i>。 - + Internal error when starting command. 启动命令时出现内部错误。 - + Bad parameters for process job call. 呼叫进程任务出现错误参数 - + External command failed to finish. 外部命令未成功完成。 - + Command <i>%1</i> failed to finish in %2 seconds. 命令 <i>%1</i> 未能在 %2 秒内完成。 - + External command finished with errors. 外部命令已完成，但出现了错误。 - + Command <i>%1</i> finished with exit code %2. 命令 <i>%1</i> 以退出代码 %2 完成。 @@ -2545,7 +2622,7 @@ Output: - + %1 (%2) language[name] (country[name]) %1（%2） @@ -2561,29 +2638,23 @@ Output: - - - - - + + + + File not found - + Path <pre>%1</pre> must be an absolute path. - + Could not create new random file <pre>%1</pre>. - - - Could not read random file <pre>%1</pre>. - - RemoveVolumeGroupJob @@ -2612,69 +2683,69 @@ Output: 表单 - + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. <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 系统分区： @@ -2857,29 +2928,29 @@ Output: 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 无法向目标系统写入主机名 @@ -2917,82 +2988,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. 设置分区 %1 的标记. - + Set flags on %1MiB %2 partition. - + Set flags on new partition. 设置新分区的标记. - + Clear flags on partition <strong>%1</strong>. 清空分区 <strong>%1</strong> 上的标记. - + Clear flags on %1MiB <strong>%2</strong> partition. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. 删除新分区的标记. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. 将分区 <strong>%2</strong> 标记为 <strong>%1</strong>。 - + Flag new partition as <strong>%1</strong>. 将新分区标记为 <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. 正在清理分区 <strong>%1</strong> 上的标记。 - + Clearing flags on new partition. 正在删除新分区的标记. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. 正在为分区 <strong>%1</strong> 设置标记 <strong>%2</strong>。 - + Setting flags <strong>%1</strong> on new partition. 正在将新分区标记为 <strong>%1</strong>. - + The installer failed to set flags on partition %1. 安装程序没有成功设置分区 %1 的标记. @@ -3000,42 +3071,42 @@ Output: 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 中止。 @@ -3232,37 +3303,37 @@ Output: - + Your username is too long. 用户名太长。 - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Only letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. 主机名太短。 - + Your hostname is too long. 主机名太长。 - + Your passwords do not match! 密码不匹配！ @@ -3270,7 +3341,7 @@ Output: UsersViewStep - + Users 用户 @@ -3440,6 +3511,14 @@ Output: %1 的支持信息 + + WelcomeQmlViewStep + + + Welcome + 欢迎 + + WelcomeViewStep @@ -3448,4 +3527,46 @@ Output: 欢迎 + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + diff --git a/lang/calamares_zh_TW.ts b/lang/calamares_zh_TW.ts index 992f4611c..729347a45 100644 --- a/lang/calamares_zh_TW.ts +++ b/lang/calamares_zh_TW.ts @@ -29,12 +29,12 @@ Boot Partition - 開機磁區 + 開機分割區 System Partition - 系統磁區 + 系統分割區 @@ -117,12 +117,12 @@ Calamares::ExecutionViewStep - + Set up 設定 - + Install 安裝 @@ -143,7 +143,7 @@ Calamares::JobThread - + Done 完成 @@ -177,36 +177,54 @@ 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 錯誤。 + + Calamares::QmlViewStep + + + Loading ... + 正在載入 ... + + + + QML Step <i>%1</i>. + QML 第 <i>%1</i> 步 + + + + Loading failed. + 載入失敗。 + + Calamares::RequirementsChecker @@ -232,176 +250,176 @@ Calamares::ViewManager - - + + &Back 返回 (&B) - - + + &Next 下一步 (&N) - - + + &Cancel 取消(&C) - + Cancel setup without changing the system. 取消安裝，不更改系統。 - + Cancel installation without changing the system. 不變更系統並取消安裝。 - + Setup Failed 設定失敗 - + Would you like to paste the install log to the web? 想要將安裝紀錄檔貼到網路上嗎？ - + Install Log Paste URL 安裝紀錄檔張貼 URL - + The upload was unsuccessful. No web-paste was done. 上傳不成功。並未完成網路張貼。 - + Calamares Initialization Failed Calamares 初始化失敗 - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 無法安裝。Calamares 無法載入所有已設定的模組。散佈版使用 Calamares 的方式有問題。 - + <br/>The following modules could not be loaded: <br/>以下的模組無法載入： - + Continue with installation? 繼續安裝？ - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> %1 設定程式將在您的磁碟上做出變更以設定 %2。<br/><strong>您將無法復原這些變更。</strong> - + &Set up now 馬上進行設定 (&S) - + &Set up 設定 (&S) - + &Install 安裝(&I) - + Setup is complete. Close the setup program. 設定完成。關閉設定程式。 - + Cancel setup? 取消設定？ - + Cancel installation? 取消安裝？ - + Do you really want to cancel the current setup process? The setup program 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 是(&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) - + &Done 完成(&D) - + The installation is complete. Close the installer. 安裝完成。關閉安裝程式。 - + Error 錯誤 - + Installation Failed 安裝失敗 @@ -409,22 +427,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type 未知的例外型別 - + unparseable Python error 無法解析的 Python 錯誤 - + unparseable Python traceback 無法解析的 Python 回溯紀錄 - + Unfetchable Python error. 無法讀取的 Python 錯誤。 @@ -513,7 +531,7 @@ The installer will quit and all changes will be lost. %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - %1 將會縮減到 %2MiB 且新的 %3MiB 分割區將會被建立為 %4。 + %1 會縮減到 %2MiB，並且會為 %4 建立新的 %3MiB 分割區。 @@ -523,7 +541,7 @@ The installer will quit and all changes will be lost. An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - 在這個系統上找不到任何的 EFI 系統分割區。請回到上一步並使用手動分割以設定 %1。 + 在這個系統找不到 EFI 系統分割區。請回到上一步並使用手動分割以設定 %1。 @@ -584,7 +602,7 @@ The installer will quit and all changes will be lost. <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - <strong>並存安裝</strong><br/>安裝程式將會縮減一個分割區以讓出空間給 %1。 + <strong>並存安裝</strong><br/>安裝程式會縮小一個分割區，以讓出空間給 %1。 @@ -731,22 +749,22 @@ The installer will quit and all changes will be lost. 加密(&C) - + Logical 邏輯磁區 - + Primary 主要磁區 - + GPT GPT - + Mountpoint already in use. Please select another one. 掛載點使用中。請選擇其他的。 @@ -754,22 +772,22 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %2MiB partition on %4 (%3) with file system %1. 使用檔案系統 %1 在 %4 (%3) 建立新的 %2MiB 分割區。 - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. 使用檔案系統 <strong>%1</strong> 在 <strong>%4</strong> (%3) 建立新的 <strong>%2MiB</strong> 分割區。 - + Creating new %1 partition on %2. - 正在 %2 上建立新的 %1 分割區。 + 正在於 %2 建立新的 %1 分割區。 - + The installer failed to create partition on disk '%1'. 安裝程式在磁碟 '%1' 上建立分割區失敗。 @@ -817,7 +835,7 @@ The installer will quit and all changes will be lost. Creating new %1 partition table on %2. - 正在 %2 上建立新的 %1 分割表。 + 正在於 %2 建立新的 %1 分割表。 @@ -1063,7 +1081,7 @@ The installer will quit and all changes will be lost. 旗標： - + Mountpoint already in use. Please select another one. 掛載點使用中。請選擇其他的。 @@ -1099,37 +1117,37 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information 設定分割區資訊 - + Install %1 on <strong>new</strong> %2 system partition. 在 <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. 正在設定掛載點。 @@ -1213,22 +1231,22 @@ The installer will quit and all changes will be lost. FormatPartitionJob - + Format partition %1 (file system: %2, size: %3 MiB) on %4. 格式化分割區 %1（檔案系統：%2，大小：%3 MiB）在 %4。 - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. 格式化 <strong>%3MiB</strong> 分割區 <strong>%1</strong>，使用檔案系統 <strong>%2</strong>。 - + Formatting partition %1 with file system %2. 正在以 %2 檔案系統格式化分割區 %1。 - + The installer failed to format partition %1 on disk '%2'. 安裝程式格式化在磁碟 '%2' 上的分割區 %1 失敗。 @@ -1611,8 +1629,8 @@ The installer will quit and all changes will be lost. - Could configure LUKS key file on partition %1. - 無法在分割區 %1 設定 LUKS 金鑰檔。 + Could not configure LUKS key file on partition %1. + 無法於分割區 %1 設定 LUKS 金鑰檔。 @@ -1636,27 +1654,27 @@ 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) 網路安裝。（已停用：無法擷取軟體包清單，請檢查您的網路連線） - + Network Installation. (Disabled: Received invalid groups data) 網路安裝。（已停用：收到無效的群組資料） - + Network Installation. (Disabled: Incorrect configuration) 網路安裝。（已停用：設定不正確） @@ -1664,10 +1682,69 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + + Package selection 軟體包選擇 + + + Office software + 辦公軟體 + + + + Office package + 辦公套件 + + + + Browser software + 瀏覽器軟體 + + + + Browser package + 瀏覽器套件 + + + + Web browser + 網頁瀏覽器 + + + + Kernel + 內核 + + + + Services + 服務 + + + + Login + 登入 + + + + Desktop + 桌面 + + + + Applications + 應用程式 + + + + NotesQmlViewStep + + + Notes + 記事 + OEMPage @@ -1943,7 +2020,7 @@ The installer will quit and all changes will be lost. 未知的錯誤 - + Password is empty 密碼為空 @@ -2336,17 +2413,17 @@ The installer will quit and all changes will be lost. 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 系統分割區以啟動 %1。<br/><br/>要設定 EFI 系統分割區，回到上一步並選取或建立一個包含啟用 <strong>esp</strong> 旗標以及掛載點位於 <strong>%2</strong> 的 FAT32 檔案系統。<br/><br/>您也可以不設定 EFI 系統分割區並繼續，但是您的系統可能會無法啟動。 EFI system partition flag not set - EFI 系統分割區旗標未設定 + 未設定 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 系統分割區以啟動 %1。<br/><br/>有一個分割區的掛載點設定為 <strong>%2</strong>，但未設定 <strong>esp</strong> 旗標。<br/>要設定此旗標，回到上一步並編輯分割區。<br/><br/>您也可以不設定旗標並繼續，但您的系統可能會無法啟動。 @@ -2356,7 +2433,7 @@ The installer will quit and all changes will be lost. 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>。 + 設定了單獨的開機分割區以及加密的根分割區，但是開機分割區並不會被加密。<br/><br/>這種設定可能會造成安全問題，因為重要的系統檔案是放在未加密的分割區中。<br/>您也可以繼續，但是檔案系統的解鎖會在系統啟動後才發生。<br/>要加密開機分割區，回到上一頁並重新建立它，並在分割區建立視窗選取<strong>加密</strong>。 @@ -2365,8 +2442,8 @@ The installer will quit and all changes will be lost. - There are no partitons to install on. - 沒有要安裝的分割區。 + There are no partitions to install on. + 沒有可用於安裝的分割區。 @@ -2430,14 +2507,14 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. 指令沒有輸出。 - + Output: @@ -2446,52 +2523,52 @@ Output: - + External command crashed. 外部指令當機。 - + Command <i>%1</i> crashed. 指令 <i>%1</i> 已當機。 - + External command failed to start. 外部指令啟動失敗。 - + Command <i>%1</i> failed to start. 指令 <i>%1</i> 啟動失敗。 - + Internal error when starting command. 當啟動指令時發生內部錯誤。 - + Bad parameters for process job call. 呼叫程序的參數無效。 - + External command failed to finish. 外部指令結束失敗。 - + Command <i>%1</i> failed to finish in %2 seconds. 指令 <i>%1</i> 在結束 %2 秒內失敗。 - + External command finished with errors. 外部指令結束時發生錯誤。 - + Command <i>%1</i> finished with exit code %2. 指令 <i>%1</i> 結束時有錯誤碼 %2。 @@ -2532,7 +2609,7 @@ Output: Unpartitioned space or unknown partition table - 尚未分割的空間或是未知的分割表 + 尚未分割的空間或是不明的分割表 @@ -2545,7 +2622,7 @@ Output: 模組 <i>%1</i> 需求檢查完成。 - + %1 (%2) language[name] (country[name]) %1 (%2) @@ -2561,29 +2638,23 @@ Output: 未提供描述。 - - - - - + + + + File not found 找不到檔案 - + Path <pre>%1</pre> must be an absolute path. 路徑 <pre>%1</pre> 必須為絕對路徑。 - + Could not create new random file <pre>%1</pre>. 無法建立新的隨機檔案 <pre>%1</pre>。 - - - Could not read random file <pre>%1</pre>. - 無法讀取檔案 <pre>%1</pre>。 - RemoveVolumeGroupJob @@ -2612,69 +2683,69 @@ Output: 表單 - + 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) - + %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>%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 上的資料都將會遺失。 + <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 系統分割區： @@ -2851,35 +2922,35 @@ Output: 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 無法寫入主機名稱到目標系統 @@ -2917,125 +2988,125 @@ Output: SetPartFlagsJob - + Set flags on partition %1. - 在分割區 %1 上設定旗標。 + 設定分割區 %1 的旗標。 - + Set flags on %1MiB %2 partition. - 在 %1MiB %2 分割區設定旗標。 + 設定 %1MiB %2 分割區的旗標。 - + Set flags on new partition. - 在新分割區上設定旗標。 + 設定新分割區的旗標。 - + Clear flags on partition <strong>%1</strong>. - 在分割區 <strong>%1</strong> 上清除旗標。 + 清除分割區 <strong>%1</strong> 的旗標。 - + Clear flags on %1MiB <strong>%2</strong> partition. - 清除在 %1MiB <strong>%2</strong> 分割區上的旗標。 + 清除 %1MiB <strong>%2</strong> 分割區的旗標。 - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. 將 %1MiB <strong>%2</strong> 分割區標記為 <strong>%3</strong>。 - - - Clearing flags on %1MiB <strong>%2</strong> partition. - 正在清除 %1MiB <strong>%2</strong> 分割區上的旗標。 - - - - Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - 正在為 %1MiB <strong>%2</strong> 分割區設定旗標 <strong>%3</strong>。 - - - - Clear flags on new partition. - 清除在新分割區上的旗標。 - - - - Flag partition <strong>%1</strong> as <strong>%2</strong>. - 將分割區 <strong>%1</strong> 的旗標設定為 <strong>%2</strong>。 - - - - Flag new partition as <strong>%1</strong>. - 將新割區旗標設定為 <strong>%1</strong>。 - - - - Clearing flags on partition <strong>%1</strong>. - 正在分割區 <strong>%1</strong> 上清除旗標。 - - - - Clearing flags on new partition. - 清除在新分割區上的旗標。 - + Clearing flags on %1MiB <strong>%2</strong> partition. + 正在清除 %1MiB <strong>%2</strong> 分割區的旗標。 + + + + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. + 正在設定 %1MiB <strong>%2</strong> 分割區的 <strong>%3</strong> 旗標。 + + + + Clear flags on new partition. + 清除新分割區的旗標。 + + + + Flag partition <strong>%1</strong> as <strong>%2</strong>. + 設定分割區 <strong>%1</strong> 的旗標為 <strong>%2</strong>。 + + + + Flag new partition as <strong>%1</strong>. + 設定新分割區的旗標為 <strong>%1</strong>。 + + + + Clearing flags on partition <strong>%1</strong>. + 正在清除分割區 <strong>%1</strong> 的旗標。 + + + + Clearing flags on new partition. + 清除新分割區的旗標。 + + + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - 正在分割區 <strong>%1</strong> 上設定旗標。 + 正在設定 <strong>%1</strong> 分割區的 <strong>%2</strong> 旗標。 - + Setting flags <strong>%1</strong> on new partition. - 正在新分割區上設定旗標 <strong>%1</strong>。 + 正在設定新分割區的 <strong>%1</strong> 旗標。 - + The installer failed to set flags on partition %1. - 安裝程式在分割區 %1 上設定旗標失敗。 + 安裝程式未能在分割區 %1 設定旗標。 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 終止。 @@ -3232,37 +3303,37 @@ Output: <small>如果將會有多於一人使用這臺電腦，您可以在安裝後設定多個帳號。</small> - + Your username is too long. 您的使用者名稱太長了。 - + Your username must start with a lowercase letter or underscore. 您的使用者名稱必須以小寫字母或底線開頭。 - + Only lowercase letters, numbers, underscore and hyphen are allowed. 僅允許小寫字母、數字、底線與連接號。 - + Only letters, numbers, underscore and hyphen are allowed. 僅允許字母、數字、底線與連接號。 - + Your hostname is too short. 您的主機名稱太短了。 - + Your hostname is too long. 您的主機名稱太長了。 - + Your passwords do not match! 密碼不符！ @@ -3270,7 +3341,7 @@ Output: UsersViewStep - + Users 使用者 @@ -3440,6 +3511,14 @@ Output: %1 支援 + + WelcomeQmlViewStep + + + Welcome + 歡迎 + + WelcomeViewStep @@ -3448,4 +3527,47 @@ Output: 歡迎 + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + <h3>%1</h3> + <p>此為發行記事範本。</p> + + + + welcomeq + + + <h3>%1 <quote>%2</quote></h3> + <h3>%1 <quote>%2</quote></h3> + + + + About + 關於 + + + + Support + 支援 + + + + Known issues + 已知問題 + + + + Release notes + 發行記事 + + + + Donate + 捐助 + + diff --git a/lang/python.pot b/lang/python.pot index 511f340e5..3d6e5a614 100644 --- a/lang/python.pot +++ b/lang/python.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -30,8 +30,8 @@ msgstr "Mounting partitions." #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -204,9 +204,9 @@ msgstr "Configuring mkinitcpio." #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "No root mount point is given for 
{!s}
to use." @@ -272,10 +272,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "Configure Plymouth theme" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Generate machine-id." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/ar/LC_MESSAGES/python.mo b/lang/python/ar/LC_MESSAGES/python.mo index 75d05ea24..121865ac8 100644 Binary files a/lang/python/ar/LC_MESSAGES/python.mo 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 index 86053adcb..2b13914fb 100644 --- a/lang/python/ar/LC_MESSAGES/python.po +++ b/lang/python/ar/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: aboodilankaboot, 2019\n" "Language-Team: Arabic (https://www.transifex.com/calamares/teams/20061/ar/)\n" @@ -34,8 +34,8 @@ msgstr "جاري تركيب الأقسام" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -201,9 +201,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -262,10 +262,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "توليد معرف الجهاز" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/as/LC_MESSAGES/python.mo b/lang/python/as/LC_MESSAGES/python.mo index 2b654ac88..9311d209e 100644 Binary files a/lang/python/as/LC_MESSAGES/python.mo and b/lang/python/as/LC_MESSAGES/python.mo differ diff --git a/lang/python/as/LC_MESSAGES/python.po b/lang/python/as/LC_MESSAGES/python.po index ff71b20f1..6b8b9acca 100644 --- a/lang/python/as/LC_MESSAGES/python.po +++ b/lang/python/as/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Deep Jyoti Choudhury , 2020\n" "Language-Team: Assamese (https://www.transifex.com/calamares/teams/20061/as/)\n" @@ -33,8 +33,8 @@ msgstr "বিভাজন মাউন্ট্ কৰা।" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -206,9 +206,9 @@ msgstr "mkinitcpio কনফিগাৰ কৰি আছে।" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "ব্যৱহাৰৰ বাবে 
{!s}
ৰ কোনো মাউন্ট্ পাইন্ট্ দিয়া হোৱা নাই।" @@ -270,10 +270,6 @@ msgstr "{name!s}ৰ বাবে পথ হ'ল {path!s} যিট msgid "Configure Plymouth theme" msgstr "Plymouth theme কন্ফিগাৰ কৰি আছে।​" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "মেচিন-আইডি সৃষ্টি কৰক।" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/ast/LC_MESSAGES/python.mo b/lang/python/ast/LC_MESSAGES/python.mo index d54bc30fa..7624cb74e 100644 Binary files a/lang/python/ast/LC_MESSAGES/python.mo 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 index c6c6f12f1..ca0456e3e 100644 --- a/lang/python/ast/LC_MESSAGES/python.po +++ b/lang/python/ast/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: enolp , 2019\n" "Language-Team: Asturian (https://www.transifex.com/calamares/teams/20061/ast/)\n" @@ -33,8 +33,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -205,9 +205,9 @@ msgstr "Configurando mkinitcpio." #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -267,10 +267,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Xeneración de machine-id." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/be/LC_MESSAGES/python.mo b/lang/python/be/LC_MESSAGES/python.mo index 19d5f5f7a..f41030221 100644 Binary files a/lang/python/be/LC_MESSAGES/python.mo and b/lang/python/be/LC_MESSAGES/python.mo differ diff --git a/lang/python/be/LC_MESSAGES/python.po b/lang/python/be/LC_MESSAGES/python.po index 92ea2d104..da35293e6 100644 --- a/lang/python/be/LC_MESSAGES/python.po +++ b/lang/python/be/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Zmicer Turok , 2019\n" "Language-Team: Belarusian (https://www.transifex.com/calamares/teams/20061/be/)\n" @@ -33,8 +33,8 @@ msgstr "Мантаванне раздзелаў." #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -206,9 +206,9 @@ msgstr "Наладка mkinitcpio." #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "Каранёвы пункт мантавання для
{!s}
не пададзены." @@ -270,10 +270,6 @@ msgstr "Шлях {path!s} да службы {level!s} не існу msgid "Configure Plymouth theme" msgstr "Наладзіць тэму Plymouth" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Стварыць machine-id." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/bg/LC_MESSAGES/python.mo b/lang/python/bg/LC_MESSAGES/python.mo index 2c505bb7a..51df83625 100644 Binary files a/lang/python/bg/LC_MESSAGES/python.mo 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 index c39f7f3c2..c4ffe56d0 100644 --- a/lang/python/bg/LC_MESSAGES/python.po +++ b/lang/python/bg/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Georgi Georgiev , 2018\n" "Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n" @@ -33,8 +33,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -200,9 +200,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -261,10 +261,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Генерирай machine-id." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/ca/LC_MESSAGES/python.mo b/lang/python/ca/LC_MESSAGES/python.mo index d235d0590..1c90ea381 100644 Binary files a/lang/python/ca/LC_MESSAGES/python.mo 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 index de147a2ef..3eeedc2f9 100644 --- a/lang/python/ca/LC_MESSAGES/python.po +++ b/lang/python/ca/LC_MESSAGES/python.po @@ -4,16 +4,16 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Davidmp , 2019 +# Davidmp , 2020 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Davidmp , 2019\n" +"Last-Translator: Davidmp , 2020\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" @@ -33,8 +33,8 @@ msgstr "Es munten les particions." #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -119,7 +119,7 @@ msgstr "No hi ha punt de muntatge per a la partició d'arrel." #: src/modules/unpackfs/main.py:371 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" -msgstr "globalstorage no conté cap clau \"rootMountPoint\". No es fa res." +msgstr "globalstorage no conté cap clau de \"rootMountPoint\". No es fa res." #: src/modules/unpackfs/main.py:376 msgid "Bad mount point for root partition" @@ -209,9 +209,9 @@ msgstr "Es configura mkinitcpio." #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" "No s'ha proporcionat el punt de muntatge perquè l'usi 
{!s}
." @@ -279,10 +279,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "Configura el tema del Plymouth" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Generació de l'id. de la màquina." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/ca@valencia/LC_MESSAGES/python.po b/lang/python/ca@valencia/LC_MESSAGES/python.po index 3de805c12..519d888c8 100644 --- a/lang/python/ca@valencia/LC_MESSAGES/python.po +++ b/lang/python/ca@valencia/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Catalan (Valencian) (https://www.transifex.com/calamares/teams/20061/ca@valencia/)\n" "MIME-Version: 1.0\n" @@ -29,8 +29,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -196,9 +196,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -257,10 +257,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/cs_CZ/LC_MESSAGES/python.mo b/lang/python/cs_CZ/LC_MESSAGES/python.mo index 0ec2c6aef..5f470e27a 100644 Binary files a/lang/python/cs_CZ/LC_MESSAGES/python.mo 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 index 89b750392..8080074a2 100644 --- a/lang/python/cs_CZ/LC_MESSAGES/python.po +++ b/lang/python/cs_CZ/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Pavel Borecki , 2019\n" "Language-Team: Czech (Czech Republic) (https://www.transifex.com/calamares/teams/20061/cs_CZ/)\n" @@ -34,8 +34,8 @@ msgstr "Připojování oddílů." #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -208,9 +208,9 @@ msgstr "Nastavování mkinitcpio." #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "Pro 
{!s}
není zadán žádný přípojný bod." @@ -278,10 +278,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "Nastavit téma vzhledu pro Plymouth" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Vytvořit identifikátor stroje." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/da/LC_MESSAGES/python.mo b/lang/python/da/LC_MESSAGES/python.mo index 81024c8f7..43c9b5f7c 100644 Binary files a/lang/python/da/LC_MESSAGES/python.mo 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 index f10517e2b..00ddffc5c 100644 --- a/lang/python/da/LC_MESSAGES/python.po +++ b/lang/python/da/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: scootergrisen, 2019\n" "Language-Team: Danish (https://www.transifex.com/calamares/teams/20061/da/)\n" @@ -34,8 +34,8 @@ msgstr "Monterer partitioner." #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -209,9 +209,9 @@ msgstr "Konfigurerer mkinitcpio." #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" "Der er ikke angivet noget rodmonteringspunkt som 
{!s}
skal bruge." @@ -277,10 +277,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "Konfigurer Plymouth-tema" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Generér maskin-id." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/de/LC_MESSAGES/python.mo b/lang/python/de/LC_MESSAGES/python.mo index 95e6761e8..79665d9b7 100644 Binary files a/lang/python/de/LC_MESSAGES/python.mo 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 index 226cc286f..14a65d375 100644 --- a/lang/python/de/LC_MESSAGES/python.po +++ b/lang/python/de/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Christian Spaan, 2020\n" "Language-Team: German (https://www.transifex.com/calamares/teams/20061/de/)\n" @@ -35,8 +35,8 @@ msgstr "Hänge Partitionen ein." #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -211,9 +211,9 @@ msgstr "Konfiguriere mkinitcpio. " #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" "Für 
{!s}
wurde kein Einhängepunkt für die Root-Partition " @@ -282,10 +282,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "Konfiguriere Plymouth-Thema" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Generiere Computer-ID" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/el/LC_MESSAGES/python.po b/lang/python/el/LC_MESSAGES/python.po index 627a33890..cd140acf4 100644 --- a/lang/python/el/LC_MESSAGES/python.po +++ b/lang/python/el/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Efstathios Iosifidis , 2017\n" "Language-Team: Greek (https://www.transifex.com/calamares/teams/20061/el/)\n" @@ -33,8 +33,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -200,9 +200,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -261,10 +261,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/en_GB/LC_MESSAGES/python.mo b/lang/python/en_GB/LC_MESSAGES/python.mo index 1460f8611..4c2401cc7 100644 Binary files a/lang/python/en_GB/LC_MESSAGES/python.mo 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 index be94948fd..3cdaeaa7f 100644 --- a/lang/python/en_GB/LC_MESSAGES/python.po +++ b/lang/python/en_GB/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Jason Collins , 2018\n" "Language-Team: English (United Kingdom) (https://www.transifex.com/calamares/teams/20061/en_GB/)\n" @@ -33,8 +33,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -200,9 +200,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -261,10 +261,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Generate machine-id." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/eo/LC_MESSAGES/python.mo b/lang/python/eo/LC_MESSAGES/python.mo index a01b6f323..0f910a110 100644 Binary files a/lang/python/eo/LC_MESSAGES/python.mo and b/lang/python/eo/LC_MESSAGES/python.mo differ diff --git a/lang/python/eo/LC_MESSAGES/python.po b/lang/python/eo/LC_MESSAGES/python.po index 586831314..77d2b8b06 100644 --- a/lang/python/eo/LC_MESSAGES/python.po +++ b/lang/python/eo/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Kurt Ankh Phoenix , 2018\n" "Language-Team: Esperanto (https://www.transifex.com/calamares/teams/20061/eo/)\n" @@ -33,8 +33,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -200,9 +200,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -261,10 +261,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Generi maŝino-legitimilo." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/es/LC_MESSAGES/python.mo b/lang/python/es/LC_MESSAGES/python.mo index 289016aba..38707435b 100644 Binary files a/lang/python/es/LC_MESSAGES/python.mo 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 index 962be18d0..379c98790 100644 --- a/lang/python/es/LC_MESSAGES/python.po +++ b/lang/python/es/LC_MESSAGES/python.po @@ -4,7 +4,7 @@ # FIRST AUTHOR , YEAR. # # Translators: -# strel, 2018 +# strel, 2017 # Francisco Sánchez López de Lerma , 2018 # Guido Grasso , 2018 # Adolfo Jayme-Barrientos, 2019 @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Miguel Mayol , 2020\n" "Language-Team: Spanish (https://www.transifex.com/calamares/teams/20061/es/)\n" @@ -37,8 +37,8 @@ msgstr "Montando particiones" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -217,9 +217,9 @@ msgstr "Configurando mkinitcpio - sistema de arranque básico -." #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" "No se facilitó un punto de montaje raíz utilizable para 
{!s}
" @@ -290,10 +290,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "Configure el tema de Plymouth - menú de bienvenida." -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Generar identificación-de-máquina." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/es_MX/LC_MESSAGES/python.mo b/lang/python/es_MX/LC_MESSAGES/python.mo index 4c8229785..d450f758c 100644 Binary files a/lang/python/es_MX/LC_MESSAGES/python.mo 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 index 3d21e53fa..a0f2d8e0f 100644 --- a/lang/python/es_MX/LC_MESSAGES/python.po +++ b/lang/python/es_MX/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Logan 8192 , 2018\n" "Language-Team: Spanish (Mexico) (https://www.transifex.com/calamares/teams/20061/es_MX/)\n" @@ -34,8 +34,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -201,9 +201,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -262,10 +262,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Generar identificación de la maquina." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/es_PR/LC_MESSAGES/python.po b/lang/python/es_PR/LC_MESSAGES/python.po index f5bb4c7c4..d2dc4f1d9 100644 --- a/lang/python/es_PR/LC_MESSAGES/python.po +++ b/lang/python/es_PR/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Spanish (Puerto Rico) (https://www.transifex.com/calamares/teams/20061/es_PR/)\n" "MIME-Version: 1.0\n" @@ -29,8 +29,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -196,9 +196,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -257,10 +257,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/et/LC_MESSAGES/python.mo b/lang/python/et/LC_MESSAGES/python.mo index 8f796c2df..bc59b5fe4 100644 Binary files a/lang/python/et/LC_MESSAGES/python.mo 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 index 9a4bbdfad..3d262b5f2 100644 --- a/lang/python/et/LC_MESSAGES/python.po +++ b/lang/python/et/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Madis Otenurm, 2019\n" "Language-Team: Estonian (https://www.transifex.com/calamares/teams/20061/et/)\n" @@ -33,8 +33,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -200,9 +200,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -261,10 +261,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Genereeri masina-id." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/eu/LC_MESSAGES/python.mo b/lang/python/eu/LC_MESSAGES/python.mo index e29e27c6e..6ec9f5277 100644 Binary files a/lang/python/eu/LC_MESSAGES/python.mo 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 index 286e052af..f91e17a29 100644 --- a/lang/python/eu/LC_MESSAGES/python.po +++ b/lang/python/eu/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Ander Elortondo, 2019\n" "Language-Team: Basque (https://www.transifex.com/calamares/teams/20061/eu/)\n" @@ -33,8 +33,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -203,9 +203,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -264,10 +264,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Sortu makina-id." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/fa/LC_MESSAGES/python.po b/lang/python/fa/LC_MESSAGES/python.po index 25e611df2..ad8b5a90d 100644 --- a/lang/python/fa/LC_MESSAGES/python.po +++ b/lang/python/fa/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Persian (https://www.transifex.com/calamares/teams/20061/fa/)\n" "MIME-Version: 1.0\n" @@ -29,8 +29,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -196,9 +196,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -257,10 +257,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/fi_FI/LC_MESSAGES/python.mo b/lang/python/fi_FI/LC_MESSAGES/python.mo index 2b3a62198..79fd502f4 100644 Binary files a/lang/python/fi_FI/LC_MESSAGES/python.mo 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 index 769ec6611..f3fa90c54 100644 --- a/lang/python/fi_FI/LC_MESSAGES/python.po +++ b/lang/python/fi_FI/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Kimmo Kujansuu , 2019\n" "Language-Team: Finnish (Finland) (https://www.transifex.com/calamares/teams/20061/fi_FI/)\n" @@ -33,8 +33,8 @@ msgstr "Yhdistä osiot." #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -206,9 +206,9 @@ msgstr "Määritetään mkinitcpio." #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" "Root-juuri kiinnityspistettä 
{!s}
ei ole annettu käytettäväksi." @@ -272,10 +272,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "Määritä Plymouthin teema" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Luo koneen-id." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/fr/LC_MESSAGES/python.mo b/lang/python/fr/LC_MESSAGES/python.mo index 9595cd801..6ad5658e8 100644 Binary files a/lang/python/fr/LC_MESSAGES/python.mo 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 index afefa1a5c..67f973adc 100644 --- a/lang/python/fr/LC_MESSAGES/python.po +++ b/lang/python/fr/LC_MESSAGES/python.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Arnaud Ferraris , 2019\n" "Language-Team: French (https://www.transifex.com/calamares/teams/20061/fr/)\n" @@ -41,8 +41,8 @@ msgstr "Montage des partitions." #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -219,9 +219,9 @@ msgstr "Configuration de mkinitcpio." #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" "Aucun point de montage racine n'a été donné pour être utilisé par " @@ -290,10 +290,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "Configurer le thème Plymouth" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Générer un identifiant machine." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/fr_CH/LC_MESSAGES/python.po b/lang/python/fr_CH/LC_MESSAGES/python.po index 528cceb9f..9cf2084c2 100644 --- a/lang/python/fr_CH/LC_MESSAGES/python.po +++ b/lang/python/fr_CH/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: French (Switzerland) (https://www.transifex.com/calamares/teams/20061/fr_CH/)\n" "MIME-Version: 1.0\n" @@ -29,8 +29,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -196,9 +196,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -257,10 +257,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/gl/LC_MESSAGES/python.mo b/lang/python/gl/LC_MESSAGES/python.mo index 2f7cdba57..d70c91133 100644 Binary files a/lang/python/gl/LC_MESSAGES/python.mo 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 index c98b4c9a3..0f973942e 100644 --- a/lang/python/gl/LC_MESSAGES/python.po +++ b/lang/python/gl/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Xosé, 2018\n" "Language-Team: Galician (https://www.transifex.com/calamares/teams/20061/gl/)\n" @@ -33,8 +33,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -203,9 +203,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -264,10 +264,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Xerar o identificador da máquina." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/gu/LC_MESSAGES/python.po b/lang/python/gu/LC_MESSAGES/python.po index 50eff4c7a..401587739 100644 --- a/lang/python/gu/LC_MESSAGES/python.po +++ b/lang/python/gu/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Gujarati (https://www.transifex.com/calamares/teams/20061/gu/)\n" "MIME-Version: 1.0\n" @@ -29,8 +29,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -196,9 +196,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -257,10 +257,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/he/LC_MESSAGES/python.mo b/lang/python/he/LC_MESSAGES/python.mo index 423f053a9..9b0cdd1a9 100644 Binary files a/lang/python/he/LC_MESSAGES/python.mo 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 index 841a40de8..076bc2819 100644 --- a/lang/python/he/LC_MESSAGES/python.po +++ b/lang/python/he/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Yaron Shahrabani , 2019\n" "Language-Team: Hebrew (https://www.transifex.com/calamares/teams/20061/he/)\n" @@ -34,8 +34,8 @@ msgstr "מחיצות מעוגנות." #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -206,9 +206,9 @@ msgstr "mkinitcpio מותקן." #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "לא סופקה נקודת עגינת שורש לשימוש של 
{!s}
." @@ -272,10 +272,6 @@ msgstr "הנתיב לשירות {name!s} הוא {path!s}, שאינ msgid "Configure Plymouth theme" msgstr "הגדרת ערכת עיצוב של Plymouth" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "לייצר מספר סידורי של המכונה." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/hi/LC_MESSAGES/python.mo b/lang/python/hi/LC_MESSAGES/python.mo index 3d3912fe5..1f427478b 100644 Binary files a/lang/python/hi/LC_MESSAGES/python.mo 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 index 66eca93b5..ec021bf43 100644 --- a/lang/python/hi/LC_MESSAGES/python.po +++ b/lang/python/hi/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Panwar108 , 2019\n" "Language-Team: Hindi (https://www.transifex.com/calamares/teams/20061/hi/)\n" @@ -33,8 +33,8 @@ msgstr "विभाजन माउंट करना।" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -205,9 +205,9 @@ msgstr "mkinitcpio को विन्यस्त करना।" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" "
{!s}
के उपयोग हेतु कोई रुट माउंट पॉइंट प्रदान नहीं किया गया।" @@ -270,10 +270,6 @@ msgstr "सेवा {name!s} हेतु पथ {path!s} है, msgid "Configure Plymouth theme" msgstr "Plymouth थीम विन्यस्त करना " -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "मशीन-आईडी उत्पन्न करना।" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/hr/LC_MESSAGES/python.mo b/lang/python/hr/LC_MESSAGES/python.mo index c455dea5d..25856d395 100644 Binary files a/lang/python/hr/LC_MESSAGES/python.mo 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 index 9f09b4af9..98f0c46eb 100644 --- a/lang/python/hr/LC_MESSAGES/python.po +++ b/lang/python/hr/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Lovro Kudelić , 2019\n" "Language-Team: Croatian (https://www.transifex.com/calamares/teams/20061/hr/)\n" @@ -33,8 +33,8 @@ msgstr "Montiranje particija." #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -208,9 +208,9 @@ msgstr "Konfiguriranje mkinitcpio." #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" "Nijedna root točka montiranja nije definirana za 
{!s}
korištenje." @@ -277,10 +277,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "Konfigurirajte Plymouth temu" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Generiraj ID računala." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/hu/LC_MESSAGES/python.mo b/lang/python/hu/LC_MESSAGES/python.mo index a77df9a5a..0dfa94c5d 100644 Binary files a/lang/python/hu/LC_MESSAGES/python.mo 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 index 8f0f798e7..4d1e7e918 100644 --- a/lang/python/hu/LC_MESSAGES/python.po +++ b/lang/python/hu/LC_MESSAGES/python.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Lajos Pasztor , 2019\n" "Language-Team: Hungarian (https://www.transifex.com/calamares/teams/20061/hu/)\n" @@ -36,8 +36,8 @@ msgstr "Partíciók csatolása." #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -212,9 +212,9 @@ msgstr "mkinitcpio konfigurálása." #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "Nincs root csatolási pont megadva a 
{!s}
használatához." @@ -279,10 +279,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "Plymouth téma beállítása" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Gépazonosító előállítása." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/id/LC_MESSAGES/python.mo b/lang/python/id/LC_MESSAGES/python.mo index 510ab114d..b9bbbc6cb 100644 Binary files a/lang/python/id/LC_MESSAGES/python.mo 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 index eaf28f83d..e9ff61477 100644 --- a/lang/python/id/LC_MESSAGES/python.po +++ b/lang/python/id/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Wantoyo , 2018\n" "Language-Team: Indonesian (https://www.transifex.com/calamares/teams/20061/id/)\n" @@ -35,8 +35,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -204,9 +204,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -265,10 +265,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Menghasilkan machine-id." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/is/LC_MESSAGES/python.po b/lang/python/is/LC_MESSAGES/python.po index 27d23e887..04e4fb51a 100644 --- a/lang/python/is/LC_MESSAGES/python.po +++ b/lang/python/is/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Kristján Magnússon, 2018\n" "Language-Team: Icelandic (https://www.transifex.com/calamares/teams/20061/is/)\n" @@ -33,8 +33,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -200,9 +200,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -261,10 +261,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/it_IT/LC_MESSAGES/python.mo b/lang/python/it_IT/LC_MESSAGES/python.mo index 93a2358e5..8a8b461a4 100644 Binary files a/lang/python/it_IT/LC_MESSAGES/python.mo 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 index 867ab557e..b7aa8b2a7 100644 --- a/lang/python/it_IT/LC_MESSAGES/python.po +++ b/lang/python/it_IT/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Pierfrancesco Passerini , 2019\n" "Language-Team: Italian (Italy) (https://www.transifex.com/calamares/teams/20061/it_IT/)\n" @@ -35,8 +35,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -207,9 +207,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -270,10 +270,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "Configura il tema Plymouth" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Genera machine-id." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/ja/LC_MESSAGES/python.mo b/lang/python/ja/LC_MESSAGES/python.mo index 4722644d8..fcdf97cb4 100644 Binary files a/lang/python/ja/LC_MESSAGES/python.mo 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 index 48d1e22d3..18c1cf628 100644 --- a/lang/python/ja/LC_MESSAGES/python.po +++ b/lang/python/ja/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: UTUMI Hirosi , 2019\n" "Language-Team: Japanese (https://www.transifex.com/calamares/teams/20061/ja/)\n" @@ -35,8 +35,8 @@ msgstr "パーティションのマウント。" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -205,9 +205,9 @@ msgstr "mkinitcpioを設定しています。" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr " 
{!s}
を使用するのにルートマウントポイントが与えられていません。" @@ -267,10 +267,6 @@ msgstr "サービス {name!s} のパスが {path!s} です。こ msgid "Configure Plymouth theme" msgstr "Plymouthテーマを設定" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "machine-id の生成" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/kk/LC_MESSAGES/python.po b/lang/python/kk/LC_MESSAGES/python.po index d21647f9c..78c96ec29 100644 --- a/lang/python/kk/LC_MESSAGES/python.po +++ b/lang/python/kk/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Kazakh (https://www.transifex.com/calamares/teams/20061/kk/)\n" "MIME-Version: 1.0\n" @@ -29,8 +29,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -196,9 +196,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -257,10 +257,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/kn/LC_MESSAGES/python.po b/lang/python/kn/LC_MESSAGES/python.po index 83bf8cc9f..cc031ed81 100644 --- a/lang/python/kn/LC_MESSAGES/python.po +++ b/lang/python/kn/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Kannada (https://www.transifex.com/calamares/teams/20061/kn/)\n" "MIME-Version: 1.0\n" @@ -29,8 +29,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -196,9 +196,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -257,10 +257,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/ko/LC_MESSAGES/python.mo b/lang/python/ko/LC_MESSAGES/python.mo index fc0658fd0..0fd46eac9 100644 Binary files a/lang/python/ko/LC_MESSAGES/python.mo and b/lang/python/ko/LC_MESSAGES/python.mo differ diff --git a/lang/python/ko/LC_MESSAGES/python.po b/lang/python/ko/LC_MESSAGES/python.po index d1f7c2b07..95980dbf0 100644 --- a/lang/python/ko/LC_MESSAGES/python.po +++ b/lang/python/ko/LC_MESSAGES/python.po @@ -5,16 +5,16 @@ # # Translators: # Ji-Hyeon Gim , 2018 -# 이정희 , 2019 +# MarongHappy , 2019 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: 이정희 , 2019\n" +"Last-Translator: MarongHappy , 2019\n" "Language-Team: Korean (https://www.transifex.com/calamares/teams/20061/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,8 +34,8 @@ msgstr "파티션 마운트 중." #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -204,9 +204,9 @@ msgstr "mkinitcpio 구성 중." #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "
{!s}
에서 사용할 루트 마운트 지점이 제공되지 않음." @@ -267,10 +267,6 @@ msgstr "{name!s} 서비스에 대한 경로는 {path!s}이고, 존 msgid "Configure Plymouth theme" msgstr "플리머스 테마 구성" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "machine-id를 생성합니다." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/lo/LC_MESSAGES/python.po b/lang/python/lo/LC_MESSAGES/python.po index b8f374c2d..e996aba11 100644 --- a/lang/python/lo/LC_MESSAGES/python.po +++ b/lang/python/lo/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Lao (https://www.transifex.com/calamares/teams/20061/lo/)\n" "MIME-Version: 1.0\n" @@ -29,8 +29,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -196,9 +196,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -257,10 +257,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/lt/LC_MESSAGES/python.mo b/lang/python/lt/LC_MESSAGES/python.mo index faee89ab3..209e223e9 100644 Binary files a/lang/python/lt/LC_MESSAGES/python.mo 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 index 4e4c9ece7..ca214e74d 100644 --- a/lang/python/lt/LC_MESSAGES/python.po +++ b/lang/python/lt/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Mindaugas , 2019\n" "Language-Team: Lithuanian (https://www.transifex.com/calamares/teams/20061/lt/)\n" @@ -34,8 +34,8 @@ msgstr "Prijungiami skaidiniai." #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -209,9 +209,9 @@ msgstr "Konfigūruojama mkinitcpio." #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" "Nėra nurodyta jokių šaknies prijungimo taškų, skirtų 
{!s}
" @@ -279,10 +279,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "Konfigūruoti Plymouth temą" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Generuoti machine-id." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/mk/LC_MESSAGES/python.po b/lang/python/mk/LC_MESSAGES/python.po index bbe94af2b..85d182f9b 100644 --- a/lang/python/mk/LC_MESSAGES/python.po +++ b/lang/python/mk/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Martin Ristovski , 2018\n" "Language-Team: Macedonian (https://www.transifex.com/calamares/teams/20061/mk/)\n" @@ -33,8 +33,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -200,9 +200,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -261,10 +261,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/ml/LC_MESSAGES/python.mo b/lang/python/ml/LC_MESSAGES/python.mo index 58f3dc3e7..60415346e 100644 Binary files a/lang/python/ml/LC_MESSAGES/python.mo and b/lang/python/ml/LC_MESSAGES/python.mo differ diff --git a/lang/python/ml/LC_MESSAGES/python.po b/lang/python/ml/LC_MESSAGES/python.po index b6877b327..cfbddc9bc 100644 --- a/lang/python/ml/LC_MESSAGES/python.po +++ b/lang/python/ml/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Balasankar C , 2019\n" "Language-Team: Malayalam (https://www.transifex.com/calamares/teams/20061/ml/)\n" @@ -34,8 +34,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -201,9 +201,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -262,10 +262,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "മെഷീൻ-ഐഡ് നിർമ്മിക്കുക" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/mr/LC_MESSAGES/python.po b/lang/python/mr/LC_MESSAGES/python.po index 2ad50b3e2..522c06160 100644 --- a/lang/python/mr/LC_MESSAGES/python.po +++ b/lang/python/mr/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Marathi (https://www.transifex.com/calamares/teams/20061/mr/)\n" "MIME-Version: 1.0\n" @@ -29,8 +29,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -196,9 +196,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -257,10 +257,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/nb/LC_MESSAGES/python.mo b/lang/python/nb/LC_MESSAGES/python.mo index 8278ac7cb..c5d4d2fb1 100644 Binary files a/lang/python/nb/LC_MESSAGES/python.mo 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 index 2c309c2c2..5d4c10403 100644 --- a/lang/python/nb/LC_MESSAGES/python.po +++ b/lang/python/nb/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Tyler Moss , 2017\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/calamares/teams/20061/nb/)\n" @@ -33,8 +33,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -200,9 +200,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -261,10 +261,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Generer maskin-ID." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/ne_NP/LC_MESSAGES/python.po b/lang/python/ne_NP/LC_MESSAGES/python.po index 6666d12ed..f705bd724 100644 --- a/lang/python/ne_NP/LC_MESSAGES/python.po +++ b/lang/python/ne_NP/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Nepali (Nepal) (https://www.transifex.com/calamares/teams/20061/ne_NP/)\n" "MIME-Version: 1.0\n" @@ -29,8 +29,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -196,9 +196,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -257,10 +257,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/nl/LC_MESSAGES/python.mo b/lang/python/nl/LC_MESSAGES/python.mo index 5097710c9..ddfad3d7a 100644 Binary files a/lang/python/nl/LC_MESSAGES/python.mo 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 index e7b5eabb7..39e345856 100644 --- a/lang/python/nl/LC_MESSAGES/python.po +++ b/lang/python/nl/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Adriaan de Groot , 2019\n" "Language-Team: Dutch (https://www.transifex.com/calamares/teams/20061/nl/)\n" @@ -33,8 +33,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -202,9 +202,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -263,10 +263,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Genereer machine-id" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/pl/LC_MESSAGES/python.mo b/lang/python/pl/LC_MESSAGES/python.mo index 79c4cbd7d..3f0af3a0d 100644 Binary files a/lang/python/pl/LC_MESSAGES/python.mo 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 index dfdaf73ec..c14ada6a6 100644 --- a/lang/python/pl/LC_MESSAGES/python.po +++ b/lang/python/pl/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Piotr Strębski , 2019\n" "Language-Team: Polish (https://www.transifex.com/calamares/teams/20061/pl/)\n" @@ -35,8 +35,8 @@ msgstr "Montowanie partycji." #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -210,9 +210,9 @@ msgstr "Konfigurowanie mkinitcpio." #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -271,10 +271,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "Konfiguracja motywu Plymouth" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Generuj machine-id." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/pt_BR/LC_MESSAGES/python.mo b/lang/python/pt_BR/LC_MESSAGES/python.mo index 27c003175..383f84566 100644 Binary files a/lang/python/pt_BR/LC_MESSAGES/python.mo 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 index d3c97bac7..d0e623838 100644 --- a/lang/python/pt_BR/LC_MESSAGES/python.po +++ b/lang/python/pt_BR/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Guilherme, 2019\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/calamares/teams/20061/pt_BR/)\n" @@ -34,8 +34,8 @@ msgstr "Montando partições." #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -210,9 +210,9 @@ msgstr "Configurando mkinitcpio." #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" "Nenhum ponto de montagem para o root fornecido para uso por 
{!s}
." @@ -282,10 +282,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "Configurar tema do Plymouth" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Gerar machine-id." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/pt_PT/LC_MESSAGES/python.mo b/lang/python/pt_PT/LC_MESSAGES/python.mo index 9ac0dcef1..c47fe73a2 100644 Binary files a/lang/python/pt_PT/LC_MESSAGES/python.mo 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 index a8b31fdc4..2edd840e7 100644 --- a/lang/python/pt_PT/LC_MESSAGES/python.po +++ b/lang/python/pt_PT/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Hugo Carvalho , 2019\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/calamares/teams/20061/pt_PT/)\n" @@ -35,8 +35,8 @@ msgstr "A montar partições." #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -211,9 +211,9 @@ msgstr "A configurar o mkintcpio." #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "Nenhum ponto de montagem root é fornecido para 
{!s}
usar." @@ -281,10 +281,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "Configurar tema do Plymouth" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Gerar id-máquina" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/ro/LC_MESSAGES/python.mo b/lang/python/ro/LC_MESSAGES/python.mo index 444b8c38a..3844e22d8 100644 Binary files a/lang/python/ro/LC_MESSAGES/python.mo 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 index 584f6677c..90be7113d 100644 --- a/lang/python/ro/LC_MESSAGES/python.po +++ b/lang/python/ro/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Sebastian Brici , 2018\n" "Language-Team: Romanian (https://www.transifex.com/calamares/teams/20061/ro/)\n" @@ -34,8 +34,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -201,9 +201,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -262,10 +262,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Generează machine-id." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/ru/LC_MESSAGES/python.po b/lang/python/ru/LC_MESSAGES/python.po index 33b0c157b..3b0bb39d9 100644 --- a/lang/python/ru/LC_MESSAGES/python.po +++ b/lang/python/ru/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Aleksey Kabanov , 2018\n" "Language-Team: Russian (https://www.transifex.com/calamares/teams/20061/ru/)\n" @@ -33,8 +33,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -200,9 +200,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -261,10 +261,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/sk/LC_MESSAGES/python.mo b/lang/python/sk/LC_MESSAGES/python.mo index 618d7fde7..914992af0 100644 Binary files a/lang/python/sk/LC_MESSAGES/python.mo 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 index c61dc8ca0..001caa658 100644 --- a/lang/python/sk/LC_MESSAGES/python.po +++ b/lang/python/sk/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Dušan Kazik , 2019\n" "Language-Team: Slovak (https://www.transifex.com/calamares/teams/20061/sk/)\n" @@ -33,8 +33,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -200,9 +200,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -261,10 +261,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Generovanie identifikátora počítača." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/sl/LC_MESSAGES/python.po b/lang/python/sl/LC_MESSAGES/python.po index 16a997f73..acf7bafd9 100644 --- a/lang/python/sl/LC_MESSAGES/python.po +++ b/lang/python/sl/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Slovenian (https://www.transifex.com/calamares/teams/20061/sl/)\n" "MIME-Version: 1.0\n" @@ -29,8 +29,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -196,9 +196,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -257,10 +257,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/sq/LC_MESSAGES/python.mo b/lang/python/sq/LC_MESSAGES/python.mo index 1ae01a16e..7f3be3883 100644 Binary files a/lang/python/sq/LC_MESSAGES/python.mo and b/lang/python/sq/LC_MESSAGES/python.mo differ diff --git a/lang/python/sq/LC_MESSAGES/python.po b/lang/python/sq/LC_MESSAGES/python.po index 42914c0c0..aca17a4d6 100644 --- a/lang/python/sq/LC_MESSAGES/python.po +++ b/lang/python/sq/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Besnik , 2019\n" "Language-Team: Albanian (https://www.transifex.com/calamares/teams/20061/sq/)\n" @@ -33,8 +33,8 @@ msgstr "Po montohen pjesë." #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -208,9 +208,9 @@ msgstr "Po formësohet mkinitcpio." #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" "S’është dhënë pikë montimi rrënjë për 
{!s}
për t’u përdorur." @@ -278,10 +278,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "Formësoni temën Plimuth" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Prodho machine-id." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/sr/LC_MESSAGES/python.po b/lang/python/sr/LC_MESSAGES/python.po index 496dbe069..74bf3206e 100644 --- a/lang/python/sr/LC_MESSAGES/python.po +++ b/lang/python/sr/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Slobodan Simić , 2019\n" "Language-Team: Serbian (https://www.transifex.com/calamares/teams/20061/sr/)\n" @@ -33,8 +33,8 @@ msgstr "Монтирање партиција." #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -200,9 +200,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -261,10 +261,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/sr@latin/LC_MESSAGES/python.po b/lang/python/sr@latin/LC_MESSAGES/python.po index 4792e537c..b072db982 100644 --- a/lang/python/sr@latin/LC_MESSAGES/python.po +++ b/lang/python/sr@latin/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Serbian (Latin) (https://www.transifex.com/calamares/teams/20061/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -29,8 +29,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -196,9 +196,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -257,10 +257,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/sv/LC_MESSAGES/python.po b/lang/python/sv/LC_MESSAGES/python.po index 07c245add..063ba7fe5 100644 --- a/lang/python/sv/LC_MESSAGES/python.po +++ b/lang/python/sv/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Jan-Olof Svensson, 2019\n" "Language-Team: Swedish (https://www.transifex.com/calamares/teams/20061/sv/)\n" @@ -33,8 +33,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -200,9 +200,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -261,10 +261,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/th/LC_MESSAGES/python.po b/lang/python/th/LC_MESSAGES/python.po index 114fb7604..faf76f2b2 100644 --- a/lang/python/th/LC_MESSAGES/python.po +++ b/lang/python/th/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Thai (https://www.transifex.com/calamares/teams/20061/th/)\n" "MIME-Version: 1.0\n" @@ -29,8 +29,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -196,9 +196,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -257,10 +257,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/tr_TR/LC_MESSAGES/python.mo b/lang/python/tr_TR/LC_MESSAGES/python.mo index 1197e1a65..f0af7e240 100644 Binary files a/lang/python/tr_TR/LC_MESSAGES/python.mo 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 index 7e2e88815..c13fe7004 100644 --- a/lang/python/tr_TR/LC_MESSAGES/python.po +++ b/lang/python/tr_TR/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Demiray Muhterem , 2019\n" "Language-Team: Turkish (Turkey) (https://www.transifex.com/calamares/teams/20061/tr_TR/)\n" @@ -33,8 +33,8 @@ msgstr "Disk bölümleri bağlanıyor." #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -208,9 +208,9 @@ msgstr "Mkinitcpio yapılandırılıyor." #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "
{!s}
kullanması için kök bağlama noktası verilmedi." @@ -273,10 +273,6 @@ msgstr "{name!s} hizmetinin yolu, bulunmayan {path!s}." msgid "Configure Plymouth theme" msgstr "Plymouth temasını yapılandır" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "Makine kimliği oluştur." - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/uk/LC_MESSAGES/python.mo b/lang/python/uk/LC_MESSAGES/python.mo index 0e9f4e170..02910dbb8 100644 Binary files a/lang/python/uk/LC_MESSAGES/python.mo 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 index 727d4c617..d653e636e 100644 --- a/lang/python/uk/LC_MESSAGES/python.po +++ b/lang/python/uk/LC_MESSAGES/python.po @@ -6,15 +6,16 @@ # Translators: # Володимир Братко , 2018 # Paul S , 2019 +# Yuri Chornoivan , 2020 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Paul S , 2019\n" +"Last-Translator: Yuri Chornoivan , 2020\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" @@ -24,30 +25,30 @@ msgstr "" #: src/modules/grubcfg/main.py:37 msgid "Configure GRUB." -msgstr "" +msgstr "Налаштовування GRUB." #: src/modules/mount/main.py:38 msgid "Mounting partitions." -msgstr "" +msgstr "Монтування розділів." #: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:201 #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 msgid "Configuration Error" -msgstr "" +msgstr "Помилка налаштовування" #: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172 #: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79 #: src/modules/fstab/main.py:323 msgid "No partitions are defined for 
{!s}
to use." -msgstr "" +msgstr "Не визначено розділів для використання 
{!s}
." #: src/modules/services-systemd/main.py:35 msgid "Configure systemd services" @@ -56,31 +57,31 @@ msgstr "Налаштуйте служби systemd" #: src/modules/services-systemd/main.py:68 #: src/modules/services-openrc/main.py:102 msgid "Cannot modify service" -msgstr "Не вдається змінити службу" +msgstr "Не вдалося змінити службу" #: src/modules/services-systemd/main.py:69 msgid "" "systemctl {arg!s} call in chroot returned error code {num!s}." msgstr "" -" systemctl {arg!s} виклик у chroot повернув код помилки {num! " -"s}." +"Внаслідок виклику systemctl {arg!s} у chroot було повернуто " +"повідомлення з кодом помилки {num! s}." #: src/modules/services-systemd/main.py:72 #: src/modules/services-systemd/main.py:76 msgid "Cannot enable systemd service {name!s}." -msgstr "Неможливо ввімкнути службу systemd {name!s}." +msgstr "Не вдалося ввімкнути службу systemd {name!s}." #: src/modules/services-systemd/main.py:74 msgid "Cannot enable systemd target {name!s}." -msgstr "Неможливо ввімкнути завдання systemd {name!s}." +msgstr "Не вдалося ввімкнути завдання systemd {name!s}." #: src/modules/services-systemd/main.py:78 msgid "Cannot disable systemd target {name!s}." -msgstr "Неможливо вимкнути завдання systemd {name!s}." +msgstr "Не вдалося вимкнути завдання systemd {name!s}." #: src/modules/services-systemd/main.py:80 msgid "Cannot mask systemd unit {name!s}." -msgstr "Неможливо маскувати вузол systemd {name!s}." +msgstr "Не вдалося замаскувати вузол systemd {name!s}." #: src/modules/services-systemd/main.py:82 msgid "" @@ -92,26 +93,26 @@ msgstr "" #: src/modules/umount/main.py:40 msgid "Unmount file systems." -msgstr "Відключити файлові системи." +msgstr "Демонтувати файлові системи." #: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." -msgstr "" +msgstr "Заповнення файлових систем." #: src/modules/unpackfs/main.py:184 msgid "rsync failed with error code {}." -msgstr "rsync зазнав невдачі з кодом помилки {}." +msgstr "Спроба виконати rsync зазнала невдачі з кодом помилки {}." #: src/modules/unpackfs/main.py:245 src/modules/unpackfs/main.py:268 msgid "Failed to unpack image \"{}\"" -msgstr "Не вдалося розпакувати образ \"{}\"" +msgstr "Не вдалося розпакувати образ «{}»" #: src/modules/unpackfs/main.py:246 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -"Не вдалося знайти unsquashfs, переконайтеся, що встановлено пакет squashfs-" +"Не вдалося знайти unsquashfs; переконайтеся, що встановлено пакет squashfs-" "tools" #: src/modules/unpackfs/main.py:370 @@ -121,161 +122,172 @@ msgstr "Немає точки монтування для кореневого #: src/modules/unpackfs/main.py:371 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" +"У globalstorage не міститься ключа «rootMountPoint». Не виконуватимемо " +"ніяких дій." #: src/modules/unpackfs/main.py:376 msgid "Bad mount point for root partition" -msgstr "Помилка точки монтування для кореневого розділу" +msgstr "Помилкова точна монтування для кореневого розділу" #: src/modules/unpackfs/main.py:377 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" +"Для rootMountPoint вказано значення «{}». Такого шляху не існує. Не " +"виконуватимемо ніяких дій." #: src/modules/unpackfs/main.py:389 src/modules/unpackfs/main.py:393 #: src/modules/unpackfs/main.py:407 msgid "Bad unsquash configuration" -msgstr "Неправильна конфігурація unsquash" +msgstr "Помилкові налаштування unsquash" #: src/modules/unpackfs/main.py:390 msgid "The filesystem for \"{}\" ({}) is not supported" -msgstr "Файлова система для \"{}\" ({}) не підтримується" +msgstr "Підтримки файлової системи для «{}» ({}) не передбачено" #: src/modules/unpackfs/main.py:394 msgid "The source filesystem \"{}\" does not exist" -msgstr "Вихідна файлова система \"{}\" не існує" +msgstr "Вихідної файлової системи «{}» не існує" #: src/modules/unpackfs/main.py:408 msgid "The destination \"{}\" in the target system is not a directory" -msgstr "Призначення \"{}\" у цільовій системі не є каталогом" +msgstr "Призначення «{}» у цільовій системі не є каталогом" #: src/modules/displaymanager/main.py:515 msgid "Cannot write KDM configuration file" -msgstr "Неможливо записати файл налаштування KDM" +msgstr "Не вдалося записати файл налаштувань KDM" #: src/modules/displaymanager/main.py:516 msgid "KDM config file {!s} does not exist" -msgstr "Файл налаштування KDM {!s} не існує" +msgstr "Файла налаштувань KDM {!s} не існує" #: src/modules/displaymanager/main.py:577 msgid "Cannot write LXDM configuration file" -msgstr "Неможливо записати файл конфігурації LXDM" +msgstr "Не вдалося виконати запис до файла налаштувань LXDM" #: src/modules/displaymanager/main.py:578 msgid "LXDM config file {!s} does not exist" -msgstr "Файл налаштування LXDM {!s} не існує" +msgstr "Файла налаштувань LXDM {!s} не існує" #: src/modules/displaymanager/main.py:661 msgid "Cannot write LightDM configuration file" -msgstr "Неможливо записати файл налаштування LightDM" +msgstr "Не вдалося виконати запис до файла налаштувань LightDM" #: src/modules/displaymanager/main.py:662 msgid "LightDM config file {!s} does not exist" -msgstr "Файл налаштування LightDM {!s} не існує" +msgstr "Файла налаштувань LightDM {!s} не існує" #: src/modules/displaymanager/main.py:736 msgid "Cannot configure LightDM" -msgstr "Неможливо налаштувати LightDM" +msgstr "Не вдалося налаштувати LightDM" #: src/modules/displaymanager/main.py:737 msgid "No LightDM greeter installed." -msgstr "" +msgstr "Засіб входу до системи LightDM не встановлено." #: src/modules/displaymanager/main.py:768 msgid "Cannot write SLIM configuration file" -msgstr "Неможливо записати файл налаштування SLIM" +msgstr "Не вдалося виконати запис до файла налаштувань SLIM" #: src/modules/displaymanager/main.py:769 msgid "SLIM config file {!s} does not exist" -msgstr "Файл налаштування SLIM {!s} не існує" +msgstr "Файла налаштувань SLIM {!s} не існує" #: src/modules/displaymanager/main.py:895 msgid "No display managers selected for the displaymanager module." -msgstr "" +msgstr "Не вибрано засобу керування дисплеєм для модуля displaymanager." #: src/modules/displaymanager/main.py:896 msgid "" "The displaymanagers list is empty or undefined in bothglobalstorage and " "displaymanager.conf." msgstr "" +"Список засобів керування дисплеєм є порожнім або невизначеним у " +"bothglobalstorage та displaymanager.conf." #: src/modules/displaymanager/main.py:978 msgid "Display manager configuration was incomplete" -msgstr "" +msgstr "Налаштування засобу керування дисплеєм є неповними" #: src/modules/initcpiocfg/main.py:37 msgid "Configuring mkinitcpio." -msgstr "" +msgstr "Налаштовуємо mkinitcpio." #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" +"Не вказано кореневої точки монтування для використання у 
{!s}
." #: src/modules/luksopenswaphookcfg/main.py:35 msgid "Configuring encrypted swap." -msgstr "" +msgstr "Налаштовуємо зашифрований розділ резервної пам'яті." #: src/modules/rawfs/main.py:35 msgid "Installing data." -msgstr "" +msgstr "Встановлюємо дані." #: src/modules/services-openrc/main.py:38 msgid "Configure OpenRC services" -msgstr "" +msgstr "Налаштувати служби OpenRC" #: src/modules/services-openrc/main.py:66 msgid "Cannot add service {name!s} to run-level {level!s}." -msgstr "" +msgstr "Не вдалося додати службу {name!s} до рівня запуску {level!s}." #: src/modules/services-openrc/main.py:68 msgid "Cannot remove service {name!s} from run-level {level!s}." -msgstr "" +msgstr "Не вдалося вилучити службу {name!s} з рівня запуску {level!s}." #: src/modules/services-openrc/main.py:70 msgid "" "Unknown service-action {arg!s} for service {name!s} in run-" "level {level!s}." msgstr "" +"Невідома дія зі службою {arg!s} для служби {name!s} на рівні " +"запуску {level!s}." #: src/modules/services-openrc/main.py:103 msgid "" "rc-update {arg!s} call in chroot returned error code {num!s}." msgstr "" +"Унаслідок виконання виклику rc-update {arg!s} chroot повернуто " +"повідомлення про помилку із кодом {num!s}." #: src/modules/services-openrc/main.py:110 msgid "Target runlevel does not exist" -msgstr "" +msgstr "Шляху до рівня запуску не існує" #: src/modules/services-openrc/main.py:111 msgid "" "The path for runlevel {level!s} is {path!s}, which does not " "exist." msgstr "" +"Шляхом до рівня запуску {level!s} вказано {path!s}. Такого " +"шляху не існує." #: src/modules/services-openrc/main.py:119 msgid "Target service does not exist" -msgstr "" +msgstr "Служби призначення не існує" #: src/modules/services-openrc/main.py:120 msgid "" "The path for service {name!s} is {path!s}, which does not " "exist." msgstr "" +"Шляхом до служби {name!s} вказано {path!s}. Такого шляху не " +"існує." #: src/modules/plymouthcfg/main.py:36 msgid "Configure Plymouth theme" -msgstr "" - -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "" +msgstr "Налаштувати тему Plymouth" #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" -msgstr "" +msgstr "Обробляємо пакунки (%(count)d з %(total)d)" #: src/modules/packages/main.py:64 src/modules/packages/main.py:74 msgid "Install packages." @@ -285,68 +297,68 @@ msgstr "Встановити пакети." #, python-format msgid "Installing one package." msgid_plural "Installing %(num)d packages." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Встановлюємо %(num)d пакунок." +msgstr[1] "Встановлюємо %(num)d пакунки." +msgstr[2] "Встановлюємо %(num)d пакунків." +msgstr[3] "Встановлюємо один пакунок." #: src/modules/packages/main.py:70 #, python-format msgid "Removing one package." msgid_plural "Removing %(num)d packages." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Вилучаємо %(num)d пакунок." +msgstr[1] "Вилучаємо %(num)d пакунки." +msgstr[2] "Вилучаємо %(num)d пакунків." +msgstr[3] "Вилучаємо один пакунок." #: src/modules/bootloader/main.py:51 msgid "Install bootloader." -msgstr "" +msgstr "Встановити завантажувач." #: src/modules/removeuser/main.py:34 msgid "Remove live user from target system" -msgstr "" +msgstr "Вилучити користувача портативної системи із системи призначення" #: src/modules/hwclock/main.py:35 msgid "Setting hardware clock." -msgstr "" +msgstr "Встановлюємо значення для апаратного годинника." #: src/modules/dracut/main.py:36 msgid "Creating initramfs with dracut." -msgstr "" +msgstr "Створюємо initramfs за допомогою dracut." #: src/modules/dracut/main.py:58 msgid "Failed to run dracut on the target" -msgstr "" +msgstr "Не вдалося виконати dracut над призначенням" #: src/modules/dracut/main.py:59 msgid "The exit code was {}" -msgstr "" +msgstr "Код виходу — {}" #: src/modules/initramfscfg/main.py:41 msgid "Configuring initramfs." -msgstr "" +msgstr "Налаштовуємо initramfs." #: src/modules/openrcdmcryptcfg/main.py:34 msgid "Configuring OpenRC dmcrypt service." -msgstr "" +msgstr "Налаштовуємо службу dmcrypt OpenRC." #: src/modules/fstab/main.py:38 msgid "Writing fstab." -msgstr "" +msgstr "Записуємо fstab." #: src/modules/dummypython/main.py:44 msgid "Dummy python job." -msgstr "" +msgstr "Фіктивне завдання python." #: src/modules/dummypython/main.py:97 msgid "Dummy python step {}" -msgstr "" +msgstr "Фіктивний крок python {}" #: src/modules/localecfg/main.py:39 msgid "Configuring locales." -msgstr "" +msgstr "Налаштовуємо локалі." #: src/modules/networkcfg/main.py:37 msgid "Saving network configuration." -msgstr "" +msgstr "Зберігаємо налаштування мережі." diff --git a/lang/python/ur/LC_MESSAGES/python.po b/lang/python/ur/LC_MESSAGES/python.po index 438989393..dccfdb421 100644 --- a/lang/python/ur/LC_MESSAGES/python.po +++ b/lang/python/ur/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Urdu (https://www.transifex.com/calamares/teams/20061/ur/)\n" "MIME-Version: 1.0\n" @@ -29,8 +29,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -196,9 +196,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -257,10 +257,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/uz/LC_MESSAGES/python.po b/lang/python/uz/LC_MESSAGES/python.po index 5a16b3b2b..37aa27672 100644 --- a/lang/python/uz/LC_MESSAGES/python.po +++ b/lang/python/uz/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Uzbek (https://www.transifex.com/calamares/teams/20061/uz/)\n" "MIME-Version: 1.0\n" @@ -29,8 +29,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -196,9 +196,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -257,10 +257,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/zh_CN/LC_MESSAGES/python.mo b/lang/python/zh_CN/LC_MESSAGES/python.mo index e20166ae4..09dcb62c7 100644 Binary files a/lang/python/zh_CN/LC_MESSAGES/python.mo 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 index c0d3d4d1d..44fa7c119 100644 --- a/lang/python/zh_CN/LC_MESSAGES/python.po +++ b/lang/python/zh_CN/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: leonfeng , 2018\n" "Language-Team: Chinese (China) (https://www.transifex.com/calamares/teams/20061/zh_CN/)\n" @@ -35,8 +35,8 @@ msgstr "" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -202,9 +202,9 @@ msgstr "" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -263,10 +263,6 @@ msgstr "" msgid "Configure Plymouth theme" msgstr "" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "生成 machine-id。" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/lang/python/zh_TW/LC_MESSAGES/python.mo b/lang/python/zh_TW/LC_MESSAGES/python.mo index d1525888b..792b16a90 100644 Binary files a/lang/python/zh_TW/LC_MESSAGES/python.mo 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 index 8708ddbf7..558011834 100644 --- a/lang/python/zh_TW/LC_MESSAGES/python.po +++ b/lang/python/zh_TW/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: 黃柏諺 , 2019\n" "Language-Team: Chinese (Taiwan) (https://www.transifex.com/calamares/teams/20061/zh_TW/)\n" @@ -33,8 +33,8 @@ msgstr "正在掛載分割區。" #: src/modules/initcpiocfg/main.py:205 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 -#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94 -#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78 +#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 +#: src/modules/openrcdmcryptcfg/main.py:78 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 @@ -202,9 +202,9 @@ msgstr "正在設定 mkinitcpio。" #: src/modules/initcpiocfg/main.py:206 #: src/modules/luksopenswaphookcfg/main.py:100 -#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99 -#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329 -#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 +#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 +#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145 +#: src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "沒有給定的根掛載點 
{!s}
以供使用。" @@ -263,10 +263,6 @@ msgstr "服務 {name!s} 的路徑為 {path!s}，不存在。" msgid "Configure Plymouth theme" msgstr "設定 Plymouth 主題" -#: src/modules/machineid/main.py:36 -msgid "Generate machine-id." -msgstr "生成 machine-id。" - #: src/modules/packages/main.py:62 #, python-format msgid "Processing packages (%(count)d / %(total)d)" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b73fecda0..1445b18f3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,6 +2,7 @@ include( CalamaresAddPlugin ) include( CalamaresAddModuleSubdirectory ) include( CalamaresAddLibrary ) include( CalamaresAddBrandingSubdirectory ) +include( CalamaresAddTest ) # library add_subdirectory( libcalamares ) diff --git a/src/calamares/CMakeLists.txt b/src/calamares/CMakeLists.txt index a55e26b6d..9327af8e3 100644 --- a/src/calamares/CMakeLists.txt +++ b/src/calamares/CMakeLists.txt @@ -1,5 +1,3 @@ -add_definitions( -DUIDLLEXPORT_PRO ) - set( calamaresSources main.cpp CalamaresApplication.cpp diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt index cad7e7a6e..156ab2cc6 100644 --- a/src/libcalamares/CMakeLists.txt +++ b/src/libcalamares/CMakeLists.txt @@ -44,7 +44,9 @@ set( libSources network/Manager.cpp # Partition service + partition/Mount.cpp partition/PartitionSize.cpp + partition/Sync.cpp # Utility service utils/CalamaresUtilsSystem.cpp @@ -74,7 +76,6 @@ mark_thirdparty_code( ${kdsagSources} ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${YAMLCPP_INCLUDE_DIR} ) ### OPTIONAL Python support @@ -111,6 +112,38 @@ if( Qt5Xml_FOUND ) list( APPEND OPTIONAL_PUBLIC_LIBRARIES Qt5::Network Qt5::Xml ) endif() +### OPTIONAL KPMcore support +# +# +find_package( KPMcore 3.3 ) +set_package_properties( + KPMcore PROPERTIES + URL "https://invent.kde.org/kde/kpmcore" + DESCRIPTION "KDE Partitioning library" + TYPE RECOMMENDED + PURPOSE "For partitioning service" +) + +if ( KPMcore_FOUND ) + find_package( Qt5 REQUIRED DBus ) # Needed for KPMCore + find_package( KF5 REQUIRED I18n WidgetsAddons ) # Needed for KPMCore + + if( KPMcore_VERSION VERSION_GREATER_EQUAL "4.0" ) + add_definitions( -DWITH_KPMCORE4API ) # kpmcore 4 with new API + elseif( KPMcore_VERSION VERSION_GREATER "3.3.70" ) + message( FATAL_ERROR "KPMCore beta versions ${KPMcore_VERSION} not supported" ) + endif() + + include_directories( ${KPMCORE_INCLUDE_DIR} ) + list( APPEND libSources + partition/FileSystem.cpp + partition/KPMManager.cpp + partition/PartitionIterator.cpp + partition/PartitionQuery.cpp + ) + list( APPEND OPTIONAL_PRIVATE_LIBRARIES kpmcore ) +endif() + ### LIBRARY # # @@ -126,7 +159,7 @@ target_link_libraries( calamares LINK_PRIVATE ${OPTIONAL_PRIVATE_LIBRARIES} LINK_PUBLIC - ${YAMLCPP_LIBRARY} + yamlcpp Qt5::Core KF5::CoreAddons ${OPTIONAL_PUBLIC_LIBRARIES} @@ -159,85 +192,51 @@ install( FILES ${utilsHeaders} DESTINATION include/libcalam ### TESTING # # -if ( ECM_FOUND AND BUILD_TESTING ) - ecm_add_test( - utils/Tests.cpp - TEST_NAME - libcalamarestest - LINK_LIBRARIES - calamares - Qt5::Core - Qt5::Test - ) - calamares_automoc( libcalamarestest ) +calamares_add_test( + libcalamarestest + SOURCES + utils/Tests.cpp +) - ecm_add_test( - utils/TestPaths.cpp - TEST_NAME - libcalamarestestpaths - LINK_LIBRARIES - calamares - Qt5::Core - Qt5::Test - ) - calamares_automoc( libcalamarestestpaths ) +calamares_add_test( + libcalamarestestpaths + SOURCES + utils/TestPaths.cpp +) +calamares_add_test( + geoiptest + SOURCES + geoip/GeoIPTests.cpp + ${geoip_src} +) - ecm_add_test( - geoip/GeoIPTests.cpp - ${geoip_src} - TEST_NAME - geoiptest - LINK_LIBRARIES - calamares - Qt5::Test - ${YAMLCPP_LIBRARY} - ) - calamares_automoc( geoiptest ) +calamares_add_test( + libcalamarespartitiontest + SOURCES + partition/Tests.cpp +) - ecm_add_test( - partition/Tests.cpp - TEST_NAME - libcalamarespartitiontest - LINK_LIBRARIES - calamares - Qt5::Test - ) - calamares_automoc( libcalamarespartitiontest ) +calamares_add_test( + libcalamareslocaletest + SOURCES + locale/Tests.cpp +) - ecm_add_test( - locale/Tests.cpp - TEST_NAME - libcalamareslocaletest - LINK_LIBRARIES - calamares - Qt5::Test - ) - calamares_automoc( libcalamareslocaletest ) +calamares_add_test( + libcalamaresnetworktest + SOURCES + network/Tests.cpp +) - ecm_add_test( - network/Tests.cpp - TEST_NAME - libcalamaresnetworktest - LINK_LIBRARIES - calamares - Qt5::Test - ) - calamares_automoc( libcalamaresnetworktest ) - - ecm_add_test( - modulesystem/Tests.cpp - TEST_NAME - libcalamaresmodulesystemtest - LINK_LIBRARIES - calamares - Qt5::Test - ) - calamares_automoc( libcalamaresmodulesystemtest ) -endif() +calamares_add_test( + libcalamaresmodulesystemtest + SOURCES + modulesystem/Tests.cpp +) if( BUILD_TESTING ) add_executable( test_geoip geoip/test_geoip.cpp ${geoip_src} ) - target_link_libraries( test_geoip calamares Qt5::Network ${YAMLCPP_LIBRARY} ) + target_link_libraries( test_geoip calamares Qt5::Network yamlcpp ) calamares_automoc( test_geoip ) endif() diff --git a/src/libcalamares/DllMacro.h b/src/libcalamares/DllMacro.h index d3e1c8098..712bf5732 100644 --- a/src/libcalamares/DllMacro.h +++ b/src/libcalamares/DllMacro.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014, Teo Mrnjavac + * Copyright 2020, 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,10 @@ #include +/* + * Mark symbols exported from Calamares non-GUI library with DLLEXPORT. + * These are the public API of libcalamares. + */ #ifndef DLLEXPORT #if defined( DLLEXPORT_PRO ) #define DLLEXPORT Q_DECL_EXPORT @@ -29,4 +34,42 @@ #endif #endif +/* + * Mark symbols exported from Calamares GUI library with DLLEXPORT. + * These are the public API of libcalamaresui. + */ +#ifndef UIDLLEXPORT +#if defined( UIDLLEXPORT_PRO ) +#define UIDLLEXPORT Q_DECL_EXPORT +#else +#define UIDLLEXPORT Q_DECL_IMPORT +#endif +#endif + +/* + * Mark symbols exported from Calamares C++ plugins with PLUGINDLLEXPORT. + * These are the public API of the libraries (generally, the plugin + * entry point) + */ +#ifndef PLUGINDLLEXPORT +#if defined( PLUGINDLLEXPORT_PRO ) +#define PLUGINDLLEXPORT Q_DECL_EXPORT +#else +#define PLUGINDLLEXPORT Q_DECL_IMPORT +#endif +#endif + +/* + * For functions that should be static in production but also need to + * be tested, use STATICTEST as linkage specifier. When built as part + * of a test, the function will be given normal linkage. + */ +#ifndef STATICTEST +#if defined( BUILD_AS_TEST ) +#define STATICTEST +#else +#define STATICTEST static +#endif +#endif + #endif diff --git a/src/libcalamares/JobQueue.cpp b/src/libcalamares/JobQueue.cpp index 2690769db..44382fb91 100644 --- a/src/libcalamares/JobQueue.cpp +++ b/src/libcalamares/JobQueue.cpp @@ -36,12 +36,13 @@ public: : QThread( queue ) , m_queue( queue ) , m_jobIndex( 0 ) + , m_jobCount( 0 ) { } virtual ~JobThread() override; - void setJobs( const JobList& jobs ) + void setJobs( JobList&& jobs ) { m_jobs = jobs; @@ -73,7 +74,7 @@ public: } emitProgress(); - cDebug() << "Starting" << ( anyFailed ? "EMERGENCY JOB" : "job" ) << job->prettyName(); + cDebug() << "Starting" << ( anyFailed ? "EMERGENCY JOB" : "job" ) << job->prettyName() << " (there are" << m_jobs.count() << " left)"; connect( job.data(), &Job::progress, this, &JobThread::emitProgress ); JobResult result = job->exec(); if ( !anyFailed && !result ) @@ -103,6 +104,7 @@ private: QList< qreal > m_jobWeights; JobQueue* m_queue; int m_jobIndex; + int m_jobCount; void emitProgress( qreal jobPercent = 0 ) { @@ -193,7 +195,7 @@ void JobQueue::start() { Q_ASSERT( !m_thread->isRunning() ); - m_thread->setJobs( m_jobs ); + m_thread->setJobs( std::move( m_jobs ) ); m_jobs.clear(); m_thread->start(); } diff --git a/src/libcalamares/PythonJobApi.cpp b/src/libcalamares/PythonJobApi.cpp index 132a9dcf5..393958664 100644 --- a/src/libcalamares/PythonJobApi.cpp +++ b/src/libcalamares/PythonJobApi.cpp @@ -22,6 +22,7 @@ #include "GlobalStorage.h" #include "JobQueue.h" #include "PythonHelper.h" +#include "partition/Mount.h" #include "utils/CalamaresUtilsSystem.h" #include "utils/Logger.h" #include "utils/String.h" @@ -63,10 +64,10 @@ mount( const std::string& device_path, const std::string& filesystem_name, const std::string& options ) { - return CalamaresUtils::System::instance()->mount( QString::fromStdString( device_path ), - QString::fromStdString( mount_point ), - QString::fromStdString( filesystem_name ), - QString::fromStdString( options ) ); + return CalamaresUtils::Partition::mount( QString::fromStdString( device_path ), + QString::fromStdString( mount_point ), + QString::fromStdString( filesystem_name ), + QString::fromStdString( options ) ); } diff --git a/src/libcalamares/locale/TranslatableConfiguration.cpp b/src/libcalamares/locale/TranslatableConfiguration.cpp index bc39c398e..83199a4cc 100644 --- a/src/libcalamares/locale/TranslatableConfiguration.cpp +++ b/src/libcalamares/locale/TranslatableConfiguration.cpp @@ -23,6 +23,7 @@ #include "utils/Logger.h" #include "utils/Variant.h" +#include #include #include @@ -34,7 +35,9 @@ TranslatedString::TranslatedString( const QString& string ) { m_strings[ QString() ] = string; } -TranslatedString::TranslatedString( const QVariantMap& map, const QString& key ) + +TranslatedString::TranslatedString( const QVariantMap& map, const QString& key, const char* context ) + : m_context( context ) { // Get the un-decorated value for the key QString value = CalamaresUtils::getString( map, key ); @@ -99,7 +102,17 @@ TranslatedString::get( const QLocale& locale ) const } } - return m_strings[ QString() ]; + // If we're given a context to work with, also try the same string in + // the regular translation framework. + const QString& s = m_strings[ QString() ]; + if ( m_context ) + { + return QCoreApplication::translate( m_context, s.toLatin1().constData() ); + } + else + { + return s; + } } diff --git a/src/libcalamares/locale/TranslatableConfiguration.h b/src/libcalamares/locale/TranslatableConfiguration.h index 45679bce0..d845569bc 100644 --- a/src/libcalamares/locale/TranslatableConfiguration.h +++ b/src/libcalamares/locale/TranslatableConfiguration.h @@ -39,8 +39,19 @@ class DLLEXPORT TranslatedString { public: /** @brief Get all the translations connected to @p key + * + * Gets map[key] as the "untranslated" form, and then all the + * keys of the form [lang] are taken as the translation + * for of the untranslated form. + * + * If @p context is not a nullptr, then that is taken as an + * indication to **also** use the regular QObject::tr() translation + * mechanism for these strings. It is recommended to pass in + * metaObject()->className() as context (from a QObject based class) + * to give the TranslatedString the same context as other calls + * to tr() within that class. */ - TranslatedString( const QVariantMap& map, const QString& key ); + TranslatedString( const QVariantMap& map, const QString& key, const char* context = nullptr ); /** @brief Not-actually-translated string. */ TranslatedString( const QString& string ); @@ -73,6 +84,7 @@ public: private: // Maps locale name to human-readable string, "" is English QMap< QString, QString > m_strings; + const char* m_context = nullptr; }; } // namespace Locale } // namespace CalamaresUtils diff --git a/src/libcalamares/network/Tests.cpp b/src/libcalamares/network/Tests.cpp index 3a15b3c59..830545b96 100644 --- a/src/libcalamares/network/Tests.cpp +++ b/src/libcalamares/network/Tests.cpp @@ -47,6 +47,6 @@ NetworkTests::testPing() using namespace CalamaresUtils::Network; Logger::setupLogLevel( Logger::LOGVERBOSE ); auto& nam = Manager::instance(); - auto r = nam.synchronousPing( QUrl( "https://www.kde.org" ), RequestOptions( RequestOptions::FollowRedirect ) ); - QVERIFY( r ); + auto canPing_www_kde_org = nam.synchronousPing( QUrl( "https://www.kde.org" ), RequestOptions( RequestOptions::FollowRedirect ) ); + QVERIFY( canPing_www_kde_org ); } diff --git a/src/libcalamares/partition/FileSystem.cpp b/src/libcalamares/partition/FileSystem.cpp new file mode 100644 index 000000000..fbbe48581 --- /dev/null +++ b/src/libcalamares/partition/FileSystem.cpp @@ -0,0 +1,74 @@ +/* === This file is part of Calamares - === + * + * Copyright 2014, Aurélien Gâteau + * Copyright 2015-2016, Teo Mrnjavac + * Copyright 2018-2019 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 "FileSystem.h" + +#include + +namespace CalamaresUtils +{ +namespace Partition +{ + +QString +prettyNameForFileSystemType( FileSystem::Type t ) +{ + switch ( t ) + { + case FileSystem::Unknown: + return QObject::tr( "unknown" ); + case FileSystem::Extended: + return QObject::tr( "extended" ); + case FileSystem::Unformatted: + return QObject::tr( "unformatted" ); + case FileSystem::LinuxSwap: + return QObject::tr( "swap" ); + case FileSystem::Fat16: + case FileSystem::Fat32: + case FileSystem::Ntfs: + case FileSystem::Xfs: + case FileSystem::Jfs: + case FileSystem::Hfs: + case FileSystem::Ufs: + case FileSystem::Hpfs: + case FileSystem::Luks: + case FileSystem::Ocfs2: + case FileSystem::Zfs: + case FileSystem::Nilfs2: + return FileSystem::nameForType( t ).toUpper(); + case FileSystem::ReiserFS: + return "ReiserFS"; + case FileSystem::Reiser4: + return "Reiser4"; + case FileSystem::HfsPlus: + return "HFS+"; + case FileSystem::Btrfs: + return "Btrfs"; + case FileSystem::Exfat: + return "exFAT"; + case FileSystem::Lvm2_PV: + return "LVM PV"; + default: + return FileSystem::nameForType( t ); + } +} + +} // namespace Partition +} // namespace CalamaresUtils diff --git a/src/libcalamares/partition/FileSystem.h b/src/libcalamares/partition/FileSystem.h new file mode 100644 index 000000000..258515d3c --- /dev/null +++ b/src/libcalamares/partition/FileSystem.h @@ -0,0 +1,65 @@ +/* === This file is part of Calamares - === + * + * Copyright 2014, Aurélien Gâteau + * Copyright 2015-2016, Teo Mrnjavac + * Copyright 2019, 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 . + */ + +/* + * NOTE: this functionality is only available when Calamares is compiled + * with KPMcore support. + */ + +#ifndef PARTITION_FILESYSTEM_H +#define PARTITION_FILESYSTEM_H + +#include + +namespace CalamaresUtils +{ +namespace Partition +{ +QString prettyNameForFileSystemType( FileSystem::Type t ); + +static inline QString +untranslatedFS( FileSystem& fs ) +{ + return fs.name( { QStringLiteral( "C" ) } ); +} + +static inline QString +untranslatedFS( FileSystem* fs ) +{ + return fs ? untranslatedFS( *fs ) : QString(); +} + +static inline QString +userVisibleFS( FileSystem& fs ) +{ + return fs.name(); +} + +static inline QString +userVisibleFS( FileSystem* fs ) +{ + return fs ? userVisibleFS( *fs ) : QString(); +} + + +} // namespace Partition +} // namespace CalamaresUtils + +#endif // PARTITION_PARTITIONQUERY_H diff --git a/src/libcalamares/partition/KPMManager.cpp b/src/libcalamares/partition/KPMManager.cpp new file mode 100644 index 000000000..efc5f0003 --- /dev/null +++ b/src/libcalamares/partition/KPMManager.cpp @@ -0,0 +1,128 @@ +/* === This file is part of Calamares - === + * + * Copyright 2019, 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 "KPMManager.h" + +#include "utils/Logger.h" + +#include +#include +#if defined( WITH_KPMCORE4API ) +#include +#endif + + +#include + + +namespace CalamaresUtils +{ +namespace Partition +{ +class InternalManager +{ +public: + InternalManager(); + ~InternalManager(); +}; + +static bool s_kpm_loaded = false; + +/* + * We have one living InternalManager object at a time. + * It is managed by shared_ptr<>s help by KPMManager + * objects, but since we can create KPMManager objects + * independent of each other, all of which share ownership + * of the same InternalManager, hang on to one extra reference + * to the InternalManager so we can hand it out in getInternal(). + */ +static std::weak_ptr< InternalManager > s_backend; + +InternalManager::InternalManager() +{ + cDebug() << "KPMCore backend starting .."; + + Q_ASSERT( s_backend.expired() ); + + if ( !s_kpm_loaded ) + { + QByteArray backendName = qgetenv( "KPMCORE_BACKEND" ); + if ( !CoreBackendManager::self()->load( backendName.isEmpty() ? CoreBackendManager::defaultBackendName() + : backendName ) ) + { + cWarning() << "Failed to load backend plugin" << backendName; + } + else + { + auto* backend_p = CoreBackendManager::self()->backend(); + cDebug() << Logger::SubEntry << "Backend @" << (void*)backend_p << backend_p->id() << backend_p->version(); + s_kpm_loaded = true; + } + } +} + +InternalManager::~InternalManager() +{ + cDebug() << "Cleaning up KPMCore backend .."; + +#if defined( WITH_KPMCORE4API ) + auto backend_p = CoreBackendManager::self()->backend(); + if ( backend_p ) + { + ExternalCommand::stopHelper(); + } +#endif +} + +std::shared_ptr< InternalManager > +getInternal() +{ + if ( s_backend.expired() ) + { + auto p = std::make_shared< InternalManager >(); + s_backend = p; + return p; + } + return s_backend.lock(); +} + +KPMManager::KPMManager() + : m_d( getInternal() ) +{ + cDebug() << "KPMManager" << s_backend.use_count() << "created."; +} + +KPMManager::~KPMManager() +{ + cDebug() << "KPMManager" << s_backend.use_count() << "being destroyed."; +} + +KPMManager::operator bool() const +{ + return s_kpm_loaded; +} + +CoreBackend* +KPMManager::backend() const +{ + return s_kpm_loaded ? CoreBackendManager::self()->backend() : nullptr; +} + + +} // namespace Partition +} // namespace CalamaresUtils diff --git a/src/libcalamares/partition/KPMManager.h b/src/libcalamares/partition/KPMManager.h new file mode 100644 index 000000000..5f7039221 --- /dev/null +++ b/src/libcalamares/partition/KPMManager.h @@ -0,0 +1,69 @@ +/* === This file is part of Calamares - === + * + * Copyright 2019, 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 . + */ + +/* + * NOTE: this functionality is only available when Calamares is compiled + * with KPMcore support. + */ + +#ifndef PARTITION_KPMMANAGER_H +#define PARTITION_KPMMANAGER_H + +#include + +class CoreBackend; + +namespace CalamaresUtils +{ +namespace Partition +{ +/// @brief Handle to KPMCore +class InternalManager; + +/** @brief KPMCore loader and cleanup + * + * A Calamares plugin that uses KPMCore should hold an object of + * this class; its only responsibility is to load KPMCore + * and to cleanly unload it on destruction (with KPMCore 4, + * also to shutdown the privileged helper application). + * + * It loads the default plugin ("parted" with KPMCore 3, "sfdisk" + * with KPMCore 4), but this can be overridden by setting the + * environment variable KPMCORE_BACKEND. Setting it to + * "dummy" will load the dummy plugin instead. + */ +class KPMManager +{ +public: + KPMManager(); + ~KPMManager(); + + /// @brief Is KPMCore loaded correctly? + operator bool() const; + + /// @brief Gets the KPMCore backend (e.g. CoreBackendManager::self()->backend() ) + CoreBackend* backend() const; + +private: + std::shared_ptr< InternalManager > m_d; +}; + +} // namespace Partition +} // namespace CalamaresUtils + +#endif // PARTITION_KPMMANAGER_H diff --git a/src/libcalamares/partition/Mount.cpp b/src/libcalamares/partition/Mount.cpp new file mode 100644 index 000000000..91fcefff5 --- /dev/null +++ b/src/libcalamares/partition/Mount.cpp @@ -0,0 +1,132 @@ +/* === This file is part of Calamares - === + * + * Copyright 2014, Teo Mrnjavac + * Copyright 2017-2019, 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 "Mount.h" + +#include "partition/Sync.h" +#include "utils/CalamaresUtilsSystem.h" +#include "utils/Logger.h" + +#include +#include + +namespace CalamaresUtils +{ +namespace Partition +{ + +int +mount( const QString& devicePath, const QString& mountPoint, const QString& filesystemName, const QString& options ) +{ + if ( devicePath.isEmpty() || mountPoint.isEmpty() ) + { + if ( devicePath.isEmpty() ) + { + cWarning() << "Can't mount an empty device."; + } + if ( mountPoint.isEmpty() ) + { + cWarning() << "Can't mount on an empty mountpoint."; + } + + return static_cast< int >( ProcessResult::Code::NoWorkingDirectory ); + } + + QDir mountPointDir( mountPoint ); + if ( !mountPointDir.exists() ) + { + bool ok = mountPointDir.mkpath( mountPoint ); + if ( !ok ) + { + cWarning() << "Could not create mountpoint" << mountPoint; + return static_cast< int >( ProcessResult::Code::NoWorkingDirectory ); + } + } + + QStringList args = { "mount" }; + + if ( !filesystemName.isEmpty() ) + { + args << "-t" << filesystemName; + } + if ( !options.isEmpty() ) + { + if ( options.startsWith( '-' ) ) + { + args << options; + } + else + { + args << "-o" << options; + } + } + args << devicePath << mountPoint; + + auto r = CalamaresUtils::System::runCommand( args, std::chrono::seconds( 10 ) ); + sync(); + return r.getExitCode(); +} + +int +unmount( const QString& path, const QStringList& options ) +{ + auto r + = CalamaresUtils::System::runCommand( QStringList { "umount" } << options << path, std::chrono::seconds( 10 ) ); + sync(); + return r.getExitCode(); +} + +struct TemporaryMount::Private +{ + QString m_devicePath; + QTemporaryDir m_mountDir; +}; + + +TemporaryMount::TemporaryMount( const QString& devicePath, const QString& filesystemName, const QString& options ) + : m_d( new Private ) +{ + m_d->m_devicePath = devicePath; + m_d->m_mountDir.setAutoRemove( false ); + int r = mount( devicePath, m_d->m_mountDir.path(), filesystemName, options ); + if ( !r ) + { + delete m_d; + m_d = nullptr; + } +} + +TemporaryMount::~TemporaryMount() +{ + if ( m_d ) + { + unmount( m_d->m_devicePath, { "-R" } ); + delete m_d; + m_d = nullptr; + } +} + +QString +TemporaryMount::path() const +{ + return m_d ? m_d->m_mountDir.path() : QString(); +} + +} // namespace Partition +} // namespace CalamaresUtils diff --git a/src/libcalamares/partition/Mount.h b/src/libcalamares/partition/Mount.h new file mode 100644 index 000000000..041e7e757 --- /dev/null +++ b/src/libcalamares/partition/Mount.h @@ -0,0 +1,80 @@ +/* === This file is part of Calamares - === + * + * Copyright 2014, Teo Mrnjavac + * Copyright 2017-2019, 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 PARTITION_MOUNT_H +#define PARTITION_MOUNT_H + +#include "DllMacro.h" + +#include +#include + +namespace CalamaresUtils +{ +namespace Partition +{ + +/** + * Runs the mount utility with the specified parameters. + * @param devicePath the path of the partition to mount. + * @param mountPoint the full path of the target mount point. + * @param filesystemName the name of the filesystem (optional). + * @param options any additional options as passed to mount -o (optional). + * If @p options starts with a dash (-) then it is passed unchanged + * and no -o option is added; this is used in handling --bind mounts. + * @returns the program's exit code, or: + * Crashed = QProcess crash + * FailedToStart = QProcess cannot start + * NoWorkingDirectory = bad arguments + */ +DLLEXPORT int mount( const QString& devicePath, + const QString& mountPoint, + const QString& filesystemName = QString(), + const QString& options = QString() ); + +/** @brief Unmount the given @p path (device or mount point). + * + * Runs umount(8) in the host system. + * + * @returns the program's exit code, or special codes like mount(). + */ +DLLEXPORT int unmount( const QString& path, const QStringList& options = QStringList() ); + +class DLLEXPORT TemporaryMount +{ +public: + TemporaryMount( const QString& devicePath, + const QString& filesystemName = QString(), + const QString& options = QString() ); + TemporaryMount( const TemporaryMount& ) = delete; + TemporaryMount& operator=( const TemporaryMount& ) = delete; + ~TemporaryMount(); + + bool isValid() const { return m_d; } + QString path() const; + +private: + struct Private; + Private* m_d = nullptr; +}; + +} // namespace Partition +} // namespace CalamaresUtils + +#endif diff --git a/src/modules/partition/core/PartitionIterator.cpp b/src/libcalamares/partition/PartitionIterator.cpp similarity index 90% rename from src/modules/partition/core/PartitionIterator.cpp rename to src/libcalamares/partition/PartitionIterator.cpp index 34471f6f2..642752163 100644 --- a/src/modules/partition/core/PartitionIterator.cpp +++ b/src/libcalamares/partition/PartitionIterator.cpp @@ -2,7 +2,7 @@ * * Copyright 2014, Aurélien Gâteau * Copyright 2015, Teo Mrnjavac - * Copyright 2017, Adriaan de Groot + * Copyright 2017, 2019 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,12 +25,19 @@ #include #include +namespace CalamaresUtils +{ +namespace Partition +{ + +using Partition = ::Partition; + PartitionIterator::PartitionIterator( PartitionTable* table ) : m_table( table ) -{} +{ +} -Partition* -PartitionIterator::operator*() const +Partition* PartitionIterator::operator*() const { return m_current; } @@ -39,7 +46,9 @@ void PartitionIterator::operator++() { if ( !m_current ) + { return; + } if ( m_current->hasChildren() ) { // Go to the first child @@ -78,18 +87,21 @@ PartitionIterator::operator==( const PartitionIterator& other ) const bool PartitionIterator::operator!=( const PartitionIterator& other ) const { - return ! ( *this == other ); + return !( *this == other ); } PartitionIterator PartitionIterator::begin( Device* device ) { if ( !device ) + { return PartitionIterator( nullptr ); - Q_ASSERT(device); + } PartitionTable* table = device->partitionTable(); if ( !table ) + { return PartitionIterator( nullptr ); + } return PartitionIterator::begin( table ); } @@ -101,7 +113,9 @@ PartitionIterator::begin( PartitionTable* table ) // Does not usually happen, but it did happen on a tiny (10MiB) disk with an MBR // partition table. if ( children.isEmpty() ) + { return it; + } it.m_current = children.first(); return it; } @@ -110,10 +124,14 @@ PartitionIterator PartitionIterator::end( Device* device ) { if ( !device ) + { return PartitionIterator( nullptr ); + } PartitionTable* table = device->partitionTable(); if ( !table ) + { return PartitionIterator( nullptr ); + } return PartitionIterator::end( table ); } @@ -123,3 +141,6 @@ PartitionIterator::end( PartitionTable* table ) { return PartitionIterator( table ); } + +} // namespace Partition +} // namespace CalamaresUtils diff --git a/src/modules/partition/core/PartitionIterator.h b/src/libcalamares/partition/PartitionIterator.h similarity index 53% rename from src/modules/partition/core/PartitionIterator.h rename to src/libcalamares/partition/PartitionIterator.h index b72c2de8a..78d930cf4 100644 --- a/src/modules/partition/core/PartitionIterator.h +++ b/src/libcalamares/partition/PartitionIterator.h @@ -2,6 +2,7 @@ * * Copyright 2014, Aurélien Gâteau * Copyright 2015, Teo Mrnjavac + * Copyright 2019, 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,37 +18,57 @@ * along with Calamares. If not, see . */ -#ifndef PARTITIONITERATOR_H -#define PARTITIONITERATOR_H +/* + * NOTE: this functionality is only available when Calamares is compiled + * with KPMcore support. + */ + +#ifndef PARTITION_PARTITIONITERATOR_H +#define PARTITION_PARTITIONITERATOR_H class Device; class Partition; class PartitionTable; -/** +namespace CalamaresUtils +{ +namespace Partition +{ + +/** @brief Iterator over KPMCore partitions + * * A forward-only iterator to go through the partitions of a device, * independently of whether they are primary, logical or extended. + * + * An iterator can be created from a device (then it refers to the + * partition table of that device) or a partition table. The + * partition table must remain valid throughout iteration. + * + * A nullptr is valid, for an empty iterator. */ class PartitionIterator { public: - Partition* operator*() const; + ::Partition* operator*() const; void operator++(); bool operator==( const PartitionIterator& other ) const; bool operator!=( const PartitionIterator& other ) const; - static PartitionIterator begin( Device* device ); - static PartitionIterator begin( PartitionTable* table ); - static PartitionIterator end( Device* device ); - static PartitionIterator end( PartitionTable* table ); + static PartitionIterator begin( ::Device* device ); + static PartitionIterator begin( ::PartitionTable* table ); + static PartitionIterator end( ::Device* device ); + static PartitionIterator end( ::PartitionTable* table ); private: - PartitionIterator( PartitionTable* table ); + PartitionIterator( ::PartitionTable* table ); - PartitionTable* m_table; - Partition* m_current = nullptr; + ::PartitionTable* m_table; + ::Partition* m_current = nullptr; }; -#endif /* PARTITIONITERATOR_H */ +} // namespace Partition +} // namespace CalamaresUtils + +#endif // PARTITION_PARTITIONITERATOR_H diff --git a/src/libcalamares/partition/PartitionQuery.cpp b/src/libcalamares/partition/PartitionQuery.cpp new file mode 100644 index 000000000..6693f7e6c --- /dev/null +++ b/src/libcalamares/partition/PartitionQuery.cpp @@ -0,0 +1,102 @@ +/* === This file is part of Calamares - === + * + * Copyright 2014, Aurélien Gâteau + * Copyright 2015-2016, Teo Mrnjavac + * Copyright 2018-2019 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 "PartitionQuery.h" + +#include "PartitionIterator.h" + +#include +#include + +namespace CalamaresUtils +{ +namespace Partition +{ + +// Types from KPMCore +using ::Device; +using ::Partition; + +bool +isPartitionFreeSpace( Partition* partition ) +{ + return partition->roles().has( PartitionRole::Unallocated ); +} + + +bool +isPartitionNew( Partition* partition ) +{ +#if defined( WITH_KPMCORE4API ) + constexpr auto NewState = Partition::State::New; +#else + constexpr auto NewState = Partition::StateNew; +#endif + return partition->state() == NewState; +} + + +Partition* +findPartitionByCurrentMountPoint( const QList< Device* >& devices, const QString& mountPoint ) +{ + for ( auto device : devices ) + for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it ) + if ( ( *it )->mountPoint() == mountPoint ) + { + return *it; + } + return nullptr; +} + + +Partition* +findPartitionByPath( const QList< Device* >& devices, const QString& path ) +{ + if ( path.simplified().isEmpty() ) + { + return nullptr; + } + + for ( auto device : devices ) + for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it ) + if ( ( *it )->partitionPath() == path.simplified() ) + { + return *it; + } + return nullptr; +} + + +QList< Partition* > +findPartitions( const QList< Device* >& devices, std::function< bool( Partition* ) > criterionFunction ) +{ + QList< Partition* > results; + for ( auto device : devices ) + for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it ) + if ( criterionFunction( *it ) ) + { + results.append( *it ); + } + return results; +} + + +} // namespace Partition +} // namespace CalamaresUtils diff --git a/src/libcalamares/partition/PartitionQuery.h b/src/libcalamares/partition/PartitionQuery.h new file mode 100644 index 000000000..18eb7edd2 --- /dev/null +++ b/src/libcalamares/partition/PartitionQuery.h @@ -0,0 +1,78 @@ +/* === This file is part of Calamares - === + * + * Copyright 2014, Aurélien Gâteau + * Copyright 2015-2016, Teo Mrnjavac + * Copyright 2019, 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 . + */ + +/* + * NOTE: this functionality is only available when Calamares is compiled + * with KPMcore support. + */ + +#ifndef PARTITION_PARTITIONQUERY_H +#define PARTITION_PARTITIONQUERY_H + +#include + +#include + +class Device; +class Partition; + +namespace CalamaresUtils +{ +namespace Partition +{ + +using ::Device; +using ::Partition; + +/** @brief Is this a free-space area? */ +bool isPartitionFreeSpace( Partition* ); + +/** @brief Is this partition newly-to-be-created? + * + * Returns true if the partition is planned to be created by the installer as + * opposed to already existing on the disk. + */ +bool isPartitionNew( Partition* ); + +/** + * Iterates on all devices and return the first partition which is (already) + * mounted on @p mountPoint. + */ +Partition* findPartitionByCurrentMountPoint( const QList< Device* >& devices, const QString& mountPoint ); + +// TODO: add this distinction +// Partition* findPartitionByIntendedMountPoint( const QList< Device* >& devices, const QString& mountPoint ); + +/** + * Iterates on all devices and partitions and returns a pointer to the Partition object + * for the given path, or nullptr if a Partition for the given path cannot be found. + */ +Partition* findPartitionByPath( const QList< Device* >& devices, const QString& path ); + +/** + * Iterates on all devices and partitions and returns a list of pointers to the Partition + * objects that satisfy the conditions defined in the criterion function. + */ +QList< Partition* > findPartitions( const QList< Device* >& devices, + std::function< bool( Partition* ) > criterionFunction ); +} // namespace Partition +} // namespace CalamaresUtils + +#endif // PARTITION_PARTITIONQUERY_H diff --git a/src/modules/welcome/Config.h b/src/libcalamares/partition/Sync.cpp similarity index 62% rename from src/modules/welcome/Config.h rename to src/libcalamares/partition/Sync.cpp index 7b0cfd734..c5e131cfa 100644 --- a/src/modules/welcome/Config.h +++ b/src/libcalamares/partition/Sync.cpp @@ -16,25 +16,21 @@ * along with Calamares. If not, see . */ -#ifndef WELCOME_CONFIG_H -#define WELCOME_CONFIG_H +#include "Sync.h" -#include -#include +#include "utils/CalamaresUtilsSystem.h" +#include "utils/Logger.h" -class Config : public QObject +void +CalamaresUtils::Partition::sync() { - Q_OBJECT - Q_PROPERTY( QUrl helpUrl READ helpUrl WRITE setHelpUrl CONSTANT ) -public: - Config(); - virtual ~Config(); + auto r = CalamaresUtils::System::runCommand( { "/sbin/udevadm", "settle" }, std::chrono::seconds( 10 ) ); - QUrl helpUrl() const { return m_helpUrl; } - void setHelpUrl( const QUrl& url ) { m_helpUrl = url; } + if ( r.getExitCode() != 0 ) + { + cWarning() << "Could not settle disks."; + r.explainProcess( "udevadm", std::chrono::seconds( 10 ) ); + } -private: - QUrl m_helpUrl; -}; - -#endif + CalamaresUtils::System::runCommand( { "/bin/sync" }, std::chrono::seconds( 10 ) ); +} diff --git a/src/libcalamares/PluginDllMacro.h b/src/libcalamares/partition/Sync.h similarity index 52% rename from src/libcalamares/PluginDllMacro.h rename to src/libcalamares/partition/Sync.h index d790230b9..510858500 100644 --- a/src/libcalamares/PluginDllMacro.h +++ b/src/libcalamares/partition/Sync.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === * - * Copyright 2014, Teo Mrnjavac + * Copyright 2019, 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 @@ -16,17 +16,31 @@ * along with Calamares. If not, see . */ -#ifndef PLUGINDLLMACRO_H -#define PLUGINDLLMACRO_H +#ifndef PARTITION_SYNC_H +#define PARTITION_SYNC_H -#include +namespace CalamaresUtils +{ +namespace Partition +{ -#ifndef PLUGINDLLEXPORT -#if defined( PLUGINDLLEXPORT_PRO ) -#define PLUGINDLLEXPORT Q_DECL_EXPORT -#else -#define PLUGINDLLEXPORT Q_DECL_IMPORT -#endif -#endif +/** @brief Run "udevadm settle" or other disk-sync mechanism. + * + * Call this after mounting, unmount, toggling swap, or other functions + * that might cause the disk to be "busy" for other disk-modifying + * actions (in particular, KPMcore actions with the sfdisk backend + * are sensitive, and systemd tends to keep disks busy after a change + * for a while). + */ +void sync(); + +/** @brief RAII class for calling sync() */ +struct Syncer +{ + ~Syncer() { sync(); } +}; + +} // namespace Partition +} // namespace CalamaresUtils #endif diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.cpp b/src/libcalamares/utils/CalamaresUtilsSystem.cpp index 61e05976a..a38b28b6d 100644 --- a/src/libcalamares/utils/CalamaresUtilsSystem.cpp +++ b/src/libcalamares/utils/CalamaresUtilsSystem.cpp @@ -117,53 +117,6 @@ System::instance() } -int -System::mount( const QString& devicePath, - const QString& mountPoint, - const QString& filesystemName, - const QString& options ) -{ - if ( devicePath.isEmpty() || mountPoint.isEmpty() ) - { - if ( devicePath.isEmpty() ) - { - cWarning() << "Can't mount an empty device."; - } - if ( mountPoint.isEmpty() ) - { - cWarning() << "Can't mount on an empty mountpoint."; - } - - return static_cast< int >( ProcessResult::Code::NoWorkingDirectory ); - } - - QDir mountPointDir( mountPoint ); - if ( !mountPointDir.exists() ) - { - bool ok = mountPointDir.mkpath( mountPoint ); - if ( !ok ) - { - cWarning() << "Could not create mountpoint" << mountPoint; - return static_cast< int >( ProcessResult::Code::NoWorkingDirectory ); - } - } - - QString program( "mount" ); - QStringList args = { devicePath, mountPoint }; - - if ( !filesystemName.isEmpty() ) - { - args << "-t" << filesystemName; - } - - if ( !options.isEmpty() ) - { - args << "-o" << options; - } - - return QProcess::execute( program, args ); -} - ProcessResult System::runCommand( System::RunLocation location, const QStringList& args, @@ -293,19 +246,19 @@ System::targetPath( const QString& path ) const } } -QString +CreationResult System::createTargetFile( const QString& path, const QByteArray& contents ) const { QString completePath = targetPath( path ); if ( completePath.isEmpty() ) { - return QString(); + return CreationResult( CreationResult::Code::Invalid ); } QFile f( completePath ); if ( f.exists() ) { - return QString(); + return CreationResult( CreationResult::Code::AlreadyExists ); } QIODevice::OpenMode m = @@ -317,18 +270,18 @@ System::createTargetFile( const QString& path, const QByteArray& contents ) cons if ( !f.open( m ) ) { - return QString(); + return CreationResult( CreationResult::Code::Failed ); } if ( f.write( contents ) != contents.size() ) { f.close(); f.remove(); - return QString(); + return CreationResult( CreationResult::Code::Failed ); } f.close(); - return QFileInfo( f ).canonicalFilePath(); + return CreationResult( QFileInfo( f ).canonicalFilePath() ); } void diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.h b/src/libcalamares/utils/CalamaresUtilsSystem.h index ca8e0d797..a163a1208 100644 --- a/src/libcalamares/utils/CalamaresUtilsSystem.h +++ b/src/libcalamares/utils/CalamaresUtilsSystem.h @@ -84,6 +84,41 @@ public: } }; +/** @brief The result of a create*() action, for status + * + * A CreationResult has a status field, can be converted to bool + * (true only on success) and can report the full pathname of + * the thing created if it was successful. + */ +class CreationResult : public QPair< int, QString > +{ +public: + enum class Code : int + { + // These are "not failed", but only OK is a success + OK = 0, + AlreadyExists = 1, + // These are "failed" + Invalid = -1, + Failed = -2 + }; + + CreationResult( Code r ) + : QPair< int, QString >( static_cast< int >( r ), QString() ) + { + } + explicit CreationResult( const QString& path ) + : QPair< int, QString >( 0, path ) + { + } + + Code code() const { return static_cast< Code >( first ); } + QString path() const { return second; } + + bool failed() const { return first < 0; } + operator bool() const { return first == 0; } +}; + /** * @brief The System class is a singleton with utility functions that perform * system-specific operations. @@ -103,23 +138,6 @@ public: static System* instance(); - /** - * Runs the mount utility with the specified parameters. - * @param devicePath the path of the partition to mount. - * @param mountPoint the full path of the target mount point. - * @param filesystemName the name of the filesystem (optional). - * @param options any additional options as passed to mount -o (optional). - * @returns the program's exit code, or: - * Crashed = QProcess crash - * FailedToStart = QProcess cannot start - * NoWorkingDirectory = bad arguments - */ - DLLEXPORT int mount( const QString& devicePath, - const QString& mountPoint, - const QString& filesystemName = QString(), - const QString& options = QString() ); - - /** (Typed) Boolean describing where a particular command should be run, * whether in the host (live) system or in the (chroot) target system. */ @@ -152,6 +170,16 @@ public: const QString& stdInput = QString(), std::chrono::seconds timeoutSec = std::chrono::seconds( 0 ) ); + /** @brief Convenience wrapper for runCommand() + * + * Runs the given command-line @p args in the host in the current direcory + * with no input, and the given @p timeoutSec for completion. + */ + static inline ProcessResult runCommand( const QStringList& args, std::chrono::seconds timeoutSec ) + { + return runCommand( RunLocation::RunInHost, args, QString(), QString(), timeoutSec ); + } + /** @brief Convenience wrapper for runCommand(). * Runs the command in the location specified through the boolean * doChroot(), which is what you usually want for running commands @@ -244,7 +272,7 @@ public: * root of the host system, or empty on failure. (Here, it is * possible to be canonical because the file exists). */ - DLLEXPORT QString createTargetFile( const QString& path, const QByteArray& contents ) const; + DLLEXPORT CreationResult createTargetFile( const QString& path, const QByteArray& contents ) const; /** @brief Remove a file from the target system. * diff --git a/src/libcalamares/utils/TestPaths.cpp b/src/libcalamares/utils/TestPaths.cpp index da67f9dd2..612c8f97d 100644 --- a/src/libcalamares/utils/TestPaths.cpp +++ b/src/libcalamares/utils/TestPaths.cpp @@ -46,6 +46,7 @@ private Q_SLOTS: void init(); void cleanupTestCase(); + void testCreationResult(); void testTargetPath(); void testCreateTarget(); void testCreateTargetBasedirs(); @@ -95,6 +96,42 @@ TestPaths::init() m_gs->insert( "rootMountPoint", "/tmp" ); } +void TestPaths::testCreationResult() +{ + using Code = CalamaresUtils::CreationResult::Code; + + for( auto c : { Code::OK, Code::AlreadyExists, Code::Failed, Code::Invalid } ) + { + auto r = CalamaresUtils::CreationResult( c ); + QVERIFY( r.path().isEmpty() ); + QCOMPARE( r.path(), QString() ); + // Get a warning from Clang if we're not covering everything + switch( r.code() ) + { + case Code::OK: + QVERIFY( !r.failed() ); + QVERIFY( r ); + break; + case Code::AlreadyExists: + QVERIFY( !r.failed() ); + QVERIFY( !r ); + break; + case Code::Failed: + case Code::Invalid: + QVERIFY( r.failed() ); + QVERIFY( !r ); + break; + } + } + + QString path( "/etc/os-release" ); + auto r = CalamaresUtils::CreationResult( path ); + QVERIFY( !r.failed() ); + QVERIFY( r ); + QCOMPARE( r.code(), Code::OK ); + QCOMPARE( r.path(), path ); +} + void TestPaths::testTargetPath() @@ -117,7 +154,10 @@ TestPaths::testTargetPath() void TestPaths::testCreateTarget() { - QCOMPARE( m_system->createTargetFile( testFile, "Hello" ), QString( absFile ) ); // Success + auto r = m_system->createTargetFile( testFile, "Hello" ); + QVERIFY( !r.failed() ); + QVERIFY( r ); + QCOMPARE( r.path(), QString( absFile ) ); // Success QFileInfo fi( absFile ); QVERIFY( fi.exists() ); diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h index e3952881e..3dfcd0586 100644 --- a/src/libcalamaresui/Branding.h +++ b/src/libcalamaresui/Branding.h @@ -22,7 +22,7 @@ #ifndef BRANDING_H #define BRANDING_H -#include "UiDllMacro.h" +#include "DllMacro.h" #include "utils/NamedSuffix.h" @@ -146,9 +146,6 @@ public: QString slideshowPath() const { return m_slideshowPath; } int slideshowAPI() const { return m_slideshowAPI; } - QString string( Branding::StringEntry stringEntry ) const; - QString styleString( Branding::StyleEntry styleEntry ) const; - QString imagePath( Branding::ImageEntry imageEntry ) const; QPixmap image( Branding::ImageEntry imageEntry, const QSize& size ) const; /** @brief Look up an image in the branding directory or as an icon @@ -185,6 +182,11 @@ public: */ void setGlobals( GlobalStorage* globalStorage ) const; +public slots: + QString string( StringEntry stringEntry ) const; + QString styleString( StyleEntry styleEntry ) const; + QString imagePath( ImageEntry imageEntry ) const; + private: static Branding* s_instance; diff --git a/src/libcalamaresui/UiDllMacro.h b/src/libcalamaresui/UiDllMacro.h deleted file mode 100644 index 3064ca68c..000000000 --- a/src/libcalamaresui/UiDllMacro.h +++ /dev/null @@ -1,32 +0,0 @@ -/* === This file is part of Calamares - === - * - * Copyright 2014, 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 UIDLLMACRO_H -#define UIDLLMACRO_H - -#include - -#ifndef UIDLLEXPORT -#if defined( UIDLLEXPORT_PRO ) -#define UIDLLEXPORT Q_DECL_EXPORT -#else -#define UIDLLEXPORT Q_DECL_IMPORT -#endif -#endif - -#endif diff --git a/src/libcalamaresui/ViewManager.h b/src/libcalamaresui/ViewManager.h index fca74a367..42fb9ad8f 100644 --- a/src/libcalamaresui/ViewManager.h +++ b/src/libcalamaresui/ViewManager.h @@ -20,7 +20,7 @@ #ifndef VIEWMANAGER_H #define VIEWMANAGER_H -#include "UiDllMacro.h" +#include "DllMacro.h" #include "viewpages/ViewStep.h" #include diff --git a/src/libcalamaresui/modulesystem/CppJobModule.h b/src/libcalamaresui/modulesystem/CppJobModule.h index feb0f22bb..d97443a8a 100644 --- a/src/libcalamaresui/modulesystem/CppJobModule.h +++ b/src/libcalamaresui/modulesystem/CppJobModule.h @@ -22,7 +22,7 @@ #define CALAMARES_CPPJOBMODULE_H #include "Module.h" -#include "UiDllMacro.h" +#include "DllMacro.h" class QPluginLoader; diff --git a/src/libcalamaresui/modulesystem/Module.h b/src/libcalamaresui/modulesystem/Module.h index bf2f1cb5d..0891f8a25 100644 --- a/src/libcalamaresui/modulesystem/Module.h +++ b/src/libcalamaresui/modulesystem/Module.h @@ -22,7 +22,7 @@ #include "Job.h" #include "Requirement.h" -#include "UiDllMacro.h" +#include "DllMacro.h" #include "modulesystem/Descriptor.h" #include "modulesystem/InstanceKey.h" diff --git a/src/libcalamaresui/modulesystem/ProcessJobModule.h b/src/libcalamaresui/modulesystem/ProcessJobModule.h index 96fb2ed47..da2badbd0 100644 --- a/src/libcalamaresui/modulesystem/ProcessJobModule.h +++ b/src/libcalamaresui/modulesystem/ProcessJobModule.h @@ -22,7 +22,7 @@ #include "Module.h" -#include "UiDllMacro.h" +#include "DllMacro.h" #include diff --git a/src/libcalamaresui/modulesystem/PythonJobModule.h b/src/libcalamaresui/modulesystem/PythonJobModule.h index 8fa137f71..295ab5942 100644 --- a/src/libcalamaresui/modulesystem/PythonJobModule.h +++ b/src/libcalamaresui/modulesystem/PythonJobModule.h @@ -21,7 +21,7 @@ #include "Module.h" -#include "UiDllMacro.h" +#include "DllMacro.h" namespace Calamares { diff --git a/src/libcalamaresui/modulesystem/PythonQtViewModule.h b/src/libcalamaresui/modulesystem/PythonQtViewModule.h index 6ebb5c433..33b8d041b 100644 --- a/src/libcalamaresui/modulesystem/PythonQtViewModule.h +++ b/src/libcalamaresui/modulesystem/PythonQtViewModule.h @@ -20,7 +20,7 @@ #define CALAMARES_PYTHONQTVIEWMODULE_H #include "Module.h" -#include "UiDllMacro.h" +#include "DllMacro.h" namespace Calamares { diff --git a/src/libcalamaresui/modulesystem/ViewModule.h b/src/libcalamaresui/modulesystem/ViewModule.h index e9db1347b..c1ee8ff69 100644 --- a/src/libcalamaresui/modulesystem/ViewModule.h +++ b/src/libcalamaresui/modulesystem/ViewModule.h @@ -21,7 +21,7 @@ #define CALAMARES_VIEWMODULE_H #include "Module.h" -#include "UiDllMacro.h" +#include "DllMacro.h" class QPluginLoader; diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.h b/src/libcalamaresui/utils/CalamaresUtilsGui.h index 0c10dcc30..961ed5bc7 100644 --- a/src/libcalamaresui/utils/CalamaresUtilsGui.h +++ b/src/libcalamaresui/utils/CalamaresUtilsGui.h @@ -20,7 +20,7 @@ #ifndef CALAMARESUTILSGUI_H #define CALAMARESUTILSGUI_H -#include "UiDllMacro.h" +#include "DllMacro.h" #include #include diff --git a/src/libcalamaresui/utils/ImageRegistry.h b/src/libcalamaresui/utils/ImageRegistry.h index 454cb500d..f73ee36e6 100644 --- a/src/libcalamaresui/utils/ImageRegistry.h +++ b/src/libcalamaresui/utils/ImageRegistry.h @@ -28,7 +28,7 @@ #include -#include "UiDllMacro.h" +#include "DllMacro.h" #include "utils/CalamaresUtilsGui.h" class UIDLLEXPORT ImageRegistry diff --git a/src/libcalamaresui/utils/Qml.h b/src/libcalamaresui/utils/Qml.h index 70f59e7ec..7371bbc3a 100644 --- a/src/libcalamaresui/utils/Qml.h +++ b/src/libcalamaresui/utils/Qml.h @@ -34,7 +34,7 @@ namespace CalamaresUtils * * If there is a return value from the QML method, it is logged (but not otherwise used). */ -DLLEXPORT void +UIDLLEXPORT void callQMLFunction( QQuickItem* qmlObject, const char* method ); } // namespace CalamaresUtils diff --git a/src/libcalamaresui/viewpages/PythonQtUtilsWrapper.cpp b/src/libcalamaresui/viewpages/PythonQtUtilsWrapper.cpp index c13e063bd..d16bd56f8 100644 --- a/src/libcalamaresui/viewpages/PythonQtUtilsWrapper.cpp +++ b/src/libcalamaresui/viewpages/PythonQtUtilsWrapper.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2016, Teo Mrnjavac + * Copyright 2019, 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,6 +19,7 @@ #include "PythonQtUtilsWrapper.h" +#include "partition/Mount.h" #include "utils/CalamaresUtilsSystem.h" #include "utils/Logger.h" #include "utils/String.h" @@ -46,7 +48,7 @@ Utils::mount( const QString& device_path, const QString& filesystem_name, const QString& options ) const { - return CalamaresUtils::System::instance()->mount( device_path, mount_point, filesystem_name, options ); + return CalamaresUtils::Partition::mount( device_path, mount_point, filesystem_name, options ); } diff --git a/src/libcalamaresui/viewpages/QmlViewStep.cpp b/src/libcalamaresui/viewpages/QmlViewStep.cpp index 2bfc72757..e13e022d8 100644 --- a/src/libcalamaresui/viewpages/QmlViewStep.cpp +++ b/src/libcalamaresui/viewpages/QmlViewStep.cpp @@ -29,12 +29,14 @@ #include "widgets/WaitingWidget.h" #include +#include #include #include #include #include #include + static const NamedEnumTable< Calamares::QmlViewStep::QmlSearch >& searchNames() { @@ -82,6 +84,20 @@ changeQMLState( QMLAction action, QQuickItem* item ) } } +static void +registerCalamaresModels() +{ + static bool done = false; + if ( !done ) + { + done = true; + qmlRegisterSingletonType< Calamares::Branding >( + "calamares.ui", 1, 0, "Branding", []( QQmlEngine*, QJSEngine* ) -> QObject* { + return Calamares::Branding::instance(); + } ); + } +} + namespace Calamares { @@ -92,6 +108,8 @@ QmlViewStep::QmlViewStep( const QString& name, QObject* parent ) , m_spinner( new WaitingWidget( tr( "Loading ..." ) ) ) , m_qmlWidget( new QQuickWidget ) { + registerCalamaresModels(); + QVBoxLayout* layout = new QVBoxLayout( m_widget ); layout->addWidget( m_spinner ); @@ -297,6 +315,12 @@ QmlViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { m_qmlFileName = searchQmlFile( m_searchMethod, qmlFile, m_name ); + QObject* config = this->getConfig(); + if ( config ) + { + m_qmlWidget->engine()->rootContext()->setContextProperty( "config", config ); + } + cDebug() << "QmlViewStep" << moduleInstanceKey() << "loading" << m_qmlFileName; m_qmlComponent = new QQmlComponent( m_qmlWidget->engine(), QUrl( m_qmlFileName ), QQmlComponent::CompilationMode::Asynchronous ); @@ -316,7 +340,17 @@ void QmlViewStep::showFailedQml() { cWarning() << "QmlViewStep" << moduleInstanceKey() << "loading failed."; + if ( m_qmlComponent ) + { + cDebug() << Logger::SubEntry << "QML error:" << m_qmlComponent->errorString(); + } m_spinner->setText( prettyName() + ' ' + tr( "Loading failed." ) ); } +QObject* +QmlViewStep::getConfig() +{ + return nullptr; +} + } // namespace Calamares diff --git a/src/libcalamaresui/viewpages/QmlViewStep.h b/src/libcalamaresui/viewpages/QmlViewStep.h index 46ba29a53..b54dc2fb7 100644 --- a/src/libcalamaresui/viewpages/QmlViewStep.h +++ b/src/libcalamaresui/viewpages/QmlViewStep.h @@ -73,9 +73,21 @@ public: /// @brief QML widgets don't produce jobs by default virtual JobList jobs() const override; - /// @brief Configure search paths; subclasses should call this as well + /// @brief Configure search paths; subclasses should call this at the **end** of their own implementation virtual void setConfigurationMap( const QVariantMap& configurationMap ) override; +protected: + /** @brief Gets a pointer to the Config of this view step + * + * Parts of the configuration of the viewstep can be passed to QML + * by placing them in a QObject (as properties). The default + * implementation returns nullptr, for no-config. + * + * Ownership of the config object remains with the ViewStep; it is possible + * to return a pointer to a member variable. + */ + virtual QObject* getConfig(); + private Q_SLOTS: void loadComplete(); diff --git a/src/libcalamaresui/viewpages/ViewStep.h b/src/libcalamaresui/viewpages/ViewStep.h index c5903d6f5..bdc235476 100644 --- a/src/libcalamaresui/viewpages/ViewStep.h +++ b/src/libcalamaresui/viewpages/ViewStep.h @@ -21,7 +21,7 @@ #define VIEWSTEP_H #include "Job.h" -#include "UiDllMacro.h" +#include "DllMacro.h" #include "modulesystem/InstanceKey.h" #include "modulesystem/Requirement.h" diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index 9e9621106..b72b755d3 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories( if( BUILD_TESTING ) add_executable( test_conf test_conf.cpp ) - target_link_libraries( test_conf ${YAMLCPP_LIBRARY} Qt5::Core ) + target_link_libraries( test_conf yamlcpp Qt5::Core ) target_include_directories( test_conf PUBLIC ${YAMLCPP_INCLUDE_DIR} ) endif() diff --git a/src/modules/contextualprocess/CMakeLists.txt b/src/modules/contextualprocess/CMakeLists.txt index a7e9ed05b..2df4cfe37 100644 --- a/src/modules/contextualprocess/CMakeLists.txt +++ b/src/modules/contextualprocess/CMakeLists.txt @@ -8,18 +8,11 @@ calamares_add_plugin( contextualprocess SHARED_LIB ) -if( ECM_FOUND AND BUILD_TESTING ) - ecm_add_test( - Tests.cpp - ContextualProcessJob.cpp # Builds it a second time - TEST_NAME - contextualprocesstest - LINK_LIBRARIES - ${CALAMARES_LIBRARIES} - calamaresui - ${YAMLCPP_LIBRARY} - Qt5::Core - Qt5::Test - ) - calamares_automoc( contextualprocesstest ) -endif() +calamares_add_test( + contextualprocesstest + SOURCES + Tests.cpp + ContextualProcessJob.cpp # Builds it a second time + LIBRARIES + yamlcpp +) diff --git a/src/modules/contextualprocess/ContextualProcessJob.h b/src/modules/contextualprocess/ContextualProcessJob.h index 2efbc5082..3a252d2d3 100644 --- a/src/modules/contextualprocess/ContextualProcessJob.h +++ b/src/modules/contextualprocess/ContextualProcessJob.h @@ -23,7 +23,7 @@ #include #include "CppJob.h" -#include "PluginDllMacro.h" +#include "DllMacro.h" #include "utils/PluginFactory.h" diff --git a/src/modules/dracutlukscfg/DracutLuksCfgJob.h b/src/modules/dracutlukscfg/DracutLuksCfgJob.h index e9e5a54a2..ccf0adb70 100644 --- a/src/modules/dracutlukscfg/DracutLuksCfgJob.h +++ b/src/modules/dracutlukscfg/DracutLuksCfgJob.h @@ -27,7 +27,7 @@ #include -#include +#include class PLUGINDLLEXPORT DracutLuksCfgJob : public Calamares::CppJob { diff --git a/src/modules/dummycpp/DummyCppJob.h b/src/modules/dummycpp/DummyCppJob.h index 4a79d0378..c60b01d57 100644 --- a/src/modules/dummycpp/DummyCppJob.h +++ b/src/modules/dummycpp/DummyCppJob.h @@ -27,7 +27,7 @@ #include -#include +#include class PLUGINDLLEXPORT DummyCppJob : public Calamares::CppJob { diff --git a/src/modules/dummypythonqt/lang/as/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/as/LC_MESSAGES/dummypythonqt.mo index 132b03abf..8192eb723 100644 Binary files a/src/modules/dummypythonqt/lang/as/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/as/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/as/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/as/LC_MESSAGES/dummypythonqt.po index 018483a91..75d63e46e 100644 --- a/src/modules/dummypythonqt/lang/as/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/as/LC_MESSAGES/dummypythonqt.po @@ -4,17 +4,17 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Wrishiraj Kaushik , 2020 # Deep Jyoti Choudhury , 2020 +# Wrishiraj Kaushik , 2020 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-29 11:14+0100\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2016-12-16 12:18+0000\n" -"Last-Translator: Deep Jyoti Choudhury , 2020\n" +"Last-Translator: Wrishiraj Kaushik , 2020\n" "Language-Team: Assamese (https://www.transifex.com/calamares/teams/20061/as/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,16 +32,16 @@ msgstr "এটা নতুন QLabel।" #: src/modules/dummypythonqt/main.py:97 msgid "Dummy PythonQt ViewStep" -msgstr "ডামী PythonQtৰ পদক্ষেপ চাওক " +msgstr "ডামী পাইথন-কিউট্ ViewStep" #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" -msgstr "ডামী PythonQtটোৰ কায্য" +msgstr "ডামী পাইথন-কিউট্ কায্য" #: src/modules/dummypythonqt/main.py:186 msgid "This is the Dummy PythonQt Job. The dummy job says: {}" -msgstr "এইটোৱে ডামী PythonQt কায্য। ডামী কাৰ্য্যটোৱে কয় যে: {}" +msgstr "এইটোৱে ডামী পাইথন-কিউট্ কাৰ্য্য। ডামী কাৰ্য্যটোৱে কয় যে: {}" #: src/modules/dummypythonqt/main.py:190 msgid "A status message for Dummy PythonQt Job." -msgstr "ডামী PythonQtকায্যৰ এটা অৱস্থাৰ বাৰ্তা।" +msgstr "ডামী পাইথন-কিউট্ কায্যৰ বাবে এটা অৱস্থা বাৰ্তা।" diff --git a/src/modules/dummypythonqt/lang/ko/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/ko/LC_MESSAGES/dummypythonqt.mo index de86554cd..be3c10a28 100644 Binary files a/src/modules/dummypythonqt/lang/ko/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/ko/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/ko/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ko/LC_MESSAGES/dummypythonqt.po index aa639c6a3..adbfe8b31 100644 --- a/src/modules/dummypythonqt/lang/ko/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/ko/LC_MESSAGES/dummypythonqt.po @@ -5,16 +5,16 @@ # # Translators: # Ji-Hyeon Gim , 2018 -# 이정희 , 2019 +# MarongHappy , 2019 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-29 15:54-0400\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2016-12-16 12:18+0000\n" -"Last-Translator: 이정희 , 2019\n" +"Last-Translator: MarongHappy , 2019\n" "Language-Team: Korean (https://www.transifex.com/calamares/teams/20061/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.mo index ca6b6c8da..6b860e05c 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 0c7aa3d85..bcf3b814a 100644 --- a/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.po @@ -4,16 +4,16 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Paul S , 2019 +# Yuri Chornoivan , 2020 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-22 07:09-0500\n" +"POT-Creation-Date: 2020-02-19 17:27+0100\n" "PO-Revision-Date: 2016-12-16 12:18+0000\n" -"Last-Translator: Paul S , 2019\n" +"Last-Translator: Yuri Chornoivan , 2020\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" @@ -23,24 +23,24 @@ msgstr "" #: src/modules/dummypythonqt/main.py:84 msgid "Click me!" -msgstr "Тицьни в мене!" +msgstr "Натисни мене!" #: src/modules/dummypythonqt/main.py:94 msgid "A new QLabel." -msgstr "Новий QLabel" +msgstr "Нова QLabel." #: src/modules/dummypythonqt/main.py:97 msgid "Dummy PythonQt ViewStep" -msgstr "" +msgstr "Фіктивний ViewStep PythonQt" #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" -msgstr "" +msgstr "Фіктивне завдання PythonQt" #: src/modules/dummypythonqt/main.py:186 msgid "This is the Dummy PythonQt Job. The dummy job says: {}" -msgstr "" +msgstr "Це фіктивне завдання PythonQt. Фіктивне завдання повідомляє: {}" #: src/modules/dummypythonqt/main.py:190 msgid "A status message for Dummy PythonQt Job." -msgstr "" +msgstr "Повідомлення щодо стану фіктивного завдання PythonQt." diff --git a/src/modules/finished/FinishedViewStep.h b/src/modules/finished/FinishedViewStep.h index 7b3881099..2df37e9b6 100644 --- a/src/modules/finished/FinishedViewStep.h +++ b/src/modules/finished/FinishedViewStep.h @@ -25,7 +25,7 @@ #include "utils/PluginFactory.h" #include "viewpages/ViewStep.h" -#include "PluginDllMacro.h" +#include "DllMacro.h" class FinishedPage; diff --git a/src/modules/fsresizer/CMakeLists.txt b/src/modules/fsresizer/CMakeLists.txt index 3d82489b7..1f4260518 100644 --- a/src/modules/fsresizer/CMakeLists.txt +++ b/src/modules/fsresizer/CMakeLists.txt @@ -8,11 +8,10 @@ set( _partition_defs "" ) if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND ) include_directories( ${KPMCORE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/src/modules/partition ) - if ( KPMcore_VERSION VERSION_GREATER "3.3.0") - list( APPEND _partition_defs WITH_KPMCORE331API) # kpmcore > 3.3.0 with deprecations - endif() - if ( KPMcore_VERSION VERSION_GREATER "3.90") - list( APPEND _partition_defs WITH_KPMCORE4API) # kpmcore 4 with new API + if( KPMcore_VERSION VERSION_GREATER_EQUAL "4.0" ) + list( APPEND _partition_defs WITH_KPMCORE4API ) # kpmcore 4 with new API + elseif( KPMcore_VERSION VERSION_GREATER "3.3.70" ) + message( FATAL_ERROR "KPMCore beta versions ${KPMcore_VERSION} are not supported" ) endif() # The PartitionIterator is a small class, and it's easiest -- but also a @@ -22,7 +21,6 @@ if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES ResizeFSJob.cpp - ${PROJECT_SOURCE_DIR}/src/modules/partition/core/PartitionIterator.cpp LINK_PRIVATE_LIBRARIES kpmcore calamares @@ -30,23 +28,15 @@ if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND SHARED_LIB ) - if( ECM_FOUND AND BUILD_TESTING ) - ecm_add_test( - Tests.cpp - TEST_NAME - fsresizertest - LINK_LIBRARIES - ${CALAMARES_LIBRARIES} - calamares - calamares_job_fsresizer # From above - ${YAMLCPP_LIBRARY} - Qt5::Core - Qt5::Test - ) - set_target_properties( fsresizertest PROPERTIES AUTOMOC TRUE ) - target_include_directories( fsresizertest PRIVATE /usr/local/include ) - target_compile_definitions( fsresizertest PRIVATE ${_partition_defs} ) - endif() + calamares_add_test( + fsresizertest + SOURCES + Tests.cpp + LIBRARIES + calamares_job_fsresizer # From above + yamlcpp + DEFINITIONS ${_partition_defs} + ) else() if ( NOT KPMcore_FOUND ) calamares_skip_module( "fsresizer (missing suitable KPMcore)" ) diff --git a/src/modules/fsresizer/ResizeFSJob.cpp b/src/modules/fsresizer/ResizeFSJob.cpp index 6b9ef9d3e..217f1315e 100644 --- a/src/modules/fsresizer/ResizeFSJob.cpp +++ b/src/modules/fsresizer/ResizeFSJob.cpp @@ -18,6 +18,14 @@ #include "ResizeFSJob.h" +#include "CalamaresVersion.h" +#include "GlobalStorage.h" +#include "JobQueue.h" +#include "partition/PartitionIterator.h" +#include "utils/Logger.h" +#include "utils/Units.h" +#include "utils/Variant.h" + #include #include #include @@ -29,17 +37,7 @@ #include #include -#include "CalamaresVersion.h" -#include "JobQueue.h" -#include "GlobalStorage.h" - -#include "utils/Logger.h" -#include "utils/Units.h" -#include "utils/Variant.h" - -// From partition module -#include "core/PartitionIterator.h" - +using CalamaresUtils::Partition::PartitionIterator; ResizeFSJob::ResizeFSJob( QObject* parent ) : Calamares::CppJob( parent ) @@ -60,13 +58,13 @@ ResizeFSJob::prettyName() const } ResizeFSJob::PartitionMatch -ResizeFSJob::findPartition( CoreBackend* backend ) +ResizeFSJob::findPartition() { using DeviceList = QList< Device* >; -#ifdef WITH_KPMCORE331API - DeviceList devices = backend->scanDevices( /* not includeReadOnly, not includeLoopback */ ScanFlag(0) ); +#if defined( WITH_KPMCORE4API ) + DeviceList devices = m_kpmcore.backend()->scanDevices( /* not includeReadOnly, not includeLoopback */ ScanFlag(0) ); #else - DeviceList devices = backend->scanDevices( /* excludeReadOnly */ true ); + DeviceList devices = m_kpmcore.backend()->scanDevices( /* excludeReadOnly */ true ); #endif cDebug() << "ResizeFSJob found" << devices.count() << "devices."; @@ -172,35 +170,17 @@ ResizeFSJob::exec() tr( "Invalid configuration" ), tr( "The file-system resize job has an invalid configuration and will not run." ) ); - // Get KPMCore - auto backend_p = CoreBackendManager::self()->backend(); - if ( backend_p ) - cDebug() << "KPMCore backend @" << ( void* )backend_p << backend_p->id() << backend_p->version(); - else - { - cDebug() << "No KPMCore backend loaded yet"; - QByteArray backendName = qgetenv( "KPMCORE_BACKEND" ); - if ( !CoreBackendManager::self()->load( backendName.isEmpty() ? CoreBackendManager::defaultBackendName() : backendName ) ) - { - cWarning() << "Could not load KPMCore backend."; - return Calamares::JobResult::error( - tr( "KPMCore not Available" ), - tr( "Calamares cannot start KPMCore for the file-system resize job." ) ); - } - - backend_p = CoreBackendManager::self()->backend(); - } - if ( !backend_p ) + if ( !m_kpmcore) { cWarning() << "Could not load KPMCore backend (2)."; return Calamares::JobResult::error( tr( "KPMCore not Available" ), tr( "Calamares cannot start KPMCore for the file-system resize job." ) ); } - backend_p->initFSSupport(); // Might not be enough, see below + m_kpmcore.backend()->initFSSupport(); // Might not be enough, see below // Now get the partition and FS we want to work on - PartitionMatch m = findPartition( backend_p ); + PartitionMatch m = findPartition(); if ( !m.first || !m.second ) return Calamares::JobResult::error( tr( "Resize Failed" ), diff --git a/src/modules/fsresizer/ResizeFSJob.h b/src/modules/fsresizer/ResizeFSJob.h index 76ca6c219..c681fae36 100644 --- a/src/modules/fsresizer/ResizeFSJob.h +++ b/src/modules/fsresizer/ResizeFSJob.h @@ -24,10 +24,11 @@ #include +#include "partition/KPMManager.h" #include "partition/PartitionSize.h" #include "utils/PluginFactory.h" -#include +#include class CoreBackend; // From KPMCore class Device; // From KPMCore @@ -72,6 +73,7 @@ public: } private: + CalamaresUtils::Partition::KPMManager m_kpmcore; PartitionSize m_size; PartitionSize m_atleast; QString m_fsname; // Either this, or devicename, is set, not both @@ -79,8 +81,8 @@ private: bool m_required; using PartitionMatch = QPair; - /** @brief Find the configured FS using KPMCore @p backend */ - PartitionMatch findPartition( CoreBackend* backend ); + /** @brief Find the configured FS */ + PartitionMatch findPartition(); /** @brief Return a new end-sector for the given dev-part pair. */ qint64 findGrownEnd( PartitionMatch ); diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py index 4a696f46b..c58e8eb11 100644 --- a/src/modules/fstab/main.py +++ b/src/modules/fstab/main.py @@ -218,7 +218,6 @@ class FstabGenerator(object): else: dct = self.generate_fstab_line_info(partition) - if dct: self.print_fstab_line(dct, file=fstab_file) @@ -233,19 +232,30 @@ class FstabGenerator(object): self.print_fstab_line(dct, file=fstab_file) def generate_fstab_line_info(self, partition): - """ Generates information for each fstab entry. """ + """ + Generates information (a dictionary of fstab-fields) + for the given @p partition. + """ + # Some "fs" names need special handling in /etc/fstab, so remap them. filesystem = partition["fs"].lower() + filesystem = FS_MAP.get(filesystem, filesystem) has_luks = "luksMapperName" in partition mount_point = partition["mountPoint"] disk_name = disk_name_for_partition(partition) is_ssd = disk_name in self.ssd_disks - filesystem = FS_MAP.get(filesystem, filesystem) + # Swap partitions are called "linuxswap" by parted. + # That "fs" is visible in GS, but that gets mapped + # to "swap", above, because that's the spelling needed in /etc/fstab if not mount_point and not filesystem == "swap": return None if not mount_point: mount_point = "swap" + if filesystem == "swap" and not partition.get("claimed", None): + libcalamares.utils.debug("Ignoring foreign swap {!s} {!s}".format(disk_name, partition.get("uuid", None))) + return None + options = self.get_mount_options(filesystem, mount_point) if is_ssd: diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py index 052aa81cc..39d50b20c 100644 --- a/src/modules/grubcfg/main.py +++ b/src/modules/grubcfg/main.py @@ -82,6 +82,9 @@ def modify_grub_default(partitions, root_mount_point, distributor): if have_dracut: for partition in partitions: + if partition["fs"] == "linuxswap" and not partition.get("claimed", None): + # Skip foreign swap + continue has_luks = "luksMapperName" in partition if partition["fs"] == "linuxswap" and not has_luks: swap_uuid = partition["uuid"] @@ -96,6 +99,9 @@ def modify_grub_default(partitions, root_mount_point, distributor): ] else: for partition in partitions: + if partition["fs"] == "linuxswap" and not partition.get("claimed", None): + # Skip foreign swap + continue has_luks = "luksMapperName" in partition if partition["fs"] == "linuxswap" and not has_luks: swap_uuid = partition["uuid"] diff --git a/src/modules/hostinfo/CMakeLists.txt b/src/modules/hostinfo/CMakeLists.txt index caf888625..3d6e0973f 100644 --- a/src/modules/hostinfo/CMakeLists.txt +++ b/src/modules/hostinfo/CMakeLists.txt @@ -32,18 +32,11 @@ if ( KF5CoreAddons_FOUND AND KF5CoreAddons_VERSION VERSION_GREATER_EQUAL 5.58 ) target_compile_definitions( calamares_job_hostinfo PRIVATE WITH_KOSRelease ) endif() -if( ECM_FOUND AND BUILD_TESTING ) - ecm_add_test( - Tests.cpp - HostInfoJob.cpp # Builds it a second time - TEST_NAME - hostinfotest - LINK_LIBRARIES - ${CALAMARES_LIBRARIES} - calamaresui - ${YAMLCPP_LIBRARY} - Qt5::Core - Qt5::Test - ) - calamares_automoc( hostinfotest ) -endif() +calamares_add_test( + hostinfotest + SOURCES + Tests.cpp + HostInfoJob.cpp + LIBRARIES + yamlcpp +) diff --git a/src/modules/hostinfo/HostInfoJob.h b/src/modules/hostinfo/HostInfoJob.h index fa3342192..5db169b0e 100644 --- a/src/modules/hostinfo/HostInfoJob.h +++ b/src/modules/hostinfo/HostInfoJob.h @@ -20,7 +20,7 @@ #define HOSTINFOJOB_H #include "CppJob.h" -#include "PluginDllMacro.h" +#include "DllMacro.h" #include "utils/PluginFactory.h" #include diff --git a/src/modules/initcpio/CMakeLists.txt b/src/modules/initcpio/CMakeLists.txt index af217fb1a..5140c97e0 100644 --- a/src/modules/initcpio/CMakeLists.txt +++ b/src/modules/initcpio/CMakeLists.txt @@ -8,18 +8,11 @@ calamares_add_plugin( initcpio SHARED_LIB ) -if( ECM_FOUND AND BUILD_TESTING ) - ecm_add_test( - Tests.cpp - TEST_NAME - initcpiotest - LINK_LIBRARIES - ${CALAMARES_LIBRARIES} - calamares - calamares_job_initcpio # From above - ${YAMLCPP_LIBRARY} - Qt5::Core - Qt5::Test - ) - calamares_automoc( initcpiotest ) -endif() +calamares_add_test( + initcpiotest + SOURCES + Tests.cpp + LIBRARIES + calamares_job_initcpio # From above + yamlcpp +) diff --git a/src/modules/initcpio/InitcpioJob.h b/src/modules/initcpio/InitcpioJob.h index 11358d749..cdc48f6ce 100644 --- a/src/modules/initcpio/InitcpioJob.h +++ b/src/modules/initcpio/InitcpioJob.h @@ -20,7 +20,7 @@ #define INITCPIOJOB_H #include "CppJob.h" -#include "PluginDllMacro.h" +#include "DllMacro.h" #include "utils/PluginFactory.h" #include diff --git a/src/modules/initramfs/CMakeLists.txt b/src/modules/initramfs/CMakeLists.txt index d7da12d55..b3287c896 100644 --- a/src/modules/initramfs/CMakeLists.txt +++ b/src/modules/initramfs/CMakeLists.txt @@ -8,18 +8,11 @@ calamares_add_plugin( initramfs SHARED_LIB ) -if( ECM_FOUND AND BUILD_TESTING ) - ecm_add_test( - Tests.cpp - TEST_NAME - initramfstest - LINK_LIBRARIES - ${CALAMARES_LIBRARIES} - calamares - calamares_job_initramfs # From above - ${YAMLCPP_LIBRARY} - Qt5::Core - Qt5::Test - ) - calamares_automoc( initramfstest ) -endif() +calamares_add_test( + initramfstest + SOURCES + Tests.cpp + LIBRARIES + calamares_job_initramfs # From above + yamlcpp +) diff --git a/src/modules/initramfs/InitramfsJob.cpp b/src/modules/initramfs/InitramfsJob.cpp index af8e07ca7..468047c45 100644 --- a/src/modules/initramfs/InitramfsJob.cpp +++ b/src/modules/initramfs/InitramfsJob.cpp @@ -54,7 +54,7 @@ InitramfsJob::exec() // First make sure we generate a safe initramfs with suitable permissions. static const char confFile[] = "/etc/initramfs-tools/conf.d/calamares-safe-initramfs.conf"; static const char contents[] = "UMASK=0077\n"; - if ( CalamaresUtils::System::instance()->createTargetFile( confFile, QByteArray( contents ) ).isEmpty() ) + if ( CalamaresUtils::System::instance()->createTargetFile( confFile, QByteArray( contents ) ).failed() ) { cWarning() << Logger::SubEntry << "Could not configure safe UMASK for initramfs."; // But continue anyway. diff --git a/src/modules/initramfs/InitramfsJob.h b/src/modules/initramfs/InitramfsJob.h index 9eeb81fea..3239c6929 100644 --- a/src/modules/initramfs/InitramfsJob.h +++ b/src/modules/initramfs/InitramfsJob.h @@ -20,7 +20,7 @@ #define INITRAMFSJOB_H #include "CppJob.h" -#include "PluginDllMacro.h" +#include "DllMacro.h" #include "utils/PluginFactory.h" #include diff --git a/src/modules/initramfs/Tests.cpp b/src/modules/initramfs/Tests.cpp index 936c94097..a9e0ce44c 100644 --- a/src/modules/initramfs/Tests.cpp +++ b/src/modules/initramfs/Tests.cpp @@ -45,6 +45,9 @@ void InitramfsTests::initTestCase() { Logger::setupLogLevel( Logger::LOGDEBUG ); + + auto* j = new Calamares::JobQueue(); + (void) new CalamaresUtils::System( true ); } static const char contents[] = "UMASK=0077\n"; @@ -55,42 +58,29 @@ void InitramfsTests::cleanup() QFile::remove( confFile ); } -void InitramfsTests::testCreateHostFile() -{ - - CalamaresUtils::System s( false ); // don't chroot - QString path = s.createTargetFile( confFile, QByteArray( contents ) ); - QVERIFY( !path.isEmpty() ); - QCOMPARE( path, confFile ); // don't chroot, so path create relative to / - QVERIFY( QFile::exists( confFile ) ); - - QFileInfo fi( confFile ); - QVERIFY( fi.exists() ); - QCOMPARE( fi.size(), sizeof( contents )-1 ); // don't count trailing NUL - - QFile::remove( confFile ); -} - void InitramfsTests::testCreateTargetFile() { static const char short_confFile[] = "/calamares-safe-umask"; - - CalamaresUtils::System s( true ); - QString path = s.createTargetFile( short_confFile, QByteArray( contents ) ); + + auto* s = CalamaresUtils::System::instance(); + auto r = s->createTargetFile( short_confFile, QByteArray( contents ) ); + QVERIFY( r.failed() ); + QVERIFY( !r ); + QString path = r.path(); QVERIFY( path.isEmpty() ); // because no rootmountpoint is set - - Calamares::JobQueue j; - j.globalStorage()->insert( "rootMountPoint", "/tmp" ); - - path = s.createTargetFile( short_confFile, QByteArray( contents ) ); - QVERIFY( path.endsWith( short_confFile ) ); // chroot, so path create relative to + + Calamares::JobQueue::instance()->globalStorage()->insert( "rootMountPoint", "/tmp" ); + + path = s->createTargetFile( short_confFile, QByteArray( contents ) ).path(); + QCOMPARE( path, QString( confFile ) ); + QVERIFY( path.endsWith( short_confFile ) ); // chroot, so path create relative to QVERIFY( path.startsWith( "/tmp/" ) ); QVERIFY( QFile::exists( path ) ); QFileInfo fi( path ); QVERIFY( fi.exists() ); QCOMPARE( fi.size(), sizeof( contents )-1 ); // don't count trailing NUL - + QFile::remove( path ); } diff --git a/src/modules/initramfs/Tests.h b/src/modules/initramfs/Tests.h index 01394d4fa..715c90169 100644 --- a/src/modules/initramfs/Tests.h +++ b/src/modules/initramfs/Tests.h @@ -31,8 +31,8 @@ public: private Q_SLOTS: void initTestCase(); void cleanup(); - - void testCreateHostFile(); + + // TODO: this doesn't actually test any of the functionality of this job void testCreateTargetFile(); }; diff --git a/src/modules/interactiveterminal/InteractiveTerminalViewStep.h b/src/modules/interactiveterminal/InteractiveTerminalViewStep.h index 55486691d..f0af35d3c 100644 --- a/src/modules/interactiveterminal/InteractiveTerminalViewStep.h +++ b/src/modules/interactiveterminal/InteractiveTerminalViewStep.h @@ -25,7 +25,7 @@ #include #include -#include +#include class InteractiveTerminalPage; diff --git a/src/modules/keyboard/KeyboardViewStep.h b/src/modules/keyboard/KeyboardViewStep.h index a5bdd579e..9f362e116 100644 --- a/src/modules/keyboard/KeyboardViewStep.h +++ b/src/modules/keyboard/KeyboardViewStep.h @@ -25,7 +25,7 @@ #include #include -#include +#include class KeyboardPage; diff --git a/src/modules/license/LicenseViewStep.h b/src/modules/license/LicenseViewStep.h index 957110f3d..cc1a92896 100644 --- a/src/modules/license/LicenseViewStep.h +++ b/src/modules/license/LicenseViewStep.h @@ -20,7 +20,7 @@ #ifndef LICENSEPAGEPLUGIN_H #define LICENSEPAGEPLUGIN_H -#include +#include #include #include diff --git a/src/modules/locale/CMakeLists.txt b/src/modules/locale/CMakeLists.txt index 768a67543..cae2ea41c 100644 --- a/src/modules/locale/CMakeLists.txt +++ b/src/modules/locale/CMakeLists.txt @@ -27,19 +27,13 @@ calamares_add_plugin( locale calamaresui Qt5::Network ${geoip_libs} - ${YAMLCPP_LIBRARY} + yamlcpp SHARED_LIB ) -if( ECM_FOUND AND BUILD_TESTING ) - ecm_add_test( - Tests.cpp - LocaleConfiguration.cpp - TEST_NAME - localetest - LINK_LIBRARIES - calamares - Qt5::Test - ) - calamares_automoc( localetest ) -endif() +calamares_add_test( + localetest + SOURCES + Tests.cpp + LocaleConfiguration.cpp +) diff --git a/src/modules/locale/LocaleViewStep.h b/src/modules/locale/LocaleViewStep.h index eb8d64177..841aba97f 100644 --- a/src/modules/locale/LocaleViewStep.h +++ b/src/modules/locale/LocaleViewStep.h @@ -25,7 +25,7 @@ #include "utils/PluginFactory.h" #include "viewpages/ViewStep.h" -#include "PluginDllMacro.h" +#include "DllMacro.h" #include #include diff --git a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp index 9997cc185..90d64d5a6 100644 --- a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp +++ b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp @@ -205,7 +205,7 @@ LuksBootKeyFileJob::exec() if ( !setupLuks( d ) ) return Calamares::JobResult::error( tr( "Encrypted rootfs setup error" ), - tr( "Could configure LUKS key file on partition %1." ).arg( d.device ) ); + tr( "Could not configure LUKS key file on partition %1." ).arg( d.device ) ); } return Calamares::JobResult::ok(); diff --git a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.h b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.h index 2d4d6d319..de9b9c677 100644 --- a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.h +++ b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.h @@ -20,7 +20,7 @@ #define LUKSBOOTKEYFILEJOB_H #include "CppJob.h" -#include "PluginDllMacro.h" +#include "DllMacro.h" #include "utils/PluginFactory.h" #include diff --git a/src/modules/machineid/CMakeLists.txt b/src/modules/machineid/CMakeLists.txt index a57d5163d..4a916334c 100644 --- a/src/modules/machineid/CMakeLists.txt +++ b/src/modules/machineid/CMakeLists.txt @@ -9,17 +9,10 @@ calamares_add_plugin( machineid SHARED_LIB ) -if ( ECM_FOUND AND BUILD_TESTING ) - ecm_add_test( - Tests.cpp - MachineIdJob.cpp - Workers.cpp - TEST_NAME - machineidtest - LINK_LIBRARIES - calamares - Qt5::Core - Qt5::Test - ) - calamares_automoc( machineidtest ) -endif() +calamares_add_test( + machineidtest + SOURCES + Tests.cpp + MachineIdJob.cpp + Workers.cpp +) diff --git a/src/modules/machineid/MachineIdJob.h b/src/modules/machineid/MachineIdJob.h index 5d44b2017..3e450accb 100644 --- a/src/modules/machineid/MachineIdJob.h +++ b/src/modules/machineid/MachineIdJob.h @@ -26,7 +26,7 @@ #include -#include +#include class PLUGINDLLEXPORT MachineIdJob : public Calamares::CppJob { diff --git a/src/modules/machineid/Tests.cpp b/src/modules/machineid/Tests.cpp index 53abd0482..4600633b0 100644 --- a/src/modules/machineid/Tests.cpp +++ b/src/modules/machineid/Tests.cpp @@ -28,6 +28,9 @@ #include #include +// Internals of Workers.cpp +extern int getUrandomPoolSize(); + class MachineIdTests : public QObject { Q_OBJECT @@ -93,10 +96,10 @@ MachineIdTests::testPoolSize() { #ifdef Q_OS_FREEBSD // It hardly makes sense, but also the /proc entry is missing - QCOMPARE( MachineId::getUrandomPoolSize(), 512 ); + QCOMPARE( getUrandomPoolSize(), 512 ); #else // Based on a sample size of 1, Netrunner - QCOMPARE( MachineId::getUrandomPoolSize(), 4096 ); + QCOMPARE( getUrandomPoolSize(), 4096 ); #endif } @@ -122,8 +125,13 @@ MachineIdTests::testJob() gs->insert( "rootMountPoint", "/tmp" ); // Prepare part of the target filesystem - QVERIFY( system->createTargetDirs("/etc") ); - QVERIFY( !(system->createTargetFile( "/etc/machine-id", "Hello" ).isEmpty() ) ); + { + QVERIFY( system->createTargetDirs("/etc") ); + auto r = system->createTargetFile( "/etc/machine-id", "Hello" ); + QVERIFY( !r.failed() ); + QVERIFY( r ); + QVERIFY( !r.path().isEmpty() ); + } MachineIdJob job( nullptr ); QVERIFY( !job.prettyName().isEmpty() ); diff --git a/src/modules/machineid/Workers.cpp b/src/modules/machineid/Workers.cpp index 39acdfbf2..76e466435 100644 --- a/src/modules/machineid/Workers.cpp +++ b/src/modules/machineid/Workers.cpp @@ -27,6 +27,34 @@ #include +/// @brief Returns a recommended size for the entropy pool (in bytes) +STATICTEST int +getUrandomPoolSize() +{ + QFile f( "/proc/sys/kernel/random/poolsize" ); + constexpr const int minimumPoolSize = 512; + int poolSize = minimumPoolSize; + + if ( f.exists() && f.open( QIODevice::ReadOnly | QIODevice::Text ) ) + { + QByteArray v = f.read( 16 ); + if ( v.length() > 2 ) + { + if ( v.endsWith( '\n' ) ) + { + v.chop( 1 ); + } + bool ok = false; + poolSize = v.toInt( &ok ); + if ( !ok ) + { + poolSize = minimumPoolSize; + } + } + } + return ( poolSize >= minimumPoolSize ) ? poolSize : minimumPoolSize; +} + namespace MachineId { @@ -59,33 +87,6 @@ copyFile( const QString& rootMountPoint, const QString& fileName ) return Calamares::JobResult::ok(); } -int -getUrandomPoolSize() -{ - QFile f( "/proc/sys/kernel/random/poolsize" ); - constexpr const int minimumPoolSize = 512; - int poolSize = minimumPoolSize; - - if ( f.exists() && f.open( QIODevice::ReadOnly | QIODevice::Text ) ) - { - QByteArray v = f.read( 16 ); - if ( v.length() > 2 ) - { - if ( v.endsWith( '\n' ) ) - { - v.chop( 1 ); - } - bool ok = false; - poolSize = v.toInt( &ok ); - if ( !ok ) - { - poolSize = minimumPoolSize; - } - } - } - return ( poolSize >= minimumPoolSize ) ? poolSize : minimumPoolSize; -} - Calamares::JobResult createNewEntropy( int poolSize, const QString& rootMountPoint, const QString& fileName ) { diff --git a/src/modules/machineid/Workers.h b/src/modules/machineid/Workers.h index 31561af1b..8cb8d74ff 100644 --- a/src/modules/machineid/Workers.h +++ b/src/modules/machineid/Workers.h @@ -48,9 +48,6 @@ enum class EntropyGeneration CopyFromHost }; -/// @brief Returns a recommended size for the entropy pool (in bytes) -int getUrandomPoolSize(); - /// @brief Creates a new entropy file @p fileName in the target system at @p rootMountPoint Calamares::JobResult createNewEntropy( int poolSize, const QString& rootMountPoint, const QString& fileName ); diff --git a/src/modules/netinstall/CMakeLists.txt b/src/modules/netinstall/CMakeLists.txt index 67f805734..c5eddd32b 100644 --- a/src/modules/netinstall/CMakeLists.txt +++ b/src/modules/netinstall/CMakeLists.txt @@ -1,5 +1,3 @@ -include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ) - calamares_add_plugin( netinstall TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO @@ -15,6 +13,6 @@ calamares_add_plugin( netinstall LINK_PRIVATE_LIBRARIES calamaresui Qt5::Network - ${YAMLCPP_LIBRARY} + yamlcpp SHARED_LIB ) diff --git a/src/modules/netinstall/NetInstallPage.cpp b/src/modules/netinstall/NetInstallPage.cpp index c3754e1c2..735610c3d 100644 --- a/src/modules/netinstall/NetInstallPage.cpp +++ b/src/modules/netinstall/NetInstallPage.cpp @@ -2,7 +2,7 @@ * Copyright 2016, Luca Giambonini * Copyright 2016, Lisa Vitolo * Copyright 2017, Kyle Robbertze - * Copyright 2017-2018, Adriaan de Groot + * Copyright 2017-2018, 2020, Adriaan de Groot * Copyright 2017, Gabriel Craciunescu * * Calamares is free software: you can redistribute it and/or modify @@ -34,8 +34,6 @@ #include #include -using CalamaresUtils::yamlToVariant; - NetInstallPage::NetInstallPage( QWidget* parent ) : QWidget( parent ) , ui( new Ui::Page_NetInst ) @@ -43,6 +41,38 @@ NetInstallPage::NetInstallPage( QWidget* parent ) , m_groups( nullptr ) { ui->setupUi( this ); + setPageTitle( nullptr ); + CALAMARES_RETRANSLATE_SLOT( &NetInstallPage::retranslate ); +} + +NetInstallPage::~NetInstallPage() +{ + delete m_groups; + delete m_reply; +} + +void +NetInstallPage::setPageTitle( CalamaresUtils::Locale::TranslatedString* t ) +{ + m_title.reset( t ); + if ( !m_title ) + { + ui->label->hide(); + } + else + { + ui->label->show(); + } + retranslate(); +} + +void +NetInstallPage::retranslate() +{ + if ( ui && m_title ) + { + ui->label->setText( m_title->get() ); // That's get() on the TranslatedString + } } bool @@ -58,8 +88,6 @@ NetInstallPage::readGroups( const QByteArray& yamlData ) } Q_ASSERT( groups.IsSequence() ); m_groups = new PackageModel( groups ); - CALAMARES_RETRANSLATE( m_groups->setHeaderData( 0, Qt::Horizontal, tr( "Name" ) ); - m_groups->setHeaderData( 1, Qt::Horizontal, tr( "Description" ) ); ) return true; } catch ( YAML::Exception& e ) @@ -121,6 +149,7 @@ NetInstallPage::dataIsHere() return; } + retranslate(); // For changed model ui->groupswidget->setModel( m_groups ); ui->groupswidget->header()->setSectionResizeMode( 0, QHeaderView::ResizeToContents ); ui->groupswidget->header()->setSectionResizeMode( 1, QHeaderView::Stretch ); diff --git a/src/modules/netinstall/NetInstallPage.h b/src/modules/netinstall/NetInstallPage.h index fbd60a8fd..12633c6b9 100644 --- a/src/modules/netinstall/NetInstallPage.h +++ b/src/modules/netinstall/NetInstallPage.h @@ -2,7 +2,7 @@ * Copyright 2016, Luca Giambonini * Copyright 2016, Lisa Vitolo * Copyright 2017, Kyle Robbertze - * Copyright 2017-2018, Adriaan de Groot + * Copyright 2017-2018, 2020, 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,9 +24,13 @@ #include "PackageModel.h" #include "PackageTreeItem.h" +#include "locale/TranslatableConfiguration.h" + #include #include +#include + class QNetworkReply; namespace Ui @@ -39,6 +43,18 @@ class NetInstallPage : public QWidget Q_OBJECT public: NetInstallPage( QWidget* parent = nullptr ); + virtual ~NetInstallPage(); + + /** @brief Sets the page title + * + * In situations where there is more than one netinstall page, + * or you want some explanatory title above the treeview, + * set the page title. This page takes ownership of the + * TranslatedString object. + * + * Set to nullptr to remove the title. + */ + void setPageTitle( CalamaresUtils::Locale::TranslatedString* ); void onActivate(); @@ -63,6 +79,8 @@ public: public slots: void dataIsHere(); + void retranslate(); + signals: void checkReady( bool ); @@ -74,6 +92,8 @@ private: Ui::Page_NetInst* ui; + std::unique_ptr< CalamaresUtils::Locale::TranslatedString > m_title; // Above the treeview + QNetworkReply* m_reply; PackageModel* m_groups; bool m_required; diff --git a/src/modules/netinstall/NetInstallViewStep.cpp b/src/modules/netinstall/NetInstallViewStep.cpp index fcb76be5a..cb79982f9 100644 --- a/src/modules/netinstall/NetInstallViewStep.cpp +++ b/src/modules/netinstall/NetInstallViewStep.cpp @@ -2,7 +2,7 @@ * Copyright 2016, Luca Giambonini * Copyright 2016, Lisa Vitolo * Copyright 2017, Kyle Robbertze - * Copyright 2017-2018, Adriaan de Groot + * Copyright 2017-2018, 2020, 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,45 +20,59 @@ #include "NetInstallViewStep.h" -#include "JobQueue.h" #include "GlobalStorage.h" +#include "JobQueue.h" #include "utils/Logger.h" #include "utils/Variant.h" #include "NetInstallPage.h" -CALAMARES_PLUGIN_FACTORY_DEFINITION( NetInstallViewStepFactory, registerPlugin(); ) +CALAMARES_PLUGIN_FACTORY_DEFINITION( NetInstallViewStepFactory, registerPlugin< NetInstallViewStep >(); ) NetInstallViewStep::NetInstallViewStep( QObject* parent ) : Calamares::ViewStep( parent ) , m_widget( new NetInstallPage() ) , m_nextEnabled( false ) + , m_sidebarLabel( nullptr ) { emit nextStatusChanged( true ); - connect( m_widget, &NetInstallPage::checkReady, - this, &NetInstallViewStep::nextIsReady ); + connect( m_widget, &NetInstallPage::checkReady, this, &NetInstallViewStep::nextIsReady ); } NetInstallViewStep::~NetInstallViewStep() { if ( m_widget && m_widget->parent() == nullptr ) + { m_widget->deleteLater(); + } + delete m_sidebarLabel; } QString NetInstallViewStep::prettyName() const { - return tr( "Package selection" ); -} + return m_sidebarLabel ? m_sidebarLabel->get() : tr( "Package selection" ); - -QString -NetInstallViewStep::prettyStatus() const -{ - return m_prettyStatus; +#if defined(TABLE_OF_TRANSLATIONS) + NOTREACHED + // This is a table of "standard" labels for this module. If you use them + // in the label: sidebar: section of the config file, the existing + // translations can be used. + tr( "Package selection" ); + tr( "Office software" ); + tr( "Office package" ); + tr( "Browser software" ); + tr( "Browser package" ); + tr( "Web browser" ); + tr( "Kernel" ); + tr( "Services" ); + tr( "Login" ); + tr( "Desktop" ); + tr( "Applications" ); +#endif } @@ -110,61 +124,79 @@ NetInstallViewStep::onActivate() m_widget->onActivate(); } - void NetInstallViewStep::onLeave() { - cDebug() << "Leaving netinstall, adding packages to be installed" - << "to global storage"; - PackageModel::PackageItemDataList packages = m_widget->selectedPackages(); + cDebug() << "Netinstall: Processing" << packages.length() << "packages."; + + static const char PACKAGEOP[] = "packageOperations"; + + // Check if there's already a PACAKGEOP entry in GS, and if so we'll + // extend that one (overwriting the value in GS at the end of this method) + Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); + QVariantList packageOperations = gs->contains( PACKAGEOP ) ? gs->value( PACKAGEOP ).toList() : QVariantList(); + cDebug() << Logger::SubEntry << "Existing package operations length" << packageOperations.length(); + + // Clear out existing operations for this module, going backwards: + // Sometimes we remove an item, and we don't want the index to + // fall off the end of the list. + for ( int index = packageOperations.length() - 1; 0 <= index; index-- ) + { + const QVariantMap op = packageOperations.at( index ).toMap(); + if ( op.contains( "source" ) && op.value( "source" ).toString() == moduleInstanceKey().toString() ) + { + cDebug() << Logger::SubEntry << "Removing existing operations for" << moduleInstanceKey(); + packageOperations.removeAt( index ); + } + } + + // This netinstall module may add two sub-steps to the packageOperations, + // one for installing and one for try-installing. QVariantList installPackages; QVariantList tryInstallPackages; - QVariantList packageOperations; - cDebug() << "Processing" << packages.length() << "packages from netinstall."; - - for ( auto package : packages ) + for ( const auto& package : packages ) { - QVariant details( package.packageName ); - // If it's a package with a pre- or post-script, replace - // with the more complicated datastructure. - if ( !package.preScript.isEmpty() || !package.postScript.isEmpty() ) - { - QMap sdetails; - sdetails.insert( "pre-script", package.preScript ); - sdetails.insert( "package", package.packageName ); - sdetails.insert( "post-script", package.postScript ); - details = sdetails; - } if ( package.isCritical ) - installPackages.append( details ); + { + installPackages.append( package.toOperation() ); + } else - tryInstallPackages.append( details ); + { + tryInstallPackages.append( package.toOperation() ); + } } if ( !installPackages.empty() ) { - QMap op; + QVariantMap op; op.insert( "install", QVariant( installPackages ) ); + op.insert( "source", moduleInstanceKey().toString() ); packageOperations.append( op ); cDebug() << Logger::SubEntry << installPackages.length() << "critical packages."; } if ( !tryInstallPackages.empty() ) { - QMap op; + QVariantMap op; op.insert( "try_install", QVariant( tryInstallPackages ) ); + op.insert( "source", moduleInstanceKey().toString() ); packageOperations.append( op ); cDebug() << Logger::SubEntry << tryInstallPackages.length() << "non-critical packages."; } if ( !packageOperations.isEmpty() ) { - Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); - gs->insert( "packageOperations", QVariant( packageOperations ) ); + gs->insert( PACKAGEOP, packageOperations ); } } +void +NetInstallViewStep::nextIsReady( bool b ) +{ + m_nextEnabled = b; + emit nextStatusChanged( b ); +} void NetInstallViewStep::setConfigurationMap( const QVariantMap& configurationMap ) @@ -179,11 +211,17 @@ NetInstallViewStep::setConfigurationMap( const QVariantMap& configurationMap ) Calamares::JobQueue::instance()->globalStorage()->insert( "groupsUrl", groupsUrl ); m_widget->loadGroupList( groupsUrl ); } -} -void -NetInstallViewStep::nextIsReady( bool b ) -{ - m_nextEnabled = b; - emit nextStatusChanged( b ); + bool bogus = false; + auto label = CalamaresUtils::getSubMap( configurationMap, "label", bogus ); + + if ( label.contains( "sidebar" ) ) + { + m_sidebarLabel = new CalamaresUtils::Locale::TranslatedString( label, "sidebar", metaObject()->className() ); + } + if ( label.contains( "title" ) ) + { + m_widget->setPageTitle( + new CalamaresUtils::Locale::TranslatedString( label, "title", metaObject()->className() ) ); + } } diff --git a/src/modules/netinstall/NetInstallViewStep.h b/src/modules/netinstall/NetInstallViewStep.h index b07d3f96d..ad796b8b2 100644 --- a/src/modules/netinstall/NetInstallViewStep.h +++ b/src/modules/netinstall/NetInstallViewStep.h @@ -20,10 +20,10 @@ #ifndef NETINSTALLVIEWSTEP_H #define NETINSTALLVIEWSTEP_H -#include -#include - -#include +#include "DllMacro.h" +#include "locale/TranslatableConfiguration.h" +#include "utils/PluginFactory.h" +#include "viewpages/ViewStep.h" #include @@ -38,7 +38,6 @@ public: virtual ~NetInstallViewStep() override; QString prettyName() const override; - QString prettyStatus() const override; QWidget* widget() override; @@ -63,11 +62,10 @@ public slots: private: NetInstallPage* m_widget; bool m_nextEnabled; - QString m_prettyStatus; - + CalamaresUtils::Locale::TranslatedString* m_sidebarLabel; // As it appears in the sidebar QList< Calamares::job_ptr > m_jobs; }; CALAMARES_PLUGIN_FACTORY_DECLARATION( NetInstallViewStepFactory ) -#endif // NETINSTALLVIEWSTEP_H +#endif // NETINSTALLVIEWSTEP_H diff --git a/src/modules/netinstall/PackageModel.cpp b/src/modules/netinstall/PackageModel.cpp index 2fde7695e..6d299f633 100644 --- a/src/modules/netinstall/PackageModel.cpp +++ b/src/modules/netinstall/PackageModel.cpp @@ -21,9 +21,11 @@ #include "utils/Yaml.h" -PackageModel::PackageModel( const YAML::Node& data, QObject* parent ) : - QAbstractItemModel( parent ), - m_columnHeadings() +// TODO: see headerData(), remove after 3.2.19 +#include + +PackageModel::PackageModel( const YAML::Node& data, QObject* parent ) + : QAbstractItemModel( parent ) { m_rootItem = new PackageTreeItem(); setupModelData( data, m_rootItem ); @@ -38,33 +40,47 @@ QModelIndex PackageModel::index( int row, int column, const QModelIndex& parent ) const { if ( !hasIndex( row, column, parent ) ) + { return QModelIndex(); + } PackageTreeItem* parentItem; if ( !parent.isValid() ) + { parentItem = m_rootItem; + } else - parentItem = static_cast( parent.internalPointer() ); + { + parentItem = static_cast< PackageTreeItem* >( parent.internalPointer() ); + } PackageTreeItem* childItem = parentItem->child( row ); if ( childItem ) + { return createIndex( row, column, childItem ); + } else + { return QModelIndex(); + } } QModelIndex PackageModel::parent( const QModelIndex& index ) const { if ( !index.isValid() ) + { return QModelIndex(); + } - PackageTreeItem* child = static_cast( index.internalPointer() ); + PackageTreeItem* child = static_cast< PackageTreeItem* >( index.internalPointer() ); PackageTreeItem* parent = child->parentItem(); if ( parent == m_rootItem ) + { return QModelIndex(); + } return createIndex( parent->row(), 0, parent ); } @@ -72,13 +88,19 @@ int PackageModel::rowCount( const QModelIndex& parent ) const { if ( parent.column() > 0 ) + { return 0; + } PackageTreeItem* parentItem; if ( !parent.isValid() ) + { parentItem = m_rootItem; + } else - parentItem = static_cast( parent.internalPointer() ); + { + parentItem = static_cast< PackageTreeItem* >( parent.internalPointer() ); + } return parentItem->childCount(); } @@ -86,26 +108,32 @@ PackageModel::rowCount( const QModelIndex& parent ) const int PackageModel::columnCount( const QModelIndex& parent ) const { - if ( parent.isValid() ) - return static_cast( parent.internalPointer() )->columnCount(); - return m_rootItem->columnCount(); + return 2; } QVariant PackageModel::data( const QModelIndex& index, int role ) const { if ( !index.isValid() ) + { return QVariant(); + } - PackageTreeItem* item = static_cast( index.internalPointer() ); + PackageTreeItem* item = static_cast< PackageTreeItem* >( index.internalPointer() ); if ( index.column() == 0 && role == Qt::CheckStateRole ) + { return item->isSelected(); + } - if ( item->isHidden() && role == Qt::DisplayRole ) // Hidden group + if ( item->isHidden() && role == Qt::DisplayRole ) // Hidden group + { return QVariant(); + } if ( role == Qt::DisplayRole ) + { return item->data( index.column() ); + } return QVariant(); } @@ -114,28 +142,12 @@ PackageModel::setData( const QModelIndex& index, const QVariant& value, int role { if ( role == Qt::CheckStateRole && index.isValid() ) { - PackageTreeItem* item = static_cast( index.internalPointer() ); - item->setSelected( static_cast( value.toInt() ) ); + PackageTreeItem* item = static_cast< PackageTreeItem* >( index.internalPointer() ); + item->setSelected( static_cast< Qt::CheckState >( value.toInt() ) ); - emit dataChanged( this->index( 0, 0 ), index.sibling( index.column(), index.row() + 1 ), - QVector( Qt::CheckStateRole ) ); - } - return true; -} - -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() ) - m_columnHeadings.replace( section, value ); - else - m_columnHeadings.insert( section, value ); - emit headerDataChanged( orientation, section, section ); + emit dataChanged( this->index( 0, 0 ), + index.sibling( index.column(), index.row() + 1 ), + QVector< int >( Qt::CheckStateRole ) ); } return true; } @@ -144,9 +156,13 @@ Qt::ItemFlags PackageModel::flags( const QModelIndex& index ) const { if ( !index.isValid() ) + { return Qt::ItemFlags(); + } if ( index.column() == 0 ) + { return Qt::ItemIsUserCheckable | QAbstractItemModel::flags( index ); + } return QAbstractItemModel::flags( index ); } @@ -154,46 +170,60 @@ QVariant PackageModel::headerData( int section, Qt::Orientation orientation, int role ) const { if ( orientation == Qt::Horizontal && role == Qt::DisplayRole ) - return m_columnHeadings.value( section ); + { + // Unusual translation call uses the existing translation from the NetInstallPage + // class (now removed). + // + // TODO: after 3.2.19, change this to just tr() and push TX + return ( section == 0 ) ? QCoreApplication::translate( "NetInstallPage", "Name" ) + : QCoreApplication::translate( "NetInstallPage", "Description" ); + } return QVariant(); } -QList +QList< PackageTreeItem::ItemData > PackageModel::getPackages() const { - QList items = getItemPackages( m_rootItem ); + QList< PackageTreeItem* > items = getItemPackages( m_rootItem ); for ( auto package : m_hiddenItems ) if ( package->hiddenSelected() ) + { items.append( getItemPackages( package ) ); - QList packages; + } + QList< PackageTreeItem::ItemData > packages; for ( auto item : items ) { PackageTreeItem::ItemData itemData; - itemData.preScript = item->parentItem()->preScript(); // Only groups have hooks - itemData.packageName = item->packageName(); // this seg faults - itemData.postScript = item->parentItem()->postScript(); // Only groups have hooks - itemData.isCritical = item->parentItem()->isCritical(); // Only groups are critical + itemData.preScript = item->parentItem()->preScript(); // Only groups have hooks + itemData.packageName = item->packageName(); // this seg faults + itemData.postScript = item->parentItem()->postScript(); // Only groups have hooks + itemData.isCritical = item->parentItem()->isCritical(); // Only groups are critical packages.append( itemData ); } return packages; } -QList +QList< PackageTreeItem* > PackageModel::getItemPackages( PackageTreeItem* item ) const { - QList selectedPackages; + QList< PackageTreeItem* > selectedPackages; for ( int i = 0; i < item->childCount(); i++ ) { if ( item->child( i )->isSelected() == Qt::Unchecked ) + { continue; + } - if ( !item->child( i )->childCount() ) // package + if ( !item->child( i )->childCount() ) // package + { selectedPackages.append( item->child( i ) ); + } else + { selectedPackages.append( getItemPackages( item->child( i ) ) ); + } } return selectedPackages; - } void @@ -203,49 +233,57 @@ PackageModel::setupModelData( const YAML::Node& data, PackageTreeItem* parent ) { const YAML::Node itemDefinition = *it; - QString name( - tr( CalamaresUtils::yamlToVariant( itemDefinition["name"] ).toByteArray() ) ); - QString description( - tr( CalamaresUtils::yamlToVariant( itemDefinition["description"] ).toByteArray() ) ); + QString name( tr( CalamaresUtils::yamlToVariant( itemDefinition[ "name" ] ).toByteArray() ) ); + QString description( tr( CalamaresUtils::yamlToVariant( itemDefinition[ "description" ] ).toByteArray() ) ); PackageTreeItem::ItemData itemData; itemData.name = name; itemData.description = description; - if ( itemDefinition["pre-install"] ) - itemData.preScript = - CalamaresUtils::yamlToVariant( itemDefinition["pre-install"] ).toString(); - if ( itemDefinition["post-install"] ) - itemData.postScript = - CalamaresUtils::yamlToVariant( itemDefinition["post-install"] ).toString(); + if ( itemDefinition[ "pre-install" ] ) + { + itemData.preScript = CalamaresUtils::yamlToVariant( itemDefinition[ "pre-install" ] ).toString(); + } + if ( itemDefinition[ "post-install" ] ) + { + itemData.postScript = CalamaresUtils::yamlToVariant( itemDefinition[ "post-install" ] ).toString(); + } PackageTreeItem* item = new PackageTreeItem( itemData, parent ); - if ( itemDefinition["selected"] ) - item->setSelected( - CalamaresUtils::yamlToVariant( itemDefinition["selected"] ).toBool() ? - Qt::Checked : Qt::Unchecked ); + if ( itemDefinition[ "selected" ] ) + item->setSelected( CalamaresUtils::yamlToVariant( itemDefinition[ "selected" ] ).toBool() ? Qt::Checked + : Qt::Unchecked ); else - item->setSelected( parent->isSelected() ); // Inherit from it's parent + { + item->setSelected( parent->isSelected() ); // Inherit from it's parent + } - if ( itemDefinition["hidden"] ) - item->setHidden( - CalamaresUtils::yamlToVariant( itemDefinition["hidden"] ).toBool() ); + if ( itemDefinition[ "hidden" ] ) + { + item->setHidden( CalamaresUtils::yamlToVariant( itemDefinition[ "hidden" ] ).toBool() ); + } - if ( itemDefinition["critical"] ) - item->setCritical( - CalamaresUtils::yamlToVariant( itemDefinition["critical"] ).toBool() ); + if ( itemDefinition[ "critical" ] ) + { + item->setCritical( CalamaresUtils::yamlToVariant( itemDefinition[ "critical" ] ).toBool() ); + } - if ( itemDefinition["packages"] ) - for ( YAML::const_iterator packageIt = itemDefinition["packages"].begin(); - packageIt != itemDefinition["packages"].end(); ++packageIt ) + if ( itemDefinition[ "packages" ] ) + for ( YAML::const_iterator packageIt = itemDefinition[ "packages" ].begin(); + packageIt != itemDefinition[ "packages" ].end(); + ++packageIt ) item->appendChild( new PackageTreeItem( CalamaresUtils::yamlToVariant( *packageIt ).toString(), item ) ); - if ( itemDefinition["subgroups"] ) - setupModelData( itemDefinition["subgroups"], item ); + if ( itemDefinition[ "subgroups" ] ) + { + setupModelData( itemDefinition[ "subgroups" ], item ); + } if ( item->isHidden() ) + { m_hiddenItems.append( item ); + } else { item->setCheckable( true ); diff --git a/src/modules/netinstall/PackageModel.h b/src/modules/netinstall/PackageModel.h index f84b2779d..25965cb7f 100644 --- a/src/modules/netinstall/PackageModel.h +++ b/src/modules/netinstall/PackageModel.h @@ -29,7 +29,7 @@ namespace YAML { - class Node; +class Node; } class PackageModel : public QAbstractItemModel @@ -43,27 +43,24 @@ public: ~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 ) override; + bool setData( const QModelIndex& index, 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; - QModelIndex index( int row, int column, - const QModelIndex& parent = QModelIndex() ) const override; + + QModelIndex index( int row, int column, const QModelIndex& parent = QModelIndex() ) const override; QModelIndex parent( const QModelIndex& index ) const override; + + QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override; int rowCount( const QModelIndex& parent = QModelIndex() ) const override; int columnCount( const QModelIndex& parent = QModelIndex() ) const override; + PackageItemDataList getPackages() const; - QList getItemPackages( PackageTreeItem* item ) const; + QList< PackageTreeItem* > getItemPackages( PackageTreeItem* item ) const; private: void setupModelData( const YAML::Node& data, PackageTreeItem* parent ); PackageTreeItem* m_rootItem; - QList m_hiddenItems; - QVariantList m_columnHeadings; + QList< PackageTreeItem* > m_hiddenItems; }; -#endif // PACKAGEMODEL_H +#endif // PACKAGEMODEL_H diff --git a/src/modules/netinstall/PackageTreeItem.cpp b/src/modules/netinstall/PackageTreeItem.cpp index b3dc6fae7..59e82a659 100644 --- a/src/modules/netinstall/PackageTreeItem.cpp +++ b/src/modules/netinstall/PackageTreeItem.cpp @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === * * Copyright (c) 2017, Kyle Robbertze - * Copyright 2017, Adriaan de Groot + * Copyright 2017, 2020, 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,28 +21,52 @@ #include "utils/Logger.h" +QVariant +PackageTreeItem::ItemData::toOperation() const +{ + // If it's a package with a pre- or post-script, replace + // with the more complicated datastructure. + if ( !preScript.isEmpty() || !postScript.isEmpty() ) + { + QMap< QString, QVariant > sdetails; + sdetails.insert( "pre-script", preScript ); + sdetails.insert( "package", packageName ); + sdetails.insert( "post-script", postScript ); + return sdetails; + } + else + { + return packageName; + } +} + PackageTreeItem::PackageTreeItem( const ItemData& data, PackageTreeItem* parent ) : m_parentItem( parent ) , m_data( data ) -{ } +{ +} -PackageTreeItem::PackageTreeItem( const QString packageName, PackageTreeItem* parent ) : - m_parentItem( parent ) +PackageTreeItem::PackageTreeItem( const QString packageName, PackageTreeItem* parent ) + : m_parentItem( parent ) { m_data.packageName = packageName; if ( parent != nullptr ) + { m_data.selected = parent->isSelected(); + } else + { m_data.selected = Qt::Unchecked; + } } -PackageTreeItem::PackageTreeItem( PackageTreeItem* parent ) : - m_parentItem( parent ) +PackageTreeItem::PackageTreeItem( PackageTreeItem* parent ) + : m_parentItem( parent ) { } -PackageTreeItem::PackageTreeItem::PackageTreeItem() : - PackageTreeItem( QString(), nullptr ) +PackageTreeItem::PackageTreeItem::PackageTreeItem() + : PackageTreeItem( QString(), nullptr ) { m_data.selected = Qt::Checked; m_data.name = QLatin1String( "" ); @@ -75,26 +99,24 @@ int PackageTreeItem::row() const { if ( m_parentItem ) - return m_parentItem->m_childItems.indexOf( const_cast( this ) ); + { + return m_parentItem->m_childItems.indexOf( const_cast< PackageTreeItem* >( this ) ); + } return 0; } -int -PackageTreeItem::columnCount() const -{ - return m_columns; -} - QVariant PackageTreeItem::data( int column ) const { - if ( packageName() != nullptr ) // package + if ( packageName() != nullptr ) // package { if ( !column ) + { return QVariant( packageName() ); + } return QVariant(); } - switch ( column ) // group + switch ( column ) // group { case 0: return QVariant( prettyName() ); @@ -164,14 +186,18 @@ bool PackageTreeItem::hiddenSelected() const { Q_ASSERT( m_data.isHidden ); - if (! m_data.selected ) + if ( !m_data.selected ) + { return false; + } const PackageTreeItem* currentItem = parentItem(); while ( currentItem != nullptr ) { if ( !currentItem->isHidden() ) + { return currentItem->isSelected() != Qt::Unchecked; + } currentItem = currentItem->parentItem(); } @@ -202,8 +228,10 @@ void PackageTreeItem::setSelected( Qt::CheckState isSelected ) { if ( parentItem() == nullptr ) - // This is the root, it is always checked so don't change state + // This is the root, it is always checked so don't change state + { return; + } m_data.selected = isSelected; setChildrenSelected( isSelected ); @@ -216,8 +244,10 @@ PackageTreeItem::setSelected( Qt::CheckState isSelected ) currentItem = currentItem->parentItem(); } if ( currentItem == nullptr ) - // Reached the root .. don't bother + // Reached the root .. don't bother + { return; + } // Figure out checked-state based on the children int childrenSelected = 0; @@ -225,16 +255,26 @@ PackageTreeItem::setSelected( Qt::CheckState isSelected ) for ( int i = 0; i < currentItem->childCount(); i++ ) { if ( currentItem->child( i )->isSelected() == Qt::Checked ) + { childrenSelected++; + } if ( currentItem->child( i )->isSelected() == Qt::PartiallyChecked ) + { childrenPartiallySelected++; + } } - if ( !childrenSelected && !childrenPartiallySelected) + if ( !childrenSelected && !childrenPartiallySelected ) + { currentItem->setSelected( Qt::Unchecked ); + } else if ( childrenSelected == currentItem->childCount() ) + { currentItem->setSelected( Qt::Checked ); + } else + { currentItem->setSelected( Qt::PartiallyChecked ); + } } void diff --git a/src/modules/netinstall/PackageTreeItem.h b/src/modules/netinstall/PackageTreeItem.h index 9c1c8c5a5..18a509861 100644 --- a/src/modules/netinstall/PackageTreeItem.h +++ b/src/modules/netinstall/PackageTreeItem.h @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === * * Copyright (c) 2017, Kyle Robbertze - * Copyright 2017, Adriaan de Groot + * Copyright 2017, 2020, 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 +21,8 @@ #define PACKAGETREEITEM_H #include -#include #include +#include class PackageTreeItem : public QStandardItem { @@ -37,6 +37,13 @@ public: bool isCritical = false; bool isHidden = false; Qt::CheckState selected = Qt::Unchecked; + + /** @brief Turns this item into a variant for PackageOperations use + * + * For "plain" items, this is just the package name; items with + * scripts return a map. See the package module for how it's interpreted. + */ + QVariant toOperation() const; }; explicit PackageTreeItem( const ItemData& data, PackageTreeItem* parent = nullptr ); explicit PackageTreeItem( const QString packageName, PackageTreeItem* parent = nullptr ); @@ -47,7 +54,6 @@ public: void appendChild( PackageTreeItem* child ); PackageTreeItem* child( int row ); int childCount() const; - int columnCount() const; QVariant data( int column ) const override; int row() const; @@ -78,11 +84,11 @@ public: void setSelected( Qt::CheckState isSelected ); void setChildrenSelected( Qt::CheckState isSelected ); int type() const override; + private: PackageTreeItem* m_parentItem; - QList m_childItems; + QList< PackageTreeItem* > m_childItems; ItemData m_data; - const int m_columns = 2; // Name, description }; -#endif // PACKAGETREEITEM_H +#endif // PACKAGETREEITEM_H diff --git a/src/modules/netinstall/netinstall.conf b/src/modules/netinstall/netinstall.conf index fd59c24c6..5f90fec76 100644 --- a/src/modules/netinstall/netinstall.conf +++ b/src/modules/netinstall/netinstall.conf @@ -21,3 +21,28 @@ # This only has an effect if the netinstall data cannot be retrieved, # or is corrupt: having "required" set, means the install cannot proceed. required: false + +# To support multiple instances of this module, +# some strings are configurable and translatable here. +# - *sidebar* This is the name of the module in the progress-tree / sidebar +# in Calamares. +# - *title* This is displayed above the list of packages. +# If no *sidebar* values are provided, defaults to "Package selection" +# and existing translations. If no *title* values are provided, no string +# is displayed. +# +# The following strings are already known to Calamares and can be +# listed here in *untranslated* form (e.g. as value of *sidebar*) +# without bothering with the translations: they are picked up from +# the regular translation framework: +# - "Package selection" +# - "Office software" +# - "Office package" +# - "Browser software" +# - "Browser package" +# - "Web browser" +label: + sidebar: "Package selection" + # sidebar[nl]: "Pakketkeuze" + # title: "Office Package" + # title[nl]: "Kantoorsoftware" diff --git a/src/modules/netinstall/page_netinst.ui b/src/modules/netinstall/page_netinst.ui index 3aa4e57ec..32c11ec15 100644 --- a/src/modules/netinstall/page_netinst.ui +++ b/src/modules/netinstall/page_netinst.ui @@ -14,6 +14,13 @@ + + + + Qt::AlignCenter + + + @@ -31,7 +38,7 @@ 0 0 981 - 434 + 407 diff --git a/src/modules/notesqml/NotesQmlViewStep.cpp b/src/modules/notesqml/NotesQmlViewStep.cpp index e729c2df7..79c2e39f2 100644 --- a/src/modules/notesqml/NotesQmlViewStep.cpp +++ b/src/modules/notesqml/NotesQmlViewStep.cpp @@ -36,9 +36,7 @@ NotesQmlViewStep::prettyName() const void NotesQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap ) -{ - Calamares::QmlViewStep::setConfigurationMap( configurationMap ); // call parent implementation - +{ bool qmlLabel_ok = false; auto qmlLabel = CalamaresUtils::getSubMap( configurationMap, "qmlLabel", qmlLabel_ok ); @@ -46,7 +44,8 @@ NotesQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { m_notesName = new CalamaresUtils::Locale::TranslatedString( qmlLabel, "notes" ); } - + + Calamares::QmlViewStep::setConfigurationMap( configurationMap ); // call parent implementation last } CALAMARES_PLUGIN_FACTORY_DEFINITION( NotesQmlViewStepFactory, registerPlugin< NotesQmlViewStep >(); ) diff --git a/src/modules/notesqml/NotesQmlViewStep.h b/src/modules/notesqml/NotesQmlViewStep.h index 445b34c81..5ffd4598e 100644 --- a/src/modules/notesqml/NotesQmlViewStep.h +++ b/src/modules/notesqml/NotesQmlViewStep.h @@ -20,7 +20,7 @@ #ifndef NOTESQMLVIEWSTEP_H #define NOTESQMLVIEWSTEP_H -#include "PluginDllMacro.h" +#include "DllMacro.h" #include "locale/TranslatableConfiguration.h" #include "utils/CalamaresUtilsSystem.h" #include "utils/Variant.h" diff --git a/src/modules/notesqml/examples/dummyqml.qml b/src/modules/notesqml/examples/notesqml.qml.example similarity index 75% rename from src/modules/notesqml/examples/dummyqml.qml rename to src/modules/notesqml/examples/notesqml.qml.example index 3cbfa65fc..a41fa98fd 100644 --- a/src/modules/notesqml/examples/dummyqml.qml +++ b/src/modules/notesqml/examples/notesqml.qml.example @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2020, Anke Boersma + * Copyright 2020, 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 @@ -16,6 +17,14 @@ * along with Calamares. If not, see . */ +/* Some Calamares internals are available to all QML modules. + * They live in the calamares.ui namespace (filled programmatically + * by Calamares). One of the internals that is exposed is the + * Branding object, which can be used to retrieve strings and paths + * and colors. + */ +import calamares.ui 1.0 + import QtQuick 2.7 import QtQuick.Controls 2.2 import QtQuick.Window 2.2 @@ -30,8 +39,9 @@ Item { id: flick anchors.fill: parent contentHeight: 800 - + ScrollBar.vertical: ScrollBar { + id: fscrollbar width: 10 policy: ScrollBar.AlwaysOn } @@ -40,33 +50,34 @@ Item { id: intro x: 1 y: 0 - width: 720 + width: parent.width - fscrollbar.width font.pointSize: 14 textFormat: Text.RichText antialiasing: true activeFocusOnPress: false wrapMode: Text.WordWrap - text: qsTr("

Generic GNU/Linux 2017.8 LTS Soapy Sousaphone

+ text: qsTr("

%1

This an example QML file, showing options in RichText with Flickable content.

- +

QML with RichText can use HTML tags, Flickable content is useful for touchscreens.

- +

This is bold text

This is italic text

This is underlined text

-

This is strikethrough

- +

This text will be center-aligned.

+

This is strikethrough

+

Code example: ls -l /home

- +

Lists:

  • Intel CPU systems
  • AMD CPU systems
- -

The vertical scrollbar is adjustable, current width set to 10.

") + +

The vertical scrollbar is adjustable, current width set to 10.

").arg(Branding.string(Branding.VersionedName)) } } diff --git a/src/modules/notesqml/notesqml.qml b/src/modules/notesqml/notesqml.qml index d1ff4f1b5..cb659debc 100644 --- a/src/modules/notesqml/notesqml.qml +++ b/src/modules/notesqml/notesqml.qml @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2020, Anke Boersma + * Copyright 2020, 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 @@ -16,6 +17,14 @@ * along with Calamares. If not, see . */ +/* Some Calamares internals are available to all QML modules. + * They live in the calamares.ui namespace (filled programmatically + * by Calamares). One of the internals that is exposed is the + * Branding object, which can be used to retrieve strings and paths + * and colors. + */ +import calamares.ui 1.0 + import QtQuick 2.7 import QtQuick.Controls 2.2 import QtQuick.Window 2.2 @@ -30,9 +39,9 @@ Item { id: flick anchors.fill: parent contentHeight: 800 - + ScrollBar.vertical: ScrollBar { - id: fscrollbar + id: fscrollbar width: 10 policy: ScrollBar.AlwaysOn } @@ -48,27 +57,9 @@ Item { activeFocusOnPress: false wrapMode: Text.WordWrap - text: qsTr("

Generic GNU/Linux 2020.2 LTS Turgid Tuba

-

This an example QML file, showing options in RichText with Flickable content.

- -

QML with RichText can use HTML tags, Flickable content is useful for touchscreens.

- -

This is bold text

-

This is italic text

-

This is underlined text

-

This text will be center-aligned.

-

This is strikethrough

- -

Code example: - ls -l /home

- -

Lists:

-
    -
  • Intel CPU systems
    • -
  • AMD CPU systems
    • -
- -

The vertical scrollbar is adjustable, current width set to 10.

") + text: qsTr("

%1

+

These are example release notes.

" + ).arg(Branding.string(Branding.VersionedName)) } } diff --git a/src/modules/oemid/OEMViewStep.h b/src/modules/oemid/OEMViewStep.h index d8722594a..57e2bba66 100644 --- a/src/modules/oemid/OEMViewStep.h +++ b/src/modules/oemid/OEMViewStep.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include diff --git a/src/modules/packagechooser/CMakeLists.txt b/src/modules/packagechooser/CMakeLists.txt index eeae655c9..d85eda8e2 100644 --- a/src/modules/packagechooser/CMakeLists.txt +++ b/src/modules/packagechooser/CMakeLists.txt @@ -53,18 +53,12 @@ calamares_add_plugin( packagechooser SHARED_LIB ) -if( ECM_FOUND AND BUILD_TESTING ) - ecm_add_test( - Tests.cpp - TEST_NAME - packagechoosertest - LINK_LIBRARIES - ${CALAMARES_LIBRARIES} - calamares_viewmodule_packagechooser - Qt5::Core - Qt5::Test - Qt5::Gui - ${_extra_libraries} - ) - calamares_automoc( packagechoosertest) -endif() +calamares_add_test( + packagechoosertest + GUI + SOURCES + Tests.cpp + LIBRARIES + calamares_viewmodule_packagechooser + ${_extra_libraries} +) diff --git a/src/modules/packagechooser/PackageChooserViewStep.h b/src/modules/packagechooser/PackageChooserViewStep.h index 29e65ef82..9e9087971 100644 --- a/src/modules/packagechooser/PackageChooserViewStep.h +++ b/src/modules/packagechooser/PackageChooserViewStep.h @@ -19,7 +19,7 @@ #ifndef PACKAGECHOOSERVIEWSTEP_H #define PACKAGECHOOSERVIEWSTEP_H -#include "PluginDllMacro.h" +#include "DllMacro.h" #include "locale/TranslatableConfiguration.h" #include "utils/PluginFactory.h" #include "viewpages/ViewStep.h" diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py index aa4bb8b12..685cea0e5 100644 --- a/src/modules/packages/main.py +++ b/src/modules/packages/main.py @@ -478,7 +478,10 @@ def run_operations(pkgman, entry): else: for package in package_list: pkgman.install_package(package, from_local=True) - + elif key == "source": + libcalamares.utils.debug("Package-list from {!s}".format(entry[key])) + else: + libcalamares.utils.warning("Unknown package-operation key {!s}".format(key)) completed_packages += len(package_list) libcalamares.job.setprogress(completed_packages * 1.0 / total_packages) libcalamares.utils.debug(pretty_name()) diff --git a/src/modules/packages/packages.conf b/src/modules/packages/packages.conf index e42e8e9b8..7b631d79e 100644 --- a/src/modules/packages/packages.conf +++ b/src/modules/packages/packages.conf @@ -55,22 +55,25 @@ update_system: false # that is in this configuration file). # # Allowed package operations are: -# - install, try_install: will call the package manager to +# - *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 +# - *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. # The *pacman* package manager is the only one to specially support # this operation (all others treat this the same as *install*). -# - remove, try_remove: will call the package manager to +# - *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. +# One additional key is recognized, to help netinstall out: +# - *source*: ignored, does get logged +# Any other key is ignored, and logged as a warning. # # 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 diff --git a/src/modules/partition/CMakeLists.txt b/src/modules/partition/CMakeLists.txt index f9c32b39e..2ac926346 100644 --- a/src/modules/partition/CMakeLists.txt +++ b/src/modules/partition/CMakeLists.txt @@ -20,7 +20,7 @@ find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE) find_package( KPMcore 3.3 ) set_package_properties( KPMcore PROPERTIES - PURPOSE "For partitioning module" + PURPOSE "For partition module" ) find_package( KF5Config CONFIG ) find_package( KF5I18n CONFIG ) @@ -51,7 +51,6 @@ if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND core/PartitionActions.cpp core/PartitionCoreModule.cpp core/PartitionInfo.cpp - core/PartitionIterator.cpp core/PartitionLayout.cpp core/PartitionModel.cpp core/PartUtils.cpp diff --git a/src/modules/partition/core/BootLoaderModel.cpp b/src/modules/partition/core/BootLoaderModel.cpp index 7f5a0427a..10b88be76 100644 --- a/src/modules/partition/core/BootLoaderModel.cpp +++ b/src/modules/partition/core/BootLoaderModel.cpp @@ -20,8 +20,8 @@ #include "core/BootLoaderModel.h" -#include "core/PartitionInfo.h" #include "core/KPMHelpers.h" +#include "core/PartitionInfo.h" #include "utils/Logger.h" @@ -44,9 +44,7 @@ BootLoaderModel::BootLoaderModel( QObject* parent ) { } -BootLoaderModel::~BootLoaderModel() -{ -} +BootLoaderModel::~BootLoaderModel() {} void BootLoaderModel::init( const QList< Device* >& devices ) @@ -67,11 +65,8 @@ BootLoaderModel::createMbrItems() { for ( auto device : m_devices ) { - QString text = tr( "Master Boot Record of %1" ) - .arg( device->name() ); - appendRow( - createBootLoaderItem( text, device->deviceNode(), false ) - ); + QString text = tr( "Master Boot Record of %1" ).arg( device->name() ); + appendRow( createBootLoaderItem( text, device->deviceNode(), false ) ); } } @@ -90,23 +85,29 @@ BootLoaderModel::update() void BootLoaderModel::updateInternal() { - QMutexLocker lock(&m_lock); + QMutexLocker lock( &m_lock ); clear(); createMbrItems(); // An empty model is possible if you don't havee permissions: don't crash though. if ( rowCount() < 1 ) + { return; + } QString partitionText; Partition* partition = KPMHelpers::findPartitionByMountPoint( m_devices, "/boot" ); if ( partition ) + { partitionText = tr( "Boot Partition" ); + } else { partition = KPMHelpers::findPartitionByMountPoint( m_devices, "/" ); if ( partition ) + { partitionText = tr( "System Partition" ); + } } Q_ASSERT( rowCount() > 0 ); @@ -117,7 +118,9 @@ BootLoaderModel::updateInternal() if ( !partition ) { if ( lastIsPartition ) + { takeRow( rowCount() - 1 ); + } } else { @@ -129,15 +132,11 @@ BootLoaderModel::updateInternal() } else { - appendRow( - createBootLoaderItem( partitionText, PartitionInfo::mountPoint( partition ), true ) - ); + appendRow( createBootLoaderItem( partitionText, PartitionInfo::mountPoint( partition ), true ) ); } // Create "don't install bootloader" item - appendRow( - createBootLoaderItem( tr( "Do not install a boot loader" ), QString(), false ) - ); + appendRow( createBootLoaderItem( tr( "Do not install a boot loader" ), QString(), false ) ); } } @@ -145,13 +144,15 @@ BootLoaderModel::updateInternal() QVariant BootLoaderModel::data( const QModelIndex& index, int role ) const { - QMutexLocker lock(&m_lock); + QMutexLocker lock( &m_lock ); if ( role == Qt::DisplayRole ) { QString displayRole = QStandardItemModel::data( index, Qt::DisplayRole ).toString(); QString pathRole = QStandardItemModel::data( index, BootLoaderModel::BootLoaderPathRole ).toString(); if ( pathRole.isEmpty() ) + { return displayRole; + } return tr( "%1 (%2)" ).arg( displayRole, pathRole ); } @@ -163,14 +164,18 @@ namespace Calamares int findBootloader( const QAbstractItemModel* model, const QString& path ) { - for ( int i = 0; i < model->rowCount(); ++i) + for ( int i = 0; i < model->rowCount(); ++i ) { const auto index = model->index( i, 0, QModelIndex() ); if ( !index.isValid() ) + { continue; + } QVariant var = model->data( index, BootLoaderModel::BootLoaderPathRole ); if ( var.isValid() && var.toString() == path ) + { return i; + } } return -1; @@ -191,7 +196,7 @@ restoreSelectedBootLoader( QComboBox& combo, const QString& path ) { combo.setCurrentIndex( 0 ); } - else if ( (r = findBootloader( model, path )) >= 0 ) + else if ( ( r = findBootloader( model, path ) ) >= 0 ) { combo.setCurrentIndex( r ); } @@ -201,4 +206,4 @@ restoreSelectedBootLoader( QComboBox& combo, const QString& path ) } } -} // namespace +} // namespace Calamares diff --git a/src/modules/partition/core/BootLoaderModel.h b/src/modules/partition/core/BootLoaderModel.h index a2befad00..8daa8ca04 100644 --- a/src/modules/partition/core/BootLoaderModel.h +++ b/src/modules/partition/core/BootLoaderModel.h @@ -66,18 +66,18 @@ private: namespace Calamares { - /** @brief Returns the row number of boot-loader @p path (e.g. /dev/sda) - * - * Assuming the @p model is a BootLoaderModel, will return a row number - * in the model. Returns -1 otherwise. - */ - int findBootloader( const QAbstractItemModel* model, const QString& path ); +/** @brief Returns the row number of boot-loader @p path (e.g. /dev/sda) + * + * Assuming the @p model is a BootLoaderModel, will return a row number + * in the model. Returns -1 otherwise. + */ +int findBootloader( const QAbstractItemModel* model, const QString& path ); - /** @brief Tries to set @p path as selected item in @p combo - * - * Matches a boot-loader install path (e.g. /dev/sda) with a model - * row and sets that as the current row. - */ - void restoreSelectedBootLoader( QComboBox& combo, const QString& path ); -} // namespace +/** @brief Tries to set @p path as selected item in @p combo + * + * Matches a boot-loader install path (e.g. /dev/sda) with a model + * row and sets that as the current row. + */ +void restoreSelectedBootLoader( QComboBox& combo, const QString& path ); +} // namespace Calamares #endif /* BOOTLOADERMODEL_H */ diff --git a/src/modules/partition/core/ColorUtils.cpp b/src/modules/partition/core/ColorUtils.cpp index ffe45d443..d04c4110d 100644 --- a/src/modules/partition/core/ColorUtils.cpp +++ b/src/modules/partition/core/ColorUtils.cpp @@ -20,8 +20,9 @@ #include "core/ColorUtils.h" #include "core/KPMHelpers.h" -#include "core/PartitionIterator.h" +#include "partition/PartitionIterator.h" +#include "partition/PartitionQuery.h" #include "utils/Logger.h" // KPMcore @@ -32,23 +33,25 @@ #include #include +using CalamaresUtils::Partition::isPartitionFreeSpace; +using CalamaresUtils::Partition::isPartitionNew; +using CalamaresUtils::Partition::PartitionIterator; + static const int NUM_PARTITION_COLORS = 5; static const int NUM_NEW_PARTITION_COLORS = 4; //Let's try to use the Breeze palette -static const QColor PARTITION_COLORS[ NUM_PARTITION_COLORS ] = -{ - "#2980b9", //Dark Plasma Blue - "#27ae60", //Dark Icon Green - "#c9ce3b", //Dirty Yellow - "#3daee9", //Plasma Blue - "#9b59b6", //Purple +static const QColor PARTITION_COLORS[ NUM_PARTITION_COLORS ] = { + "#2980b9", //Dark Plasma Blue + "#27ae60", //Dark Icon Green + "#c9ce3b", //Dirty Yellow + "#3daee9", //Plasma Blue + "#9b59b6", //Purple }; -static const QColor NEW_PARTITION_COLORS[ NUM_NEW_PARTITION_COLORS ] = -{ - "#c0392b", //Dark Icon Red - "#f39c1f", //Dark Icon Yellow - "#f1b7bc", //Light Salmon - "#fed999", //Light Orange +static const QColor NEW_PARTITION_COLORS[ NUM_NEW_PARTITION_COLORS ] = { + "#c0392b", //Dark Icon Red + "#f39c1f", //Dark Icon Yellow + "#f1b7bc", //Light Salmon + "#fed999", //Light Orange }; static QColor FREE_SPACE_COLOR = "#777777"; static QColor EXTENDED_COLOR = "#aaaaaa"; @@ -60,12 +63,14 @@ static QMap< QString, QColor > s_partitionColorsCache; namespace ColorUtils { -QColor freeSpaceColor() +QColor +freeSpaceColor() { return FREE_SPACE_COLOR; } -QColor unknownDisklabelColor() +QColor +unknownDisklabelColor() { return UNKNOWN_DISKLABEL_COLOR; } @@ -73,9 +78,10 @@ QColor unknownDisklabelColor() PartitionNode* _findRootForPartition( PartitionNode* partition ) { - if ( partition->isRoot() || - !partition->parent() ) + if ( partition->isRoot() || !partition->parent() ) + { return partition; + } return _findRootForPartition( partition->parent() ); } @@ -89,24 +95,31 @@ colorForPartition( Partition* partition ) return FREE_SPACE_COLOR; } - if ( KPMHelpers::isPartitionFreeSpace( partition ) ) + if ( isPartitionFreeSpace( partition ) ) + { return FREE_SPACE_COLOR; + } if ( partition->roles().has( PartitionRole::Extended ) ) + { return EXTENDED_COLOR; + } - if ( partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone && - !partition->fileSystem().uuid().isEmpty() ) + if ( partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone + && !partition->fileSystem().uuid().isEmpty() ) { if ( partition->fileSystem().type() == FileSystem::Luks ) { FS::luks& luksFs = dynamic_cast< FS::luks& >( partition->fileSystem() ); - if ( !luksFs.outerUuid().isEmpty() && - s_partitionColorsCache.contains( luksFs.outerUuid() ) ) + if ( !luksFs.outerUuid().isEmpty() && s_partitionColorsCache.contains( luksFs.outerUuid() ) ) + { return s_partitionColorsCache[ luksFs.outerUuid() ]; + } } if ( s_partitionColorsCache.contains( partition->fileSystem().uuid() ) ) + { return s_partitionColorsCache[ partition->fileSystem().uuid() ]; + } } // No partition-specific color needed, pick one from our list, but skip @@ -117,27 +130,30 @@ colorForPartition( Partition* partition ) Q_ASSERT( table ); int colorIdx = 0; int newColorIdx = 0; - for ( PartitionIterator it = PartitionIterator::begin( table ); - it != PartitionIterator::end( table ); - ++it ) + for ( PartitionIterator it = PartitionIterator::begin( table ); it != PartitionIterator::end( table ); ++it ) { Partition* child = *it; if ( child == partition ) - break; - if ( !KPMHelpers::isPartitionFreeSpace( child ) && - !child->hasChildren() ) { - if ( KPMHelpers::isPartitionNew( child ) ) + break; + } + if ( !isPartitionFreeSpace( child ) && !child->hasChildren() ) + { + if ( isPartitionNew( child ) ) + { ++newColorIdx; + } ++colorIdx; } } - if ( KPMHelpers::isPartitionNew( partition ) ) + if ( isPartitionNew( partition ) ) + { return NEW_PARTITION_COLORS[ newColorIdx % NUM_NEW_PARTITION_COLORS ]; + } - if ( partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone && - !partition->fileSystem().uuid().isEmpty() ) + if ( partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone + && !partition->fileSystem().uuid().isEmpty() ) { if ( partition->fileSystem().type() == FileSystem::Luks ) { @@ -163,17 +179,17 @@ colorForPartitionInFreeSpace( Partition* partition ) PartitionTable* table = dynamic_cast< PartitionTable* >( parent ); Q_ASSERT( table ); int newColorIdx = 0; - for ( PartitionIterator it = PartitionIterator::begin( table ); - it != PartitionIterator::end( table ); - ++it ) + for ( PartitionIterator it = PartitionIterator::begin( table ); it != PartitionIterator::end( table ); ++it ) { Partition* child = *it; if ( child == partition ) + { break; - if ( !KPMHelpers::isPartitionFreeSpace( child ) && - !child->hasChildren() && - KPMHelpers::isPartitionNew( child ) ) + } + if ( !isPartitionFreeSpace( child ) && !child->hasChildren() && isPartitionNew( child ) ) + { ++newColorIdx; + } } return NEW_PARTITION_COLORS[ newColorIdx % NUM_NEW_PARTITION_COLORS ]; } @@ -185,4 +201,4 @@ invalidateCache() s_partitionColorsCache.clear(); } -} // namespace +} // namespace ColorUtils diff --git a/src/modules/partition/core/ColorUtils.h b/src/modules/partition/core/ColorUtils.h index 33efc4b7e..3c65b75b2 100644 --- a/src/modules/partition/core/ColorUtils.h +++ b/src/modules/partition/core/ColorUtils.h @@ -53,6 +53,6 @@ QColor colorForPartitionInFreeSpace( Partition* freeSpacePartition ); */ void invalidateCache(); -} +} // namespace ColorUtils #endif /* COLORUTILS_H */ diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp index 680d30dd6..944940d9a 100644 --- a/src/modules/partition/core/DeviceList.cpp +++ b/src/modules/partition/core/DeviceList.cpp @@ -20,23 +20,24 @@ #include "DeviceList.h" #include "PartitionCoreModule.h" - #include "core/DeviceModel.h" #include "core/KPMHelpers.h" -#include "core/PartitionIterator.h" + +#include "GlobalStorage.h" +#include "JobQueue.h" +#include "partition/PartitionIterator.h" +#include "utils/Logger.h" #include #include #include #include -#include -#include -#include - #include #include +using CalamaresUtils::Partition::PartitionIterator; + namespace PartUtils { @@ -49,7 +50,9 @@ hasRootPartition( Device* device ) { for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it ) if ( ( *it )->mountPoint() == "/" ) + { return true; + } return false; } @@ -68,17 +71,22 @@ isIso9660( const Device* device ) { const QString path = device->deviceNode(); if ( path.isEmpty() ) + { return false; + } if ( blkIdCheckIso9660( path ) ) + { return true; + } - if ( device->partitionTable() && - !device->partitionTable()->children().isEmpty() ) + if ( device->partitionTable() && !device->partitionTable()->children().isEmpty() ) { for ( const Partition* partition : device->partitionTable()->children() ) { if ( blkIdCheckIso9660( partition->partitionPath() ) ) + { return true; + } } } return false; @@ -86,7 +94,7 @@ isIso9660( const Device* device ) static inline QDebug& -operator <<( QDebug& s, QList< Device* >::iterator& it ) +operator<<( QDebug& s, QList< Device* >::iterator& it ) { s << ( ( *it ) ? ( *it )->deviceNode() : QString( "" ) ); return s; @@ -95,7 +103,7 @@ operator <<( QDebug& s, QList< Device* >::iterator& it ) using DeviceList = QList< Device* >; static inline DeviceList::iterator -erase(DeviceList& l, DeviceList::iterator& it) +erase( DeviceList& l, DeviceList::iterator& it ) { Device* p = *it; auto r = l.erase( it ); @@ -103,13 +111,14 @@ erase(DeviceList& l, DeviceList::iterator& it) return r; } -QList< Device* > getDevices( DeviceType which, qint64 minimumSize ) +QList< Device* > +getDevices( DeviceType which, qint64 minimumSize ) { - bool writableOnly = (which == DeviceType::WritableOnly); + bool writableOnly = ( which == DeviceType::WritableOnly ); CoreBackend* backend = CoreBackendManager::self()->backend(); -#ifdef WITH_KPMCORE331API - DeviceList devices = backend->scanDevices( /* not includeReadOnly, not includeLoopback */ ScanFlag(0) ); +#if defined( WITH_KPMCORE4API ) + DeviceList devices = backend->scanDevices( /* not includeReadOnly, not includeLoopback */ ScanFlag( 0 ) ); #else DeviceList devices = backend->scanDevices( /* excludeReadOnly */ true ); #endif @@ -127,14 +136,12 @@ QList< Device* > getDevices( DeviceType which, qint64 minimumSize ) if ( !( *it ) ) { cDebug() << Logger::SubEntry << "Skipping nullptr device"; - it = erase( devices, it); + it = erase( devices, it ); } - else if ( ( *it )->deviceNode().startsWith( "/dev/zram" ) - ) + else if ( ( *it )->deviceNode().startsWith( "/dev/zram" ) ) { cDebug() << Logger::SubEntry << "Removing zram" << it; it = erase( devices, it ); - } else if ( writableOnly && hasRootPartition( *it ) ) { @@ -146,13 +153,15 @@ QList< Device* > getDevices( DeviceType which, qint64 minimumSize ) cDebug() << Logger::SubEntry << "Removing device with iso9660 filesystem (probably a CD) on it" << it; it = erase( devices, it ); } - else if ( (minimumSize >= 0) && !( (*it)->capacity() > minimumSize ) ) + else if ( ( minimumSize >= 0 ) && !( ( *it )->capacity() > minimumSize ) ) { cDebug() << Logger::SubEntry << "Removing too-small" << it; it = erase( devices, it ); } else + { ++it; + } #endif return devices; diff --git a/src/modules/partition/core/DeviceList.h b/src/modules/partition/core/DeviceList.h index 3754f58e6..6823d6951 100644 --- a/src/modules/partition/core/DeviceList.h +++ b/src/modules/partition/core/DeviceList.h @@ -28,7 +28,11 @@ class Device; namespace PartUtils { -enum class DeviceType { All, WritableOnly }; +enum class DeviceType +{ + All, + WritableOnly +}; /** * @brief Gets a list of storage devices. @@ -43,6 +47,6 @@ enum class DeviceType { All, WritableOnly }; */ QList< Device* > getDevices( DeviceType which = DeviceType::All, qint64 minimumSize = -1 ); -} +} // namespace PartUtils -#endif // DEVICELIST_H +#endif // DEVICELIST_H diff --git a/src/modules/partition/core/DeviceModel.cpp b/src/modules/partition/core/DeviceModel.cpp index c76c39090..f881d265b 100644 --- a/src/modules/partition/core/DeviceModel.cpp +++ b/src/modules/partition/core/DeviceModel.cpp @@ -30,8 +30,8 @@ // KF5 #include -#include #include +#include // STL #include @@ -39,8 +39,7 @@ static void sortDevices( DeviceModel::DeviceList& l ) { - std::sort( l.begin(), l.end(), []( const Device* dev1, const Device* dev2 ) - { + std::sort( l.begin(), l.end(), []( const Device* dev1, const Device* dev2 ) { return dev1->deviceNode() < dev2->deviceNode(); } ); } @@ -50,9 +49,7 @@ DeviceModel::DeviceModel( QObject* parent ) { } -DeviceModel::~DeviceModel() -{ -} +DeviceModel::~DeviceModel() {} void DeviceModel::init( const DeviceList& devices ) @@ -74,7 +71,9 @@ DeviceModel::data( const QModelIndex& index, int role ) const { int row = index.row(); if ( row < 0 || row >= m_devices.count() ) + { return QVariant(); + } Device* device = m_devices.at( row ); @@ -83,16 +82,18 @@ DeviceModel::data( const QModelIndex& index, int role ) const case Qt::DisplayRole: case Qt::ToolTipRole: if ( device->name().isEmpty() ) + { return device->deviceNode(); + } else { if ( device->logicalSize() >= 0 && device->totalLogical() >= 0 ) { //: device[name] - size[number] (device-node[name]) return tr( "%1 - %2 (%3)" ) - .arg( device->name() ) - .arg( KFormat().formatByteSize( device->capacity() ) ) - .arg( device->deviceNode() ); + .arg( device->name() ) + .arg( KFormat().formatByteSize( device->capacity() ) ) + .arg( device->deviceNode() ); } else { @@ -100,16 +101,14 @@ DeviceModel::data( const QModelIndex& index, int role ) const // always has 1B capacity), so don't show it for a while. // //: device[name] - (device-node[name]) - return tr( "%1 - (%2)" ) - .arg( device->name() ) - .arg( device->deviceNode() ); + return tr( "%1 - (%2)" ).arg( device->name() ).arg( device->deviceNode() ); } - } + } case Qt::DecorationRole: - return CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionDisk, - CalamaresUtils::Original, - QSize( CalamaresUtils::defaultIconSize().width() * 3, - CalamaresUtils::defaultIconSize().height() * 3 ) ); + return CalamaresUtils::defaultPixmap( + CalamaresUtils::PartitionDisk, + CalamaresUtils::Original, + QSize( CalamaresUtils::defaultIconSize().width() * 3, CalamaresUtils::defaultIconSize().height() * 3 ) ); default: return QVariant(); } @@ -121,7 +120,9 @@ DeviceModel::deviceForIndex( const QModelIndex& index ) const { int row = index.row(); if ( row < 0 || row >= m_devices.count() ) + { return nullptr; + } return m_devices.at( row ); } @@ -134,7 +135,9 @@ DeviceModel::swapDevice( Device* oldDevice, Device* newDevice ) int indexOfOldDevice = m_devices.indexOf( oldDevice ); if ( indexOfOldDevice < 0 ) + { return; + } m_devices[ indexOfOldDevice ] = newDevice; @@ -142,7 +145,7 @@ DeviceModel::swapDevice( Device* oldDevice, Device* newDevice ) } void -DeviceModel::addDevice( Device *device ) +DeviceModel::addDevice( Device* device ) { beginResetModel(); m_devices << device; @@ -151,7 +154,7 @@ DeviceModel::addDevice( Device *device ) } void -DeviceModel::removeDevice( Device *device ) +DeviceModel::removeDevice( Device* device ) { beginResetModel(); m_devices.removeAll( device ); diff --git a/src/modules/partition/core/DeviceModel.h b/src/modules/partition/core/DeviceModel.h index f3e158bbf..29d1598ad 100644 --- a/src/modules/partition/core/DeviceModel.h +++ b/src/modules/partition/core/DeviceModel.h @@ -20,8 +20,8 @@ #define DEVICEMODEL_H #include -#include #include +#include class Device; class PartitionModel; diff --git a/src/modules/partition/core/KPMHelpers.cpp b/src/modules/partition/core/KPMHelpers.cpp index 0265a17e5..730d1d9af 100644 --- a/src/modules/partition/core/KPMHelpers.cpp +++ b/src/modules/partition/core/KPMHelpers.cpp @@ -21,94 +21,35 @@ #include "core/KPMHelpers.h" #include "core/PartitionInfo.h" -#include "core/PartitionIterator.h" + +#include "partition/PartitionIterator.h" +#include "utils/Logger.h" // KPMcore +#include #include #include #include -#include #include -#include "utils/Logger.h" - -#include - +using CalamaresUtils::Partition::PartitionIterator; namespace KPMHelpers { -static bool s_KPMcoreInited = false; - -bool -initKPMcore() -{ - if ( s_KPMcoreInited ) - return true; - - QByteArray backendName = qgetenv( "KPMCORE_BACKEND" ); - if ( !CoreBackendManager::self()->load( backendName.isEmpty() ? CoreBackendManager::defaultBackendName() : backendName ) ) - { - cWarning() << "Failed to load backend plugin" << backendName; - return false; - } - s_KPMcoreInited = true; - return true; -} - - -bool -isPartitionFreeSpace( Partition* partition ) -{ - return partition->roles().has( PartitionRole::Unallocated ); -} - - -bool -isPartitionNew( Partition* partition ) -{ - return partition->state() == KPM_PARTITION_STATE(New); -} - - Partition* findPartitionByMountPoint( const QList< Device* >& devices, const QString& mountPoint ) { for ( auto device : devices ) for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it ) if ( PartitionInfo::mountPoint( *it ) == mountPoint ) + { return *it; + } return nullptr; } -Partition* -findPartitionByPath( const QList< Device* >& devices, const QString& path ) -{ - if ( path.simplified().isEmpty() ) - return nullptr; - - for ( auto device : devices ) - for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it ) - if ( ( *it )->partitionPath() == path.simplified() ) - return *it; - return nullptr; -} - - -QList< Partition* > -findPartitions( const QList< Device* >& devices, - std::function< bool ( Partition* ) > criterionFunction ) -{ - QList< Partition* > results; - for ( auto device : devices ) - for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it ) - if ( criterionFunction( *it ) ) - results.append( *it ); - return results; -} - - Partition* createNewPartition( PartitionNode* parent, const Device& device, @@ -118,21 +59,19 @@ createNewPartition( PartitionNode* parent, qint64 lastSector, PartitionTable::Flags flags ) { - FileSystem* fs = FileSystemFactory::create( fsType, firstSector, lastSector - ,device.logicalSize() - ); - return new Partition( - parent, - device, - role, - fs, fs->firstSector(), fs->lastSector(), - QString() /* path */, - KPM_PARTITION_FLAG(None) /* availableFlags */, - QString() /* mountPoint */, - false /* mounted */, - flags /* activeFlags */, - KPM_PARTITION_STATE(New) - ); + FileSystem* fs = FileSystemFactory::create( fsType, firstSector, lastSector, device.logicalSize() ); + return new Partition( parent, + device, + role, + fs, + fs->firstSector(), + fs->lastSector(), + QString() /* path */, + KPM_PARTITION_FLAG( None ) /* availableFlags */, + QString() /* mountPoint */, + false /* mounted */, + flags /* activeFlags */, + KPM_PARTITION_STATE( New ) ); } @@ -148,14 +87,12 @@ createNewEncryptedPartition( PartitionNode* parent, { PartitionRole::Roles newRoles = role.roles(); if ( !role.has( PartitionRole::Luks ) ) + { newRoles |= PartitionRole::Luks; + } FS::luks* fs = dynamic_cast< FS::luks* >( - FileSystemFactory::create( FileSystem::Luks, - firstSector, - lastSector - ,device.logicalSize() - ) ); + FileSystemFactory::create( FileSystem::Luks, firstSector, lastSector, device.logicalSize() ) ); if ( !fs ) { cError() << "cannot create LUKS filesystem. Giving up."; @@ -167,13 +104,15 @@ createNewEncryptedPartition( PartitionNode* parent, Partition* p = new Partition( parent, device, PartitionRole( newRoles ), - fs, fs->firstSector(), fs->lastSector(), + fs, + fs->firstSector(), + fs->lastSector(), QString() /* path */, - KPM_PARTITION_FLAG(None) /* availableFlags */, + KPM_PARTITION_FLAG( None ) /* availableFlags */, QString() /* mountPoint */, false /* mounted */, flags /* activeFlags */, - KPM_PARTITION_STATE(New) ); + KPM_PARTITION_STATE( New ) ); return p; } @@ -182,11 +121,7 @@ Partition* clonePartition( Device* device, Partition* partition ) { FileSystem* fs = FileSystemFactory::create( - partition->fileSystem().type(), - partition->firstSector(), - partition->lastSector() - ,device->logicalSize() - ); + partition->fileSystem().type(), partition->firstSector(), partition->lastSector(), device->logicalSize() ); return new Partition( partition->parent(), *device, partition->roles(), @@ -197,48 +132,4 @@ clonePartition( Device* device, Partition* partition ) partition->activeFlags() ); } - -QString -prettyNameForFileSystemType( FileSystem::Type t ) -{ - switch ( t ) - { - case FileSystem::Unknown: - return QObject::tr( "unknown" ); - case FileSystem::Extended: - return QObject::tr( "extended" ); - case FileSystem::Unformatted: - return QObject::tr( "unformatted" ); - case FileSystem::LinuxSwap: - return QObject::tr( "swap" ); - case FileSystem::Fat16: - case FileSystem::Fat32: - case FileSystem::Ntfs: - case FileSystem::Xfs: - case FileSystem::Jfs: - case FileSystem::Hfs: - case FileSystem::Ufs: - case FileSystem::Hpfs: - case FileSystem::Luks: - case FileSystem::Ocfs2: - case FileSystem::Zfs: - case FileSystem::Nilfs2: - return FileSystem::nameForType( t ).toUpper(); - case FileSystem::ReiserFS: - return "ReiserFS"; - case FileSystem::Reiser4: - return "Reiser4"; - case FileSystem::HfsPlus: - return "HFS+"; - case FileSystem::Btrfs: - return "Btrfs"; - case FileSystem::Exfat: - return "exFAT"; - case FileSystem::Lvm2_PV: - return "LVM PV"; - default: - return FileSystem::nameForType( t ); - } -} - -} // namespace +} // namespace KPMHelpers diff --git a/src/modules/partition/core/KPMHelpers.h b/src/modules/partition/core/KPMHelpers.h index bb510cafb..326993362 100644 --- a/src/modules/partition/core/KPMHelpers.h +++ b/src/modules/partition/core/KPMHelpers.h @@ -34,13 +34,13 @@ class Partition; class PartitionNode; class PartitionRole; -#ifdef WITH_KPMCORE331API -#define KPM_PARTITION_FLAG(x) PartitionTable::Flag::x -#define KPM_PARTITION_STATE(x) Partition::State::x +#if defined( WITH_KPMCORE4API ) +#define KPM_PARTITION_FLAG( x ) PartitionTable::Flag::x +#define KPM_PARTITION_STATE( x ) Partition::State::x #define KPM_PARTITION_FLAG_ESP PartitionTable::Flag::Boot #else -#define KPM_PARTITION_FLAG(x) PartitionTable::Flag##x -#define KPM_PARTITION_STATE(x) Partition::State##x +#define KPM_PARTITION_FLAG( x ) PartitionTable::Flag##x +#define KPM_PARTITION_STATE( x ) Partition::State##x #define KPM_PARTITION_FLAG_ESP PartitionTable::FlagEsp #endif @@ -50,46 +50,12 @@ class PartitionRole; namespace KPMHelpers { -/** - * Thin wrapper on top of CoreBackendManager. Hides things like initializing the - * Config instance or instantiating the backend. - * - * Initialize PartitionManager Config object and load a PartitionManager - * backend. It loads the "libparted" plugin by default, but this can be - * overloaded by settings the environment variable KPMCORE_BACKEND. Setting it to - * "dummy" will load the dummy plugin instead. - * - * @return true if initialization was successful. - */ -bool initKPMcore(); - -bool isPartitionFreeSpace( Partition* ); - -/** - * Returns true if the partition is planned to be created by the installer as - * opposed to already existing on the disk. - */ -bool isPartitionNew( Partition* ); - /** * Iterates on all devices and return the first partition which is associated * with mountPoint. This uses PartitionInfo::mountPoint(), not Partition::mountPoint() */ Partition* findPartitionByMountPoint( const QList< Device* >& devices, const QString& mountPoint ); -/** - * Iterates on all devices and partitions and returns a pointer to the Partition object - * for the given path, or nullptr if a Partition for the given path cannot be found. - */ -Partition* findPartitionByPath( const QList< Device* >& devices, const QString& path ); - -/** - * Iterates on all devices and partitions and returns a list of pointers to the Partition - * objects that satisfy the conditions defined in the criterion function. - */ -QList< Partition* > findPartitions( const QList< Device* >& devices, - std::function< bool ( Partition* ) > criterionFunction ); - /** * Helper function to create a new Partition object (does not create anything * on the disk) associated with a FileSystem. @@ -113,32 +79,6 @@ Partition* createNewEncryptedPartition( PartitionNode* parent, Partition* clonePartition( Device* device, Partition* partition ); -QString prettyNameForFileSystemType( FileSystem::Type t ); - -static inline QString -untranslatedFS( FileSystem& fs ) -{ - return fs.name( { QStringLiteral( "C" ) } ); -} - -static inline QString -untranslatedFS( FileSystem* fs ) -{ - return fs ? untranslatedFS( *fs ) : QString(); -} - -static inline QString -userVisibleFS( FileSystem& fs ) -{ - return fs.name(); -} - -static inline QString -userVisibleFS( FileSystem* fs ) -{ - return fs ? userVisibleFS( *fs ) : QString(); -} - -} +} // namespace KPMHelpers #endif /* KPMHELPERS_H */ diff --git a/src/modules/partition/core/OsproberEntry.h b/src/modules/partition/core/OsproberEntry.h index e8c7895f0..1e1fd0eca 100644 --- a/src/modules/partition/core/OsproberEntry.h +++ b/src/modules/partition/core/OsproberEntry.h @@ -32,7 +32,7 @@ struct FstabEntry int pass; /// Does this entry make sense and is it complete? - bool isValid() const; // implemented in Partutils.cpp + bool isValid() const; // implemented in Partutils.cpp /** @brief Create an entry from a live of /etc/fstab * @@ -41,7 +41,7 @@ struct FstabEntry * If the string isn't valid (e.g. comment-line, or broken * fstab entry) then the entry that is returned is invalid. */ - static FstabEntry fromEtcFstab( const QString& ); // implemented in Partutils.cpp + static FstabEntry fromEtcFstab( const QString& ); // implemented in Partutils.cpp }; typedef QList< FstabEntry > FstabEntryList; @@ -59,4 +59,4 @@ struct OsproberEntry typedef QList< OsproberEntry > OsproberEntryList; -#endif // OSPROBERENTRY_H +#endif // OSPROBERENTRY_H diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp index 94630b472..4cc59d518 100644 --- a/src/modules/partition/core/PartUtils.cpp +++ b/src/modules/partition/core/PartUtils.cpp @@ -25,21 +25,26 @@ #include "core/DeviceModel.h" #include "core/KPMHelpers.h" #include "core/PartitionInfo.h" -#include "core/PartitionIterator.h" + +#include "GlobalStorage.h" +#include "JobQueue.h" +#include "partition/Mount.h" +#include "partition/PartitionIterator.h" +#include "partition/PartitionQuery.h" +#include "utils/CalamaresUtilsSystem.h" +#include "utils/Logger.h" #include #include #include #include -#include -#include -#include -#include - #include #include +using CalamaresUtils::Partition::isPartitionFreeSpace; +using CalamaresUtils::Partition::isPartitionNew; + namespace PartUtils { @@ -47,17 +52,25 @@ QString convenienceName( const Partition* const candidate ) { if ( !candidate->mountPoint().isEmpty() ) + { return candidate->mountPoint(); + } if ( !candidate->partitionPath().isEmpty() ) + { return candidate->partitionPath(); + } if ( !candidate->devicePath().isEmpty() ) + { return candidate->devicePath(); + } if ( !candidate->deviceNode().isEmpty() ) + { return candidate->devicePath(); + } QString p; QTextStream s( &p ); - s << (void *)candidate; + s << (void*)candidate; return p; } @@ -106,9 +119,9 @@ canBeReplaced( Partition* candidate ) Logger::CDebug deb; deb << Logger::SubEntry << "NO, insufficient storage"; deb << Logger::Continuation << "Required storage B:" << requiredStorageB - << QString( "(%1GiB)" ).arg( requiredStorageGiB ); + << QString( "(%1GiB)" ).arg( requiredStorageGiB ); deb << Logger::Continuation << "Available storage B:" << availableStorageB - << QString( "(%1GiB)" ).arg( CalamaresUtils::BytesToGiB( availableStorageB ) ); + << QString( "(%1GiB)" ).arg( CalamaresUtils::BytesToGiB( availableStorageB ) ); return false; } } @@ -124,15 +137,14 @@ canBeResized( Partition* candidate ) } cDebug() << "Checking if" << convenienceName( candidate ) << "can be resized."; - if ( !candidate->fileSystem().supportGrow() || - !candidate->fileSystem().supportShrink() ) + if ( !candidate->fileSystem().supportGrow() || !candidate->fileSystem().supportShrink() ) { cDebug() << Logger::SubEntry << "NO, filesystem" << candidate->fileSystem().name() - << "does not support resize."; + << "does not support resize."; return false; } - if ( KPMHelpers::isPartitionFreeSpace( candidate ) ) + if ( isPartitionFreeSpace( candidate ) ) { cDebug() << Logger::SubEntry << "NO, partition is free space"; return false; @@ -155,8 +167,8 @@ canBeResized( Partition* candidate ) if ( table->numPrimaries() >= table->maxPrimaries() ) { - cDebug() << Logger::SubEntry << "NO, partition table already has" - << table->maxPrimaries() << "primary partitions."; + cDebug() << Logger::SubEntry << "NO, partition table already has" << table->maxPrimaries() + << "primary partitions."; return false; } } @@ -184,11 +196,11 @@ canBeResized( Partition* candidate ) Logger::CDebug deb; deb << Logger::SubEntry << "NO, insufficient storage"; deb << Logger::Continuation << "Required storage B:" << advisedStorageB - << QString( "(%1GiB)" ).arg( advisedStorageGiB ); + << QString( "(%1GiB)" ).arg( advisedStorageGiB ); deb << Logger::Continuation << "Available storage B:" << availableStorageB - << QString( "(%1GiB)" ).arg( CalamaresUtils::BytesToGiB( availableStorageB ) ) - << "for" << convenienceName( candidate ) << "length:" << candidate->length() - << "sectorsUsed:" << candidate->sectorsUsed() << "fsType:" << candidate->fileSystem().name(); + << QString( "(%1GiB)" ).arg( CalamaresUtils::BytesToGiB( availableStorageB ) ) << "for" + << convenienceName( candidate ) << "length:" << candidate->length() + << "sectorsUsed:" << candidate->sectorsUsed() << "fsType:" << candidate->fileSystem().name(); return false; } } @@ -205,7 +217,7 @@ canBeResized( PartitionCoreModule* core, const QString& partitionPath ) for ( int i = 0; i < dm->rowCount(); ++i ) { Device* dev = dm->deviceForIndex( dm->index( i ) ); - Partition* candidate = KPMHelpers::findPartitionByPath( { dev }, partitionWithOs ); + Partition* candidate = CalamaresUtils::Partition::findPartitionByPath( { dev }, partitionWithOs ); if ( candidate ) { return canBeResized( candidate ); @@ -222,66 +234,69 @@ canBeResized( PartitionCoreModule* core, const QString& partitionPath ) static FstabEntryList lookForFstabEntries( const QString& partitionPath ) { - QStringList mountOptions{ "ro" }; + QStringList mountOptions { "ro" }; - auto r = CalamaresUtils::System::runCommand( - CalamaresUtils::System::RunLocation::RunInHost, - { "blkid", "-s", "TYPE", "-o", "value", partitionPath } - ); + auto r = CalamaresUtils::System::runCommand( CalamaresUtils::System::RunLocation::RunInHost, + { "blkid", "-s", "TYPE", "-o", "value", partitionPath } ); if ( r.getExitCode() ) + { cWarning() << "blkid on" << partitionPath << "failed."; + } else { QString fstype = r.getOutput().trimmed(); if ( ( fstype == "ext3" ) || ( fstype == "ext4" ) ) + { mountOptions.append( "noload" ); + } } - cDebug() << "Checking device" << partitionPath - << "for fstab (fs=" << r.getOutput() << ')'; + cDebug() << "Checking device" << partitionPath << "for fstab (fs=" << r.getOutput() << ')'; FstabEntryList fstabEntries; - QTemporaryDir mountsDir; - mountsDir.setAutoRemove( false ); - int exit = QProcess::execute( "mount", { "-o", mountOptions.join(','), partitionPath, mountsDir.path() } ); - if ( !exit ) // if all is well + CalamaresUtils::Partition::TemporaryMount mount( partitionPath, QString(), mountOptions.join( ',' ) ); + if ( mount.isValid() ) { - QFile fstabFile( mountsDir.path() + "/etc/fstab" ); + QFile fstabFile( mount.path() + "/etc/fstab" ); cDebug() << Logger::SubEntry << "reading" << fstabFile.fileName(); if ( fstabFile.open( QIODevice::ReadOnly | QIODevice::Text ) ) { - const QStringList fstabLines = QString::fromLocal8Bit( fstabFile.readAll() ) - .split( '\n' ); + const QStringList fstabLines = QString::fromLocal8Bit( fstabFile.readAll() ).split( '\n' ); for ( const QString& rawLine : fstabLines ) + { fstabEntries.append( FstabEntry::fromEtcFstab( rawLine ) ); + } fstabFile.close(); cDebug() << Logger::SubEntry << "got" << fstabEntries.count() << "lines."; - std::remove_if( fstabEntries.begin(), fstabEntries.end(), [](const FstabEntry& x) { return !x.isValid(); } ); + std::remove_if( + fstabEntries.begin(), fstabEntries.end(), []( const FstabEntry& x ) { return !x.isValid(); } ); cDebug() << Logger::SubEntry << "got" << fstabEntries.count() << "fstab entries."; } else + { cWarning() << "Could not read fstab from mounted fs"; - - if ( QProcess::execute( "umount", { "-R", mountsDir.path() } ) ) - cWarning() << "Could not unmount" << mountsDir.path(); + } } else + { cWarning() << "Could not mount existing fs"; + } return fstabEntries; } static QString -findPartitionPathForMountPoint( const FstabEntryList& fstab, - const QString& mountPoint ) +findPartitionPathForMountPoint( const FstabEntryList& fstab, const QString& mountPoint ) { if ( fstab.isEmpty() ) + { return QString(); + } for ( const FstabEntry& entry : fstab ) { @@ -290,7 +305,7 @@ findPartitionPathForMountPoint( const FstabEntryList& fstab, QProcess readlink; QString partPath; - if ( entry.partitionNode.startsWith( "/dev" ) ) // plain dev node + if ( entry.partitionNode.startsWith( "/dev" ) ) // plain dev node { partPath = entry.partitionNode; } @@ -325,17 +340,22 @@ findPartitionPathForMountPoint( const FstabEntryList& fstab, // At this point we either have /dev/sda1, or /dev/disk/by-something/... - if ( partPath.startsWith( "/dev/disk/by-" ) ) // we got a fancy node + if ( partPath.startsWith( "/dev/disk/by-" ) ) // we got a fancy node { - readlink.start( "readlink", { "-en", partPath }); + readlink.start( "readlink", { "-en", partPath } ); if ( !readlink.waitForStarted( 1000 ) ) + { return QString(); + } if ( !readlink.waitForFinished( 1000 ) ) + { return QString(); + } if ( readlink.exitCode() != 0 || readlink.exitStatus() != QProcess::NormalExit ) + { return QString(); - partPath = QString::fromLocal8Bit( - readlink.readAllStandardOutput() ).trimmed(); + } + partPath = QString::fromLocal8Bit( readlink.readAllStandardOutput() ).trimmed(); } return partPath; @@ -364,9 +384,7 @@ runOsprober( PartitionCoreModule* core ) } else { - osproberOutput.append( - QString::fromLocal8Bit( - osprober.readAllStandardOutput() ).trimmed() ); + osproberOutput.append( QString::fromLocal8Bit( osprober.readAllStandardOutput() ).trimmed() ); } QStringList osproberCleanLines; @@ -379,32 +397,37 @@ runOsprober( PartitionCoreModule* core ) QStringList lineColumns = line.split( ':' ); QString prettyName; if ( !lineColumns.value( 1 ).simplified().isEmpty() ) + { prettyName = lineColumns.value( 1 ).simplified(); + } else if ( !lineColumns.value( 2 ).simplified().isEmpty() ) + { prettyName = lineColumns.value( 2 ).simplified(); + } QString path = lineColumns.value( 0 ).simplified(); - if ( !path.startsWith( "/dev/" ) ) //basic sanity check + if ( !path.startsWith( "/dev/" ) ) //basic sanity check + { continue; + } FstabEntryList fstabEntries = lookForFstabEntries( path ); QString homePath = findPartitionPathForMountPoint( fstabEntries, "/home" ); - osproberEntries.append( { prettyName, - path, - QString(), - canBeResized( core, path ), - lineColumns, - fstabEntries, - homePath } ); + osproberEntries.append( + { prettyName, path, QString(), canBeResized( core, path ), lineColumns, fstabEntries, homePath } ); osproberCleanLines.append( line ); } } if ( osproberCleanLines.count() > 0 ) + { cDebug() << "os-prober lines after cleanup:" << Logger::DebugList( osproberCleanLines ); + } else + { cDebug() << "os-prober gave no output."; + } Calamares::JobQueue::instance()->globalStorage()->insert( "osproberLines", osproberCleanLines ); @@ -427,24 +450,28 @@ isEfiBootable( const Partition* candidate ) /* If bit 17 is set, old-style Esp flag, it's OK */ if ( flags.testFlag( KPM_PARTITION_FLAG_ESP ) ) + { return true; + } /* Otherwise, if it's a GPT table, Boot (bit 0) is the same as Esp */ const PartitionNode* root = candidate; while ( root && !root->isRoot() ) { root = root->parent(); - cDebug() << Logger::SubEntry << "moved towards root" << (void *)root; + cDebug() << Logger::SubEntry << "moved towards root" << (void*)root; } // Strange case: no root found, no partition table node? if ( !root ) + { return false; + } - const PartitionTable* table = dynamic_cast( root ); - cDebug() << Logger::SubEntry << "partition table" << (void *)table << "type" << ( table ? table->type() : PartitionTable::TableType::unknownTableType ); - return table && ( table->type() == PartitionTable::TableType::gpt ) && - flags.testFlag( KPM_PARTITION_FLAG(Boot) ); + const PartitionTable* table = dynamic_cast< const PartitionTable* >( root ); + cDebug() << Logger::SubEntry << "partition table" << (void*)table << "type" + << ( table ? table->type() : PartitionTable::TableType::unknownTableType ); + return table && ( table->type() == PartitionTable::TableType::gpt ) && flags.testFlag( KPM_PARTITION_FLAG( Boot ) ); } QString @@ -452,14 +479,18 @@ findFS( QString fsName, FileSystem::Type* fsType ) { QStringList fsLanguage { QLatin1String( "C" ) }; // Required language list to turn off localization if ( fsName.isEmpty() ) + { fsName = QStringLiteral( "ext4" ); + } FileSystem::Type tmpType = FileSystem::typeForName( fsName, fsLanguage ); if ( tmpType != FileSystem::Unknown ) { cDebug() << "Found filesystem" << fsName; if ( fsType ) + { *fsType = tmpType; + } return fsName; } @@ -472,7 +503,9 @@ findFS( QString fsName, FileSystem::Type* fsType ) QString fsRealName = FileSystem::nameForType( t, fsLanguage ); cDebug() << "Filesystem name" << fsName << "translated to" << fsRealName; if ( fsType ) + { *fsType = t; + } return fsRealName; } } @@ -480,8 +513,10 @@ findFS( QString fsName, FileSystem::Type* fsType ) cDebug() << "Filesystem" << fsName << "not found, using ext4"; fsName = QStringLiteral( "ext4" ); // fsType can be used to check whether fsName was a valid filesystem. - if (fsType) + if ( fsType ) + { *fsType = FileSystem::Unknown; + } #ifdef DEBUG_FILESYSTEMS // This bit is for distro's debugging their settings, and shows // all the strings that KPMCore is matching against for FS type. @@ -491,13 +526,15 @@ findFS( QString fsName, FileSystem::Type* fsType ) const auto fstypes = FileSystem::types(); d << "Available types (" << fstypes.count() << ')'; for ( FileSystem::Type t : fstypes ) - d << TR( static_cast( t ), FileSystem::nameForType( t, fsLanguage ) ); + { + d << TR( static_cast< int >( t ), FileSystem::nameForType( t, fsLanguage ) ); + } } #endif return fsName; } -} // nmamespace PartUtils +} // namespace PartUtils /* Implementation of methods for FstabEntry, from OsproberEntry.h */ @@ -512,17 +549,18 @@ FstabEntry::fromEtcFstab( const QString& rawLine ) { QString line = rawLine.simplified(); if ( line.startsWith( '#' ) ) - return FstabEntry{ QString(), QString(), QString(), QString(), 0, 0 }; + return FstabEntry { QString(), QString(), QString(), QString(), 0, 0 }; QStringList splitLine = line.split( ' ' ); if ( splitLine.length() != 6 ) - return FstabEntry{ QString(), QString(), QString(), QString(), 0, 0 }; + return FstabEntry { QString(), QString(), QString(), QString(), 0, 0 }; - return FstabEntry{ splitLine.at( 0 ), // path, or UUID, or LABEL, etc. - splitLine.at( 1 ), // mount point - splitLine.at( 2 ), // fs type - splitLine.at( 3 ), // options - splitLine.at( 4 ).toInt(), //dump - splitLine.at( 5 ).toInt() //pass - }; - } + return FstabEntry { + splitLine.at( 0 ), // path, or UUID, or LABEL, etc. + splitLine.at( 1 ), // mount point + splitLine.at( 2 ), // fs type + splitLine.at( 3 ), // options + splitLine.at( 4 ).toInt(), //dump + splitLine.at( 5 ).toInt() //pass + }; +} diff --git a/src/modules/partition/core/PartUtils.h b/src/modules/partition/core/PartUtils.h index 1b4ee0b71..0db49d043 100644 --- a/src/modules/partition/core/PartUtils.h +++ b/src/modules/partition/core/PartUtils.h @@ -22,8 +22,8 @@ #define PARTUTILS_H #include "OsproberEntry.h" -#include "utils/Units.h" #include "utils/NamedSuffix.h" +#include "utils/Units.h" // KPMcore #include @@ -99,6 +99,6 @@ bool isEfiBootable( const Partition* candidate ); */ QString findFS( QString fsName, FileSystem::Type* fsType ); -} +} // namespace PartUtils -#endif // PARTUTILS_H +#endif // PARTUTILS_H diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp index f0d5acdd9..5e785c9d1 100644 --- a/src/modules/partition/core/PartitionActions.cpp +++ b/src/modules/partition/core/PartitionActions.cpp @@ -21,13 +21,13 @@ #include "PartitionActions.h" #include "core/KPMHelpers.h" -#include "core/PartitionInfo.h" -#include "core/PartitionCoreModule.h" #include "core/PartUtils.h" +#include "core/PartitionCoreModule.h" +#include "core/PartitionInfo.h" #include "utils/CalamaresUtilsSystem.h" -#include "utils/Units.h" #include "utils/NamedEnum.h" +#include "utils/Units.h" #include "GlobalStorage.h" #include "JobQueue.h" @@ -47,7 +47,9 @@ qint64 swapSuggestion( const qint64 availableSpaceB, Choices::SwapChoice swap ) { if ( ( swap != Choices::SmallSwap ) && ( swap != Choices::FullSwap ) ) + { return 0; + } // See partition.conf for explanation qint64 suggestedSwapSizeB = 0; @@ -59,15 +61,23 @@ swapSuggestion( const qint64 availableSpaceB, Choices::SwapChoice swap ) // Ramp up quickly to 8GiB, then follow memory size if ( availableRamB <= 4_GiB ) + { suggestedSwapSizeB = availableRamB * 2; + } else if ( availableRamB <= 8_GiB ) + { suggestedSwapSizeB = 8_GiB; + } else + { suggestedSwapSizeB = availableRamB; + } // .. top out at 8GiB if we don't care about suspend if ( !ensureSuspendToDisk ) + { suggestedSwapSizeB = qMin( 8_GiB, suggestedSwapSizeB ); + } // Allow for a fudge factor @@ -75,7 +85,9 @@ swapSuggestion( const qint64 availableSpaceB, Choices::SwapChoice swap ) // don't use more than 10% of available space if ( !ensureSuspendToDisk ) + { suggestedSwapSizeB = qMin( suggestedSwapSizeB, qint64( 0.10 * availableSpaceB ) ); + } cDebug() << "Suggested swap size:" << suggestedSwapSizeB / 1024. / 1024. / 1024. << "GiB"; @@ -88,7 +100,9 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); QString defaultFsType = o.defaultFsType; if ( FileSystem::typeForName( defaultFsType ) == FileSystem::Unknown ) + { defaultFsType = "ext4"; + } bool isEfi = PartUtils::isEfiSystem(); @@ -103,8 +117,8 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO { if ( gs->contains( "efiSystemPartitionSize" ) ) { - CalamaresUtils::Partition::PartitionSize part_size = CalamaresUtils::Partition::PartitionSize( - gs->value( "efiSystemPartitionSize" ).toString() ); + CalamaresUtils::Partition::PartitionSize part_size + = CalamaresUtils::Partition::PartitionSize( gs->value( "efiSystemPartitionSize" ).toString() ); uefisys_part_sizeB = part_size.toBytes( dev->capacity() ); } else @@ -128,15 +142,13 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO // firstFreeSector..firstFreeSector+efiSectorCount-1. qint64 lastSector = firstFreeSector + efiSectorCount - 1; core->createPartitionTable( dev, PartitionTable::gpt ); - Partition* efiPartition = KPMHelpers::createNewPartition( - dev->partitionTable(), - *dev, - PartitionRole( PartitionRole::Primary ), - FileSystem::Fat32, - firstFreeSector, - lastSector, - KPM_PARTITION_FLAG(None) - ); + Partition* efiPartition = KPMHelpers::createNewPartition( dev->partitionTable(), + *dev, + PartitionRole( PartitionRole::Primary ), + FileSystem::Fat32, + firstFreeSector, + lastSector, + KPM_PARTITION_FLAG( None ) ); PartitionInfo::setFormat( efiPartition, true ); PartitionInfo::setMountPoint( efiPartition, o.efiPartitionMountPoint ); core->createPartition( dev, efiPartition, KPM_PARTITION_FLAG_ESP ); @@ -164,7 +176,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO shouldCreateSwap = availableSpaceB > requiredSpaceB; } - qint64 lastSectorForRoot = dev->totalLogical() - 1; //last sector of the device + qint64 lastSectorForRoot = dev->totalLogical() - 1; //last sector of the device if ( shouldCreateSwap ) { lastSectorForRoot -= suggestedSwapSizeB / dev->logicalSize() + 1; @@ -177,28 +189,24 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO Partition* swapPartition = nullptr; if ( o.luksPassphrase.isEmpty() ) { - swapPartition = KPMHelpers::createNewPartition( - dev->partitionTable(), - *dev, - PartitionRole( PartitionRole::Primary ), - FileSystem::LinuxSwap, - lastSectorForRoot + 1, - dev->totalLogical() - 1, - KPM_PARTITION_FLAG(None) - ); + swapPartition = KPMHelpers::createNewPartition( dev->partitionTable(), + *dev, + PartitionRole( PartitionRole::Primary ), + FileSystem::LinuxSwap, + lastSectorForRoot + 1, + dev->totalLogical() - 1, + KPM_PARTITION_FLAG( None ) ); } else { - swapPartition = KPMHelpers::createNewEncryptedPartition( - dev->partitionTable(), - *dev, - PartitionRole( PartitionRole::Primary ), - FileSystem::LinuxSwap, - lastSectorForRoot + 1, - dev->totalLogical() - 1, - o.luksPassphrase, - KPM_PARTITION_FLAG(None) - ); + swapPartition = KPMHelpers::createNewEncryptedPartition( dev->partitionTable(), + *dev, + PartitionRole( PartitionRole::Primary ), + FileSystem::LinuxSwap, + lastSectorForRoot + 1, + dev->totalLogical() - 1, + o.luksPassphrase, + KPM_PARTITION_FLAG( None ) ); } PartitionInfo::setFormat( swapPartition, true ); core->createPartition( dev, swapPartition ); @@ -209,10 +217,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO void -doReplacePartition( PartitionCoreModule* core, - Device* dev, - Partition* partition, - Choices::ReplacePartitionOptions o ) +doReplacePartition( PartitionCoreModule* core, Device* dev, Partition* partition, Choices::ReplacePartitionOptions o ) { qint64 firstSector, lastSector; @@ -220,11 +225,15 @@ doReplacePartition( PartitionCoreModule* core, QString defaultFsType = o.defaultFsType; if ( FileSystem::typeForName( defaultFsType ) == FileSystem::Unknown ) + { defaultFsType = "ext4"; + } PartitionRole newRoles( partition->roles() ); if ( partition->roles().has( PartitionRole::Extended ) ) + { newRoles = PartitionRole( PartitionRole::Primary ); + } if ( partition->roles().has( PartitionRole::Unallocated ) ) { @@ -234,7 +243,9 @@ doReplacePartition( PartitionCoreModule* core, { Partition* parent = dynamic_cast< Partition* >( partition->parent() ); if ( parent && parent->roles().has( PartitionRole::Extended ) ) + { newRoles = PartitionRole( PartitionRole::Logical ); + } } } @@ -242,7 +253,9 @@ doReplacePartition( PartitionCoreModule* core, firstSector = partition->firstSector(); lastSector = partition->lastSector(); if ( !partition->roles().has( PartitionRole::Unallocated ) ) + { core->deletePartition( dev, partition ); + } core->layoutApply( dev, firstSector, lastSector, o.luksPassphrase ); @@ -251,16 +264,14 @@ doReplacePartition( PartitionCoreModule* core, namespace Choices { -static const NamedEnumTable& +static const NamedEnumTable< SwapChoice >& nameTable() { - static const NamedEnumTable names{ - { QStringLiteral( "none" ), SwapChoice::NoSwap }, - { QStringLiteral( "small" ), SwapChoice::SmallSwap }, - { QStringLiteral( "suspend" ), SwapChoice::FullSwap }, - { QStringLiteral( "reuse" ), SwapChoice::ReuseSwap }, - { QStringLiteral( "file" ), SwapChoice::SwapFile } - }; + static const NamedEnumTable< SwapChoice > names { { QStringLiteral( "none" ), SwapChoice::NoSwap }, + { QStringLiteral( "small" ), SwapChoice::SmallSwap }, + { QStringLiteral( "suspend" ), SwapChoice::FullSwap }, + { QStringLiteral( "reuse" ), SwapChoice::ReuseSwap }, + { QStringLiteral( "file" ), SwapChoice::SwapFile } }; return names; } diff --git a/src/modules/partition/core/PartitionActions.h b/src/modules/partition/core/PartitionActions.h index cc9716123..ed7045822 100644 --- a/src/modules/partition/core/PartitionActions.h +++ b/src/modules/partition/core/PartitionActions.h @@ -33,45 +33,49 @@ namespace PartitionActions */ namespace Choices { - /** @brief Ccchoice of swap (size and type) */ - enum SwapChoice +/** @brief Ccchoice of swap (size and type) */ +enum SwapChoice +{ + NoSwap, // don't create any swap, don't use any + ReuseSwap, // don't create, but do use existing + SmallSwap, // up to 8GiB of swap + FullSwap, // ensureSuspendToDisk -- at least RAM size + SwapFile // use a file (if supported) +}; + +SwapChoice nameToChoice( QString name, bool& ok ); +QString choiceToName( SwapChoice ); + +struct ReplacePartitionOptions +{ + QString defaultFsType; // e.g. "ext4" or "btrfs" + QString luksPassphrase; // optional + + ReplacePartitionOptions( const QString& fs, const QString& luks ) + : defaultFsType( fs ) + , luksPassphrase( luks ) { - NoSwap, // don't create any swap, don't use any - ReuseSwap, // don't create, but do use existing - SmallSwap, // up to 8GiB of swap - FullSwap, // ensureSuspendToDisk -- at least RAM size - SwapFile // use a file (if supported) - }; + } +}; - SwapChoice nameToChoice( QString name, bool& ok ); - QString choiceToName( SwapChoice ); +struct AutoPartitionOptions : ReplacePartitionOptions +{ + QString efiPartitionMountPoint; // optional, e.g. "/boot" + quint64 requiredSpaceB; // estimated required space for root partition + SwapChoice swap; - struct ReplacePartitionOptions + AutoPartitionOptions( const QString& fs, + const QString& luks, + const QString& efi, + qint64 requiredBytes, + SwapChoice s ) + : ReplacePartitionOptions( fs, luks ) + , efiPartitionMountPoint( efi ) + , requiredSpaceB( requiredBytes > 0 ? static_cast< quint64 >( requiredBytes ) : 0 ) + , swap( s ) { - QString defaultFsType; // e.g. "ext4" or "btrfs" - QString luksPassphrase; // optional - - ReplacePartitionOptions( const QString& fs, const QString& luks ) - : defaultFsType( fs ) - , luksPassphrase( luks ) - { - } - }; - - struct AutoPartitionOptions : ReplacePartitionOptions - { - QString efiPartitionMountPoint; // optional, e.g. "/boot" - quint64 requiredSpaceB; // estimated required space for root partition - SwapChoice swap; - - AutoPartitionOptions( const QString& fs, const QString& luks, const QString& efi, qint64 requiredBytes, SwapChoice s ) - : ReplacePartitionOptions( fs, luks ) - , efiPartitionMountPoint( efi ) - , requiredSpaceB( requiredBytes > 0 ? static_cast( requiredBytes ) : 0 ) - , swap( s ) - { - } - }; + } +}; } // namespace Choices @@ -81,9 +85,7 @@ namespace Choices * @param dev the device to wipe. * @param options settings for autopartitioning. */ -void doAutopartition( PartitionCoreModule* core, - Device* dev, - Choices::AutoPartitionOptions options ); +void doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionOptions options ); /** * @brief doReplacePartition sets up replace-partitioning with the given partition. @@ -100,4 +102,4 @@ void doReplacePartition( PartitionCoreModule* core, Choices::ReplacePartitionOptions options ); } // namespace PartitionActions -#endif // PARTITIONACTIONS_H +#endif // PARTITIONACTIONS_H diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp index 4b23c86e4..5d4d8f3cd 100644 --- a/src/modules/partition/core/PartitionCoreModule.cpp +++ b/src/modules/partition/core/PartitionCoreModule.cpp @@ -26,11 +26,10 @@ #include "core/ColorUtils.h" #include "core/DeviceList.h" #include "core/DeviceModel.h" -#include "core/PartitionInfo.h" -#include "core/PartitionIterator.h" -#include "core/PartitionModel.h" #include "core/KPMHelpers.h" #include "core/PartUtils.h" +#include "core/PartitionInfo.h" +#include "core/PartitionModel.h" #include "jobs/ClearMountsJob.h" #include "jobs/ClearTempMountsJob.h" #include "jobs/CreatePartitionJob.h" @@ -45,33 +44,37 @@ #include "jobs/ResizeVolumeGroupJob.h" #include "jobs/SetPartitionFlagsJob.h" -#include "utils/Variant.h" - #ifdef DEBUG_PARTITION_LAME #include "JobExample.h" #endif +#include "partition/PartitionIterator.h" +#include "partition/PartitionQuery.h" #include "utils/Logger.h" +#include "utils/Variant.h" // KPMcore +#include +#include #include #include #include #include -#include -#include #include #include #include // Qt -#include #include -#include #include +#include +#include #include +using CalamaresUtils::Partition::isPartitionFreeSpace; +using CalamaresUtils::Partition::isPartitionNew; +using CalamaresUtils::Partition::PartitionIterator; -PartitionCoreModule::RefreshHelper::RefreshHelper(PartitionCoreModule* module) +PartitionCoreModule::RefreshHelper::RefreshHelper( PartitionCoreModule* module ) : m_module( module ) { } @@ -99,7 +102,7 @@ private: // called in *reverse* order of declaration in this class. PartitionCoreModule::RefreshHelper m_coreHelper; PartitionModel::ResetHelper m_modelHelper; -} ; +}; //- DeviceInfo --------------------------------------------- @@ -108,19 +111,20 @@ PartitionCoreModule::DeviceInfo::DeviceInfo( Device* _device ) , partitionModel( new PartitionModel ) , immutableDevice( new Device( *_device ) ) , isAvailable( true ) -{} - -PartitionCoreModule::DeviceInfo::~DeviceInfo() { } +PartitionCoreModule::DeviceInfo::~DeviceInfo() {} + void PartitionCoreModule::DeviceInfo::forgetChanges() { jobs.clear(); for ( auto it = PartitionIterator::begin( device.data() ); it != PartitionIterator::end( device.data() ); ++it ) + { PartitionInfo::reset( *it ); + } partitionModel->revert(); } @@ -129,11 +133,15 @@ bool PartitionCoreModule::DeviceInfo::isDirty() const { if ( !jobs.isEmpty() ) + { return true; + } for ( auto it = PartitionIterator::begin( device.data() ); it != PartitionIterator::end( device.data() ); ++it ) if ( PartitionInfo::isDirty( *it ) ) + { return true; + } return false; } @@ -144,8 +152,10 @@ PartitionCoreModule::PartitionCoreModule( QObject* parent ) , m_deviceModel( new DeviceModel( this ) ) , m_bootLoaderModel( new BootLoaderModel( this ) ) { - if ( !KPMHelpers::initKPMcore() ) + if ( !m_kpmcore ) + { qFatal( "Failed to initialize KPMcore backend" ); + } } @@ -194,33 +204,39 @@ 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 ) + for ( auto jt = m_osproberLines.begin(); jt != m_osproberLines.end(); ++jt ) { - if ( jt->path == partition->partitionPath() && - partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone && - !partition->fileSystem().uuid().isEmpty() ) + if ( jt->path == partition->partitionPath() + && 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 ); + } DeviceList bootLoaderDevices; - for ( DeviceList::Iterator it = devices.begin(); it != devices.end(); ++it) - if ( (*it)->type() != Device::Type::Disk_Device ) + for ( DeviceList::Iterator it = devices.begin(); it != devices.end(); ++it ) + if ( ( *it )->type() != Device::Type::Disk_Device ) { cDebug() << "Ignoring device that is not Disk_Device to bootLoaderDevices list."; continue; } else - bootLoaderDevices.append(*it); + { + bootLoaderDevices.append( *it ); + } m_bootLoaderModel->init( bootLoaderDevices ); @@ -229,7 +245,9 @@ PartitionCoreModule::doInit() //FIXME: this should be removed in favor of // proper KPM support for EFI if ( PartUtils::isEfiSystem() ) + { scanForEfiSystemPartitions(); + } } PartitionCoreModule::~PartitionCoreModule() @@ -264,7 +282,9 @@ PartitionCoreModule::immutableDeviceCopy( const Device* device ) Q_ASSERT( device ); DeviceInfo* info = infoForDevice( device ); if ( !info ) + { return nullptr; + } return info->immutableDevice.data(); } @@ -288,9 +308,7 @@ PartitionCoreModule::createPartitionTable( Device* device, PartitionTable::Table } void -PartitionCoreModule::createPartition( Device* device, - Partition* partition, - PartitionTable::Flags flags ) +PartitionCoreModule::createPartition( Device* device, Partition* partition, PartitionTable::Flags flags ) { auto deviceInfo = infoForDevice( device ); Q_ASSERT( deviceInfo ); @@ -301,7 +319,7 @@ PartitionCoreModule::createPartition( Device* device, deviceInfo->jobs << Calamares::job_ptr( job ); - if ( flags != KPM_PARTITION_FLAG(None) ) + if ( flags != KPM_PARTITION_FLAG( None ) ) { SetPartFlagsJob* fJob = new SetPartFlagsJob( device, partition, flags ); deviceInfo->jobs << Calamares::job_ptr( fJob ); @@ -310,21 +328,23 @@ PartitionCoreModule::createPartition( Device* device, } void -PartitionCoreModule::createVolumeGroup( QString &vgName, - QVector< const Partition* > pvList, - qint32 peSize ) +PartitionCoreModule::createVolumeGroup( QString& vgName, QVector< const Partition* > pvList, qint32 peSize ) { // Appending '_' character in case of repeated VG name while ( hasVGwithThisName( vgName ) ) - vgName.append('_'); + { + vgName.append( '_' ); + } CreateVolumeGroupJob* job = new CreateVolumeGroupJob( vgName, pvList, peSize ); job->updatePreview(); - LvmDevice* device = new LvmDevice(vgName); + LvmDevice* device = new LvmDevice( vgName ); for ( const Partition* p : pvList ) + { device->physicalVolumes() << p; + } DeviceInfo* deviceInfo = new DeviceInfo( device ); @@ -339,7 +359,7 @@ PartitionCoreModule::createVolumeGroup( QString &vgName, } void -PartitionCoreModule::resizeVolumeGroup( LvmDevice *device, QVector< const Partition* >& pvList ) +PartitionCoreModule::resizeVolumeGroup( LvmDevice* device, QVector< const Partition* >& pvList ) { DeviceInfo* deviceInfo = infoForDevice( device ); Q_ASSERT( deviceInfo ); @@ -352,7 +372,7 @@ PartitionCoreModule::resizeVolumeGroup( LvmDevice *device, QVector< const Partit } void -PartitionCoreModule::deactivateVolumeGroup( LvmDevice *device ) +PartitionCoreModule::deactivateVolumeGroup( LvmDevice* device ) { DeviceInfo* deviceInfo = infoForDevice( device ); Q_ASSERT( deviceInfo ); @@ -368,7 +388,7 @@ PartitionCoreModule::deactivateVolumeGroup( LvmDevice *device ) } void -PartitionCoreModule::removeVolumeGroup( LvmDevice *device ) +PartitionCoreModule::removeVolumeGroup( LvmDevice* device ) { DeviceInfo* deviceInfo = infoForDevice( device ); Q_ASSERT( deviceInfo ); @@ -395,29 +415,36 @@ PartitionCoreModule::deletePartition( Device* device, Partition* partition ) // deleting them, so let's play it safe and keep our own list. QList< Partition* > lst; for ( auto childPartition : partition->children() ) - if ( !KPMHelpers::isPartitionFreeSpace( childPartition ) ) + if ( !isPartitionFreeSpace( childPartition ) ) + { lst << childPartition; + } for ( auto childPartition : lst ) + { deletePartition( device, childPartition ); + } } Calamares::JobList& jobs = deviceInfo->jobs; - if ( partition->state() == KPM_PARTITION_STATE(New) ) + if ( partition->state() == KPM_PARTITION_STATE( New ) ) { // First remove matching SetPartFlagsJobs for ( auto it = jobs.begin(); it != jobs.end(); ) { SetPartFlagsJob* job = qobject_cast< SetPartFlagsJob* >( it->data() ); if ( job && job->partition() == partition ) + { it = jobs.erase( it ); + } else + { ++it; + } } // Find matching CreatePartitionJob - auto it = std::find_if( jobs.begin(), jobs.end(), [ partition ]( Calamares::job_ptr job ) - { + auto it = std::find_if( jobs.begin(), jobs.end(), [partition]( Calamares::job_ptr job ) { CreatePartitionJob* createJob = qobject_cast< CreatePartitionJob* >( job.data() ); return createJob && createJob->partition() == partition; } ); @@ -427,7 +454,7 @@ PartitionCoreModule::deletePartition( Device* device, Partition* partition ) return; } // Remove it - if ( ! partition->parent()->remove( partition ) ) + if ( !partition->parent()->remove( partition ) ) { cDebug() << "Failed to remove partition from preview"; return; @@ -446,9 +473,13 @@ PartitionCoreModule::deletePartition( Device* device, Partition* partition ) { PartitionJob* job = qobject_cast< PartitionJob* >( it->data() ); if ( job && job->partition() == partition ) + { it = jobs.erase( it ); + } else + { ++it; + } } DeletePartitionJob* job = new DeletePartitionJob( device, partition ); job->updatePreview(); @@ -468,10 +499,7 @@ PartitionCoreModule::formatPartition( Device* device, Partition* partition ) } void -PartitionCoreModule::resizePartition( Device* device, - Partition* partition, - qint64 first, - qint64 last ) +PartitionCoreModule::resizePartition( Device* device, Partition* partition, qint64 first, qint64 last ) { auto deviceInfo = infoForDevice( device ); Q_ASSERT( deviceInfo ); @@ -483,9 +511,7 @@ PartitionCoreModule::resizePartition( Device* device, } void -PartitionCoreModule::setPartitionFlags( Device* device, - Partition* partition, - PartitionTable::Flags flags ) +PartitionCoreModule::setPartitionFlags( Device* device, Partition* partition, PartitionTable::Flags flags ) { auto deviceInfo = infoForDevice( device ); Q_ASSERT( deviceInfo ); @@ -518,7 +544,9 @@ PartitionCoreModule::jobs() const for ( auto info : m_deviceInfos ) { if ( info->isDirty() ) + { lst << Calamares::job_ptr( new ClearMountsJob( info->device.data() ) ); + } } for ( auto info : m_deviceInfos ) @@ -552,18 +580,18 @@ PartitionCoreModule::lvmPVs() const bool PartitionCoreModule::hasVGwithThisName( const QString& name ) const { - auto condition = [ name ]( DeviceInfo* d ) { - return dynamic_cast(d->device.data()) && d->device.data()->name() == name; + auto condition = [name]( DeviceInfo* d ) { + return dynamic_cast< LvmDevice* >( d->device.data() ) && d->device.data()->name() == name; }; return std::find_if( m_deviceInfos.begin(), m_deviceInfos.end(), condition ) != m_deviceInfos.end(); } bool -PartitionCoreModule::isInVG( const Partition *partition ) const +PartitionCoreModule::isInVG( const Partition* partition ) const { - auto condition = [ partition ]( DeviceInfo* d ) { - LvmDevice* vg = dynamic_cast( d->device.data()); + auto condition = [partition]( DeviceInfo* d ) { + LvmDevice* vg = dynamic_cast< LvmDevice* >( d->device.data() ); return vg && vg->physicalVolumes().contains( partition ); }; @@ -578,7 +606,9 @@ PartitionCoreModule::dumpQueue() const { cDebug() << "## Device:" << info->device->name(); for ( auto job : info->jobs ) + { cDebug() << "-" << job->prettyName(); + } } } @@ -612,16 +642,21 @@ PartitionCoreModule::refreshAfterModelChange() //FIXME: this should be removed in favor of // proper KPM support for EFI if ( PartUtils::isEfiSystem() ) + { scanForEfiSystemPartitions(); + } } -void PartitionCoreModule::updateHasRootMountPoint() +void +PartitionCoreModule::updateHasRootMountPoint() { bool oldValue = m_hasRootMountPoint; m_hasRootMountPoint = findPartitionByMountPoint( "/" ); if ( oldValue != m_hasRootMountPoint ) + { hasRootMountPointChanged( m_hasRootMountPoint ); + } } void @@ -636,7 +671,9 @@ PartitionCoreModule::updateIsDirty() break; } if ( oldValue != m_isDirty ) + { isDirtyChanged( m_isDirty ); + } } void @@ -647,16 +684,17 @@ PartitionCoreModule::scanForEfiSystemPartitions() QList< Device* > devices; for ( int row = 0; row < deviceModel()->rowCount(); ++row ) { - Device* device = deviceModel()->deviceForIndex( - deviceModel()->index( row ) ); + Device* device = deviceModel()->deviceForIndex( deviceModel()->index( row ) ); devices.append( device ); } - QList< Partition* > efiSystemPartitions = - KPMHelpers::findPartitions( devices, PartUtils::isEfiBootable ); + QList< Partition* > efiSystemPartitions + = CalamaresUtils::Partition::findPartitions( devices, PartUtils::isEfiBootable ); if ( efiSystemPartitions.isEmpty() ) + { cWarning() << "system is EFI but no EFI system partitions found."; + } m_efiSystemPartitions = efiSystemPartitions; } @@ -671,11 +709,13 @@ PartitionCoreModule::scanForLVMPVs() for ( DeviceInfo* deviceInfo : m_deviceInfos ) { - if ( deviceInfo->device.data()->type() == Device::Type::Disk_Device) + if ( deviceInfo->device.data()->type() == Device::Type::Disk_Device ) + { physicalDevices << deviceInfo->device.data(); + } else if ( deviceInfo->device.data()->type() == Device::Type::LVM_Device ) { - LvmDevice* device = dynamic_cast(deviceInfo->device.data()); + LvmDevice* device = dynamic_cast< LvmDevice* >( deviceInfo->device.data() ); // Restoring physical volume list device->physicalVolumes().clear(); @@ -687,14 +727,9 @@ PartitionCoreModule::scanForLVMPVs() #if defined( WITH_KPMCORE4API ) VolumeManagerDevice::scanDevices( physicalDevices ); for ( auto p : LVM::pvList::list() ) -#else -#if defined( WITH_KPMCORE331API ) - LvmDevice::scanSystemLVM( physicalDevices ); - for ( auto p : LVM::pvList::list() ) #else LvmDevice::scanSystemLVM( physicalDevices ); for ( auto p : LVM::pvList ) -#endif #endif { m_lvmPVs << p.partition().data(); @@ -713,29 +748,35 @@ PartitionCoreModule::scanForLVMPVs() for ( auto job : d->jobs ) { // Including new LVM PVs - CreatePartitionJob* partJob = dynamic_cast( job.data() ); + CreatePartitionJob* partJob = dynamic_cast< CreatePartitionJob* >( job.data() ); if ( partJob ) { Partition* p = partJob->partition(); if ( p->fileSystem().type() == FileSystem::Type::Lvm2_PV ) + { m_lvmPVs << p; + } else if ( p->fileSystem().type() == FileSystem::Type::Luks ) { // Encrypted LVM PVs - FileSystem* innerFS = static_cast(&p->fileSystem())->innerFS(); + FileSystem* innerFS = static_cast< const FS::luks* >( &p->fileSystem() )->innerFS(); if ( innerFS && innerFS->type() == FileSystem::Type::Lvm2_PV ) + { m_lvmPVs << p; + } } -#ifdef WITH_KPMCORE4API +#if defined( WITH_KPMCORE4API ) else if ( p->fileSystem().type() == FileSystem::Type::Luks2 ) { // Encrypted LVM PVs - FileSystem* innerFS = static_cast(&p->fileSystem())->innerFS(); + FileSystem* innerFS = static_cast< const FS::luks* >( &p->fileSystem() )->innerFS(); if ( innerFS && innerFS->type() == FileSystem::Type::Lvm2_PV ) + { m_lvmPVs << p; + } } #endif } @@ -746,13 +787,16 @@ PartitionCoreModule::scanForLVMPVs() PartitionCoreModule::DeviceInfo* PartitionCoreModule::infoForDevice( const Device* device ) const { - for ( auto it = m_deviceInfos.constBegin(); - it != m_deviceInfos.constEnd(); ++it ) + for ( auto it = m_deviceInfos.constBegin(); it != m_deviceInfos.constEnd(); ++it ) { if ( ( *it )->device.data() == device ) + { return *it; + } if ( ( *it )->immutableDevice.data() == device ) + { return *it; + } } return nullptr; } @@ -765,7 +809,9 @@ PartitionCoreModule::findPartitionByMountPoint( const QString& mountPoint ) cons Device* device = deviceInfo->device.data(); for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it ) if ( PartitionInfo::mountPoint( *it ) == mountPoint ) + { return *it; + } } return nullptr; } @@ -782,7 +828,7 @@ PartitionCoreModule::initLayout() { m_partLayout = new PartitionLayout(); - m_partLayout->addEntry( QString("/"), QString("100%") ); + m_partLayout->addEntry( QString( "/" ), QString( "100%" ) ); } void @@ -798,42 +844,52 @@ PartitionCoreModule::initLayout( const QVariantList& config ) { QVariantMap pentry = r.toMap(); - if ( !pentry.contains( "name" ) || !pentry.contains( "mountPoint" ) || - !pentry.contains( "filesystem" ) || !pentry.contains( "size" ) ) + if ( !pentry.contains( "name" ) || !pentry.contains( "mountPoint" ) || !pentry.contains( "filesystem" ) + || !pentry.contains( "size" ) ) { - cError() << "Partition layout entry #" << config.indexOf(r) - << "lacks mandatory attributes, switching to default layout."; - delete( m_partLayout ); + cError() << "Partition layout entry #" << config.indexOf( r ) + << "lacks mandatory attributes, switching to default layout."; + delete ( m_partLayout ); initLayout(); break; } - if ( pentry.contains("size") && CalamaresUtils::getString( pentry, "size" ).isEmpty() ) + if ( pentry.contains( "size" ) && CalamaresUtils::getString( pentry, "size" ).isEmpty() ) + { sizeString.setNum( CalamaresUtils::getInteger( pentry, "size", 0 ) ); + } else + { sizeString = CalamaresUtils::getString( pentry, "size" ); + } - if ( pentry.contains("minSize") && CalamaresUtils::getString( pentry, "minSize" ).isEmpty() ) + if ( pentry.contains( "minSize" ) && CalamaresUtils::getString( pentry, "minSize" ).isEmpty() ) + { minSizeString.setNum( CalamaresUtils::getInteger( pentry, "minSize", 0 ) ); + } else + { minSizeString = CalamaresUtils::getString( pentry, "minSize" ); + } - if ( pentry.contains("maxSize") && CalamaresUtils::getString( pentry, "maxSize" ).isEmpty() ) + if ( pentry.contains( "maxSize" ) && CalamaresUtils::getString( pentry, "maxSize" ).isEmpty() ) + { maxSizeString.setNum( CalamaresUtils::getInteger( pentry, "maxSize", 0 ) ); + } else + { maxSizeString = CalamaresUtils::getString( pentry, "maxSize" ); + } if ( !m_partLayout->addEntry( CalamaresUtils::getString( pentry, "name" ), CalamaresUtils::getString( pentry, "mountPoint" ), CalamaresUtils::getString( pentry, "filesystem" ), sizeString, minSizeString, - maxSizeString - ) ) + maxSizeString ) ) { - cError() << "Partition layout entry #" << config.indexOf(r) - << "is invalid, switching to default layout."; - delete( m_partLayout ); + cError() << "Partition layout entry #" << config.indexOf( r ) << "is invalid, switching to default layout."; + delete ( m_partLayout ); initLayout(); break; } @@ -841,7 +897,7 @@ PartitionCoreModule::initLayout( const QVariantList& config ) } void -PartitionCoreModule::layoutApply( Device *dev, +PartitionCoreModule::layoutApply( Device* dev, qint64 firstSector, qint64 lastSector, QString luksPassphrase, @@ -849,17 +905,14 @@ PartitionCoreModule::layoutApply( Device *dev, const PartitionRole& role ) { bool isEfi = PartUtils::isEfiSystem(); - QList< Partition* > partList = m_partLayout->execute( dev, firstSector, lastSector, - luksPassphrase, parent, role - ); + QList< Partition* > partList = m_partLayout->execute( dev, firstSector, lastSector, luksPassphrase, parent, role ); - foreach ( Partition *part, partList ) + foreach ( Partition* part, partList ) { if ( part->mountPoint() == "/" ) { - createPartition( dev, part, - part->activeFlags() | ( isEfi ? KPM_PARTITION_FLAG(None) : KPM_PARTITION_FLAG(Boot) ) - ); + createPartition( + dev, part, part->activeFlags() | ( isEfi ? KPM_PARTITION_FLAG( None ) : KPM_PARTITION_FLAG( Boot ) ) ); } else { @@ -869,14 +922,10 @@ PartitionCoreModule::layoutApply( Device *dev, } void -PartitionCoreModule::layoutApply( Device *dev, - qint64 firstSector, - qint64 lastSector, - QString luksPassphrase ) +PartitionCoreModule::layoutApply( Device* dev, qint64 firstSector, qint64 lastSector, QString luksPassphrase ) { - layoutApply( dev, firstSector, lastSector, luksPassphrase, dev->partitionTable(), - PartitionRole( PartitionRole::Primary ) - ); + layoutApply( + dev, firstSector, lastSector, luksPassphrase, dev->partitionTable(), PartitionRole( PartitionRole::Primary ) ); } void @@ -897,13 +946,13 @@ PartitionCoreModule::revertAllDevices() for ( auto it = m_deviceInfos.begin(); it != m_deviceInfos.end(); ) { // In new VGs device info, there will be always a CreateVolumeGroupJob as the first job in jobs list - if ( dynamic_cast( ( *it )->device.data() ) ) + if ( dynamic_cast< LvmDevice* >( ( *it )->device.data() ) ) { ( *it )->isAvailable = true; if ( !( *it )->jobs.empty() ) { - CreateVolumeGroupJob* vgJob = dynamic_cast( ( *it )->jobs[0].data() ); + CreateVolumeGroupJob* vgJob = dynamic_cast< CreateVolumeGroupJob* >( ( *it )->jobs[ 0 ].data() ); if ( vgJob ) { @@ -935,7 +984,9 @@ PartitionCoreModule::revertDevice( Device* dev, bool individualRevert ) DeviceInfo* devInfo = infoForDevice( dev ); if ( !devInfo ) + { return; + } devInfo->forgetChanges(); CoreBackend* backend = CoreBackendManager::self()->backend(); Device* newDev = backend->scanDevice( devInfo->device->deviceNode() ); @@ -948,13 +999,17 @@ PartitionCoreModule::revertDevice( Device* dev, bool individualRevert ) for ( DeviceInfo* const info : m_deviceInfos ) { if ( info && !info->device.isNull() && info->device->type() == Device::Type::Disk_Device ) + { devices.append( info->device.data() ); + } } m_bootLoaderModel->init( devices ); if ( individualRevert ) + { refreshAfterModelChange(); + } emit deviceReverted( newDev ); } @@ -963,9 +1018,7 @@ void PartitionCoreModule::asyncRevertDevice( Device* dev, std::function< void() > callback ) { QFutureWatcher< void >* watcher = new QFutureWatcher< void >(); - connect( watcher, &QFutureWatcher< void >::finished, - this, [ watcher, callback ] - { + connect( watcher, &QFutureWatcher< void >::finished, this, [watcher, callback] { callback(); watcher->deleteLater(); } ); @@ -979,7 +1032,9 @@ void PartitionCoreModule::clearJobs() { foreach ( DeviceInfo* deviceInfo, m_deviceInfos ) + { deviceInfo->forgetChanges(); + } updateIsDirty(); } @@ -991,11 +1046,13 @@ PartitionCoreModule::isDirty() } bool -PartitionCoreModule::isVGdeactivated( LvmDevice *device ) +PartitionCoreModule::isVGdeactivated( LvmDevice* device ) { for ( DeviceInfo* deviceInfo : m_deviceInfos ) if ( device == deviceInfo->device.data() && !deviceInfo->isAvailable ) + { return true; + } return false; } @@ -1007,7 +1064,9 @@ PartitionCoreModule::createSummaryInfo() const for ( auto deviceInfo : m_deviceInfos ) { if ( !deviceInfo->isDirty() ) + { continue; + } SummaryInfo summaryInfo; summaryInfo.deviceName = deviceInfo->device->name(); summaryInfo.deviceNode = deviceInfo->device->deviceNode(); diff --git a/src/modules/partition/core/PartitionCoreModule.h b/src/modules/partition/core/PartitionCoreModule.h index 7faf67863..f88544ae8 100644 --- a/src/modules/partition/core/PartitionCoreModule.h +++ b/src/modules/partition/core/PartitionCoreModule.h @@ -26,6 +26,7 @@ #include "core/PartitionModel.h" #include "Job.h" +#include "partition/KPMManager.h" // KPMcore #include @@ -138,10 +139,10 @@ public: * If @p flags is not FlagNone, then the given flags are * applied to the newly-created partition. */ - void createPartition( Device* device, Partition* partition, - PartitionTable::Flags flags = KPM_PARTITION_FLAG(None) ); + void + createPartition( Device* device, Partition* partition, PartitionTable::Flags flags = KPM_PARTITION_FLAG( None ) ); - void createVolumeGroup( QString &vgName, QVector< const Partition* > pvList, qint32 peSize ); + void createVolumeGroup( QString& vgName, QVector< const Partition* > pvList, qint32 peSize ); void resizeVolumeGroup( LvmDevice* device, QVector< const Partition* >& pvList ); @@ -165,8 +166,13 @@ public: void initLayout(); void initLayout( const QVariantList& config ); - void layoutApply( Device *dev, qint64 firstSector, qint64 lastSector, QString luksPassphrase ); - void layoutApply( Device *dev, qint64 firstSector, qint64 lastSector, QString luksPassphrase, PartitionNode* parent, const PartitionRole& role ); + void layoutApply( Device* dev, qint64 firstSector, qint64 lastSector, QString luksPassphrase ); + void layoutApply( Device* dev, + qint64 firstSector, + qint64 lastSector, + QString luksPassphrase, + PartitionNode* parent, + const PartitionRole& role ); /** * @brief jobs creates and returns a list of jobs which can then apply the changes @@ -195,19 +201,19 @@ public: */ Partition* findPartitionByMountPoint( const QString& mountPoint ) const; - void revert(); // full revert, thread safe, calls doInit - void revertAllDevices(); // convenience function, calls revertDevice + void revert(); // full revert, thread safe, calls doInit + void revertAllDevices(); // convenience function, calls revertDevice /** @brief rescans a single Device and updates DeviceInfo * * When @p individualRevert is true, calls refreshAfterModelChange(), * used to reduce number of refreshes when calling revertAllDevices(). */ - void revertDevice( Device* dev, bool individualRevert=true ); - void asyncRevertDevice( Device* dev, std::function< void() > callback ); //like revertDevice, but asynchronous + void revertDevice( Device* dev, bool individualRevert = true ); + void asyncRevertDevice( Device* dev, std::function< void() > callback ); //like revertDevice, but asynchronous - void clearJobs(); // only clear jobs, the Device* states are preserved + void clearJobs(); // only clear jobs, the Device* states are preserved - bool isDirty(); // true if there are pending changes, otherwise false + bool isDirty(); // true if there are pending changes, otherwise false bool isVGdeactivated( LvmDevice* device ); @@ -224,9 +230,9 @@ public: */ QList< SummaryInfo > createSummaryInfo() const; - void dumpQueue() const; // debug output + const OsproberEntryList osproberEntries() const; // os-prober data structure, cached - const OsproberEntryList osproberEntries() const; // os-prober data structure, cached + void dumpQueue() const; // debug output Q_SIGNALS: void hasRootMountPointChanged( bool value ); @@ -235,6 +241,8 @@ Q_SIGNALS: void deviceReverted( Device* device ); private: + CalamaresUtils::Partition::KPMManager m_kpmcore; + void refreshAfterModelChange(); /** diff --git a/src/modules/partition/core/PartitionInfo.cpp b/src/modules/partition/core/PartitionInfo.cpp index 3a2e5bbd3..fe38bf2d6 100644 --- a/src/modules/partition/core/PartitionInfo.cpp +++ b/src/modules/partition/core/PartitionInfo.cpp @@ -57,15 +57,19 @@ setFormat( Partition* partition, bool value ) partition->setProperty( FORMAT_PROPERTY, value ); } -PartitionTable::Flags flags(const Partition* partition) +PartitionTable::Flags +flags( const Partition* partition ) { auto v = partition->property( FLAGS_PROPERTY ); - if (v.type() == QVariant::Int ) - return static_cast( v.toInt() ); + if ( v.type() == QVariant::Int ) + { + return static_cast< PartitionTable::Flags >( v.toInt() ); + } return partition->activeFlags(); } -void setFlags(Partition* partition, PartitionTable::Flags f) +void +setFlags( Partition* partition, PartitionTable::Flags f ) { partition->setProperty( FLAGS_PROPERTY, PartitionTable::Flags::Int( f ) ); } @@ -82,11 +86,11 @@ bool isDirty( Partition* partition ) { if ( LvmDevice::s_DirtyPVs.contains( partition ) ) + { return true; + } - return !mountPoint( partition ).isEmpty() - || format( partition ) - || flags( partition ) != partition->activeFlags(); + return !mountPoint( partition ).isEmpty() || format( partition ) || flags( partition ) != partition->activeFlags(); } -} // namespace +} // namespace PartitionInfo diff --git a/src/modules/partition/core/PartitionInfo.h b/src/modules/partition/core/PartitionInfo.h index a9c391059..9f9cd2d1e 100644 --- a/src/modules/partition/core/PartitionInfo.h +++ b/src/modules/partition/core/PartitionInfo.h @@ -60,6 +60,6 @@ void reset( Partition* partition ); */ bool isDirty( Partition* partition ); -}; +}; // namespace PartitionInfo #endif /* PARTITIONINFO_H */ diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp index 35b90722a..23332f3f5 100644 --- a/src/modules/partition/core/PartitionLayout.cpp +++ b/src/modules/partition/core/PartitionLayout.cpp @@ -26,9 +26,9 @@ #include "core/PartitionLayout.h" #include "core/KPMHelpers.h" +#include "core/PartUtils.h" #include "core/PartitionActions.h" #include "core/PartitionInfo.h" -#include "core/PartUtils.h" #include #include @@ -42,9 +42,11 @@ getDefaultFileSystemType() if ( gs->contains( "defaultFileSystemType" ) ) { - PartUtils::findFS( gs->value( "defaultFileSystemType" ).toString(), &defaultFS); + PartUtils::findFS( gs->value( "defaultFileSystemType" ).toString(), &defaultFS ); if ( defaultFS == FileSystem::Unknown ) + { defaultFS = FileSystem::Ext4; + } } return defaultFS; @@ -67,9 +69,7 @@ PartitionLayout::PartitionLayout( const PartitionLayout& layout ) { } -PartitionLayout::~PartitionLayout() -{ -} +PartitionLayout::~PartitionLayout() {} bool PartitionLayout::addEntry( PartitionLayout::PartitionEntry entry ) @@ -117,7 +117,12 @@ PartitionLayout::addEntry( const QString& mountPoint, const QString& size, const } bool -PartitionLayout::addEntry( const QString& label, const QString& mountPoint, const QString& fs, const QString& size, const QString& min, const QString& max ) +PartitionLayout::addEntry( const QString& label, + const QString& mountPoint, + const QString& fs, + const QString& size, + const QString& min, + const QString& max ) { PartitionLayout::PartitionEntry entry( size, min, max ); @@ -136,7 +141,9 @@ PartitionLayout::addEntry( const QString& label, const QString& mountPoint, cons entry.partMountPoint = mountPoint; PartUtils::findFS( fs, &entry.partFileSystem ); if ( entry.partFileSystem == FileSystem::Unknown ) + { entry.partFileSystem = m_defaultFsType; + } m_partLayout.append( entry ); @@ -144,8 +151,10 @@ PartitionLayout::addEntry( const QString& label, const QString& mountPoint, cons } QList< Partition* > -PartitionLayout::execute( Device *dev, qint64 firstSector, - qint64 lastSector, QString luksPassphrase, +PartitionLayout::execute( Device* dev, + qint64 firstSector, + qint64 lastSector, + QString luksPassphrase, PartitionNode* parent, const PartitionRole& role ) { @@ -157,9 +166,9 @@ PartitionLayout::execute( Device *dev, qint64 firstSector, // TODO: Refine partition sizes to make sure there is room for every partition // Use a default (200-500M ?) minimum size for partition without minSize - foreach( const PartitionLayout::PartitionEntry& part, m_partLayout ) + foreach ( const PartitionLayout::PartitionEntry& part, m_partLayout ) { - Partition *currentPartition = nullptr; + Partition* currentPartition = nullptr; qint64 size = -1; // Calculate partition size @@ -169,67 +178,67 @@ PartitionLayout::execute( Device *dev, qint64 firstSector, } else { - cWarning() << "Partition" << part.partMountPoint << "size (" - << size << "sectors) is invalid, skipping..."; + cWarning() << "Partition" << part.partMountPoint << "size (" << size << "sectors) is invalid, skipping..."; continue; } if ( part.partMinSize.isValid() ) + { minSize = part.partMinSize.toSectors( totalSize, dev->logicalSize() ); + } else + { minSize = 0; + } if ( part.partMaxSize.isValid() ) + { maxSize = part.partMaxSize.toSectors( totalSize, dev->logicalSize() ); + } else + { maxSize = availableSize; + } // Make sure we never go under minSize once converted to sectors if ( maxSize < minSize ) { - cWarning() << "Partition" << part.partMountPoint << "max size (" << maxSize - << "sectors) is < min size (" << minSize << "sectors), using min size"; + cWarning() << "Partition" << part.partMountPoint << "max size (" << maxSize << "sectors) is < min size (" + << minSize << "sectors), using min size"; maxSize = minSize; } // Adjust partition size based on user-defined boundaries and available space if ( size < minSize ) + { size = minSize; + } if ( size > maxSize ) + { size = maxSize; + } if ( size > availableSize ) + { size = availableSize; + } end = firstSector + size - 1; if ( luksPassphrase.isEmpty() ) { currentPartition = KPMHelpers::createNewPartition( - parent, - *dev, - role, - part.partFileSystem, - firstSector, - end, - KPM_PARTITION_FLAG(None) - ); + parent, *dev, role, part.partFileSystem, firstSector, end, KPM_PARTITION_FLAG( None ) ); } else { currentPartition = KPMHelpers::createNewEncryptedPartition( - parent, - *dev, - role, - part.partFileSystem, - firstSector, - end, - luksPassphrase, - KPM_PARTITION_FLAG(None) - ); + parent, *dev, role, part.partFileSystem, firstSector, end, luksPassphrase, KPM_PARTITION_FLAG( None ) ); } PartitionInfo::setFormat( currentPartition, true ); PartitionInfo::setMountPoint( currentPartition, part.partMountPoint ); if ( !part.partLabel.isEmpty() ) + { currentPartition->fileSystem().setLabel( part.partLabel ); + } // Some buggy (legacy) BIOSes test if the bootflag of at least one partition is set. // Otherwise they ignore the device in boot-order, so add it here. partList.append( currentPartition ); diff --git a/src/modules/partition/core/PartitionLayout.h b/src/modules/partition/core/PartitionLayout.h index a9b8d410b..50bb1ba43 100644 --- a/src/modules/partition/core/PartitionLayout.h +++ b/src/modules/partition/core/PartitionLayout.h @@ -37,7 +37,6 @@ class Partition; class PartitionLayout { public: - struct PartitionEntry { QString partLabel; @@ -54,9 +53,11 @@ public: bool isValid() const { - if ( !partSize.isValid() || - ( partMinSize.isValid() && partMaxSize.isValid() && partMinSize > partMaxSize ) ) + if ( !partSize.isValid() + || ( partMinSize.isValid() && partMaxSize.isValid() && partMinSize > partMaxSize ) ) + { return false; + } return true; } }; @@ -67,14 +68,27 @@ public: ~PartitionLayout(); bool addEntry( PartitionEntry entry ); - bool addEntry( const QString& mountPoint, const QString& size, const QString& min = QString(), const QString& max = QString() ); - bool addEntry( const QString& label, const QString& mountPoint, const QString& fs, const QString& size, const QString& min = QString(), const QString& max = QString() ); + bool addEntry( const QString& mountPoint, + const QString& size, + const QString& min = QString(), + const QString& max = QString() ); + bool addEntry( const QString& label, + const QString& mountPoint, + const QString& fs, + const QString& size, + const QString& min = QString(), + const QString& max = QString() ); /** * @brief Apply the current partition layout to the selected drive space. * @return A list of Partition objects. */ - QList< Partition* > execute( Device *dev, qint64 firstSector, qint64 lastSector, QString luksPassphrase, PartitionNode* parent, const PartitionRole& role ); + QList< Partition* > execute( Device* dev, + qint64 firstSector, + qint64 lastSector, + QString luksPassphrase, + PartitionNode* parent, + const PartitionRole& role ); private: FileSystem::Type m_defaultFsType; diff --git a/src/modules/partition/core/PartitionModel.cpp b/src/modules/partition/core/PartitionModel.cpp index 8b13ab0a0..d6f996c4f 100644 --- a/src/modules/partition/core/PartitionModel.cpp +++ b/src/modules/partition/core/PartitionModel.cpp @@ -20,8 +20,11 @@ #include "core/PartitionModel.h" #include "core/ColorUtils.h" -#include "core/PartitionInfo.h" #include "core/KPMHelpers.h" +#include "core/PartitionInfo.h" + +#include "partition/FileSystem.h" +#include "partition/PartitionQuery.h" #include "utils/Logger.h" // CalaPM @@ -36,6 +39,9 @@ // Qt #include +using CalamaresUtils::Partition::isPartitionFreeSpace; +using CalamaresUtils::Partition::isPartitionNew; + //- ResetHelper -------------------------------------------- PartitionModel::ResetHelper::ResetHelper( PartitionModel* model ) : m_model( model ) @@ -61,9 +67,9 @@ PartitionModel::PartitionModel( QObject* parent ) } void -PartitionModel::init( Device* device , const OsproberEntryList& osproberEntries ) +PartitionModel::init( Device* device, const OsproberEntryList& osproberEntries ) { - QMutexLocker lock(&m_lock); + QMutexLocker lock( &m_lock ); beginResetModel(); m_device = device; m_osproberEntries = osproberEntries; @@ -81,7 +87,9 @@ PartitionModel::rowCount( const QModelIndex& parent ) const { Partition* parentPartition = partitionForIndex( parent ); if ( parentPartition ) + { return parentPartition->children().count(); + } PartitionTable* table = m_device->partitionTable(); return table ? table->children().count() : 0; } @@ -89,16 +97,21 @@ PartitionModel::rowCount( const QModelIndex& parent ) const QModelIndex PartitionModel::index( int row, int column, const QModelIndex& parent ) const { - PartitionNode* parentPartition = parent.isValid() - ? static_cast< PartitionNode* >( partitionForIndex( parent ) ) - : static_cast< PartitionNode* >( m_device->partitionTable() ); + PartitionNode* parentPartition = parent.isValid() ? static_cast< PartitionNode* >( partitionForIndex( parent ) ) + : static_cast< PartitionNode* >( m_device->partitionTable() ); if ( !parentPartition ) + { return QModelIndex(); + } auto lst = parentPartition->children(); if ( row < 0 || row >= lst.count() ) + { return QModelIndex(); + } if ( column < 0 || column >= ColumnCount ) + { return QModelIndex(); + } Partition* partition = parentPartition->children().at( row ); return createIndex( row, column, partition ); } @@ -107,19 +120,27 @@ QModelIndex PartitionModel::parent( const QModelIndex& child ) const { if ( !child.isValid() ) + { return QModelIndex(); + } Partition* partition = partitionForIndex( child ); if ( !partition ) + { return QModelIndex(); + } PartitionNode* parentNode = partition->parent(); if ( parentNode == m_device->partitionTable() ) + { return QModelIndex(); + } int row = 0; for ( auto p : m_device->partitionTable()->children() ) { if ( parentNode == p ) + { return createIndex( row, 0, parentNode ); + } ++row; } cWarning() << "No parent found!"; @@ -131,7 +152,9 @@ PartitionModel::data( const QModelIndex& index, int role ) const { Partition* partition = partitionForIndex( index ); if ( !partition ) + { return QVariant(); + } switch ( role ) { @@ -140,19 +163,23 @@ PartitionModel::data( const QModelIndex& index, int role ) const int col = index.column(); if ( col == NameColumn ) { - if ( KPMHelpers::isPartitionFreeSpace( partition ) ) + if ( isPartitionFreeSpace( partition ) ) + { return tr( "Free Space" ); + } else { - return KPMHelpers::isPartitionNew( partition ) - ? tr( "New partition" ) - : partition->partitionPath(); + return isPartitionNew( partition ) ? tr( "New partition" ) : partition->partitionPath(); } } if ( col == FileSystemColumn ) - return KPMHelpers::prettyNameForFileSystemType( partition->fileSystem().type() ); + { + return CalamaresUtils::Partition::prettyNameForFileSystemType( partition->fileSystem().type() ); + } if ( col == MountPointColumn ) + { return PartitionInfo::mountPoint( partition ); + } if ( col == SizeColumn ) { qint64 size = ( partition->lastSector() - partition->firstSector() + 1 ) * m_device->logicalSize(); @@ -163,41 +190,48 @@ PartitionModel::data( const QModelIndex& index, int role ) const } case Qt::DecorationRole: if ( index.column() == NameColumn ) + { return ColorUtils::colorForPartition( partition ); + } else + { return QVariant(); + } case Qt::ToolTipRole: { int col = index.column(); QString name; if ( col == NameColumn ) { - if ( KPMHelpers::isPartitionFreeSpace( partition ) ) + if ( isPartitionFreeSpace( partition ) ) + { name = tr( "Free Space" ); + } else { - name = KPMHelpers::isPartitionNew( partition ) - ? tr( "New partition" ) - : partition->partitionPath(); + name = isPartitionNew( partition ) ? tr( "New partition" ) : partition->partitionPath(); } } - QString prettyFileSystem = KPMHelpers::prettyNameForFileSystemType( partition->fileSystem().type() ); + QString prettyFileSystem + = CalamaresUtils::Partition::prettyNameForFileSystemType( partition->fileSystem().type() ); qint64 size = ( partition->lastSector() - partition->firstSector() + 1 ) * m_device->logicalSize(); QString prettySize = KFormat().formatByteSize( size ); - return QVariant(name + " " + prettyFileSystem + " " + prettySize); + return QVariant( name + " " + prettyFileSystem + " " + prettySize ); } case SizeRole: return ( partition->lastSector() - partition->firstSector() + 1 ) * m_device->logicalSize(); case IsFreeSpaceRole: - return KPMHelpers::isPartitionFreeSpace( partition ); + return isPartitionFreeSpace( partition ); case IsPartitionNewRole: - return KPMHelpers::isPartitionNew( partition ); + return isPartitionNew( partition ); case FileSystemLabelRole: - if ( partition->fileSystem().supportGetLabel() != FileSystem::cmdSupportNone && - !partition->fileSystem().label().isEmpty() ) + if ( partition->fileSystem().supportGetLabel() != FileSystem::cmdSupportNone + && !partition->fileSystem().label().isEmpty() ) + { return partition->fileSystem().label(); + } return QVariant(); case FileSystemTypeRole: @@ -212,40 +246,45 @@ PartitionModel::data( const QModelIndex& index, int role ) const // Osprober roles: case OsproberNameRole: foreach ( const OsproberEntry& osproberEntry, m_osproberEntries ) - if ( partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone && - !partition->fileSystem().uuid().isEmpty() && - osproberEntry.uuid == partition->fileSystem().uuid() ) + if ( partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone + && !partition->fileSystem().uuid().isEmpty() && osproberEntry.uuid == partition->fileSystem().uuid() ) + { return osproberEntry.prettyName; + } return QVariant(); case OsproberPathRole: foreach ( const OsproberEntry& osproberEntry, m_osproberEntries ) - if ( partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone && - !partition->fileSystem().uuid().isEmpty() && - osproberEntry.uuid == partition->fileSystem().uuid() ) + if ( partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone + && !partition->fileSystem().uuid().isEmpty() && osproberEntry.uuid == partition->fileSystem().uuid() ) + { return osproberEntry.path; + } return QVariant(); case OsproberCanBeResizedRole: foreach ( const OsproberEntry& osproberEntry, m_osproberEntries ) - if ( partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone && - !partition->fileSystem().uuid().isEmpty() && - osproberEntry.uuid == partition->fileSystem().uuid() ) + if ( partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone + && !partition->fileSystem().uuid().isEmpty() && osproberEntry.uuid == partition->fileSystem().uuid() ) + { return osproberEntry.canBeResized; + } return QVariant(); case OsproberRawLineRole: foreach ( const OsproberEntry& osproberEntry, m_osproberEntries ) - if ( partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone && - !partition->fileSystem().uuid().isEmpty() && - osproberEntry.uuid == partition->fileSystem().uuid() ) + if ( partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone + && !partition->fileSystem().uuid().isEmpty() && osproberEntry.uuid == partition->fileSystem().uuid() ) + { return osproberEntry.line; + } return QVariant(); case OsproberHomePartitionPathRole: foreach ( const OsproberEntry& osproberEntry, m_osproberEntries ) - if ( partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone && - !partition->fileSystem().uuid().isEmpty() && - osproberEntry.uuid == partition->fileSystem().uuid() ) + if ( partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone + && !partition->fileSystem().uuid().isEmpty() && osproberEntry.uuid == partition->fileSystem().uuid() ) + { return osproberEntry.homePath; + } return QVariant(); - // end Osprober roles. + // end Osprober roles. default: return QVariant(); @@ -256,7 +295,9 @@ QVariant PartitionModel::headerData( int section, Qt::Orientation, int role ) const { if ( role != Qt::DisplayRole ) + { return QVariant(); + } switch ( section ) { @@ -277,9 +318,11 @@ PartitionModel::headerData( int section, Qt::Orientation, int role ) const Partition* PartitionModel::partitionForIndex( const QModelIndex& index ) const { - QMutexLocker lock(&m_lock); + QMutexLocker lock( &m_lock ); if ( !index.isValid() ) + { return nullptr; + } return reinterpret_cast< Partition* >( index.internalPointer() ); } diff --git a/src/modules/partition/core/PartitionModel.h b/src/modules/partition/core/PartitionModel.h index f5289254b..7066aa5a5 100644 --- a/src/modules/partition/core/PartitionModel.h +++ b/src/modules/partition/core/PartitionModel.h @@ -61,6 +61,7 @@ public: ResetHelper( const ResetHelper& ) = delete; ResetHelper& operator=( const ResetHelper& ) = delete; + private: PartitionModel* m_model; }; @@ -75,7 +76,7 @@ public: FileSystemLabelRole, FileSystemTypeRole, PartitionPathRole, - PartitionPtrRole, // passed as void*, use sparingly + PartitionPtrRole, // passed as void*, use sparingly OsproberNameRole, OsproberPathRole, OsproberCanBeResizedRole, @@ -89,7 +90,7 @@ public: FileSystemColumn, MountPointColumn, SizeColumn, - ColumnCount // Must remain last + ColumnCount // Must remain last }; PartitionModel( QObject* parent = nullptr ); @@ -108,10 +109,7 @@ public: Partition* partitionForIndex( const QModelIndex& index ) const; - Device* device() const - { - return m_device; - } + Device* device() const { return m_device; } void update(); diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index 5e8260dec..aebf9a7f6 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -28,7 +28,6 @@ #include "core/PartitionActions.h" #include "core/PartitionCoreModule.h" #include "core/PartitionInfo.h" -#include "core/PartitionIterator.h" #include "core/PartitionModel.h" #include "BootInfoWidget.h" @@ -40,14 +39,16 @@ #include "ReplaceWidget.h" #include "ScanningDialog.h" -#include "utils/CalamaresUtilsGui.h" +#include "GlobalStorage.h" +#include "JobQueue.h" +#include "partition/PartitionIterator.h" +#include "partition/PartitionQuery.h" #include "utils/Logger.h" #include "utils/Retranslator.h" #include "utils/Units.h" #include "Branding.h" -#include "GlobalStorage.h" -#include "JobQueue.h" +#include "utils/CalamaresUtilsGui.h" #include #include @@ -65,6 +66,9 @@ #include using PartitionActions::Choices::SwapChoice; +using CalamaresUtils::Partition::PartitionIterator; +using CalamaresUtils::Partition::isPartitionFreeSpace; +using CalamaresUtils::Partition::findPartitionByPath; /** @brief Given a set of swap choices, return a sensible value from it. * @@ -691,7 +695,7 @@ ChoicePage::doAlongsideApply() for ( int i = 0; i < dm->rowCount(); ++i ) { Device* dev = dm->deviceForIndex( dm->index( i ) ); - Partition* candidate = KPMHelpers::findPartitionByPath( { dev }, path ); + Partition* candidate = findPartitionByPath( { dev }, path ); if ( candidate ) { qint64 firstSector = candidate->firstSector(); @@ -754,7 +758,7 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current ) Partition* selectedPartition = static_cast< Partition* >( current.data( PartitionModel::PartitionPtrRole ) .value< void* >() ); - if ( KPMHelpers::isPartitionFreeSpace( selectedPartition ) ) + if ( isPartitionFreeSpace( selectedPartition ) ) { //NOTE: if the selected partition is free space, we don't deal with // a separate /home partition at all because there's no existing @@ -768,7 +772,7 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current ) if ( parent && parent->roles().has( PartitionRole::Extended ) ) { newRoles = PartitionRole( PartitionRole::Logical ); - newParent = KPMHelpers::findPartitionByPath( { selectedDevice() }, parent->partitionPath() ); + newParent = findPartitionByPath( { selectedDevice() }, parent->partitionPath() ); } } @@ -782,7 +786,7 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current ) // We can't use the PartitionPtrRole because we need to make changes to the // main DeviceModel, not the immutable copy. QString partPath = current.data( PartitionModel::PartitionPathRole ).toString(); - selectedPartition = KPMHelpers::findPartitionByPath( { selectedDevice() }, + selectedPartition = findPartitionByPath( { selectedDevice() }, partPath ); if ( selectedPartition ) { @@ -805,7 +809,7 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current ) gs->value( "defaultFileSystemType" ).toString(), m_encryptWidget->passphrase() } ); - Partition* homePartition = KPMHelpers::findPartitionByPath( { selectedDevice() }, + Partition* homePartition = findPartitionByPath( { selectedDevice() }, *homePartitionPath ); if ( homePartition && doReuseHomePartition ) diff --git a/src/modules/partition/gui/CreatePartitionDialog.cpp b/src/modules/partition/gui/CreatePartitionDialog.cpp index 926df03a3..e69137740 100644 --- a/src/modules/partition/gui/CreatePartitionDialog.cpp +++ b/src/modules/partition/gui/CreatePartitionDialog.cpp @@ -20,7 +20,8 @@ * along with Calamares. If not, see . */ -#include "gui/CreatePartitionDialog.h" +#include "CreatePartitionDialog.h" +#include "ui_CreatePartitionDialog.h" #include "core/ColorUtils.h" #include "core/PartitionInfo.h" @@ -29,20 +30,18 @@ #include "gui/PartitionDialogHelpers.h" #include "gui/PartitionSizeController.h" -#include "ui_CreatePartitionDialog.h" - -#include "utils/Logger.h" #include "GlobalStorage.h" #include "JobQueue.h" +#include "partition/PartitionQuery.h" +#include "partition/FileSystem.h" +#include "utils/Logger.h" -// KPMcore #include #include #include #include #include -// Qt #include #include #include @@ -51,6 +50,9 @@ #include #include +using CalamaresUtils::Partition::untranslatedFS; +using CalamaresUtils::Partition::userVisibleFS; + static QSet< FileSystem::Type > s_unmountableFS( { FileSystem::Unformatted, @@ -112,7 +114,7 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device, PartitionNode* par if ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended ) { - fsNames << KPMHelpers::userVisibleFS( fs ); // This is put into the combobox + fsNames << userVisibleFS( fs ); // This is put into the combobox if ( fs->type() == defaultFSType ) defaultFsIndex = fsCounter; fsCounter++; @@ -279,7 +281,7 @@ CreatePartitionDialog::checkMountPointSelection() void CreatePartitionDialog::initPartResizerWidget( Partition* partition ) { - QColor color = KPMHelpers::isPartitionFreeSpace( partition ) + QColor color = CalamaresUtils::Partition::isPartitionFreeSpace( partition ) ? ColorUtils::colorForPartitionInFreeSpace( partition ) : ColorUtils::colorForPartition( partition ); m_partitionSizeController->init( m_device, partition, color ); diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp index 6268a2a22..37868c7ff 100644 --- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp +++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp @@ -23,31 +23,31 @@ */ #include "EditExistingPartitionDialog.h" +#include "ui_EditExistingPartitionDialog.h" #include "core/ColorUtils.h" #include "core/PartitionCoreModule.h" #include "core/PartitionInfo.h" #include "core/PartUtils.h" -#include "core/KPMHelpers.h" #include "gui/PartitionDialogHelpers.h" #include "gui/PartitionSizeController.h" -#include "ui_EditExistingPartitionDialog.h" - #include "GlobalStorage.h" #include "JobQueue.h" +#include "partition/FileSystem.h" #include "utils/Logger.h" -// KPMcore #include #include #include -// Qt #include #include #include +using CalamaresUtils::Partition::untranslatedFS; +using CalamaresUtils::Partition::userVisibleFS; + EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device, Partition* partition, const QStringList& usedMountPoints, QWidget* parentWidget ) : QDialog( parentWidget ) , m_ui( new Ui_EditExistingPartitionDialog ) @@ -77,7 +77,7 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device, Partit m_ui->fileSystemComboBox->setEnabled( doFormat ); if ( !doFormat ) - m_ui->fileSystemComboBox->setCurrentText( KPMHelpers::userVisibleFS( m_partition->fileSystem() ) ); + m_ui->fileSystemComboBox->setCurrentText( userVisibleFS( m_partition->fileSystem() ) ); updateMountPointPicker(); } ); @@ -93,7 +93,7 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device, Partit for ( auto fs : FileSystemFactory::map() ) { if ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended ) - fsNames << KPMHelpers::userVisibleFS( fs ); // For the combo box + fsNames << userVisibleFS( fs ); // For the combo box } m_ui->fileSystemComboBox->addItems( fsNames ); @@ -107,7 +107,7 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device, Partit defaultFSType = FileSystem::Type::Ext4; } - QString thisFSNameForUser = KPMHelpers::userVisibleFS( m_partition->fileSystem() ); + QString thisFSNameForUser = userVisibleFS( m_partition->fileSystem() ); if ( fsNames.contains( thisFSNameForUser ) ) m_ui->fileSystemComboBox->setCurrentText( thisFSNameForUser ); else diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp index 915f899b2..d2ad49c23 100644 --- a/src/modules/partition/gui/PartitionPage.cpp +++ b/src/modules/partition/gui/PartitionPage.cpp @@ -40,11 +40,13 @@ #include "ui_PartitionPage.h" #include "ui_CreatePartitionTableDialog.h" +#include "GlobalStorage.h" +#include "JobQueue.h" +#include "partition/PartitionQuery.h" #include "utils/Logger.h" #include "utils/Retranslator.h" + #include "Branding.h" -#include "JobQueue.h" -#include "GlobalStorage.h" // KPMcore #include @@ -132,7 +134,7 @@ PartitionPage::updateButtons() Q_ASSERT( model ); Partition* partition = model->partitionForIndex( index ); Q_ASSERT( partition ); - bool isFree = KPMHelpers::isPartitionFreeSpace( partition ); + bool isFree = CalamaresUtils::Partition::isPartitionFreeSpace( partition ); bool isExtended = partition->roles().has( PartitionRole::Extended ); bool isInVG = m_core->isInVG( partition ); @@ -392,7 +394,7 @@ PartitionPage::onEditClicked() Partition* partition = model->partitionForIndex( index ); Q_ASSERT( partition ); - if ( KPMHelpers::isPartitionNew( partition ) ) + if ( CalamaresUtils::Partition::isPartitionNew( partition ) ) updatePartitionToCreate( model->device(), partition ); else editExistingPartition( model->device(), partition ); @@ -452,7 +454,7 @@ PartitionPage::onPartitionViewActivated() // but I don't expect there will be other occurences of triggering the same // action from multiple UI elements in this page, so it does not feel worth // the price. - if ( KPMHelpers::isPartitionFreeSpace( partition ) ) + if ( CalamaresUtils::Partition::isPartitionFreeSpace( partition ) ) m_ui->createButton->click(); else m_ui->editButton->click(); diff --git a/src/modules/partition/gui/PartitionSplitterWidget.cpp b/src/modules/partition/gui/PartitionSplitterWidget.cpp index 0281ab32c..bcc80b65a 100644 --- a/src/modules/partition/gui/PartitionSplitterWidget.cpp +++ b/src/modules/partition/gui/PartitionSplitterWidget.cpp @@ -19,10 +19,12 @@ #include "PartitionSplitterWidget.h" #include "core/ColorUtils.h" -#include "core/PartitionIterator.h" #include "core/KPMHelpers.h" +#include "partition/PartitionIterator.h" +#include "partition/PartitionQuery.h" #include "utils/Logger.h" + #include "utils/CalamaresUtilsGui.h" #include @@ -33,6 +35,8 @@ #include #include +using CalamaresUtils::Partition::PartitionIterator; + 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; @@ -66,7 +70,7 @@ PartitionSplitterWidget::init( Device* dev, bool drawNestedPartitions ) PartitionSplitterItem newItem = { ( *it )->partitionPath(), ColorUtils::colorForPartition( *it ), - KPMHelpers::isPartitionFreeSpace( *it ), + CalamaresUtils::Partition::isPartitionFreeSpace( *it ), ( *it )->capacity(), PartitionSplitterItem::Normal, {} diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp index 1bb7f64fd..28ed77409 100644 --- a/src/modules/partition/gui/PartitionViewStep.cpp +++ b/src/modules/partition/gui/PartitionViewStep.cpp @@ -75,7 +75,7 @@ PartitionViewStep::PartitionViewStep( QObject* parent ) m_waitingWidget = new WaitingWidget( QString() ); m_widget->addWidget( m_waitingWidget ); - CALAMARES_RETRANSLATE( qobject_cast< WaitingWidget* >( m_waitingWidget )->setText( tr( "Gathering system information..." ) ); ) + CALAMARES_RETRANSLATE( m_waitingWidget->setText( tr( "Gathering system information..." ) ); ) m_core = new PartitionCoreModule( this ); // Unusable before init is complete! // We're not done loading, but we need the configuration map first. @@ -648,7 +648,7 @@ PartitionViewStep::checkRequirements() { QLatin1String( "partitions" ), []{ return tr( "has at least one disk device available." ); }, - []{ return tr( "There are no partitons to install on." ); }, + []{ return tr( "There are no partitions to install on." ); }, m_core->deviceModel()->rowCount() > 0, // satisfied #ifdef DEBUG_PARTITION_UNSAFE false // optional diff --git a/src/modules/partition/gui/PartitionViewStep.h b/src/modules/partition/gui/PartitionViewStep.h index 0a62b3aa3..20e9f4f1c 100644 --- a/src/modules/partition/gui/PartitionViewStep.h +++ b/src/modules/partition/gui/PartitionViewStep.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include "core/PartitionActions.h" @@ -35,6 +35,7 @@ class ChoicePage; class PartitionPage; class PartitionCoreModule; class QStackedWidget; +class WaitingWidget; template class QFutureWatcher; @@ -82,7 +83,7 @@ private: ChoicePage* m_choicePage; PartitionPage* m_manualPartitionPage; - QWidget* m_waitingWidget; + WaitingWidget* m_waitingWidget; QFutureWatcher* m_future; QSet< PartitionActions::Choices::SwapChoice > m_swapChoices; diff --git a/src/modules/partition/gui/ReplaceWidget.cpp b/src/modules/partition/gui/ReplaceWidget.cpp index 3d0711761..728b33c36 100644 --- a/src/modules/partition/gui/ReplaceWidget.cpp +++ b/src/modules/partition/gui/ReplaceWidget.cpp @@ -2,7 +2,7 @@ * * Copyright 2014-2015, Teo Mrnjavac * Copyright 2014, Aurélien Gâteau - * Copyright 2019, Adriaan de Groot + * Copyright 2019-2020, 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,7 +22,6 @@ #include "ui_ReplaceWidget.h" #include "core/DeviceModel.h" -#include "core/KPMHelpers.h" #include "core/PartitionCoreModule.h" #include "core/PartitionActions.h" #include "core/PartitionInfo.h" @@ -30,6 +29,7 @@ #include "Branding.h" #include "GlobalStorage.h" #include "JobQueue.h" +#include "partition/FileSystem.h" #include "utils/CalamaresUtilsGui.h" #include "utils/Retranslator.h" @@ -38,6 +38,9 @@ #include +using CalamaresUtils::Partition::untranslatedFS; +using CalamaresUtils::Partition::userVisibleFS; + ReplaceWidget::ReplaceWidget( PartitionCoreModule* core, QComboBox* devicesComboBox, QWidget* parent ) @@ -193,7 +196,7 @@ ReplaceWidget::onPartitionSelected() return; } - QString fsNameForUser = KPMHelpers::userVisibleFS( partition->fileSystem() ); + QString fsNameForUser = userVisibleFS( partition->fileSystem() ); QString prettyName = tr( "Data partition (%1)" ).arg( fsNameForUser ); for ( const QString& line : osproberLines ) { diff --git a/src/modules/partition/jobs/ClearMountsJob.cpp b/src/modules/partition/jobs/ClearMountsJob.cpp index 605087147..2678a70a3 100644 --- a/src/modules/partition/jobs/ClearMountsJob.cpp +++ b/src/modules/partition/jobs/ClearMountsJob.cpp @@ -21,7 +21,9 @@ #include "ClearMountsJob.h" #include "core/PartitionInfo.h" -#include "core/PartitionIterator.h" + +#include "partition/Sync.h" +#include "partition/PartitionIterator.h" #include "utils/Logger.h" // KPMcore @@ -33,6 +35,7 @@ #include #include +using CalamaresUtils::Partition::PartitionIterator; ClearMountsJob::ClearMountsJob( Device* device ) : Calamares::Job() @@ -57,25 +60,47 @@ ClearMountsJob::prettyStatusMessage() const } +QStringList +getPartitionsForDevice( const QString& deviceName ) +{ + QStringList partitions; + + QFile dev_partitions( "/proc/partitions" ); + if ( dev_partitions.open( QFile::ReadOnly ) ) + { + cDebug() << "Reading from" << dev_partitions.fileName(); + QTextStream in( &dev_partitions ); + (void) in.readLine(); // That's the header line, skip it + while ( !in.atEnd() ) + { + // The fourth column (index from 0, so index 3) is the name of the device; + // keep it if it is followed by something. + QStringList columns = in.readLine().split( ' ', QString::SkipEmptyParts ); + if ( ( columns.count() >= 4 ) && ( columns[3].startsWith( deviceName ) ) && ( columns[3] != deviceName ) ) + { + partitions.append( columns[3] ); + } + } + } + else + { + cDebug() << "Could not open" << dev_partitions.fileName(); + } + + return partitions; +} + Calamares::JobResult ClearMountsJob::exec() { - QStringList goodNews; + CalamaresUtils::Partition::Syncer s; QString deviceName = m_device->deviceNode().split( '/' ).last(); + QStringList goodNews; QProcess process; - process.setProgram( "sh" ); - process.setArguments( { - "-c", - QString( "echo $(awk '{print $4}' /proc/partitions | sed -e '/name/d' -e '/^$/d' -e '/[1-9]/!d' | grep %1)" ) - .arg( deviceName ) - } ); - process.start(); - process.waitForFinished(); - const QString partitions = process.readAllStandardOutput(); - const QStringList partitionsList = partitions.simplified().split( ' ' ); + QStringList partitionsList = getPartitionsForDevice( deviceName ); // Build a list of partitions of type 82 (Linux swap / Solaris). // We then need to clear them just in case they contain something resumable from a diff --git a/src/modules/partition/jobs/ClearMountsJob.h b/src/modules/partition/jobs/ClearMountsJob.h index 26514913e..6b98aac08 100644 --- a/src/modules/partition/jobs/ClearMountsJob.h +++ b/src/modules/partition/jobs/ClearMountsJob.h @@ -19,7 +19,7 @@ #ifndef CLEARMOUNTSJOB_H #define CLEARMOUNTSJOB_H -#include +#include "Job.h" class Device; diff --git a/src/modules/partition/jobs/ClearTempMountsJob.h b/src/modules/partition/jobs/ClearTempMountsJob.h index 36adca91b..d7b2c55f4 100644 --- a/src/modules/partition/jobs/ClearTempMountsJob.h +++ b/src/modules/partition/jobs/ClearTempMountsJob.h @@ -19,7 +19,7 @@ #ifndef CLEARTEMPMOUNTSJOB_H #define CLEARTEMPMOUNTSJOB_H -#include +#include "Job.h" class Device; diff --git a/src/modules/partition/jobs/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp index 0f9590bfd..afa7b3ecc 100644 --- a/src/modules/partition/jobs/CreatePartitionJob.cpp +++ b/src/modules/partition/jobs/CreatePartitionJob.cpp @@ -18,14 +18,12 @@ * along with Calamares. If not, see . */ -#include "jobs/CreatePartitionJob.h" - -#include "core/KPMHelpers.h" +#include "CreatePartitionJob.h" +#include "partition/FileSystem.h" #include "utils/Logger.h" #include "utils/Units.h" -// KPMcore #include #include #include @@ -34,8 +32,8 @@ #include #include -using KPMHelpers::untranslatedFS; -using KPMHelpers::userVisibleFS; +using CalamaresUtils::Partition::untranslatedFS; +using CalamaresUtils::Partition::userVisibleFS; CreatePartitionJob::CreatePartitionJob( Device* device, Partition* partition ) : PartitionJob( partition ) diff --git a/src/modules/partition/jobs/CreatePartitionJob.h b/src/modules/partition/jobs/CreatePartitionJob.h index e25c74241..fe4ab2203 100644 --- a/src/modules/partition/jobs/CreatePartitionJob.h +++ b/src/modules/partition/jobs/CreatePartitionJob.h @@ -20,7 +20,7 @@ #ifndef CREATEPARTITIONJOB_H #define CREATEPARTITIONJOB_H -#include +#include "PartitionJob.h" class Device; class Partition; diff --git a/src/modules/partition/jobs/CreatePartitionTableJob.cpp b/src/modules/partition/jobs/CreatePartitionTableJob.cpp index 3465a0e2d..b18f56a04 100644 --- a/src/modules/partition/jobs/CreatePartitionTableJob.cpp +++ b/src/modules/partition/jobs/CreatePartitionTableJob.cpp @@ -20,21 +20,22 @@ #include "jobs/CreatePartitionTableJob.h" -#include "core/PartitionIterator.h" - +#include "partition/PartitionIterator.h" #include "utils/Logger.h" // KPMcore -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include // Qt #include +using CalamaresUtils::Partition::PartitionIterator; + CreatePartitionTableJob::CreatePartitionTableJob( Device* device, PartitionTable::TableType type ) : m_device( device ) , m_type( type ) @@ -99,7 +100,7 @@ CreatePartitionTableJob::exec() cDebug() << "lsblk:\n" << lsblk.readAllStandardOutput(); QProcess mount; - mount.setProgram( "mount" ); + mount.setProgram( "mount" ); // Debug output only, not mounting something mount.setProcessChannelMode( QProcess::MergedChannels ); mount.start(); mount.waitForFinished(); diff --git a/src/modules/partition/jobs/CreatePartitionTableJob.h b/src/modules/partition/jobs/CreatePartitionTableJob.h index 38ef5365c..d4f65ba51 100644 --- a/src/modules/partition/jobs/CreatePartitionTableJob.h +++ b/src/modules/partition/jobs/CreatePartitionTableJob.h @@ -20,7 +20,8 @@ #ifndef CREATEPARTITIONTABLEJOB_H #define CREATEPARTITIONTABLEJOB_H -#include +#include "Job.h" +#include "partition/KPMManager.h" // KPMcore #include @@ -50,6 +51,7 @@ public: } private: + CalamaresUtils::Partition::KPMManager m_kpmcore; Device* m_device; PartitionTable::TableType m_type; PartitionTable* createTable(); diff --git a/src/modules/partition/jobs/CreateVolumeGroupJob.h b/src/modules/partition/jobs/CreateVolumeGroupJob.h index 6f85eaab8..dfdf0319f 100644 --- a/src/modules/partition/jobs/CreateVolumeGroupJob.h +++ b/src/modules/partition/jobs/CreateVolumeGroupJob.h @@ -19,12 +19,13 @@ #ifndef CREATEVOLUMEGROUPJOB_H #define CREATEVOLUMEGROUPJOB_H -#include - -#include +#include "Job.h" +#include "partition/KPMManager.h" #include +class Partition; + class CreateVolumeGroupJob : public Calamares::Job { Q_OBJECT @@ -40,6 +41,7 @@ public: void undoPreview(); private: + CalamaresUtils::Partition::KPMManager m_kpmcore; QString m_vgName; QVector< const Partition* > m_pvList; qint32 m_peSize; diff --git a/src/modules/partition/jobs/DeactivateVolumeGroupJob.h b/src/modules/partition/jobs/DeactivateVolumeGroupJob.h index 17be7cdef..ff6569b10 100644 --- a/src/modules/partition/jobs/DeactivateVolumeGroupJob.h +++ b/src/modules/partition/jobs/DeactivateVolumeGroupJob.h @@ -20,6 +20,7 @@ #define DEACTIVATEVOLUMEGROUPJOB_H #include "Job.h" +#include "partition/KPMManager.h" class LvmDevice; @@ -35,6 +36,7 @@ public: Calamares::JobResult exec() override; private: + CalamaresUtils::Partition::KPMManager m_kpmcore; LvmDevice* m_device; }; diff --git a/src/modules/partition/jobs/DeletePartitionJob.cpp b/src/modules/partition/jobs/DeletePartitionJob.cpp index 5cd4a08ea..07880ce65 100644 --- a/src/modules/partition/jobs/DeletePartitionJob.cpp +++ b/src/modules/partition/jobs/DeletePartitionJob.cpp @@ -21,12 +21,12 @@ #include "jobs/DeletePartitionJob.h" // KPMcore -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include DeletePartitionJob::DeletePartitionJob( Device* device, Partition* partition ) : PartitionJob( partition ) diff --git a/src/modules/partition/jobs/DeletePartitionJob.h b/src/modules/partition/jobs/DeletePartitionJob.h index 805689cc0..cdc0b7f63 100644 --- a/src/modules/partition/jobs/DeletePartitionJob.h +++ b/src/modules/partition/jobs/DeletePartitionJob.h @@ -20,7 +20,7 @@ #ifndef DELETEPARTITIONJOB_H #define DELETEPARTITIONJOB_H -#include +#include "PartitionJob.h" class Device; class Partition; diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.cpp b/src/modules/partition/jobs/FillGlobalStorageJob.cpp index 12faaf969..65c93014b 100644 --- a/src/modules/partition/jobs/FillGlobalStorageJob.cpp +++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp @@ -18,31 +18,31 @@ * along with Calamares. If not, see . */ -#include "jobs/FillGlobalStorageJob.h" +#include "FillGlobalStorageJob.h" #include "core/KPMHelpers.h" #include "core/PartitionInfo.h" -#include "core/PartitionIterator.h" #include "Branding.h" #include "GlobalStorage.h" #include "JobQueue.h" +#include "partition/FileSystem.h" +#include "partition/PartitionIterator.h" #include "utils/Logger.h" -// KPMcore -#include -#include -#include -#include +#include +#include +#include +#include -// Qt #include #include #include #include -using KPMHelpers::untranslatedFS; -using KPMHelpers::userVisibleFS; +using CalamaresUtils::Partition::untranslatedFS; +using CalamaresUtils::Partition::userVisibleFS; +using CalamaresUtils::Partition::PartitionIterator; typedef QHash< QString, QString > UuidForPartitionHash; @@ -100,14 +100,18 @@ mapForPartition( Partition* partition, const QString& uuid ) map[ "fs" ] = untranslatedFS( dynamic_cast< FS::luks& >( partition->fileSystem() ).innerFS() ); } map[ "uuid" ] = uuid; + map[ "claimed" ] = PartitionInfo::format( partition ); // If we formatted it, it's ours // Debugging for inside the loop in createPartitionList(), // so indent a bit Logger::CDebug deb; using TR = Logger::DebugRow< const char* const, const QString& >; deb << Logger::SubEntry << "mapping for" << partition->partitionPath() << partition->deviceNode() - << TR( "mtpoint:", PartitionInfo::mountPoint( partition ) ) << TR( "fs:", map[ "fs" ].toString() ) - << TR( "fsName", map[ "fsName" ].toString() ) << TR( "uuid", uuid ); + << TR( "mtpoint:", PartitionInfo::mountPoint( partition ) ) + << TR( "fs:", map[ "fs" ].toString() ) + << TR( "fsName", map[ "fsName" ].toString() ) + << TR( "uuid", uuid ) + << TR( "claimed", map[ "claimed" ].toString() ); if ( partition->roles().has( PartitionRole::Luks ) ) { @@ -213,6 +217,7 @@ FillGlobalStorageJob::exec() { Calamares::GlobalStorage* storage = Calamares::JobQueue::instance()->globalStorage(); storage->insert( "partitions", createPartitionList() ); + cDebug() << "Saving partition information map to GlobalStorage[\"partitions\"]"; if ( !m_bootLoaderPath.isEmpty() ) { QVariant var = createBootLoaderMap(); @@ -236,7 +241,7 @@ FillGlobalStorageJob::createPartitionList() const { UuidForPartitionHash hash = findPartitionUuids( m_devices ); QVariantList lst; - cDebug() << "Writing to GlobalStorage[\"partitions\"]"; + cDebug() << "Building partition information map"; for ( auto device : m_devices ) { cDebug() << Logger::SubEntry << "partitions on" << device->deviceNode(); diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.h b/src/modules/partition/jobs/FillGlobalStorageJob.h index 357d939a2..c2bf80a06 100644 --- a/src/modules/partition/jobs/FillGlobalStorageJob.h +++ b/src/modules/partition/jobs/FillGlobalStorageJob.h @@ -20,7 +20,7 @@ #ifndef FILLGLOBALSTORAGEJOB_H #define FILLGLOBALSTORAGEJOB_H -#include +#include "Job.h" // Qt #include diff --git a/src/modules/partition/jobs/FormatPartitionJob.cpp b/src/modules/partition/jobs/FormatPartitionJob.cpp index c877343c3..b8af7493d 100644 --- a/src/modules/partition/jobs/FormatPartitionJob.cpp +++ b/src/modules/partition/jobs/FormatPartitionJob.cpp @@ -2,6 +2,7 @@ * * Copyright 2014, Aurélien Gâteau * Copyright 2015-2016, Teo Mrnjavac + * Copyright 2020, 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,22 +18,20 @@ * along with Calamares. If not, see . */ -#include "jobs/FormatPartitionJob.h" - -#include "core/KPMHelpers.h" +#include "FormatPartitionJob.h" +#include "partition/FileSystem.h" #include "utils/Logger.h" -// KPMcore -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -using KPMHelpers::untranslatedFS; -using KPMHelpers::userVisibleFS; +using CalamaresUtils::Partition::untranslatedFS; +using CalamaresUtils::Partition::userVisibleFS; FormatPartitionJob::FormatPartitionJob( Device* device, Partition* partition ) : PartitionJob( partition ) diff --git a/src/modules/partition/jobs/FormatPartitionJob.h b/src/modules/partition/jobs/FormatPartitionJob.h index 683deb66e..9ce4a0677 100644 --- a/src/modules/partition/jobs/FormatPartitionJob.h +++ b/src/modules/partition/jobs/FormatPartitionJob.h @@ -20,7 +20,7 @@ #ifndef FORMATPARTITIONJOB_H #define FORMATPARTITIONJOB_H -#include +#include "PartitionJob.h" class Device; class Partition; diff --git a/src/modules/partition/jobs/PartitionJob.cpp b/src/modules/partition/jobs/PartitionJob.cpp index 1da8b0ba0..6adf99122 100644 --- a/src/modules/partition/jobs/PartitionJob.cpp +++ b/src/modules/partition/jobs/PartitionJob.cpp @@ -16,7 +16,7 @@ * along with Calamares. If not, see . */ -#include +#include "PartitionJob.h" PartitionJob::PartitionJob( Partition* partition ) : m_partition( partition ) diff --git a/src/modules/partition/jobs/PartitionJob.h b/src/modules/partition/jobs/PartitionJob.h index 61245203c..4cb5e5db6 100644 --- a/src/modules/partition/jobs/PartitionJob.h +++ b/src/modules/partition/jobs/PartitionJob.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014, Aurélien Gâteau + * Copyright 2019, 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,12 +20,13 @@ #ifndef PARTITIONJOB_H #define PARTITIONJOB_H -#include +#include "Job.h" +#include "partition/KPMManager.h" class Partition; /** - * Base class for jobs which affect a partition. + * Base class for jobs which affect a partition and which use KPMCore. */ class PartitionJob : public Calamares::Job { @@ -46,6 +48,7 @@ public slots: void iprogress( int percent ); protected: + CalamaresUtils::Partition::KPMManager m_kpmcore; Partition* m_partition; }; diff --git a/src/modules/partition/jobs/RemoveVolumeGroupJob.h b/src/modules/partition/jobs/RemoveVolumeGroupJob.h index 009e6f44d..8687eb544 100644 --- a/src/modules/partition/jobs/RemoveVolumeGroupJob.h +++ b/src/modules/partition/jobs/RemoveVolumeGroupJob.h @@ -19,7 +19,8 @@ #ifndef REMOVEVOLUMEGROUPJOB_H #define REMOVEVOLUMEGROUPJOB_H -#include +#include "Job.h" +#include "partition/KPMManager.h" class LvmDevice; @@ -35,6 +36,7 @@ public: Calamares::JobResult exec() override; private: + CalamaresUtils::Partition::KPMManager m_kpmcore; LvmDevice* m_device; }; diff --git a/src/modules/partition/jobs/ResizePartitionJob.cpp b/src/modules/partition/jobs/ResizePartitionJob.cpp index bac4c7a6c..ebc47d286 100644 --- a/src/modules/partition/jobs/ResizePartitionJob.cpp +++ b/src/modules/partition/jobs/ResizePartitionJob.cpp @@ -23,9 +23,9 @@ #include "utils/Units.h" // KPMcore -#include -#include -#include +#include +#include +#include using CalamaresUtils::BytesToMiB; diff --git a/src/modules/partition/jobs/ResizePartitionJob.h b/src/modules/partition/jobs/ResizePartitionJob.h index 9e6d39943..f8413f214 100644 --- a/src/modules/partition/jobs/ResizePartitionJob.h +++ b/src/modules/partition/jobs/ResizePartitionJob.h @@ -20,7 +20,7 @@ #ifndef RESIZEPARTITIONJOB_H #define RESIZEPARTITIONJOB_H -#include +#include "PartitionJob.h" class Device; class Partition; diff --git a/src/modules/partition/jobs/ResizeVolumeGroupJob.h b/src/modules/partition/jobs/ResizeVolumeGroupJob.h index fb0ff715b..1519dfa9d 100644 --- a/src/modules/partition/jobs/ResizeVolumeGroupJob.h +++ b/src/modules/partition/jobs/ResizeVolumeGroupJob.h @@ -19,7 +19,8 @@ #ifndef RESIZEVOLUMEGROUPJOB_H #define RESIZEVOLUMEGROUPJOB_H -#include +#include "Job.h" +#include "partition/KPMManager.h" #include @@ -42,6 +43,7 @@ private: QString targetPartitions() const; private: + CalamaresUtils::Partition::KPMManager m_kpmcore; LvmDevice* m_device; QVector< const Partition* > m_partitionList; }; diff --git a/src/modules/partition/jobs/SetPartitionFlagsJob.cpp b/src/modules/partition/jobs/SetPartitionFlagsJob.cpp index 09380a24c..7298e9bd0 100644 --- a/src/modules/partition/jobs/SetPartitionFlagsJob.cpp +++ b/src/modules/partition/jobs/SetPartitionFlagsJob.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2016, Teo Mrnjavac + * Copyright 2020, Adriaan de Groot * * Based on the SetPartFlagsJob class from KDE Partition Manager, * Copyright 2008, 2010, Volker Lanz @@ -21,21 +22,19 @@ #include "SetPartitionFlagsJob.h" -#include "core/KPMHelpers.h" - +#include "partition/FileSystem.h" #include "utils/Logger.h" #include "utils/Units.h" -// KPMcore -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include using CalamaresUtils::BytesToMiB; -using KPMHelpers::untranslatedFS; -using KPMHelpers::userVisibleFS; +using CalamaresUtils::Partition::untranslatedFS; +using CalamaresUtils::Partition::userVisibleFS; SetPartFlagsJob::SetPartFlagsJob( Device* device, Partition* partition, diff --git a/src/modules/partition/jobs/SetPartitionFlagsJob.h b/src/modules/partition/jobs/SetPartitionFlagsJob.h index 464ad0c6b..30cad9a21 100644 --- a/src/modules/partition/jobs/SetPartitionFlagsJob.h +++ b/src/modules/partition/jobs/SetPartitionFlagsJob.h @@ -22,7 +22,7 @@ #ifndef SETPARTITIONFLAGSJOB_H #define SETPARTITIONFLAGSJOB_H -#include +#include "PartitionJob.h" #include diff --git a/src/modules/partition/tests/CMakeLists.txt b/src/modules/partition/tests/CMakeLists.txt index ac3968df9..0bd559fd1 100644 --- a/src/modules/partition/tests/CMakeLists.txt +++ b/src/modules/partition/tests/CMakeLists.txt @@ -2,18 +2,6 @@ find_package( Qt5 COMPONENTS Gui REQUIRED ) set( PartitionModule_SOURCE_DIR .. ) -set( partitionjobtests_SRCS - ${PartitionModule_SOURCE_DIR}/core/KPMHelpers.cpp - ${PartitionModule_SOURCE_DIR}/core/PartitionInfo.cpp - ${PartitionModule_SOURCE_DIR}/core/PartitionIterator.cpp - ${PartitionModule_SOURCE_DIR}/jobs/CreatePartitionJob.cpp - ${PartitionModule_SOURCE_DIR}/jobs/CreatePartitionTableJob.cpp - ${PartitionModule_SOURCE_DIR}/jobs/DeletePartitionJob.cpp - ${PartitionModule_SOURCE_DIR}/jobs/PartitionJob.cpp - ${PartitionModule_SOURCE_DIR}/jobs/ResizePartitionJob.cpp - PartitionJobTests.cpp -) - include_directories( ${Qt5Gui_INCLUDE_DIRS} ${PartitionModule_SOURCE_DIR} @@ -21,16 +9,29 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ) -if( ECM_FOUND AND BUILD_TESTING ) - ecm_add_test( ${partitionjobtests_SRCS} - TEST_NAME partitionjobtests - LINK_LIBRARIES - ${CALAMARES_LIBRARIES} - kpmcore - Qt5::Core - Qt5::Test - ) +calamares_add_test( + partitionjobtests + SOURCES + PartitionJobTests.cpp + ${PartitionModule_SOURCE_DIR}/core/KPMHelpers.cpp + ${PartitionModule_SOURCE_DIR}/core/PartitionInfo.cpp + ${PartitionModule_SOURCE_DIR}/jobs/CreatePartitionJob.cpp + ${PartitionModule_SOURCE_DIR}/jobs/CreatePartitionTableJob.cpp + ${PartitionModule_SOURCE_DIR}/jobs/DeletePartitionJob.cpp + ${PartitionModule_SOURCE_DIR}/jobs/PartitionJob.cpp + ${PartitionModule_SOURCE_DIR}/jobs/ResizePartitionJob.cpp + LIBRARIES + kpmcore + DEFINITIONS ${_partition_defs} +) + +calamares_add_test( + clearmountsjobtests + SOURCES + ${PartitionModule_SOURCE_DIR}/jobs/ClearMountsJob.cpp + ClearMountsJobTests.cpp + LIBRARIES + kpmcore + DEFINITIONS ${_partition_defs} +) - set_target_properties( partitionjobtests PROPERTIES AUTOMOC TRUE ) - target_compile_definitions( partitionjobtests PRIVATE ${_partition_defs} ) -endif() diff --git a/src/modules/partition/tests/ClearMountsJobTests.cpp b/src/modules/partition/tests/ClearMountsJobTests.cpp new file mode 100644 index 000000000..1f01c4638 --- /dev/null +++ b/src/modules/partition/tests/ClearMountsJobTests.cpp @@ -0,0 +1,66 @@ +/* === This file is part of Calamares - === + * + * Copyright 2019, 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 "ClearMountsJobTests.h" + +#include "utils/Logger.h" + +#include + +QTEST_GUILESS_MAIN( ClearMountsJobTests ) + + +/* Not exactly public API */ +QStringList +getPartitionsForDevice( const QString& deviceName ); + +QStringList +getPartitionsForDevice_other(const QString& deviceName) +{ + QProcess process; + process.setProgram( "sh" ); + process.setArguments( { + "-c", + QString( "echo $(awk '{print $4}' /proc/partitions | sed -e '/name/d' -e '/^$/d' -e '/[1-9]/!d' | grep %1)" ) + .arg( deviceName ) + } ); + process.start(); + process.waitForFinished(); + + const QString partitions = process.readAllStandardOutput(); + const QStringList partitionsList = partitions.simplified().split( ' ' ); + + return partitionsList; +} + + +ClearMountsJobTests::ClearMountsJobTests() +{ + Logger::setupLogLevel(6); +} + +void ClearMountsJobTests::testFindPartitions() +{ + QStringList partitions = getPartitionsForDevice( "sda" ); + QStringList other_part = getPartitionsForDevice_other( "sda" ); + + cDebug() << "Initial implementation:" << Logger::DebugList( partitions ); + cDebug() << "Other implementation:" << Logger::DebugList( other_part ); + + QCOMPARE( partitions, other_part ); +} diff --git a/src/modules/welcome/Config.cpp b/src/modules/partition/tests/ClearMountsJobTests.h similarity index 77% rename from src/modules/welcome/Config.cpp rename to src/modules/partition/tests/ClearMountsJobTests.h index b46b85bf3..0cc2b5c78 100644 --- a/src/modules/welcome/Config.cpp +++ b/src/modules/partition/tests/ClearMountsJobTests.h @@ -16,13 +16,19 @@ * along with Calamares. If not, see . */ -#include "Config.h" +#ifndef CLEARMOUNTSJOBTESTS_H +#define CLEARMOUNTSJOBTESTS_H -Config::Config() - : m_helpUrl( "https://www.kde.org/" ) -{ -} +#include -Config::~Config() +class ClearMountsJobTests : public QObject { -} + Q_OBJECT +public: + ClearMountsJobTests(); + +private Q_SLOTS: + void testFindPartitions(); +}; + +#endif diff --git a/src/modules/partition/tests/PartitionJobTests.cpp b/src/modules/partition/tests/PartitionJobTests.cpp index b6e37c08e..94e822e42 100644 --- a/src/modules/partition/tests/PartitionJobTests.cpp +++ b/src/modules/partition/tests/PartitionJobTests.cpp @@ -20,16 +20,18 @@ #include +#include "partition/KPMManager.h" +#include "partition/PartitionQuery.h" +#include "utils/Logger.h" #include "utils/Units.h" +#include #include #include #include -#include // CalaPM #include -#include #include // Qt @@ -41,6 +43,7 @@ QTEST_GUILESS_MAIN( PartitionJobTests ) using namespace Calamares; using CalamaresUtils::operator""_MiB; +using CalamaresUtils::Partition::isPartitionFreeSpace; class PartitionMounter { @@ -57,15 +60,14 @@ public: ~PartitionMounter() { if ( !m_mounted ) + { return; + } int ret = QProcess::execute( "umount", QStringList() << m_mountPointDir.path() ); QCOMPARE( ret, 0 ); } - QString mountPoint() const - { - return m_mounted ? m_mountPointDir.path() : QString(); - } + QString mountPoint() const { return m_mounted ? m_mountPointDir.path() : QString(); } private: QString m_devicePath; @@ -78,9 +80,9 @@ static QByteArray generateTestData( qint64 size ) { QByteArray ba; - ba.resize( static_cast( size ) ); + ba.resize( static_cast< int >( size ) ); // Fill the array explicitly to keep Valgrind happy - for ( auto it = ba.data() ; it < ba.data() + size ; ++it ) + for ( auto it = ba.data(); it < ba.data() + size; ++it ) { *it = char( rand() & 0xff ); } @@ -103,9 +105,9 @@ writeFile( const QString& path, const QByteArray data ) if ( count < 0 ) { QString msg = QString( "Writing file failed. Only %1 bytes written out of %2. Error: '%3'." ) - .arg( ptr - data.constData() ) - .arg( data.size() ) - .arg( file.errorString() ); + .arg( ptr - data.constData() ) + .arg( data.size() ) + .arg( file.errorString() ); QFAIL( qPrintable( msg ) ); } ptr += count; @@ -115,9 +117,11 @@ writeFile( const QString& path, const QByteArray data ) static Partition* firstFreePartition( PartitionNode* parent ) { - for( auto child : parent->children() ) - if ( KPMHelpers::isPartitionFreeSpace( child ) ) + for ( auto child : parent->children() ) + if ( isPartitionFreeSpace( child ) ) + { return child; + } return nullptr; } @@ -144,7 +148,9 @@ QueueRunner::run() m_queue->start(); QEventLoop loop; while ( !m_finished ) + { loop.processEvents(); + } return m_success; } @@ -162,10 +168,13 @@ QueueRunner::onFailed( const QString& message, const QString& details ) QFAIL( qPrintable( msg ) ); } +CalamaresUtils::Partition::KPMManager* kpmcore = nullptr; + //- PartitionJobTests ------------------------------------------------------------------ PartitionJobTests::PartitionJobTests() : m_runner( &m_queue ) -{} +{ +} void PartitionJobTests::initTestCase() @@ -174,21 +183,27 @@ PartitionJobTests::initTestCase() if ( devicePath.isEmpty() ) { // The 0 is to keep the macro parameters happy - QSKIP( "Skipping test, CALAMARES_TEST_DISK is not set. It should point to a disk which can be safely formatted", 0 ); + QSKIP( "Skipping test, CALAMARES_TEST_DISK is not set. It should point to a disk which can be safely formatted", + 0 ); } - QVERIFY( KPMHelpers::initKPMcore() ); + kpmcore = new CalamaresUtils::Partition::KPMManager(); FileSystemFactory::init(); refreshDevice(); } +void +PartitionJobTests::cleanupTestCase() +{ + delete kpmcore; +} + void PartitionJobTests::refreshDevice() { QString devicePath = qgetenv( "CALAMARES_TEST_DISK" ); - CoreBackend* backend = CoreBackendManager::self()->backend(); - m_device.reset( backend->scanDevice( devicePath ) ); + m_device.reset( kpmcore->backend()->scanDevice( devicePath ) ); QVERIFY( !m_device.isNull() ); } @@ -207,7 +222,7 @@ PartitionJobTests::testPartitionTable() } void -PartitionJobTests::queuePartitionTableCreation( PartitionTable::TableType type) +PartitionJobTests::queuePartitionTableCreation( PartitionTable::TableType type ) { auto job = new CreatePartitionTableJob( m_device.data(), type ); job->updatePreview(); @@ -215,7 +230,10 @@ PartitionJobTests::queuePartitionTableCreation( PartitionTable::TableType type) } CreatePartitionJob* -PartitionJobTests::newCreatePartitionJob( Partition* freeSpacePartition, PartitionRole role, FileSystem::Type type, qint64 size ) +PartitionJobTests::newCreatePartitionJob( Partition* freeSpacePartition, + PartitionRole role, + FileSystem::Type type, + qint64 size ) { Q_ASSERT( freeSpacePartition ); @@ -223,25 +241,27 @@ PartitionJobTests::newCreatePartitionJob( Partition* freeSpacePartition, Partiti qint64 lastSector; if ( size > 0 ) + { lastSector = firstSector + size / m_device->logicalSize(); + } else + { lastSector = freeSpacePartition->lastSector(); - FileSystem* fs = FileSystemFactory::create( type, firstSector, lastSector - ,m_device->logicalSize() - ); + } + FileSystem* fs = FileSystemFactory::create( type, firstSector, lastSector, m_device->logicalSize() ); - Partition* partition = new Partition( - freeSpacePartition->parent(), - *m_device, - role, - fs, firstSector, lastSector, - QString() /* path */, - KPM_PARTITION_FLAG(None) /* availableFlags */, - QString() /* mountPoint */, - false /* mounted */, - KPM_PARTITION_FLAG(None) /* activeFlags */, - KPM_PARTITION_STATE(New) - ); + Partition* partition = new Partition( freeSpacePartition->parent(), + *m_device, + role, + fs, + firstSector, + lastSector, + QString() /* path */, + KPM_PARTITION_FLAG( None ) /* availableFlags */, + QString() /* mountPoint */, + false /* mounted */, + KPM_PARTITION_FLAG( None ) /* activeFlags */, + KPM_PARTITION_STATE( New ) ); return new CreatePartitionJob( m_device.data(), partition ); } @@ -254,7 +274,7 @@ PartitionJobTests::testCreatePartition() freePartition = firstFreePartition( m_device->partitionTable() ); QVERIFY( freePartition ); - job = newCreatePartitionJob( freePartition, PartitionRole( PartitionRole::Primary ), FileSystem::Ext4, 1_MiB); + job = newCreatePartitionJob( freePartition, PartitionRole( PartitionRole::Primary ), FileSystem::Ext4, 1_MiB ); Partition* partition1 = job->partition(); QVERIFY( partition1 ); job->updatePreview(); @@ -262,7 +282,7 @@ PartitionJobTests::testCreatePartition() freePartition = firstFreePartition( m_device->partitionTable() ); QVERIFY( freePartition ); - job = newCreatePartitionJob( freePartition, PartitionRole( PartitionRole::Primary ), FileSystem::LinuxSwap, 1_MiB); + job = newCreatePartitionJob( freePartition, PartitionRole( PartitionRole::Primary ), FileSystem::LinuxSwap, 1_MiB ); Partition* partition2 = job->partition(); QVERIFY( partition2 ); job->updatePreview(); @@ -270,7 +290,7 @@ PartitionJobTests::testCreatePartition() freePartition = firstFreePartition( m_device->partitionTable() ); QVERIFY( freePartition ); - job = newCreatePartitionJob( freePartition, PartitionRole( PartitionRole::Primary ), FileSystem::Fat32, 1_MiB); + job = newCreatePartitionJob( freePartition, PartitionRole( PartitionRole::Primary ), FileSystem::Fat32, 1_MiB ); Partition* partition3 = job->partition(); QVERIFY( partition3 ); job->updatePreview(); @@ -295,7 +315,7 @@ PartitionJobTests::testCreatePartitionExtended() freePartition = firstFreePartition( m_device->partitionTable() ); QVERIFY( freePartition ); - job = newCreatePartitionJob( freePartition, PartitionRole( PartitionRole::Primary ), FileSystem::Ext4, 10_MiB); + job = newCreatePartitionJob( freePartition, PartitionRole( PartitionRole::Primary ), FileSystem::Ext4, 10_MiB ); Partition* partition1 = job->partition(); QVERIFY( partition1 ); job->updatePreview(); @@ -303,14 +323,15 @@ PartitionJobTests::testCreatePartitionExtended() freePartition = firstFreePartition( m_device->partitionTable() ); QVERIFY( freePartition ); - job = newCreatePartitionJob( freePartition, PartitionRole( PartitionRole::Extended ), FileSystem::Extended, 10_MiB); + job = newCreatePartitionJob( + freePartition, PartitionRole( PartitionRole::Extended ), FileSystem::Extended, 10_MiB ); job->updatePreview(); m_queue.enqueue( job_ptr( job ) ); Partition* extendedPartition = job->partition(); freePartition = firstFreePartition( extendedPartition ); QVERIFY( freePartition ); - job = newCreatePartitionJob( freePartition, PartitionRole( PartitionRole::Logical ), FileSystem::Ext4, 0); + job = newCreatePartitionJob( freePartition, PartitionRole( PartitionRole::Logical ), FileSystem::Ext4, 0 ); Partition* partition2 = job->partition(); QVERIFY( partition2 ); job->updatePreview(); @@ -334,10 +355,10 @@ PartitionJobTests::testResizePartition_data() QTest::addColumn< unsigned int >( "newStartMiB" ); QTest::addColumn< unsigned int >( "newSizeMiB" ); - QTest::newRow("grow") << 10 << 50 << 10 << 70; - QTest::newRow("shrink") << 10 << 70 << 10 << 50; - QTest::newRow("moveLeft") << 10 << 50 << 8 << 50; - QTest::newRow("moveRight") << 10 << 50 << 12 << 50; + QTest::newRow( "grow" ) << 10 << 50 << 10 << 70; + QTest::newRow( "shrink" ) << 10 << 70 << 10 << 50; + QTest::newRow( "moveLeft" ) << 10 << 50 << 8 << 50; + QTest::newRow( "moveRight" ) << 10 << 50 << 12 << 50; } void @@ -351,9 +372,9 @@ PartitionJobTests::testResizePartition() const qint64 sectorsPerMiB = 1_MiB / m_device->logicalSize(); qint64 oldFirst = sectorsPerMiB * oldStartMiB; - qint64 oldLast = oldFirst + sectorsPerMiB * oldSizeMiB - 1; + qint64 oldLast = oldFirst + sectorsPerMiB * oldSizeMiB - 1; qint64 newFirst = sectorsPerMiB * newStartMiB; - qint64 newLast = newFirst + sectorsPerMiB * newSizeMiB - 1; + qint64 newLast = newFirst + sectorsPerMiB * newSizeMiB - 1; // Make the test data file smaller than the full size of the partition to // accomodate for the file system overhead @@ -367,15 +388,13 @@ PartitionJobTests::testResizePartition() Partition* freePartition = firstFreePartition( m_device->partitionTable() ); QVERIFY( freePartition ); - Partition* partition = KPMHelpers::createNewPartition( - freePartition->parent(), - *m_device, - PartitionRole( PartitionRole::Primary ), - FileSystem::Ext4, - oldFirst, - oldLast, - KPM_PARTITION_FLAG(None) - ); + Partition* partition = KPMHelpers::createNewPartition( freePartition->parent(), + *m_device, + PartitionRole( PartitionRole::Primary ), + FileSystem::Ext4, + oldFirst, + oldLast, + KPM_PARTITION_FLAG( None ) ); CreatePartitionJob* job = new CreatePartitionJob( m_device.data(), partition ); job->updatePreview(); m_queue.enqueue( job_ptr( job ) ); @@ -387,7 +406,8 @@ PartitionJobTests::testResizePartition() // Write a test file in the partition refreshDevice(); QVERIFY( m_device->partitionTable() ); - Partition* partition = m_device->partitionTable()->findPartitionBySector( oldFirst, PartitionRole( PartitionRole::Primary ) ); + Partition* partition + = m_device->partitionTable()->findPartitionBySector( oldFirst, PartitionRole( PartitionRole::Primary ) ); QVERIFY( partition ); QCOMPARE( partition->firstSector(), oldFirst ); QCOMPARE( partition->lastSector(), oldLast ); @@ -412,7 +432,8 @@ PartitionJobTests::testResizePartition() { refreshDevice(); QVERIFY( m_device->partitionTable() ); - Partition* partition = m_device->partitionTable()->findPartitionBySector( newFirst, PartitionRole( PartitionRole::Primary ) ); + Partition* partition + = m_device->partitionTable()->findPartitionBySector( newFirst, PartitionRole( PartitionRole::Primary ) ); QVERIFY( partition ); QCOMPARE( partition->firstSector(), newFirst ); QCOMPARE( partition->lastSector(), newLast ); diff --git a/src/modules/partition/tests/PartitionJobTests.h b/src/modules/partition/tests/PartitionJobTests.h index 62d5924ea..1aad945e5 100644 --- a/src/modules/partition/tests/PartitionJobTests.h +++ b/src/modules/partition/tests/PartitionJobTests.h @@ -59,6 +59,7 @@ public: private Q_SLOTS: void initTestCase(); + void cleanupTestCase(); void testPartitionTable(); void testCreatePartition(); void testCreatePartitionExtended(); @@ -71,7 +72,8 @@ private: QueueRunner m_runner; void queuePartitionTableCreation( PartitionTable::TableType type ); - CreatePartitionJob* newCreatePartitionJob( Partition* freeSpacePartition, PartitionRole, FileSystem::Type type, qint64 size ); + CreatePartitionJob* + newCreatePartitionJob( Partition* freeSpacePartition, PartitionRole, FileSystem::Type type, qint64 size ); void refreshDevice(); }; diff --git a/src/modules/plasmalnf/PlasmaLnfViewStep.h b/src/modules/plasmalnf/PlasmaLnfViewStep.h index 01db17821..e99418549 100644 --- a/src/modules/plasmalnf/PlasmaLnfViewStep.h +++ b/src/modules/plasmalnf/PlasmaLnfViewStep.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/src/modules/preservefiles/PreserveFiles.h b/src/modules/preservefiles/PreserveFiles.h index ed2fe889c..587ac9bab 100644 --- a/src/modules/preservefiles/PreserveFiles.h +++ b/src/modules/preservefiles/PreserveFiles.h @@ -24,7 +24,7 @@ #include #include "CppJob.h" -#include "PluginDllMacro.h" +#include "DllMacro.h" #include "utils/PluginFactory.h" diff --git a/src/modules/shellprocess/CMakeLists.txt b/src/modules/shellprocess/CMakeLists.txt index 166dff17d..ec1cf0bcf 100644 --- a/src/modules/shellprocess/CMakeLists.txt +++ b/src/modules/shellprocess/CMakeLists.txt @@ -8,17 +8,10 @@ calamares_add_plugin( shellprocess SHARED_LIB ) -if( ECM_FOUND AND BUILD_TESTING ) - ecm_add_test( - Tests.cpp - TEST_NAME - shellprocesstest - LINK_LIBRARIES - ${CALAMARES_LIBRARIES} - calamaresui - ${YAMLCPP_LIBRARY} - Qt5::Core - Qt5::Test - ) - calamares_automoc( shellprocesstest ) -endif() +calamares_add_test( + shellprocesstest + SOURCES + Tests.cpp + LIBRARIES + yamlcpp +) diff --git a/src/modules/shellprocess/ShellProcessJob.h b/src/modules/shellprocess/ShellProcessJob.h index d532aac99..708a43087 100644 --- a/src/modules/shellprocess/ShellProcessJob.h +++ b/src/modules/shellprocess/ShellProcessJob.h @@ -20,7 +20,7 @@ #define SHELLPROCESSJOB_H #include "CppJob.h" -#include "PluginDllMacro.h" +#include "DllMacro.h" #include "utils/CommandList.h" #include "utils/PluginFactory.h" diff --git a/src/modules/summary/SummaryViewStep.h b/src/modules/summary/SummaryViewStep.h index 88f177a4d..2c873e168 100644 --- a/src/modules/summary/SummaryViewStep.h +++ b/src/modules/summary/SummaryViewStep.h @@ -24,7 +24,7 @@ #include #include -#include +#include class SummaryPage; diff --git a/src/modules/tracking/TrackingViewStep.h b/src/modules/tracking/TrackingViewStep.h index dc952253a..df6497d68 100644 --- a/src/modules/tracking/TrackingViewStep.h +++ b/src/modules/tracking/TrackingViewStep.h @@ -21,7 +21,7 @@ #include "TrackingType.h" -#include +#include #include #include diff --git a/src/modules/unpackfs/main.py b/src/modules/unpackfs/main.py index a6ee3455d..d3a7198e9 100644 --- a/src/modules/unpackfs/main.py +++ b/src/modules/unpackfs/main.py @@ -8,6 +8,8 @@ # Copyright 2014, Philip Müller # Copyright 2017, Alf Gaida # Copyright 2019, Kevin Kofler +# Copyright 2020, Adriaan de Groot +# Copyright 2020, 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 @@ -30,6 +32,7 @@ import sys import tempfile from libcalamares import * +from libcalamares.utils import mount import gettext _ = gettext.translation("calamares-python", @@ -130,7 +133,8 @@ def file_copy(source, entry, progress_cb): args.extend(["--exclude", f]) args.extend(['--progress', source, dest]) process = subprocess.Popen( - args, env=at_env, bufsize=1, stdout=subprocess.PIPE, close_fds=ON_POSIX + args, env=at_env, universal_newlines=True, bufsize=1, + stdout=subprocess.PIPE, close_fds=ON_POSIX ) # last_num_files_copied trails num_files_copied, and whenever at least 100 more # files have been copied, progress is reported and last_num_files_copied is updated. @@ -274,34 +278,29 @@ class UnpackOperation: def mount_image(self, entry, imgmountdir): """ - Mount given image as loop device. + Mount given @p entry as loop device on @p imgmountdir. A *file* entry (e.g. one with *sourcefs* set to *file*) is not mounted and just ignored. - :param entry: - :param imgmountdir: + :param entry: the entry to mount (source is the important property) + :param imgmountdir: where to mount it + + :returns: None, but throws if the mount failed """ if entry.is_file(): return if os.path.isdir(entry.source): - subprocess.check_call(["mount", - "--bind", entry.source, - imgmountdir]) + r = mount(entry.source, imgmountdir, "", "--bind") elif os.path.isfile(entry.source): - subprocess.check_call(["mount", - entry.source, - imgmountdir, - "-t", entry.sourcefs, - "-o", "loop" - ]) + r = mount(entry.source, imgmountdir, entry.sourcefs, "loop") else: # entry.source is a device - subprocess.check_call(["mount", - entry.source, - imgmountdir, - "-t", entry.sourcefs - ]) + r = mount(entry.source, imgmountdir, entry.sourcefs, "") + + if r != 0: + raise subprocess.CalledProcessError(r, "mount") + def unpack_image(self, entry, imgmountdir): """ @@ -385,9 +384,10 @@ def run(): sourcefs = entry["sourcefs"] if sourcefs not in supported_filesystems: - utils.warning("The filesystem for \"{}\" ({}) is not supported".format(source, sourcefs)) + utils.warning("The filesystem for \"{}\" ({}) is not supported by your current kernel".format(source, sourcefs)) + utils.warning(" ... modprobe {} may solve the problem".format(sourcefs)) return (_("Bad unsquash configuration"), - _("The filesystem for \"{}\" ({}) is not supported").format(source, sourcefs)) + _("The filesystem for \"{}\" ({}) is not supported by your current kernel").format(source, sourcefs)) if not os.path.exists(source): utils.warning("The source filesystem \"{}\" does not exist".format(source)) return (_("Bad unsquash configuration"), diff --git a/src/modules/users/CMakeLists.txt b/src/modules/users/CMakeLists.txt index d0e7b6d9d..1d969a93b 100644 --- a/src/modules/users/CMakeLists.txt +++ b/src/modules/users/CMakeLists.txt @@ -1,4 +1,4 @@ -find_package( Qt5 COMPONENTS Core REQUIRED ) +find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Core DBus Network ) find_package( Crypt REQUIRED ) # Add optional libraries here @@ -36,20 +36,24 @@ calamares_add_plugin( users calamaresui ${CRYPT_LIBRARIES} ${USER_EXTRA_LIB} + Qt5::DBus SHARED_LIB ) -if( ECM_FOUND AND BUILD_TESTING ) - ecm_add_test( - PasswordTests.cpp - SetPasswordJob.cpp - TEST_NAME - passwordtest - LINK_LIBRARIES - ${CALAMARES_LIBRARIES} - Qt5::Core - Qt5::Test - ${CRYPT_LIBRARIES} - ) - calamares_automoc( passwordtest ) -endif() +calamares_add_test( + userspasswordtest + SOURCES + PasswordTests.cpp + SetPasswordJob.cpp + LIBRARIES + ${CRYPT_LIBRARIES} +) + +calamares_add_test( + userstest + SOURCES + Tests.cpp + SetHostNameJob.cpp + LIBRARIES + Qt5::DBus +) diff --git a/src/modules/users/SetHostNameJob.cpp b/src/modules/users/SetHostNameJob.cpp index b03d7a200..db220d042 100644 --- a/src/modules/users/SetHostNameJob.cpp +++ b/src/modules/users/SetHostNameJob.cpp @@ -2,7 +2,7 @@ * * Copyright 2014, Rohan Garg * Copyright 2015, Teo Mrnjavac - * Copyright 2018, Adriaan de Groot + * Copyright 2018, 2020, 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,14 +22,19 @@ #include "GlobalStorage.h" #include "JobQueue.h" +#include "utils/CalamaresUtilsSystem.h" #include "utils/Logger.h" #include #include +#include +#include +#include -SetHostNameJob::SetHostNameJob( const QString& hostname ) +SetHostNameJob::SetHostNameJob( const QString& hostname, Actions a ) : Calamares::Job() , m_hostname( hostname ) + , m_actions( a ) { } @@ -53,6 +58,68 @@ SetHostNameJob::prettyStatusMessage() const return tr( "Setting hostname %1." ).arg( m_hostname ); } +STATICTEST bool +setFileHostname( const QString& hostname ) +{ + return !( CalamaresUtils::System::instance() + ->createTargetFile( QStringLiteral( "/etc/hostname" ), ( hostname + '\n' ).toUtf8() ) + .failed() ); +} + +STATICTEST bool +writeFileEtcHosts( const QString& hostname ) +{ + // The actual hostname gets substituted in at %1 + static const char etc_hosts[] = R"(# Host addresses +127.0.0.1 localhost +127.0.1.1 %1 +::1 localhost ip6-localhost ip6-loopback +ff02::1 ip6-allnodes +ff02::2 ip6-allrouters +)"; + + return !( CalamaresUtils::System::instance() + ->createTargetFile( QStringLiteral( "/etc/hosts" ), QString( etc_hosts ).arg( hostname ).toUtf8() ) + .failed() ); +} + +STATICTEST bool +setSystemdHostname( const QString& hostname ) +{ + QDBusInterface hostnamed( "org.freedesktop.hostname1", + "/org/freedesktop/hostname1", + "org.freedesktop.hostname1", + QDBusConnection::systemBus() ); + if ( !hostnamed.isValid() ) + { + cWarning() << "Interface" << hostnamed.interface() << "is not valid."; + return false; + } + + bool success = true; + // Static, writes /etc/hostname + { + QDBusReply< void > r = hostnamed.call( "SetStaticHostname", hostname, false ); + if ( !r.isValid() ) + { + cWarning() << "Could not set hostname through org.freedesktop.hostname1.SetStaticHostname." << r.error(); + success = false; + } + } + // Dynamic, updates kernel + { + QDBusReply< void > r = hostnamed.call( "SetHostname", hostname, false ); + if ( !r.isValid() ) + { + cWarning() << "Could not set hostname through org.freedesktop.hostname1.SetHostname." << r.error(); + success = false; + } + } + + return success; +} + + Calamares::JobResult SetHostNameJob::exec() { @@ -71,43 +138,29 @@ SetHostNameJob::exec() return Calamares::JobResult::error( tr( "Internal Error" ) ); } - QFile hostfile( destDir + "/etc/hostname" ); - if ( !hostfile.open( QFile::WriteOnly ) ) + if ( m_actions & Action::EtcHostname ) { - cError() << "Can't write to hostname file"; - return Calamares::JobResult::error( tr( "Cannot write hostname to target system" ) ); + if ( !setFileHostname( m_hostname ) ) + { + cError() << "Can't write to hostname file"; + return Calamares::JobResult::error( tr( "Cannot write hostname to target system" ) ); + } } - QTextStream hostfileout( &hostfile ); - hostfileout << m_hostname << "\n"; - hostfile.close(); - - QFile hostsfile( destDir + "/etc/hosts" ); - if ( !hostsfile.open( QFile::WriteOnly ) ) + if ( m_actions & Action::WriteEtcHosts ) { - cError() << "Can't write to hosts file"; - return Calamares::JobResult::error( tr( "Cannot write hostname to target system" ) ); + if ( !writeFileEtcHosts( m_hostname ) ) + { + cError() << "Can't write to hosts file"; + return Calamares::JobResult::error( tr( "Cannot write hostname to target system" ) ); + } } - // We also need to write the appropriate entries for /etc/hosts - QTextStream hostsfileout( &hostsfile ); - // ipv4 support - hostsfileout << "127.0.0.1" - << "\t" - << "localhost" - << "\n"; - hostsfileout << "127.0.1.1" - << "\t" << m_hostname << "\n"; - // ipv6 support - hostsfileout << "::1" - << "\t" - << "localhost ip6-localhost ip6-loopback" - << "\n"; - hostsfileout << "ff02::1 ip6-allnodes" - << "\n" - << "ff02::2 ip6-allrouters" - << "\n"; - hostsfile.close(); + if ( m_actions & Action::SystemdHostname ) + { + // Does its own logging + setSystemdHostname( m_hostname ); + } return Calamares::JobResult::ok(); } diff --git a/src/modules/users/SetHostNameJob.h b/src/modules/users/SetHostNameJob.h index ca2481dd4..619e2ba59 100644 --- a/src/modules/users/SetHostNameJob.h +++ b/src/modules/users/SetHostNameJob.h @@ -2,6 +2,7 @@ * * Copyright 2014, Rohan Garg * Copyright 2015, Teo Mrnjavac + * Copyright 2020, 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,7 +27,17 @@ class SetHostNameJob : public Calamares::Job { Q_OBJECT public: - SetHostNameJob( const QString& hostname ); + enum Action + { + None = 0x0, + EtcHostname = 0x1, // Write to /etc/hostname directly + SystemdHostname = 0x2, // Set via hostnamed(1) + WriteEtcHosts = 0x4 // Write /etc/hosts (127.0.1.1 is this host) + }; + Q_DECLARE_FLAGS( Actions, Action ) + + + SetHostNameJob( const QString& hostname, Actions a ); QString prettyName() const override; QString prettyDescription() const override; QString prettyStatusMessage() const override; @@ -34,7 +45,9 @@ public: private: const QString m_hostname; + const Actions m_actions; }; +Q_DECLARE_OPERATORS_FOR_FLAGS( SetHostNameJob::Actions ) #endif // SETHOSTNAMEJOB_CPP_H diff --git a/src/modules/users/Tests.cpp b/src/modules/users/Tests.cpp new file mode 100644 index 000000000..196fd9d68 --- /dev/null +++ b/src/modules/users/Tests.cpp @@ -0,0 +1,145 @@ +/* === This file is part of Calamares - === + * + * Copyright 2020, 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 "SetHostNameJob.h" + +// Implementation details +extern bool setFileHostname( const QString& ); +extern bool writeFileEtcHosts( const QString& ); +extern bool setSystemdHostname( const QString& ); + +#include "GlobalStorage.h" +#include "JobQueue.h" +#include "utils/CalamaresUtilsSystem.h" +#include "utils/Logger.h" +#include "utils/Yaml.h" + +#include +#include + +class UsersTests : public QObject +{ + Q_OBJECT +public: + UsersTests(); + virtual ~UsersTests() {} + +private Q_SLOTS: + void initTestCase(); + + void testEtcHostname(); + void testEtcHosts(); + void testHostnamed(); + + void cleanup(); + +private: + QTemporaryDir m_dir; +}; + +UsersTests::UsersTests() + : m_dir( QStringLiteral( "/tmp/calamares-usertest" ) ) +{ +} + +void +UsersTests::initTestCase() +{ + Logger::setupLogLevel( Logger::LOGDEBUG ); + cDebug() << "Users test started."; + cDebug() << "Test dir" << m_dir.path(); + + // Ensure we have a system object, expect it to be a "bogus" one + CalamaresUtils::System* system = CalamaresUtils::System::instance(); + QVERIFY( system ); + QVERIFY( system->doChroot() ); + + // Ensure we have a system-wide GlobalStorage with /tmp as root + if ( !Calamares::JobQueue::instance() ) + { + cDebug() << "Creating new JobQueue"; + (void)new Calamares::JobQueue(); + } + Calamares::GlobalStorage* gs + = Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr; + QVERIFY( gs ); + gs->insert( "rootMountPoint", m_dir.path() ); +} + +void +UsersTests::testEtcHostname() +{ + cDebug() << "Test dir" << m_dir.path(); + + QVERIFY( QFile::exists( m_dir.path() ) ); + QVERIFY( !QFile::exists( m_dir.filePath( "etc" ) ) ); + + // Doesn't create intermediate directories + QVERIFY( !setFileHostname( QStringLiteral( "tubophone.calamares.io" ) ) ); + + QVERIFY( CalamaresUtils::System::instance()->createTargetDirs( "/etc" ) ); + QVERIFY( QFile::exists( m_dir.filePath( "etc" ) ) ); + + // Does write the file + QVERIFY( setFileHostname( QStringLiteral( "tubophone.calamares.io" ) ) ); + QVERIFY( QFile::exists( m_dir.filePath( "etc/hostname" ) ) ); + + // 22 for the test string, above, and 1 for the newline + QCOMPARE( QFileInfo( m_dir.filePath( "etc/hostname" ) ).size(), 22 + 1 ); +} + +void +UsersTests::testEtcHosts() +{ + // Assume previous tests did their work + QVERIFY( QFile::exists( m_dir.path() ) ); + QVERIFY( QFile::exists( m_dir.filePath( "etc" ) ) ); + + QVERIFY( writeFileEtcHosts( QStringLiteral( "tubophone.calamares.io" ) ) ); + QVERIFY( QFile::exists( m_dir.filePath( "etc/hosts" ) ) ); + // The skeleton contains %1 which has the hostname substituted in, so we lose two, + // and the rest of the blabla is 150 (according to Python) + QCOMPARE( QFileInfo( m_dir.filePath( "etc/hosts" ) ).size(), 150 + 22 - 2 ); +} + +void +UsersTests::testHostnamed() +{ + // Since the service might not be running (e.g. non-systemd systems, + // FreeBSD, docker, ..) we're not going to fail a test here. + // There's also the permissions problem to think of. + QEXPECT_FAIL( "", "Hostname changes are access-controlled", Continue ); + QVERIFY( setSystemdHostname( "tubophone.calamares.io" ) ); +} + + +void +UsersTests::cleanup() +{ + if ( QTest::currentTestFailed() ) + { + m_dir.setAutoRemove( false ); + } +} + + +QTEST_GUILESS_MAIN( UsersTests ) + +#include "utils/moc-warnings.h" + +#include "Tests.moc" diff --git a/src/modules/users/UsersPage.cpp b/src/modules/users/UsersPage.cpp index a7c72ce69..21f472a40 100644 --- a/src/modules/users/UsersPage.cpp +++ b/src/modules/users/UsersPage.cpp @@ -3,6 +3,7 @@ * Copyright 2014-2017, Teo Mrnjavac * Copyright 2017-2018, Adriaan de Groot * Copyright 2019, Collabora Ltd + * Copyright 2020, Gabriel Craciunescu * * Portions from the Manjaro Installation Framework * by Roland Singer @@ -40,6 +41,7 @@ #include "utils/String.h" #include +#include #include #include #include @@ -97,14 +99,12 @@ UsersPage::UsersPage( QWidget* parent ) connect( ui->textBoxUserVerifiedPassword, &QLineEdit::textChanged, this, &UsersPage::onPasswordTextChanged ); connect( ui->textBoxRootPassword, &QLineEdit::textChanged, this, &UsersPage::onRootPasswordTextChanged ); connect( ui->textBoxVerifiedRootPassword, &QLineEdit::textChanged, this, &UsersPage::onRootPasswordTextChanged ); - connect( ui->checkBoxValidatePassword, &QCheckBox::stateChanged, this, [this]( int ) - { + connect( ui->checkBoxValidatePassword, &QCheckBox::stateChanged, this, [this]( int ) { onPasswordTextChanged( ui->textBoxUserPassword->text() ); onRootPasswordTextChanged( ui->textBoxRootPassword->text() ); checkReady( isReady() ); } ); - connect( ui->checkBoxReusePassword, &QCheckBox::stateChanged, this, [this]( int checked ) - { + connect( ui->checkBoxReusePassword, &QCheckBox::stateChanged, this, [this]( int checked ) { ui->labelChooseRootPassword->setVisible( !checked ); ui->labelRootPassword->setVisible( !checked ); ui->labelRootPasswordError->setVisible( !checked ); @@ -166,6 +166,37 @@ UsersPage::isReady() return readyFields && m_readyRootPassword; } +QString +UsersPage::getHostname() const +{ + return ui->textBoxHostname->text(); +} + +QString +UsersPage::getRootPassword() const +{ + if ( m_writeRootPassword ) + { + if ( ui->checkBoxReusePassword->isChecked() ) + { + return ui->textBoxUserPassword->text(); + } + else + { + return ui->textBoxRootPassword->text(); + } + } + else + { + return QString(); + } +} + +QPair< QString, QString > +UsersPage::getUserPassword() const +{ + return QPair< QString, QString >( ui->textBoxUsername->text(), ui->textBoxUserPassword->text() ); +} QList< Calamares::job_ptr > UsersPage::createJobs( const QStringList& defaultGroupsList ) @@ -186,32 +217,10 @@ UsersPage::createJobs( const QStringList& defaultGroupsList ) defaultGroupsList ); list.append( Calamares::job_ptr( j ) ); - j = new SetPasswordJob( ui->textBoxUsername->text(), ui->textBoxUserPassword->text() ); - list.append( Calamares::job_ptr( j ) ); - if ( m_writeRootPassword ) { gs->insert( "reuseRootPassword", ui->checkBoxReusePassword->isChecked() ); - if ( ui->checkBoxReusePassword->isChecked() ) - { - j = new SetPasswordJob( "root", ui->textBoxUserPassword->text() ); - } - else - { - j = new SetPasswordJob( "root", ui->textBoxRootPassword->text() ); - } - list.append( Calamares::job_ptr( j ) ); } - else - { - j = new SetPasswordJob( "root", - "" ); //explicitly disable root password - list.append( Calamares::job_ptr( j ) ); - } - - j = new SetHostNameJob( ui->textBoxHostname->text() ); - list.append( Calamares::job_ptr( j ) ); - gs->insert( "hostname", ui->textBoxHostname->text() ); if ( ui->checkBoxAutoLogin->isChecked() ) { @@ -269,6 +278,38 @@ UsersPage::onFullNameTextEdited( const QString& textRef ) checkReady( isReady() ); } +/** @brief Guess the machine's name + * + * If there is DMI data, use that; otherwise, just call the machine "-pc". + * Reads the DMI data just once. + */ +static QString +guessProductName() +{ + static bool tried = false; + static QString dmiProduct; + + if ( !tried ) + { + // yes validateHostnameText() but these files can be a mess + QRegExp dmirx( "[^a-zA-Z0-9]", Qt::CaseInsensitive ); + QFile dmiFile( QStringLiteral( "/sys/devices/virtual/dmi/id/product_name" ) ); + + if ( dmiFile.exists() && dmiFile.open( QIODevice::ReadOnly ) ) + { + dmiProduct = QString::fromLocal8Bit( dmiFile.readAll().simplified().data() ) + .toLower() + .replace( dmirx, " " ) + .remove( ' ' ); + } + if ( dmiProduct.isEmpty() ) + { + dmiProduct = QStringLiteral( "-pc" ); + } + tried = true; + } + return dmiProduct; +} void UsersPage::fillSuggestions() @@ -303,7 +344,9 @@ UsersPage::fillSuggestions() { if ( !cleanParts.isEmpty() && !cleanParts.first().isEmpty() ) { - QString hostnameSuggestion = QString( "%1-pc" ).arg( cleanParts.first() ); + QString hostnameSuggestion; + QString productName = guessProductName(); + hostnameSuggestion = QString( "%1-%2" ).arg( cleanParts.first() ).arg( productName ); if ( HOSTNAME_RX.indexIn( hostnameSuggestion ) != -1 ) { ui->textBoxHostname->setText( hostnameSuggestion ); @@ -524,10 +567,10 @@ UsersPage::addPasswordCheck( const QString& key, const QVariant& value ) { if ( value.toBool() ) { - m_passwordChecks.push_back( PasswordCheck( - []() { return QCoreApplication::translate( "PWQ", "Password is empty" ); }, - []( const QString& s ) { return !s.isEmpty(); }, - PasswordCheck::Weight( 1 ) ) ); + m_passwordChecks.push_back( + PasswordCheck( []() { return QCoreApplication::translate( "PWQ", "Password is empty" ); }, + []( const QString& s ) { return !s.isEmpty(); }, + PasswordCheck::Weight( 1 ) ) ); } } #ifdef CHECK_PWQUALITY diff --git a/src/modules/users/UsersPage.h b/src/modules/users/UsersPage.h index c6bf87ecf..3382e9335 100644 --- a/src/modules/users/UsersPage.h +++ b/src/modules/users/UsersPage.h @@ -63,6 +63,13 @@ public: */ void addPasswordCheck( const QString& key, const QVariant& value ); + ///@brief Hostname as entered / auto-filled + QString getHostname() const; + ///@brief Root password, depends on settings, may be empty + QString getRootPassword() const; + ///@brief User name and password + QPair< QString, QString > getUserPassword() const; + protected slots: void onFullNameTextEdited( const QString& ); void fillSuggestions(); diff --git a/src/modules/users/UsersViewStep.cpp b/src/modules/users/UsersViewStep.cpp index b898f00c8..fe633b1c2 100644 --- a/src/modules/users/UsersViewStep.cpp +++ b/src/modules/users/UsersViewStep.cpp @@ -20,10 +20,12 @@ #include "UsersViewStep.h" +#include "SetHostNameJob.h" +#include "SetPasswordJob.h" #include "UsersPage.h" -// #include "utils/CalamaresUtils.h" #include "utils/Logger.h" +#include "utils/NamedEnum.h" #include "utils/Variant.h" #include "GlobalStorage.h" @@ -31,9 +33,28 @@ CALAMARES_PLUGIN_FACTORY_DEFINITION( UsersViewStepFactory, registerPlugin< UsersViewStep >(); ) +static const NamedEnumTable< SetHostNameJob::Action >& +hostnameActions() +{ + using Action = SetHostNameJob::Action; + + // *INDENT-OFF* + // clang-format off + static const NamedEnumTable< Action > names { + { QStringLiteral( "none" ), Action::None }, + { QStringLiteral( "etcfile" ), Action::EtcHostname }, + { QStringLiteral( "hostnamed" ), Action::SystemdHostname } + }; + // clang-format on + // *INDENT-ON* + + return names; +} + UsersViewStep::UsersViewStep( QObject* parent ) : Calamares::ViewStep( parent ) , m_widget( new UsersPage() ) + , m_actions( SetHostNameJob::Action::None ) { emit nextStatusChanged( true ); connect( m_widget, &UsersPage::checkReady, this, &UsersViewStep::nextStatusChanged ); @@ -109,14 +130,27 @@ void UsersViewStep::onLeave() { m_jobs.clear(); - m_jobs.append( m_widget->createJobs( m_defaultGroups ) ); + + Calamares::Job* j; + + auto userPW = m_widget->getUserPassword(); + j = new SetPasswordJob( userPW.first, userPW.second ); + m_jobs.append( Calamares::job_ptr( j ) ); + + j = new SetPasswordJob( "root", m_widget->getRootPassword() ); + m_jobs.append( Calamares::job_ptr( j ) ); + + j = new SetHostNameJob( m_widget->getHostname(), m_actions ); + m_jobs.append( Calamares::job_ptr( j ) ); } void UsersViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { + using CalamaresUtils::getBool; + if ( configurationMap.contains( "defaultGroups" ) && configurationMap.value( "defaultGroups" ).type() == QVariant::List ) { @@ -142,25 +176,12 @@ UsersViewStep::setConfigurationMap( const QVariantMap& configurationMap ) configurationMap.value( "sudoersGroup" ).toString() ); } - if ( configurationMap.contains( "setRootPassword" ) - && configurationMap.value( "setRootPassword" ).type() == QVariant::Bool ) - { - Calamares::JobQueue::instance()->globalStorage()->insert( - "setRootPassword", configurationMap.value( "setRootPassword" ).toBool() ); - m_widget->setWriteRootPassword( configurationMap.value( "setRootPassword" ).toBool() ); - } + bool setRootPassword = getBool( configurationMap, "setRootPassword", true ); + Calamares::JobQueue::instance()->globalStorage()->insert( "setRootPassword", setRootPassword ); - if ( configurationMap.contains( "doAutologin" ) - && configurationMap.value( "doAutologin" ).type() == QVariant::Bool ) - { - m_widget->setAutologinDefault( configurationMap.value( "doAutologin" ).toBool() ); - } - - if ( configurationMap.contains( "doReusePassword" ) - && configurationMap.value( "doReusePassword" ).type() == QVariant::Bool ) - { - m_widget->setReusePasswordDefault( configurationMap.value( "doReusePassword" ).toBool() ); - } + m_widget->setWriteRootPassword( setRootPassword ); + m_widget->setAutologinDefault( getBool( configurationMap, "doAutologin", false ) ); + m_widget->setReusePasswordDefault( getBool( configurationMap, "doReusePassword", false ) ); if ( configurationMap.contains( "passwordRequirements" ) && configurationMap.value( "passwordRequirements" ).type() == QVariant::Map ) @@ -173,8 +194,8 @@ UsersViewStep::setConfigurationMap( const QVariantMap& configurationMap ) } } - m_widget->setPasswordCheckboxVisible( CalamaresUtils::getBool( configurationMap, "allowWeakPasswords", false ) ); - m_widget->setValidatePasswordDefault( !CalamaresUtils::getBool( configurationMap, "allowWeakPasswordsDefault", false) ); + m_widget->setPasswordCheckboxVisible( getBool( configurationMap, "allowWeakPasswords", false ) ); + m_widget->setValidatePasswordDefault( !getBool( configurationMap, "allowWeakPasswordsDefault", false ) ); QString shell( QLatin1String( "/bin/bash" ) ); // as if it's not set at all if ( configurationMap.contains( "userShell" ) ) @@ -184,4 +205,21 @@ UsersViewStep::setConfigurationMap( const QVariantMap& configurationMap ) // Now it might be explicitly set to empty, which is ok Calamares::JobQueue::instance()->globalStorage()->insert( "userShell", shell ); + + using Action = SetHostNameJob::Action; + + QString hostnameActionString = CalamaresUtils::getString( configurationMap, "setHostname" ); + if ( hostnameActionString.isEmpty() ) + { + hostnameActionString = QStringLiteral( "EtcFile" ); + } + bool ok = false; + auto hostnameAction = hostnameActions().find( hostnameActionString, ok ); + if ( !ok ) + { + hostnameAction = Action::EtcHostname; + } + + Action hostsfileAction = getBool( configurationMap, "writeHostsFile", true ) ? Action::WriteEtcHosts : Action::None; + m_actions = hostsfileAction | hostnameAction; } diff --git a/src/modules/users/UsersViewStep.h b/src/modules/users/UsersViewStep.h index 6fced76b9..03cc83819 100644 --- a/src/modules/users/UsersViewStep.h +++ b/src/modules/users/UsersViewStep.h @@ -20,13 +20,13 @@ #ifndef USERSPAGEPLUGIN_H #define USERSPAGEPLUGIN_H +#include "SetHostNameJob.h" + +#include "DllMacro.h" +#include "utils/PluginFactory.h" +#include "viewpages/ViewStep.h" + #include - -#include -#include - -#include - #include class UsersPage; @@ -61,6 +61,7 @@ private: QList< Calamares::job_ptr > m_jobs; QStringList m_defaultGroups; + SetHostNameJob::Actions m_actions; }; CALAMARES_PLUGIN_FACTORY_DECLARATION( UsersViewStepFactory ) diff --git a/src/modules/users/users.conf b/src/modules/users/users.conf index 00747195c..1c928fd3a 100644 --- a/src/modules/users/users.conf +++ b/src/modules/users/users.conf @@ -28,13 +28,13 @@ defaultGroups: # Disable when your Distribution does not require such a group. autologinGroup: autologin # You can control the initial state for the 'autologin checkbox' here. -# Possible values are: -# - true to check or +# Possible values are: +# - true to check or # - false to uncheck # These set the **initial** state of the checkbox. doAutologin: true -# When *sudoersGroup* is set to a non-empty string, Calamares creates a +# When *sudoersGroup* is set to a non-empty string, Calamares creates a # sudoers file for the user. This file is located at: # `/etc/sudoers.d/10-installer` # Remember to add the (value of) *sudoersGroup* to *defaultGroups*. @@ -48,8 +48,8 @@ sudoersGroup: wheel # Setting this to false , causes the root account to be disabled. setRootPassword: true # You can control the initial state for the 'reuse password for root' -# checkbox here. Possible values are: -# - true to check or +# checkbox here. Possible values are: +# - true to check or # - false to uncheck # # When checked, the user password is used for the root account too. @@ -96,18 +96,18 @@ passwordRequirements: libpwquality: - minlen=0 - minclass=0 - + # You can control the visibility of the 'strong passwords' checkbox here. -# Possible values are: -# - true to show or +# Possible values are: +# - true to show or # - false to hide (default) # the checkbox. This checkbox allows the user to choose to disable # password-strength-checks. By default the box is **hidden**, so # that you have to pick a password that satisfies the checks. allowWeakPasswords: false # You can control the initial state for the 'strong passwords' checkbox here. -# Possible values are: -# - true to uncheck or +# Possible values are: +# - true to uncheck or # - false to check (default) # the checkbox by default. Since the box is labeled to enforce strong # passwords, in order to **allow** weak ones by default, the box needs @@ -122,3 +122,17 @@ allowWeakPasswordsDefault: false # - set, non-empty, use that path as shell. No validation is done # that the shell actually exists or is executable. # userShell: /bin/bash + +# Hostname setting +# +# The user can enter a hostname; this is configured into the system +# in some way; pick one of: +# - *None*, to not set the hostname at all +# - *EtcFile*, to write to `/etc/hostname` directly +# - *Hostnamed*, to use systemd hostnamed(1) over DBus +# The default is *EtcFile*. +setHostname: EtcFile + +# Should /etc/hosts be written with a hostname for this machine +# (also adds localhost and some ipv6 standard entries). +writeHostsFile: true diff --git a/src/modules/webview/WebViewStep.h b/src/modules/webview/WebViewStep.h index c588318fa..9ee2dfac9 100644 --- a/src/modules/webview/WebViewStep.h +++ b/src/modules/webview/WebViewStep.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include diff --git a/src/modules/welcome/CMakeLists.txt b/src/modules/welcome/CMakeLists.txt index b25bb6720..e25b7f5d0 100644 --- a/src/modules/welcome/CMakeLists.txt +++ b/src/modules/welcome/CMakeLists.txt @@ -40,13 +40,3 @@ calamares_add_plugin( welcome Qt5::Network SHARED_LIB ) - -add_executable( welcomeqmltest qmlmain.cpp Config.cpp ) -target_link_libraries( welcomeqmltest PRIVATE calamaresui Qt5::Core ) -set_target_properties( welcomeqmltest - PROPERTIES - ENABLE_EXPORTS TRUE - RUNTIME_OUTPUT_NAME welcomeqmltest -) -calamares_automoc( welcomeqmltest ) -calamares_autouic( welcomeqmltest ) diff --git a/src/modules/welcome/WelcomeViewStep.h b/src/modules/welcome/WelcomeViewStep.h index 4d8fa160f..217f827e9 100644 --- a/src/modules/welcome/WelcomeViewStep.h +++ b/src/modules/welcome/WelcomeViewStep.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include diff --git a/src/modules/welcome/qmlmain.cpp b/src/modules/welcome/qmlmain.cpp deleted file mode 100644 index a9dd1875d..000000000 --- a/src/modules/welcome/qmlmain.cpp +++ /dev/null @@ -1,84 +0,0 @@ -/* Example executable showing a QML page and using the - * models from libcalamares for displaying a welcome. - */ - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include "Branding.h" -#include "JobQueue.h" -#include "Settings.h" -#include "locale/LabelModel.h" -#include "utils/Logger.h" - -#include "Config.h" - -static Config* theConfig() -{ - static Config* cnf = new Config(); - return cnf; -} - -int main(int argc, char **argv) -{ - QApplication a( argc, argv ); - - KAboutData aboutData( "calamares", - "Calamares", - "0.1", - "Calamares QML Test Application", - KAboutLicense::GPL_V3, - QString(), - QString(), - "https://calamares.io", - "https://github.com/calamares/calamares/issues" ); - KAboutData::setApplicationData( aboutData ); - a.setApplicationDisplayName( QString() ); // To avoid putting an extra "Calamares/" into the log-file - - Logger::setupLogLevel( Logger::LOGVERBOSE ); - - std::unique_ptr< Calamares::Settings > settings_p( Calamares::Settings::init( QString() ) ); - std::unique_ptr< Calamares::JobQueue > jobqueue_p( new Calamares::JobQueue( nullptr ) ); - - Calamares::Branding defaultBrand( "src/branding/default/branding.desc" ); - cDebug() << "Branding @" << (void *)Calamares::Branding::instance(); - - QMainWindow mw; - QWidget background; - QVBoxLayout vl; - QLabel l( "Hello, world", &mw ); - QQuickWidget qqw( &mw ); - vl.addWidget( &qqw ); - vl.addWidget( &l ); - background.setLayout( &vl ); - mw.setCentralWidget( &background ); - mw.resize( QSize( 400, 400 ) ); - mw.show(); - - Config cnf; - if ( argc > 1 ) - { - cnf.setHelpUrl( QUrl( argv[1] ) ); - } - - // TODO: this should put the one config object in the context, rather than adding a factory function to share it everywhere - qmlRegisterSingletonType< Config >( "io.calamares.modules.welcome", 1, 0, "PotatoConfig", [](QQmlEngine*, QJSEngine*) -> QObject* { return theConfig(); }); - - qmlRegisterSingletonType< CalamaresUtils::Locale::LabelModel >( "io.calamares.locale", 1, 0, "LocaleModel", [](QQmlEngine*, QJSEngine*) -> QObject* { return CalamaresUtils::Locale::availableTranslations(); } ); - - qqw.setSource( QUrl::fromLocalFile("../src/modules/welcome/welcome.qml") ); - - return a.exec(); -} diff --git a/src/modules/welcome/welcome.qml b/src/modules/welcome/welcome.qml deleted file mode 100644 index bdb7c4416..000000000 --- a/src/modules/welcome/welcome.qml +++ /dev/null @@ -1,29 +0,0 @@ -import QtQuick 2.0; -import QtQuick.Controls 2.3; -import io.calamares.modules.welcome 1.0; -import io.calamares.locale 1.0; - -Rectangle { - width: 200; - height: 200; - color: "pink"; - - Label { - id: label; - anchors.centerIn: parent; - text: "Welcome to Calamares"; - } - - Button { - id: thebutton; - anchors.top: label.bottom; - text: PotatoConfig.helpUrl; - - } - - ListView { - anchors.fill: parent; - model: LocaleModel; - delegate: Label { text: display } - } -} diff --git a/src/modules/welcomeq/Config.cpp b/src/modules/welcomeq/Config.cpp index 6d085143c..cfa6336e2 100644 --- a/src/modules/welcomeq/Config.cpp +++ b/src/modules/welcomeq/Config.cpp @@ -18,11 +18,6 @@ #include "Config.h" -Config::Config() - : m_helpUrl( "https://www.kde.org/" ) -{ -} +Config::Config() {} -Config::~Config() -{ -} +Config::~Config() {} diff --git a/src/modules/welcomeq/Config.h b/src/modules/welcomeq/Config.h index 2295d4ee2..50c3e387b 100644 --- a/src/modules/welcomeq/Config.h +++ b/src/modules/welcomeq/Config.h @@ -16,8 +16,8 @@ * along with Calamares. If not, see . */ -#ifndef WELCOME_CONFIG_H -#define WELCOME_CONFIG_H +#ifndef WELCOMEQ_CONFIG_H +#define WELCOMEQ_CONFIG_H #include #include @@ -25,16 +25,27 @@ class Config : public QObject { Q_OBJECT - Q_PROPERTY( QUrl helpUrl READ helpUrl WRITE setHelpUrl CONSTANT ) + Q_PROPERTY( QUrl helpUrl READ helpUrl CONSTANT FINAL ) + Q_PROPERTY( QUrl issuesUrl READ issuesUrl CONSTANT FINAL ) + Q_PROPERTY( QUrl notesUrl READ notesUrl CONSTANT FINAL ) + Q_PROPERTY( QUrl donateUrl READ donateUrl CONSTANT FINAL ) public: Config(); virtual ~Config(); - QUrl helpUrl() const { return m_helpUrl; } void setHelpUrl( const QUrl& url ) { m_helpUrl = url; } + void setIssuesUrl( const QUrl& url ) { m_issuesUrl = url; } + void setNotesUrl( const QUrl& url ) { m_notesUrl = url; } + void setDonateUrl( const QUrl& url ) { m_donateUrl = url; } + +public slots: + QUrl helpUrl() const { return m_helpUrl; } + QUrl issuesUrl() const { return m_issuesUrl; } + QUrl notesUrl() const { return m_notesUrl; } + QUrl donateUrl() const { return m_donateUrl; } private: - QUrl m_helpUrl; + QUrl m_helpUrl, m_issuesUrl, m_notesUrl, m_donateUrl; }; #endif diff --git a/src/modules/welcomeq/WelcomeQmlViewStep.cpp b/src/modules/welcomeq/WelcomeQmlViewStep.cpp index 2a5b0f661..382e0b4d1 100644 --- a/src/modules/welcomeq/WelcomeQmlViewStep.cpp +++ b/src/modules/welcomeq/WelcomeQmlViewStep.cpp @@ -37,7 +37,7 @@ CALAMARES_PLUGIN_FACTORY_DEFINITION( WelcomeQmlViewStepFactory, registerPlugin< WelcomeQmlViewStep >(); ) WelcomeQmlViewStep::WelcomeQmlViewStep( QObject* parent ) - : Calamares::ViewStep( parent ) + : Calamares::QmlViewStep( QStringLiteral( "welcomeq" ), parent ) , m_requirementsChecker( new GeneralRequirements( this ) ) { connect( Calamares::ModuleManager::instance(), @@ -47,10 +47,7 @@ WelcomeQmlViewStep::WelcomeQmlViewStep( QObject* parent ) } -WelcomeQmlViewStep::~WelcomeQmlViewStep() -{ -} - +WelcomeQmlViewStep::~WelcomeQmlViewStep() {} QString WelcomeQmlViewStep::prettyName() const @@ -58,53 +55,6 @@ WelcomeQmlViewStep::prettyName() const return tr( "Welcome" ); } - -QWidget* -WelcomeQmlViewStep::widget() -{ - return nullptr; -} - - -bool -WelcomeQmlViewStep::isNextEnabled() const -{ - // TODO: should return true - return false; -} - - -bool -WelcomeQmlViewStep::isBackEnabled() const -{ - // TODO: should return true (it's weird that you are not allowed to have welcome *after* anything - return false; -} - - -bool -WelcomeQmlViewStep::isAtBeginning() const -{ - // TODO: adjust to "pages" in the QML - return true; -} - - -bool -WelcomeQmlViewStep::isAtEnd() const -{ - // TODO: adjust to "pages" in the QML - return true; -} - - -Calamares::JobList -WelcomeQmlViewStep::jobs() const -{ - return Calamares::JobList(); -} - - /** @brief Look up a URL for a button * * Looks up @p key in @p map; if it is a *boolean* value, then @@ -143,7 +93,9 @@ WelcomeQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap ) using Calamares::Branding; m_config.setHelpUrl( jobOrBrandingSetting( Branding::SupportUrl, configurationMap, "showSupportUrl" ) ); - // TODO: expand Config class and set the remaining fields + m_config.setIssuesUrl( jobOrBrandingSetting( Branding::KnownIssuesUrl, configurationMap, "showKnownIssuesUrl" ) ); + m_config.setNotesUrl( jobOrBrandingSetting( Branding::ReleaseNotesUrl, configurationMap, "showReleaseNotesUrl" ) ); + m_config.setDonateUrl( CalamaresUtils::getString( configurationMap, "showDonateUrl" ) ); // TODO: figure out how the requirements (held by ModuleManager) should be accessible // to QML as a odel. @@ -193,6 +145,8 @@ WelcomeQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap ) // TODO: figure out where to set this: Config? } } + + QmlViewStep::setConfigurationMap( configurationMap ); // call parent implementation last } Calamares::RequirementsList @@ -241,3 +195,9 @@ WelcomeQmlViewStep::setCountry( const QString& countryCode, CalamaresUtils::GeoI } } } + +QObject* +WelcomeQmlViewStep::getConfig() +{ + return &m_config; +} diff --git a/src/modules/welcomeq/WelcomeQmlViewStep.h b/src/modules/welcomeq/WelcomeQmlViewStep.h index 5486d8d31..064be0455 100644 --- a/src/modules/welcomeq/WelcomeQmlViewStep.h +++ b/src/modules/welcomeq/WelcomeQmlViewStep.h @@ -21,11 +21,10 @@ #include "Config.h" +#include "DllMacro.h" #include "modulesystem/Requirement.h" #include "utils/PluginFactory.h" -#include "viewpages/ViewStep.h" - -#include +#include "viewpages/QmlViewStep.h" #include #include @@ -40,13 +39,7 @@ class Handler; class GeneralRequirements; -class QQmlComponent; -class QQuickItem; -class QQuickWidget; - -// TODO: Needs a generic Calamares::QmlViewStep as base class -// TODO: refactor and move what makes sense to base class -class PLUGINDLLEXPORT WelcomeQmlViewStep : public Calamares::ViewStep +class PLUGINDLLEXPORT WelcomeQmlViewStep : public Calamares::QmlViewStep { Q_OBJECT @@ -56,16 +49,6 @@ public: QString prettyName() const override; - QWidget* widget() override; - - bool isNextEnabled() const override; - bool isBackEnabled() const override; - - bool isAtBeginning() const override; - bool isAtEnd() const override; - - Calamares::JobList jobs() const override; - void setConfigurationMap( const QVariantMap& configurationMap ) override; /** @brief Sets the country that Calamares is running in. @@ -78,16 +61,13 @@ public: Calamares::RequirementsList checkRequirements() override; +protected: + QObject* getConfig() override; + private: // TODO: a generic QML viewstep should return a config object from a method Config m_config; GeneralRequirements* m_requirementsChecker; - - // TODO: these need to be in the base class (also a base class of ExecutionViewStep) - QQuickWidget* m_qmlWidget; - QQmlComponent* m_qmlComponent; - QQuickItem* m_qmlItem; - }; CALAMARES_PLUGIN_FACTORY_DECLARATION( WelcomeQmlViewStepFactory ) diff --git a/src/modules/welcomeq/welcomeq.conf b/src/modules/welcomeq/welcomeq.conf new file mode 100644 index 000000000..0068ebe5c --- /dev/null +++ b/src/modules/welcomeq/welcomeq.conf @@ -0,0 +1,25 @@ +# Configuration for the welcome module. The welcome page +# displays some information from the branding file. +# Which parts it displays can be configured through +# the show* variables. +# +# In addition to displaying the welcome page, this module +# can check requirements for installation. +--- +# Display settings for various buttons on the welcome page. +# The URLs themselves come from branding.desc is the setting +# here is "true". If the setting is false, the button is hidden. +# The setting can also be a full URL which will then be used +# instead of the one from the branding file, or empty or not-set +# which will hide the button. +showSupportUrl: true +showKnownIssuesUrl: true +showReleaseNotesUrl: true + +# If this Url is set to something non-empty, a "donate" +# button is added to the welcome page alongside the +# others (see settings, above). Clicking the button opens +# the corresponding link. (This button has no corresponding +# branding.desc string) +# +# showDonateUrl: https://kde.org/community/donations/ diff --git a/src/modules/welcomeq/welcomeq.qml b/src/modules/welcomeq/welcomeq.qml new file mode 100644 index 000000000..b40ec4813 --- /dev/null +++ b/src/modules/welcomeq/welcomeq.qml @@ -0,0 +1,129 @@ +/* === This file is part of Calamares - === + * + * Copyright 2020, 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 . + */ +import calamares.ui 1.0 + +import QtQuick 2.10 +import QtQuick.Controls 2.10 +import QtQuick.Layouts 1.3 +import org.kde.kirigami 2.7 as Kirigami +import QtGraphicalEffects 1.0 +import QtQuick.Window 2.3 + +Page +{ + id: welcome + + header: Item + { + width: parent.width + height: 150 + + Text + { + id: welcomeTopText + anchors.horizontalCenter: parent.horizontalCenter + anchors.top: parent.top + // In QML, QString::arg() only takes one argument + text: qsTr("

%1 %2

").arg(Branding.string(Branding.ProductName)).arg(Branding.string(Branding.Version)) + } + Image + { + id: welcomeImage + anchors.centerIn: parent + // imagePath() returns a full pathname, so make it refer to the filesystem + // .. otherwise the path is interpreted relative to the "call site", which + // .. might be the QRC file. + source: "file:/" + Branding.imagePath(Branding.ProductWelcome) + height: Math.min(100, parent.height) + width: height + sourceSize.width: width + sourceSize.height: height + } + + RowLayout + { + id: buttonBar + width: parent.width + height: 64 + + anchors.bottom: parent.bottom + + spacing: Kirigami.Units.largeSpacing* 2 + +/* Traditionally Calamares has had an "About" button that talks about + * Calamares itself, which just isn't a very useful thing in someone + * else's installation ISO. + */ + Button + { + Layout.fillWidth: true + text: qsTr("About") + icon.name: "documentinfo" + Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4) + Kirigami.Theme.textColor: "#fff" + + visible: false + onClicked: { } // TODO: show an about-Calamares window + } + Button + { + Layout.fillWidth: true + text: qsTr("Support") + icon.name: "documentinfo" + Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4) + Kirigami.Theme.textColor: "#fff" + + visible: config.helpUrl.isValid + onClicked: Qt.openUrlExternally(config.helpUrl) + } + Button + { + Layout.fillWidth: true + text: qsTr("Known issues") + icon.name: "documentinfo" + Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4) + Kirigami.Theme.textColor: "#fff" + + visible: config.issuesUrl.isValid + onClicked: Qt.openUrlExternally(config.issuesUrl) + } + Button + { + Layout.fillWidth: true + text: qsTr("Release notes") + icon.name: "documentinfo" + Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4) + Kirigami.Theme.textColor: "#fff" + + visible: config.notesUrl.isValid + onClicked: Qt.openUrlExternally(config.notesUrl) + } + Button + { + Layout.fillWidth: true + text: qsTr("Donate") + icon.name: "documentinfo" + Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4) + Kirigami.Theme.textColor: "#fff" + + visible: config.donateUrl.isValid + onClicked: Qt.openUrlExternally(config.donateUrl) + } + } + } +} diff --git a/src/modules/welcomeq/welcomeq.qrc b/src/modules/welcomeq/welcomeq.qrc new file mode 100644 index 000000000..772bf7e88 --- /dev/null +++ b/src/modules/welcomeq/welcomeq.qrc @@ -0,0 +1,5 @@ + + + welcomeq.qml + +