diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2019-06-28 05:19:43 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2019-06-28 05:19:43 -0400 |
| commit | e3630ee18b9245d9440d4f093be319f64d042ec5 (patch) | |
| tree | 2691fc620a19d933b878493f630771b9d6286996 | |
| parent | 3ce663321504f6bc551c0123b49afe5adb94acab (diff) | |
| parent | 40d1856bb1b910720fd36977abcef5207f31e40f (diff) | |
Merge tag 'v3.2.9' into parabola-3.2.9
Release v3.2.9
213 files changed, 9811 insertions, 8816 deletions
@@ -36,8 +36,6 @@ and moral support from (alphabetically by first name or nickname): - Kyle Robertze - Lisa Vitolo - n3rdopolis - - Phil Mueller - - Philip Mueller - Philip Müller - Ramon Buldó - Raul Rodrigo Segura @@ -3,6 +3,31 @@ contributors are listed. Note that Calamares does not have a historical changelog -- this log starts with version 3.2.0. The release notes on the website will have to do for older versions. +# 3.2.9 (2019-06-03) # + +This release contains contributions from (alphabetically by first name): + - Kevin Kofler + +## Core ## + +No user- or deployer-visible changes. Bugfixing as usual, see the +milestone for details. + +## Modules ## + + - *branding* now supports os-release variables in the *strings* section, + which allows re-using (at runtime) information set in /etc/os-release . + This requires KDE Frameworks 5.58. #1150 + - *branding* allows the use of FreeDesktop.org icon names for the + *productLogo* and *productIcon* keys. If a file is named there, then + the file is used, and otherwise the icon is looked up in the current + theme. #1160 + - *packages* On Arch, with the `pacman` package manager, avoid a hang + during system update. #1154 + - *welcome* allows a custom image path or icon name to be set for the + language-selection drop-down (instead of the international standard one). + + # 3.2.8 (2019-05-10) # This is a **source-incompatible** release of Calamares. Include files diff --git a/CMakeLists.txt b/CMakeLists.txt index 74be0a37f..b069ed71d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,7 @@ cmake_minimum_required( VERSION 3.2 FATAL_ERROR ) project( CALAMARES - VERSION 3.2.8 + VERSION 3.2.9 LANGUAGES C CXX ) set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development @@ -104,12 +104,12 @@ set( CALAMARES_DESCRIPTION_SUMMARY # checks for new languages and misspelled ones are done (that is, # copy these four lines to four backup lines, add "p", and then update # the original four lines with the current translations). -set( _tx_complete ast ca cs_CZ da de fr hr ja lt pl pt_BR pt_PT - tr_TR zh_TW ) -set( _tx_good bg en_GB es es_MX et gl he hi hu id it_IT ro ru sk sq - zh_CN ) -set( _tx_ok ar el es_PR eu fi_FI is ko mr nb nl sl sr - sr@latin sv th uk ) +set( _tx_complete ca cs_CZ da de fr he hr hu ko lt pt_BR sq tr_TR + zh_TW ) +set( _tx_good ast en_GB es es_MX et gl id it_IT ja nl pl pt_PT ro + ru sk zh_CN ) +set( _tx_ok ar bg el es_PR eu fi_FI hi is mr nb sl sr sr@latin sv + th uk ) set( _tx_bad be eo fa fr_CH gu kk kn lo mk ne_NP ur uz ) @@ -193,6 +193,7 @@ if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) ) string( APPEND CMAKE_CXX_FLAGS " ${CLANG_WARNINGS}" ) endforeach() + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTREACHED='//'" ) # Third-party code where we don't care so much about compiler warnings # (because it's uncomfortable to patch) get different flags; use @@ -203,7 +204,7 @@ if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) set( CMAKE_CXX_FLAGS_DEBUG "-g ${CMAKE_CXX_FLAGS_DEBUG}" ) set( CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG" ) - set( CMAKE_CXX_FLAGS_RELEASE "-O4 -DNDEBUG" ) + set( CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" ) set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g" ) set( CMAKE_TOOLCHAIN_PREFIX "llvm-" ) @@ -211,12 +212,15 @@ if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" ) set( CALAMARES_AUTOMOC_OPTIONS "-butils/moc-warnings.h" ) + set( CALAMARES_AUTOUIC_OPTIONS --include utils/moc-warnings.h ) else() set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-undefined" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--fatal-warnings -Wnon-virtual-dtor -Woverloaded-virtual -Werror=return-type" ) set( SUPPRESS_3RDPARTY_WARNINGS "" ) set( SUPPRESS_BOOST_WARNINGS "" ) + + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTREACHED='__builtin_unreachable();'" ) endif() # Use mark_thirdparty_code() to reduce warnings from the compiler diff --git a/CMakeModules/CalamaresAddLibrary.cmake b/CMakeModules/CalamaresAddLibrary.cmake index e731e2b15..0829d919e 100644 --- a/CMakeModules/CalamaresAddLibrary.cmake +++ b/CMakeModules/CalamaresAddLibrary.cmake @@ -61,11 +61,6 @@ function(calamares_add_library) include_directories(${CMAKE_CURRENT_LIST_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) - if(LIBRARY_UI) - qt5_wrap_ui(LIBRARY_UI_SOURCES ${LIBRARY_UI}) - list(APPEND LIBRARY_SOURCES ${LIBRARY_UI_SOURCES}) - endif() - # add resources from current dir if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/${LIBRARY_RESOURCES}") qt5_add_resources(LIBRARY_RC_SOURCES "${LIBRARY_RESOURCES}") @@ -83,7 +78,10 @@ function(calamares_add_library) endif() calamares_automoc(${target}) - + if(LIBRARY_UI) + calamares_autouic(${target} ${LIBRARY_UI}) + endif() + if(LIBRARY_EXPORT_MACRO) set_target_properties(${target} PROPERTIES COMPILE_DEFINITIONS ${LIBRARY_EXPORT_MACRO}) endif() diff --git a/CMakeModules/CalamaresAutomoc.cmake b/CMakeModules/CalamaresAutomoc.cmake index 0ca5cd89a..f8aa7faef 100644 --- a/CMakeModules/CalamaresAutomoc.cmake +++ b/CMakeModules/CalamaresAutomoc.cmake @@ -18,7 +18,7 @@ # ### # -# Helper function for doing automoc on a target. +# Helper function for doing automoc on a target, and autoui on a .ui file. # # Sets AUTOMOC TRUE for a target. # @@ -27,6 +27,8 @@ # libcalamares/utils/moc-warnings.h file to the moc, which in turn # reduces compiler warnings in generated MOC code. # +# If the global variable CALAMARES_AUTOUIC_OPTIONS is set, adds that +# to the options passed to uic. function(calamares_automoc TARGET) set_target_properties( ${TARGET} PROPERTIES AUTOMOC TRUE ) @@ -34,3 +36,12 @@ function(calamares_automoc TARGET) set_target_properties( ${TARGET} PROPERTIES AUTOMOC_MOC_OPTIONS "${CALAMARES_AUTOMOC_OPTIONS}" ) endif() endfunction() + +function(calamares_autouic TARGET) + set_target_properties( ${TARGET} PROPERTIES AUTOUIC TRUE ) + if ( CALAMARES_AUTOUIC_OPTIONS ) + foreach(S ${ARGN}) + set_property(SOURCE ${S} PROPERTY AUTOUIC_OPTIONS "${CALAMARES_AUTOUIC_OPTIONS}") + endforeach() + endif() +endfunction() diff --git a/ci/HACKING.md b/ci/HACKING.md index ca3901f07..f2e6308d1 100644 --- a/ci/HACKING.md +++ b/ci/HACKING.md @@ -60,6 +60,8 @@ some PEP8 guidelines. * Function and class definitions have their braces on separate lines. * A function implementation's return type is on its own line. * `CamelCase.{cpp,h}` style file names. +* Lambdas are preferrably indented to a 4-space tab, even when passed as an + argument to functions. Example: ``` diff --git a/ci/RELEASE.sh b/ci/RELEASE.sh index a835ebcb3..dfb65cfeb 100644 --- a/ci/RELEASE.sh +++ b/ci/RELEASE.sh @@ -41,8 +41,8 @@ BUILDDIR=$(mktemp -d --suffix=-build --tmpdir=.) if test "x$BUILD_DEFAULT" = "xtrue" ; then rm -rf "$BUILDDIR" mkdir "$BUILDDIR" || { echo "Could not create build directory." ; exit 1 ; } - ( cd "$BUILDDIR" && cmake .. && make -j4 ) || { echo "Could not perform test-build." ; exit 1 ; } - ( cd "$BUILDDIR" && make test ) || { echo "Tests failed." ; exit 1 ; } + ( cd "$BUILDDIR" && cmake .. && make -j4 ) || { echo "Could not perform test-build in $BUILDDIR." ; exit 1 ; } + ( cd "$BUILDDIR" && make test ) || { echo "Tests failed in $BUILDDIR." ; exit 1 ; } fi ### Build with clang @@ -53,13 +53,13 @@ if test "x$BUILD_CLANG" = "xtrue" ; then # Do build again with clang rm -rf "$BUILDDIR" mkdir "$BUILDDIR" || { echo "Could not create build directory." ; exit 1 ; } - ( cd "$BUILDDIR" && CC=clang CXX=clang++ cmake .. && make -j4 ) || { echo "Could not perform test-build." ; exit 1 ; } - ( cd "$BUILDDIR" && make test ) || { echo "Tests failed." ; exit 1 ; } + ( cd "$BUILDDIR" && CC=clang CXX=clang++ cmake .. && make -j4 ) || { echo "Could not perform test-build in $BUILDDIR." ; exit 1 ; } + ( cd "$BUILDDIR" && make test ) || { echo "Tests failed in $BUILDDIR." ; exit 1 ; } fi fi if test "x$BUILD_ONLY" = "xtrue" ; then - echo "Builds completed, release stopped." + echo "Builds completed, release stopped. Build remains in $BUILDDIR." exit 1 fi diff --git a/lang/calamares_ar.ts b/lang/calamares_ar.ts index c5eb26c32..e60c06393 100644 --- a/lang/calamares_ar.ts +++ b/lang/calamares_ar.ts @@ -97,7 +97,7 @@ <translation>الأدوات</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>معلومات التّنقيح</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>ثبت </translation> </message> @@ -430,124 +435,124 @@ The installer will quit and all changes will be lost.</source> <translation><strong>تقسيم يدويّ</strong><br/>يمكنك إنشاء أو تغيير حجم الأقسام بنفسك.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>مكان محمّل الإقلاع:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>سيتقلّص %1 إلى %2م.بايت وقسم %3م.بايت آخر جديد سيُنشأ ل%4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>اختر &جهاز التّخزين:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>الحاليّ:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>اختر قسمًا لتقليصه، ثمّ اسحب الشّريط السّفليّ لتغيير حجمه </strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>اختر القسم حيث سيكون التّثبيت عليه</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>تعذّر إيجاد قسم النّظام EFI في أيّ مكان. فضلًا ارجع واستخدم التّقسيم اليدويّ لإعداد %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>قسم النّظام EFI على %1 سيُستخدم لبدء %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>قسم نظام EFI:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>لا يبدو أن في جهاز التّخزين أيّ نظام تشغيل. ما الذي تودّ فعله؟<br/>يمكنك مراجعة الاختيارات وتأكيدها قبل تطبيقها على جهاز التّخزين.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>مسح القرص</strong><br/>هذا س<font color="red">يمسح</font> كلّ البيانات الموجودة في جهاز التّخزين المحدّد.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>على جهاز التّخزين %1. ما الذي تودّ فعله؟<br/>يمكنك مراجعة الاختيارات وتأكيدها قبل تطبيقها على جهاز التّخزين.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>ثبّت جنبًا إلى جنب</strong><br/>سيقلّص المثبّت قسمًا لتفريغ مساحة لِ %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>استبدل قسمًا</strong><br/>يستبدل قسمًا مع %1 .</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>على جهاز التّخزين هذا نظام تشغيل ذأصلًا. ما الذي تودّ فعله؟<br/>يمكنك مراجعة الاختيارات وتأكيدها قبل تطبيقها على جهاز التّخزين.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>على جهاز التّخزين هذا عدّة أنظمة تشغيل. ما الذي تودّ فعله؟<br/>يمكنك مراجعة الاختيارات وتأكيدها قبل تطبيقها على جهاز التّخزين.</translation> </message> @@ -555,17 +560,17 @@ The installer will quit and all changes will be lost.</source> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation type="unfinished"/> </message> @@ -702,13 +707,13 @@ The installer will quit and all changes will be lost.</source> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>أنشئ قسم %2م.بايت جديد على %4 (%3) بنظام الملفّات %1.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>أنشئ قسم <strong>%2م.بايت</strong> جديد على <strong>%4</strong> (%3) بنظام الملفّات <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1119,12 +1124,12 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> @@ -1132,27 +1137,27 @@ The installer will quit and all changes will be lost.</source> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>أنهِ</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation type="unfinished"/> </message> @@ -1161,13 +1166,13 @@ The installer will quit and all changes will be lost.</source> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>هيّء القسم %1 (نظام الملفّات: %2، الحجم: %3 م.بايت) على %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>هيّء قسم <strong>%3م.بايت</strong> <strong>%1</strong> بنظام الملفّات <strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1184,23 +1189,23 @@ The installer will quit and all changes will be lost.</source> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>فيه على الأقل مساحة بحجم %1 غ.بايت حرّة</translation> + <source>has at least %1 GiB available drive space</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>ليست في القرص مساحة كافية. المطلوب هو %1 غ.بايت على الأقلّ.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>فيه ذاكرة شاغرة بحجم %1 غ.بايت على الأقلّ</translation> + <source>has at least %1 GiB working memory</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>ليس في النّظام ذاكرة شاغرة كافية. المطلوب هو %1 غ.بايت على الأقلّ.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1482,12 +1487,12 @@ The installer will quit and all changes will be lost.</source> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>يحمّل بيانات المواقع...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>الموقع</translation> </message> @@ -1876,42 +1881,42 @@ The installer will quit and all changes will be lost.</source> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>الجذر</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>المنزل</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>الإقلاع</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>نظام EFI</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>التّبديل</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>قسم جديد ل %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>قسم جديد</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2296,7 +2301,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>مساحة غير مقسّمة أو جدول تقسيم مجهول</translation> </message> @@ -2311,7 +2316,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2414,70 +2419,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2491,13 +2496,13 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>غيّر حجم قسم <strong>%2م.بايت</strong> <strong>%1</strong> إلى <strong>%3م.بايت</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>يغيّر حجم قسم %2م.بايت %1 إلى %3م.بايت.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2652,7 +2657,7 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> + <source>Set flags on %1MiB %2 partition.</source> <translation type="unfinished"/> </message> <message> @@ -2667,7 +2672,22 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> <translation type="unfinished"/> </message> <message> @@ -2681,11 +2701,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation type="unfinished"/> @@ -2696,11 +2711,6 @@ Output: <translation>يمحي رايات القسم <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation type="unfinished"/> @@ -2711,11 +2721,6 @@ Output: <translation>يضبط رايات <strong>%2</strong> القسم<strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation type="unfinished"/> @@ -3130,7 +3135,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>مرحبا بك</translation> </message> diff --git a/lang/calamares_ast.ts b/lang/calamares_ast.ts index c397ba53e..a559906a3 100644 --- a/lang/calamares_ast.ts +++ b/lang/calamares_ast.ts @@ -97,7 +97,7 @@ <translation>Ferramientes</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Información de la depuración</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Instalación</translation> </message> @@ -431,124 +436,124 @@ L'instalador va colar y van perdese tolos cambeos.</translation> <translation><strong>Particionáu manual</strong><br/>Vas poder crear o redimensionar particiones.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Allugamientu del xestor d'arrinque:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 va redimensionase a %2MB y va crease una partición nueva de %s3MB pa %4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Esbilla un preséu d'al&macenamientu:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Anguaño:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Reusu de %s como partición d'aniciu pa %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Esbilla una partición a redimensionar, dempués arrastra la barra baxera pa facelo</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Esbilla una partición na qu'instalar</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>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.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>La partición del sistema EFI en %1 va usase p'aniciar %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>Partición del sistema EFI:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Esti preséu d'almacenamientu nun paez que tenga un sistema operativu nelli. ¿Qué te prestaría facer?<br/>Vas ser a revisar y confirmar lo qu'escueyas enantes de que se faiga cualesquier cambéu nel preséu d'almacenamientu.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Desaniciu d'un discu</strong><br/>Esto va <font color="red">desaniciar</font> tolos datos presentes nel preséu d'almacenamientu esbilláu.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>Esti preséu d'almacenamientu tien %1 nelli. ¿Qué te prestaría facer?<br/>Vas ser a revisar y confirmar lo qu'escueyas enantes de que se faiga cualesquier cambéu nel preséu d'almacenamientu.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation>Ensin intercambéu</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation>Reusar un intercambéu</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation>Intercambéu (ensin ivernación)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation>Intercambéu (con ivernación)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation>Intercambéu nun ficheru</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Instalación anexa</strong><br/>L'instalador va redimensionar una partición pa dexar sitiu a %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Troquéu d'una partición</strong><br/>Troca una parción con %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>Esti preséu d'almacenamientu yá tien un sistema operativu nelli. ¿Qué te prestaría facer?<br/>Vas ser a revisar y confirmar lo qu'escueyas enantes de que se faiga cualesquier cambéu nel preséu d'almacenamientu.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>Esti preséu d'almacenamientu tien varios sistemes operativos nelli. ¿Qué te prestaría facer?<br/>Vas ser a revisar y confirmar lo qu'escueyas enantes de que se faiga cualesquier cambéu nel preséu d'almacenamientu.</translation> </message> @@ -556,17 +561,17 @@ L'instalador va colar y van perdese tolos cambeos.</translation> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Llimpieza de los montaxes pa les operaciones de particionáu en %1.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Llimpiando los montaxes pa les operaciones de particionáu en %1.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Llimpiáronse tolos montaxes de %1</translation> </message> @@ -703,13 +708,13 @@ L'instalador va colar y van perdese tolos cambeos.</translation> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Creación d'una partición nueva en %4 (%3) de %2MB col sistema de ficheros.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Va crease una partición de <strong>%2MB</strong> en <strong>%4</strong> (%3) col sistema de ficheros <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1120,12 +1125,12 @@ L'instalador va colar y van perdese tolos cambeos.</translation> <translation><html><head/><body><p>Cuando se conseña esti caxellu, el sistema va reaniciase nel intre cuando calques en <span style="font-style:italic;">Fecho</span> o zarres l'instalador.</p></body></html></translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation><h1>Falló la configuración</h1><br/>%1 nun se configuró nel ordenador.<br/>El mensaxe de fallu foi: %2.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>Falló la instalación</h1><br/>%1 nun s'instaló nel ordenador.<br/>El mensaxe de fallu foi: %2.</translation> </message> @@ -1133,27 +1138,27 @@ L'instalador va colar y van perdese tolos cambeos.</translation> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Fin</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation>Configuración completada</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Instalación completada</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation>La configuración de %1 ta completada.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>Completóse la instalación de %1.</translation> </message> @@ -1162,13 +1167,13 @@ L'instalador va colar y van perdese tolos cambeos.</translation> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Formatu de la partición %1 (sistema de ficheros: %2, tamañu: %3MB) en %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>Va formatiase la partición <strong>%1</strong> de <strong>%3MB</strong> col sistema de ficheros <strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1185,23 +1190,23 @@ L'instalador va colar y van perdese tolos cambeos.</translation> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>tien polo menos %1GB d'espaciu llibre</translation> + <source>has at least %1 GiB available drive space</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>Nun hai espaciu disponible abondo. Ríquense polo menos %1GB.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>tien polo menos %1GB de memoria de trabayu</translation> + <source>has at least %1 GiB working memory</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>El sistema nun tien memoria de trabayu abondo. Ríquense polo menos %1GB.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1483,12 +1488,12 @@ L'instalador va colar y van perdese tolos cambeos.</translation> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Cargando los datos del allugamientu...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Allugamientu</translation> </message> @@ -1877,42 +1882,42 @@ L'instalador va colar y van perdese tolos cambeos.</translation> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Raigañu</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Aniciu</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Arrinque</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>Sistema EFI</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Intercambéu</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Partición nueva pa %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Partición nueva</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 de %2</translation> @@ -2300,7 +2305,7 @@ Salida: <translation>intercambéu</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>L'espaciu nun ta particionáu o nun se conoz la tabla de particiones</translation> </message> @@ -2315,7 +2320,7 @@ Salida: <translation>Completóse la comprobación de requirimientos del módulu <i>%1</i></translation> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2418,70 +2423,70 @@ Salida: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation>Trabayu de redimensionáu de sistemes de ficheros</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>La configuración nun ye válida</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation>El trabayu de redimensionáu de sistemes de ficheros tien una configuración non válida y nun va executase.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation>KPMCore nun ta disponible</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation>Calamares nun pue aniciar KPMCore pal trabayu de redimensionáu de sistemes de ficheros.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>Falló'l redimensionáu</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation>Nun pudo alcontrase nel sistema'l sistema de ficheros %1 y nun pue redimensionase.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation>Nun pudo alcontrase nel sistema'l preséu %1 y nun pue redimensionase.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation>El sistema de ficheros %1 nun pue redimensionase.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation>El preséu %1 nun pue redimensionase.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation>El sistema de ficheros %1 ha redimensionase, pero nun se pue.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation>El preséu %1 ha redimensionase, pero nun se pue</translation> </message> @@ -2495,13 +2500,13 @@ Salida: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>Va redimensionase la partición <strong>%1</strong> de <strong>%2MB</strong> a <strong>%3MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Redimensionando la partición %1 de %2MB a %3MB.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2656,8 +2661,8 @@ Salida: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>Afitamientu de banderes na partición %2 de %1MB.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2671,8 +2676,23 @@ Salida: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>Van llimpiase les banderes de la partición <strong>%2</strong> de %1MB.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2685,11 +2705,6 @@ Salida: <translation>Va afitase la bandera <strong>%2</strong> na partición <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Va afitase la bandera <strong>%3</strong> na partición <strong>%2</strong> de %1MB.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Va afitase la bandera <strong>%1</strong> na partición nueva.</translation> @@ -2700,11 +2715,6 @@ Salida: <translation>Llimpiando les banderes de la partición <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>Llimpiando les banderes de la partición <strong>%2</strong> de %1MB.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>Llimpiando les banderes de la partición nueva.</translation> @@ -2715,11 +2725,6 @@ Salida: <translation>Afitando les banderes <strong>%2</strong> na partición <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>Afitando les banderes <strong>%3</strong> na partición <strong>%2</strong> de %1MB.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>Afitando les banderes <strong>%1</strong> na partición nueva.</translation> @@ -3134,7 +3139,7 @@ Salida: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Acoyida</translation> </message> diff --git a/lang/calamares_be.ts b/lang/calamares_be.ts index a2484ab72..7215913ff 100644 --- a/lang/calamares_be.ts +++ b/lang/calamares_be.ts @@ -97,7 +97,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation type="unfinished"/> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation type="unfinished"/> </message> @@ -429,124 +434,124 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -554,17 +559,17 @@ The installer will quit and all changes will be lost.</source> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation type="unfinished"/> </message> @@ -701,12 +706,12 @@ The installer will quit and all changes will be lost.</source> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1118,12 +1123,12 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> @@ -1131,27 +1136,27 @@ The installer will quit and all changes will be lost.</source> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation type="unfinished"/> </message> @@ -1160,12 +1165,12 @@ The installer will quit and all changes will be lost.</source> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1183,22 +1188,22 @@ The installer will quit and all changes will be lost.</source> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> + <source>has at least %1 GiB available drive space</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> + <source>There is not enough drive space. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> + <source>has at least %1 GiB working memory</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> @@ -1481,12 +1486,12 @@ The installer will quit and all changes will be lost.</source> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation type="unfinished"/> </message> @@ -1875,42 +1880,42 @@ The installer will quit and all changes will be lost.</source> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation type="unfinished"/> @@ -2295,7 +2300,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation type="unfinished"/> </message> @@ -2310,7 +2315,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation type="unfinished"/> @@ -2413,70 +2418,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2490,12 +2495,12 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> + <source>Resizing %2MiB partition %1 to %3MiB.</source> <translation type="unfinished"/> </message> <message> @@ -2651,7 +2656,7 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> + <source>Set flags on %1MiB %2 partition.</source> <translation type="unfinished"/> </message> <message> @@ -2666,7 +2671,22 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> <translation type="unfinished"/> </message> <message> @@ -2680,11 +2700,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation type="unfinished"/> @@ -2695,11 +2710,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation type="unfinished"/> @@ -2710,11 +2720,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation type="unfinished"/> @@ -3129,7 +3134,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation type="unfinished"/> </message> diff --git a/lang/calamares_bg.ts b/lang/calamares_bg.ts index c1a737b69..b741be71f 100644 --- a/lang/calamares_bg.ts +++ b/lang/calamares_bg.ts @@ -97,7 +97,7 @@ <translation>Инструменти</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Информация за отстраняване на грешки</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Инсталирай</translation> </message> @@ -430,124 +435,124 @@ The installer will quit and all changes will be lost.</source> <translation><strong>Самостоятелно поделяне</strong><br/>Можете да създадете или преоразмерите дяловете сами.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Локация на програмата за начално зареждане:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 ще се смали до %2МБ и нов %3МБ дял ще бъде създаден за %4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Изберете ус&тройство за съхранение:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Сегашен:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Използване на %1 като домашен дял за %2</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Изберете дял за смаляване, после влачете долната лента за преоразмеряване</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Изберете дял за инсталацията</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>EFI системен дял не е намерен. Моля, опитайте пак като използвате ръчно поделяне за %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>EFI системен дял в %1 ще бъде използван за стартиране на %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>EFI системен дял:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Това устройство за съхранение няма инсталирана операционна система. Какво ще правите?<br/>Ще може да прегледате и потвърдите избора си, преди да се направят промени по устройството за съхранение.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Изтриване на диска</strong><br/>Това ще <font color="red">изтрие</font> всички данни върху устройството за съхранение.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>Това устройство за съхранение има инсталиран %1. Какво ще правите?<br/>Ще може да прегледате и потвърдите избора си, преди да се направят промени по устройството за съхранение.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Инсталирайте покрай</strong><br/>Инсталатора ще раздроби дяла за да направи място за %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Замени дял</strong><br/>Заменя този дял с %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>Това устройство за съхранение има инсталирана операционна система. Какво ще правите?<br/>Ще може да прегледате и потвърдите избора си, преди да се направят промени по устройството за съхранение.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>Това устройство за съхранение има инсталирани операционни системи. Какво ще правите?<br/>Ще може да прегледате и потвърдите избора си, преди да се направят промени по устройството за съхранение.</translation> </message> @@ -555,17 +560,17 @@ The installer will quit and all changes will be lost.</source> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Разчисти монтиранията за операциите на подялбата на %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Разчистване на монтиранията за операциите на подялбата на %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Разчистени всички монтирания за %1</translation> </message> @@ -702,13 +707,13 @@ The installer will quit and all changes will be lost.</source> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Създай нов %2МБ дял върху %4 (%3) със файлова система %1.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Създай нов <strong>%2МБ</strong> дял върху <strong>%4</strong> (%3) със файлова система <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1119,12 +1124,12 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>Инсталацията е неуспешна</h1><br/>%1 не е инсталиран на Вашия компютър.<br/>Съобщението с грешката е: %2.</translation> </message> @@ -1132,27 +1137,27 @@ The installer will quit and all changes will be lost.</source> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Завърши</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Инсталацията е завършена</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>Инсталацията на %1 е завършена.</translation> </message> @@ -1161,13 +1166,13 @@ The installer will quit and all changes will be lost.</source> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Форматирай дял %1 (файлова система: %2, размер: %3 МБ) on %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>Форматирай <strong>%3МБ</strong> дял <strong>%1</strong> с файлова система <strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1184,23 +1189,23 @@ The installer will quit and all changes will be lost.</source> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>има поне %1 ГБ свободено дисково пространство</translation> + <source>has at least %1 GiB available drive space</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>Няма достатъчно дисково пространство. Необходимо е поне %1 ГБ.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>има поне %1 ГБ работна памет</translation> + <source>has at least %1 GiB working memory</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>Системата не разполага с достатъчно работна памет. Необходима е поне %1 ГБ.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1482,12 +1487,12 @@ The installer will quit and all changes will be lost.</source> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Зареждане на данните за местоположение</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Местоположение</translation> </message> @@ -1876,42 +1881,42 @@ The installer will quit and all changes will be lost.</source> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Основен</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Домашен</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Зареждане</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>EFI система</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Нов дял за %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Нов дял</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2298,7 +2303,7 @@ Output: <translation>swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Неразделено пространство или неизвестна таблица на дяловете</translation> </message> @@ -2313,7 +2318,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2416,70 +2421,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2493,13 +2498,13 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>Преоразмери <strong>%2МБ</strong> дял <strong>%1</strong> на <strong>%3МБ</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Преоразмеряване от %2МБ дял %1 на %3МБ.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2655,8 +2660,8 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>Задай флагове на дял %1MB %2.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2670,8 +2675,23 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>Изчисти флагове на дял %1MB <strong>%2</strong>.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2684,11 +2704,6 @@ Output: <translation>Сложи флаг на дял <strong>%1</strong> като <strong>%2</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Сложи флаг на дял %1MB <strong>%2</strong> като <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Сложи флаг на новия дял като <strong>%1</strong>.</translation> @@ -2699,11 +2714,6 @@ Output: <translation>Изчистване на флаговете на дял <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>Изчистване флаговете на дял %1MB <strong>%2</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>Изчистване на флаговете на новия дял.</translation> @@ -2714,11 +2724,6 @@ Output: <translation>Задаване на флагове <strong>%2</strong> на дял <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>Задаване на флагове <strong>%3</strong> на дял %1MB <strong>%2</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>Задаване на флагове <strong>%1</strong> на новия дял.</translation> @@ -3133,7 +3138,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Добре дошли</translation> </message> diff --git a/lang/calamares_ca.ts b/lang/calamares_ca.ts index 7fb591765..c31cde6d6 100644 --- a/lang/calamares_ca.ts +++ b/lang/calamares_ca.ts @@ -97,7 +97,7 @@ <translation>Eines</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Informació de depuració</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation>Configuració</translation> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Instal·la</translation> </message> @@ -341,7 +346,7 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="269"/> <source>Go &back</source> - <translation>Vés &enrere</translation> + <translation>Ves &enrere</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="323"/> @@ -431,124 +436,124 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation> <translation><strong>Particions manuals</strong><br/>Podeu crear o canviar la mida de les particions vosaltres mateixos.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Ubicació del gestor d'arrencada:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 s'encongirà a %2 MB i es crearà una partició nova de %3 MB per a %4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Seleccioneu un dispositiu d'e&mmagatzematge:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Actual:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Reutilitza %1 com a partició de l'usuari per a %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Seleccioneu una partició per encongir i arrossegueu-la per redimensinar-la</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation>%1 s'encongirà a %2 MiB i es crearà una partició nova de %3 MB per a %4.</translation> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Seleccioneu una partició per fer-hi la instal·lació</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>No s'ha pogut trobar enlloc una partició EFI en aquest sistema. Si us plau, torneu enrere i use les particions manuals per configurar %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation> La partició EFI de sistema a %1 s'usarà per iniciar %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>Partició EFI del sistema:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Aquest dispositiu d'emmagatzematge no sembla que tingui un sistema operatiu. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faci cap canvi al dispositiu.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Esborra el disc</strong><br/>Això <font color="red">suprimirà</font> totes les dades del dispositiu seleccionat.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>Aquest dispositiu d'emmagatzematge té %1. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faci cap canvi al dispositiu. </translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation>Sense intercanvi</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation>Reutilitza l'intercanvi</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation>Intercanvi (sense hibernació)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation>Intercanvi (amb hibernació)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation>Intercanvi en fitxer</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Instal·la al costat</strong><br/>L'instal·lador reduirà una partició per fer espai per a %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Reemplaça una partició</strong><br/>Reemplaça una partició per %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>Aquest dispositiu d'emmagatzematge ja té un sistema operatiu. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faci cap canvi al dispositiu. </translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>Aquest dispositiu d'emmagatzematge ja múltiples sistemes operatius. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faci cap canvi al dispositiu. </translation> </message> @@ -556,17 +561,17 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Neteja els muntatges per les operacions de partició a %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Es netegen els muntatges per a les operacions de les particions a %1.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>S'han netejat tots els muntatges de %1</translation> </message> @@ -703,13 +708,13 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Crea una partició nova de %2 MB a %4 (%3) amb el sistema de fitxers %1.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation>Crea una partició nova de %2 MiB a %4 (%3) amb el sistema de fitxers %1.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Crea una partició nova de <strong>%2 MB</strong> a <strong>%4</strong> (%3) amb el sistema de fitxers <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation>Crea una partició nova de <strong>%2 MiB</strong> a <strong>%4</strong> (%3) amb el sistema de fitxers <strong>%1</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1120,12 +1125,12 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation> <translation><html><head/><body><p>Quan aquesta casella està marcada, el sistema es reiniciarà immediatament quan cliqueu a <span style=" font-style:italic;">Fet</span> o tanqueu l'instal·lador.</p></body></html></translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation><h1>La configuració ha fallat</h1><br/>No s'ha configurat %1 a l'ordinador.<br/>El missatge d'error ha estat el següent: %2.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>La instal·lació ha fallat</h1><br/>No s'ha instal·lat %1 a l'ordinador.<br/>El missatge d'error ha estat el següent: %2.</translation> </message> @@ -1133,27 +1138,27 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Acaba</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation>Configuració completa</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Instal·lació acabada</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation>La configuració de %1 ha acabat.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>La instal·lació de %1 ha acabat.</translation> </message> @@ -1162,13 +1167,13 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Formata la partició %1 (sistema de fitxers: %2, mida: %3 MB) de %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation>Formata la partició %1 (sistema de fitxers: %2, mida: %3 MiB) de %4.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>Formata la partició de <strong>%3 MB</strong> <strong>%1</strong> amb el sistema de fitxers <strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation>Formata la partició de <strong>%3 MiB</strong> <strong>%1</strong> amb el sistema de fitxers <strong>%2</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1185,23 +1190,23 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>tingui com a mínim %1 GB d'espai de disc disponible.</translation> + <source>has at least %1 GiB available drive space</source> + <translation>tingui com a mínim %1 GiB d'espai de disc disponible.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>No hi ha prou espai de disc disponible. Com a mínim hi ha d'haver %1 GB.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation>No hi ha prou espai de disc disponible. Com a mínim hi ha d'haver %1 GiB.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>tingui com a mínim %1 GB de memòria de treball.</translation> + <source>has at least %1 GiB working memory</source> + <translation>tingui com a mínim %1 GiB de memòria de treball.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>El sistema no té prou memòria de treball. Com a mínim es necessita %1 GB.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation>El sistema no té prou memòria de treball. Com a mínim hi ha d'haver %1 GiB.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1483,12 +1488,12 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Es carreguen les dades d'ubicació...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Ubicació</translation> </message> @@ -1877,42 +1882,42 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Arrel</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Inici</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Arrencada</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>Sistema EFI</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Intercanvi</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Partició nova per a %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Partició nova</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2300,7 +2305,7 @@ Sortida: <translation>Intercanvi</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Espai sense partir o taula de particions desconeguda</translation> </message> @@ -2315,7 +2320,7 @@ Sortida: <translation>S'ha completat la comprovació dels requeriments per al mòdul <i>%1</i>.</translation> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2418,70 +2423,70 @@ Sortida: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation>Tasca de canviar de mida un sistema de fitxers</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>Configuració no vàlida</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation>La tasca de canviar de mida un sistema de fitxers té una configuració no vàlida i no s'executarà.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation>KPMCore no disponible</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation>El Calamares no pot iniciar KPMCore per a la tasca de canviar de mida un sistema de fitxers.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>Ha fallat el canvi de mida.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation>El sistema de fitxers %1 no s'ha pogut trobar en aquest sistema i, per tant, no se'n pot canviar la mida.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation>El dispositiu &1 no s'ha pogut trobar en aquest sistema i, per tant, no se'n pot canviar la mida.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation>No es pot canviar la mida del sistema de fitxers %1.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation>No es pot canviar la mida del dispositiu %1.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation>Cal canviar la mida del sistema de fitxers %1, però no es pot.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation>Cal canviar la mida del dispositiu %1, però no es pot.</translation> </message> @@ -2495,13 +2500,13 @@ Sortida: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>Canvia la mida de la partició de <strong>%2MB</strong>, <strong>%1</strong>, a <strong>%3MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation>Canvia la mida de la partició de <strong>%2 MiB</strong>, <strong>%1</strong>, a <strong>%3 MiB</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Es canvia la mida de la partició %1 de %2MB a %3MB.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation>Es canvia la mida de la partició %1 de %2 MiB a %3 MiB.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2656,8 +2661,8 @@ Sortida: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>Estableix les banderes a la partició %1MB %2.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation>Estableix les banderes a la partició %2 de %1 MiB.</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2671,8 +2676,23 @@ Sortida: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>Neteja les banderes de la partició %1MB <strong>%2</strong>.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation>Neteja les banderes de la partició <strong>%2</strong> de %1 MiB.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation>Estableix la bandera de la partició <strong>%2</strong> de %1 MiB com a <strong>%3</strong>.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation>Es netegen les banderes de la partició <strong>%2</strong>de %1 MiB.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation>S'estableixen les banderes <strong>%3</strong> a la partició <strong>%2</strong> de %1 MiB.</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2685,11 +2705,6 @@ Sortida: <translation>Estableix la bandera <strong>%2</strong> a la partició <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Estableix la bandera de la partició %1MB <strong>%2</strong> com a <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Estableix la bandera de la partició nova com a <strong>%1</strong>.</translation> @@ -2700,11 +2715,6 @@ Sortida: <translation>Es netegen les banderes de la partició <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>Es netegen les banderes de la partició %1MB <strong>%2</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>Es netegen les banderes de la partició nova.</translation> @@ -2715,11 +2725,6 @@ Sortida: <translation>Establint les banderes <strong>%2</strong> a la partició <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>S'estableixen les banderes <strong>%3</strong> a la partició %1MB <strong>%2</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>S'estableixen les banderes <strong>%1</strong> a la partició nova.</translation> @@ -3134,7 +3139,7 @@ Sortida: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Benvinguda</translation> </message> diff --git a/lang/calamares_cs_CZ.ts b/lang/calamares_cs_CZ.ts index 1b73a8f15..cada5548e 100644 --- a/lang/calamares_cs_CZ.ts +++ b/lang/calamares_cs_CZ.ts @@ -97,7 +97,7 @@ <translation>Nástroje</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Ladící informace</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation>Nastavit</translation> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Instalovat</translation> </message> @@ -431,124 +436,124 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation> <translation><strong>Ruční rozdělení datového úložiště</strong><br/>Sami si můžete vytvořit vytvořit nebo zvětšit/zmenšit oddíly.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Umístění zavaděče:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 bude zmenšen na %2MB a nový %3MB oddíl pro %4 bude vytvořen.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>&Vyberte úložné zařízení:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Stávající:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Zrecyklovat %1 na oddíl pro domovské složky %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Vyberte oddíl, který chcete zmenšit, poté posouváním na spodní liště změňte jeho velikost.</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation>%1 bude zmenšen na %2MiB a nový %3MiB oddíl pro %4 bude vytvořen.</translation> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Vyberte oddíl na který nainstalovat</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>Nebyl nalezen žádný EFI systémový oddíl. Vraťte se zpět a nastavte %1 pomocí ručního rozdělení.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>Pro zavedení %2 se využije EFI systémový oddíl %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>EFI systémový oddíl:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Zdá se, že na tomto úložném zařízení není žádný operační systém. Jak chcete postupovat?<br/>Než budou provedeny jakékoli změny na úložných zařízeních, bude zobrazen jejich přehled a budete požádáni o jejich potvrzení.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Vymazat datové úložiště</strong><br/>Touto volbou budou <font color="red">smazána</font> všechna data, která se na něm nyní nacházejí.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>Na tomto úložném zařízení bylo nalezeno %1. Jak chcete postupovat?<br/>Než budou provedeny jakékoli změny na úložných zařízeních, bude zobrazen jejich přehled a budete požádáni o jejich potvrzení.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation>Žádný odkládací prostor (swap)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation>Použít existující odkládací prostor</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation>Odkládací prostor (bez uspávání na disk)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation>Odkládací prostor (s uspáváním na disk)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation>Odkládat do souboru</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Nainstalovat vedle</strong><br/>Instalátor zmenší oddíl a vytvoří místo pro %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Nahradit oddíl</strong><br/>Původní oddíl bude nahrazen %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>Na tomto úložném zařízení se už nachází operační systém. Jak chcete postupovat?<br/>Než budou provedeny jakékoli změny na úložných zařízeních, bude zobrazen jejich přehled a budete požádáni o jejich potvrzení.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>Na tomto úložném zařízení se už nachází několik operačních systémů. Jak chcete postupovat?<br/>Než budou provedeny jakékoli změny na úložných zařízeních, bude zobrazen jejich přehled změn a budete požádáni o jejich potvrzení.</translation> </message> @@ -556,17 +561,17 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Odpojit souborové systémy před zahájením dělení %1 na oddíly</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Odpojují se souborové systémy před zahájením dělení %1 na oddíly</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Všechny souborové systémy na %1 odpojeny</translation> </message> @@ -703,13 +708,13 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Vytvořit nový %2MB oddíl na %4 (%3) se souborovým systémem %1.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation>Vytvořit nový %2MiB oddíl na %4 (%3) se souborovým systémem %1.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Vytvořit nový <strong>%2MB</strong> oddíl na <strong>%4</strong> (%3) se souborovým systémem <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation>Vytvořit nový <strong>%2MiB</strong> oddíl na <strong>%4</strong> (%3) se souborovým systémem <strong>%1</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1120,12 +1125,12 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation> <translation><html><head/><body><p>Když je tato kolonka zaškrtnutá, systém se restartuje jakmile kliknete na <span style="font-style:italic;">Hotovo</span> nebo zavřete instalátor.</p></body></html></translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation><h1>Instalace se nezdařila</h1><br/>%1 nebyl instalován na váš počítač.<br/>Hlášení o chybě: %2.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>Instalace se nezdařila</h1><br/>%1 nebylo nainstalováno na váš počítač.<br/>Hlášení o chybě: %2.</translation> </message> @@ -1133,27 +1138,27 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Dokončit</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation>Nastavení dokončeno</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Instalace dokončena</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation>Nastavení %1 je dokončeno.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>Instalace %1 je dokončena.</translation> </message> @@ -1162,13 +1167,13 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Formátovat oddíl %1 (souborový systém: %2, velikost %3 MB) na %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation>Formátovat oddíl %1 (souborový systém: %2, velikost %3 MiB) na %4.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>Naformátovat <strong>%3MB</strong> oddíl <strong>%1</strong> souborovým systémem <strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation>Naformátovat <strong>%3MiB</strong> oddíl <strong>%1</strong> souborovým systémem <strong>%2</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1185,23 +1190,23 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>má minimálně %1 GB dostupného místa na jednotce</translation> + <source>has at least %1 GiB available drive space</source> + <translation>má alespoň %1 GiB dostupného prostoru</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>Nedostatek místa na úložišti. Je potřeba nejméně %1 GB.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation>Nedostatek místa na úložišti. Je potřeba nejméně %1 GiB.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>má alespoň %1 GB operační paměti</translation> + <source>has at least %1 GiB working memory</source> + <translation>má alespoň %1 GiB operační paměti</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>Systém nemá dostatek operační paměti. Je potřeba nejméně %1 GB.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation>Systém nemá dostatek operační paměti. Je potřeba nejméně %1 GiB.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1483,12 +1488,12 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Načítání informací o poloze…</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Poloha</translation> </message> @@ -1877,42 +1882,42 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Kořenový (root)</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Složky uživatelů (home)</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Zaváděcí (boot)</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>EFI systémový</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Odkládání str. z oper. paměti (swap)</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Nový oddíl pro %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Nový oddíl</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2300,7 +2305,7 @@ Výstup: <translation>odkládací oddíl</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Nerozdělené prázné místo nebo neznámá tabulka oddílů</translation> </message> @@ -2315,7 +2320,7 @@ Výstup: <translation>Kontrola požadavků pro modul <i>%1</i> dokončena.</translation> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2418,70 +2423,70 @@ Výstup: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation>Úloha změny velikosti souborového systému</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>Neplatné nastavení</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation>Úloha změny velikosti souborového systému nemá platné nastavení a nebude spuštěna.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation>KPMCore není k dispozici</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation>Kalamares nemůže spustit KPMCore pro úlohu změny velikosti souborového systému.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>Změna velikosti se nezdařila</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation>Souborový systém %1 nebyl na tomto systému nalezen a jeho velikost proto nemůže být změněna.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation>Zařízení %1 nebylo na tomto systému nalezeno a proto nemůže být jeho velikost změněna.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation>Velikost souborového systému %1 není možné změnit.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation>Velikost zařízení %1 nelze měnit.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation>Velikost souborového systému %1 je třeba změnit, ale není to možné.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation>Velikost zařízení %1 je třeba změnit, ale není to možné</translation> </message> @@ -2495,13 +2500,13 @@ Výstup: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>Změnit velikost <strong>%2MB</strong> oddílu <strong>%1</strong> na <strong>%3MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation>Změnit velikost <strong>%2MiB</strong> oddílu <strong>%1</strong> na <strong>%3MiB</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Mění se velikost %2MB oddílu %1 na %3MB.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation>Změna velikosti %2MiB oddílu %1 na %3MiB.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2656,8 +2661,8 @@ Výstup: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>Nastavit příznaky na %1MB %2 oddílu.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation>Nastavit příznaky na %1MiB %2 oddílu.</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2671,8 +2676,23 @@ Výstup: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>Vymazat příznaky z %1MB <strong>%2</strong> oddílu.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation>Odstranit příznaky z %1MiB <strong>%2</strong> oddílu.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation>Označit %1MiB <strong>%2</strong> oddíl jako <strong>%3</strong>.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation>Odstraňování příznaků na %1MiB <strong>%2</strong> oddílu.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation>Nastavování příznaků <strong>%3</strong> na %1MiB <strong>%2</strong> oddílu.</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2685,11 +2705,6 @@ Výstup: <translation>Nastavit příznak oddílu <strong>%1</strong> jako <strong>%2</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Nastavit příznak %1MB <strong>%2</strong> oddílu jako <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Nastavit příznak <strong>%1</strong> na novém oddílu.</translation> @@ -2700,11 +2715,6 @@ Výstup: <translation>Mazání příznaků oddílu <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>Mazání příznaků na %1MB <strong>%2</strong> oddílu.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>Mazání příznaků na novém oddílu.</translation> @@ -2715,11 +2725,6 @@ Výstup: <translation>Nastavování příznaků <strong>%2</strong> na oddílu <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>Nastavování příznaků <strong>%3</strong> na %1MB <strong>%2</strong> oddílu.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>Nastavování příznaků <strong>%1</strong> na novém oddílu.</translation> @@ -3134,7 +3139,7 @@ Výstup: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Vítejte</translation> </message> diff --git a/lang/calamares_da.ts b/lang/calamares_da.ts index 97a67e09b..ad5f7cf6b 100644 --- a/lang/calamares_da.ts +++ b/lang/calamares_da.ts @@ -97,7 +97,7 @@ <translation>Værktøjer</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Fejlretningsinformation</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation>Sæt op</translation> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Installation</translation> </message> @@ -262,7 +267,7 @@ <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="254"/> <source>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></source> - <translation type="unfinished"/> + <translation>%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></translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="261"/> @@ -298,7 +303,8 @@ <location filename="../src/libcalamaresui/ViewManager.cpp" line="375"/> <source>Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost.</source> - <translation type="unfinished"/> + <translation>Vil du virkelig annullere den igangværende opsætningsproces? +Opsætningsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="377"/> @@ -409,7 +415,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation <message> <location filename="../src/modules/welcome/checker/CheckerContainer.cpp" line="45"/> <source>Gathering system information...</source> - <translation>Indsamler systeminformation...</translation> + <translation>Indsamler systeminformation ...</translation> </message> </context> <context> @@ -430,124 +436,124 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation <translation><strong>Manuel partitionering</strong><br/>Du kan selv oprette og ændre størrelse på partitioner.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Placering af bootloader:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 vil blive skrumpet til %2 MB og en ny %3 MB partition vil blive oprettet for %4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Vælg lageren&hed:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Nuværende:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Genbrug %1 som hjemmepartition til %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Vælg en partition der skal mindskes, træk herefter den nederste bjælke for at ændre størrelsen</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation>%1 vil blive skrumpet til %2 MiB og en ny %3 MiB partition vil blive oprettet for %4.</translation> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Vælg en partition at installere på</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>En EFI-partition blev ikke fundet på systemet. Gå venligst tilbage og brug manuel partitionering til at opsætte %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>EFI-systempartitionen ved %1 vil blive brugt til at starte %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>EFI-systempartition:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Lagerenheden ser ikke ud til at indeholde et styresystem. Hvad ønsker du at gøre?<br/>Du vil få mulighed for at se og bekræfte dine valg før der sker ændringer til lagerenheden.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Slet disk</strong><br/>Det vil <font color="red">slette</font> alt data på den valgte lagerenhed.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>Lagerenheden har %1 på sig. Hvad ønsker du at gøre?<br/>Du vil få mulighed for at se og bekræfte dine valg før det sker ændringer til lagerenheden.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation>Ingen swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation>Genbrug swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation>Swap (ingen dvale)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation>Swap (med dvale)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation>Swap til fil</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Installér ved siden af</strong><br/>Installationsprogrammet vil mindske en partition for at gøre plads til %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Erstat en partition</strong><br/>Erstatter en partition med %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>Lagerenheden indeholder allerede et styresystem. Hvad ønsker du at gøre?<br/>Du vil få mulighed for at se og bekræfte dine valg før der sker ændringer til lagerenheden.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>Lagerenheden indeholder flere styresystemer. Hvad ønsker du at gøre?<br/>Du vil få mulighed for at se og bekræfte dine valg før der sker ændringer til lagerenheden.</translation> </message> @@ -555,17 +561,17 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Ryd monteringspunkter for partitioneringshandlinger på %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Rydder monteringspunkter for partitioneringshandlinger på %1.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Ryddede alle monteringspunkter til %1</translation> </message> @@ -702,13 +708,13 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Opret en ny %2 MB partition på %4 (%3) med %1-filsystem.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation>Opret en ny %2 MiB partition på %4 (%3) med %1-filsystem.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Opret en ny <strong>%2 MB</strong> partition på <strong>%4</strong> (%3) med <strong>%1</strong>-filsystem.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation>Opret en ny <strong>%2 MiB</strong> partition på <strong>%4</strong> (%3) med <strong>%1</strong>-filsystem.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1101,12 +1107,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation <message> <location filename="../src/modules/finished/FinishedPage.cpp" line="54"/> <source><h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system.</source> - <translation type="unfinished"/> + <translation><h1>Færdig.</h1><br/>%1 er blevet opsat på din computer.<br/>Du kan nu begynde at bruge dit nye system.</translation> </message> <message> <location filename="../src/modules/finished/FinishedPage.cpp" line="58"/> <source><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></source> - <translation type="unfinished"/> + <translation><html><head/><body><p>Når boksen er tilvalgt, vil dit system genstarte med det samme når du klikker på <span style="font-style:italic;">Færdig</span> eller lukker opsætningsprogrammet.</p></body></html></translation> </message> <message> <location filename="../src/modules/finished/FinishedPage.cpp" line="66"/> @@ -1116,15 +1122,15 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation <message> <location filename="../src/modules/finished/FinishedPage.cpp" line="71"/> <source><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></source> - <translation type="unfinished"/> + <translation><html><head/><body><p>Når boksen er tilvalgt, vil dit system genstarte med det samme når du klikker på <span style="font-style:italic;">Færdig</span> eller lukker installationsprogrammet.</p></body></html></translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation><h1>Opsætningen mislykkede</h1><br/>%1 er ikke blevet sat op på din computer.<br/>Fejlmeddelelsen var: %2.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>Installation mislykkede</h1><br/>%1 er ikke blevet installeret på din computer.<br/>Fejlmeddelelsen var: %2.</translation> </message> @@ -1132,27 +1138,27 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Færdig</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation>Opsætningen er fuldført</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Installation fuldført</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation>Opsætningen af %1 er fuldført.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>Installationen af %1 er fuldført.</translation> </message> @@ -1161,13 +1167,13 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Formatér partition %1 (filsystem: %2, størrelse: %3 MB) på %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation>Formatér partition %1 (filsystem: %2, størrelse: %3 MiB) på %4.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>Formatér <strong>%3 MB</strong> partition <strong>%1</strong> med <strong>%2</strong>-filsystem.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation>Formatér <strong>%3 MiB</strong> partition <strong>%1</strong> med <strong>%2</strong>-filsystem.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1184,23 +1190,23 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>har mindst %1 GB ledig plads på drevet</translation> + <source>has at least %1 GiB available drive space</source> + <translation>har mindst %1 GiB ledig plads på drevet</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>Der er ikke nok ledig plads på drevet. Mindst %1 GB er påkrævet.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation>Der er ikke nok ledig plads på drevet. Mindst %1 GiB er påkrævet.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>har mindst %1 GB arbejdshukommelse</translation> + <source>has at least %1 GiB working memory</source> + <translation>har mindst %1 GiB hukkommelse</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>Systemet har ikke nok arbejdshukommelse. Mindst %1 GB er påkrævet.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation>Systemet har ikke nok arbejdshukommelse. Mindst %1 GiB er påkrævet.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1225,7 +1231,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="142"/> <source>The setup program is not running with administrator rights.</source> - <translation type="unfinished"/> + <translation>Opsætningsprogrammet kører ikke med administratorrettigheder.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="143"/> @@ -1251,7 +1257,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation <location filename="../src/modules/oemid/IDJob.cpp" line="59"/> <location filename="../src/modules/oemid/IDJob.cpp" line="67"/> <source>OEM Batch Identifier</source> - <translation type="unfinished"/> + <translation>OEM-batchidentifikator</translation> </message> <message> <location filename="../src/modules/oemid/IDJob.cpp" line="48"/> @@ -1471,7 +1477,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation <location filename="../src/modules/locale/LocalePage.cpp" line="224"/> <location filename="../src/modules/locale/LocalePage.cpp" line="225"/> <source>&Change...</source> - <translation>&Skift...</translation> + <translation>&Skift ...</translation> </message> <message> <location filename="../src/modules/locale/LocalePage.cpp" line="404"/> @@ -1482,12 +1488,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> - <translation>Indlæser placeringsdata...</translation> + <translation>Indlæser placeringsdata ...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Placering</translation> </message> @@ -1528,17 +1534,17 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation <message> <location filename="../src/modules/oemid/OEMPage.ui" line="28"/> <source>Ba&tch:</source> - <translation type="unfinished"/> + <translation>Ba&tch:</translation> </message> <message> <location filename="../src/modules/oemid/OEMPage.ui" line="38"/> <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source> - <translation type="unfinished"/> + <translation><html><head/><body><p>Indtast en batchidentifikator her. Det gemmes på målsystemet.</p></body></html></translation> </message> <message> <location filename="../src/modules/oemid/OEMPage.ui" line="48"/> <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source> - <translation type="unfinished"/> + <translation><html><head/><body><h1>OEM-konfiguration</h1><p>Calamares bruger OEM-indstillingerne under konfigurering af målsystemet.</p></body></html></translation> </message> </context> <context> @@ -1551,7 +1557,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation <message> <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/> <source>Set the OEM Batch Identifier to <code>%1</code>.</source> - <translation type="unfinished"/> + <translation>Indstil OEM-batchidentifikatoren til <code>%1</code>.</translation> </message> </context> <context> @@ -1876,42 +1882,42 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Rod</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Hjem</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Boot</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>EFI-system</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Ny partition til %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Ny partition</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2035,7 +2041,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation <message> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/> <source>Gathering system information...</source> - <translation>Indsamler systeminformation...</translation> + <translation>Indsamler systeminformation ...</translation> </message> <message> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/> @@ -2299,7 +2305,7 @@ Output: <translation>swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Upartitioneret plads eller ukendt partitionstabel</translation> </message> @@ -2314,7 +2320,7 @@ Output: <translation>Tjek at krav for modulet <i>%1</i> er fuldført.</translation> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2417,70 +2423,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation>Job til ændring af størrelse</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>Ugyldig konfiguration</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation>Filsystemets job til ændring af størrelse har en ugyldig konfiguration og kan ikke køre.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation>KPMCore ikke tilgængelig</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation>Calamares kan ikke starte KPMCore for jobbet til ændring af størrelse.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>Ændring af størrelse mislykkedes</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation>Filsystemet %1 kunne ikke findes i systemet, og kan ikke ændres i størrelse.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation>Enheden %1 kunne ikke findes i systemet, og kan ikke ændres i størrelse.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation>Filsystemet størrelse %1 kan ikke ændres.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation>Enheden %1 kan ikke ændres i størrelse.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation>Filsystemet %1 skal ændres i størrelse, men er ikke i stand til det.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation>Enheden størrelse %1 skal ændres, men er ikke i stand til det.</translation> </message> @@ -2494,13 +2500,13 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>Ændr størrelse af <strong>%2 MB</strong> partition <strong>%1</strong> til <strong>%3 MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation>Ændr størrelse af <strong>%2 MiB</strong> partition <strong>%1</strong> til <strong>%3 MiB</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Ændrer størrelsen på %2 MB partition %1 til %3 MB.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation>Ændrer størrelsen på %2 MiB partition %1 til %3 MiB.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2540,17 +2546,17 @@ Output: <message> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="96"/> <source>This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a></source> - <translation type="unfinished"/> + <translation>Computeren imødekommer ikke minimumsystemkravene for at opsætte %1.<br/>Opsætningen kan ikke fortsætte. <a href="#details">Detaljer ...</a></translation> </message> <message> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="100"/> <source>This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a></source> - <translation>Computeren imødekommer ikke minimumsystemkravene for at installere %1.<br/>Installationen kan ikke fortsætte. <a href="#details">Detaljer...</a></translation> + <translation>Computeren imødekommer ikke minimumsystemkravene for at installere %1.<br/>Installationen kan ikke fortsætte. <a href="#details">Detaljer ...</a></translation> </message> <message> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="118"/> <source>This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.</source> - <translation type="unfinished"/> + <translation>Computeren imødekommer ikke nogle af de anbefalede systemkrav for at opsætte %1.<br/>Opsætningen kan fortsætte, men nogle funktionaliteter kan være deaktiveret.</translation> </message> <message> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="122"/> @@ -2578,7 +2584,7 @@ Output: <message> <location filename="../src/modules/partition/gui/ScanningDialog.cpp" line="84"/> <source>Scanning storage devices...</source> - <translation>Skanner lagerenheder...</translation> + <translation>Skanner lagerenheder ...</translation> </message> <message> <location filename="../src/modules/partition/gui/ScanningDialog.cpp" line="85"/> @@ -2655,8 +2661,8 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>Sæt flag på %1 MB %2 partition.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation>Sæt flag på %1 MiB %2 partition.</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2670,8 +2676,23 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>Ryd flag på %1 MB <strong>%2</strong> partition.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation>Ryd flag på %1 MiB <strong>%2</strong> partition.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation>Flag %1 MiB <strong>%2</strong> partition som <strong>%3</strong>.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation>Rydder flag på %1 MiB <strong>%2</strong> partition.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation>Sætter flag <strong>%3</strong> på %1 MiB <strong>%2</strong> partition.</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2684,11 +2705,6 @@ Output: <translation>Flag partition <strong>%1</strong> som <strong>%2</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Flag %1 MB <strong>%2</strong> partition som <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Flag ny partition som <strong>%1</strong>.</translation> @@ -2699,11 +2715,6 @@ Output: <translation>Rydder flag på partition <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>Rydder flag på %1 MB <strong>%2</strong> partition.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>Rydder flag på ny partition.</translation> @@ -2714,11 +2725,6 @@ Output: <translation>Sætter flag <strong>%2</strong> på partition <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>Sætter flag <strong>%3</strong> på %1 MB <strong>%2</strong> partition.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>Sætter flag <strong>%1</strong> på ny partition.</translation> @@ -2832,7 +2838,7 @@ Output: <message> <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/> <source>This is an overview of what will happen once you start the setup procedure.</source> - <translation type="unfinished"/> + <translation>Dette er et overblik over hvad der vil ske når du starter opsætningsprocessen.</translation> </message> <message> <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/> @@ -2956,7 +2962,7 @@ Output: <message> <location filename="../src/modules/users/UsersPage.cpp" line="120"/> <source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source> - <translation type="unfinished"/> + <translation><small>Hvis mere end én person bruger computeren, kan du oprette flere konti efter opsætningen.</small></translation> </message> <message> <location filename="../src/modules/users/UsersPage.cpp" line="126"/> @@ -3133,7 +3139,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Velkommen</translation> </message> diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts index 50b125ac8..919a4d03e 100644 --- a/lang/calamares_de.ts +++ b/lang/calamares_de.ts @@ -97,7 +97,7 @@ <translation>Werkzeuge</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Debug-Information</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation>Einrichten</translation> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Installieren</translation> </message> @@ -431,124 +436,124 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. <translation><strong>Manuelle Partitionierung</strong><br/>Sie können Partitionen eigenhändig erstellen oder in der Grösse verändern.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Installationsziel des Bootloaders:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 wird auf %2MB verkleinert und eine neue Partition mit einer Größe von %3MB wird für %4 erstellt werden.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Speichermedium auswählen</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Aktuell:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>%1 als Home-Partition für %2 wiederverwenden.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Wählen Sie die zu verkleinernde Partition, dann ziehen Sie den Regler, um die Größe zu ändern</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation>%1 wird auf %2MiB verkleinert und eine neue Partition mit einer Größe von %3MiB wird für %4 erstellt werden.</translation> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Wählen Sie eine Partition für die Installation</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>Es wurde keine EFI-Systempartition auf diesem System gefunden. Bitte gehen Sie zurück und nutzen Sie die manuelle Partitionierung für das Einrichten von %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>Die EFI-Systempartition %1 wird benutzt, um %2 zu starten.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>EFI-Systempartition:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Auf diesem Speichermedium scheint kein Betriebssystem installiert zu sein. Was möchten Sie tun?<br/>Sie können Ihre Auswahl überprüfen und bestätigen, bevor Änderungen auf diesem Speichermedium vorgenommen werden.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Festplatte löschen</strong><br/>Dies wird alle vorhandenen Daten auf dem gewählten Speichermedium <font color="red">löschen</font>. </translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>Auf diesem Speichermedium ist %1 installiert. Was möchten Sie tun?<br/>Sie können Ihre Auswahl überprüfen und bestätigen, bevor Änderungen an dem Speichermedium vorgenommen werden.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation>Kein Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation>Swap wiederverwenden</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation>Swap (ohne Ruhezustand)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation>Swap (mit Ruhezustand)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation>Swap in Datei</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Parallel dazu installieren</strong><br/>Das Installationsprogramm wird eine Partition verkleinern, um Platz für %1 zu schaffen.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Ersetze eine Partition</strong><br/>Ersetzt eine Partition durch %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>Dieses Speichermedium enthält bereits ein Betriebssystem. Was möchten Sie tun?<br/>Sie können Ihre Auswahl überprüfen und bestätigen, bevor Änderungen an dem Speichermedium vorgenommen wird.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>Auf diesem Speichermedium sind mehrere Betriebssysteme installiert. Was möchten Sie tun?<br/>Sie können Ihre Auswahl überprüfen und bestätigen, bevor Änderungen an dem Speichermedium vorgenommen werden.</translation> </message> @@ -556,17 +561,17 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Leere Mount-Points für Partitioning-Operation auf %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Löse eingehängte Laufwerke für die Partitionierung von %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Alle Mount-Points für %1 geleert</translation> </message> @@ -703,13 +708,13 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Erstelle eine neue Partition mit einer Größe von %2MB auf %4 (%3) mit dem Dateisystem %1.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation>Erstelle eine neue Partition mit einer Größe von %2MiB auf %4 (%3) mit dem Dateisystem %1.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Erstelle eine neue Partition mit einer Größe von <strong>%2MB</strong> auf <strong>%4</strong> (%3) mit dem Dateisystem <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation>Erstelle eine neue Partition mit einer Größe von <strong>%2MiB</strong> auf <strong>%4</strong> (%3) mit dem Dateisystem <strong>%1</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1120,12 +1125,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. <translation><html><head/><body><p>Wenn diese Option aktiviert ist, genügt zum Neustart des Systems ein Klick auf <span style="font-style:italic;">Fertig</span> oder das Schließen des Installationsprogramms.</p></body></html></translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation><h1>Installation fehlgeschlagen</h1><br/>%1 wurde nicht auf Ihrem Computer eingerichtet.<br/>Die Fehlermeldung war: %2.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>Installation fehlgeschlagen</h1><br/>%1 wurde nicht auf deinem Computer installiert.<br/>Die Fehlermeldung lautet: %2.</translation> </message> @@ -1133,27 +1138,27 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Beenden</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation>Installation komplett</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Installation abgeschlossen</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation>Die Installation von %1 ist abgeschlossen.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>Die Installation von %1 ist abgeschlossen.</translation> </message> @@ -1162,13 +1167,13 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Formatiere Partition %1 (Dateisystem: %2, Grösse: %3 MB) auf %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation>Formatiere Partition %1 (Dateisystem: %2, Grösse: %3 MiB) auf %4.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>Formatiere <strong>%3MB</strong> Partition <strong>%1</strong> mit Dateisystem strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation>Formatiere <strong>%3MiB</strong> Partition <strong>%1</strong> mit Dateisystem strong>%2</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1185,23 +1190,23 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>mindestens %1 GB freien Festplattenplatz hat</translation> + <source>has at least %1 GiB available drive space</source> + <translation>mindestens %1 GiB freien Festplattenplatz hat</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>Der Speicherplatz auf der Festplatte ist unzureichend. Es wird mindestens %1 GB benötigt.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation>Der Speicherplatz auf der Festplatte ist unzureichend. Es wird mindestens %1 GiB benötigt.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>hat mindestens %1 GB Arbeitsspeicher</translation> + <source>has at least %1 GiB working memory</source> + <translation>mindestens %1 GiB Arbeitsspeicher hat</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>Das System hat nicht genug Arbeitsspeicher. Es wird mindestens %1GB benötigt.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation>Das System hat nicht genug Arbeitsspeicher. Es wird mindestens %1GiB benötigt.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1252,22 +1257,22 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. <location filename="../src/modules/oemid/IDJob.cpp" line="59"/> <location filename="../src/modules/oemid/IDJob.cpp" line="67"/> <source>OEM Batch Identifier</source> - <translation type="unfinished"/> + <translation>OEM Chargenkennung</translation> </message> <message> <location filename="../src/modules/oemid/IDJob.cpp" line="48"/> <source>Could not create directories <code>%1</code>.</source> - <translation type="unfinished"/> + <translation>Es konnten keine Verzeichnisse <code>%1</code> erstellt werden.</translation> </message> <message> <location filename="../src/modules/oemid/IDJob.cpp" line="60"/> <source>Could not open file <code>%1</code>.</source> - <translation type="unfinished"/> + <translation>Datei <code>%1</code> konnte nicht geöffnet werden.</translation> </message> <message> <location filename="../src/modules/oemid/IDJob.cpp" line="68"/> <source>Could not write to file <code>%1</code>.</source> - <translation type="unfinished"/> + <translation>Konnte nicht in die Datei <code>%1</code> schreiben.</translation> </message> </context> <context> @@ -1483,12 +1488,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Lade Standortdaten...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Standort</translation> </message> @@ -1529,17 +1534,17 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. <message> <location filename="../src/modules/oemid/OEMPage.ui" line="28"/> <source>Ba&tch:</source> - <translation type="unfinished"/> + <translation>S&tapel:</translation> </message> <message> <location filename="../src/modules/oemid/OEMPage.ui" line="38"/> <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source> - <translation type="unfinished"/> + <translation><html><head/><body><p>Geben Sie hier eine Chargenkennung ein. Diese wird im Zielsystem gespeichert.</p></body></html></translation> </message> <message> <location filename="../src/modules/oemid/OEMPage.ui" line="48"/> <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source> - <translation type="unfinished"/> + <translation><html><head/><body><h1>OEM-Konfiguration</h1><p>Calamares verwendet OEM-Einstellungen bei der Konfiguration des Zielsystems.</p></body></html></translation> </message> </context> <context> @@ -1547,12 +1552,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. <message> <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/> <source>OEM Configuration</source> - <translation type="unfinished"/> + <translation>OEM-Konfiguration</translation> </message> <message> <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/> <source>Set the OEM Batch Identifier to <code>%1</code>.</source> - <translation type="unfinished"/> + <translation>Stellen Sie die OEM-Batch-Identifikation auf <code>%1</code>.</translation> </message> </context> <context> @@ -1877,42 +1882,42 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Root</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Home</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Boot</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>EFI-System</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Neue Partition für %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Neue Partition</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2300,7 +2305,7 @@ Ausgabe: <translation>Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Nicht zugeteilter Speicherplatz oder unbekannte Partitionstabelle</translation> </message> @@ -2315,7 +2320,7 @@ Ausgabe: <translation>Die Anforderungsprüfung für das Modul <i>%1</i> ist abgeschlossen.</translation> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2418,70 +2423,70 @@ Ausgabe: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation>Auftrag zur Änderung der Dateisystemgröße</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>Ungültige Konfiguration</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation>Die Aufgabe zur Änderung der Größe des Dateisystems enthält eine ungültige Konfiguration und wird nicht ausgeführt.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation>KPMCore ist nicht verfügbar</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation>Calamares konnte KPMCore nicht zur Änderung der Dateisystemgröße starten.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>Größenänderung ist fehlgeschlagen.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation>Das Dateisystem %1 konnte in diesem System weder gefunden noch in der Größe verändert werden. </translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation>Das Gerät %1 konnte in diesem System weder gefunden noch in der Größe verändert werden. </translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation>Das Größe des Dateisystem %1 konnte nicht geändert werden.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation>Das Gerät %1 kann nicht in seiner Größe verändert werden.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation>Das Größe des Dateisystem %1 muss geändert werden, kann aber nicht.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation>Das Gerät %1 muss in seiner Größe verändert werden, aber kann nicht</translation> </message> @@ -2495,13 +2500,13 @@ Ausgabe: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>Partition <strong>%1</strong> von <strong>%2MB</strong> auf <strong>%3MB</strong> vergrößern.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation>Partition <strong>%1</strong> von <strong>%2MiB</strong> auf <strong>%3MiB</strong> vergrößern.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Ändere die Größe der Partition %1 von %2MB auf %3MB.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation>Ändere die Größe der Partition %1 von %2MiB auf %3MiB.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2656,8 +2661,8 @@ Ausgabe: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>Setze Markierungen für %1MB %2 Partition.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation>Setze Markierungen für %1MiB %2 Partition.</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2671,8 +2676,23 @@ Ausgabe: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>Markierungen für %1MB <strong>%2</strong> Partition entfernen.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation>Markierungen für %1MiB <strong>%2</strong> Partition entfernen.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation>Markiere %1MiB <strong>%2</strong> Partition als <strong>%3</strong>.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation>Lösche Markierungen für %1MiB <strong>%2</strong> Partition.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation>Setze Markierungen <strong>%3</strong> für %1MiB <strong>%2</strong> Partition.</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2685,11 +2705,6 @@ Ausgabe: <translation>Partition markieren <strong>%1</strong> als <strong>%2</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Markiere %1MB <strong>%2</strong> Partition als <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Markiere neue Partition als <strong>%1</strong>.</translation> @@ -2700,11 +2715,6 @@ Ausgabe: <translation>Lösche Markierungen für Partition <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>Lösche Markierungen für %1MB <strong>%2</strong> Partition.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>Lösche Markierungen für neue Partition.</translation> @@ -2715,11 +2725,6 @@ Ausgabe: <translation>Setze Markierungen <strong>%2</strong> für Partition <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>Setze Markierungen <strong>%3</strong> für %1MB <strong>%2</strong> Partition.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>Setze Markierungen <strong>%1</strong> für neue Partition.</translation> @@ -3134,7 +3139,7 @@ Ausgabe: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Willkommen</translation> </message> diff --git a/lang/calamares_el.ts b/lang/calamares_el.ts index 9faf68461..f6076390d 100644 --- a/lang/calamares_el.ts +++ b/lang/calamares_el.ts @@ -97,7 +97,7 @@ <translation>Εργαλεία</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Πληροφορίες αποσφαλμάτωσης</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Εγκατάσταση</translation> </message> @@ -430,124 +435,124 @@ The installer will quit and all changes will be lost.</source> <translation><strong>Χειροκίνητη τμηματοποίηση</strong><br/>Μπορείτε να δημιουργήσετε κατατμήσεις ή να αλλάξετε το μέγεθός τους μόνοι σας.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Τοποθεσία προγράμματος εκκίνησης:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>Το %1 θα συρρικνωθεί σε %2MB και μία νέα κατάτμηση %3MB θα δημιουργηθεί για το %4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Επιλέξτε συσκευή απ&οθήκευσης:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Τρέχον:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Επιλέξτε ένα διαμέρισμα για σμίκρυνση, και μετά σύρετε το κάτω τμήμα της μπάρας για αλλαγή του μεγέθους</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Επιλέξτε διαμέρισμα για την εγκατάσταση</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>Πουθενά στο σύστημα δεν μπορεί να ανιχθευθεί μία κατάτμηση EFI. Παρακαλώ επιστρέψτε πίσω και χρησιμοποιήστε τη χειροκίνητη τμηματοποίηση για την εγκατάσταση του %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>Η κατάτμηση συστήματος EFI στο %1 θα χρησιμοποιηθεί για την εκκίνηση του %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>Κατάτμηση συστήματος EFI:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Η συσκευή αποθήκευσης δεν φαίνεται να διαθέτει κάποιο λειτουργικό σύστημα. Τί θα ήθελες να κάνεις;<br/>Θα έχεις την δυνατότητα να επιβεβαιώσεις και αναθεωρήσεις τις αλλαγές πριν γίνει οποιαδήποτε αλλαγή στην συσκευή αποθήκευσης.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Διαγραφή του δίσκου</strong><br/>Αυτό θα <font color="red">διαγράψει</font> όλα τα αρχεία στην επιλεγμένη συσκευή αποθήκευσης.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Εγκατάσταση σε επαλληλία</strong><br/>Η εγκατάσταση θα συρρικνώσει μία κατάτμηση για να κάνει χώρο για το %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Αντικατάσταση μίας κατάτμησης</strong><br/>Αντικαθιστά μία κατάτμηση με το %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -555,17 +560,17 @@ The installer will quit and all changes will be lost.</source> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Καθαρίστηκαν όλες οι προσαρτήσεις για %1</translation> </message> @@ -702,13 +707,13 @@ The installer will quit and all changes will be lost.</source> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Δημιουργία νέας κατάτμησης %2MB στο %4 (%3) με σύστημα αρχείων %1.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Δημιουργία νέας κατάτμησης <strong>%2MB</strong> στο <strong>%4</strong> (%3) με σύστημα αρχείων <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1119,12 +1124,12 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> @@ -1132,27 +1137,27 @@ The installer will quit and all changes will be lost.</source> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Τέλος</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation type="unfinished"/> </message> @@ -1161,12 +1166,12 @@ The installer will quit and all changes will be lost.</source> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1184,23 +1189,23 @@ The installer will quit and all changes will be lost.</source> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>έχει τουλάχιστον %1 GB διαθέσιμου χώρου στον δίσκο</translation> + <source>has at least %1 GiB available drive space</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>Δεν υπάρχει αρκετός χώρος στον δίσκο. Απαιτείται τουλάχιστον %1 GB.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>έχει τουλάχιστον %1 GB μνημης</translation> + <source>has at least %1 GiB working memory</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>Το σύστημα δεν έχει αρκετή μνήμη. Απαιτείται τουλάχιστον %1 GB.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1482,12 +1487,12 @@ The installer will quit and all changes will be lost.</source> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Γίνεται φόρτωση των δεδομένων τοποθεσίας...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Τοποθεσία</translation> </message> @@ -1876,42 +1881,42 @@ The installer will quit and all changes will be lost.</source> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Ριζική</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Home</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Εκκίνηση</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>Σύστημα EFI</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Νέα κατάτμηση για το %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Νέα κατάτμηση</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2296,7 +2301,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Μη κατανεμημένος χώρος ή άγνωστος πίνακας κατατμήσεων</translation> </message> @@ -2311,7 +2316,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2414,70 +2419,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2491,13 +2496,13 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>Αλλαγή μεγέθους κατάτμησης <strong>%1</strong> από <strong>%2MB</strong> σε <strong>%3MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Αλλαγή μεγέθους κατάτμησης %1 από %2MB σε %3MB.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2652,7 +2657,7 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> + <source>Set flags on %1MiB %2 partition.</source> <translation type="unfinished"/> </message> <message> @@ -2667,7 +2672,22 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> <translation type="unfinished"/> </message> <message> @@ -2681,11 +2701,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation type="unfinished"/> @@ -2696,11 +2711,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation type="unfinished"/> @@ -2711,11 +2721,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation type="unfinished"/> @@ -3130,7 +3135,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Καλώς ήλθατε</translation> </message> diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts index d5c8dd46c..73af757dd 100644 --- a/lang/calamares_en.ts +++ b/lang/calamares_en.ts @@ -97,7 +97,7 @@ <translation>Tools</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Debug information</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation>Set up</translation> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Install</translation> </message> @@ -431,124 +436,124 @@ The installer will quit and all changes will be lost.</translation> <translation><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Boot loader location:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Select storage de&vice:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Current:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Reuse %1 as home partition for %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</translation> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Select a partition to install on</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>The EFI system partition at %1 will be used for starting %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>EFI system partition:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>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.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation>No Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation>Reuse Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation>Swap (no Hibernate)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation>Swap (with Hibernate)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation>Swap to file</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Replace a partition</strong><br/>Replaces a partition with %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>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.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>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.</translation> </message> @@ -556,17 +561,17 @@ The installer will quit and all changes will be lost.</translation> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Clear mounts for partitioning operations on %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Clearing mounts for partitioning operations on %1.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Cleared all mounts for %1</translation> </message> @@ -703,13 +708,13 @@ The installer will quit and all changes will be lost.</translation> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Create new %2MB partition on %4 (%3) with file system %1.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation>Create new %2MiB partition on %4 (%3) with file system %1.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1120,12 +1125,12 @@ The installer will quit and all changes will be lost.</translation> <translation><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></translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</translation> </message> @@ -1133,27 +1138,27 @@ The installer will quit and all changes will be lost.</translation> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Finish</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation>Setup Complete</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Installation Complete</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation>The setup of %1 is complete.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>The installation of %1 is complete.</translation> </message> @@ -1162,13 +1167,13 @@ The installer will quit and all changes will be lost.</translation> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Format partition %1 (file system: %2, size: %3 MB) on %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation>Format partition %1 (file system: %2, size: %3 MiB) on %4.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1185,23 +1190,23 @@ The installer will quit and all changes will be lost.</translation> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>has at least %1 GB available drive space</translation> + <source>has at least %1 GiB available drive space</source> + <translation>has at least %1 GiB available drive space</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>There is not enough drive space. At least %1 GB is required.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation>There is not enough drive space. At least %1 GiB is required.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>has at least %1 GB working memory</translation> + <source>has at least %1 GiB working memory</source> + <translation>has at least %1 GiB working memory</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>The system does not have enough working memory. At least %1 GB is required.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation>The system does not have enough working memory. At least %1 GiB is required.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1483,12 +1488,12 @@ The installer will quit and all changes will be lost.</translation> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Loading location data...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Location</translation> </message> @@ -1877,42 +1882,42 @@ The installer will quit and all changes will be lost.</translation> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Root</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Home</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Boot</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>EFI system</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>New partition for %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>New partition</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2300,7 +2305,7 @@ Output: <translation>swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Unpartitioned space or unknown partition table</translation> </message> @@ -2315,7 +2320,7 @@ Output: <translation>Requirements checking for module <i>%1</i> is complete.</translation> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2418,70 +2423,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation>Resize Filesystem Job</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>Invalid configuration</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation>The file-system resize job has an invalid configuration and will not run.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation>KPMCore not Available</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation>Calamares cannot start KPMCore for the file-system resize job.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>Resize Failed</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation>The filesystem %1 could not be found in this system, and cannot be resized.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation>The device %1 could not be found in this system, and cannot be resized.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation>The filesystem %1 cannot be resized.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation>The device %1 cannot be resized.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation>The filesystem %1 must be resized, but cannot.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation>The device %1 must be resized, but cannot</translation> </message> @@ -2495,13 +2500,13 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Resizing %2MB partition %1 to %3MB.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation>Resizing %2MiB partition %1 to %3MiB.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2656,8 +2661,8 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>Set flags on %1MB %2 partition.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation>Set flags on %1MiB %2 partition.</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2671,8 +2676,23 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>Clear flags on %1MB <strong>%2</strong> partition.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation>Clear flags on %1MiB <strong>%2</strong> partition.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation>Clearing flags on %1MiB <strong>%2</strong> partition.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2685,11 +2705,6 @@ Output: <translation>Flag partition <strong>%1</strong> as <strong>%2</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Flag new partition as <strong>%1</strong>.</translation> @@ -2700,11 +2715,6 @@ Output: <translation>Clearing flags on partition <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>Clearing flags on %1MB <strong>%2</strong> partition.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>Clearing flags on new partition.</translation> @@ -2715,11 +2725,6 @@ Output: <translation>Setting flags <strong>%2</strong> on partition <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>Setting flags <strong>%1</strong> on new partition.</translation> @@ -3134,7 +3139,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Welcome</translation> </message> diff --git a/lang/calamares_en_GB.ts b/lang/calamares_en_GB.ts index 72cb5a6df..bc3053321 100644 --- a/lang/calamares_en_GB.ts +++ b/lang/calamares_en_GB.ts @@ -97,7 +97,7 @@ <translation>Tools</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Debug information</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Install</translation> </message> @@ -430,124 +435,124 @@ The installer will quit and all changes will be lost.</translation> <translation><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Boot loader location:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Select storage de&vice:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Current:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Reuse %1 as home partition for %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Select a partition to install on</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>The EFI system partition at %1 will be used for starting %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>EFI system partition:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>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.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Replace a partition</strong><br/>Replaces a partition with %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>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.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>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.</translation> </message> @@ -555,17 +560,17 @@ The installer will quit and all changes will be lost.</translation> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Clear mounts for partitioning operations on %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Clearing mounts for partitioning operations on %1.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Cleared all mounts for %1</translation> </message> @@ -702,13 +707,13 @@ The installer will quit and all changes will be lost.</translation> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Create new %2MB partition on %4 (%3) with file system %1.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1119,12 +1124,12 @@ The installer will quit and all changes will be lost.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</translation> </message> @@ -1132,27 +1137,27 @@ The installer will quit and all changes will be lost.</translation> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Finish</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Installation Complete</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>The installation of %1 is complete.</translation> </message> @@ -1161,13 +1166,13 @@ The installer will quit and all changes will be lost.</translation> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Format partition %1 (file system: %2, size: %3 MB) on %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1184,23 +1189,23 @@ The installer will quit and all changes will be lost.</translation> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>has at least %1 GB available drive space</translation> + <source>has at least %1 GiB available drive space</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>There is not enough drive space. At least %1 GB is required.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>has at least %1 GB working memory</translation> + <source>has at least %1 GiB working memory</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>The system does not have enough working memory. At least %1 GB is required.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1482,12 +1487,12 @@ The installer will quit and all changes will be lost.</translation> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Loading location data...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Location</translation> </message> @@ -1876,42 +1881,42 @@ The installer will quit and all changes will be lost.</translation> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Root</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Home</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Boot</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>EFI system</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>New partition for %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>New partition</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2299,7 +2304,7 @@ Output: <translation>swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Unpartitioned space or unknown partition table</translation> </message> @@ -2314,7 +2319,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2417,70 +2422,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2494,13 +2499,13 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Resizing %2MB partition %1 to %3MB.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2655,8 +2660,8 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>Set flags on %1MB %2 partition.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2670,8 +2675,23 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>Clear flags on %1MB <strong>%2</strong> partition.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2684,11 +2704,6 @@ Output: <translation>Flag partition <strong>%1</strong> as <strong>%2</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Flag new partition as <strong>%1</strong>.</translation> @@ -2699,11 +2714,6 @@ Output: <translation>Clearing flags on partition <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>Clearing flags on %1MB <strong>%2</strong> partition.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>Clearing flags on new partition.</translation> @@ -2714,11 +2724,6 @@ Output: <translation>Setting flags <strong>%2</strong> on partition <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>Setting flags <strong>%1</strong> on new partition.</translation> @@ -3133,7 +3138,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Welcome</translation> </message> diff --git a/lang/calamares_eo.ts b/lang/calamares_eo.ts index d223d3a0e..558006b8e 100644 --- a/lang/calamares_eo.ts +++ b/lang/calamares_eo.ts @@ -97,7 +97,7 @@ <translation>Iloj</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation type="unfinished"/> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Instali</translation> </message> @@ -430,124 +435,124 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -555,17 +560,17 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.</translation> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation type="unfinished"/> </message> @@ -702,12 +707,12 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.</translation> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1119,12 +1124,12 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> @@ -1132,27 +1137,27 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.</translation> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation type="unfinished"/> </message> @@ -1161,12 +1166,12 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.</translation> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1184,22 +1189,22 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.</translation> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> + <source>has at least %1 GiB available drive space</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> + <source>There is not enough drive space. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> + <source>has at least %1 GiB working memory</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> @@ -1482,12 +1487,12 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.</translation> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation type="unfinished"/> </message> @@ -1876,42 +1881,42 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.</translation> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation type="unfinished"/> @@ -2296,7 +2301,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation type="unfinished"/> </message> @@ -2311,7 +2316,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1(%2)</translation> @@ -2414,70 +2419,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2491,12 +2496,12 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> + <source>Resizing %2MiB partition %1 to %3MiB.</source> <translation type="unfinished"/> </message> <message> @@ -2652,7 +2657,7 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> + <source>Set flags on %1MiB %2 partition.</source> <translation type="unfinished"/> </message> <message> @@ -2667,7 +2672,22 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> <translation type="unfinished"/> </message> <message> @@ -2681,11 +2701,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation type="unfinished"/> @@ -2696,11 +2711,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation type="unfinished"/> @@ -2711,11 +2721,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation type="unfinished"/> @@ -3130,7 +3135,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation type="unfinished"/> </message> diff --git a/lang/calamares_es.ts b/lang/calamares_es.ts index 9265f7256..74128ccde 100644 --- a/lang/calamares_es.ts +++ b/lang/calamares_es.ts @@ -98,7 +98,7 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar <translation>Herramientas</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Información de depuración.</translation> </message> @@ -106,7 +106,12 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Instalar</translation> </message> @@ -431,124 +436,124 @@ Saldrá del instalador y se perderán todos los cambios.</translation> <translation><strong>Particionado manual </strong><br/> Usted puede crear o cambiar el tamaño de las particiones usted mismo.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Ubicación del cargador de arranque:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 se contraerá a %2 MB y se creará una nueva partición de %3 MB para %4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Seleccionar dispositivo de almacenamiento:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Corriente</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Volver a usar %1 como partición home para %2</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Seleccione una partición para reducir el tamaño, a continuación, arrastre la barra inferior para cambiar el tamaño</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Seleccione una partición para instalar en</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>No se puede encontrar una partición de sistema EFI en ningún lugar de este sistema. Por favor, vuelva y use el particionamiento manual para establecer %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>La partición de sistema EFI en %1 se usará para iniciar %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>Partición del sistema EFI:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Este dispositivo de almacenamiento no parece tener un sistema operativo en él. ¿Qué quiere hacer?<br/>Podrá revisar y confirmar sus elecciones antes de que se haga cualquier cambio en el dispositivo de almacenamiento.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Borrar disco</strong><br/>Esto <font color="red">borrará</font> todos los datos presentes actualmente en el dispositivo de almacenamiento.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>%1 se encuentra instalado en este dispositivo de almacenamiento. ¿Qué desea hacer?<br/>Podrá revisar y confirmar su elección antes de que cualquier cambio se haga efectivo en el dispositivo de almacenamiento.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation>Sin Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation>Reusar Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation>Swap (sin hibernación)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation>Swap (con hibernación)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation>Swap a archivo</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Instalar junto al otro SO</strong><br/>El instalador reducirá la partición del SO existente para tener espacio para instalar %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Reemplazar una partición</strong><br/>Reemplazar una partición con %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>Este dispositivo de almacenamiento parece que ya tiene un sistema operativo instalado en él. ¿Qué desea hacer?<br/>Podrá revisar y confirmar su elección antes de que cualquier cambio se haga efectivo en el dispositivo de almacenamiento.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>Este dispositivo de almacenamiento contiene múltiples sistemas operativos instalados en él. ¿Qué desea hacer?<br/>Podrá revisar y confirmar su elección antes de que cualquier cambio se haga efectivo en el dispositivo de almacenamiento.</translation> </message> @@ -556,17 +561,17 @@ Saldrá del instalador y se perderán todos los cambios.</translation> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Limpiar puntos de montaje para operaciones de particionamiento en %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Limpiando puntos de montaje para operaciones de particionamiento en %1.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Limpiados todos los puntos de montaje para %1</translation> </message> @@ -703,13 +708,13 @@ Saldrá del instalador y se perderán todos los cambios.</translation> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Crear nueva %2MB partición en %4 (%3) con el sistema de archivos %1.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Crear nueva <strong>%2MB</strong> partición en <strong>%4</strong> (%3) con el sistema de ficheros <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1120,12 +1125,12 @@ Saldrá del instalador y se perderán todos los cambios.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>La instalación falló</h1><br/>%1 no se ha instalado en su equipo.<br/>El mensaje de error fue: %2.</translation> </message> @@ -1133,27 +1138,27 @@ Saldrá del instalador y se perderán todos los cambios.</translation> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Finalizar</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Instalación completada</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>Se ha completado la instalación de %1.</translation> </message> @@ -1162,13 +1167,13 @@ Saldrá del instalador y se perderán todos los cambios.</translation> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Formatear la partición %1 (sistema de archivos: %2, tamaño: %3 MB) en %4</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>Formatear <strong>%3MB</strong> partición <strong>%1</strong> con sistema de ficheros <strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1185,23 +1190,23 @@ Saldrá del instalador y se perderán todos los cambios.</translation> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>tiene al menos %1 GB espacio libre en el disco</translation> + <source>has at least %1 GiB available drive space</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>No hay suficiente espació en el disco duro. Se requiere al menos %1 GB libre.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>tiene al menos %1 GB de memoria.</translation> + <source>has at least %1 GiB working memory</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>El sistema no tiene suficiente memoria. Se requiere al menos %1 GB</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1483,12 +1488,12 @@ Saldrá del instalador y se perderán todos los cambios.</translation> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Detectando ubicación...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Ubicación</translation> </message> @@ -1877,42 +1882,42 @@ Saldrá del instalador y se perderán todos los cambios.</translation> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Root</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Inicio</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Boot</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>Sistema EFI</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Nueva partición de %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Partición nueva</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2300,7 +2305,7 @@ Salida: <translation>swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Espacio no particionado o tabla de partición desconocida</translation> </message> @@ -2315,7 +2320,7 @@ Salida: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2418,70 +2423,70 @@ Salida: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation>Tarea de redimensionamiento de sistema de archivos</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>Configuración no válida</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation>La tarea de redimensionamiento del sistema de archivos no posee una configuración válida y no se ejecutará.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation>KPMCore no disponible</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation>Calamares no puede iniciar KPMCore para la tarea de redimensionamiento del sistema de archivos.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>Falló el redimiensionamiento</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation>No se encontró en este sistema el sistema de archivos %1, por lo que no puede redimensionarse.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation>No se encontró en este sistema el dispositivo %1, por lo que no puede redimensionarse.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation>No puede redimensionarse el sistema de archivos %1.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation>No puede redimensionarse el dispositivo %1.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation>Es necesario redimensionar el sistema de archivos %1 pero no es posible hacerlo.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation>Es necesario redimensionar el dispositivo %1 pero no es posible hacerlo.</translation> </message> @@ -2495,13 +2500,13 @@ Salida: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>Redimensionar <strong>%2MB</strong> partición <strong>%1</strong> a <strong>%3MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Redimensionando %2MB %1 a %3MB.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2656,8 +2661,8 @@ Salida: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>Establecer indicadores en la partición de %1 MB %2.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2671,8 +2676,23 @@ Salida: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>Limpiar indicadores en la partición de %1 MB <strong>%2</strong>.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2685,11 +2705,6 @@ Salida: <translation>Indicar partición <strong>%1</strong> como <strong>%2</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Indicar partición de %1 MB <strong>%2</strong> como <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Indicar nueva partición como <strong>%1</strong>.</translation> @@ -2700,11 +2715,6 @@ Salida: <translation>Limpiando indicadores en la partición <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>Limpiando indicadores en la partición de %1 MB <strong>%2</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>Limpiando indicadores en la nueva partición.</translation> @@ -2715,11 +2725,6 @@ Salida: <translation>Estableciendo indicadores <strong>%2</strong> en la partición <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>Establecinedo indicadores <strong>%3</strong> en la partición de %1 MB <strong>%2</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>Estableciendo indicadores <strong>%1</strong> en una nueva partición.</translation> @@ -3134,7 +3139,7 @@ Salida: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Bienvenido</translation> </message> diff --git a/lang/calamares_es_MX.ts b/lang/calamares_es_MX.ts index 78babe418..5b1556a12 100644 --- a/lang/calamares_es_MX.ts +++ b/lang/calamares_es_MX.ts @@ -97,7 +97,7 @@ <translation>Herramientas</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Información de depuración</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation>Preparar</translation> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Instalar</translation> </message> @@ -115,12 +120,12 @@ <message> <location filename="../src/libcalamares/JobExample.cpp" line="39"/> <source>Job failed (%1)</source> - <translation type="unfinished"/> + <translation>Trabajo fallido (%1)</translation> </message> <message> <location filename="../src/libcalamares/JobExample.cpp" line="39"/> <source>Programmed job failure was explicitly requested.</source> - <translation type="unfinished"/> + <translation>Falla del trabajo programado fue solicitado explícitamente.</translation> </message> </context> <context> @@ -136,7 +141,7 @@ <message> <location filename="../src/libcalamares/JobExample.cpp" line="27"/> <source>Example job (%1)</source> - <translation type="unfinished"/> + <translation>Trabajo de ejemplo. (%1)</translation> </message> </context> <context> @@ -200,7 +205,7 @@ <message> <location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="152"/> <source>System-requirements checking is complete.</source> - <translation type="unfinished"/> + <translation>Chequeo de requerimientos del sistema completado.</translation> </message> </context> <context> @@ -226,7 +231,7 @@ <location filename="../src/libcalamaresui/ViewManager.cpp" line="80"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="313"/> <source>Cancel setup without changing the system.</source> - <translation type="unfinished"/> + <translation>Cancelar la configuración sin cambiar el sistema.</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="81"/> @@ -237,7 +242,7 @@ <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="167"/> <source>Setup Failed</source> - <translation type="unfinished"/> + <translation>Fallo en la configuración.</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="192"/> @@ -257,22 +262,22 @@ <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="252"/> <source>Continue with installation?</source> - <translation type="unfinished"/> + <translation>¿Continuar con la instalación?</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="254"/> <source>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></source> - <translation type="unfinished"/> + <translation>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></translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="261"/> <source>&Set up now</source> - <translation type="unfinished"/> + <translation>&Configurar ahora</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="307"/> <source>&Set up</source> - <translation type="unfinished"/> + <translation>&Configurar</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="308"/> @@ -282,12 +287,12 @@ <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="310"/> <source>Setup is complete. Close the setup program.</source> - <translation type="unfinished"/> + <translation>Configuración completa. Cierre el programa de instalación.</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="372"/> <source>Cancel setup?</source> - <translation type="unfinished"/> + <translation>¿Cancelar la configuración?</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="373"/> @@ -298,7 +303,8 @@ <location filename="../src/libcalamaresui/ViewManager.cpp" line="375"/> <source>Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost.</source> - <translation type="unfinished"/> + <translation>¿Realmente desea cancelar el actual proceso de configuración? +El programa de instalación se cerrará y todos los cambios se perderán.</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="377"/> @@ -391,7 +397,7 @@ El instalador terminará y se perderán todos los cambios.</translation> <message> <location filename="../src/calamares/CalamaresWindow.cpp" line="61"/> <source>%1 Setup Program</source> - <translation type="unfinished"/> + <translation>%1 Programa de instalación</translation> </message> <message> <location filename="../src/calamares/CalamaresWindow.cpp" line="62"/> @@ -430,125 +436,125 @@ El instalador terminará y se perderán todos los cambios.</translation> <translation><strong>Particionado manual </strong><br/> Puede crear o cambiar el tamaño de las particiones usted mismo.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Ubicación del cargador de arranque:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 será reducido a %2MB y una nueva partición %3MB will be created for %4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Seleccionar dispositivo de almacenamiento:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Actual:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Reuse %1 como partición home para %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation> <strong>Seleccione una partición para reducir el tamaño, a continuación, arrastre la barra inferior para redimencinar</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation>%1 será reducido a %2MiB y una nueva %3MiB partición se creará para %4.</translation> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation> <strong>Seleccione una partición para instalar</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>No se puede encontrar en el sistema una partición EFI. Por favor vuelva atrás y use el particionamiento manual para configurar %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>La partición EFI en %1 será usada para iniciar %2. </translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>Partición de sistema EFI:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Este dispositivo de almacenamiento parece no tener un sistema operativo en el. ¿que le gustaría hacer?<br/> Usted podrá revisar y confirmar sus elecciones antes que cualquier cambio se realice al dispositivo de almacenamiento.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Borrar disco</strong> <br/>Esto <font color="red">borrará</font> todos los datos presentes actualmente en el dispositivo de almacenamiento seleccionado.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>Este dispositivo de almacenamiento tiene %1 en el. ¿Que le gustaría hacer? <br/>Usted podrá revisar y confirmar sus elecciones antes de que cualquier cambio se realice al dispositivo de almacenamiento.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> - <translation type="unfinished"/> + <translation>Sin Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> - <translation type="unfinished"/> + <translation>Reutilizar Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> - <translation type="unfinished"/> + <translation>Swap (sin hibernación)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> - <translation type="unfinished"/> + <translation>Swap (con hibernación)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> - <translation type="unfinished"/> + <translation>Swap a archivo</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Instalar junto a</strong> <br/>El instalador reducirá una partición con el fin de hacer espacio para %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Reemplazar una partición</strong> <br/>Reemplaza una partición con %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>Este dispositivo de almacenamiento ya tiene un sistema operativo en el. ¿Que le gustaría hacer?<br/> Usted podrá revisar y confirmar sus elecciones antes que cualquier cambio se realice al dispositivo de almacenamiento.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>Este dispositivo de almacenamiento tiene múltiples sistemas operativos en el. ¿Que le gustaria hacer?<br/> Usted podrá revisar y confirmar sus elecciones antes que cualquier cambio se realice al dispositivo de almacenamiento.</translation> </message> @@ -556,17 +562,17 @@ El instalador terminará y se perderán todos los cambios.</translation> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Borrar puntos de montaje para operaciones de particionamiento en %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Borrando puntos de montaje para operaciones de particionamiento en %1.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Puntos de montaje despejados para %1</translation> </message> @@ -703,13 +709,13 @@ El instalador terminará y se perderán todos los cambios.</translation> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation> Crear nueva partición %2MB en %4 (%3) con el sistema de archivos %1.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation>Crear nueva %2MiB partición en %4 (%3) con el sistema de archivos %1.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation> Crear nueva partición <strong>%2MB</strong> en <strong>%4</strong> (%3) con el sistema de archivos <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation>Crear nueva<strong>%2MiB</strong> partición en<strong>%2MiB</strong> (%3) con el sistema de archivos <strong>%1</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -816,7 +822,7 @@ El instalador terminará y se perderán todos los cambios.</translation> <message> <location filename="../src/modules/partition/gui/CreateVolumeGroupDialog.cpp" line="37"/> <source>Create Volume Group</source> - <translation type="unfinished"/> + <translation>Crear Grupo de Volumen</translation> </message> </context> <context> @@ -824,22 +830,22 @@ El instalador terminará y se perderán todos los cambios.</translation> <message> <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="38"/> <source>Create new volume group named %1.</source> - <translation type="unfinished"/> + <translation>Crear nuevo grupo de volumen llamado %1.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="45"/> <source>Create new volume group named <strong>%1</strong>.</source> - <translation type="unfinished"/> + <translation>Crear nuevo grupo de volumen llamado <strong>%1</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="52"/> <source>Creating new volume group named %1.</source> - <translation type="unfinished"/> + <translation>Creando nuevo grupo de volumen llamado %1.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="65"/> <source>The installer failed to create a volume group named '%1'.</source> - <translation type="unfinished"/> + <translation>El instalador no pudo crear un grupo de volumen llamado '%1'.</translation> </message> </context> <context> @@ -1120,12 +1126,12 @@ El instalador terminará y se perderán todos los cambios.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>Instalación fallida</h1> <br/>%1 no ha sido instalado en su computador. <br/>El mensaje de error es: %2.</translation> </message> @@ -1133,27 +1139,27 @@ El instalador terminará y se perderán todos los cambios.</translation> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Terminado</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Instalación Completa</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>La instalación de %1 está completa.</translation> </message> @@ -1162,13 +1168,13 @@ El instalador terminará y se perderán todos los cambios.</translation> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Formatear la partición %1 (sistema de archivos: %2, tamaño: %3 MB) en %4</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>Formatear <strong>%3MB</strong> partición <strong>%1</strong> con sistema de archivos <strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1185,23 +1191,23 @@ El instalador terminará y se perderán todos los cambios.</translation> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>tiene al menos %1 GB de espacio en disco disponible</translation> + <source>has at least %1 GiB available drive space</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>No hay suficiente espacio disponible en disco. Se requiere al menos %1 GB.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>tiene al menos %1 GB de memoria para trabajar</translation> + <source>has at least %1 GiB working memory</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>No hay suficiente espacio disponible en disco. Se requiere al menos %1 GB.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1483,12 +1489,12 @@ El instalador terminará y se perderán todos los cambios.</translation> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Cargando datos de ubicación...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Ubicación</translation> </message> @@ -1877,42 +1883,42 @@ El instalador terminará y se perderán todos los cambios.</translation> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Root</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Home</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Boot</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>Sistema EFI</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Partición nueva para %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Partición nueva</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2300,7 +2306,7 @@ Salida <translation>swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Espacio no particionado o tabla de partición desconocida</translation> </message> @@ -2315,7 +2321,7 @@ Salida <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2419,70 +2425,70 @@ Salida <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>Configuración inválida</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation>KPMCore no está disponible</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2496,13 +2502,13 @@ Salida </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation> Redimensionar la partición <strong>%1</strong> de <strong>%2MB</strong> a <strong>%3MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Redimensionando partición %1 de %2MB a %3MB.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2657,8 +2663,8 @@ Salida </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>Establecer indicadores en la partición %1MB %2.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2672,8 +2678,23 @@ Salida </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>Borrar indicadores %1MB en la partición <strong>%2</strong>.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2686,11 +2707,6 @@ Salida <translation>Indicador de partición <strong>%1</strong> como <strong>%2</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Indicador %1MB de partición <strong>%2</strong> como <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Marcar la nueva partición como <strong>%1</strong>.</translation> @@ -2701,11 +2717,6 @@ Salida <translation>Borrar indicadores en la partición <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>Borrar indicadores en la partición %1MB <strong>%2</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>Borrar indicadores en la nueva partición.</translation> @@ -2716,11 +2727,6 @@ Salida <translation>Establecer indicadores <strong>%2</strong> en la partición <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>Establecer indicadores <strong>%3</strong> en partición %1MB <strong>%2</strong></translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>Establecer indicadores <strong>%1</strong> en nueva partición.</translation> @@ -2834,7 +2840,7 @@ Salida <message> <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/> <source>This is an overview of what will happen once you start the setup procedure.</source> - <translation type="unfinished"/> + <translation>Esta es una descripción general de lo que sucederá una vez que comience el procedimiento de configuración.</translation> </message> <message> <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/> @@ -2958,12 +2964,12 @@ Salida <message> <location filename="../src/modules/users/UsersPage.cpp" line="120"/> <source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source> - <translation type="unfinished"/> + <translation><small>Si más de una persona usará esta computadora, puede crear múltiples cuentas después de la configuración</small></translation> </message> <message> <location filename="../src/modules/users/UsersPage.cpp" line="126"/> <source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source> - <translation type="unfinished"/> + <translation><small>Si más de una persona usará esta computadora, puede crear varias cuentas después de la instalación.</small></translation> </message> <message> <location filename="../src/modules/users/UsersPage.cpp" line="317"/> @@ -3010,27 +3016,27 @@ Salida <message> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="14"/> <source>Create Volume Group</source> - <translation type="unfinished"/> + <translation>Crear Grupo de Volumen</translation> </message> <message> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="20"/> <source>List of Physical Volumes</source> - <translation type="unfinished"/> + <translation>Lista de volúmenes físicos</translation> </message> <message> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="30"/> <source>Volume Group Name:</source> - <translation type="unfinished"/> + <translation>Nombre de Grupo de volumen:</translation> </message> <message> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="43"/> <source>Volume Group Type:</source> - <translation type="unfinished"/> + <translation>Tipo de Grupo de volumen:</translation> </message> <message> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="56"/> <source>Physical Extent Size:</source> - <translation type="unfinished"/> + <translation>Tamaño de la extensión física:</translation> </message> <message> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="66"/> @@ -3040,12 +3046,12 @@ Salida <message> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="82"/> <source>Total Size:</source> - <translation type="unfinished"/> + <translation>Tamaño total:</translation> </message> <message> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="102"/> <source>Used Size:</source> - <translation type="unfinished"/> + <translation>Tamaño usado:</translation> </message> <message> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="122"/> @@ -3055,7 +3061,7 @@ Salida <message> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="142"/> <source>Quantity of LVs:</source> - <translation type="unfinished"/> + <translation>Cantidad de LVs:</translation> </message> </context> <context> @@ -3079,7 +3085,7 @@ Salida <location filename="../src/modules/welcome/WelcomePage.ui" line="17"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="72"/> <source>Select language</source> - <translation type="unfinished"/> + <translation>Seleccione el idioma</translation> </message> <message> <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/> @@ -3104,17 +3110,17 @@ Salida <message> <location filename="../src/modules/welcome/WelcomePage.cpp" line="71"/> <source><h1>Welcome to the Calamares setup program for %1.</h1></source> - <translation type="unfinished"/> + <translation><h1>Bienvenido al programa de instalación Calamares para %1.</h1></translation> </message> <message> <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/> <source><h1>Welcome to %1 setup.</h1></source> - <translation type="unfinished"/> + <translation><h1>Bienvenido a la configuración %1</h1></translation> </message> <message> <location filename="../src/modules/welcome/WelcomePage.cpp" line="90"/> <source>About %1 setup</source> - <translation type="unfinished"/> + <translation>Acerca de la configuración %1</translation> </message> <message> <location filename="../src/modules/welcome/WelcomePage.cpp" line="91"/> @@ -3135,7 +3141,7 @@ Salida <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Bienvenido</translation> </message> diff --git a/lang/calamares_es_PR.ts b/lang/calamares_es_PR.ts index 2ce9e5759..d86113636 100644 --- a/lang/calamares_es_PR.ts +++ b/lang/calamares_es_PR.ts @@ -97,7 +97,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Información de depuración</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Instalar</translation> </message> @@ -429,124 +434,124 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -554,17 +559,17 @@ The installer will quit and all changes will be lost.</source> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation type="unfinished"/> </message> @@ -701,12 +706,12 @@ The installer will quit and all changes will be lost.</source> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1118,12 +1123,12 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> @@ -1131,27 +1136,27 @@ The installer will quit and all changes will be lost.</source> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation type="unfinished"/> </message> @@ -1160,12 +1165,12 @@ The installer will quit and all changes will be lost.</source> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1183,22 +1188,22 @@ The installer will quit and all changes will be lost.</source> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> + <source>has at least %1 GiB available drive space</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> + <source>There is not enough drive space. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> + <source>has at least %1 GiB working memory</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> @@ -1481,12 +1486,12 @@ The installer will quit and all changes will be lost.</source> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Ubicación</translation> </message> @@ -1875,42 +1880,42 @@ The installer will quit and all changes will be lost.</source> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation type="unfinished"/> @@ -2295,7 +2300,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation type="unfinished"/> </message> @@ -2310,7 +2315,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation type="unfinished"/> @@ -2413,70 +2418,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2490,12 +2495,12 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> + <source>Resizing %2MiB partition %1 to %3MiB.</source> <translation type="unfinished"/> </message> <message> @@ -2651,7 +2656,7 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> + <source>Set flags on %1MiB %2 partition.</source> <translation type="unfinished"/> </message> <message> @@ -2666,7 +2671,22 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> <translation type="unfinished"/> </message> <message> @@ -2680,11 +2700,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation type="unfinished"/> @@ -2695,11 +2710,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation type="unfinished"/> @@ -2710,11 +2720,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation type="unfinished"/> @@ -3129,7 +3134,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation type="unfinished"/> </message> diff --git a/lang/calamares_et.ts b/lang/calamares_et.ts index 9e15a4d91..c5e83f825 100644 --- a/lang/calamares_et.ts +++ b/lang/calamares_et.ts @@ -97,7 +97,7 @@ <translation>Tööriistad</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Silumisteave</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Paigalda</translation> </message> @@ -430,124 +435,124 @@ Paigaldaja sulgub ning kõik muutused kaovad.</translation> <translation><strong>Käsitsi partitsioneerimine</strong><br/>Sa võid ise partitsioone luua või nende suurust muuta. </translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Käivituslaaduri asukoht:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 vähendatakse suuruseni %2MB ja %4 jaoks luuakse uus %3MB partitsioon.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Vali mäluseade:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Hetkel:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Taaskasuta %1 %2 kodupartitsioonina.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Vali vähendatav partitsioon, seejärel sikuta alumist riba suuruse muutmiseks</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Vali partitsioon, kuhu paigaldada</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>EFI süsteemipartitsiooni ei leitud sellest süsteemist. Palun mine tagasi ja kasuta käsitsi partitsioonimist, et seadistada %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>EFI süsteemipartitsioon asukohas %1 kasutatakse %2 käivitamiseks.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>EFI süsteemipartitsioon:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Sellel mäluseadmel ei paista olevat operatsioonisüsteemi peal. Mida soovid teha?<br/>Sa saad oma valikud üle vaadata ja kinnitada enne kui mistahes muudatus saab mäluseadmele teostatud.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Tühjenda ketas</strong><br/>See <font color="red">kustutab</font> kõik valitud mäluseadmel olevad andmed.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>Sellel mäluseadmel on peal %1. Mida soovid teha?<br/>Sa saad oma valikud üle vaadata ja kinnitada enne kui mistahes muudatus saab mäluseadmele teostatud.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Paigalda kõrvale</strong><br/>Paigaldaja vähendab partitsiooni, et teha ruumi operatsioonisüsteemile %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Asenda partitsioon</strong><br/>Asendab partitsiooni operatsioonisüsteemiga %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>Sellel mäluseadmel on juba operatsioonisüsteem peal. Mida soovid teha?<br/>Sa saad oma valikud üle vaadata ja kinnitada enne kui mistahes muudatus saab mäluseadmele teostatud.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>Sellel mäluseadmel on mitu operatsioonisüsteemi peal. Mida soovid teha?<br/>Sa saad oma valikud üle vaadata ja kinnitada enne kui mistahes muudatus saab mäluseadmele teostatud.</translation> </message> @@ -555,17 +560,17 @@ Paigaldaja sulgub ning kõik muutused kaovad.</translation> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Tühjenda monteeringud partitsioneerimistegevustes %1 juures</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Tühjendan monteeringud partitsioneerimistegevustes %1 juures.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Kõik monteeringud tühjendatud %1 jaoks</translation> </message> @@ -702,13 +707,13 @@ Paigaldaja sulgub ning kõik muutused kaovad.</translation> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Loo uus %2MB partitsioon kettal %4 (%3) failisüsteemiga %1.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Loo uus <strong>%2MB</strong> partitsioon kettale <strong>%4</strong> (%3) failisüsteemiga <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1119,12 +1124,12 @@ Paigaldaja sulgub ning kõik muutused kaovad.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>Paigaldamine ebaõnnestus</h1><br/>%1 ei paigaldatud sinu arvutisse.<br/>Veateade oli: %2.</translation> </message> @@ -1132,27 +1137,27 @@ Paigaldaja sulgub ning kõik muutused kaovad.</translation> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Valmis</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Paigaldus valmis</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>%1 paigaldus on valmis.</translation> </message> @@ -1161,13 +1166,13 @@ Paigaldaja sulgub ning kõik muutused kaovad.</translation> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Vorminda partitsioon %1 (failisüsteem: %2, suurus: %3 MB) kohas %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>Vorminda <strong>%3MB</strong> partitsioon <strong>%1</strong>failisüsteemiga <strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1184,23 +1189,23 @@ Paigaldaja sulgub ning kõik muutused kaovad.</translation> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>omab vähemalt %1 GB vaba kettaruumi</translation> + <source>has at least %1 GiB available drive space</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>Pole piisavalt kettaruumi. Vähemalt %1 GB on nõutud.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>omab vähemalt %1 GB töötamismälu</translation> + <source>has at least %1 GiB working memory</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>Süsteemil pole piisavalt töötamismälu. Vähemalt %1 GB on nõutud.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1482,12 +1487,12 @@ Paigaldaja sulgub ning kõik muutused kaovad.</translation> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Laadin asukohaandmeid...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Asukoht</translation> </message> @@ -1876,42 +1881,42 @@ Paigaldaja sulgub ning kõik muutused kaovad.</translation> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Juur</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Kodu</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Käivitus</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>EFI süsteem</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Uus partitsioon %1 jaoks</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Uus partitsioon</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2299,7 +2304,7 @@ Väljund: <translation>swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Partitsioneerimata ruum või tundmatu partitsioonitabel</translation> </message> @@ -2314,7 +2319,7 @@ Väljund: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2417,70 +2422,70 @@ Väljund: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation>Failisüsteemi suuruse muutmise töö</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>Sobimatu konfiguratsioon</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation>Failisüsteemi suuruse muutmise tööl on sobimatu konfiguratsioon ning see ei käivitu.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation>KPMCore pole saadaval</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation>Calamares ei saa KPMCore'i käivitada failisüsteemi suuruse muutmise töö jaoks.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>Suuruse muutmine ebaõnnestus</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation>Failisüsteemi %1 ei leitud sellest süsteemist, seega selle suurust ei saa muuta.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation>Seadet %1 ei leitud sellest süsteemist, seega selle suurust ei saa muuta.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation>Failisüsteemi %1 suurust ei saa muuta.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation>Seadme %1 suurust ei saa muuta.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation>Failisüsteemi %1 suurust tuleb muuta, aga ei saa.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation>Seadme %1 suurust tuleb muuta, aga ei saa.</translation> </message> @@ -2494,13 +2499,13 @@ Väljund: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>Muuda <strong>%2MB</strong> partitsiooni <strong>%1</strong>suuruseks <strong>%3MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Muudan %2MB partitsiooni %1 suuruseks %3MB</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2655,8 +2660,8 @@ Väljund: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>Sildid määratud %1MB %2 partitsioonile.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2670,8 +2675,23 @@ Väljund: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>Tühjenda sildid %1MB <strong>%2</strong> partitsioonilt.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2684,11 +2704,6 @@ Väljund: <translation>Määra partitsioonile <strong>%1</strong> silt <strong>%2</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Määra %1MB <strong>%2</strong> partitsiooni sildiks <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Määra uuele partitsioonile silt <strong>%1</strong>.</translation> @@ -2699,11 +2714,6 @@ Väljund: <translation>Eemaldan sildid partitsioonilt <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>Eemaldan sildid %1MB <strong>%2</strong> partitsioonilt.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>Eemaldan uuelt partitsioonilt sildid.</translation> @@ -2714,11 +2724,6 @@ Väljund: <translation>Määran sildid <strong>%1</strong> partitsioonile <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>Määran sildid <strong>%3</strong> %1MB <strong>%2</strong> partitsioonile.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>Määran sildid <strong>%1</strong> uuele partitsioonile.</translation> @@ -3133,7 +3138,7 @@ Väljund: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Tervist</translation> </message> diff --git a/lang/calamares_eu.ts b/lang/calamares_eu.ts index e5e21cf8f..29824da9e 100644 --- a/lang/calamares_eu.ts +++ b/lang/calamares_eu.ts @@ -97,7 +97,7 @@ <translation>Tresnak</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Arazte informazioa</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Instalatu</translation> </message> @@ -430,124 +435,124 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.</translation> <translation><strong>Eskuz partizioak landu</strong><br/>Zure kasa sortu edo tamainaz alda dezakezu partizioak.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Abio kargatzaile kokapena:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 %2MB-ra txikituko da, eta %3MB-tako partizio berri bat sortuko da %4-(e)rako.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Aukeratu &biltegiratze-gailua:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Unekoa: </translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Berrerabili %1 home partizio bezala %2rentzat.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Aukeratu partizioa txikitzeko eta gero arrastatu azpiko-barra tamaina aldatzeko</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>aukeratu partizioa instalatzeko</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>Ezin da inon aurkitu EFI sistemako partiziorik sistema honetan. Mesedez joan atzera eta erabili eskuz partizioak lantzea %1 ezartzeko.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>%1eko EFI partizio sistema erabiliko da abiarazteko %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>EFI sistema-partizioa:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Biltegiratze-gailuak badirudi ez duela sistema eragilerik. Zer egin nahiko zenuke? <br/>Zure aukerak berrikusteko eta berresteko aukera izango duzu aldaketak gauzatu aurretik biltegiratze-gailuan</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Diskoa ezabatu</strong><br/>Honek orain dauden datu guztiak <font color="red">ezbatuko</font> ditu biltegiratze-gailutik.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>Biltegiratze-gailuak %1 dauka. Zer egin nahiko zenuke? <br/>Zure aukerak berrikusteko eta berresteko aukera izango duzu aldaketak gauzatu aurretik biltegiratze-gailuan</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Instalatu alboan</strong><br/>Instalatzaileak partizioa txikituko du lekua egiteko %1-(r)i.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Ordeztu partizioa</strong><br/>ordezkatu partizioa %1-(e)kin.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>Biltegiragailu honetan badaude jadanik eragile sistema bat. Zer gustatuko litzaizuke egin?<br/>Biltegiragailuan aldaketarik egin baino lehen zure aukerak aztertu eta konfirmatu ahal izango duzu.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>Biltegiragailu honetan badaude jadanik eragile sistema batzuk. Zer gustatuko litzaizuke egin?<br/>Biltegiragailuan aldaketarik egin baino lehen zure aukerak aztertu eta konfirmatu ahal izango duzu.</translation> </message> @@ -555,17 +560,17 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.</translation> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Garbitu muntaketa puntuak partizioak egiteko %1 -(e)an.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Garbitzen muntaketa puntuak partizio eragiketak egiteko %1 -(e)an.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Muntaketa puntu guztiak garbitu dira %1 -(e)an</translation> </message> @@ -702,13 +707,13 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.</translation> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Sortu %2MB partizioa %4n (%3) %1 fitxategi sistemaz.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Sortu <strong>%2MB</strong> partizioa <strong>%4</strong>n (%3) <strong>%1</strong> fitxategi sistemaz.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1119,12 +1124,12 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> @@ -1132,27 +1137,27 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.</translation> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Bukatu</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Instalazioa amaitua</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>%1 instalazioa amaitu da.</translation> </message> @@ -1161,12 +1166,12 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.</translation> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Formateatu %1 partizioa %4-(e)n (fitxategi sistema: %2, tamaina: %3 MB).</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1184,22 +1189,22 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.</translation> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> + <source>has at least %1 GiB available drive space</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> + <source>There is not enough drive space. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> + <source>has at least %1 GiB working memory</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> @@ -1482,12 +1487,12 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.</translation> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Kokapen datuak kargatzen...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Kokapena</translation> </message> @@ -1876,42 +1881,42 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.</translation> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Root</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Home</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Boot</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>EFI sistema</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Partizio berri %1(e)ntzat</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Partizio berria</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2298,7 +2303,7 @@ Irteera: <translation>swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation type="unfinished"/> </message> @@ -2313,7 +2318,7 @@ Irteera: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2416,70 +2421,70 @@ Irteera: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>Konfigurazio baliogabea</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2493,12 +2498,12 @@ Irteera: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> + <source>Resizing %2MiB partition %1 to %3MiB.</source> <translation type="unfinished"/> </message> <message> @@ -2654,7 +2659,7 @@ Irteera: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> + <source>Set flags on %1MiB %2 partition.</source> <translation type="unfinished"/> </message> <message> @@ -2669,7 +2674,22 @@ Irteera: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> <translation type="unfinished"/> </message> <message> @@ -2683,11 +2703,6 @@ Irteera: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation type="unfinished"/> @@ -2698,11 +2713,6 @@ Irteera: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation type="unfinished"/> @@ -2713,11 +2723,6 @@ Irteera: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation type="unfinished"/> @@ -3132,7 +3137,7 @@ Irteera: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Ongi etorri</translation> </message> diff --git a/lang/calamares_fa.ts b/lang/calamares_fa.ts index 8dced3e46..74e4a08d7 100644 --- a/lang/calamares_fa.ts +++ b/lang/calamares_fa.ts @@ -97,7 +97,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation type="unfinished"/> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation type="unfinished"/> </message> @@ -429,124 +434,124 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -554,17 +559,17 @@ The installer will quit and all changes will be lost.</source> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation type="unfinished"/> </message> @@ -701,12 +706,12 @@ The installer will quit and all changes will be lost.</source> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1118,12 +1123,12 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> @@ -1131,27 +1136,27 @@ The installer will quit and all changes will be lost.</source> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation type="unfinished"/> </message> @@ -1160,12 +1165,12 @@ The installer will quit and all changes will be lost.</source> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1183,22 +1188,22 @@ The installer will quit and all changes will be lost.</source> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> + <source>has at least %1 GiB available drive space</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> + <source>There is not enough drive space. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> + <source>has at least %1 GiB working memory</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> @@ -1481,12 +1486,12 @@ The installer will quit and all changes will be lost.</source> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation type="unfinished"/> </message> @@ -1875,42 +1880,42 @@ The installer will quit and all changes will be lost.</source> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation type="unfinished"/> @@ -2295,7 +2300,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation type="unfinished"/> </message> @@ -2310,7 +2315,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation type="unfinished"/> @@ -2413,70 +2418,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2490,12 +2495,12 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> + <source>Resizing %2MiB partition %1 to %3MiB.</source> <translation type="unfinished"/> </message> <message> @@ -2651,7 +2656,7 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> + <source>Set flags on %1MiB %2 partition.</source> <translation type="unfinished"/> </message> <message> @@ -2666,7 +2671,22 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> <translation type="unfinished"/> </message> <message> @@ -2680,11 +2700,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation type="unfinished"/> @@ -2695,11 +2710,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation type="unfinished"/> @@ -2710,11 +2720,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation type="unfinished"/> @@ -3129,7 +3134,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation type="unfinished"/> </message> diff --git a/lang/calamares_fi_FI.ts b/lang/calamares_fi_FI.ts index 1a66ae17d..e85ee3b06 100644 --- a/lang/calamares_fi_FI.ts +++ b/lang/calamares_fi_FI.ts @@ -4,17 +4,17 @@ <message> <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="71"/> <source>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.</source> - <translation type="unfinished"/> + <translation>Järjestelmän <strong>käynnistysympäristö.</strong> <br><br>Vanhemmat x86-järjestelmät tukevat vain <strong>BIOS</strong>-järjestelmää.<br>Nykyaikaiset järjestelmät käyttävät yleensä <strong>EFI</strong>,mutta voivat myös näkyä BIOS tilassa, jos ne käynnistetään yhteensopivuustilassa.</translation> </message> <message> <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="81"/> <source>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.</source> - <translation type="unfinished"/> + <translation>Tämä järjestelmä käynnistettiin <strong>EFI</strong> -käynnistysympäristössä.<br><br>Jos haluat määrittää EFI-ympäristön, tämän asennuksen on asennettava käynnistyksen latausohjelma, kuten <strong>GRUB</strong> tai <strong>systemd-boot</strong> ohjaus <strong>EFI -järjestelmän osioon</strong>. Tämä on automaattinen oletus, ellet valitse manuaalista osiota, jolloin sinun on valittava asetukset itse.</translation> </message> <message> <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="93"/> <source>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.</source> - <translation type="unfinished"/> + <translation>Järjestelmä käynnistettiin <strong>BIOS</strong> -käynnistysympäristössä.<br><br>Jos haluat määrittää käynnistämisen BIOS-ympäristöstä, tämän asennusohjelman on asennettava käynnistyksen lataaja, kuten<strong>GRUB</strong>, joko osion alkuun tai <strong>Master Boot Record</strong> ,joka on osiotaulukon alussa (suositus). Tämä on automaattista, ellet valitset manuaalista osiota, jolloin sinun on valittava asetukset itse.</translation> </message> </context> <context> @@ -37,12 +37,12 @@ <message> <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/> <source>Do not install a boot loader</source> - <translation type="unfinished"/> + <translation>Älä asenna käynnistyksenlataajaa</translation> </message> <message> <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/> <source>%1 (%2)</source> - <translation type="unfinished"/> + <translation>%1 (%2)</translation> </message> </context> <context> @@ -50,7 +50,7 @@ <message> <location filename="../src/libcalamaresui/viewpages/BlankViewStep.cpp" line="69"/> <source>Blank Page</source> - <translation type="unfinished"/> + <translation>Tyhjä sivu</translation> </message> </context> <context> @@ -68,7 +68,7 @@ <message> <location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="34"/> <source>JobQueue</source> - <translation type="unfinished"/> + <translation>Työjono</translation> </message> <message> <location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="44"/> @@ -84,7 +84,7 @@ <location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="64"/> <location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="78"/> <source>none</source> - <translation type="unfinished"/> + <translation>tyhjä</translation> </message> <message> <location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="71"/> @@ -97,15 +97,20 @@ <translation>Työkalut</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> - <translation type="unfinished"/> + <translation>Virheenkorjaustiedot</translation> </message> </context> <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation>Määritä</translation> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Asenna</translation> </message> @@ -115,12 +120,12 @@ <message> <location filename="../src/libcalamares/JobExample.cpp" line="39"/> <source>Job failed (%1)</source> - <translation type="unfinished"/> + <translation>Työ epäonnistui (%1)</translation> </message> <message> <location filename="../src/libcalamares/JobExample.cpp" line="39"/> <source>Programmed job failure was explicitly requested.</source> - <translation type="unfinished"/> + <translation>Ohjelmoitua työn epäonnistumista pyydettiin erikseen.</translation> </message> </context> <context> @@ -136,7 +141,7 @@ <message> <location filename="../src/libcalamares/JobExample.cpp" line="27"/> <source>Example job (%1)</source> - <translation type="unfinished"/> + <translation>Esimerkki työ (%1)</translation> </message> </context> <context> @@ -200,7 +205,7 @@ <message> <location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="152"/> <source>System-requirements checking is complete.</source> - <translation type="unfinished"/> + <translation>Järjestelmävaatimusten tarkistus on valmis.</translation> </message> </context> <context> @@ -226,68 +231,68 @@ <location filename="../src/libcalamaresui/ViewManager.cpp" line="80"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="313"/> <source>Cancel setup without changing the system.</source> - <translation type="unfinished"/> + <translation>Peruuta asennus muuttamatta järjestelmää.</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="81"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="314"/> <source>Cancel installation without changing the system.</source> - <translation type="unfinished"/> + <translation>Peruuta asennus tekemättä muutoksia järjestelmään.</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="167"/> <source>Setup Failed</source> - <translation type="unfinished"/> + <translation>Asennus epäonnistui</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="192"/> <source>Calamares Initialization Failed</source> - <translation type="unfinished"/> + <translation>Calamares-alustustaminen epäonnistui</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="193"/> <source>%1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.</source> - <translation type="unfinished"/> + <translation>%1 ei voida asentaa. Calamares ei voinut ladata kaikkia määritettyjä moduuleja. Ongelma on siinä, miten jakelu käyttää Calamaresia.</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="198"/> <source><br/>The following modules could not be loaded:</source> - <translation type="unfinished"/> + <translation><br/>Seuraavia moduuleja ei voitu ladata:</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="252"/> <source>Continue with installation?</source> - <translation type="unfinished"/> + <translation>Jatka asennusta?</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="254"/> <source>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></source> - <translation type="unfinished"/> + <translation>%1 asennusohjelma on aikeissa tehdä muutoksia levylle, jotta voit määrittää kohteen %2.<br/><strong>Et voi kumota näitä muutoksia.</strong></translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="261"/> <source>&Set up now</source> - <translation type="unfinished"/> + <translation>&Määritä nyt</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="307"/> <source>&Set up</source> - <translation type="unfinished"/> + <translation>&Määritä</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="308"/> <source>&Install</source> - <translation type="unfinished"/> + <translation>&Asenna</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="310"/> <source>Setup is complete. Close the setup program.</source> - <translation type="unfinished"/> + <translation>Asennus on valmis. Sulje asennusohjelma.</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="372"/> <source>Cancel setup?</source> - <translation type="unfinished"/> + <translation>Peruuta asennus?</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="373"/> @@ -298,7 +303,8 @@ <location filename="../src/libcalamaresui/ViewManager.cpp" line="375"/> <source>Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost.</source> - <translation type="unfinished"/> + <translation>Haluatko todella peruuttaa nykyisen asennuksen? +Asennusohjelma lopetetaan ja kaikki muutokset menetetään.</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="377"/> @@ -325,12 +331,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="251"/> <source>Continue with setup?</source> - <translation type="unfinished"/> + <translation>Jatka asennusta?</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="257"/> <source>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></source> - <translation type="unfinished"/> + <translation>Asennus ohjelman %1 on tehtävä muutoksia levylle, jotta %2 voidaan asentaa.<br/><strong>Et voi kumota näitä muutoksia.</strong></translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="262"/> @@ -340,7 +346,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="269"/> <source>Go &back</source> - <translation type="unfinished"/> + <translation>Mene &takaisin</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="323"/> @@ -391,7 +397,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/calamares/CalamaresWindow.cpp" line="61"/> <source>%1 Setup Program</source> - <translation type="unfinished"/> + <translation>%1 Asennusohjelma</translation> </message> <message> <location filename="../src/calamares/CalamaresWindow.cpp" line="62"/> @@ -401,7 +407,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/calamares/CalamaresWindow.cpp" line="131"/> <source>Show debug information</source> - <translation type="unfinished"/> + <translation>Näytä virheenkorjaustiedot</translation> </message> </context> <context> @@ -427,145 +433,145 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="330"/> <source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source> - <translation type="unfinished"/> + <translation><strong>Manuaalinen osiointi </strong><br/>Voit luoda tai muuttaa osioita itse.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation type="unfinished"/> + <translation>Käynnistyksen lataajan sijainti:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> - <translation type="unfinished"/> + <translation>Valitse tallennus&laite:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> - <translation type="unfinished"/> + <translation>Nykyinen:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> - <translation type="unfinished"/> + <translation>Käytä %1 uudelleen kotiosiona kohteelle %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> - <translation type="unfinished"/> + <translation><strong>Valitse supistettava osio ja säädä alarivillä kokoa vetämällä</strong></translation> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation>%1 supistetaan %2Mib:iin ja uusi %3MiB-osio luodaan kohteelle %4.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> - <translation type="unfinished"/> + <translation><strong>Valitse asennettava osio</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> - <translation type="unfinished"/> + <translation>EFI-osiota ei löydy mistään tässä järjestelmässä. Siirry takaisin ja käytä manuaalista osiointia, kun haluat määrittää %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> - <translation type="unfinished"/> + <translation>EFI-järjestelmän osiota %1 käytetään käynnistettäessä %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> - <translation type="unfinished"/> + <translation>EFI järjestelmäosio</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> - <translation type="unfinished"/> + <translation>Tällä tallennuslaitteella ei näytä olevan käyttöjärjestelmää. Mitä haluat tehdä?<br/>Voit tarkistaa ja vahvistaa valintasi ennen kuin tallennuslaitteeseen tehdään muutoksia.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> - <translation type="unfinished"/> + <translation><strong>Tyhjennä levy</strong><br/>Tämä <font color="red">poistaa</font> kaikki tiedot valitussa tallennuslaitteessa.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> - <translation type="unfinished"/> + <translation>Tässä tallennuslaitteessa on %1 dataa. Mitä haluat tehdä?<br/>Voit tarkistaa ja vahvistaa valintasi ennen kuin tallennuslaitteeseen tehdään muutoksia.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> - <translation type="unfinished"/> + <translation>Ei välimuistia</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> - <translation type="unfinished"/> + <translation>Kierrätä välimuistia</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> - <translation type="unfinished"/> + <translation>Välimuisti (ei lepotilaa)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> - <translation type="unfinished"/> + <translation>Välimuisti (lepotilan kanssa)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> - <translation type="unfinished"/> + <translation>Välimuisti tiedostona</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> - <translation type="unfinished"/> + <translation><strong>Asenna nykyisen rinnalle</strong><br/>Asennus ohjelma supistaa osion tehdäkseen tilaa kohteelle %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> - <translation type="unfinished"/> + <translation><strong>Osion korvaaminen</strong><br/>korvaa osion %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> - <translation type="unfinished"/> + <translation>Tämä tallennuslaite sisältää jo käyttöjärjestelmän. Mitä haluaisit tehdä?<br/>Voit tarkistaa ja vahvistaa valintasi, ennen kuin tallennuslaitteeseen tehdään muutoksia.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> - <translation type="unfinished"/> + <translation>Tämä tallennuslaite sisältää jo useita käyttöjärjestelmiä. Mitä haluaisit tehdä?<br/>Voit tarkistaa ja vahvistaa valintasi, ennen kuin tallennuslaitteeseen tehdään muutoksia.</translation> </message> </context> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Poista osiointitoimenpiteitä varten tehdyt liitokset kohteesta %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> - <translation type="unfinished"/> + <translation>Tyhjennät kiinnitys osiointitoiminnoille %1.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Kaikki liitokset poistettu kohteesta %1</translation> </message> @@ -580,12 +586,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/partition/jobs/ClearTempMountsJob.cpp" line="49"/> <source>Clearing all temporary mounts.</source> - <translation type="unfinished"/> + <translation>Kaikki tilapäiset kiinnitykset tyhjennetään.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ClearTempMountsJob.cpp" line="60"/> <source>Cannot get list of temporary mounts.</source> - <translation type="unfinished"/> + <translation>Väliaikaisten kiinnitysten luetteloa ei voi hakea.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ClearTempMountsJob.cpp" line="99"/> @@ -599,17 +605,17 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/> <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/> <source>Could not run command.</source> - <translation type="unfinished"/> + <translation>Komentoa ei voi suorittaa.</translation> </message> <message> <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/> <source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source> - <translation type="unfinished"/> + <translation>Komento toimii isäntäympäristössä ja sen täytyy tietää juuren polku, mutta root-liityntä kohtaa ei ole määritetty.</translation> </message> <message> <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/> <source>The command needs to know the user's name, but no username is defined.</source> - <translation type="unfinished"/> + <translation>Komennon on tiedettävä käyttäjän nimi, mutta käyttäjän tunnusta ei ole määritetty.</translation> </message> </context> <context> @@ -617,7 +623,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/contextualprocess/ContextualProcessJob.cpp" line="117"/> <source>Contextual Processes Job</source> - <translation type="unfinished"/> + <translation>Prosessien yhteydessä tehtävät</translation> </message> </context> <context> @@ -630,7 +636,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="48"/> <source> MiB</source> - <translation type="unfinished"/> + <translation> Mib</translation> </message> <message> <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="55"/> @@ -650,12 +656,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="119"/> <source>Fi&le System:</source> - <translation type="unfinished"/> + <translation>Tie&dosto järjestelmä:</translation> </message> <message> <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="151"/> <source>LVM LV name</source> - <translation type="unfinished"/> + <translation>LVM LV nimi</translation> </message> <message> <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="188"/> @@ -675,7 +681,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="72"/> <source>En&crypt</source> - <translation type="unfinished"/> + <translation>Sa&laa</translation> </message> <message> <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="151"/> @@ -695,25 +701,25 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="262"/> <source>Mountpoint already in use. Please select another one.</source> - <translation type="unfinished"/> + <translation>Asennuskohde on jo käytössä. Valitse toinen.</translation> </message> </context> <context> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation type="unfinished"/> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation>Luo uusi %2Mib-osio %4 (%3) tiedostojärjestelmällä %1.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation type="unfinished"/> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation>Luo uusi <strong>%2Mib</strong> osio <strong>%4</strong> (%3) tiedostojärjestelmällä <strong>%1</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> <source>Creating new %1 partition on %2.</source> - <translation type="unfinished"/> + <translation>Luodaan uutta %1-osiota kohteessa %2.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="79"/> @@ -754,17 +760,17 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="47"/> <source>Create new %1 partition table on %2.</source> - <translation type="unfinished"/> + <translation>Luo uusi %1 osiotaulukko kohteessa %2.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="54"/> <source>Create new <strong>%1</strong> partition table on <strong>%2</strong> (%3).</source> - <translation type="unfinished"/> + <translation>Luo uusi <strong>%1</strong> osiotaulukko kohteessa <strong>%2</strong> (%3).</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="64"/> <source>Creating new %1 partition table on %2.</source> - <translation type="unfinished"/> + <translation>Luodaan uutta %1 osiotaulukkoa kohteelle %2.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="82"/> @@ -782,12 +788,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/users/CreateUserJob.cpp" line="58"/> <source>Create user <strong>%1</strong>.</source> - <translation type="unfinished"/> + <translation>Luo käyttäjä <strong>%1</strong>.</translation> </message> <message> <location filename="../src/modules/users/CreateUserJob.cpp" line="65"/> <source>Creating user %1.</source> - <translation type="unfinished"/> + <translation>Luodaan käyttäjä %1.</translation> </message> <message> <location filename="../src/modules/users/CreateUserJob.cpp" line="81"/> @@ -815,7 +821,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/partition/gui/CreateVolumeGroupDialog.cpp" line="37"/> <source>Create Volume Group</source> - <translation type="unfinished"/> + <translation>Luo aseman ryhmä</translation> </message> </context> <context> @@ -823,22 +829,22 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="38"/> <source>Create new volume group named %1.</source> - <translation type="unfinished"/> + <translation>Luo uusi aseman ryhmä nimellä %1.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="45"/> <source>Create new volume group named <strong>%1</strong>.</source> - <translation type="unfinished"/> + <translation>Luo uusi aseman ryhmä nimellä <strong>%1</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="52"/> <source>Creating new volume group named %1.</source> - <translation type="unfinished"/> + <translation>Luodaan uusi aseman ryhmä nimellä %1.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="65"/> <source>The installer failed to create a volume group named '%1'.</source> - <translation type="unfinished"/> + <translation>Asennusohjelma ei voinut luoda aseman ryhmää nimellä '%1'.</translation> </message> </context> <context> @@ -847,17 +853,17 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="34"/> <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="48"/> <source>Deactivate volume group named %1.</source> - <translation type="unfinished"/> + <translation>Poista levyryhmän nimi %1 käytöstä.</translation> </message> <message> <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="41"/> <source>Deactivate volume group named <strong>%1</strong>.</source> - <translation type="unfinished"/> + <translation>Poista levyryhmän nimi käytöstä. <strong>%1</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="61"/> <source>The installer failed to deactivate a volume group named %1.</source> - <translation type="unfinished"/> + <translation>Asennusohjelma ei pystynyt poistamaan levyryhmää nimellä %1.</translation> </message> </context> <context> @@ -865,17 +871,17 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="40"/> <source>Delete partition %1.</source> - <translation type="unfinished"/> + <translation>Poista levyosio %1.</translation> </message> <message> <location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="48"/> <source>Delete partition <strong>%1</strong>.</source> - <translation type="unfinished"/> + <translation>Poista levyosio <strong>%1</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="56"/> <source>Deleting partition %1.</source> - <translation type="unfinished"/> + <translation>Poistetaan levyosiota %1.</translation> </message> <message> <location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="68"/> @@ -888,32 +894,32 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="151"/> <source>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.</source> - <translation type="unfinished"/> + <translation>Valitun tallennuslaitteen <strong>osion taulukon</strong> tyyppi.<br><br>Ainoa tapa muuttaa osion taulukon tyyppiä on poistaa ja luoda uudelleen osiot tyhjästä, mikä tuhoaa kaikki tallennuslaitteen tiedot. <br>Tämä asennusohjelma säilyttää nykyisen osion taulukon, ellet nimenomaisesti valitse muuta.<br>Jos olet epävarma, niin nykyaikaisissa järjestelmissä GPT on suositus.</translation> </message> <message> <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="108"/> <source>This device has a <strong>%1</strong> partition table.</source> - <translation type="unfinished"/> + <translation>Tässälaitteessa on <strong>%1</strong> osion taulukko.</translation> </message> <message> <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="115"/> <source>This is a <strong>loop</strong> device.<br><br>It is a pseudo-device with no partition table that makes a file accessible as a block device. This kind of setup usually only contains a single filesystem.</source> - <translation type="unfinished"/> + <translation>Tämä <strong>loop</strong> -laite.<br><br>Se on pseudo-laite, jossa ei ole osio-taulukkoa ja joka tekee tiedostosta lohkotun aseman. Tällainen asennus sisältää yleensä vain yhden tiedostojärjestelmän.</translation> </message> <message> <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="122"/> <source>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.</source> - <translation type="unfinished"/> + <translation>Tämä asennusohjelma <strong>ei tunnista osion taulukkoa</strong> valitussa tallennuslaitteessa.<br><br>Laitteessa ei ole osio-taulukkoa, tai taulukko on vioittunut tai tuntematon.<br>Tämä asennusohjelma voi luoda uuden osiontaulukon sinulle, joko automaattisesti tai manuaalisesti.</translation> </message> <message> <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="132"/> <source><br><br>This is the recommended partition table type for modern systems which start from an <strong>EFI</strong> boot environment.</source> - <translation type="unfinished"/> + <translation><br><br>Tämä on suositeltava osion taulun tyyppi nykyaikaisille järjestelmille, jotka käyttävät <strong>EFI</strong> -käynnistysympäristöä.</translation> </message> <message> <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="138"/> <source><br><br>This partition table type is only advisable on older systems which start from a <strong>BIOS</strong> boot environment. GPT is recommended in most other cases.<br><br><strong>Warning:</strong> the MBR partition table is an obsolete MS-DOS era standard.<br>Only 4 <em>primary</em> partitions may be created, and of those 4, one can be an <em>extended</em> partition, which may in turn contain many <em>logical</em> partitions.</source> - <translation type="unfinished"/> + <translation><br><br>Tämä osiotaulukon tyyppi on suositeltava vain vanhemmissa järjestelmissä, jotka käyttävät <strong>BIOS</strong> -käynnistysympäristöä. GPT:tä suositellaan useimmissa muissa tapauksissa.<br><br><strong>Varoitus:</strong>MBR-taulukko on vanhentunut MS-DOS-standardi.<br>Vain 4 <em>ensisijaisia</em> Vain ensisijaisia osioita voidaan luoda, ja 4, niistä yksi voi olla <em>laajennettu</em> osio, joka voi puolestaan sisältää monia osioita <em>loogisia</em> osioita.</translation> </message> </context> <context> @@ -928,7 +934,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/> <source>%1 - (%2)</source> <extracomment>device[name] - (device-node[name])</extracomment> - <translation type="unfinished"/> + <translation>%1 - (%2)</translation> </message> </context> <context> @@ -936,17 +942,17 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="131"/> <source>Write LUKS configuration for Dracut to %1</source> - <translation type="unfinished"/> + <translation>Kirjoita LUKS-kokoonpano Dracutille %1</translation> </message> <message> <location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="133"/> <source>Skip writing LUKS configuration for Dracut: "/" partition is not encrypted</source> - <translation type="unfinished"/> + <translation>Ohita LUKS-määrityksen kirjoittaminen Dracutille: "/" -osio ei ole salattu</translation> </message> <message> <location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="149"/> <source>Failed to open %1</source> - <translation type="unfinished"/> + <translation>Ei voi avata %1</translation> </message> </context> <context> @@ -954,7 +960,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/dummycpp/DummyCppJob.cpp" line="47"/> <source>Dummy C++ Job</source> - <translation type="unfinished"/> + <translation>Dummy C++ -työ</translation> </message> </context> <context> @@ -972,7 +978,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="60"/> <source>&Keep</source> - <translation type="unfinished"/> + <translation>&Säilytä</translation> </message> <message> <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="70"/> @@ -997,12 +1003,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="129"/> <source> MiB</source> - <translation type="unfinished"/> + <translation> Mib</translation> </message> <message> <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="136"/> <source>Fi&le System:</source> - <translation type="unfinished"/> + <translation>Tie&dosto järjestelmä:</translation> </message> <message> <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="149"/> @@ -1012,7 +1018,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="269"/> <source>Mountpoint already in use. Please select another one.</source> - <translation type="unfinished"/> + <translation>Asennuskohde on jo käytössä. Valitse toinen.</translation> </message> </context> <context> @@ -1025,22 +1031,22 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="32"/> <source>En&crypt system</source> - <translation type="unfinished"/> + <translation>Sa&laa järjestelmä</translation> </message> <message> <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="42"/> <source>Passphrase</source> - <translation type="unfinished"/> + <translation>Salasana</translation> </message> <message> <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="52"/> <source>Confirm passphrase</source> - <translation type="unfinished"/> + <translation>Vahvista salasana</translation> </message> <message> <location filename="../src/modules/partition/gui/EncryptWidget.cpp" line="151"/> <source>Please enter the same passphrase in both boxes.</source> - <translation type="unfinished"/> + <translation>Anna sama salasana molemmissa ruuduissa.</translation> </message> </context> <context> @@ -1053,32 +1059,32 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="153"/> <source>Install %1 on <strong>new</strong> %2 system partition.</source> - <translation type="unfinished"/> + <translation>Asenna %1 <strong>uusi</strong> %2 järjestelmä osio.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="157"/> <source>Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>.</source> - <translation type="unfinished"/> + <translation>Määritä <strong>uusi</strong> %2 -osio liitepisteellä<strong>%1</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="165"/> <source>Install %2 on %3 system partition <strong>%1</strong>.</source> - <translation type="unfinished"/> + <translation>Asenna %2 - %3 -järjestelmän osioon <strong>%1</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="170"/> <source>Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>.</source> - <translation type="unfinished"/> + <translation>Määritä %3 osio <strong>%1</strong> jossa on liitäntäpiste <strong>%2</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="182"/> <source>Install boot loader on <strong>%1</strong>.</source> - <translation type="unfinished"/> + <translation>Asenna käynnistyslatain <strong>%1</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="192"/> <source>Setting up mount points.</source> - <translation type="unfinished"/> + <translation>Liitosten määrittäminen.</translation> </message> </context> <context> @@ -1091,7 +1097,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/finished/FinishedPage.ui" line="95"/> <source><Restart checkbox tooltip></source> - <translation type="unfinished"/> + <translation><Restart checkbox tooltip></translation> </message> <message> <location filename="../src/modules/finished/FinishedPage.ui" line="98"/> @@ -1101,12 +1107,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/finished/FinishedPage.cpp" line="54"/> <source><h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system.</source> - <translation type="unfinished"/> + <translation><h1>Valmista.</h1><br/>%1 on määritetty tietokoneellesi.<br/>Voit nyt alkaa käyttää uutta järjestelmääsi.</translation> </message> <message> <location filename="../src/modules/finished/FinishedPage.cpp" line="58"/> <source><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></source> - <translation type="unfinished"/> + <translation><html><head/><body><p>Kun tämä valintaruutu on valittu, järjestelmä käynnistyy heti, kun napsautat <span style="font-style:italic;">Valmis</span> -painiketta tai suljet asennusohjelman.</p></body></html></translation> </message> <message> <location filename="../src/modules/finished/FinishedPage.cpp" line="66"/> @@ -1116,63 +1122,63 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/finished/FinishedPage.cpp" line="71"/> <source><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></source> - <translation type="unfinished"/> + <translation><html><head/><body><p>Kun tämä valintaruutu on valittuna, järjestelmä käynnistyy heti, kun napsautat <span style="font-style:italic;">Valmis</span> tai suljet asentimen.</p></body></html></translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> - <translation type="unfinished"/> + <translation><h1>Asennus epäonnistui</h1><br/>%1 ei ole määritetty tietokoneellesi.<br/> Virhesanoma oli: %2.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> - <translation type="unfinished"/> + <translation><h1>Asennus epäonnistui </h1><br/>%1 ei ole asennettu tietokoneeseesi.<br/>Virhesanoma oli: %2.</translation> </message> </context> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Valmis</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> - <translation type="unfinished"/> + <translation>Asennus valmis</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> - <translation type="unfinished"/> + <translation>Asennus valmis</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> - <translation type="unfinished"/> + <translation>Asennus %1 on valmis.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> - <translation type="unfinished"/> + <translation>Asennus %1 on valmis.</translation> </message> </context> <context> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Alusta osio %1 (tiedostojärjestelmä: %2, koko: %3 MB) levyllä %4</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation>Alustaa osiota %1 (tiedostojärjestelmä: %2, koko: %3 MiB) - %4.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation type="unfinished"/> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation>Alustus <strong>%3MiB</strong> osio <strong>%1</strong> tiedostojärjestelmällä <strong>%2</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> <source>Formatting partition %1 with file system %2.</source> - <translation type="unfinished"/> + <translation>Alustaa osiota %1 tiedostojärjestelmällä %2.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="77"/> @@ -1184,23 +1190,23 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>sisältää vähintään %1 GB käytettävissä olevaa asematilaa</translation> + <source>has at least %1 GiB available drive space</source> + <translation>vähintään %1 GiB vapaata levytilaa</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation type="unfinished"/> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation>Levytilaa ei ole riittävästi. Vähintään %1 GiB tarvitaan.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>sisältää vähintään %1 GB muistia</translation> + <source>has at least %1 GiB working memory</source> + <translation>vähintään %1 GiB työmuistia</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation type="unfinished"/> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation>Järjestelmässä ei ole tarpeeksi työmuistia. Vähintään %1 GiB vaaditaan.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1210,7 +1216,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="125"/> <source>The system is not plugged in to a power source.</source> - <translation type="unfinished"/> + <translation>Järjestelmä ei ole kytketty virtalähteeseen.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="132"/> @@ -1220,27 +1226,27 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="133"/> <source>The system is not connected to the Internet.</source> - <translation type="unfinished"/> + <translation>Järjestelmä ei ole yhteydessä internetiin.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="142"/> <source>The setup program is not running with administrator rights.</source> - <translation type="unfinished"/> + <translation>Asennus -ohjelma ei ole käynnissä järjestelmänvalvojan oikeuksin.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="143"/> <source>The installer is not running with administrator rights.</source> - <translation type="unfinished"/> + <translation>Asennus -ohjelma ei ole käynnissä järjestelmänvalvojan oikeuksin.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="152"/> <source>The screen is too small to display the setup program.</source> - <translation type="unfinished"/> + <translation>Näyttö on liian pieni, jotta asennus -ohjelma voidaan näyttää.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="153"/> <source>The screen is too small to display the installer.</source> - <translation type="unfinished"/> + <translation>Näyttö on liian pieni asentajan näyttämiseksi.</translation> </message> </context> <context> @@ -1251,22 +1257,22 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <location filename="../src/modules/oemid/IDJob.cpp" line="59"/> <location filename="../src/modules/oemid/IDJob.cpp" line="67"/> <source>OEM Batch Identifier</source> - <translation type="unfinished"/> + <translation>OEM-erän tunniste</translation> </message> <message> <location filename="../src/modules/oemid/IDJob.cpp" line="48"/> <source>Could not create directories <code>%1</code>.</source> - <translation type="unfinished"/> + <translation>Hakemistoja ei voitu luoda <code>%1</code>.</translation> </message> <message> <location filename="../src/modules/oemid/IDJob.cpp" line="60"/> <source>Could not open file <code>%1</code>.</source> - <translation type="unfinished"/> + <translation>Tiedostoa ei voitu avata <code>%1</code>.</translation> </message> <message> <location filename="../src/modules/oemid/IDJob.cpp" line="68"/> <source>Could not write to file <code>%1</code>.</source> - <translation type="unfinished"/> + <translation>Tiedostoon ei voitu kirjoittaa <code>%1</code>.</translation> </message> </context> <context> @@ -1274,17 +1280,17 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="53"/> <source>Konsole not installed</source> - <translation type="unfinished"/> + <translation>Pääte ei asennettuna</translation> </message> <message> <location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="54"/> <source>Please install KDE Konsole and try again!</source> - <translation type="unfinished"/> + <translation>Asenna KDE konsole ja yritä uudelleen!</translation> </message> <message> <location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="116"/> <source>Executing script: &nbsp;<code>%1</code></source> - <translation type="unfinished"/> + <translation>Suoritetaan skripti: &nbsp;<code>%1</code></translation> </message> </context> <context> @@ -1292,7 +1298,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/interactiveterminal/InteractiveTerminalViewStep.cpp" line="45"/> <source>Script</source> - <translation type="unfinished"/> + <translation>Skripti</translation> </message> </context> <context> @@ -1326,7 +1332,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="41"/> <source>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>.</source> - <translation type="unfinished"/> + <translation>Järjestelmän kieli asetus vaikuttaa joidenkin komentorivin käyttöliittymän kieleen ja merkistön käyttöön.<br/>Nykyinen asetus on <strong>%1</strong>.</translation> </message> <message> <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="66"/> @@ -1336,7 +1342,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="67"/> <source>&OK</source> - <translation type="unfinished"/> + <translation>&OK</translation> </message> </context> <context> @@ -1349,27 +1355,27 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/license/LicensePage.cpp" line="123"/> <source>I accept the terms and conditions above.</source> - <translation type="unfinished"/> + <translation>Hyväksyn yllä olevat ehdot ja edellytykset.</translation> </message> <message> <location filename="../src/modules/license/LicensePage.cpp" line="146"/> <source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source> - <translation type="unfinished"/> + <translation><h1>Lisenssisopimus</h1>Tämä asennustoiminto asentaa ohjelmistoja, joihin sovelletaan lisenssiehtoja.</translation> </message> <message> <location filename="../src/modules/license/LicensePage.cpp" line="149"/> <source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source> - <translation type="unfinished"/> + <translation>Katso yllä olevat käyttöoikeussopimukset (EULA).<br/>Jos et hyväksy ehtoja, asennus ei voi jatkua.</translation> </message> <message> <location filename="../src/modules/license/LicensePage.cpp" line="155"/> <source><h1>License Agreement</h1>This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.</source> - <translation type="unfinished"/> + <translation><h1>Lisenssisopimus</h1>Tämä asennustoiminto voi asentaa tekijänoikeuksin rajattua ohjelmistoja, joihin sovelletaan lisenssiehtoja, jotta voidaan tarjota lisäominaisuuksia ja parantaa käyttäjäkokemusta.</translation> </message> <message> <location filename="../src/modules/license/LicensePage.cpp" line="160"/> <source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.</source> - <translation type="unfinished"/> + <translation>Katso yllä olevat käyttöoikeussopimukset (EULA).<br/>Jos et hyväksy ehtoja, tekijänoikeuksin rajattua ohjelmistoa ei asenneta, ja avoimen lähdekoodin vaihtoehtoja käytetään sen sijaan.</translation> </message> </context> <context> @@ -1377,7 +1383,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/license/LicenseViewStep.cpp" line="51"/> <source>License</source> - <translation type="unfinished"/> + <translation>Lisenssi</translation> </message> </context> <context> @@ -1482,12 +1488,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Ladataan sijainnin tietoja...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Sijainti</translation> </message> @@ -1502,7 +1508,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="63"/> <source>Description</source> - <translation type="unfinished"/> + <translation>Kuvaus</translation> </message> <message> <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="84"/> @@ -1520,7 +1526,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="54"/> <source>Package selection</source> - <translation type="unfinished"/> + <translation>Paketin valinta</translation> </message> </context> <context> @@ -1546,7 +1552,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/> <source>OEM Configuration</source> - <translation type="unfinished"/> + <translation>OEM-kokoonpano</translation> </message> <message> <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/> @@ -1559,17 +1565,17 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/users/CheckPWQuality.cpp" line="63"/> <source>Password is too short</source> - <translation type="unfinished"/> + <translation>Salasana on liian lyhyt</translation> </message> <message> <location filename="../src/modules/users/CheckPWQuality.cpp" line="85"/> <source>Password is too long</source> - <translation type="unfinished"/> + <translation>Salasana on liian pitkä</translation> </message> <message> <location filename="../src/modules/users/CheckPWQuality.cpp" line="169"/> <source>Password is too weak</source> - <translation type="unfinished"/> + <translation>Salasana on liian heikko</translation> </message> <message> <location filename="../src/modules/users/CheckPWQuality.cpp" line="176"/> @@ -1664,7 +1670,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/users/CheckPWQuality.cpp" line="214"/> <source>The password is too short</source> - <translation type="unfinished"/> + <translation>Salasana on liian lyhyt</translation> </message> <message> <location filename="../src/modules/users/CheckPWQuality.cpp" line="216"/> @@ -1714,7 +1720,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/users/CheckPWQuality.cpp" line="234"/> <source>No password supplied</source> - <translation type="unfinished"/> + <translation>Salasanaa ei annettu</translation> </message> <message> <location filename="../src/modules/users/CheckPWQuality.cpp" line="236"/> @@ -1789,12 +1795,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/users/CheckPWQuality.cpp" line="283"/> <source>Fatal failure</source> - <translation type="unfinished"/> + <translation>Vakava virhe</translation> </message> <message> <location filename="../src/modules/users/CheckPWQuality.cpp" line="285"/> <source>Unknown error</source> - <translation type="unfinished"/> + <translation>Tuntematon virhe</translation> </message> </context> <context> @@ -1876,45 +1882,45 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> - <translation type="unfinished"/> + <translation>Root</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> - <translation type="unfinished"/> + <translation>Home</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> - <translation type="unfinished"/> + <translation>Boot</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> - <translation type="unfinished"/> + <translation>EFI-järjestelmä</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> - <translation type="unfinished"/> + <translation>Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> - <translation type="unfinished"/> + <translation>Uusi osio %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Uusi osiointi</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> - <translation type="unfinished"/> + <translation>%1 %2</translation> </message> </context> <context> @@ -2090,7 +2096,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/> <source>Current:</source> - <translation type="unfinished"/> + <translation>Nykyinen:</translation> </message> <message> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/> @@ -2100,7 +2106,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/> <source>No EFI system partition configured</source> - <translation type="unfinished"/> + <translation>EFI-järjestelmäosiota ei ole määritetty</translation> </message> <message> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/> @@ -2110,7 +2116,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/> <source>EFI system partition flag not set</source> - <translation type="unfinished"/> + <translation>EFI-järjestelmäosion lippua ei ole asetettu</translation> </message> <message> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/> @@ -2120,7 +2126,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/> <source>Boot partition not encrypted</source> - <translation type="unfinished"/> + <translation>Käynnistysosiota ei ole salattu</translation> </message> <message> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/> @@ -2130,7 +2136,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/> <source>has at least one disk device available.</source> - <translation type="unfinished"/> + <translation>on vähintään yksi levy käytettävissä.</translation> </message> <message> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/> @@ -2183,7 +2189,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation> <message> <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/> <source>Saving files for later ...</source> - <translation type="unfinished"/> + <translation>Tiedostojen tallentaminen myöhemmin ...</translation> </message> <message> <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/> @@ -2209,7 +2215,9 @@ There was no output from the command.</source> <source> Output: </source> - <translation type="unfinished"/> + <translation> +Ulostulo: +</translation> </message> <message> <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="310"/> @@ -2278,32 +2286,32 @@ Output: <message> <location filename="../src/modules/partition/core/KPMHelpers.cpp" line="207"/> <source>unknown</source> - <translation type="unfinished"/> + <translation>tuntematon</translation> </message> <message> <location filename="../src/modules/partition/core/KPMHelpers.cpp" line="209"/> <source>extended</source> - <translation type="unfinished"/> + <translation>laajennettu</translation> </message> <message> <location filename="../src/modules/partition/core/KPMHelpers.cpp" line="211"/> <source>unformatted</source> - <translation type="unfinished"/> + <translation>formatoimaton</translation> </message> <message> <location filename="../src/modules/partition/core/KPMHelpers.cpp" line="213"/> <source>swap</source> - <translation type="unfinished"/> + <translation>swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/gui/PartitionDialogHelpers.cpp" line="47"/> <source>(no mount point)</source> - <translation type="unfinished"/> + <translation>(ei liitoskohtaa)</translation> </message> <message> <location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="62"/> @@ -2311,10 +2319,10 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> - <translation type="unfinished"/> + <translation>%1 (%2)</translation> </message> </context> <context> @@ -2403,81 +2411,81 @@ Output: <message> <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/> <source>The EFI system partition at %1 will be used for starting %2.</source> - <translation type="unfinished"/> + <translation>EFI-järjestelmän osiota %1 käytetään käynnistettäessä %2.</translation> </message> <message> <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/> <source>EFI system partition:</source> - <translation type="unfinished"/> + <translation>EFI järjestelmäosio</translation> </message> </context> <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> - <translation type="unfinished"/> + <translation>Virheellinen konfiguraatio</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> - <translation type="unfinished"/> + <translation>KPMCore ei saatavilla</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> - <translation type="unfinished"/> + <translation>Kokomuutos epäonnistui</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2491,12 +2499,12 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> + <source>Resizing %2MiB partition %1 to %3MiB.</source> <translation type="unfinished"/> </message> <message> @@ -2567,7 +2575,7 @@ Output: <message> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="209"/> <source>System requirements</source> - <translation type="unfinished"/> + <translation>Järjestelmävaatimukset</translation> </message> </context> <context> @@ -2575,12 +2583,12 @@ Output: <message> <location filename="../src/modules/partition/gui/ScanningDialog.cpp" line="84"/> <source>Scanning storage devices...</source> - <translation type="unfinished"/> + <translation>Skannataan tallennuslaitteita...</translation> </message> <message> <location filename="../src/modules/partition/gui/ScanningDialog.cpp" line="85"/> <source>Partitioning</source> - <translation type="unfinished"/> + <translation>Osiointi</translation> </message> </context> <context> @@ -2652,7 +2660,7 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> + <source>Set flags on %1MiB %2 partition.</source> <translation type="unfinished"/> </message> <message> @@ -2667,7 +2675,22 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> <translation type="unfinished"/> </message> <message> @@ -2681,11 +2704,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation type="unfinished"/> @@ -2696,11 +2714,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation type="unfinished"/> @@ -2711,11 +2724,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation type="unfinished"/> @@ -2751,7 +2759,7 @@ Output: <message> <location filename="../src/modules/users/SetPasswordJob.cpp" line="123"/> <source>Cannot disable root account.</source> - <translation type="unfinished"/> + <translation>Root-tiliä ei voi poistaa.</translation> </message> <message> <location filename="../src/modules/users/SetPasswordJob.cpp" line="124"/> @@ -2799,7 +2807,7 @@ Output: <message> <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="96"/> <source>Cannot set timezone,</source> - <translation type="unfinished"/> + <translation>Aikavyöhykettä ei voi määrittää,</translation> </message> <message> <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="97"/> @@ -2850,7 +2858,7 @@ Output: <message> <location filename="../src/modules/tracking/TrackingJobs.cpp" line="43"/> <source>Installation feedback</source> - <translation type="unfinished"/> + <translation>Asennuksen palaute</translation> </message> <message> <location filename="../src/modules/tracking/TrackingJobs.cpp" line="53"/> @@ -2945,7 +2953,7 @@ Output: <message> <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/> <source>Feedback</source> - <translation type="unfinished"/> + <translation>Palautetta</translation> </message> </context> <context> @@ -3005,7 +3013,7 @@ Output: <message> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="14"/> <source>Create Volume Group</source> - <translation type="unfinished"/> + <translation>Luo aseman ryhmä</translation> </message> <message> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="20"/> @@ -3025,27 +3033,27 @@ Output: <message> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="56"/> <source>Physical Extent Size:</source> - <translation type="unfinished"/> + <translation>Fyysinen koko:</translation> </message> <message> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="66"/> <source> MiB</source> - <translation type="unfinished"/> + <translation> Mib</translation> </message> <message> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="82"/> <source>Total Size:</source> - <translation type="unfinished"/> + <translation>Yhteensä koko:</translation> </message> <message> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="102"/> <source>Used Size:</source> - <translation type="unfinished"/> + <translation>Käytetty tila:</translation> </message> <message> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="122"/> <source>Total Sectors:</source> - <translation type="unfinished"/> + <translation>Sektorit yhteensä:</translation> </message> <message> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="142"/> @@ -3074,7 +3082,7 @@ Output: <location filename="../src/modules/welcome/WelcomePage.ui" line="17"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="72"/> <source>Select language</source> - <translation type="unfinished"/> + <translation>Valitse kieli</translation> </message> <message> <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/> @@ -3124,13 +3132,13 @@ Output: <message> <location filename="../src/modules/welcome/WelcomePage.cpp" line="201"/> <source>%1 support</source> - <translation type="unfinished"/> + <translation>%1 tuki</translation> </message> </context> <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Tervetuloa</translation> </message> diff --git a/lang/calamares_fr.ts b/lang/calamares_fr.ts index 8bf0df529..c5a74bbe5 100644 --- a/lang/calamares_fr.ts +++ b/lang/calamares_fr.ts @@ -97,7 +97,7 @@ <translation>Outils</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Informations de dépannage</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation>Configurer</translation> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Installer</translation> </message> @@ -226,7 +231,7 @@ <location filename="../src/libcalamaresui/ViewManager.cpp" line="80"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="313"/> <source>Cancel setup without changing the system.</source> - <translation>Annuler l'installation sans toucher au système.</translation> + <translation>Annuler la configuration sans toucher au système.</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="81"/> @@ -237,7 +242,7 @@ <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="167"/> <source>Setup Failed</source> - <translation>Échec de l'installation</translation> + <translation>Échec de la configuration</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="192"/> @@ -262,17 +267,17 @@ <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="254"/> <source>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></source> - <translation>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></translation> + <translation>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></translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="261"/> <source>&Set up now</source> - <translation>&Installer maintenant</translation> + <translation>&Configurer maintenant</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="307"/> <source>&Set up</source> - <translation>&Installer</translation> + <translation>&Configurer</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="308"/> @@ -282,12 +287,12 @@ <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="310"/> <source>Setup is complete. Close the setup program.</source> - <translation>L'installation est terminée. Fermer l'installateur.</translation> + <translation>La configuration est terminée. Fermer le programme de configuration.</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="372"/> <source>Cancel setup?</source> - <translation>Annuler l'installation ?</translation> + <translation>Annuler la configuration ?</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="373"/> @@ -298,8 +303,8 @@ <location filename="../src/libcalamaresui/ViewManager.cpp" line="375"/> <source>Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost.</source> - <translation>Voulez-vous réellement abandonner le processus d'installation ? -L'installateur se fermera et les changements seront perdus.</translation> + <translation>Voulez-vous réellement abandonner le processus de configuration ? +Le programme de configuration se fermera et les changements seront perdus.</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="377"/> @@ -392,7 +397,7 @@ L'installateur se fermera et les changements seront perdus.</translation> <message> <location filename="../src/calamares/CalamaresWindow.cpp" line="61"/> <source>%1 Setup Program</source> - <translation>Programme d'installation de %1</translation> + <translation>Programme de configuration de %1</translation> </message> <message> <location filename="../src/calamares/CalamaresWindow.cpp" line="62"/> @@ -431,124 +436,124 @@ L'installateur se fermera et les changements seront perdus.</translation> <translation><strong>Partitionnement manuel</strong><br/>Vous pouvez créer ou redimensionner vous-même des partitions.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Emplacement du chargeur de démarrage:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 va être réduit à %2Mo et une nouvelle partition de %3Mo va être créée pour %4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Sélectionnez le support de sto&ckage :</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Actuel :</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Réutiliser %1 comme partition home pour %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Sélectionnez une partition à réduire, puis faites glisser la barre du bas pour redimensionner</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation>%1 va être réduit à %2Mio et une nouvelle partition de %3Mio va être créée pour %4.</translation> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Sélectionner une partition pour l'installation</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>Une partition système EFI n'a pas pu être trouvée sur ce système. Veuillez retourner à l'étape précédente et sélectionner le partitionnement manuel pour configurer %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>La partition système EFI sur %1 va être utilisée pour démarrer %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>Partition système EFI :</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Ce périphérique de stockage ne semble pas contenir de système d'exploitation. Que souhaitez-vous faire ?<br/>Vous pourrez relire et confirmer vos choix avant que les modifications soient effectuées sur le périphérique de stockage.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Effacer le disque</strong><br/>Ceci va <font color="red">effacer</font> toutes les données actuellement présentes sur le périphérique de stockage sélectionné.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>Ce périphérique de stockage contient %1. Que souhaitez-vous faire ?<br/>Vous pourrez relire et confirmer vos choix avant que les modifications soient effectuées sur le périphérique de stockage.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation>Aucun Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation>Réutiliser le Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation>Swap (sans hibernation)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation>Swap (avec hibernation)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation>Swap dans un fichier</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Installer à côté</strong><br/>L'installateur va réduire une partition pour faire de la place pour %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Remplacer une partition</strong><br>Remplace une partition par %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>Ce périphérique de stockage contient déjà un système d'exploitation. Que souhaitez-vous faire ?<br/>Vous pourrez relire et confirmer vos choix avant que les modifications soient effectuées sur le périphérique de stockage.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>Ce péiphérique de stockage contient déjà plusieurs systèmes d'exploitation. Que souhaitez-vous faire ?<br/>Vous pourrez relire et confirmer vos choix avant que les modifications soient effectuées sur le périphérique de stockage.</translation> </message> @@ -556,17 +561,17 @@ L'installateur se fermera et les changements seront perdus.</translation> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Retirer les montages pour les opérations de partitionnement sur %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Libération des montages pour les opérations de partitionnement sur %1.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Tous les montages ont été retirés pour %1</translation> </message> @@ -703,13 +708,13 @@ L'installateur se fermera et les changements seront perdus.</translation> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Créer une nouvelle partition de %2Mo sur %4 (%3) avec le système de fichiers %1.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation>Créer une nouvelle partition de %2Mio sur %4 (%3) avec le système de fichier %1.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Créer une nouvelle partition de <strong>%2Mo</strong> sur <strong>%4</strong> (%3) avec le système de fichiers <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation>Créer une nouvelle partition de <strong>%2Mio</strong> sur <strong>%4</strong> (%3) avec le système de fichiers <strong>%1</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1102,12 +1107,12 @@ L'installateur se fermera et les changements seront perdus.</translation> <message> <location filename="../src/modules/finished/FinishedPage.cpp" line="54"/> <source><h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system.</source> - <translation><h1>Installation terminée.</h1><br/>%1 a été installé sur votre ordinateur.<br/>Vous pouvez maintenant utiliser votre nouveau système.</translation> + <translation><h1>Configuration terminée.</h1><br/>%1 a été configuré sur votre ordinateur.<br/>Vous pouvez maintenant utiliser votre nouveau système.</translation> </message> <message> <location filename="../src/modules/finished/FinishedPage.cpp" line="58"/> <source><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></source> - <translation><html><head/><body><p>En sélectionnant cette option, votre système redémarrera immédiatement quand vous cliquerez sur <span style=" font-style:italic;">Terminé</span> ou fermerez l'installateur.</p></body></html></translation> + <translation><html><head/><body><p>En sélectionnant cette option, votre système redémarrera immédiatement quand vous cliquerez sur <span style=" font-style:italic;">Terminé</span> ou fermerez le programme de configuration.</p></body></html></translation> </message> <message> <location filename="../src/modules/finished/FinishedPage.cpp" line="66"/> @@ -1120,12 +1125,12 @@ L'installateur se fermera et les changements seront perdus.</translation> <translation><html><head/><body><p>En sélectionnant cette option, votre système redémarrera immédiatement quand vous cliquerez sur <span style=" font-style:italic;">Terminé</span> ou fermerez l'installateur.</p></body></html></translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> - <translation><h1>Installation échouée</h1><br/>%1 n'a pas été installée sur cet ordinateur.<br/>Le message d'erreur était : %2.</translation> + <translation><h1>Échec de la configuration</h1><br/>%1 n'a pas été configuré sur cet ordinateur.<br/>Le message d'erreur était : %2.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>Installation échouée</h1><br/>%1 n'a pas été installée sur cet ordinateur.<br/>Le message d'erreur était : %2.</translation> </message> @@ -1133,27 +1138,27 @@ L'installateur se fermera et les changements seront perdus.</translation> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Terminer</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> - <translation>Installation terminée</translation> + <translation>Configuration terminée</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Installation terminée</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> - <translation>L'installation de %1 est terminée.</translation> + <translation>La configuration de %1 est terminée.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>L'installation de %1 est terminée.</translation> </message> @@ -1162,13 +1167,13 @@ L'installateur se fermera et les changements seront perdus.</translation> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Formater la partition %1 (système de fichier : %2, taille : %3 Mo) sur %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation>Formater la partition %1 (système de fichiers : %2, taille : %3 Mio) sur %4.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>Formater la partition <strong>%1</strong> de <strong>%3MB</strong> avec le système de fichiers <strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation>Formater la partition <strong>%1</strong> de <strong>%3Mio</strong>avec le système de fichier <strong>%2</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1185,23 +1190,23 @@ L'installateur se fermera et les changements seront perdus.</translation> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>a au moins %1 Go d'espace disque disponible</translation> + <source>has at least %1 GiB available drive space</source> + <translation>a au moins %1 Gio d'espace disque disponible</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>Il n'y a pas assez d'espace disque. Au moins %1 Go sont requis.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation>Il n'y a pas assez d'espace disque. Au moins %1 Gio sont requis.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>a au moins %1 Go de mémoire vive</translation> + <source>has at least %1 GiB working memory</source> + <translation>a au moins %1 Gio de mémoire vive</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>Le système n'a pas assez de mémoire vive. Au moins %1 Go sont requis.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation>Le système n'a pas assez de mémoire vive. Au moins %1 Gio sont requis.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1226,7 +1231,7 @@ L'installateur se fermera et les changements seront perdus.</translation> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="142"/> <source>The setup program is not running with administrator rights.</source> - <translation>L'installateur ne dispose pas des droits administrateur.</translation> + <translation>Le programme de configuration ne dispose pas des droits administrateur.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="143"/> @@ -1236,7 +1241,7 @@ L'installateur se fermera et les changements seront perdus.</translation> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="152"/> <source>The screen is too small to display the setup program.</source> - <translation>L'écran est trop petit pour afficher l'installateur.</translation> + <translation>L'écran est trop petit pour afficher le programme de configuration.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="153"/> @@ -1252,7 +1257,7 @@ L'installateur se fermera et les changements seront perdus.</translation> <location filename="../src/modules/oemid/IDJob.cpp" line="59"/> <location filename="../src/modules/oemid/IDJob.cpp" line="67"/> <source>OEM Batch Identifier</source> - <translation type="unfinished"/> + <translation>Identifiant de Lot OEM</translation> </message> <message> <location filename="../src/modules/oemid/IDJob.cpp" line="48"/> @@ -1483,12 +1488,12 @@ L'installateur se fermera et les changements seront perdus.</translation> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Chargement des données de localisation...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Localisation</translation> </message> @@ -1529,17 +1534,17 @@ L'installateur se fermera et les changements seront perdus.</translation> <message> <location filename="../src/modules/oemid/OEMPage.ui" line="28"/> <source>Ba&tch:</source> - <translation type="unfinished"/> + <translation>Lo&amp;t:</translation> </message> <message> <location filename="../src/modules/oemid/OEMPage.ui" line="38"/> <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source> - <translation type="unfinished"/> + <translation><html><head/><body><p>Entrez ici un identifiant de lot. Celui-ci sera stocké sur le système cible.</p></body></html></translation> </message> <message> <location filename="../src/modules/oemid/OEMPage.ui" line="48"/> <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source> - <translation type="unfinished"/> + <translation><html><head/><body><h1>Configuration OEM</h1><p>Calamares va utiliser les paramètres OEM pendant la configuration du système cible.</p></body></html></translation> </message> </context> <context> @@ -1547,12 +1552,12 @@ L'installateur se fermera et les changements seront perdus.</translation> <message> <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/> <source>OEM Configuration</source> - <translation type="unfinished"/> + <translation>Configuration OEM</translation> </message> <message> <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/> <source>Set the OEM Batch Identifier to <code>%1</code>.</source> - <translation type="unfinished"/> + <translation>Utiliser <code>%1</code> comme Identifiant de Lot OEM.</translation> </message> </context> <context> @@ -1877,42 +1882,42 @@ L'installateur se fermera et les changements seront perdus.</translation> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Racine</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Home</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Démarrage</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>Système EFI</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Nouvelle partition pour %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Nouvelle partition</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2163,7 +2168,7 @@ L'installateur se fermera et les changements seront perdus.</translation> <message> <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="70"/> <source>Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.</source> - <translation>Merci de choisir l'apparence du bureau KDE Plasma. Vous pouvez aussi passer cette étape et configurer l'apparence une fois le système installé. Vous pouvez obtenir un aperçu des différentes apparences en cliquant sur celles-ci.</translation> + <translation>Merci de choisir l'apparence du bureau KDE Plasma. Vous pouvez aussi passer cette étape et configurer l'apparence une fois le système configuré. Vous pouvez obtenir un aperçu des différentes apparences en cliquant sur celles-ci.</translation> </message> <message> <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="76"/> @@ -2301,7 +2306,7 @@ Sortie <translation>swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Espace non partitionné ou table de partitions inconnue</translation> </message> @@ -2316,7 +2321,7 @@ Sortie <translation>La vérification des prérequis pour le module <i>%1</i> est terminée.</translation> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2419,70 +2424,70 @@ Sortie <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation>Tâche de redimensionnement du système de fichiers</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>Configuration incorrecte</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation>La tâche de redimensionnement du système de fichier a une configuration incorrecte et ne sera pas exécutée.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation>KPMCore n'est pas disponible</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation>Calamares ne peut pas démarrer KPMCore pour la tâche de redimensionnement du système de fichiers.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>Échec du redimensionnement</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation>Le système de fichiers %1 n'a pas été trouvé sur ce système, et ne peut pas être redimensionné.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation>Le périphérique %1 n'a pas été trouvé sur ce système, et ne peut pas être redimensionné.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation>Le système de fichiers %1 ne peut pas être redimensionné.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation>Le périphérique %1 ne peut pas être redimensionné.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation>Le système de fichiers %1 doit être redimensionné, mais c'est impossible.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation>Le périphérique %1 doit être redimensionné, mais c'est impossible.</translation> </message> @@ -2496,13 +2501,13 @@ Sortie </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>Redimentionner la partition <strong>%1</strong> de <strong>%2MB</strong> à <strong>%3MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation>Redimensionner la partition <strong>%1</strong> de <strong>%2 Mio</strong> à <strong>%3 Mio</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Redimensionnement de la partition %1 de %2Mo à %3Mo.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation>Redimensionnement de la partition %1 de %2 Mio à %3 Mio.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2542,7 +2547,7 @@ Sortie <message> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="96"/> <source>This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a></source> - <translation>Cet ordinateur ne satisfait pas les minimum prérequis pour installer %1.<br/>L'installation ne peut pas continuer. <a href="#details">Détails...</a></translation> + <translation>Cet ordinateur ne satisfait pas les minimum prérequis pour configurer %1.<br/>La configuration ne peut pas continuer. <a href="#details">Détails...</a></translation> </message> <message> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="100"/> @@ -2552,7 +2557,7 @@ Sortie <message> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="118"/> <source>This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.</source> - <translation>Cet ordinateur ne satisfait pas certains des prérequis recommandés pour installer %1.<br/>L'installation peut continuer, mais certaines fonctionnalités pourraient être désactivées.</translation> + <translation>Cet ordinateur ne satisfait pas certains des prérequis recommandés pour configurer %1.<br/>La configuration peut continuer, mais certaines fonctionnalités pourraient être désactivées.</translation> </message> <message> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="122"/> @@ -2562,7 +2567,7 @@ Sortie <message> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="160"/> <source>This program will ask you some questions and set up %2 on your computer.</source> - <translation>Ce programme va vous poser quelques questions et installer %2 sur votre ordinateur.</translation> + <translation>Ce programme va vous poser quelques questions et configurer %2 sur votre ordinateur.</translation> </message> <message> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="181"/> @@ -2657,8 +2662,8 @@ Sortie </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>Configurer les drapeaux sur la partition %2 de %1Mo.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation>Configurer les drapeaux sur la partition %2 de %1 Mio.</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2672,8 +2677,23 @@ Sortie </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>Réinitialisez les drapeaux sur la partition <strong>%2</strong> de %1Mo.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation>Réinitialisez les drapeaux sur la partition <strong>%2</strong> de %1Mio.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation>Marquer la partition <strong>%2</strong> de %1 Mio comme <strong>%3</strong>. </translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation>Réinitialisez les drapeaux sur la partition <strong>%2</strong> de %1 Mio.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation>Configuration des drapeaux <strong>%3</strong> pour la partition <strong>%2</strong> de %1 Mio.</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2686,11 +2706,6 @@ Sortie <translation>Marquer la partition <strong>%1</strong> comme <strong>%2</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Marquer la partition <strong>%2</strong> de %1Mo comme <strong>%3</strong>. </translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Marquer la nouvelle partition comme <strong>%1</strong>.</translation> @@ -2701,11 +2716,6 @@ Sortie <translation>Réinitialisation des drapeaux pour la partition <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>Réinitialisez les drapeaux sur la partition <strong>%2</strong> de %1Mo.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>Réinitialisez les drapeaux sur la nouvelle partition.</translation> @@ -2716,11 +2726,6 @@ Sortie <translation>Configuration des drapeaux <strong>%2</strong> pour la partition <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>Configuration des drapeaux <strong>%3</strong> pour la partition <strong>%2</strong> de %1Mo.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>Configuration des drapeaux <strong>%1</strong> pour la nouvelle partition.</translation> @@ -2834,7 +2839,7 @@ Sortie <message> <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/> <source>This is an overview of what will happen once you start the setup procedure.</source> - <translation>Ceci est un aperçu de ce qui va arriver lorsque vous commencerez l'installation.</translation> + <translation>Ceci est un aperçu de ce qui va arriver lorsque vous commencerez la configuration.</translation> </message> <message> <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/> @@ -2958,7 +2963,7 @@ Sortie <message> <location filename="../src/modules/users/UsersPage.cpp" line="120"/> <source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source> - <translation><small>si plusieurs personnes utilisent cet ordinateur, vous pourrez créer plusieurs comptes après l'installation.</small></translation> + <translation><small>si plusieurs personnes utilisent cet ordinateur, vous pourrez créer plusieurs comptes après la configuration.</small></translation> </message> <message> <location filename="../src/modules/users/UsersPage.cpp" line="126"/> @@ -3104,17 +3109,17 @@ Sortie <message> <location filename="../src/modules/welcome/WelcomePage.cpp" line="71"/> <source><h1>Welcome to the Calamares setup program for %1.</h1></source> - <translation><h1>Bienvenue dans l'installateur Calamares pour %1.</h1></translation> + <translation><h1>Bienvenue dans le programme de configuration Calamares pour %1.</h1></translation> </message> <message> <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/> <source><h1>Welcome to %1 setup.</h1></source> - <translation><h1>Bienvenue dans l'installation de %1.</h1></translation> + <translation><h1>Bienvenue dans la configuration de %1.</h1></translation> </message> <message> <location filename="../src/modules/welcome/WelcomePage.cpp" line="90"/> <source>About %1 setup</source> - <translation>À propos de l'installation de %1</translation> + <translation>À propos de la configuration de %1</translation> </message> <message> <location filename="../src/modules/welcome/WelcomePage.cpp" line="91"/> @@ -3135,7 +3140,7 @@ Sortie <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Bienvenue</translation> </message> diff --git a/lang/calamares_fr_CH.ts b/lang/calamares_fr_CH.ts index 0ced942d3..e46ce5ecb 100644 --- a/lang/calamares_fr_CH.ts +++ b/lang/calamares_fr_CH.ts @@ -97,7 +97,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation type="unfinished"/> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation type="unfinished"/> </message> @@ -429,124 +434,124 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -554,17 +559,17 @@ The installer will quit and all changes will be lost.</source> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation type="unfinished"/> </message> @@ -701,12 +706,12 @@ The installer will quit and all changes will be lost.</source> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1118,12 +1123,12 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> @@ -1131,27 +1136,27 @@ The installer will quit and all changes will be lost.</source> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation type="unfinished"/> </message> @@ -1160,12 +1165,12 @@ The installer will quit and all changes will be lost.</source> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1183,22 +1188,22 @@ The installer will quit and all changes will be lost.</source> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> + <source>has at least %1 GiB available drive space</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> + <source>There is not enough drive space. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> + <source>has at least %1 GiB working memory</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> @@ -1481,12 +1486,12 @@ The installer will quit and all changes will be lost.</source> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation type="unfinished"/> </message> @@ -1875,42 +1880,42 @@ The installer will quit and all changes will be lost.</source> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation type="unfinished"/> @@ -2295,7 +2300,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation type="unfinished"/> </message> @@ -2310,7 +2315,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation type="unfinished"/> @@ -2413,70 +2418,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2490,12 +2495,12 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> + <source>Resizing %2MiB partition %1 to %3MiB.</source> <translation type="unfinished"/> </message> <message> @@ -2651,7 +2656,7 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> + <source>Set flags on %1MiB %2 partition.</source> <translation type="unfinished"/> </message> <message> @@ -2666,7 +2671,22 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> <translation type="unfinished"/> </message> <message> @@ -2680,11 +2700,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation type="unfinished"/> @@ -2695,11 +2710,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation type="unfinished"/> @@ -2710,11 +2720,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation type="unfinished"/> @@ -3129,7 +3134,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation type="unfinished"/> </message> diff --git a/lang/calamares_gl.ts b/lang/calamares_gl.ts index 9e706e475..e7f7b9c95 100644 --- a/lang/calamares_gl.ts +++ b/lang/calamares_gl.ts @@ -98,7 +98,7 @@ <translation>Ferramentas</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Informe de depuración de erros.</translation> </message> @@ -106,7 +106,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Instalar</translation> </message> @@ -431,124 +436,124 @@ O instalador pecharase e perderanse todos os cambios.</translation> <translation><strong>Particionado manual</strong><br/> Pode crear o redimensionar particións pola súa conta.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Localización do cargador de arranque:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 será acurtada a %2MB e unha nova partición de %3MB será creada para %4</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Seleccione o dispositivo de almacenamento:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Actual:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Reutilizar %1 como partición home para %2</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Seleccione unha partición para acurtar, logo empregue a barra para redimensionala</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Seleccione unha partición para instalar</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>Non foi posible atopar unha partición de sistema de tipo EFI. Por favor, volva atrás e empregue a opción de particionado manual para crear unha en %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>A partición EFI do sistema en %1 será usada para iniciar %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>Partición EFI do sistema:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Esta unidade de almacenamento non semella ter un sistema operativo instalado nela. Que desexa facer?<br/>Poderá revisar e confirmar as súas eleccións antes de que calquera cambio sexa feito na unidade de almacenamento.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Borrar disco</strong><br/>Esto <font color="red">eliminará</font> todos os datos gardados na unidade de almacenamento seleccionada.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>A unidade de almacenamento ten %1 nela. Que desexa facer?<br/>Poderá revisar e confirmar a súa elección antes de que se aplique algún cambio á unidade.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Instalar a carón</strong><br/>O instalador encollerá a partición para facerlle sitio a %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Substituír a partición</strong><br/>Substitúe a partición con %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>Esta unidade de almacenamento xa ten un sistema operativo instalado nel. Que desexa facer?<br/>Poderá revisar e confirmar as súas eleccións antes de que calquera cambio sexa feito na unidade de almacenamento</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>Esta unidade de almacenamento ten múltiples sistemas operativos instalados nela. Que desexa facer?<br/>Poderá revisar e confirmar as súas eleccións antes de que calquera cambio sexa feito na unidade de almacenamento.</translation> </message> @@ -556,17 +561,17 @@ O instalador pecharase e perderanse todos os cambios.</translation> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Desmontar os volumes para levar a cabo as operacións de particionado en %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Desmontando os volumes para levar a cabo as operacións de particionado en %1.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Os volumes para %1 foron desmontados</translation> </message> @@ -703,13 +708,13 @@ O instalador pecharase e perderanse todos os cambios.</translation> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Crear unha nova partición de %2 MB en %4 (%3) empregando o sistema de arquivos %1.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Crear unha nova partición de <strong>%2 MB</strong> en <strong>%4<7strong>(%3) empregando o sistema de arquivos <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1120,12 +1125,12 @@ O instalador pecharase e perderanse todos os cambios.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>Fallou a instalación</h1><br/>%1 non se pudo instalar na sua computadora. <br/>A mensaxe de erro foi: %2.</translation> </message> @@ -1133,27 +1138,27 @@ O instalador pecharase e perderanse todos os cambios.</translation> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Fin</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Instalacion completa</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>Completouse a instalación de %1</translation> </message> @@ -1162,13 +1167,13 @@ O instalador pecharase e perderanse todos os cambios.</translation> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Formato da partición %1 (sistema de ficheiros: %2, tamaño: %3 MB) en %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>Formato <strong>%3MB</strong> partición <strong>%1</strong> con sistema de ficheiros <strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1185,23 +1190,23 @@ O instalador pecharase e perderanse todos os cambios.</translation> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>ten un mínimo de %1 GB de espazo de disco dispoñíbeis</translation> + <source>has at least %1 GiB available drive space</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>Non hai espazo abondo no disco. Precísanse cando menos %1 GB.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>ten cando menos %1 GB de memoria de traballo</translation> + <source>has at least %1 GiB working memory</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>O sistema non ten memoria de traballo abonda. Requírense cando menos %1 GB.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1483,12 +1488,12 @@ O instalador pecharase e perderanse todos os cambios.</translation> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Cargando datos de localización...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Localización...</translation> </message> @@ -1877,42 +1882,42 @@ O instalador pecharase e perderanse todos os cambios.</translation> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Raíz</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Cartafol persoal</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Arranque</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>Sistema EFI</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Intercambio</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Nova partición para %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Nova partición</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2300,7 +2305,7 @@ Saída: <translation>intercambio</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Espazo sen particionar ou táboa de particións descoñecida</translation> </message> @@ -2315,7 +2320,7 @@ Saída: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2418,70 +2423,70 @@ Saída: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation>Traballo de mudanza de tamaño do sistema de ficheiros</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>Configuración incorrecta</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation>O traballo de mudanza do tamaño do sistema de ficheiros ten unha configuración incorrecta e non vai ser executado.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation>KPMCore non está dispoñíbel</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation>Calamares non pode iniciar KPMCore para o traballo de mudanza do tamaño do sistema de ficheiros.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>Fallou a mudanza de tamaño</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation>Non foi posíbel atopar o sistema de ficheiros %1 neste sistema e non se pode mudar o seu tamaño.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation>Non foi posíbel atopar o dispositivo %1 neste sistema e non se pode mudar o seu tamaño.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation>Non é posíbel mudar o tamaño do sistema de ficheiros %1.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation>Non é posíbel mudar o tamaño do dispositivo %1.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation>Hai que mudar o tamaño do sistema de ficheiros %1 mais non é posíbel.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation>Hai que mudar o tamaño do dispositivo %1 mais non é posíbel</translation> </message> @@ -2495,13 +2500,13 @@ Saída: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>Redimensionar <strong>%2MB</strong> partición <strong>%1</strong> a <strong>%3MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Redimensionando %2MB %1 a %3MB.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2656,8 +2661,8 @@ Saída: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>Configurar as bandeiras na partición de %1MB %2.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2671,8 +2676,23 @@ Saída: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>Limpar as bandeiras da partición de %1MB <strong>%2</strong>.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2685,11 +2705,6 @@ Saída: <translation>Marcar a partición <strong>%1</strong> coa bandeira <strong>%2</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Marcar a partición de %1MB <strong>%2</strong> coa bandeira <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Marcar a nova partición coa bandeira <strong>%1</strong>.</translation> @@ -2700,11 +2715,6 @@ Saída: <translation>A limpar as bandeiras da partición <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>A limpar as bandeiras da partición de %1MB <strong>%2</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>A limpar as bandeiras da nova partición.</translation> @@ -2715,11 +2725,6 @@ Saída: <translation>A configurar as bandeiras <strong>%2</strong> na partición <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>A configurar as bandeiras <strong>%3</strong> na partición de %1MB <strong>%2</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>A configurar as bandeiras <strong>%1</strong> na nova partición.</translation> @@ -3134,7 +3139,7 @@ Saída: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Benvido</translation> </message> diff --git a/lang/calamares_gu.ts b/lang/calamares_gu.ts index d009a11d2..e5d043daf 100644 --- a/lang/calamares_gu.ts +++ b/lang/calamares_gu.ts @@ -97,7 +97,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation type="unfinished"/> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation type="unfinished"/> </message> @@ -429,124 +434,124 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -554,17 +559,17 @@ The installer will quit and all changes will be lost.</source> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation type="unfinished"/> </message> @@ -701,12 +706,12 @@ The installer will quit and all changes will be lost.</source> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1118,12 +1123,12 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> @@ -1131,27 +1136,27 @@ The installer will quit and all changes will be lost.</source> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation type="unfinished"/> </message> @@ -1160,12 +1165,12 @@ The installer will quit and all changes will be lost.</source> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1183,22 +1188,22 @@ The installer will quit and all changes will be lost.</source> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> + <source>has at least %1 GiB available drive space</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> + <source>There is not enough drive space. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> + <source>has at least %1 GiB working memory</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> @@ -1481,12 +1486,12 @@ The installer will quit and all changes will be lost.</source> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation type="unfinished"/> </message> @@ -1875,42 +1880,42 @@ The installer will quit and all changes will be lost.</source> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation type="unfinished"/> @@ -2295,7 +2300,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation type="unfinished"/> </message> @@ -2310,7 +2315,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation type="unfinished"/> @@ -2413,70 +2418,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2490,12 +2495,12 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> + <source>Resizing %2MiB partition %1 to %3MiB.</source> <translation type="unfinished"/> </message> <message> @@ -2651,7 +2656,7 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> + <source>Set flags on %1MiB %2 partition.</source> <translation type="unfinished"/> </message> <message> @@ -2666,7 +2671,22 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> <translation type="unfinished"/> </message> <message> @@ -2680,11 +2700,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation type="unfinished"/> @@ -2695,11 +2710,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation type="unfinished"/> @@ -2710,11 +2720,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation type="unfinished"/> @@ -3129,7 +3134,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation type="unfinished"/> </message> diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts index 63788b022..57dd7fae0 100644 --- a/lang/calamares_he.ts +++ b/lang/calamares_he.ts @@ -97,7 +97,7 @@ <translation>כלים</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>מידע על ניפוי שגיאות</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation>הקמה</translation> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>התקנה</translation> </message> @@ -431,124 +436,124 @@ The installer will quit and all changes will be lost.</source> <translation><strong>הגדרת מחיצות באופן ידני</strong><br/>ניתן ליצור או לשנות את גודל המחיצות בעצמך.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>מיקום מנהל אתחול המערכת:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 תוקטן לכדי %2 מ״ב ותיווצר מחיצה חדשה בגודל %3 מ״ב עבור %4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>בחירת התקן א&חסון:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>נוכחי:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>להשתמש ב־%1 כמחיצת הבית (home) עבור %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>ראשית יש לבחור מחיצה לכיווץ, לאחר מכן לגרור את הסרגל התחתון כדי לשנות את גודלה</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation>%1 תכווץ לכדי %2MiB ותיווצר מחיצה חדשה בגודל %3MiB עבור %4.</translation> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>נא לבחור מחיצה כדי להתקין עליה</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>במערכת זו לא נמצאה מחיצת מערכת EFI. נא לחזור ולהשתמש ביצירת מחיצות באופן ידני כדי להגדיר את %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>מחיצת מערכת ה־EFI שב־%1 תשמש עבור טעינת %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>מחיצת מערכת EFI:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>לא נמצאה מערכת הפעלה על התקן אחסון זה. מה ברצונך לעשות?<br/> ניתן לסקור ולאשר את בחירתך לפני ששינויים יתבצעו על התקן האחסון.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>מחיקת כונן</strong><br/> פעולה זו <font color="red">תמחק</font> את כל המידע השמור על התקן האחסון הנבחר.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>בהתקן אחסון זה נמצאה %1. מה ברצונך לעשות?<br/> ניתן לסקור ולאשר את בחירתך לפני ששינויים יתבצעו על התקן האחסון.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation>בלי החלפה</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation>שימוש מחדש בהחלפה</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation>החלפה (ללא תרדמת)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation>החלפה (עם תרדמת)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation>החלפה לקובץ</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>התקנה לצד</strong><br/> אשף ההתקנה יכווץ מחיצה כדי לפנות מקום לטובת %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>החלפת מחיצה</strong><br/> ביצוע החלפה של המחיצה ב־%1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>כבר קיימת מערכת הפעלה על התקן האחסון הזה. כיצד להמשיך?<br/> ניתן לסקור ולאשר את בחירתך לפני ששינויים יתבצעו על התקן האחסון.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>ישנן מגוון מערכות הפעלה על התקן אחסון זה. איך להמשיך? <br/>ניתן לסקור ולאשר את בחירתך לפני ששינויים יתבצעו על התקן האחסון.</translation> </message> @@ -556,17 +561,17 @@ The installer will quit and all changes will be lost.</source> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>מחיקת נקודות עיגון עבור פעולות חלוקה למחיצות על %1.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>מתבצעת מחיקה של נקודות עיגון לטובת פעולות חלוקה למחיצות על %1.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>כל נקודות העיגון על %1 נמחקו.</translation> </message> @@ -703,13 +708,13 @@ The installer will quit and all changes will be lost.</source> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>יצירת מחיצה חדשה בגודל של %2 מ״ב על גבי %4 (%3) עם מערכת הקבצים %1.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation>יצירת מחיצה חדשה בגודל %2MiB על גבי %4 (%3) עם מערכת הקבצים %1.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>צור מחיצה חדשה בגודל <strong>%2 MB</strong> על <strong>%4</strong> (%3) עם מערכת קבצים <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation>יצירת מחיצה חדשה בגודל <strong>%2MiB</strong> על גבי <strong>%4</strong> (%3) עם מערכת הקבצים <strong>%1</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1120,12 +1125,12 @@ The installer will quit and all changes will be lost.</source> <translation><html><head/><body><p>אם תיבה זו מסומנת, המערכת שלך תופעל מחדש מיידית עם הלחיצה על <span style="font-style:italic;">סיום</span> או עם סגירת תכנית ההתקנה.</p></body></html></translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation><h1>ההתקנה נכשלה</h1><br/>ההתקנה של %1 במחשבך לא הושלמה.<br/>הודעת השגיאה הייתה: %2.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>ההתקנה נכשלה</h1><br/>%1 לא הותקן על מחשבך.<br/> הודעת השגיאה: %2.</translation> </message> @@ -1133,27 +1138,27 @@ The installer will quit and all changes will be lost.</source> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>סיום</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation>ההתקנה הושלמה</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>ההתקנה הושלמה</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation>התקנת %1 הושלמה.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>ההתקנה של %1 הושלמה.</translation> </message> @@ -1162,13 +1167,13 @@ The installer will quit and all changes will be lost.</source> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>אתחול מחיצה %1 (מערכת קבצים: %2, גודל: %3 מ״ב) על %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation>לאתחל את המחיצה %1 (מערכת קבצים: %2, גודל: %3 MiB) על גבי %4.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>אתחול מחיצה <strong>%1</strong> בגודל <strong>%3 מ״ב</strong> עם מערכת קבצים <strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation>אתחול מחיצה בגודל <strong>%3MiB</strong> בנתיב <strong>%1</strong> עם מערכת הקבצים <strong>%2</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1185,23 +1190,23 @@ The installer will quit and all changes will be lost.</source> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>עם %1 ג״ב של נפח אחסון לפחות</translation> + <source>has at least %1 GiB available drive space</source> + <translation>יש לפחות %1 GiB פנויים בכונן</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>נפח האחסון לא מספיק. נדרשים %1 ג״ב לפחות.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation>נפח האחסון לא מספיק. נדרשים %1 GiB לפחות.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>עם %1 ג״ב של זכרון פעולה לפחות</translation> + <source>has at least %1 GiB working memory</source> + <translation>יש לפחות %1 GiB זיכרון לעבודה</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>כמות הזיכרון הנדרשת לפעולה אינה מספיקה. נדרשים %1 ג״ב לפחות.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation>כמות הזיכרון הנדרשת לפעולה אינה מספיקה. נדרשים %1 GiB לפחות.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1483,12 +1488,12 @@ The installer will quit and all changes will be lost.</source> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>הנתונים על המיקום נטענים…</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>מיקום</translation> </message> @@ -1877,42 +1882,42 @@ The installer will quit and all changes will be lost.</source> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>מערכת הפעלה Root</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>בית Home</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>טעינה Boot</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>מערכת EFI</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>דפדוף Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>מחיצה חדשה עבור %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>מחיצה חדשה</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2300,7 +2305,7 @@ Output: <translation>דפדוף, swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>הזכרון לא מחולק למחיצות או שטבלת המחיצות אינה מוכרת</translation> </message> @@ -2315,7 +2320,7 @@ Output: <translation>בדיקת הדרישות למודול <i>%1</i> הושלמה.</translation> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2418,70 +2423,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation>משימת שינוי גודל מערכת קבצים</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>תצורה שגויה</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation>למשימת שינוי גודל מערכת הקבצים יש תצורה שגויה והיא לא תפעל.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation>KPMCore לא זמין</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation>ל־Calamares אין אפשרות להתחיל את KPMCore עבור משימת שינוי גודל מערכת הקבצים.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>שינוי הגודל נכשל</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation>לא הייתה אפשרות למצוא את מערכת הקבצים %1 במערכת הזו, לכן לא ניתן לשנות את גודלה.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation>לא הייתה אפשרות למצוא את ההתקן %1 במערכת הזו, לכן לא ניתן לשנות את גודלו.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation>לא ניתן לשנות את גודל מערכת הקבצים %1.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation>לא ניתן לשנות את גודל ההתקן %1.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation>חובה לשנות את גודל מערכת הקבצים %1, אך לא ניתן.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation>חובה לשנות את גודל ההתקן %1, אך לא ניתן.</translation> </message> @@ -2495,13 +2500,13 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>משנה את מחיצה <strong>%1</strong> מגודל <strong>%2 MB</strong> ל <strong>%3 MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation>שינוי גודל של מחיצה בגודל <strong>%2MiB</strong> בנתיב <strong>%1</strong> לכדי <strong>%3MiB</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>משנה את מחיצה %1 מ %2 MB ל %3 MB.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation>משתנה הגודל של מחיצה %1 בגודל %2MiB לכדי %3MiB.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2656,8 +2661,8 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>הגדר סימונים על מחיצה %2 בגודל %1 MB.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation>הגדרת דגלונים על מחיצה מסוג %2 בגודל %1MiB.</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2671,8 +2676,23 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>מחק סימונים על מחיצה <strong>%2</strong> בגודל %1 MB.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation>לבטל דגלונים על מחיצת <strong>%2</strong> בגודל %1MiB.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation>סימון מחיצת <strong>%2</strong> בגודל %1MiB בתור <strong>%3</strong>.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation>לבטל דגלונים על מחיצת <strong>%2</strong> בגודל %1MiB.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation>הדגלונים <strong>%3</strong> על מחיצת <strong>%2</strong> בגודל %1MiB.</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2685,11 +2705,6 @@ Output: <translation>סמן מחיצה <strong>%1</strong> כ <strong>%2</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>סמן מחיצה <strong>%2</strong> בגודל %1 MB כ <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>סמן מחיצה חדשה כ <strong>%1</strong>.</translation> @@ -2700,11 +2715,6 @@ Output: <translation>מוחק סימונים על מחיצה <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>מוחק סימונים על מחיצה <strong>%2</strong> בגודל %1 MB.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>מוחק סימונים על מחיצה חדשה.</translation> @@ -2715,11 +2725,6 @@ Output: <translation>מגדיר סימונים <strong>%2</strong> על מחיצה <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>מגדיר סימונים <strong>%3</strong> על מחיצה <strong>%2</strong> בגודל %1 MB.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>מגדיר סימונים <strong>%1</strong> על מחיצה חדשה.</translation> @@ -3134,7 +3139,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>ברוך בואך</translation> </message> diff --git a/lang/calamares_hi.ts b/lang/calamares_hi.ts index fb5e7d1e6..b6b1d0172 100644 --- a/lang/calamares_hi.ts +++ b/lang/calamares_hi.ts @@ -97,7 +97,7 @@ <translation>साधन</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>डीबग संबंधी जानकारी</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>इंस्टॉल करें</translation> </message> @@ -430,124 +435,124 @@ The installer will quit and all changes will be lost.</source> <translation><strong>मैनुअल विभाजन</strong><br/> आप स्वयं भी विभाजन बना व उनका आकार बदल सकते है।</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>बूट लोडर का स्थान:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 को छोटा करके %2MB किया जाएगा व %4 के लिए %3MB का एक नया विभाजन बनेगा।</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>डिवाइस चुनें (&v):</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>मौजूदा :</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>%2 के होम विभाजन के लिए %1 को पुनः उपयोग करें।</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>छोटा करने के लिए विभाजन चुनें, फिर नीचे bar से उसका आकर सेट करें</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>इंस्टॉल के लिए विभाजन चुनें</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>इस सिस्टम पर कहीं भी कोई EFI सिस्टम विभाजन नहीं मिला। कृपया वापस जाएँ व %1 को सेट करने के लिए मैनुअल रूप से विभाजन करें।</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>%1 वाले EFI सिस्टम विभाजन का उपयोग %2 को शुरू करने के लिए किया जाएगा।</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>EFI सिस्टम विभाजन:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>इस डिवाइस पर लगता है कि कोई ऑपरेटिंग सिस्टम नहीं है। आप क्या करना चाहेंगे?<br/>आप डिवाइस में किसी भी बदलाव से पहले उसकी समीक्षा व पुष्टि कर सकेंगे।</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>डिस्क का सारा डाटा हटाएँ</strong><br/>इससे चयनित डिवाइस पर मौजूद सारा डाटा <font color="red">हटा</font>हो जाएगा।</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>इस डिवाइस पर %1 है। आप क्या करना चाहेंगे?<br/>आप डिवाइस में किसी भी बदलाव से पहले उसकी समीक्षा व पुष्टि कर सकेंगे।</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>साथ में इंस्टॉल करें</strong><br/>इंस्टॉलर %1 के लिए स्थान बनाने हेतु एक विभाजन को छोटा कर देगा।</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>विभाजन को बदलें</strong><br/>एक विभाजन को %1 से बदलें।</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>इस डिवाइस पर पहले से एक ऑपरेटिंग सिस्टम है। आप क्या करना चाहेंगे?<br/>आप डिवाइस में किसी भी बदलाव से पहले उसकी समीक्षा व पुष्टि कर सकेंगे।</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>इस डिवाइस पर एक से अधिक ऑपरेटिंग सिस्टम है। आप क्या करना चाहेंगे?<br/>आप डिवाइस में किसी भी बदलाव से पहले उसकी समीक्षा व पुष्टि कर सकेंगे।</translation> </message> @@ -555,17 +560,17 @@ The installer will quit and all changes will be lost.</source> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>%1 पर विभाजन कार्य हेतु माउंट हटाएँ</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>%1 पर विभाजन कार्य हेतु माउंट हटाएँ जा रहे हैं।</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>%1 के लिए सभी माउंट हटा दिए गए</translation> </message> @@ -702,13 +707,13 @@ The installer will quit and all changes will be lost.</source> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>फ़ाइल सिस्टम %1 के साथ %4 (%3) पर नया %2MB का विभाजन बनाएँ।</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>फ़ाइल सिस्टम <strong>%1</strong> के साथ <strong>%4</strong> (%3) पर नया <strong>%2MB</strong> का विभाजन बनाएँ।</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1119,12 +1124,12 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>इंस्टॉल विफल रहा</h1><br/>%1 आपके कंप्यूटर पर इंस्टॉल नहीं हुआ।<br/>त्रुटि संदेश : %2।</translation> </message> @@ -1132,27 +1137,27 @@ The installer will quit and all changes will be lost.</source> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>समाप्त करें</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>इंस्टॉल पूर्ण हुआ</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>%1 का इंस्टॉल पूर्ण हुआ।</translation> </message> @@ -1161,13 +1166,13 @@ The installer will quit and all changes will be lost.</source> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>विभाजन %1 (फ़ाइल सिस्टम: %2, आकार: %3MB) को %4 पर फॉर्मेट करें।</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>फ़ाइल सिस्टम <strong>%2</strong> के साथ <strong>%3MB</strong> के विभाजन <strong>%1</strong> को फॉर्मेट करें।</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1184,23 +1189,23 @@ The installer will quit and all changes will be lost.</source> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>%1GB स्पेस ड्राइव पर उपलब्ध है</translation> + <source>has at least %1 GiB available drive space</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>ड्राइव में पर्याप्त स्पेस नहीं है। कम-से-कम %1GB होना ज़रूरी है।</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>%1GB मेमोरी है</translation> + <source>has at least %1 GiB working memory</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>सिस्टम में पर्याप्त मेमोरी नहीं है। कम-से-कम %1GB होनी ज़रूरी है।</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1482,12 +1487,12 @@ The installer will quit and all changes will be lost.</source> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>स्थान संबंधी डाटा लोड किया जा रहा है...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>स्थान</translation> </message> @@ -1876,42 +1881,42 @@ The installer will quit and all changes will be lost.</source> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>रुट</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>होम</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>बूट</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>EFI सिस्टम</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>स्वैप</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>%1 के लिए नया विभाजन</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>नया विभाजन</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2299,7 +2304,7 @@ Output: <translation>स्वैप</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>अविभाजित स्पेस या अज्ञात विभाजन तालिका</translation> </message> @@ -2314,7 +2319,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2417,70 +2422,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2494,13 +2499,13 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation><strong>%2MB</strong> के <strong>%1</strong> विभाजन का आकार बदलकर <strong>%3MB</strong> किया जा रहा है।</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>%2MB के %1 विभाजन का आकार बदलकर %3MB किया जा रहा है।</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2655,8 +2660,8 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>%1MB के %2 विभाजन पर flag सेट करें।</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2670,8 +2675,23 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>%1MB के <strong>%2</strong> विभाजन पर से flag हटाएँ।</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2684,11 +2704,6 @@ Output: <translation><strong>%1</strong> विभाजन पर <strong>%2</strong> का flag लगाएँ।</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>%1MB के <strong>%2</strong> विभाजन पर <strong>%3</strong> का flag लगाएँ।</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>नए विभाजन पर<strong>%1</strong>का flag लगाएँ।</translation> @@ -2699,11 +2714,6 @@ Output: <translation><strong>%1</strong> विभाजन पर से flag हटाएँ जा रहे हैं।</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>%1MB के <strong>%2</strong> विभाजन पर से flag हटाएँ जा रहे हैं।</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>नए विभाजन पर से flag हटाएँ जा रहे हैं।</translation> @@ -2714,11 +2724,6 @@ Output: <translation><strong>%1</strong> विभाजन पर flag <strong>%2</strong> सेट किए जा रहे हैं।</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>%1MB के <strong>%2</strong> विभाजन पर flag <strong>%3</strong> सेट किए जा रहे हैं।</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>नए विभाजन पर flag <strong>%1</strong> सेट किए जा रहे हैं।</translation> @@ -3133,7 +3138,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>स्वागतं </translation> </message> diff --git a/lang/calamares_hr.ts b/lang/calamares_hr.ts index beaeb72f9..f758dcf09 100644 --- a/lang/calamares_hr.ts +++ b/lang/calamares_hr.ts @@ -97,7 +97,7 @@ <translation>Alati</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Debug informacija</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation>Postaviti</translation> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Instaliraj</translation> </message> @@ -431,124 +436,124 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio <translation><strong>Ručno particioniranje</strong><br/>Možete sami stvoriti ili promijeniti veličine particija.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Lokacija boot učitavača:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 će se smanjiti na %2MB i stvorit će se nova %3MB particija za %4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Odaberi uređaj za spremanje:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Trenutni:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Koristi %1 kao home particiju za %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Odaberite particiju za smanjivanje, te povlačenjem donjeg pokazivača odaberite promjenu veličine</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation>%1 će se smanjiti na %2MB i stvorit će se nova %3MB particija za %4.</translation> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Odaberite particiju za instalaciju</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>EFI particija ne postoji na ovom sustavu. Vratite se natrag i koristite ručno particioniranje da bi ste postavili %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>EFI particija na %1 će se koristiti za pokretanje %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>EFI particija:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Izgleda da na ovom disku nema operacijskog sustava. Što želite učiniti?<br/>Moći ćete provjeriti i potvrditi vaš odabir prije bilo kakvih promjena na disku.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Obriši disk</strong><br/>To će <font color="red">obrisati</font> sve podatke na odabranom disku.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>Ovaj disk ima %1. Što želite učiniti?<br/>Moći ćete provjeriti i potvrditi vaš odabir prije bilo kakvih promjena na disku.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation>Bez swap-a</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation>Iskoristi postojeći swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation>Swap (bez hibernacije)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation>Swap (sa hibernacijom)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation>Swap datoteka</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Instaliraj uz postojeće</strong><br/>Instalacijski program će smanjiti particiju da bi napravio mjesto za %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Zamijeni particiju</strong><br/>Zamijenjuje particiju sa %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>Ovaj disk već ima operacijski sustav. Što želite učiniti?<br/>Moći ćete provjeriti i potvrditi vaš odabir prije bilo kakvih promjena na disku.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>Ovaj disk ima više operacijskih sustava. Što želite učiniti?<br/>Moći ćete provjeriti i potvrditi vaš odabir prije bilo kakvih promjena na disku.</translation> </message> @@ -556,17 +561,17 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Ukloni montiranja za operacije s particijama na %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Uklanjam montiranja za operacija s particijama na %1.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Uklonjena sva montiranja za %1</translation> </message> @@ -703,12 +708,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> <translation>Stvori novu %2MB particiju na %4 (%3) s datotečnim sustavom %1.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> <translation>Stvori novu <strong>%2MB</strong> particiju na <strong>%4</strong> (%3) s datotečnim sustavom <strong>%1</strong>.</translation> </message> <message> @@ -1120,12 +1125,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio <translation><html><head/><body><p>Kada je odabrana ova opcija, vaš sustav će se ponovno pokrenuti kada kliknete na <span style="font-style:italic;">Gotovo</span> ili zatvorite instalacijski program.</p></body></html></translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation><h1>Instalacija nije uspijela</h1><br/>%1 nije instaliran na vaše računalo.<br/>Greška: %2.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>Instalacija nije uspijela</h1><br/>%1 nije instaliran na vaše računalo.<br/>Greška: %2.</translation> </message> @@ -1133,27 +1138,27 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Završi</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation>Instalacija je završena</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Instalacija je završena</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation>Instalacija %1 je završena.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>Instalacija %1 je završena.</translation> </message> @@ -1162,12 +1167,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> <translation>Formatiraj particiju %1 (datotečni sustav: %2, veličina: %3 MB) na %4.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> <translation>Formatiraj <strong>%3MB</strong>particiju <strong>%1</strong> na datotečni sustav <strong>%2</strong>.</translation> </message> <message> @@ -1185,22 +1190,22 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> + <source>has at least %1 GiB available drive space</source> <translation>ima barem %1 GB dostupne slobodne memorije na disku</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> + <source>There is not enough drive space. At least %1 GiB is required.</source> <translation>Nema dovoljno prostora na disku. Potrebno je najmanje %1 GB.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> + <source>has at least %1 GiB working memory</source> <translation>ima barem %1 GB radne memorije</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> <translation>Ovaj sustav nema dovoljno radne memorije. Potrebno je najmanje %1 GB.</translation> </message> <message> @@ -1483,12 +1488,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Učitavanje podataka o lokaciji...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Lokacija</translation> </message> @@ -1877,42 +1882,42 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Root</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Home</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Boot</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>EFI sustav</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Nova particija za %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Nova particija</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2300,7 +2305,7 @@ Izlaz: <translation>swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Ne particionirani prostor ili nepoznata particijska tablica</translation> </message> @@ -2315,7 +2320,7 @@ Izlaz: <translation>Provjera zahtjeva za modul <i>%1</i> je dovršena.</translation> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2418,70 +2423,70 @@ Izlaz: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation>Promjena veličine datotečnog sustava</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>Nevažeća konfiguracija</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation>Promjena veličine datotečnog sustava ima nevažeću konfiguraciju i neće se pokrenuti.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation>KPMCore nije dostupan</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation>Calamares ne može pokrenuti KPMCore za promjenu veličine datotečnog sustava.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>Promjena veličine nije uspjela</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation>Datotečni sustav % 1 nije moguće pronaći na ovom sustavu i ne može mu se promijeniti veličina.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation>Uređaj % 1 nije moguće pronaći na ovom sustavu i ne može mu se promijeniti veličina.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation>Datotečnom sustavu %1 se ne može promijeniti veličina.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation>Uređaju %1 se ne može promijeniti veličina.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation>Datotečnom sustavu %1 se ne može promijeniti veličina iako bi se trebala.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation>Uređaju %1 se ne može promijeniti veličina iako bi se trebala.</translation> </message> @@ -2495,12 +2500,12 @@ Izlaz: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> <translation>Promijeni veličinu od <strong>%2MB</strong> particije <strong>%1</strong> na <strong>%3MB</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> + <source>Resizing %2MiB partition %1 to %3MiB.</source> <translation>Mijenjam veličinu od %2MB particije %1 na %3MB.</translation> </message> <message> @@ -2656,7 +2661,7 @@ Izlaz: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> + <source>Set flags on %1MiB %2 partition.</source> <translation>Postavi oznake na %1MB %2 particiji.</translation> </message> <message> @@ -2671,10 +2676,25 @@ Izlaz: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> <translation>Obriši oznake na %1MB <strong>%2</strong> particiji.</translation> </message> <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation>Označi %1MB <strong>%2</strong> particiju kao <strong>%3</strong>.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation>Brišem oznake na %1MB <strong>%2</strong> particiji.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation>Postavljam oznake <strong>%3</strong> na %1MB <strong>%2</strong> particiji.</translation> + </message> + <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> <source>Clear flags on new partition.</source> <translation>Obriši oznake na novoj particiji.</translation> @@ -2685,11 +2705,6 @@ Izlaz: <translation>Označi particiju <strong>%1</strong> kao <strong>%2</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Označi %1MB <strong>%2</strong> particiju kao <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Označi novu particiju kao <strong>%1</strong>.</translation> @@ -2700,11 +2715,6 @@ Izlaz: <translation>Brišem oznake na particiji <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>Brišem oznake na %1MB <strong>%2</strong> particiji.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>Brišem oznake na novoj particiji.</translation> @@ -2715,11 +2725,6 @@ Izlaz: <translation>Postavljam oznake <strong>%2</strong> na particiji <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>Postavljam oznake <strong>%3</strong> na %1MB <strong>%2</strong> particiji.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>Postavljam oznake <strong>%1</strong> na novoj particiji.</translation> @@ -3134,7 +3139,7 @@ Izlaz: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Dobrodošli</translation> </message> diff --git a/lang/calamares_hu.ts b/lang/calamares_hu.ts index c510ab62d..09a0f4d51 100644 --- a/lang/calamares_hu.ts +++ b/lang/calamares_hu.ts @@ -97,7 +97,7 @@ <translation>Eszközök</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Hibakeresési információk</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation>Összeállítás</translation> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Telepít</translation> </message> @@ -115,12 +120,12 @@ <message> <location filename="../src/libcalamares/JobExample.cpp" line="39"/> <source>Job failed (%1)</source> - <translation type="unfinished"/> + <translation>Művelet nem sikerült (%1)</translation> </message> <message> <location filename="../src/libcalamares/JobExample.cpp" line="39"/> <source>Programmed job failure was explicitly requested.</source> - <translation type="unfinished"/> + <translation>Kifejezetten kért programozott műveleti hiba.</translation> </message> </context> <context> @@ -136,7 +141,7 @@ <message> <location filename="../src/libcalamares/JobExample.cpp" line="27"/> <source>Example job (%1)</source> - <translation type="unfinished"/> + <translation>Mintapélda (%1)</translation> </message> </context> <context> @@ -190,17 +195,17 @@ <message numerus="yes"> <location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="147"/> <source>Waiting for %n module(s).</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>Várakozás a %n modulokra.</numerusform><numerusform>Várakozás %n modulokra. </numerusform></translation> </message> <message numerus="yes"> <location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="148"/> <source>(%n second(s))</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>(%n másodperc)</numerusform><numerusform>(%n másodperc)</numerusform></translation> </message> <message> <location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="152"/> <source>System-requirements checking is complete.</source> - <translation type="unfinished"/> + <translation>Rendszerkövetelmények ellenőrzése kész.</translation> </message> </context> <context> @@ -226,7 +231,7 @@ <location filename="../src/libcalamaresui/ViewManager.cpp" line="80"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="313"/> <source>Cancel setup without changing the system.</source> - <translation type="unfinished"/> + <translation>Telepítés megszakítása a rendszer módosítása nélkül.</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="81"/> @@ -237,7 +242,7 @@ <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="167"/> <source>Setup Failed</source> - <translation type="unfinished"/> + <translation>Telepítési hiba</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="192"/> @@ -257,22 +262,22 @@ <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="252"/> <source>Continue with installation?</source> - <translation type="unfinished"/> + <translation>Folytatja a telepítést?</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="254"/> <source>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></source> - <translation type="unfinished"/> + <translation>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></translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="261"/> <source>&Set up now</source> - <translation type="unfinished"/> + <translation>&Telepítés most</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="307"/> <source>&Set up</source> - <translation type="unfinished"/> + <translation>&Telepítés</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="308"/> @@ -282,12 +287,12 @@ <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="310"/> <source>Setup is complete. Close the setup program.</source> - <translation type="unfinished"/> + <translation>Telepítés sikerült. Zárja be a telepítőt.</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="372"/> <source>Cancel setup?</source> - <translation type="unfinished"/> + <translation>Megszakítja a telepítést?</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="373"/> @@ -298,7 +303,8 @@ <location filename="../src/libcalamaresui/ViewManager.cpp" line="375"/> <source>Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost.</source> - <translation type="unfinished"/> + <translation>Valóban megszakítod a telepítési eljárást? +A telepítő ki fog lépni és minden változtatás elveszik.</translation> </message> <message> <location filename="../src/libcalamaresui/ViewManager.cpp" line="377"/> @@ -391,7 +397,7 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation> <message> <location filename="../src/calamares/CalamaresWindow.cpp" line="61"/> <source>%1 Setup Program</source> - <translation type="unfinished"/> + <translation>%1 Program telepítése</translation> </message> <message> <location filename="../src/calamares/CalamaresWindow.cpp" line="62"/> @@ -430,124 +436,124 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation> <translation><strong>Manuális partícionálás</strong><br/>Létrehozhat vagy átméretezhet partíciókat.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Rendszerbetöltő helye:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 lesz zsugorítva %2MB méretűre és egy új %3MB méretű partíció lesz létrehozva itt %4</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Válassz tároló eszközt:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Aktuális:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>%1 partíció használata mint home partíció a %2 -n</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Válaszd ki a partíciót amit zsugorítani akarsz és egérrel méretezd át.</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation>%1 zsugorítva lesz %2MiB -re és új %3MiB partíció lesz létrehozva itt %4.</translation> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Válaszd ki a telepítésre szánt partíciót </strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>Nem található EFI partíció a rendszeren. Menj vissza a manuális partícionáláshoz és állíts be %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>A %1 EFI rendszer partíció lesz használva %2 indításához.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>EFI rendszerpartíció:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Úgy tűnik ezen a tárolóeszközön nincs operációs rendszer. Mit szeretnél csinálni?<br/>Lehetőséged lesz átnézni és megerősíteni a választásod mielőtt bármilyen változtatás történik a tárolóeszközön.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Lemez törlése</strong><br/>Ez <font color="red">törölni</font> fogja a lemezen levő összes adatot.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>Ezen a tárolóeszközön %1 található. Mit szeretnél tenni?<br/>Lehetőséged lesz átnézni és megerősíteni a választásod mielőtt bármilyen változtatás történik a tárolóeszközön.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> - <translation type="unfinished"/> + <translation>Swap nélkül</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> - <translation type="unfinished"/> + <translation>Swap újrahasználata</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> - <translation type="unfinished"/> + <translation>Swap (nincs hibernálás)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> - <translation type="unfinished"/> + <translation>Swap (hibernálással)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> - <translation type="unfinished"/> + <translation>Swap fájlba</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Meglévő mellé telepíteni</strong><br/>A telepítő zsugorítani fogja a partíciót, hogy elférjen a %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>A partíció lecserélése</strong> a következővel: %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>Ez a tárolóeszköz már tartalmaz egy operációs rendszert. Mit szeretnél tenni?<br/>Lehetőséged lesz átnézni és megerősíteni a választásod mielőtt bármilyen változtatás történik a tárolóeszközön.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>A tárolóeszközön több operációs rendszer található. Mit szeretnél tenni?<br/>Lehetőséged lesz átnézni és megerősíteni a választásod mielőtt bármilyen változtatás történik a tárolóeszközön.</translation> </message> @@ -555,17 +561,17 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>%1 csatolás törlése partícionáláshoz</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>%1 csatolás törlése partícionáláshoz</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>%1 minden csatolása törölve</translation> </message> @@ -702,13 +708,13 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Új %2MB- os partíció létrehozása a %4 (%3) eszközön %1 fájlrendszerrel.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation>Új partíció létrehozása %2MiB partíción a %4 (%3) %1 fájlrendszerrel</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Új <strong>%2MB</strong>- os partíció létrehozása a </strong>%4</strong> (%3) eszközön <strong>%1</strong> fájlrendszerrel.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation>Új <strong>%2MiB </strong>partíció létrehozása itt <strong>%4</strong> (%3) fájlrendszer típusa <strong>%1</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -815,7 +821,7 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation> <message> <location filename="../src/modules/partition/gui/CreateVolumeGroupDialog.cpp" line="37"/> <source>Create Volume Group</source> - <translation type="unfinished"/> + <translation>Kötetcsoport létrehozása</translation> </message> </context> <context> @@ -1091,7 +1097,7 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation> <message> <location filename="../src/modules/finished/FinishedPage.ui" line="95"/> <source><Restart checkbox tooltip></source> - <translation type="unfinished"/> + <translation><Restart checkbox tooltip></translation> </message> <message> <location filename="../src/modules/finished/FinishedPage.ui" line="98"/> @@ -1101,12 +1107,12 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation> <message> <location filename="../src/modules/finished/FinishedPage.cpp" line="54"/> <source><h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system.</source> - <translation type="unfinished"/> + <translation><h1>Minden kész.</h1><br/>%1 telepítve lett a számítógépére. <br/>Most már használhatja az új rendszert.</translation> </message> <message> <location filename="../src/modules/finished/FinishedPage.cpp" line="58"/> <source><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></source> - <translation type="unfinished"/> + <translation><html><head/><body><p>Ezt bejelölve a rendszer újra fog indulni amikor a <span style="font-style:italic;">Kész</span> gombra kattint vagy bezárja a telepítőt.</p></body></html> </translation> </message> <message> <location filename="../src/modules/finished/FinishedPage.cpp" line="66"/> @@ -1116,15 +1122,15 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation> <message> <location filename="../src/modules/finished/FinishedPage.cpp" line="71"/> <source><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></source> - <translation type="unfinished"/> + <translation><html><head/><body><p>Ezt bejelölve a rendszer újra fog indulni amikor a <span style="font-style:italic;">Kész</span>gombra kattint vagy bezárja a telepítőt.</p></body></html></translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> - <translation type="unfinished"/> + <translation><h1>Telepítés nem sikerült</h1><br/>%1 nem lett telepítve a számítógépére. <br/>A hibaüzenet: %2.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>A telepítés hibába ütközött.</h1><br/>%1 nem lett telepítve a számítógépre.<br/>A hibaüzenet: %2.</translation> </message> @@ -1132,27 +1138,27 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Befejezés</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> - <translation type="unfinished"/> + <translation>Telepítés Sikerült</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>A telepítés befejeződött.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> - <translation type="unfinished"/> + <translation>A telepítésből %1 van kész.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>A %1 telepítése elkészült.</translation> </message> @@ -1161,13 +1167,13 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Partíció formázása %1 (fájlrendszer: %2, méret: %3 MB) a %4 -on.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation>Partíció formázása %1 (fájlrendszer: %2, méret: %3 MiB) itt %4</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation><strong>%3MB</strong> partíció formázása <strong>%1</strong> a következő fájlrendszerrel <strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation><strong>%3MiB</strong> <strong>%1</strong> partíció formázása <strong>%2</strong> fájlrendszerrel.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1184,23 +1190,23 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>Legalább %1 GB lemezterület elérhető</translation> + <source>has at least %1 GiB available drive space</source> + <translation>legalább %1 GiB lemezterület elérhető</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>Nincs elég lemezterület. Legalább %1GB szükséges.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation>Nincs elég lemezterület. Legalább %1 GiB szükséges.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>Legalább %1 GB elérhető memória</translation> + <source>has at least %1 GiB working memory</source> + <translation>legalább %1 GiB memória elérhető</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>A rendszernek nincs elég memóriája. Legalább %1 GB szükséges.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation>A rendszer nem tartalmaz elég memóriát. Legalább %1 GiB szükséges.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1225,7 +1231,7 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="142"/> <source>The setup program is not running with administrator rights.</source> - <translation type="unfinished"/> + <translation>A telepítő program nem adminisztrátori joggal fut.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="143"/> @@ -1235,7 +1241,7 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="152"/> <source>The screen is too small to display the setup program.</source> - <translation type="unfinished"/> + <translation>A képernyő mérete túl kicsi a telepítő program megjelenítéséhez.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="153"/> @@ -1251,22 +1257,22 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation> <location filename="../src/modules/oemid/IDJob.cpp" line="59"/> <location filename="../src/modules/oemid/IDJob.cpp" line="67"/> <source>OEM Batch Identifier</source> - <translation type="unfinished"/> + <translation>OEM Batch azonosító</translation> </message> <message> <location filename="../src/modules/oemid/IDJob.cpp" line="48"/> <source>Could not create directories <code>%1</code>.</source> - <translation type="unfinished"/> + <translation>Nem sikerült létrehozni a könyvtárakat <code>%1</code>.</translation> </message> <message> <location filename="../src/modules/oemid/IDJob.cpp" line="60"/> <source>Could not open file <code>%1</code>.</source> - <translation type="unfinished"/> + <translation>Sikertelen fájl megnyitás <code>%1</code>. </translation> </message> <message> <location filename="../src/modules/oemid/IDJob.cpp" line="68"/> <source>Could not write to file <code>%1</code>.</source> - <translation type="unfinished"/> + <translation>Sikertelen fájl írás <code>%1</code>.</translation> </message> </context> <context> @@ -1417,32 +1423,32 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation> <message> <location filename="../src/modules/license/LicenseWidget.cpp" line="191"/> <source>Shows the complete license text</source> - <translation type="unfinished"/> + <translation>Teljes licensz szöveg megjelenítése</translation> </message> <message> <location filename="../src/modules/license/LicenseWidget.cpp" line="192"/> <source>Hide license text</source> - <translation type="unfinished"/> + <translation>Licensz szöveg elrejtése</translation> </message> <message> <location filename="../src/modules/license/LicenseWidget.cpp" line="196"/> <source>Show license agreement</source> - <translation type="unfinished"/> + <translation>Licensz egyezmény megjelenítése</translation> </message> <message> <location filename="../src/modules/license/LicenseWidget.cpp" line="197"/> <source>Hide license agreement</source> - <translation type="unfinished"/> + <translation>Licensz egyezmény elrejtése</translation> </message> <message> <location filename="../src/modules/license/LicenseWidget.cpp" line="201"/> <source>Opens the license agreement in a browser window.</source> - <translation type="unfinished"/> + <translation>Licensz egyezmény megnyitása új böngészőablakban.</translation> </message> <message> <location filename="../src/modules/license/LicenseWidget.cpp" line="202"/> <source><a href="%1">View license agreement</a></source> - <translation type="unfinished"/> + <translation><a href="%1">Licensz egyezmény megtekintése</a></translation> </message> </context> <context> @@ -1482,12 +1488,12 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Hely adatok betöltése...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Hely</translation> </message> @@ -1528,17 +1534,17 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation> <message> <location filename="../src/modules/oemid/OEMPage.ui" line="28"/> <source>Ba&tch:</source> - <translation type="unfinished"/> + <translation>Ba&amp;tch:</translation> </message> <message> <location filename="../src/modules/oemid/OEMPage.ui" line="38"/> <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source> - <translation type="unfinished"/> + <translation><html><head/><body><p>Gépelje ide a batch azonosítót. Ez a célrendszeren lesz tárolva.</p></body></html></translation> </message> <message> <location filename="../src/modules/oemid/OEMPage.ui" line="48"/> <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source> - <translation type="unfinished"/> + <translation><html><head/><body><h1>OEM konfiguráció</h1> <p>A Calamares az OEM beállításokat fogja használni a célrendszer konfigurációjához.</p></body></html></translation> </message> </context> <context> @@ -1546,12 +1552,12 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation> <message> <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/> <source>OEM Configuration</source> - <translation type="unfinished"/> + <translation>OEM konfiguráció</translation> </message> <message> <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/> <source>Set the OEM Batch Identifier to <code>%1</code>.</source> - <translation type="unfinished"/> + <translation>Állítsa az OEM Batch azonosítót erre: <code>%1</code>.</translation> </message> </context> <context> @@ -1876,42 +1882,42 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Root</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Home</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Boot</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>EFI rendszer</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Új partíció %1 -ra/ -re</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Új partíció</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2130,12 +2136,12 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation> <message> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/> <source>has at least one disk device available.</source> - <translation type="unfinished"/> + <translation>legalább egy lemez eszköz elérhető.</translation> </message> <message> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/> <source>There are no partitons to install on.</source> - <translation type="unfinished"/> + <translation>Nincsenek partíciók a telepítéshez.</translation> </message> </context> <context> @@ -2162,7 +2168,7 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation> <message> <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="70"/> <source>Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.</source> - <translation type="unfinished"/> + <translation>Kérem válasszon kinézetet a KDE Plasma felülethez, Kihagyhatja ezt a lépést és konfigurálhatja a kinézetet a rendszer telepítése után. A listában a kinézetet kiválasztva egy élő előnézetet fog látni az adott témáról.</translation> </message> <message> <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="76"/> @@ -2299,22 +2305,22 @@ Kimenet: <translation>Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Nem particionált, vagy ismeretlen partíció</translation> </message> <message> <location filename="../src/modules/partition/gui/PartitionDialogHelpers.cpp" line="47"/> <source>(no mount point)</source> - <translation type="unfinished"/> + <translation>(nincs csatolási pont)</translation> </message> <message> <location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="62"/> <source>Requirements checking for module <i>%1</i> is complete.</source> - <translation type="unfinished"/> + <translation>Követelmények ellenőrzése a <i>%1</i>modulhoz kész.</translation> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2417,70 +2423,70 @@ Kimenet: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation>Fájlrendszer átméretezési feladat</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>Érvénytelen konfiguráció</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation>A fájlrendszer átméretezési feladat konfigurációja érvénytelen, és nem fog futni.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation>A KPMCore nem érhető el</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation>A Calamares nem tudja elindítani a KPMCore-t a fájlrendszer átméretezési feladathoz.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>Az átméretezés meghiúsult</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation>A(z) %1 fájlrendszer nem található a rendszeren, és nem méretezhető át.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation>A(z) %1 eszköz nem található a rendszeren, és nem méretezhető át.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation>A(z) %1 fájlrendszer nem méretezhető át.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation>A(z) %1 eszköz nem méretezhető át.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation>A(z) %1 fájlrendszert át kell méretezni, de nem lehet.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation>A(z) %1 eszközt át kell méretezni, de nem lehet</translation> </message> @@ -2494,13 +2500,13 @@ Kimenet: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation><strong>%2MB</strong> partíció átméretezése <strong>%1</strong a következőre:<strong>%3MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation><strong>%2MiB</strong><strong>%1</strong> partíció átméretezése erre <strong>%3MiB</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>%2MB partíció átméretezése %1 -ról/ -ről %3MB- ra/ -re.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation>%1 partíción %2MiB átméretezése erre %3MiB.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2540,7 +2546,7 @@ Kimenet: <message> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="96"/> <source>This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a></source> - <translation type="unfinished"/> + <translation>Ez a számítógép nem felel meg a minimum követelményeknek a %1 telepítéséhez. <br/>A telepítés nem folytatható. <a href="#details">Részletek...</a></translation> </message> <message> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="100"/> @@ -2551,7 +2557,7 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l <message> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="118"/> <source>This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.</source> - <translation type="unfinished"/> + <translation>Ez a számítógép nem felel meg néhány követelménynek a %1 telepítéséhez. <br/>A telepítés folytatható de előfordulhat néhány képesség nem lesz elérhető.</translation> </message> <message> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="122"/> @@ -2656,8 +2662,8 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>Jelzők beállítása a %1MB %2 partíción.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation>flags beállítása a %1MiB %2 partíción.</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2671,8 +2677,23 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>Jelzők törlése a %1MB <strong>%2</strong> partíción.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation>flags eltávolítása a %1MiB <strong>%2</strong> partíción.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation>Flag %1MiB <strong>%2</strong> partíción mint <strong>%3</strong>.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation>Flag-ek eltávolítása a %1MiB <strong>%2</strong> partíción.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation>Flag-ek beállítása <strong>%3</strong> a %1MiB <strong>%2</strong> partíción.</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2685,11 +2706,6 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l <translation>Zászlók beállítása <strong>%1</strong> ,mint <strong>%2</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Jelzők beállítása %1MB <strong>%2</strong> a partíción mint <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Jelző beállítása mint <strong>%1</strong>.</translation> @@ -2700,11 +2716,6 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l <translation>Zászlók törlése a partíción: <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>Jelzők törlése a %1MB <strong>%2</strong> partíción.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>jelzők törlése az új partíción.</translation> @@ -2715,11 +2726,6 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l <translation>Zászlók beállítása <strong>%2</strong> a <strong>%1</strong> partíción.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>Jelzők beállítása <strong>%3</strong> a %1MB <strong>%2</strong> partíción.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>Jelzők beállítása az új <strong>%1</strong> partíción.</translation> @@ -2833,7 +2839,7 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l <message> <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/> <source>This is an overview of what will happen once you start the setup procedure.</source> - <translation type="unfinished"/> + <translation>Összefoglaló arról mi fog történni a telepítés során.</translation> </message> <message> <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/> @@ -2958,12 +2964,12 @@ Calamares hiba %1.</translation> <message> <location filename="../src/modules/users/UsersPage.cpp" line="120"/> <source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source> - <translation type="unfinished"/> + <translation><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></translation> </message> <message> <location filename="../src/modules/users/UsersPage.cpp" line="126"/> <source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source> - <translation type="unfinished"/> + <translation><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></translation> </message> <message> <location filename="../src/modules/users/UsersPage.cpp" line="317"/> @@ -3010,7 +3016,7 @@ Calamares hiba %1.</translation> <message> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="14"/> <source>Create Volume Group</source> - <translation type="unfinished"/> + <translation>Kötetcsoport létrehozása</translation> </message> <message> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="20"/> @@ -3079,7 +3085,7 @@ Calamares hiba %1.</translation> <location filename="../src/modules/welcome/WelcomePage.ui" line="17"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="72"/> <source>Select language</source> - <translation type="unfinished"/> + <translation>Válasszon nyelvet</translation> </message> <message> <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/> @@ -3104,17 +3110,17 @@ Calamares hiba %1.</translation> <message> <location filename="../src/modules/welcome/WelcomePage.cpp" line="71"/> <source><h1>Welcome to the Calamares setup program for %1.</h1></source> - <translation type="unfinished"/> + <translation><h1>Üdvözli önt a Calamares telepítő itt %1!</h1></translation> </message> <message> <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/> <source><h1>Welcome to %1 setup.</h1></source> - <translation type="unfinished"/> + <translation><h1>Köszöntjük a %1 telepítőben!</h1></translation> </message> <message> <location filename="../src/modules/welcome/WelcomePage.cpp" line="90"/> <source>About %1 setup</source> - <translation type="unfinished"/> + <translation>A %1 telepítőről.</translation> </message> <message> <location filename="../src/modules/welcome/WelcomePage.cpp" line="91"/> @@ -3124,7 +3130,7 @@ Calamares hiba %1.</translation> <message> <location filename="../src/modules/welcome/WelcomePage.cpp" line="94"/> <source><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.</source> - <translation type="unfinished"/> + <translation><h1>%1</h1><br/><strong>%2<br/>a %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/>Köszönet<a href="https://calamares.io/team/"> a Calamares csapatnak</a> és a <a href="https://www.transifex.com/calamares/calamares/"> Calamares fordítói csapatának</a>. <br/><br/><a href="https://calamares.io/">A Calamares</a> fejlesztését a <br/><a href="http://www.blue-systems.com/">Blue Systems</a> -Liberating Software támogatja.</translation> </message> <message> <location filename="../src/modules/welcome/WelcomePage.cpp" line="201"/> @@ -3135,7 +3141,7 @@ Calamares hiba %1.</translation> <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Üdvözlet</translation> </message> diff --git a/lang/calamares_id.ts b/lang/calamares_id.ts index 315f61aa6..e55cdfb36 100644 --- a/lang/calamares_id.ts +++ b/lang/calamares_id.ts @@ -97,7 +97,7 @@ <translation>Alat</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Informasi debug</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Instal</translation> </message> @@ -430,124 +435,124 @@ Instalasi akan ditutup dan semua perubahan akan hilang.</translation> <translation><strong>Pemartisian manual</strong><br/>Anda bisa membuat atau mengubah ukuran partisi.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Lokasi Boot loader:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 akan disusutkan menjadi %2MB dan partisi baru %3MB akan dibuat untuk %4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Pilih perangkat penyimpanan:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Saat ini:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Gunakan kembali %1 sebagai partisi home untuk %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Pilih sebuah partisi untuk diiris, kemudian seret bilah di bawah untuk mengubah ukuran</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Pilih sebuah partisi untuk memasang</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>Sebuah partisi sistem EFI tidak ditemukan pada sistem ini. Silakan kembali dan gunakan pemartisian manual untuk mengeset %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>Partisi sistem EFI di %1 akan digunakan untuk memulai %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>Partisi sistem EFI:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Tampaknya media penyimpanan ini tidak mengandung sistem operasi. Apa yang hendak Anda lakukan?<br/>Anda dapat menelaah dan mengkonfirmasi pilihan Anda sebelum dilakukan perubahan pada media penyimpanan.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Hapus disk</strong><br/>Aksi ini akan <font color="red">menghapus</font> semua berkas yang ada pada media penyimpanan terpilih.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>Media penyimpanan ini mengandung %1. Apa yang hendak Anda lakukan?<br/>Anda dapat menelaah dan mengkonfirmasi pilihan Anda sebelum dilakukan perubahan pada media penyimpanan.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Instal berdampingan dengan</strong><br/>Installer akan mengiris sebuah partisi untuk memberi ruang bagi %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Ganti sebuah partisi</strong><br/> Ganti partisi dengan %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>Media penyimpanan ini telah mengandung sistem operasi. Apa yang hendak Anda lakukan?<br/>Anda dapat menelaah dan mengkonfirmasi pilihan Anda sebelum dilakukan perubahan pada media penyimpanan.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>Media penyimpanan ini telah mengandung beberapa sistem operasi. Apa yang hendak Anda lakukan?<br/>Anda dapat menelaah dan mengkonfirmasi pilihan Anda sebelum dilakukan perubahan pada media penyimpanan.</translation> </message> @@ -555,17 +560,17 @@ Instalasi akan ditutup dan semua perubahan akan hilang.</translation> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Lepaskan semua kaitan untuk operasi pemartisian pada %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Melepas semua kaitan untuk operasi pemartisian pada %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Semua kaitan dilepas untuk %1</translation> </message> @@ -702,13 +707,13 @@ Instalasi akan ditutup dan semua perubahan akan hilang.</translation> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Buat partisi %2MB baru pada %4 (%3) dengan sistem berkas %1.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Buat <strong>%2MB</strong> partisi baru pada <strong>%4</strong> (%3) dengan sistem berkas <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1119,12 +1124,12 @@ Instalasi akan ditutup dan semua perubahan akan hilang.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>Instalasi Gagal</h1><br/>%1 tidak bisa diinstal pada komputermu.<br/>Pesan galatnya adalah: %2.</translation> </message> @@ -1132,27 +1137,27 @@ Instalasi akan ditutup dan semua perubahan akan hilang.</translation> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Selesai</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Instalasi Lengkap</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>Instalasi %1 telah lengkap.</translation> </message> @@ -1161,13 +1166,13 @@ Instalasi akan ditutup dan semua perubahan akan hilang.</translation> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Format partisi %1 (sistem berkas: %2, ukuran: %3 MB) pada %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>Format <strong>%3MB</strong> partisi <strong>%1</strong> dengan berkas sistem <strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1184,23 +1189,23 @@ Instalasi akan ditutup dan semua perubahan akan hilang.</translation> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>memiliki paling sedikit %1 GB ruang drive tersedia</translation> + <source>has at least %1 GiB available drive space</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>Ruang drive tidak cukup. Butuh minial %1 GB.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>memiliki paling sedikit %1 GB memori bekerja</translation> + <source>has at least %1 GiB working memory</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>Sistem ini tidak memiliki memori yang cukup. Butuh minial %1 GB.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1482,12 +1487,12 @@ Instalasi akan ditutup dan semua perubahan akan hilang.</translation> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Memuat data lokasi...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Lokasi</translation> </message> @@ -1876,42 +1881,42 @@ Instalasi akan ditutup dan semua perubahan akan hilang.</translation> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Root</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Beranda</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Boot</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>Sistem EFI</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Partisi baru untuk %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Partisi baru</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2299,7 +2304,7 @@ Keluaran: <translation>swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Ruang tidak terpartisi atau tidak diketahui tabel partisinya</translation> </message> @@ -2314,7 +2319,7 @@ Keluaran: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2417,70 +2422,70 @@ Keluaran: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation>Tugas Ubah-ukuran Filesystem</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>Konfigurasi taksah</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation>Tugas pengubahan ukuran filesystem mempunyai sebuah konfigurasi yang taksah dan tidak akan berjalan.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation>KPMCore tidak Tersedia</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation>Calamares gak bisa menjalankan KPMCore untuk tugas pengubahan ukuran filesystem.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>Pengubahan Ukuran, Gagal</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation>Filesystem %1 enggak ditemukan dalam sistem ini, dan gak bisa diubahukurannya.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation>Perangkat %1 enggak ditemukan dalam sistem ini, dan gak bisa diubahukurannya.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation>Filesystem %1 gak bisa diubahukurannya.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation>Perangkat %1 gak bisa diubahukurannya.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation>Filesystem %1 mestinya bisa diubahukurannya, namun gak bisa.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation>Perangkat %1 mestinya bisa diubahukurannya, namun gak bisa.</translation> </message> @@ -2494,13 +2499,13 @@ Keluaran: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>Ubah ukuran<strong>%2MB</strong> partisi <strong>%1</strong> menjadi <strong>%3MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Mengubah partisi %2MB %1 ke %3MB.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2657,8 +2662,8 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</translat </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>Setel bendera pada partisi %2 %1MB.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2672,8 +2677,23 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</translat </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>Bersihkan bendera pada partisi <strong>%2</strong> %1MB.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2686,11 +2706,6 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</translat <translation>Benderakan partisi <strong>%1</strong> sebagai <strong>%2</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Flag partisi <strong>%2</strong> %1MB sebagai <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Benderakan partisi baru sebagai <strong>%1</strong>.</translation> @@ -2701,11 +2716,6 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</translat <translation>Membersihkan bendera pada partisi <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>Membersihkan bendera pada partisi <strong>%2</strong> %1MB.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>Membersihkan bendera pada partisi baru.</translation> @@ -2716,11 +2726,6 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</translat <translation>Menyetel bendera <strong>%2</strong> pada partisi <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>Menyetel bendera <strong>%3</strong> pada partisi <strong>%2</strong> %1MB.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>Menyetel bendera <strong>%1</strong> pada partisi baru.</translation> @@ -3135,7 +3140,7 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</translat <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Selamat Datang</translation> </message> diff --git a/lang/calamares_is.ts b/lang/calamares_is.ts index 1904789dd..5133e0205 100644 --- a/lang/calamares_is.ts +++ b/lang/calamares_is.ts @@ -97,7 +97,7 @@ <translation>Verkfæri</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Villuleitarupplýsingar</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Setja upp</translation> </message> @@ -430,124 +435,124 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation> <translation><strong>Handvirk disksneiðing</strong><br/>Þú getur búið til eða breytt stærð disksneiða sjálft.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Staðsetning ræsistjóra</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 verður minnkuð í %2MB og ný %3MB disksneið verður búin til fyrir %4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Veldu geymslu tæ&ki:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Núverandi:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Endurnota %1 sem heimasvæðis disksneið fyrir %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Veldu disksneið til að minnka, dragðu síðan botnstikuna til að breyta stærðinni</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Veldu disksneið til að setja upp á </strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>EFI kerfisdisksneið er hvergi að finna á þessu kerfi. Farðu til baka og notaðu handvirka skiptingu til að setja upp %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>EFI kerfisdisksneið á %1 mun verða notuð til að ræsa %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>EFI kerfisdisksneið:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Þetta geymslu tæki hefur mörg stýrikerfi á sér. Hvað viltu gera?<br/>Þú verður að vera fær um að yfirfara og staðfesta val þitt áður en breytingar eru gerðar til geymslu tæki.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Eyða disk</strong><br/>Þetta mun <font color="red">eyða</font> öllum gögnum á þessu valdna geymslu tæki.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>Þetta geymslu tæki hefur %1 á sér. Hvað viltu gera?<br/>Þú verður að vera fær um að yfirfara og staðfesta val þitt áður en breytingar eru gerðar til geymslu tæki.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Setja upp samhliða</strong><br/>Uppsetningarforritið mun minnka disksneið til að búa til pláss fyrir %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Skipta út disksneið</strong><br/>Skiptir disksneið út með %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>Þetta geymslu tæki hefur stýrikerfi á sér. Hvað viltu gera?<br/>Þú verður að vera fær um að yfirfara og staðfesta val þitt áður en breytingar eru gerðar til geymslu tæki.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>Þetta geymslu tæki hefur mörg stýrikerfi á sér. Hvað viltu gera?<br/>Þú verður að vera fær um að yfirfara og staðfesta val þitt áður en breytingar eru gerðar til geymslu tæki.</translation> </message> @@ -555,17 +560,17 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Hreinsaði alla tengipunkta fyrir %1</translation> </message> @@ -702,13 +707,13 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Búa til nýja %2MB disksneið á %4 (%3) með %1 skráakerfi.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Búa til nýja <strong>%2MB</strong> disksneið á <strong>%4</strong> (%3) með skrár kerfi <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1119,12 +1124,12 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> @@ -1132,27 +1137,27 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Ljúka</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Uppsetningu lokið</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>Uppsetningu af %1 er lokið.</translation> </message> @@ -1161,13 +1166,13 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Forsníða disksneið %1 (skráakerfi: %2, stærð: %3 MB) á %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>Forsníða <strong>%3MB</strong> disksneið <strong>%1</strong> með <strong>%2</strong> skráakerfinu.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1184,23 +1189,23 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>hefur að minnsta kosti %1 GB laus á harðadisk</translation> + <source>has at least %1 GiB available drive space</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>Það er ekki nóg diskapláss. Að minnsta kosti %1 GB eru þörf.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>hefur að minnsta kosti %1 GB vinnsluminni</translation> + <source>has at least %1 GiB working memory</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>Kerfið hefur ekki nóg vinnsluminni. Að minnsta kosti %1 GB er krafist.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1482,12 +1487,12 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Hleð inn staðsetningargögnum...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Staðsetning</translation> </message> @@ -1876,42 +1881,42 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Rót</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Heimasvæði</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Ræsisvæði</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>EFI-kerfi</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Swap diskminni</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Ný disksneið fyrir %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Ný disksneið</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2296,7 +2301,7 @@ Output: <translation>swap diskminni</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation type="unfinished"/> </message> @@ -2311,7 +2316,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2414,70 +2419,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2491,13 +2496,13 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>Breyta stærð <strong>%2MB</strong> disksneiðar <strong>%1</strong> í <strong>%3MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Breyti stærð %2MB disksneiðar %1 í %3MB.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2652,7 +2657,7 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> + <source>Set flags on %1MiB %2 partition.</source> <translation type="unfinished"/> </message> <message> @@ -2667,7 +2672,22 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> <translation type="unfinished"/> </message> <message> @@ -2681,11 +2701,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation type="unfinished"/> @@ -2696,11 +2711,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation type="unfinished"/> @@ -2711,11 +2721,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation type="unfinished"/> @@ -3130,7 +3135,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Velkomin(n)</translation> </message> diff --git a/lang/calamares_it_IT.ts b/lang/calamares_it_IT.ts index b7a293073..35bec08ab 100644 --- a/lang/calamares_it_IT.ts +++ b/lang/calamares_it_IT.ts @@ -97,7 +97,7 @@ <translation>Strumenti</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Informazioni di debug</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Installa</translation> </message> @@ -430,124 +435,124 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno <translation><strong>Partizionamento manuale</strong><br/>Si possono creare o ridimensionare le partizioni manualmente.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Posizionamento del boot loader:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 sarà ridotta a %2MB e una nuova partizione di %3MB sarà creata per %4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Selezionare un dispositivo di me&moria:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Corrente:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Riutilizzare %1 come partizione home per &2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Selezionare una partizione da ridurre, trascina la barra inferiore per ridimensionare</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Selezionare la partizione sulla quale si vuole installare</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>Impossibile trovare una partizione EFI di sistema. Si prega di tornare indietro ed effettuare un partizionamento manuale per configurare %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>La partizione EFI di sistema su %1 sarà usata per avviare %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>Partizione EFI di sistema:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Questo dispositivo di memoria non sembra contenere alcun sistema operativo. Come si vuole procedere?<br/>Si potranno comunque rivedere e confermare le scelte prima di apportare i cambiamenti al dispositivo.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Cancellare disco</strong><br/>Questo <font color="red">cancellerà</font> tutti i dati attualmente presenti sul dispositivo di memoria.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>Questo dispositivo di memoria ha %1. Come si vuole procedere?<br/>Si potranno comunque rivedere e confermare le scelte prima di apportare i cambiamenti al dispositivo.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation>No Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation>Riutilizza Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation>Swap (senza ibernazione)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation>Swap (con ibernazione)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation>Swap su file</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Installare a fianco</strong><br/>Il programma di installazione ridurrà una partizione per dare spazio a %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Sostituire una partizione</strong><br/>Sostituisce una partizione con %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>Questo dispositivo di memoria contenere già un sistema operativo. Come si vuole procedere?<br/>Si potranno comunque rivedere e confermare le scelte prima di apportare i cambiamenti al dispositivo.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>Questo dispositivo di memoria contenere diversi sistemi operativi. Come si vuole procedere?<br/>Comunque si potranno rivedere e confermare le scelte prima di apportare i cambiamenti al dispositivo.</translation> </message> @@ -555,17 +560,17 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Rimuovere i punti di mount per operazioni di partizionamento su %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Rimozione dei punti di mount per le operazioni di partizionamento su %1.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Rimossi tutti i punti di mount per %1</translation> </message> @@ -702,13 +707,13 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Creare una nuova partizione da %2MB su %4 (%3) con file system %1.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Creare una nuova partizione da <strong>%2MB</strong> su <strong>%4</strong> (%3) con file system <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1119,12 +1124,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>Installazione Fallita</h1><br/>%1 non è stato installato sul tuo computer.<br/>Il messaggio di errore è: %2</translation> </message> @@ -1132,27 +1137,27 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Termina</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Installazione completata</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>L'installazione di %1 è completata.</translation> </message> @@ -1161,13 +1166,13 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Formattare la partizione %1 (file system: %2, dimensioni: %3 MB) su %4</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>Formattare la partizione <strong>%1</strong> da <strong>%3MB</strong> con file system <strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1184,23 +1189,23 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>ha almeno %1 GB di spazio disponibile</translation> + <source>has at least %1 GiB available drive space</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>Non c'è spazio sufficiente sul dispositivo. E' richiesto almeno %1 GB.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>ha almeno %1 GB di memoria </translation> + <source>has at least %1 GiB working memory</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>Il sistema non dispone di sufficiente memoria. E' richiesto almeno %1 GB.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1482,12 +1487,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Caricamento dei dati di posizione...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Posizione</translation> </message> @@ -1876,42 +1881,42 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Root</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Home</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Boot</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>Sistema EFI</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Nuova partizione per %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Nuova partizione</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2299,7 +2304,7 @@ Output: <translation>swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Spazio non partizionato o tabella delle partizioni sconosciuta</translation> </message> @@ -2314,7 +2319,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2417,70 +2422,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>Configurazione non valida</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>Ridimensionamento fallito.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation>Il filesystem %1 non è stato trovato su questo sistema, e non può essere ridimensionato.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation>Il dispositivo %1 non è stato trovato su questo sistema, e non può essere ridimensionato.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation>Il filesystem %1 non può essere ridimensionato.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation>Il dispositivo %1 non può essere ridimensionato.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2494,13 +2499,13 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>Ridimensionare la partizione <strong>%1</strong> da <strong>%2MB</strong> a <strong>%3MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Ridimensionamento della partizione %1 da %2MB a %3MB.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2655,8 +2660,8 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>Impostare i flag sulla partizione %1MB %2.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2670,8 +2675,23 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>Rimuovere i flag dalla partizione %1MB <strong>%2</strong>.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2684,11 +2704,6 @@ Output: <translation>Flag di partizione <strong>%1</strong> come <strong>%2</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Flag di partizione %1MB <strong>%2</strong> come <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Flag della nuova partizione come <strong>%1</strong>.</translation> @@ -2699,11 +2714,6 @@ Output: <translation>Rimozione dei flag sulla partizione <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>Rimozione del flag dalla partizione %1MB <strong>%2</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>Rimozione dei flag dalla nuova partizione.</translation> @@ -2714,11 +2724,6 @@ Output: <translation>Impostazione dei flag <strong>%2</strong> sulla partizione <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>Impostazione dei flag <strong>%3</strong> sulla partizione %1MB <strong>%2</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>Impostazione dei flag <strong>%1</strong> sulla nuova partizione.</translation> @@ -3133,7 +3138,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Benvenuti</translation> </message> diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts index 96f559e13..0efaed04b 100644 --- a/lang/calamares_ja.ts +++ b/lang/calamares_ja.ts @@ -97,7 +97,7 @@ <translation>ツール</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>デバッグ情報</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>インストール</translation> </message> @@ -431,124 +436,124 @@ The installer will quit and all changes will be lost.</source> <translation><strong>手動パーティション</strong><br/>パーティションの作成、あるいはサイズ変更を行うことができます。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>ブートローダーの場所:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 は %2 MB に縮小され、新しい %3 MB のパーティションが %4 のために作成されます。</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>ストレージデバイスを選択 (&V):</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>現在:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>%1 を %2 のホームパーティションとして再利用する</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>縮小するパーティションを選択し、下のバーをドラッグしてサイズを変更して下さい</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>インストールするパーティションの選択</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>システムにEFIシステムパーティションが存在しません。%1 のセットアップのため、元に戻り、手動パーティショニングを使用してください。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>%1 上のEFIシステムパーテイションは %2 のスタートに使用されます。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>EFI システムパーティション:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>このストレージデバイスは、オペレーティングシステムを持っていないようです。どうしますか？<br/>ストレージデバイスに対する変更が実施される前に、変更点をレビューし、確認することができます。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>ディスクの消去</strong><br/>選択したストレージデバイス上のデータがすべて <font color="red">削除</font>されます。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>このストレージデバイスは %1 を有しています。どうしますか?<br/>ストレージデバイスに対する変更が実施される前に、変更点をレビューし、確認することができます。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation>スワップを使用しない</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation>スワップを再利用</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation>スワップ(ハイバーネートなし)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation>スワップ(ハイバーネート)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation>ファイルにスワップ</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>共存してインストール</strong><br/>インストーラは %1 用の空きスペースを確保するため、パーティションを縮小します。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>パーティションの置換</strong><br/>パーティションを %1 に置き換えます。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>この記憶装置は、すでにオペレーティングシステムが存在します。どうしますか?<br/>ストレージデバイスに対する変更が実施される前に、変更点をレビューし、確認することができます。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>このストレージデバイスには、複数のオペレーティングシステムが存在します。どうしますか？<br />ストレージデバイスに対する変更が実施される前に、変更点をレビューし、確認することができます。</translation> </message> @@ -556,17 +561,17 @@ The installer will quit and all changes will be lost.</source> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>%1 のパーティション操作のため、マウントを解除</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>%1 のパーティション操作のため、マウントを解除中</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>%1 のすべてのマウントを解除</translation> </message> @@ -703,13 +708,13 @@ The installer will quit and all changes will be lost.</source> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>ファイルシステム %1 で %4 (%3) 上に新しく%2 MBのパーティションを作成</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>ファイルシステム %1で <strong>%4</strong> (%3) 上に新しく<strong>%2MB</strong>のパーティションを作成</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1120,12 +1125,12 @@ The installer will quit and all changes will be lost.</source> <translation><html><head/><body><p>このボックスをチェックすると、 <span style="font-style:italic;">実行</span>をクリックするかインストーラーを閉じると直ちにシステムが再起動します。</p></body></html></translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation><h1>セットアップに失敗しました。</h1><br/>%1 はコンピュータにセットアップされていません。<br/>エラーメッセージは次のとおりです: %2</translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>インストールに失敗しました</h1><br/>%1 はコンピュータにインストールされませんでした。<br/>エラーメッセージ: %2.</translation> </message> @@ -1133,28 +1138,28 @@ The installer will quit and all changes will be lost.</source> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>終了</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation>セットアップが完了しました</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>インストールが完了 </translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation>%1 のセットアップが完了しました。</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>%1 のインストールは完了です。</translation> </message> @@ -1163,13 +1168,13 @@ The installer will quit and all changes will be lost.</source> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>%4 上でパーティション %1 (ファイルシステム: %2, サイズ: %3 MB) のフォーマット</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation><strong>%3MB</strong> パーティション <strong>%1</strong> をファイルシステム<strong>%2</strong>でフォーマット。</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1186,23 +1191,23 @@ The installer will quit and all changes will be lost.</source> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>最低 %1 GBのディスク空き領域があること</translation> + <source>has at least %1 GiB available drive space</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>十分なドライブ容量がありません。少なくとも %1 GB 必要です。</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>最低 %1 GB のワーキングメモリーがあること</translation> + <source>has at least %1 GiB working memory</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>システムには十分なワーキングメモリがありません。少なくとも %1 GB 必要です。</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1484,12 +1489,12 @@ The installer will quit and all changes will be lost.</source> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>ロケーションデータをロード中...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>ロケーション</translation> </message> @@ -1878,42 +1883,42 @@ The installer will quit and all changes will be lost.</source> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Root</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Home</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Boot</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>EFI システム</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>スワップ</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>新しいパーティション %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>新しいパーティション</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2301,7 +2306,7 @@ Output: <translation>スワップ</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>パーティションされていない領域または未知のパーティションテーブル</translation> </message> @@ -2316,7 +2321,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2419,70 +2424,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation>ファイルシステム ジョブのサイズ変更</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>不当な設定</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation>ファイルシステムのサイズ変更ジョブが不当な設定であるため、作動しません。</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation>KPMCore は利用できません</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation>Calamares はファイエウシステムのサイズ変更ジョブのため KPMCore を開始することができません。</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>サイズ変更に失敗しました</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation>ファイルシステム %1 がシステム内に見つけられなかったため、サイズ変更ができません。</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation>デバイス %1 がシステム内に見つけられなかったため、サイズ変更ができません。</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation>ファイルシステム %1 のサイズ変更ができません。</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation>デバイス %1 のサイズ変更ができません。</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation>ファイルシステム %1 はサイズ変更が必要ですが、できません。</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation>デバイス %1 はサイズ変更が必要ですが、できません。</translation> </message> @@ -2496,13 +2501,13 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation> <strong>%2MB</strong> のパーティション <strong>%1</strong> を<strong>%3MB</strong> にサイズを変更。</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation> %2MB のパーティション %1 を %3MB にサイズ変更中。</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2657,8 +2662,8 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>%1MB %2 パーティション上にフラグを設定。</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2672,8 +2677,23 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>%1MB <strong>%2</strong> パーティション上のフラグを消去。</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2686,11 +2706,6 @@ Output: <translation>パーティション <strong>%1</strong> を<strong>%2</strong>のフラグとして設定。</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>%1MB <strong>%2</strong> パーティションに <strong>%3</strong> のフラグを設定。</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>新しいパーティションに <strong>%1</strong>のフラグを設定。</translation> @@ -2701,11 +2716,6 @@ Output: <translation>パーティション <strong>%1</strong> 上のフラグを消去中。</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>%1MB <strong>%2</strong> パーティション上のフラグを消去しています。</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>新しいパーティション上のフラグを消去しています。</translation> @@ -2716,11 +2726,6 @@ Output: <translation>パーティション <strong>%1</strong> 上に フラグ<strong>%2</strong>を設定。</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>%1MB <strong>%2</strong> パーティション上に <strong>%3</strong> フラグを設定しています。</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>新しいパーティション上に <strong>%1</strong> フラグを設定しています。</translation> @@ -3135,7 +3140,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>ようこそ</translation> </message> diff --git a/lang/calamares_kk.ts b/lang/calamares_kk.ts index 0763d3884..d813d970b 100644 --- a/lang/calamares_kk.ts +++ b/lang/calamares_kk.ts @@ -97,7 +97,7 @@ <translation>Саймандар</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Жөндеу ақпараты</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Орнату</translation> </message> @@ -429,124 +434,124 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>EFI жүйелік бөлімі:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -554,17 +559,17 @@ The installer will quit and all changes will be lost.</source> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation type="unfinished"/> </message> @@ -701,12 +706,12 @@ The installer will quit and all changes will be lost.</source> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1118,12 +1123,12 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> @@ -1131,27 +1136,27 @@ The installer will quit and all changes will be lost.</source> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation type="unfinished"/> </message> @@ -1160,12 +1165,12 @@ The installer will quit and all changes will be lost.</source> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1183,22 +1188,22 @@ The installer will quit and all changes will be lost.</source> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> + <source>has at least %1 GiB available drive space</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> + <source>There is not enough drive space. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> + <source>has at least %1 GiB working memory</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> @@ -1481,12 +1486,12 @@ The installer will quit and all changes will be lost.</source> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation type="unfinished"/> </message> @@ -1875,42 +1880,42 @@ The installer will quit and all changes will be lost.</source> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation type="unfinished"/> @@ -2295,7 +2300,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation type="unfinished"/> </message> @@ -2310,7 +2315,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2413,70 +2418,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2490,12 +2495,12 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> + <source>Resizing %2MiB partition %1 to %3MiB.</source> <translation type="unfinished"/> </message> <message> @@ -2651,7 +2656,7 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> + <source>Set flags on %1MiB %2 partition.</source> <translation type="unfinished"/> </message> <message> @@ -2666,7 +2671,22 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> <translation type="unfinished"/> </message> <message> @@ -2680,11 +2700,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation type="unfinished"/> @@ -2695,11 +2710,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation type="unfinished"/> @@ -2710,11 +2720,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation type="unfinished"/> @@ -3129,7 +3134,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Қош келдіңіз</translation> </message> diff --git a/lang/calamares_kn.ts b/lang/calamares_kn.ts index d35896ecb..cabf3ff17 100644 --- a/lang/calamares_kn.ts +++ b/lang/calamares_kn.ts @@ -97,7 +97,7 @@ <translation>ಉಪಕರಣಗಳು</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation type="unfinished"/> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>ಸ್ಥಾಪಿಸು</translation> </message> @@ -429,124 +434,124 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>ಪ್ರಸಕ್ತ:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -554,17 +559,17 @@ The installer will quit and all changes will be lost.</source> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation type="unfinished"/> </message> @@ -701,12 +706,12 @@ The installer will quit and all changes will be lost.</source> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1118,12 +1123,12 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> @@ -1131,27 +1136,27 @@ The installer will quit and all changes will be lost.</source> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation type="unfinished"/> </message> @@ -1160,12 +1165,12 @@ The installer will quit and all changes will be lost.</source> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1183,22 +1188,22 @@ The installer will quit and all changes will be lost.</source> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> + <source>has at least %1 GiB available drive space</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> + <source>There is not enough drive space. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> + <source>has at least %1 GiB working memory</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> @@ -1481,12 +1486,12 @@ The installer will quit and all changes will be lost.</source> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation type="unfinished"/> </message> @@ -1875,42 +1880,42 @@ The installer will quit and all changes will be lost.</source> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation type="unfinished"/> @@ -2295,7 +2300,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation type="unfinished"/> </message> @@ -2310,7 +2315,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation type="unfinished"/> @@ -2413,70 +2418,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2490,12 +2495,12 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> + <source>Resizing %2MiB partition %1 to %3MiB.</source> <translation type="unfinished"/> </message> <message> @@ -2651,7 +2656,7 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> + <source>Set flags on %1MiB %2 partition.</source> <translation type="unfinished"/> </message> <message> @@ -2666,7 +2671,22 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> <translation type="unfinished"/> </message> <message> @@ -2680,11 +2700,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation type="unfinished"/> @@ -2695,11 +2710,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation type="unfinished"/> @@ -2710,11 +2720,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation type="unfinished"/> @@ -3129,7 +3134,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation type="unfinished"/> </message> diff --git a/lang/calamares_ko.ts b/lang/calamares_ko.ts index 84a4cea96..7c7d78de1 100644 --- a/lang/calamares_ko.ts +++ b/lang/calamares_ko.ts @@ -97,7 +97,7 @@ <translation>도구</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>디버그 정보</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation>설정</translation> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>설치</translation> </message> @@ -431,124 +436,124 @@ The installer will quit and all changes will be lost.</source> <translation><strong>수동 파티션 작업</strong><br/>직접 파티션을 만들거나 크기를 조정할 수 있습니다.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>부트 로더 위치 :</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1이 %2MB로 축소되고 %4에 대해 새 %3MB 파티션이 생성됩니다.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>저장 장치 선택 (&v)</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>현재:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>%2의 홈 파티션으로 %1을 재사용합니다.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>축소할 파티션을 선택한 다음 하단 막대를 끌어 크기를 조정합니다.</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation>%1이 %2MiB로 축소되고 %4에 대해 새 %3MiB 파티션이 생성됩니다.</translation> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>설치할 파티션을 선택합니다.</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>이 시스템에서는 EFI 시스템 파티션을 찾을 수 없습니다. 돌아가서 수동 파티션 작업을 사용하여 %1을 설정하세요.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>%1의 EFI 시스템 파티션은 %2의 시작으로 사용될 것입니다.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>EFI 시스템 파티션:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>이 저장 장치에는 운영 체제가없는 것 같습니다. 무엇을하고 싶으십니까?<br/>저장 장치를 변경하기 전에 선택 사항을 검토하고 확인할 수 있습니다.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>디스크 지우기</strong><br/>그러면 선택한 저장 장치에 현재 있는 모든 데이터가 <font color="red">삭제</font>됩니다.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>이 저장 장치에 %1이 있습니다. 무엇을하고 싶으십니까?<br/>저장 장치를 변경하기 전에 선택 사항을 검토하고 확인할 수 있습니다.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation>스왑 없음</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation>스왑 재사용</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation>스왑 (최대 절전모드 아님)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation>스왑 (최대 절전모드 사용)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation>파일로 스왑</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>함께 설치</strong><br/>설치 관리자가 파티션을 축소하여 %1 공간을 확보합니다.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>파티션 바꾸기</strong><br/>파티션을 %1로 바꿉니다.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>이 저장 장치에는 이미 운영 체제가 있습니다. 무엇을하고 싶으십니까?<br/>저장 장치를 변경하기 전에 선택 사항을 검토하고 확인할 수 있습니다.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>이 저장 장치에는 여러 개의 운영 체제가 있습니다. 무엇을하고 싶으십니까?<br/>저장 장치를 변경하기 전에 선택 사항을 검토하고 확인할 수 있습니다.</translation> </message> @@ -556,17 +561,17 @@ The installer will quit and all changes will be lost.</source> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>파티셔닝 작업을 위해 %1의 마운트를 모두 해제합니다</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>파티셔닝 작업을 위해 %1의 마운트를 모두 해제하는 중입니다.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>%1의 모든 마운트가 해제되었습니다.</translation> </message> @@ -703,13 +708,13 @@ The installer will quit and all changes will be lost.</source> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>%1 파일 시스템을 사용하여 %4 (%3)에 새 %2MB 파티션을 만듭니다.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation>%1 파일 시스템으로 %4(%3)에 새 %2MiB 파티션을 만듭니다.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation><strong>%1</strong> 파일 시스템을 사용하여 <strong>%4</strong> (%3)에 새 <strong>%2MB</strong> 파티션을 만듭니다.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation><strong>%1</strong> 파일 시스템으로 <strong>%4</strong> (%3)에 새 <strong>%2MiB</strong> 파티션을 만듭니다.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1120,12 +1125,12 @@ The installer will quit and all changes will be lost.</source> <translation><html><head/><body><p>이 확인란을 선택하면 <span style="font-style:italic;">완료</span>를 클릭하거나 설치 관리자를 닫으면 시스템이 즉시 다시 시작됩니다.</p></body></html></translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation><h1>설치 실패</h1><br/>%1이 컴퓨터에 설정되지 않았습니다.<br/>오류 메시지 : %2.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>설치에 실패했습니다.</h1><br/>%1이 컴퓨터에 설치되지 않았습니다.<br/>오류 메시지는 %2입니다.</translation> </message> @@ -1133,27 +1138,27 @@ The installer will quit and all changes will be lost.</source> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>완료</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation>설치 완료</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>설치 완료</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation>%1 설치가 완료되었습니다.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>%1의 설치가 완료되었습니다.</translation> </message> @@ -1162,13 +1167,13 @@ The installer will quit and all changes will be lost.</source> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>%4의 %1 파티션 형식 (파일 시스템: %2, 크기: %3 MB) .</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation>%4의 %1 포맷 파티션(파일 시스템: %2, 크기: %3 MiB)</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>파티션 <strong>%1</strong>의 <strong></strong><strong>%3MB</strong>을 파일 시스템 %2로 포맷합니다.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation><strong>%3MiB</strong> 파티션 <strong>%1</strong>을 파일 시스템 <strong>%2</strong>로 포맷합니다.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1185,23 +1190,23 @@ The installer will quit and all changes will be lost.</source> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>최소 %1 GB의 여유 공간이 필요합니다.</translation> + <source>has at least %1 GiB available drive space</source> + <translation>%1 GiB 이상의 사용 가능한 드라이브 공간이 있음</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>저장 공간이 충분하지 않습니다. 최소 %1 GB의 공간이 필요합니다.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation>드라이브 공간이 부족합니다. %1 GiB 이상이 필요합니다.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>최소 %1 GB의 가용 메모리가 필요합니다</translation> + <source>has at least %1 GiB working memory</source> + <translation>%1 GiB 이상의 작동 메모리가 있습니다.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>이 시스템은 가용 메모리가 충분하지 않습니다. 최소 %1 GB의 가용 메모리가 필요합니다.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation>시스템에 충분한 작동 메모리가 없습니다. %1 GiB 이상이 필요합니다.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1252,22 +1257,22 @@ The installer will quit and all changes will be lost.</source> <location filename="../src/modules/oemid/IDJob.cpp" line="59"/> <location filename="../src/modules/oemid/IDJob.cpp" line="67"/> <source>OEM Batch Identifier</source> - <translation type="unfinished"/> + <translation>OEM 배치 식별자</translation> </message> <message> <location filename="../src/modules/oemid/IDJob.cpp" line="48"/> <source>Could not create directories <code>%1</code>.</source> - <translation type="unfinished"/> + <translation><code>%1</code> 디렉토리를 생성할 수 없습니다.</translation> </message> <message> <location filename="../src/modules/oemid/IDJob.cpp" line="60"/> <source>Could not open file <code>%1</code>.</source> - <translation type="unfinished"/> + <translation><code>%1</code> 파일을 열 수 없습니다.</translation> </message> <message> <location filename="../src/modules/oemid/IDJob.cpp" line="68"/> <source>Could not write to file <code>%1</code>.</source> - <translation type="unfinished"/> + <translation><code>%1</code> 파일에 쓸 수 없습니다.</translation> </message> </context> <context> @@ -1418,32 +1423,32 @@ The installer will quit and all changes will be lost.</source> <message> <location filename="../src/modules/license/LicenseWidget.cpp" line="191"/> <source>Shows the complete license text</source> - <translation type="unfinished"/> + <translation>전체 라이센스 텍스트 표시</translation> </message> <message> <location filename="../src/modules/license/LicenseWidget.cpp" line="192"/> <source>Hide license text</source> - <translation type="unfinished"/> + <translation>라이센스 텍스트 숨기기</translation> </message> <message> <location filename="../src/modules/license/LicenseWidget.cpp" line="196"/> <source>Show license agreement</source> - <translation type="unfinished"/> + <translation>라이센스 계약 표시</translation> </message> <message> <location filename="../src/modules/license/LicenseWidget.cpp" line="197"/> <source>Hide license agreement</source> - <translation type="unfinished"/> + <translation>라이센스 계약 숨기기</translation> </message> <message> <location filename="../src/modules/license/LicenseWidget.cpp" line="201"/> <source>Opens the license agreement in a browser window.</source> - <translation type="unfinished"/> + <translation>브라우저 창에서 사용권 계약 열기.</translation> </message> <message> <location filename="../src/modules/license/LicenseWidget.cpp" line="202"/> <source><a href="%1">View license agreement</a></source> - <translation type="unfinished"/> + <translation><a href="%1">라이센스 계약 보기</a></translation> </message> </context> <context> @@ -1483,12 +1488,12 @@ The installer will quit and all changes will be lost.</source> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>위치 정보를 불러오는 중입니다...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>위치</translation> </message> @@ -1529,17 +1534,17 @@ The installer will quit and all changes will be lost.</source> <message> <location filename="../src/modules/oemid/OEMPage.ui" line="28"/> <source>Ba&tch:</source> - <translation type="unfinished"/> + <translation>배치(&T):</translation> </message> <message> <location filename="../src/modules/oemid/OEMPage.ui" line="38"/> <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source> - <translation type="unfinished"/> + <translation><html><head/><body><p>여기에 배치 식별자를 입력합니다. 대상 시스템에 저장됩니다.</p></body></html></translation> </message> <message> <location filename="../src/modules/oemid/OEMPage.ui" line="48"/> <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source> - <translation type="unfinished"/> + <translation><html><head/><body><h1>OEM 구성</h1> <p>Calamares는 대상 시스템을 구성하는 동안 OEM 설정을 사용합니다.</p></body></html></translation> </message> </context> <context> @@ -1547,12 +1552,12 @@ The installer will quit and all changes will be lost.</source> <message> <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/> <source>OEM Configuration</source> - <translation type="unfinished"/> + <translation>OEM 구성</translation> </message> <message> <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/> <source>Set the OEM Batch Identifier to <code>%1</code>.</source> - <translation type="unfinished"/> + <translation>OEM 배치 식별자를 <code>%1</code>로 설정합니다.</translation> </message> </context> <context> @@ -1877,42 +1882,42 @@ The installer will quit and all changes will be lost.</source> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>루트</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>홈</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>부트</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>EFI 시스템</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>스왑</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>%1에 대한 새로운 파티션</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>새로운 파티션</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2300,7 +2305,7 @@ Output: <translation>스왑</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>분할되지 않은 공간 또는 알 수 없는 파티션 테이블입니다.</translation> </message> @@ -2315,7 +2320,7 @@ Output: <translation><i>%1</i> 모듈에 대한 요구사항 검사가 완료되었습니다.</translation> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2418,70 +2423,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation>파일시스템 작업 크기조정</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>잘못된 설정</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation>파일 시스템 크기 조정 작업에 잘못된 설정이 있으며 실행되지 않습니다.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation>KPMCore 사용할 수 없음</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation>Calamares는 파일 시스템 크기 조정 작업을 위해 KPMCore를 시작할 수 없습니다.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>크기조정 실패</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation>이 시스템에서 파일 시스템 %1를 찾을 수 없으므로 크기를 조정할 수 없습니다.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation>%1 장치를 이 시스템에서 찾을 수 없으며 크기를 조정할 수 없습니다.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation>파일 시스템 %1의 크기를 조정할 수 없습니다.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation>%1 장치의 크기를 조정할 수 없습니다.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation>파일 시스템 %1의 크기를 조정해야 하지만 조정할 수 없습니다.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation>%1 장치의 크기를 조정해야 하지만 조정할 수 없습니다.</translation> </message> @@ -2495,13 +2500,13 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>파티션 <strong>%1</strong>에서 <strong>%2MB</strong>의 크기를 <strong>%3MB</strong>로 조정합니다.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation><strong>%2MiB</strong> 파티션 <strong>%1</strong>의 크기를 <strong>%3MiB</strong>로 조정합니다.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>%2MB 파티션 %1의 크기를 %3MB로 조정합니다.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation>%2MiB 파티션 %1의 크기를 %3MiB로 조정합니다.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2656,8 +2661,8 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>파티션 %2에 %1MB의 플래그를 설정합니다.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation>%1MiB %2 파티션에 플래그 설정.</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2671,8 +2676,23 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>파티션 <strong>%2</strong>에서 %1MB의 플래그를 지웁니다</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation>%1MiB <strong>%2</strong> 파티션에서 플래그를 지웁니다.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation>%1MiB <strong>%2</strong> 파티션을 <strong>%3</strong>으로 플래그합니다.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation>%1MiB <strong>%2</strong> 파티션에서 플래그를 지우는 중입니다.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation>%1MiB <strong>%2</strong> 파티션에서 플래그 <strong>%3</strong>을 설정합니다.</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2685,11 +2705,6 @@ Output: <translation>파티션 <strong>%1</strong>을 <strong>%2</strong>로 플래그 지정합니다.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>파티션 <strong>%2</strong>에서 %1MB를 <strong>%3</strong>로 플래그 지정합니다.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation> 파티션을 <strong>%1</strong>로 플래그 지정합니다</translation> @@ -2700,11 +2715,6 @@ Output: <translation>파티션 <strong>%1</strong>에서 플래그를 지우는 중입니다.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>파티션 <strong>%2</strong>의 %1MB에서 플래그를 지우는 중입니다.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>새 파티션에서 플래그를 지우는 중입니다.</translation> @@ -2715,11 +2725,6 @@ Output: <translation>파티션 <strong>%1</strong>에 플래그를 .<strong>%2</strong>로 설정합니다.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>파티션 <strong>%2</strong>의 %1MB에 <strong>%3</strong> 플래그를 설정합니다.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>새 파티션에서 플래그를 <strong>%1</strong>으로 설정합니다.</translation> @@ -3078,7 +3083,7 @@ Output: <location filename="../src/modules/welcome/WelcomePage.ui" line="17"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="72"/> <source>Select language</source> - <translation type="unfinished"/> + <translation>언어 선택</translation> </message> <message> <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/> @@ -3134,7 +3139,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>환영합니다</translation> </message> diff --git a/lang/calamares_lo.ts b/lang/calamares_lo.ts index 15b650cb9..b235fe6e5 100644 --- a/lang/calamares_lo.ts +++ b/lang/calamares_lo.ts @@ -97,7 +97,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation type="unfinished"/> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation type="unfinished"/> </message> @@ -429,124 +434,124 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -554,17 +559,17 @@ The installer will quit and all changes will be lost.</source> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation type="unfinished"/> </message> @@ -701,12 +706,12 @@ The installer will quit and all changes will be lost.</source> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1118,12 +1123,12 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> @@ -1131,27 +1136,27 @@ The installer will quit and all changes will be lost.</source> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation type="unfinished"/> </message> @@ -1160,12 +1165,12 @@ The installer will quit and all changes will be lost.</source> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1183,22 +1188,22 @@ The installer will quit and all changes will be lost.</source> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> + <source>has at least %1 GiB available drive space</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> + <source>There is not enough drive space. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> + <source>has at least %1 GiB working memory</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> @@ -1481,12 +1486,12 @@ The installer will quit and all changes will be lost.</source> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation type="unfinished"/> </message> @@ -1875,42 +1880,42 @@ The installer will quit and all changes will be lost.</source> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation type="unfinished"/> @@ -2295,7 +2300,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation type="unfinished"/> </message> @@ -2310,7 +2315,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation type="unfinished"/> @@ -2413,70 +2418,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2490,12 +2495,12 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> + <source>Resizing %2MiB partition %1 to %3MiB.</source> <translation type="unfinished"/> </message> <message> @@ -2651,7 +2656,7 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> + <source>Set flags on %1MiB %2 partition.</source> <translation type="unfinished"/> </message> <message> @@ -2666,7 +2671,22 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> <translation type="unfinished"/> </message> <message> @@ -2680,11 +2700,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation type="unfinished"/> @@ -2695,11 +2710,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation type="unfinished"/> @@ -2710,11 +2720,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation type="unfinished"/> @@ -3129,7 +3134,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation type="unfinished"/> </message> diff --git a/lang/calamares_lt.ts b/lang/calamares_lt.ts index 964fb02ba..580dc2831 100644 --- a/lang/calamares_lt.ts +++ b/lang/calamares_lt.ts @@ -97,7 +97,7 @@ <translation>Įrankiai</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Derinimo informacija</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation>Sąranka</translation> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Diegimas</translation> </message> @@ -431,124 +436,124 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation> <translation><strong>Rankinis skaidymas</strong><br/>Galite patys kurti ar keisti skaidinių dydžius.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Paleidyklės vieta:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 bus sumažintas iki %2MB ir naujas %3MB skaidinys bus sukurtas sistemai %4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Pasirinkite atminties įr&enginį:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Dabartinis:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Pakartotinai naudoti %1 kaip namų skaidinį, skirtą %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Pasirinkite, kurį skaidinį sumažinti, o tuomet vilkite juostą, kad pakeistumėte skaidinio dydį</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation>%1 bus sumažintas iki %2MiB ir naujas %3MiB skaidinys bus sukurtas sistemai %4.</translation> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Pasirinkite kuriame skaidinyje įdiegti</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>Šioje sistemoje niekur nepavyko rasti EFI skaidinio. Prašome grįžti ir naudoti rankinį skaidymą, kad nustatytumėte %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>%2 paleidimui bus naudojamas EFI sistemos skaidinys, esantis ties %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>EFI sistemos skaidinys:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Atrodo, kad šiame įrenginyje nėra operacinės sistemos. Ką norėtumėte daryti?<br/>Prieš atliekant bet kokius pakeitimus atminties įrenginyje, jūs galėsite apžvelgti ir patvirtinti savo pasirinkimus.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Ištrinti diską</strong><br/>Tai <font color="red">ištrins</font> visus, pasirinktame atminties įrenginyje, esančius duomenis.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>Šiame atminties įrenginyje jau yra %1. Ką norėtumėte daryti?<br/>Prieš atliekant bet kokius pakeitimus atminties įrenginyje, jūs galėsite apžvelgti ir patvirtinti savo pasirinkimus.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation>Be sukeitimų skaidinio</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation>Iš naujo naudoti sukeitimų skaidinį</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation>Sukeitimų skaidinys (be užmigdymo)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation>Sukeitimų skaidinys (su užmigdymu)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation>Sukeitimų failas</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Įdiegti šalia</strong><br/>Diegimo programa sumažins skaidinį, kad atlaisvintų vietą sistemai %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Pakeisti skaidinį</strong><br/>Pakeičia skaidinį ir įrašo %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>Šiame atminties įrenginyje jau yra operacinė sistema. Ką norėtumėte daryti?<br/>Prieš atliekant bet kokius pakeitimus atminties įrenginyje, jūs galėsite apžvelgti ir patvirtinti savo pasirinkimus.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>Šiame atminties įrenginyje jau yra kelios operacinės sistemos. Ką norėtumėte daryti?<br/>Prieš atliekant bet kokius pakeitimus atminties įrenginyje, jūs galėsite apžvelgti ir patvirtinti savo pasirinkimus.</translation> </message> @@ -556,17 +561,17 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Išvalyti prijungimus, siekiant atlikti skaidymo operacijas skaidiniuose %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Išvalomi prijungimai, siekiant atlikti skaidymo operacijas skaidiniuose %1.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Visi %1 prijungimai išvalyti</translation> </message> @@ -641,7 +646,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation> <message> <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="67"/> <source>&Primary</source> - <translation>&Pirminė</translation> + <translation>&Pirminis</translation> </message> <message> <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="77"/> @@ -681,12 +686,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation> <message> <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="151"/> <source>Logical</source> - <translation>Loginė</translation> + <translation>Loginis</translation> </message> <message> <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="156"/> <source>Primary</source> - <translation>Pagrindinė</translation> + <translation>Pirminis</translation> </message> <message> <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="173"/> @@ -703,13 +708,13 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Sukurti naują %2MB skaidinį diske %4 (%3) su %1 failų sistema.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation>Sukurti naują %2MiB skaidinį diske %4 (%3) su %1 failų sistema.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Sukurti naują <strong>%2MB</strong> skaidinį diske <strong>%4</strong> (%3) su <strong>%1</strong> failų sistema.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation>Sukurti naują <strong>%2MiB</strong> skaidinį diske <strong>%4</strong> (%3) su <strong>%1</strong> failų sistema.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1120,12 +1125,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation> <translation><html><head/><body><p>Pažymėjus šį langelį, jūsų sistema nedelsiant pasileis iš naujo, kai spustelėsite <span style="font-style:italic;">Atlikta</span> ar užversite diegimo programą.</p></body></html></translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation><h1>Sąranka nepavyko</h1><br/>%1 nebuvo nustatyta jūsų kompiuteryje.<br/>Klaidos pranešimas buvo: %2.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>Diegimas nepavyko</h1><br/>%1 nebuvo įdiegta jūsų kompiuteryje.<br/>Klaidos pranešimas buvo: %2.</translation> </message> @@ -1133,27 +1138,27 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Pabaiga</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation>Sąranka užbaigta</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Diegimas užbaigtas</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation>%1 sąranka yra užbaigta.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>%1 diegimas yra užbaigtas.</translation> </message> @@ -1162,13 +1167,13 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Formatuoti skaidinį %1 (failų sistema: %2, dydis: %3 MB) diske %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation>Formatuoti skaidinį %1 (failų sistema: %2, dydis: %3 MiB) diske %4.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>Formatuoti <strong>%3MB</strong> skaidinį <strong>%1</strong> su failų sistema <strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation>Formatuoti <strong>%3MiB</strong> skaidinį <strong>%1</strong> su <strong>%2</strong> failų sistema.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1185,23 +1190,23 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>turi bent %1 GB laisvos vietos diske</translation> + <source>has at least %1 GiB available drive space</source> + <translation>turi bent %1 GiB laisvos vietos diske</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>Neužtenka vietos diske. Reikia bent %1 GB.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation>Neužtenka vietos diske. Reikia bent %1 GiB.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>turi bent %1 GB darbinės atminties</translation> + <source>has at least %1 GiB working memory</source> + <translation>turi bent %1 GiB darbinės atminties</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>Sistemai neužtenka darbinės atminties. Reikia bent %1 GB.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation>Sistemai neužtenka darbinės atminties. Reikia bent %1 GiB.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1483,12 +1488,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Įkeliami vietos duomenys...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Vieta</translation> </message> @@ -1877,42 +1882,42 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Šaknies</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Namų</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Paleidimo</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>EFI sistema</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Sukeitimų (swap)</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Naujas skaidinys, skirtas %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Naujas skaidinys</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2300,7 +2305,7 @@ Išvestis: <translation>sukeitimų (swap)</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Nesuskaidyta vieta arba nežinoma skaidinių lentelė</translation> </message> @@ -2315,7 +2320,7 @@ Išvestis: <translation>Reikalavimų tikrinimas <i>%1</i> moduliui yra užbaigtas.</translation> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2418,70 +2423,70 @@ Išvestis: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation>Failų sistemos dydžio keitimo užduotis</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>Neteisinga konfigūracija</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation>Failų sistemos dydžio keitimo užduotyje yra neteisinga konfigūracija ir užduotis nebus paleista.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation>KPMCore neprieinama</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation>Diegimo programai Calamares nepavyksta paleisti KPMCore, kuri skirta failų sistemos dydžio keitimo užduočiai.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>Dydžio keitimas patyrė nesėkmę</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation>Šioje sistemoje nepavyko rasti %1 failų sistemos ir nepavyko pakeisti jos dydį.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation>Šioje sistemoje nepavyko rasti %1 įrenginio ir nepavyko pakeisti jo dydį.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation>%1 failų sistemos dydis negali būti pakeistas.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation>%1 įrenginio dydis negali būti pakeistas.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation>%1 failų sistemos dydis privalo būti pakeistas, tačiau tai negali būti atlikta.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation>%1 įrenginio dydis privalo būti pakeistas, tačiau tai negali būti atlikta</translation> </message> @@ -2495,13 +2500,13 @@ Išvestis: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>Pakeisti <strong>%2MB</strong> skaidinio <strong>%1</strong> dydį iki <strong>%3MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation>Pakeisti <strong>%2MiB</strong> skaidinio <strong>%1</strong> dydį iki <strong>%3MiB</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Keičiamas %2MB skaidinio %1 dydis iki %3MB.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation>Keičiamas %2MiB skaidinio %1 dydis iki %3MiB.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2656,8 +2661,8 @@ Išvestis: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>Nustatyti vėliavėles %1MB skaidinyje %2.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation>Nustatyti vėliavėles %1MiB skaidinyje %2.</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2671,8 +2676,23 @@ Išvestis: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>Išvalyti vėliavėles %1MB skaidinyje <strong>%2</strong>.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation>Išvalyti vėliavėles %1MiB skaidinyje <strong>%2</strong>.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation>Pažymėti vėliavėle %1MiB skaidinį <strong>%2</strong> kaip <strong>%3</strong>.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation>Išvalomos vėliavėlės %1MiB skaidinyje<strong>%2</strong>.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation>Nustatomos vėliavėlės <strong>%3</strong>, %1MiB skaidinyje <strong>%2</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2685,11 +2705,6 @@ Išvestis: <translation>Pažymėti vėliavėle skaidinį <strong>%1</strong> kaip <strong>%2</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Pažymėti vėliavėle %1MB skaidinį <strong>%2</strong> kaip <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Pažymėti vėliavėle naują skaidinį kaip <strong>%1</strong>.</translation> @@ -2700,11 +2715,6 @@ Išvestis: <translation>Išvalomos vėliavėlės skaidinyje <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>Išvalomos vėliavėlės %1MB skaidinyje <strong>%2</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>Išvalomos vėliavėlės naujame skaidinyje.</translation> @@ -2715,11 +2725,6 @@ Išvestis: <translation>Nustatomos <strong>%2</strong> vėliavėlės skaidinyje <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>Nustatomos vėliavėlės <strong>%3</strong>, %1MB skaidinyje <strong>%2</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>Nustatomos vėliavėlės <strong>%1</strong> naujame skaidinyje.</translation> @@ -3134,7 +3139,7 @@ Išvestis: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Pasisveikinimas</translation> </message> diff --git a/lang/calamares_mk.ts b/lang/calamares_mk.ts index 83bf1d1bb..05cf84668 100644 --- a/lang/calamares_mk.ts +++ b/lang/calamares_mk.ts @@ -97,7 +97,7 @@ <translation>Алатки</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation type="unfinished"/> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Инсталирај</translation> </message> @@ -429,124 +434,124 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -554,17 +559,17 @@ The installer will quit and all changes will be lost.</source> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation type="unfinished"/> </message> @@ -701,12 +706,12 @@ The installer will quit and all changes will be lost.</source> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1118,12 +1123,12 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> @@ -1131,27 +1136,27 @@ The installer will quit and all changes will be lost.</source> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation type="unfinished"/> </message> @@ -1160,12 +1165,12 @@ The installer will quit and all changes will be lost.</source> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1183,22 +1188,22 @@ The installer will quit and all changes will be lost.</source> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> + <source>has at least %1 GiB available drive space</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> + <source>There is not enough drive space. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> + <source>has at least %1 GiB working memory</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> @@ -1481,12 +1486,12 @@ The installer will quit and all changes will be lost.</source> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation type="unfinished"/> </message> @@ -1875,42 +1880,42 @@ The installer will quit and all changes will be lost.</source> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation type="unfinished"/> @@ -2295,7 +2300,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation type="unfinished"/> </message> @@ -2310,7 +2315,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation type="unfinished"/> @@ -2413,70 +2418,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2490,12 +2495,12 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> + <source>Resizing %2MiB partition %1 to %3MiB.</source> <translation type="unfinished"/> </message> <message> @@ -2651,7 +2656,7 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> + <source>Set flags on %1MiB %2 partition.</source> <translation type="unfinished"/> </message> <message> @@ -2666,7 +2671,22 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> <translation type="unfinished"/> </message> <message> @@ -2680,11 +2700,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation type="unfinished"/> @@ -2695,11 +2710,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation type="unfinished"/> @@ -2710,11 +2720,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation type="unfinished"/> @@ -3129,7 +3134,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation type="unfinished"/> </message> diff --git a/lang/calamares_mr.ts b/lang/calamares_mr.ts index c49a73235..e21e2d337 100644 --- a/lang/calamares_mr.ts +++ b/lang/calamares_mr.ts @@ -97,7 +97,7 @@ <translation> साधने</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>दोषमार्जन माहिती</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>अधिष्ठापना</translation> </message> @@ -429,124 +434,124 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>सद्या :</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -554,17 +559,17 @@ The installer will quit and all changes will be lost.</source> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation type="unfinished"/> </message> @@ -701,12 +706,12 @@ The installer will quit and all changes will be lost.</source> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1118,12 +1123,12 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> @@ -1131,27 +1136,27 @@ The installer will quit and all changes will be lost.</source> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation type="unfinished"/> </message> @@ -1160,12 +1165,12 @@ The installer will quit and all changes will be lost.</source> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1183,22 +1188,22 @@ The installer will quit and all changes will be lost.</source> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> + <source>has at least %1 GiB available drive space</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> + <source>There is not enough drive space. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> + <source>has at least %1 GiB working memory</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> @@ -1481,12 +1486,12 @@ The installer will quit and all changes will be lost.</source> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation type="unfinished"/> </message> @@ -1875,42 +1880,42 @@ The installer will quit and all changes will be lost.</source> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation type="unfinished"/> @@ -2295,7 +2300,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation type="unfinished"/> </message> @@ -2310,7 +2315,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2413,70 +2418,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2490,12 +2495,12 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> + <source>Resizing %2MiB partition %1 to %3MiB.</source> <translation type="unfinished"/> </message> <message> @@ -2651,7 +2656,7 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> + <source>Set flags on %1MiB %2 partition.</source> <translation type="unfinished"/> </message> <message> @@ -2666,7 +2671,22 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> <translation type="unfinished"/> </message> <message> @@ -2680,11 +2700,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation type="unfinished"/> @@ -2695,11 +2710,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation type="unfinished"/> @@ -2710,11 +2720,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation type="unfinished"/> @@ -3129,7 +3134,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>स्वागत</translation> </message> diff --git a/lang/calamares_nb.ts b/lang/calamares_nb.ts index c6b321ff7..9e0f3f6b8 100644 --- a/lang/calamares_nb.ts +++ b/lang/calamares_nb.ts @@ -97,7 +97,7 @@ <translation>Verktøy</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Debug informasjon</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Installer</translation> </message> @@ -430,124 +435,124 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati <translation><strong>Manuell partisjonering</strong><br/>Du kan opprette eller endre størrelse på partisjoner selv.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -555,17 +560,17 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation type="unfinished"/> </message> @@ -702,12 +707,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1119,12 +1124,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>Innnstallasjonen mislyktes</h1><br/>%1 har ikke blitt installert på datamaskinen din.<br/>Feilmeldingen var: %2.</translation> </message> @@ -1132,27 +1137,27 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Installasjon fullført</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>Installasjonen av %1 er fullført.</translation> </message> @@ -1161,12 +1166,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1184,22 +1189,22 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> + <source>has at least %1 GiB available drive space</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> + <source>There is not enough drive space. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> + <source>has at least %1 GiB working memory</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> @@ -1482,12 +1487,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Plassering</translation> </message> @@ -1876,42 +1881,42 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation type="unfinished"/> @@ -2296,7 +2301,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation type="unfinished"/> </message> @@ -2311,7 +2316,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2414,70 +2419,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2491,12 +2496,12 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> + <source>Resizing %2MiB partition %1 to %3MiB.</source> <translation type="unfinished"/> </message> <message> @@ -2652,7 +2657,7 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> + <source>Set flags on %1MiB %2 partition.</source> <translation type="unfinished"/> </message> <message> @@ -2667,7 +2672,22 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> <translation type="unfinished"/> </message> <message> @@ -2681,11 +2701,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation type="unfinished"/> @@ -2696,11 +2711,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation type="unfinished"/> @@ -2711,11 +2721,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation type="unfinished"/> @@ -3130,7 +3135,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Velkommen</translation> </message> diff --git a/lang/calamares_ne_NP.ts b/lang/calamares_ne_NP.ts index fd326fed8..41f30c140 100644 --- a/lang/calamares_ne_NP.ts +++ b/lang/calamares_ne_NP.ts @@ -97,7 +97,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation type="unfinished"/> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation type="unfinished"/> </message> @@ -429,124 +434,124 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -554,17 +559,17 @@ The installer will quit and all changes will be lost.</source> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation type="unfinished"/> </message> @@ -701,12 +706,12 @@ The installer will quit and all changes will be lost.</source> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1118,12 +1123,12 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> @@ -1131,27 +1136,27 @@ The installer will quit and all changes will be lost.</source> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation type="unfinished"/> </message> @@ -1160,12 +1165,12 @@ The installer will quit and all changes will be lost.</source> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1183,22 +1188,22 @@ The installer will quit and all changes will be lost.</source> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> + <source>has at least %1 GiB available drive space</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> + <source>There is not enough drive space. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> + <source>has at least %1 GiB working memory</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> @@ -1481,12 +1486,12 @@ The installer will quit and all changes will be lost.</source> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation type="unfinished"/> </message> @@ -1875,42 +1880,42 @@ The installer will quit and all changes will be lost.</source> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation type="unfinished"/> @@ -2295,7 +2300,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation type="unfinished"/> </message> @@ -2310,7 +2315,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation type="unfinished"/> @@ -2413,70 +2418,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2490,12 +2495,12 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> + <source>Resizing %2MiB partition %1 to %3MiB.</source> <translation type="unfinished"/> </message> <message> @@ -2651,7 +2656,7 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> + <source>Set flags on %1MiB %2 partition.</source> <translation type="unfinished"/> </message> <message> @@ -2666,7 +2671,22 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> <translation type="unfinished"/> </message> <message> @@ -2680,11 +2700,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation type="unfinished"/> @@ -2695,11 +2710,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation type="unfinished"/> @@ -2710,11 +2720,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation type="unfinished"/> @@ -3129,7 +3134,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation type="unfinished"/> </message> diff --git a/lang/calamares_nl.ts b/lang/calamares_nl.ts index 255e9f090..fe283920c 100644 --- a/lang/calamares_nl.ts +++ b/lang/calamares_nl.ts @@ -97,7 +97,7 @@ <translation>Hulpmiddelen</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Debug informatie</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Installeer</translation> </message> @@ -430,124 +435,124 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. <translation><strong>Handmatig partitioneren</strong><br/>Je maakt of wijzigt zelf de partities.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Bootloader locatie:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 zal verkleind worden tot %2MB en een nieuwe %3MB partitie zal worden aangemaakt voor %4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Selecteer &opslagmedium:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Huidig:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Hergebruik %1 als home-partitie voor %2</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Selecteer een partitie om te verkleinen, en sleep vervolgens de onderste balk om het formaat te wijzigen</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Selecteer een partitie om op te installeren</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>Er werd geen EFI systeempartitie gevonden op dit systeem. Gelieve terug te gaan en manueel te partitioneren om %1 in te stellen.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>De EFI systeempartitie op %1 zal gebruikt worden om %2 te starten.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>EFI systeempartitie:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Dit opslagmedium lijkt geen besturingssysteem te bevatten. Wat wil je doen?<br/>Je zal jouw keuzes kunnen nazien en bevestigen voordat er iets aan het opslagmedium wordt veranderd.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Wis schijf</strong><br/>Dit zal alle huidige gegevens op de geselecteerd opslagmedium <font color="red">verwijderen</font>.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>Dit opslagmedium bevat %1. Wat wil je doen?<br/>Je zal jouw keuzes kunnen nazien en bevestigen voordat er iets aan het opslagmedium wordt veranderd.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation>Geen wisselgeheugen</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation>Wisselgeheugen hergebruiken</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation>Wisselgeheugen (geen Sluimerstand)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation>Wisselgeheugen ( met Sluimerstand)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation>Wisselgeheugen naar bestand</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Installeer ernaast</strong><br/>Het installatieprogramma zal een partitie verkleinen om plaats te maken voor %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Vervang een partitie</strong><br/>Vervangt een partitie met %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>Dit opslagmedium bevat reeds een besturingssysteem. Wat wil je doen?<br/>Je zal jouw keuzes kunnen nazien en bevestigen voordat er iets aan het opslagmedium wordt veranderd.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>Dit opslagmedium bevat meerdere besturingssystemen. Wat wil je doen?<br/>Je zal jouw keuzes kunnen nazien en bevestigen voordat er iets aan het opslagmedium wordt veranderd.</translation> </message> @@ -555,17 +560,17 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Geef aankoppelpunten vrij voor partitiebewerkingen op %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Aankoppelpunten vrijgeven voor partitiebewerkingen op %1.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Alle aankoppelpunten voor %1 zijn vrijgegeven</translation> </message> @@ -702,13 +707,13 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Maak nieuwe %2MB partitie aan op %4 (%3) met bestandsysteem %1.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Maak een nieuwe <strong>%2MB</strong> partitie aan op <strong>%4</strong> (%3) met bestandsysteem <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1119,12 +1124,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>Installatie Mislukt</h1><br/>%1 werd niet op de computer geïnstalleerd. <br/>De foutboodschap was: %2</translation> </message> @@ -1132,27 +1137,27 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Beëindigen</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Installatie Afgerond.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>De installatie van %1 is afgerond.</translation> </message> @@ -1161,13 +1166,13 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Formateer partitie %1 (bestandssysteem: %2, grootte: %3 MB) op %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>Formatteer <strong>%3MB</strong> partitie <strong>%1</strong> met bestandsysteem <strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1184,23 +1189,23 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>tenminste %1 GB vrije schijfruimte heeft</translation> + <source>has at least %1 GiB available drive space</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>Er is onvoldoende vrije schijfruimte. Tenminste %1 GB is vereist.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>tenminste %1 GB werkgeheugen heeft</translation> + <source>has at least %1 GiB working memory</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>Dit systeem heeft onvoldoende werkgeheugen. Tenminste %1 GB is vereist.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1482,12 +1487,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Laden van locatiegegevens...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Locatie</translation> </message> @@ -1876,42 +1881,42 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Root</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Home</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Boot</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>EFI systeem</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Wisselgeheugen</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Nieuwe partitie voor %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Nieuwe partitie</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2299,7 +2304,7 @@ Uitvoer: <translation>wisselgeheugen</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Niet-gepartitioneerde ruimte of onbekende partitietabel</translation> </message> @@ -2314,7 +2319,7 @@ Uitvoer: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2417,70 +2422,70 @@ Uitvoer: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation>Bestandssysteem herschalen Taak</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>Ongeldige configuratie</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation>De bestandssysteem herschalen-taak heeft een ongeldige configuratie en zal niet uitgevoerd worden. </translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation>KPMCore niet beschikbaar</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation>Calamares kan KPMCore niet starten voor de bestandssysteem-herschaaltaak.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>Herschalen mislukt</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation>Het bestandssysteem %1 kon niet gevonden worden op dit systeem en kan niet herschaald worden.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation>Het apparaat %1 kon niet gevonden worden op dit systeem en kan niet herschaald worden.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation>Het bestandssysteem %1 kan niet worden herschaald.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation>Het apparaat %1 kan niet worden herschaald.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation>Het bestandssysteem %1 moet worden herschaald, maar kan niet.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation>Het apparaat %1 moet worden herschaald, maar kan niet.</translation> </message> @@ -2494,13 +2499,13 @@ Uitvoer: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>Herschaal de <strong>%2MB</strong> partitie <strong>%1</strong> naar <strong>%3MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Pas de %2MB partitie %1 aan naar %3MB.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2655,8 +2660,8 @@ Uitvoer: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>Stel vlaggen in op %1MB %2 partitie.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2670,8 +2675,23 @@ Uitvoer: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>Wis vlaggen op %1MB <strong>%2</strong> partitie.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2684,11 +2704,6 @@ Uitvoer: <translation>Partitie <strong>%1</strong> als <strong>%2</strong> vlaggen.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Vlag %1MB <strong>%2</strong> partitie als <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Vlag nieuwe partitie als <strong>%1</strong>.</translation> @@ -2699,11 +2714,6 @@ Uitvoer: <translation>Vlaggen op partitie <strong>%1</strong> wissen.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>Vlaggen op %1MB <strong>%2</strong> partitie wissen.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>Vlaggen op nieuwe partitie wissen.</translation> @@ -2714,11 +2724,6 @@ Uitvoer: <translation>Vlaggen <strong>%2</strong> op partitie <strong>%1</strong> instellen.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>Vlaggen <strong>%3</strong> op %1MB <strong>%2</strong> partitie instellen.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>Vlaggen <strong>%1</strong> op nieuwe partitie instellen.</translation> @@ -3133,7 +3138,7 @@ Uitvoer: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Welkom</translation> </message> diff --git a/lang/calamares_pl.ts b/lang/calamares_pl.ts index 32149abd7..bbdfe0294 100644 --- a/lang/calamares_pl.ts +++ b/lang/calamares_pl.ts @@ -97,7 +97,7 @@ <translation>Narzędzia</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Informacje debugowania</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Zainstaluj</translation> </message> @@ -430,124 +435,124 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio <translation><strong>Ręczne partycjonowanie</strong><br/>Możesz samodzielnie utworzyć lub zmienić rozmiar istniejących partycji.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Położenie programu rozruchowego:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 zostanie zmniejszony do %2MB a nowa partycja %3MB zostanie utworzona dla %4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>&Wybierz urządzenie przechowywania:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Bieżący:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Użyj ponownie %1 jako partycji domowej dla %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Wybierz partycję do zmniejszenia, a następnie przeciągnij dolny pasek, aby zmienić jej rozmiar</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Wybierz partycję, na której przeprowadzona będzie instalacja</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>Nigdzie w tym systemie nie można odnaleźć partycji systemowej EFI. Prosimy się cofnąć i użyć ręcznego partycjonowania dysku do ustawienia %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>Partycja systemowa EFI na %1 będzie użyta do uruchamiania %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>Partycja systemowa EFI:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>To urządzenie pamięci masowej prawdopodobnie nie posiada żadnego systemu operacyjnego. Co chcesz zrobić?<br/>Będziesz miał możliwość przejrzenia oraz zatwierdzenia swoich ustawień przed wykonaniem jakichkolwiek zmian na tym urządzeniu.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Wyczyść dysk</strong><br/>Ta operacja <font color="red">usunie</font> wszystkie dane obecnie znajdujące się na wybranym urządzeniu przechowywania.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>To urządzenie pamięci masowej posiada %1. Co chcesz zrobić?<br/>Będziesz miał możliwość przejrzenia oraz zatwierdzenia swoich ustawień przed wykonaniem jakichkolwiek zmian na tym urządzeniu.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation>Brak przestrzeni wymiany</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation>Użyj ponownie przestrzeni wymiany</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation>Przestrzeń wymiany (bez hibernacji)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation>Przestrzeń wymiany (z hibernacją)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation>Przestrzeń wymiany do pliku</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Zainstaluj obok siebie</strong><br/>Instalator zmniejszy partycję, aby zrobić miejsce dla %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Zastąp partycję</strong><br/>Zastępowanie partycji poprzez %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>To urządzenie pamięci masowej posiada już system operacyjny. Co chcesz zrobić?<br/>Będziesz miał możliwość przejrzenia oraz zatwierdzenia swoich ustawień przed wykonaniem jakichkolwiek zmian na tym urządzeniu.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>To urządzenie pamięci masowej posiada kilka systemów operacyjnych. Co chcesz zrobić?<br/>Będziesz miał możliwość przejrzenia oraz zatwierdzenia swoich ustawień przed wykonaniem jakichkolwiek zmian na tym urządzeniu.</translation> </message> @@ -555,17 +560,17 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Wyczyść zamontowania dla operacji partycjonowania na %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Czyszczenie montowań dla operacji partycjonowania na %1.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Wyczyszczono wszystkie zamontowania dla %1</translation> </message> @@ -702,13 +707,13 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Utwórz nową partycję %2MB na %4 (%3) z systemem plików %1.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Utwórz nową partycję <strong>%2MB</strong> na <strong>%4</strong> (%3) z systemem plików <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1119,12 +1124,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>Instalacja nie powiodła się</h1><br/>Nie udało się zainstalować %1 na Twoim komputerze.<br/>Komunikat o błędzie: %2.</translation> </message> @@ -1132,27 +1137,27 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Koniec</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Instalacja zakończona</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>Instalacja %1 ukończyła się pomyślnie.</translation> </message> @@ -1161,13 +1166,13 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Formatuj partycję %1 (system plików: %2, rozmiar: %3 MB) na %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>Sformatuj partycję <strong>%3MB</strong> <strong>%1</strong> z systemem plików <strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1184,23 +1189,23 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>ma przynajmniej %1 GB dostępnego miejsca na dysku</translation> + <source>has at least %1 GiB available drive space</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>Nie ma wystarczającej ilości miejsca na dysku. Wymagane jest przynajmniej %1 GB.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>ma przynajmniej %1 GB pamięci roboczej</translation> + <source>has at least %1 GiB working memory</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>System nie posiada wystarczającej ilości pamięci roboczej. Wymagane jest przynajmniej %1 GB.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1482,12 +1487,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Wczytywanie danych położenia</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Położenie</translation> </message> @@ -1876,42 +1881,42 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Systemowa</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Domowa</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Rozruchowa</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>System EFI</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Przestrzeń wymiany</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Nowa partycja dla %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Nowa partycja</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2299,7 +2304,7 @@ Wyjście: <translation>przestrzeń wymiany</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Przestrzeń bez partycji lub nieznana tabela partycji</translation> </message> @@ -2314,7 +2319,7 @@ Wyjście: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2417,71 +2422,71 @@ Wyjście: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation>Zmień Rozmiar zadania systemu plików</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>Nieprawidłowa konfiguracja</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation>Zadanie zmiany rozmiaru systemu plików ma nieprawidłową konfigurację i nie uruchomi się</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation>KPMCore nie dostępne</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation>Calamares nie może uruchomić KPMCore dla zadania zmiany rozmiaru systemu plików</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>Nieudana zmiana rozmiaru</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation>System plików %1 nie mógł być znaleziony w tym systemie i nie może być zmieniony rozmiar</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation>Urządzenie %1 nie mogło być znalezione w tym systemie i zmiana rozmiaru jest nie dostępna</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation>Zmiana rozmiaru w systemie plików %1 niedostępna</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation>Zmiana rozmiaru w urządzeniu %1 niedostępna</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation>Wymagana zmiana rozmiaru w systemie plików %1 , ale jest niedostępna</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation>Wymagana zmiana rozmiaru w urządzeniu %1 , ale jest niedostępna</translation> </message> @@ -2495,13 +2500,13 @@ i nie uruchomi się</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>Zmień rozmiar partycji <strong>%2MB</strong> <strong>%1</strong> do <strong>%3MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Zmiana rozmiaru partycji %1 z %2MB do %3MB.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2656,8 +2661,8 @@ i nie uruchomi się</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>Ustaw flagi na partycji %1MB %2.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2671,8 +2676,23 @@ i nie uruchomi się</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>Wyczyść flagi z partycji %1MB <strong>%2</strong>.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2685,11 +2705,6 @@ i nie uruchomi się</translation> <translation>Oflaguj partycję <strong>%1</strong> jako <strong>%2</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Oflaguj partycję %1MB <strong>%2</strong> jako <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Oflaguj nową partycję jako <strong>%1</strong>.</translation> @@ -2700,11 +2715,6 @@ i nie uruchomi się</translation> <translation>Usuwanie flag na partycji <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>Czyszczenie flag partycji %1MB <strong>%2</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>Czyszczenie flag na nowej partycji.</translation> @@ -2715,11 +2725,6 @@ i nie uruchomi się</translation> <translation>Ustawianie flag <strong>%2</strong> na partycji <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>Ustawienie flag <strong>%3</strong> na partycji %1MB <strong>%2</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>Ustawianie flag <strong>%1</strong> na nowej partycji.</translation> @@ -3134,7 +3139,7 @@ i nie uruchomi się</translation> <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Witamy</translation> </message> diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts index 383235c19..93e5a0ffb 100644 --- a/lang/calamares_pt_BR.ts +++ b/lang/calamares_pt_BR.ts @@ -97,7 +97,7 @@ <translation>Ferramentas</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Informações de depuração</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation>Configurar</translation> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Instalar</translation> </message> @@ -431,124 +436,124 @@ O instalador será fechado e todas as alterações serão perdidas.</translation <translation><strong>Particionamento manual</strong><br/>Você pode criar ou redimensionar partições.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Local do gerenciador de inicialização:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 será reduzida para %2MB e uma nova partição de %3MB será criada para %4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Selecione o dispositi&vo de armazenamento:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Atual:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Reutilizar %1 como partição home para %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Selecione uma partição para reduzir, então arraste a barra de baixo para redimensionar</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation>%1 será reduzida para %2MiB e uma nova partição de %3MiB será criada para %4.</translation> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Selecione uma partição para instalação</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>Uma partição de sistema EFI não pôde ser encontrada neste dispositivo. Por favor, volte e use o particionamento manual para gerenciar %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>A partição de sistema EFI em %1 será utilizada para iniciar %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>Partição de sistema EFI:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Parece que não há um sistema operacional neste dispositivo de armazenamento. O que você gostaria de fazer?<br/>Você poderá revisar e confirmar suas opções antes que as alterações sejam feitas no dispositivo de armazenamento.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Apagar disco</strong><br/>Isto <font color="red">excluirá</font> todos os dados no dispositivo de armazenamento selecionado.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>Este dispositivo de armazenamento possui %1 nele. O que você gostaria de fazer?<br/>Você poderá revisar e confirmar suas opções antes que as alterações sejam feitas no dispositivo de armazenamento.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation>Sem swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation>Reutilizar swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation>Swap (sem hibernação)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation>Swap (com hibernação)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation>Swap em arquivo</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Instalar lado a lado</strong><br/>O instalador reduzirá uma partição para liberar espaço para %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Substituir uma partição</strong><br/>Substitui uma partição com %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>Já há um sistema operacional neste dispositivo de armazenamento. O que você gostaria de fazer?<br/>Você poderá revisar e confirmar suas opções antes que as alterações sejam feitas no dispositivo de armazenamento.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>Há diversos sistemas operacionais neste dispositivo de armazenamento. O que você gostaria de fazer?<br/>Você poderá revisar e confirmar suas opções antes que as alterações sejam feitas no dispositivo de armazenamento.</translation> </message> @@ -556,17 +561,17 @@ O instalador será fechado e todas as alterações serão perdidas.</translation <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Limpar as montagens para as operações nas partições em %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Limpando montagens para operações de particionamento em %1.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Todos os pontos de montagem para %1 foram limpos</translation> </message> @@ -703,13 +708,13 @@ O instalador será fechado e todas as alterações serão perdidas.</translation <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Criar nova partição de %2MB em %4 (%3) com o sistema de arquivos %1.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation>Criar nova partição de %2MiB em %4 (%3) com o sistema de arquivos %1.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Criar nova partição de <strong>%2MB</strong> em <strong>%4</strong> (%3) com o sistema de arquivos <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation>Criar nova partição de <strong>%2MiB</strong> em <strong>%4</strong> (%3) com o sistema de arquivos <strong>%1</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1120,12 +1125,12 @@ O instalador será fechado e todas as alterações serão perdidas.</translation <translation><html><head/><body><p>Quando essa caixa for marcada, seu sistema irá reiniciar imediatamente quando você clicar em <span style="font-style:italic;">Concluído</span> ou fechar o instalador.</p></body></html></translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation><h1>A configuração falhou</h1><br/>%1 não foi configurado no seu computador.<br/>A mensagem de erro foi: %2.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>A instalação falhou</h1><br/>%1 não foi instalado em seu computador.<br/>A mensagem de erro foi: %2.</translation> </message> @@ -1133,27 +1138,27 @@ O instalador será fechado e todas as alterações serão perdidas.</translation <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Concluir</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation>Configuração Concluída</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Instalação Completa</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation>A configuração de %1 está concluída.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>A instalação do %1 está completa.</translation> </message> @@ -1162,13 +1167,13 @@ O instalador será fechado e todas as alterações serão perdidas.</translation <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Formatar partição %1 (sistema de arquivos: %2, tamanho: %3 MB) em %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation>Formatar partição %1 (sistema de arquivos: %2, tamanho: %3 MiB) em %4.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>Formatar a partição de <strong>%3MB</strong> <strong>%1</strong> com o sistema de arquivos <strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation>Formatar partição de <strong>%3MiB</strong> <strong>%1</strong> com o sistema de arquivos <strong>%2</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1185,23 +1190,23 @@ O instalador será fechado e todas as alterações serão perdidas.</translation <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>tenha pelo menos %1 GB de espaço disponível no dispositivo</translation> + <source>has at least %1 GiB available drive space</source> + <translation>tenha pelo menos %1 GiB disponível de espaço no disco</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>Não há espaço suficiente no armazenamento. Pelo menos %1 GB é necessário.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation>Não há espaço suficiente no disco. Pelo menos %1 GiB é requerido.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>tenha pelo menos %1 GB de memória</translation> + <source>has at least %1 GiB working memory</source> + <translation>tenha pelo menos %1 GiB de memória de trabalho</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>O sistema não tem memória de trabalho suficiente. Pelo menos %1 GB é necessário.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation>O sistema não tem memória de trabalho o suficiente. Pelo menos %1 GiB é requerido.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1483,12 +1488,12 @@ O instalador será fechado e todas as alterações serão perdidas.</translation <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Carregando dados de localização...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Localização</translation> </message> @@ -1877,42 +1882,42 @@ O instalador será fechado e todas as alterações serão perdidas.</translation <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Root</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Home</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Inicialização</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>Sistema EFI</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Nova partição para %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Nova partição</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2300,7 +2305,7 @@ Saída: <translation>swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Espaço não particionado ou tabela de partições desconhecida</translation> </message> @@ -2315,7 +2320,7 @@ Saída: <translation>A verificação de requerimentos para o módulo <i>%1</i> está completa.</translation> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2418,70 +2423,70 @@ Saída: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation>Redimensionar Tarefa de Sistema de Arquivos</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>Configuração inválida</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation>A tarefa de redimensionamento do sistema de arquivos tem uma configuração inválida e não poderá ser executada.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation>O KPMCore não está disponível</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation>O Calamares não pôde iniciar o KPMCore para a tarefa de redimensionamento do sistema de arquivos.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>O Redimensionamento Falhou</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation>O sistema de arquivos %1 não pôde ser encontrado neste sistema e não poderá ser redimensionado.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation>O dispositivo %1 não pôde ser encontrado neste sistema e não poderá ser redimensionado.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation>O sistema de arquivos %1 não pode ser redimensionado.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation>O dispositivo %1 não pode ser redimensionado.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation>O sistema de arquivos %1 deve ser redimensionado, mas não foi possível executar a tarefa.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation>O dispositivo %1 deve ser redimensionado, mas não foi possível executar a tarefa.</translation> </message> @@ -2495,13 +2500,13 @@ Saída: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>Redimensionar <strong>%2MB</strong> da partição <strong>%1</strong> para <strong>%3MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation>Redimensionar partição de <strong>%2MiB</strong> <strong>%1</strong> para <strong>%3MiB</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Redimensionando %2MB da partição %1 para %3MB.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation>Redimensionando partição de %2MiB %1 para %3MiB.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2656,8 +2661,8 @@ Saída: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>Definir marcadores na partição %1MB %2.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation>Definir marcadores na partição de %1MiB %2.</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2671,8 +2676,23 @@ Saída: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>Limpar marcadores na partição %1MB <strong>%2</strong>.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation>Limpar marcadores na partição de %1MiB <strong>%2</strong>.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation>Marcar partição de %1MiB <strong>%2</strong> como <strong>%3</strong>.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation>Limpando marcadores na partição de %1MiB <strong>%2</strong>.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation>Definindo marcadores <strong>%3</strong> na partição de %1MiB <strong>%2</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2685,11 +2705,6 @@ Saída: <translation>Marcar partição <strong>%1</strong> como <strong>%2</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Marcar partição %1MB <strong>%2</strong> como <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Marcar nova partição como <strong>%1</strong>.</translation> @@ -2700,11 +2715,6 @@ Saída: <translation>Limpando marcadores na partição <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>Limpar marcadores na partição %1MB <strong>%2</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>Limpando marcadores na nova partição.</translation> @@ -2715,11 +2725,6 @@ Saída: <translation>Definindo marcadores <strong>%2</strong> na partição <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>Definindo marcadores <strong>%3</strong> na partição %1MB <strong>%2</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>Definindo marcadores <strong>%1</strong> na nova partição.</translation> @@ -3134,7 +3139,7 @@ Saída: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Bem-vindo</translation> </message> diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts index b58475e25..2897a8d31 100644 --- a/lang/calamares_pt_PT.ts +++ b/lang/calamares_pt_PT.ts @@ -97,7 +97,7 @@ <translation>Ferramentas</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Informação de depuração</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation>Configuração</translation> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Instalar</translation> </message> @@ -431,124 +436,124 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati <translation><strong>Particionamento manual</strong><br/>Pode criar ou redimensionar partições manualmente.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Localização do carregador de arranque:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 será encolhida para %2MB e uma nova %3MB partição será criada para %4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Selecione o dis&positivo de armazenamento:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Atual:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Reutilizar %1 como partição home para %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Selecione uma partição para encolher, depois arraste a barra de fundo para redimensionar</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Selecione uma partição para instalar</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>Nenhuma partição de sistema EFI foi encontrada neste sistema. Por favor volte atrás e use o particionamento manual para configurar %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>A partição de sistema EFI em %1 será usada para iniciar %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>Partição de sistema EFI:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Este dispositivo de armazenamento aparenta não ter um sistema operativo. O que quer fazer?<br/>Poderá rever e confirmar as suas escolhas antes de qualquer alteração ser feita no dispositivo de armazenamento.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Apagar disco</strong><br/>Isto irá <font color="red">apagar</font> todos os dados atualmente apresentados no dispositivo de armazenamento selecionado.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>Este dispositivo de armazenamento tem %1 nele. O que quer fazer?<br/>Poderá rever e confirmar as suas escolhas antes de qualquer alteração ser feita no dispositivo de armazenamento.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation>Sem Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation>Reutilizar Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation>Swap (sem Hibernação)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation>Swap (com Hibernação)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation>Swap para ficheiro</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Instalar paralelamente</strong><br/>O instalador irá encolher a partição para arranjar espaço para %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Substituir a partição</strong><br/>Substitui a partição com %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>Este dispositivo de armazenamento já tem um sistema operativo nele. O que quer fazer?<br/>Poderá rever e confirmar as suas escolhas antes de qualquer alteração ser feita no dispositivo de armazenamento.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>Este dispositivo de armazenamento tem múltiplos sistemas operativos nele, O que quer fazer?<br/>Poderá rever e confirmar as suas escolhas antes de qualquer alteração ser feita no dispositivo de armazenamento.</translation> </message> @@ -556,17 +561,17 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Limpar montagens para operações de particionamento em %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>A limpar montagens para operações de particionamento em %1.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Limpar todas as montagens para %1</translation> </message> @@ -703,13 +708,13 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Criar nova partição de %2MB em %4 (%3) com sistema de ficheiros %1.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Criar nova partição de <strong>%2MB</strong> em <strong>%4</strong> (%3) com sistema de ficheiros <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1120,12 +1125,12 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>Instalação Falhada</h1><br/>%1 não foi instalado no seu computador.<br/>A mensagem de erro foi: %2.</translation> </message> @@ -1133,27 +1138,27 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Finalizar</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation>Instalação Completa</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Instalação Completa</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation>A instalação de %1 está completa.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>A instalação de %1 está completa.</translation> </message> @@ -1162,13 +1167,13 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Formatar partição %1 (sistema de ficheiros: %2, tamanho: %3 MB) em %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>Formatar <strong>%3MB</strong> partitição <strong>%1</strong> com sistema de ficheiros <strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1185,23 +1190,23 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>tem pelo menos %1 GB de espaço livre em disco</translation> + <source>has at least %1 GiB available drive space</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>Não existe espaço livre suficiente em disco. É necessário pelo menos %1 GB. </translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>tem pelo menos %1 GB de memória disponível</translation> + <source>has at least %1 GiB working memory</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>O sistema não tem memória disponível suficiente. É necessário pelo menos %1 GB.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1483,12 +1488,12 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>A carregar dados de localização...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Localização</translation> </message> @@ -1877,42 +1882,42 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Root</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Home</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Arranque</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>Sistema EFI</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Nova partição para %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Nova partição</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2300,7 +2305,7 @@ Saída de Dados: <translation>swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Espaço não particionado ou tabela de partições desconhecida</translation> </message> @@ -2315,7 +2320,7 @@ Saída de Dados: <translation>A verificação de requisitos para módulo <i>%1</i> está completa.</translation> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2418,70 +2423,70 @@ Saída de Dados: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation>Tarefa de Redimensionamento do Sistema de Ficheiros</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>Configuração inválida</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation>A tarefa de redimensionamento do sistema de ficheiros tem uma configuração inválida e não irá ser corrida.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation>KPMCore não Disponível</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation>O Calamares não consegue iniciar KPMCore para a tarefa de redimensionamento de sistema de ficheiros.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>Redimensionamento Falhou</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation>O sistema de ficheiros %1 não foi encontrado neste sistema, e não pode ser redimensionado.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation>O dispositivo %1 não pode ser encontrado neste sistema, e não pode ser redimensionado.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation>O sistema de ficheiros %1 não pode ser redimensionado.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation>O dispositivo %1 não pode ser redimensionado.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation>O sistema de ficheiros %1 tem de ser redimensionado, mas não pode.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation>O dispositivo %1 tem de ser redimensionado, mas não pode</translation> </message> @@ -2495,13 +2500,13 @@ Saída de Dados: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>Redimensionar <strong>%2MB</strong> partição <strong>%1</strong> para <strong>%3MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>A redimensionar %2MB partição %1 para %3MB.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2656,8 +2661,8 @@ Saída de Dados: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>Definir flags na %1MB %2 partição.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2671,8 +2676,23 @@ Saída de Dados: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>Limpar flags na %1MB <strong>%2</strong> partição.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2685,11 +2705,6 @@ Saída de Dados: <translation>Definir flag da partição <strong>%1</strong> como <strong>%2</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Flag %1MB <strong>%2</strong> partição como <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Nova partição com flag <strong>%1</strong>.</translation> @@ -2700,11 +2715,6 @@ Saída de Dados: <translation>A limpar flags na partição <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>A limpar flags na %1MB <strong>%2</strong> partição.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>A limpar flags na nova partição.</translation> @@ -2715,11 +2725,6 @@ Saída de Dados: <translation>A definir flags <strong>%2</strong> na partitição <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>A definir flags <strong>%3</strong> na %1MB <strong>%2</strong> partição.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>A definir flags <strong>%1</strong> na nova partição.</translation> @@ -3134,7 +3139,7 @@ Saída de Dados: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Bem-vindo</translation> </message> diff --git a/lang/calamares_ro.ts b/lang/calamares_ro.ts index e80c88568..9819aa880 100644 --- a/lang/calamares_ro.ts +++ b/lang/calamares_ro.ts @@ -97,7 +97,7 @@ <translation>Unelte</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Informație pentru depanare</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Instalează</translation> </message> @@ -430,124 +435,124 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans <translation><strong>Partiționare manuală</strong><br/>Puteți crea sau redimensiona partițiile.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Locație boot loader:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 va fi micșorată la %2MB și o nouă partiție %3MB va fi creată pentru %4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Selectează dispoziti&vul de stocare:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Actual:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Reutilizează %1 ca partiție home pentru %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Selectează o partiție de micșorat, apoi trageți bara din jos pentru a redimensiona</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Selectează o partiție pe care să se instaleze</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>O partiție de sistem EFI nu poate fi găsită nicăieri în acest sistem. Vă rugăm să reveniți și să partiționați manual pentru a seta %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>Partiția de sistem EFI de la %1 va fi folosită pentru a porni %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>Partiție de sistem EFI:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Acest dispozitiv de stocare nu pare să aibă un sistem de operare instalat. Ce doriți să faceți?<br/>Veți putea revedea și confirma alegerile făcute înainte să fie realizate schimbări pe dispozitivul de stocare.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Șterge discul</strong><br/>Aceasta va <font color="red">șterge</font> toate datele prezente pe dispozitivul de stocare selectat.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>Acest dispozitiv de stocare are %1. Ce doriți să faceți?<br/>Veți putea revedea și confirma alegerile făcute înainte să fie realizate schimbări pe dispozitivul de stocare.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Instalează laolaltă</strong><br/>Instalatorul va micșora o partiție pentru a face loc pentru %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Înlocuiește o partiție</strong><br/>Înlocuiește o partiție cu %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>Acest dispozitiv de stocare are deja un sistem de operare instalat. Ce doriți să faceți?<br/>Veți putea revedea și confirma alegerile făcute înainte de se realiza schimbări pe dispozitivul de stocare.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>Acest dispozitiv de stocare are mai multe sisteme de operare instalate. Ce doriți să faceți?<br/>Veți putea revedea și confirma alegerile făcute înainte de a se realiza schimbări pe dispozitivul de stocare.</translation> </message> @@ -555,17 +560,17 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Eliminați montările pentru operațiunea de partiționare pe %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Se elimină montările pentru operațiunile de partiționare pe %1.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>S-au eliminat toate punctele de montare pentru %1</translation> </message> @@ -702,13 +707,13 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Creează o nouă partiție de %2MB pe %4 (3%) cu sistemul de operare %1.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Creează o nouă partiție de <strong>%2MB</strong> pe <strong>%4</strong> (%3) cu sistemul de fișiere <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1119,12 +1124,12 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>Instalarea a eșuat</h1><br/>%1 nu a mai fost instalat pe acest calculator.<br/>Mesajul de eroare era: %2.</translation> </message> @@ -1132,27 +1137,27 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Termină</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Instalarea s-a terminat</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>Instalarea este %1 completă.</translation> </message> @@ -1161,13 +1166,13 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Formatează partiția %1 (sistem de fișiere: %2, mărime: %3 MB) pe %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>Formatează partiția <strong>%1</strong>, de <strong>%3MB</strong> cu sistemul de fișiere <strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1184,23 +1189,23 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>are cel puțin %1 spațiu disponibil</translation> + <source>has at least %1 GiB available drive space</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>Nu este suficient spațiu disponibil. Sunt necesari cel puțin %1 GB.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>are cel puțin %1 GB de memorie utilizabilă</translation> + <source>has at least %1 GiB working memory</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>Sistemul nu are suficientă memorie utilizabilă. Sunt necesari cel puțin %1 GB.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1482,12 +1487,12 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Se încarcă datele locației...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Locație</translation> </message> @@ -1879,42 +1884,42 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Root</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Home</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Boot</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>Sistem EFI</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Noua partiție pentru %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Noua partiție</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2302,7 +2307,7 @@ Output <translation>swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Spațiu nepartiționat sau tabelă de partiții necunoscută</translation> </message> @@ -2317,7 +2322,7 @@ Output <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2420,70 +2425,70 @@ Output <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2497,13 +2502,13 @@ Output </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>Redimensionează partiția <strong>%1</strong> de la<strong>%2MB</strong> la <strong>%3MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Se redimensionează partiția %1 de la %2MG la %3MB.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2658,8 +2663,8 @@ Output </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>Setează flagurile pe partiția %2 de %1MB.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2673,8 +2678,23 @@ Output </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>Elimină flagurile pe partiția <strong>%2</strong> de %1MB.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2687,11 +2707,6 @@ Output <translation>Marchează partiția <strong>%1</strong> cu flag-ul <strong>%2</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Marchează partiția <strong>%2</strong> de %1MB ca <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Marchează noua partiție ca <strong>%1</strong>.</translation> @@ -2702,11 +2717,6 @@ Output <translation>Se șterg flag-urile pentru partiția <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>Se elimină flagurile pe partiția <strong>%2</strong> de %1MB.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>Se elimină flagurile de pe noua partiție.</translation> @@ -2717,11 +2727,6 @@ Output <translation>Se setează flag-urile <strong>%2</strong> pentru partiția <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>Se setează flagurile <strong>%3</strong> pe partiția <strong>%2</strong> de %1MB.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>Se setează flagurile <strong>%1</strong> pe noua partiție.</translation> @@ -3136,7 +3141,7 @@ Output <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Bine ați venit</translation> </message> diff --git a/lang/calamares_ru.ts b/lang/calamares_ru.ts index a977941d3..eab111987 100644 --- a/lang/calamares_ru.ts +++ b/lang/calamares_ru.ts @@ -97,7 +97,7 @@ <translation>Инструменты</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Отладочная информация</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Установить</translation> </message> @@ -429,124 +434,124 @@ The installer will quit and all changes will be lost.</source> <translation><strong>Ручная разметка</strong><br/>Вы можете самостоятельно создавать разделы или изменять их размеры.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Расположение загрузчика:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 будет уменьшен до %2MB и новый раздел %3MB будет создан для %4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Выбрать устройство &хранения:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Текущий:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Использовать %1 как домашний раздел для %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Выберите раздел для уменьшения, затем двигайте ползунок, изменяя размер</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Выберите раздел для установки</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>Не найдено системного раздела EFI. Пожалуйста, вернитесь назад и выполните ручную разметку %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>Системный раздел EFI на %1 будет использован для запуска %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>Системный раздел EFI:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Видимо, на этом устройстве нет операционной системы. Что Вы хотите сделать?<br/>Вы сможете изменить или подтвердить свой выбор до того, как на устройстве будут сделаны какие-либо изменения.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Стереть диск</strong><br/>Это <font color="red">удалит</font> все данные, которые сейчас находятся на выбранном устройстве.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>На этом устройстве есть %1. Что Вы хотите сделать?<br/>Вы сможете изменить или подтвердить свой выбор до того, как на устройстве будут сделаны какие-либо изменения.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Установить рядом</strong><br/>Программа установки уменьшит раздел, чтобы освободить место для %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Заменить раздел</strong><br/>Меняет раздел на %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>На этом устройстве уже есть операционная система. Что Вы хотите сделать?<br/>Вы сможете изменить или подтвердить свой выбор до того, как на устройстве будут сделаны какие-либо изменения.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>На этом устройстве есть несколько операционных систем. Что Вы хотите сделать?<br/>Вы сможете изменить или подтвердить свой выбор до того, как на устройстве будут сделаны какие-либо изменения.</translation> </message> @@ -554,17 +559,17 @@ The installer will quit and all changes will be lost.</source> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Освободить точки монтирования для выполнения разметки на %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Освобождаются точки монтирования для выполнения разметки на %1.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Освобождены все точки монтирования для %1</translation> </message> @@ -701,13 +706,13 @@ The installer will quit and all changes will be lost.</source> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Создать новый раздел %2 MB на %4 (%3) с файловой системой %1.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Создать новый раздел <strong>%2 MB</strong> на <strong>%4</strong> (%3) с файловой системой <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1118,12 +1123,12 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>Сбой установки</h1><br/>Не удалось установить %1 на ваш компьютер.<br/>Сообщение об ошибке: %2.</translation> </message> @@ -1131,27 +1136,27 @@ The installer will quit and all changes will be lost.</source> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Завершить</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Установка завершена</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>Установка %1 завершена.</translation> </message> @@ -1160,13 +1165,13 @@ The installer will quit and all changes will be lost.</source> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Форматировать раздел %1 (файловая система: %2, размер: %3 МБ) на %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>Форматировать раздел <strong>%1</strong> размером <strong>%3MB</strong> с файловой системой <strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1183,23 +1188,23 @@ The installer will quit and all changes will be lost.</source> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>доступно как минимум %1 ГБ свободного дискового пространства</translation> + <source>has at least %1 GiB available drive space</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>Недостаточно места на дисках. Необходимо как минимум %1 ГБ.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>доступно как минимум %1 ГБ оперативной памяти</translation> + <source>has at least %1 GiB working memory</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>Недостаточно оперативной памяти. Необходимо как минимум %1 ГБ.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1481,12 +1486,12 @@ The installer will quit and all changes will be lost.</source> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Загружаю данные о местоположениях...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Местоположение</translation> </message> @@ -1875,42 +1880,42 @@ The installer will quit and all changes will be lost.</source> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Root</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Home</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Boot</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>Система EFI</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Новый раздел для %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Новый раздел</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2298,7 +2303,7 @@ Output: <translation>swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Неразмеченное место или неизвестная таблица разделов</translation> </message> @@ -2313,7 +2318,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2416,70 +2421,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation>Изменить размер файловой системы</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>Недействительная конфигурация</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>Не удалось изменить размер</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2493,13 +2498,13 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>Изменить размер <strong>%2MB</strong> раздела <strong>%1</strong> на <strong>%3MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Изменяю размер раздела %1 с %2MB на %3MB.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2654,8 +2659,8 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>Установить флаги %1MB раздела %2.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2669,8 +2674,23 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>Очистить флаги %1MB раздела <strong>%2</strong>.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2683,11 +2703,6 @@ Output: <translation>Отметить раздел <strong>%1</strong> флагом как <strong>%2</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Отметить %1MB раздел <strong>%2</strong> флагом как <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Отметить новый раздел флагом как <strong>%1</strong>.</translation> @@ -2698,11 +2713,6 @@ Output: <translation>Очистка флагов раздела <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>Очистка флагов %1MB раздела <strong>%2</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>Сброс флагов нового раздела.</translation> @@ -2713,11 +2723,6 @@ Output: <translation>Установка флагов <strong>%2</strong> на раздел <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>Установка флагов <strong>%3</strong> %1MB раздела <strong>%2</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>Установка флагов <strong>%1</strong> нового раздела.</translation> @@ -3132,7 +3137,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Добро пожаловать</translation> </message> diff --git a/lang/calamares_sk.ts b/lang/calamares_sk.ts index 002c9851b..847d935fe 100644 --- a/lang/calamares_sk.ts +++ b/lang/calamares_sk.ts @@ -97,7 +97,7 @@ <translation>Nástroje</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Ladiace informácie</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Inštalácia</translation> </message> @@ -431,124 +436,124 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation> <translation><strong>Ručné rozdelenie oddielov</strong><br/>Môžete vytvoriť alebo zmeniť veľkosť oddielov podľa seba.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Umiestnenie zavádzača:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>Oddiel %1 bude zmenšený na %2MB a nový %3MB oddiel bude vytvorený pre distribúciu %4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Vyberte úložné &zariadenie:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Teraz:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Opakované použitie oddielu %1 ako domovského pre distribúciu %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Vyberte oddiel na zmenšenie a potom potiahnutím spodného pruhu zmeňte veľkosť</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Vyberte oddiel, na ktorý sa má inštalovať</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>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.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>Oddie lsystému EFI na %1 bude použitý na spustenie distribúcie %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>Oddiel systému EFI:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Zdá sa, že toto úložné zariadenie neobsahuje operačný systém. Čo by ste chceli urobiť?<br/>Budete môcť skontrolovať a potvrdiť vaše voľby pred uplatnením akejkoľvek zmeny na úložnom zariadení.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Vymazanie disku</strong><br/>Týmto sa <font color="red">odstránia</font> všetky údaje momentálne sa nachádzajúce na vybranom úložnom zariadení.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>Toto úložné zariadenie obsahuje operačný systém %1. Čo by ste chceli urobiť?<br/>Budete môcť skontrolovať a potvrdiť vaše voľby pred uplatnením akejkoľvek zmeny na úložnom zariadení.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation>Bez odkladacieho priestoru</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation>Znovu použiť odkladací priestor</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation>Odkladací priestor (bez hibernácie)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation>Odkladací priestor (s hibernáciou)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation>Odkladací priestor v súbore</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Inštalácia popri súčasnom systéme</strong><br/>Inštalátor zmenší oddiel a uvoľní miesto pre distribúciu %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Nahradenie oddielu</strong><br/>Nahradí oddiel distribúciou %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>Toto úložné zariadenie už obsahuje operačný systém. Čo by ste chceli urobiť?<br/>Budete môcť skontrolovať a potvrdiť vaše voľby pred uplatnením akejkoľvek zmeny na úložnom zariadení.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>Toto úložné zariadenie obsahuje viacero operačných systémov. Čo by ste chceli urobiť?<br/>Budete môcť skontrolovať a potvrdiť vaše voľby pred uplatnením akejkoľvek zmeny na úložnom zariadení.</translation> </message> @@ -556,17 +561,17 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Vymazať pripojenia pre operácie rozdelenia oddielov na zariadení %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Vymazávajú sa pripojenia pre operácie rozdelenia oddielov na zariadení %1.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Vymazané všetky pripojenia pre zariadenie %1</translation> </message> @@ -703,13 +708,13 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Vytvoriť nový %2MB oddiel na zariadení %4 (%3) so systémom súborov %1.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Vytvoriť nový <strong>%2MB</strong> oddiel na zariadení <strong>%4</strong> (%3) so systémom súborov <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1120,12 +1125,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>Inštalácia zlyhala</h1><br/>Distribúcia %1 nebola nainštalovaná do vášho počítača.<br/>Chybová hláška: %2.</translation> </message> @@ -1133,27 +1138,27 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Dokončenie</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation>Inštalácia dokončená</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Inštalácia dokončená</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation>Inštalácia distribúcie %1 je dokončená.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>Inštalácia distribúcie %1s je dokončená.</translation> </message> @@ -1162,13 +1167,13 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Naformátovanie oddielu %1 (systém súborov: %2, veľkosť: %3 MB) na %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>Naformátovanie <strong>%3MB</strong> oddielu <strong>%1</strong> so systémom súborov <strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1185,23 +1190,23 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>obsahuje aspoň %1 GB voľného miesta na disku</translation> + <source>has at least %1 GiB available drive space</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>Nie je dostatok miesta na disku. Vyžaduje sa aspoň %1 GB.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>obsahuje aspoň %1 GB voľnej operačnej pamäte</translation> + <source>has at least %1 GiB working memory</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>Počítač neobsahuje dostatok operačnej pamäte. Vyžaduje sa aspoň %1 GB.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1483,12 +1488,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Načítavajú sa údaje umiestnenia...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Umiestnenie</translation> </message> @@ -1877,42 +1882,42 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Koreňový adresár</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Domovský adresár</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Zavádzač</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>Systém EFI</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Odkladací priestor</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Nový oddiel pre %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Nový oddiel</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2300,7 +2305,7 @@ Výstup: <translation>odkladací</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Nerozdelené miesto alebo neznáma tabuľka oddielov</translation> </message> @@ -2315,7 +2320,7 @@ Výstup: <translation>Kontrola požiadaviek modulu <i>%1</i> je dokončená.</translation> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2418,70 +2423,70 @@ Výstup: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation>Úloha zmeny veľkosti systému súborov</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>Neplatná konfigurácia</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation>Úloha zmeny veľkosti systému súborov má neplatnú konfiguráciu a nebude spustená.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation>Jadro KPMCore nie je dostupné</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation>Inštalátor Calamares nemôže spustiť jadro KPMCore pre úlohu zmeny veľkosti systému súborov.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>Zlyhala zmena veľkosti</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation>Systém súborov %1 sa nepodarilo nájsť v tomto systéme a nemôže sa zmeniť jeho veľkosť.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation>Zariadenie %1 sa nepodarilo nájsť v tomto systéme a nemôže sa zmeniť jeho veľkosť.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation>Nedá sa zmeniť veľkosť systému súborov %1.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation>Nedá sa zmeniť veľkosť zariadenia %1.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation>Musí sa zmeniť veľkosť systému súborov %1, ale nedá sa vykonať.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation>Musí sa zmeniť veľkosť zariadenia %1, ale nedá sa vykonať.</translation> </message> @@ -2495,13 +2500,13 @@ Výstup: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>Zmena veľkosti <strong>%2MB</strong> oddielu <strong>%1</strong> na <strong>%3MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Mení sa veľkosť %2MB oddielu %1 na %3MB.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2656,8 +2661,8 @@ Výstup: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>Nastavenie značiek na %1MB oddieli %2.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2671,8 +2676,23 @@ Výstup: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>Vymazanie značiek na %1MB oddieli <strong>%2</strong>.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2685,11 +2705,6 @@ Výstup: <translation>Označenie oddielu <strong>%1</strong> ako <strong>%2</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Označenie %1MB oddielu <strong>%2</strong> ako <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Označenie nového oddielu ako <strong>%1</strong>.</translation> @@ -2700,11 +2715,6 @@ Výstup: <translation>Vymazávajú sa značky na oddieli <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>Vymazávajú sa značky na %1MB oddieli <strong>%2</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>Vymazávajú sa značky na novom oddieli.</translation> @@ -2715,11 +2725,6 @@ Výstup: <translation>Nastavujú sa značky <strong>%2</strong> na oddieli <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>Nastavujú sa značky <strong>%3</strong> na %1MB oddieli <strong>%2</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>Nastavujú sa značky <strong>%1</strong> na novom oddieli.</translation> @@ -3134,7 +3139,7 @@ Výstup: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Uvítanie</translation> </message> diff --git a/lang/calamares_sl.ts b/lang/calamares_sl.ts index 62cc65a6d..1ea9375e5 100644 --- a/lang/calamares_sl.ts +++ b/lang/calamares_sl.ts @@ -97,7 +97,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation type="unfinished"/> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Namesti</translation> </message> @@ -430,124 +435,124 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -555,17 +560,17 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation type="unfinished"/> </message> @@ -702,12 +707,12 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1119,12 +1124,12 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> @@ -1132,27 +1137,27 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Končano</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation type="unfinished"/> </message> @@ -1161,12 +1166,12 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Formatiraj razdelek %1 (datotečni sistem: %2, velikost %3 MB) na %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1184,22 +1189,22 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>ima vsaj %1 GB razpoložljivega prostora na disku</translation> + <source>has at least %1 GiB available drive space</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> + <source>There is not enough drive space. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>ima vsaj %1 GB delovnega pomnilnika</translation> + <source>has at least %1 GiB working memory</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> @@ -1482,12 +1487,12 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Nalaganje podatkov položaja ...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Položaj</translation> </message> @@ -1876,42 +1881,42 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Nov razdelek</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation type="unfinished"/> @@ -2296,7 +2301,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation type="unfinished"/> </message> @@ -2311,7 +2316,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation type="unfinished"/> @@ -2414,70 +2419,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2491,12 +2496,12 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> + <source>Resizing %2MiB partition %1 to %3MiB.</source> <translation type="unfinished"/> </message> <message> @@ -2652,7 +2657,7 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> + <source>Set flags on %1MiB %2 partition.</source> <translation type="unfinished"/> </message> <message> @@ -2667,7 +2672,22 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> <translation type="unfinished"/> </message> <message> @@ -2681,11 +2701,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation type="unfinished"/> @@ -2696,11 +2711,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation type="unfinished"/> @@ -2711,11 +2721,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation type="unfinished"/> @@ -3130,7 +3135,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Dobrodošli</translation> </message> diff --git a/lang/calamares_sq.ts b/lang/calamares_sq.ts index 75679b363..6d3bb2016 100644 --- a/lang/calamares_sq.ts +++ b/lang/calamares_sq.ts @@ -97,7 +97,7 @@ <translation>Mjete</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Të dhëna diagnostikimi</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation>Ujdise</translation> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Instaloje</translation> </message> @@ -431,124 +436,124 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation> <translation><strong>Pjesëzim dorazi</strong><br/>Pjesët mund t’i krijoni dhe ripërmasoni ju vetë.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Vendndodhje ngarkuesi nisjesh:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 do të zvogëlohet në %2MB dhe për %4 do të krijohet një pjesë e re %3MB.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Përzgjidhni &pajisje depozitimi:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>E tanishmja:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Ripërdore %1 si pjesën shtëpi për %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Përzgjidhni një pjesë që të zvogëlohet, mandej tërhiqni shtyllën e poshtme që ta ripërmasoni</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation>%1 do të zvogëlohet në %2MiB dhe për %4 do të krijohet një pjesë e re %3MiB.</translation> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Përzgjidhni një pjesë ku të instalohet</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>Në këtë sistem s’gjendet gjëkundi një pjesë EFI sistemi. Ju lutemi, kthehuni mbrapsht dhe përdorni pjesëzimin dorazi që të rregulloni %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>Për nisjen e %2 do të përdoret pjesa EFI e sistemit te %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>Pjesë Sistemi EFI:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Kjo pajisje depozitimi përmban %1 në të. Ç’do të donit të bënit?<br/>Do të jeni në gjendje të rishqyrtoni dhe ripohoni zgjedhjet tuaja, para se te pajisja e depozitimit të bëhet çfarëdo ndryshimi.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Fshije diskun</strong><br/>Kështu do të <font color=\"red\">fshihen</font> krejt të dhënat të pranishme tani në pajisjen e përzgjedhur.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>Kjo pajisje depozitimi përmban %1 në të. Ç’do të donit të bënit?<br/>Do të jeni në gjendje të rishqyrtoni dhe ripohoni zgjedhjet tuaja, para se te pajisja e depozitimit të bëhet çfarëdo ndryshimi.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation>Pa Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation>Ripërdor Swap-in</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation>Swap (pa Letargji)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation>Swap (me Letargji)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation>Swap në kartelë</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Instaloje në krah të tij</strong><br/>Instaluesi do të zvogëlojë një pjesë për të bërë vend për %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Zëvendëso një pjesë</strong><br/>Zëvendëson një pjesë me %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>Kjo pajisje depozitimi ka tashmë një sistem operativ në të. Ç’do të donit të bënit?<br/>Do të jeni në gjendje të rishqyrtoni dhe ripohoni zgjedhjet tuaja, para se te pajisja e depozitimit të bëhet çfarëdo ndryshimi.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>Kjo pajisje depozitimi ka disa sisteme operativë në të. Ç’do të donit të bënit?<br/>Do të jeni në gjendje të rishqyrtoni dhe ripohoni zgjedhjet tuaja, para se te pajisja e depozitimit të bëhet çfarëdo ndryshimi.</translation> </message> @@ -556,17 +561,17 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Hiqi montimet për veprime pjesëzimi te %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Po hiqen montimet për veprime pjesëzimi te %1.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>U hoqën krejt montimet për %1</translation> </message> @@ -703,13 +708,13 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Krijo pjesë të re %2MB te %4 (%3) me sistem kartelash %1.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation>Krijo pjesë të re %2MiB te %4 (%3) me sistem kartelash %1.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Krijo pjesë të re <strong>%2MB</strong> te <strong>%4</strong> (%3) me sistem kartelash <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation>Krijo pjesë të re <strong>%2MiB</strong> te <strong>%4</strong> (%3) me sistem kartelash <strong>%1</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1120,12 +1125,12 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation> <translation><html><head/><body><p>Kur i vihet shenjë kësaj kutie, sistemi juaj do të riniset menjëherë, kur klikoni mbi <span style=" font-style:italic;">U bë</span> ose mbyllni instaluesin.</p></body></html></translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation><h1>Rregullimi Dështoi</h1><br/>%1 s’u rregullua në kompjuterin tuaj.<br/>Mesazhi i gabimit qe: %2.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>Instalimi Dështoi</h1><br/>%1 s’u instalua në kompjuterin tuaj.<br/>Mesazhi i gabimit qe: %2.</translation> </message> @@ -1133,27 +1138,27 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Përfundoje</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation>Rregullim i Plotësuar</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Instalimi u Plotësua</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation>Rregullimi i %1 u plotësua.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>Instalimi i %1 u plotësua.</translation> </message> @@ -1162,13 +1167,13 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Formatoje pjesën %1 (sistem kartelash: %2, madhësi: %3 MB) në %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation>Formatoje pjesën %1 (sistem kartelash: %2, madhësi: %3 MiB) në %4.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>Formato pjesë <strong>%3MB</strong> <strong>%1</strong> me sistem kartelash <strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation>Formato pjesën <strong>%3MiB</strong> <strong>%1</strong> me sistem kartelash <strong>%2</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1185,23 +1190,23 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>ka të paktën %1 GB hapësirë të përdorshme</translation> + <source>has at least %1 GiB available drive space</source> + <translation>ka të paktën %1 GiB hapësirë të përdorshme</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>S’ka hapësirë të mjaftueshme. Lypset të paktën %1 GB.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation>S’ka hapësirë të mjaftueshme. Lypset të paktën %1 GiB.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>ka të paktën %1 GB kujtesë të përdorshme</translation> + <source>has at least %1 GiB working memory</source> + <translation>ka të paktën %1 GiB kujtesë të përdorshme</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>Sistemi s’ka kujtesë të mjaftueshme për të punuar. Lypsen të paktën %1 GB.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation>Sistemi s’ka kujtesë të mjaftueshme për të punuar. Lypsen të paktën %1 GiB.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1483,12 +1488,12 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Po ngarkohen të dhëna vendndodhjeje…</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Vendndodhje</translation> </message> @@ -1877,42 +1882,42 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Rrënjë</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Shtëpi</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Nisje</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>Sistem EFI</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Pjesë e re për %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Pjesë e re</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2300,7 +2305,7 @@ Përfundim: <translation>swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Hapësirë e papjesëzuar ose tabelë e panjohur pjesësh</translation> </message> @@ -2315,7 +2320,7 @@ Përfundim: <translation>Kontrolli i domosdoshmërive për modulin <i>%1</i> u plotësua.</translation> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2418,70 +2423,70 @@ Përfundim: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation>Akt Ripërmasimi Sistemi Kartelash</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>Formësim i palvefshëm</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation>Akti i ripërmasimit të sistemit të kartela ka një formësim të pavlefshëm dhe nuk do të kryhet.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation>S’ka KPMCore</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation>Calamares s’mund të nisë KPMCore për aktin e ripërmasimit të sistemit të kartelave.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>Ripërmasimi Dështoi</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation>Sistemi %1 i kartelave s’u gjet dot në këtë sistem, dhe s’mund të ripërmasohet.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation>Pajisja %1 s’u gjet dot në këtë sistem, dhe s’mund të ripërmasohet.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation>Sistemi %1 i kartelave s’mund të ripërmasohet.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation>Pajisja %1 s’mund të ripërmasohet.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation>Sistemi %1 i kartelave duhet ripërmasuar, por kjo s’bëhet dot.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation>Pajisja %1 duhet ripërmasuar, por kjo s’bëhet dot.</translation> </message> @@ -2495,13 +2500,13 @@ Përfundim: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>Ripërmasoje pjesën <strong>%2MB</strong> <strong>%1</strong> në <strong>%3MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation>Ripërmasoje pjesën <strong>%2MiB</strong> <strong>%1</strong> në <strong>%3MiB</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Po ripërmasohet ndarja %2MB %1 në %3MB.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation>Po ripërmasohet ndarja %2MiB %1 në %3MiB.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2656,8 +2661,8 @@ Përfundim: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>Vendos flamurka në pjesën %1MB %2.`</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation>Vendos flamurka në pjesën %1MiB %2.`</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2671,8 +2676,23 @@ Përfundim: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>Hiqi flamurkat te ndarja %1MB <strong>%2</strong>.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation>Hiqi flamurkat te pjesa %1MiB <strong>%2</strong>.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation>Vëri flamurkë pjesës %1MiB <strong>%2</strong> si <strong>%3</strong>.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation>Po hiqen flamurkat në pjesën %1MiB <strong>%2</strong>.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation>Po vihen flamurkat <strong>%3</strong> në pjesën %1MiB <strong>%2</strong>.</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2685,11 +2705,6 @@ Përfundim: <translation>Vëri flamurkë pjesës <strong>%1</strong> si <strong>%2</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Vëri flamurkë pjesës %1MB <strong>%2</strong> si <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Vëri flamurkë pjesës së re si <strong>%1</strong>.</translation> @@ -2700,11 +2715,6 @@ Përfundim: <translation>Po hiqen flamurkat në pjesën <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>Po hiqen flamurkat në pjesën %1MB <strong>%2</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>Po hiqen flamurkat në pjesën e re.</translation> @@ -2715,11 +2725,6 @@ Përfundim: <translation>Po vihen flamurkat <strong>%2</strong> në pjesën <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>Po vihen flamurkat <strong>%3</strong> në pjesën %1MB <strong>%2</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>Po vihen flamurkat <strong>%1</strong> në pjesën e re.</translation> @@ -3134,7 +3139,7 @@ Përfundim: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Mirë se vini</translation> </message> diff --git a/lang/calamares_sr.ts b/lang/calamares_sr.ts index 6848f5f79..a63b56a94 100644 --- a/lang/calamares_sr.ts +++ b/lang/calamares_sr.ts @@ -97,7 +97,7 @@ <translation>Алатке</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation type="unfinished"/> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Инсталирај</translation> </message> @@ -430,124 +435,124 @@ The installer will quit and all changes will be lost.</source> <translation><strong>Ручно партиционисање</strong><br/>Сами можете креирати или мењати партције.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Подизни учитавач на:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 биће змањена на %2MB а нова %3MB партиција биће направљена за %4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Изаберите у&ређај за смештање:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Тренутно:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -555,17 +560,17 @@ The installer will quit and all changes will be lost.</source> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Уклони тачке припајања за операције партиције на %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Уклоњене све тачке припајања за %1</translation> </message> @@ -702,12 +707,12 @@ The installer will quit and all changes will be lost.</source> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1119,12 +1124,12 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> @@ -1132,27 +1137,27 @@ The installer will quit and all changes will be lost.</source> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Заврши</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation type="unfinished"/> </message> @@ -1161,12 +1166,12 @@ The installer will quit and all changes will be lost.</source> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1184,22 +1189,22 @@ The installer will quit and all changes will be lost.</source> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> + <source>has at least %1 GiB available drive space</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> + <source>There is not enough drive space. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> + <source>has at least %1 GiB working memory</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> @@ -1482,12 +1487,12 @@ The installer will quit and all changes will be lost.</source> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Локација</translation> </message> @@ -1876,42 +1881,42 @@ The installer will quit and all changes will be lost.</source> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation type="unfinished"/> @@ -2296,7 +2301,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation type="unfinished"/> </message> @@ -2311,7 +2316,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2414,70 +2419,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2491,12 +2496,12 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> + <source>Resizing %2MiB partition %1 to %3MiB.</source> <translation type="unfinished"/> </message> <message> @@ -2652,7 +2657,7 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> + <source>Set flags on %1MiB %2 partition.</source> <translation type="unfinished"/> </message> <message> @@ -2667,7 +2672,22 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> <translation type="unfinished"/> </message> <message> @@ -2681,11 +2701,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation type="unfinished"/> @@ -2696,11 +2711,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation type="unfinished"/> @@ -2711,11 +2721,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation type="unfinished"/> @@ -3130,7 +3135,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Добродошли</translation> </message> diff --git a/lang/calamares_sr@latin.ts b/lang/calamares_sr@latin.ts index d6d6b772f..0d2e2bf6f 100644 --- a/lang/calamares_sr@latin.ts +++ b/lang/calamares_sr@latin.ts @@ -97,7 +97,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation type="unfinished"/> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Instaliraj</translation> </message> @@ -430,124 +435,124 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -555,17 +560,17 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Skini tačke montiranja za operacije nad particijama na %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Sve tačke montiranja na %1 skinute</translation> </message> @@ -702,12 +707,12 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1119,12 +1124,12 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> @@ -1132,27 +1137,27 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Završi</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation type="unfinished"/> </message> @@ -1161,12 +1166,12 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1184,22 +1189,22 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>ima najmanje %1GB slobodnog prostora na disku</translation> + <source>has at least %1 GiB available drive space</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> + <source>There is not enough drive space. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>ima bar %1GB radne memorije</translation> + <source>has at least %1 GiB working memory</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> @@ -1482,12 +1487,12 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Očitavam podatke o lokaciji...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Lokacija</translation> </message> @@ -1876,42 +1881,42 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Nova particija</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation type="unfinished"/> @@ -2296,7 +2301,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation type="unfinished"/> </message> @@ -2311,7 +2316,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation type="unfinished"/> @@ -2414,70 +2419,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2491,12 +2496,12 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> + <source>Resizing %2MiB partition %1 to %3MiB.</source> <translation type="unfinished"/> </message> <message> @@ -2652,7 +2657,7 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> + <source>Set flags on %1MiB %2 partition.</source> <translation type="unfinished"/> </message> <message> @@ -2667,7 +2672,22 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> <translation type="unfinished"/> </message> <message> @@ -2681,11 +2701,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation type="unfinished"/> @@ -2696,11 +2711,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation type="unfinished"/> @@ -2711,11 +2721,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation type="unfinished"/> @@ -3130,7 +3135,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Dobrodošli</translation> </message> diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts index 046ba7ee3..76f8b360c 100644 --- a/lang/calamares_sv.ts +++ b/lang/calamares_sv.ts @@ -97,7 +97,7 @@ <translation>Verktyg</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Avlusningsinformation</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Installera</translation> </message> @@ -430,124 +435,124 @@ Alla ändringar kommer att gå förlorade.</translation> <translation><strong>Manuell partitionering</strong><br/>Du kan själv skapa och ändra storlek på partitionerna.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Sökväg till uppstartshanterare:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 kommer att förminskas till %2 MB och en ny %3 MB-partition kommer att skapas för %4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Välj lagringsenhet:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Nuvarande:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Återanvänd %1 som hempartition för %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Välj en partition att minska, sen dra i nedre fältet för att ändra storlek</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Välj en partition att installera på</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>Ingen EFI-partition kunde inte hittas på systemet. Gå tillbaka och partitionera din lagringsenhet manuellt för att ställa in %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>EFI-partitionen %1 kommer att användas för att starta %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>EFI system partition:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Denna lagringsenhet ser inte ut att ha ett operativsystem installerat. Vad vill du göra?<br/>Du kommer kunna granska och bekräfta dina val innan någon ändring görs på lagringseneheten.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Rensa lagringsenhet</strong><br/>Detta kommer <font color="red">radera</font> all existerande data på den valda lagringsenheten.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>Denna lagringsenhet har %1 på sig. Vad vill du göra?<br/>Du kommer kunna granska och bekräfta dina val innan någon ändring görs på lagringsenheten.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Installera på sidan om</strong><br/>Installationshanteraren kommer krympa en partition för att göra utrymme för %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Ersätt en partition</strong><br/>Ersätter en partition med %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>Denna lagringsenhet har redan ett operativsystem på sig. Vad vill du göra?<br/>Du kommer kunna granska och bekräfta dina val innan någon ändring sker på lagringsenheten.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>Denna lagringsenhet har flera operativsystem på sig. Vad vill du göra?<br/>Du kommer kunna granska och bekräfta dina val innan någon ändring sker på lagringsenheten.</translation> </message> @@ -555,17 +560,17 @@ Alla ändringar kommer att gå förlorade.</translation> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Rensa monteringspunkter för partitionering på %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Rensar monteringspunkter för partitionering på %1.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Rensade alla monteringspunkter för %1</translation> </message> @@ -702,13 +707,13 @@ Alla ändringar kommer att gå förlorade.</translation> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Skapa ny %2MB partition på %4 (%3) med filsystem %1.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Skapa ny <strong>%2MB</strong> partition på <strong>%4 (%3)</strong> med filsystem <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1119,12 +1124,12 @@ Alla ändringar kommer att gå förlorade.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> @@ -1132,27 +1137,27 @@ Alla ändringar kommer att gå förlorade.</translation> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Slutför</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation type="unfinished"/> </message> @@ -1161,12 +1166,12 @@ Alla ändringar kommer att gå förlorade.</translation> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Formatera partition %1 (filsystem: %2, storlek: %3 MB) på %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1184,22 +1189,22 @@ Alla ändringar kommer att gå förlorade.</translation> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>har minst %1 GB tillgängligt utrymme på hårddisken</translation> + <source>has at least %1 GiB available drive space</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> + <source>There is not enough drive space. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>har minst %1 GB arbetsminne</translation> + <source>has at least %1 GiB working memory</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> @@ -1482,12 +1487,12 @@ Alla ändringar kommer att gå förlorade.</translation> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Laddar platsdata...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Plats</translation> </message> @@ -1876,42 +1881,42 @@ Alla ändringar kommer att gå förlorade.</translation> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Root</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Hem</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Boot</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>EFI-system</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Ny partition för %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Ny partition</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2296,7 +2301,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Opartitionerat utrymme eller okänd partitionstabell</translation> </message> @@ -2311,7 +2316,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2414,70 +2419,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2491,13 +2496,13 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Ändrar storlek på %2 MB-partitionen %1 till %3 MB.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2652,7 +2657,7 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> + <source>Set flags on %1MiB %2 partition.</source> <translation type="unfinished"/> </message> <message> @@ -2667,7 +2672,22 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> <translation type="unfinished"/> </message> <message> @@ -2681,11 +2701,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation type="unfinished"/> @@ -2696,11 +2711,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation type="unfinished"/> @@ -2711,11 +2721,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation type="unfinished"/> @@ -3130,7 +3135,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Välkommen</translation> </message> diff --git a/lang/calamares_th.ts b/lang/calamares_th.ts index 6b02c0da9..dffcb5622 100644 --- a/lang/calamares_th.ts +++ b/lang/calamares_th.ts @@ -97,7 +97,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>ข้อมูลดีบั๊ก</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>ติดตั้ง</translation> </message> @@ -430,124 +435,124 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>ไม่พบพาร์ทิชันสำหรับระบบ EFI อยู่ที่ไหนเลยในระบบนี้ กรุณากลับไปเลือกใช้การแบ่งพาร์ทิชันด้วยตนเอง เพื่อติดตั้ง %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>พาร์ทิชันสำหรับระบบ EFI ที่ %1 จะถูกใช้เพื่อเริ่มต้น %2</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>พาร์ทิชันสำหรับระบบ EFI:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -555,17 +560,17 @@ The installer will quit and all changes will be lost.</source> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>ล้างจุดเชื่อมต่อสำหรับการแบ่งพาร์ทิชันบน %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>กำลังล้างจุดเชื่อมต่อสำหรับการดำเนินงานเกี่ยวกับพาร์ทิชันบน %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>ล้างจุดเชื่อมต่อทั้งหมดแล้วสำหรับ %1</translation> </message> @@ -702,12 +707,12 @@ The installer will quit and all changes will be lost.</source> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1119,12 +1124,12 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> @@ -1132,27 +1137,27 @@ The installer will quit and all changes will be lost.</source> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>สิ้นสุด</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation type="unfinished"/> </message> @@ -1161,12 +1166,12 @@ The installer will quit and all changes will be lost.</source> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>ฟอร์แมทพาร์ทิชัน %1 (ระบบไฟล์: %2, ขนาด: %3 MB) บน %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1184,22 +1189,22 @@ The installer will quit and all changes will be lost.</source> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>มีพื้นที่บนไดรฟ์เหลืออย่างน้อย %1 GB</translation> + <source>has at least %1 GiB available drive space</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> + <source>There is not enough drive space. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>มีพื้นที่หน่วยความจำอย่างน้อย %1 GB</translation> + <source>has at least %1 GiB working memory</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> @@ -1482,12 +1487,12 @@ The installer will quit and all changes will be lost.</source> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>กำลังโหลดข้อมูลตำแหน่ง...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>ตำแหน่ง</translation> </message> @@ -1876,42 +1881,42 @@ The installer will quit and all changes will be lost.</source> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>พาร์ทิชันใหม่</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation type="unfinished"/> @@ -2296,7 +2301,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation type="unfinished"/> </message> @@ -2311,7 +2316,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2414,70 +2419,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2491,12 +2496,12 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> + <source>Resizing %2MiB partition %1 to %3MiB.</source> <translation type="unfinished"/> </message> <message> @@ -2652,7 +2657,7 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> + <source>Set flags on %1MiB %2 partition.</source> <translation type="unfinished"/> </message> <message> @@ -2667,7 +2672,22 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> <translation type="unfinished"/> </message> <message> @@ -2681,11 +2701,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation type="unfinished"/> @@ -2696,11 +2711,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation type="unfinished"/> @@ -2711,11 +2721,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation type="unfinished"/> @@ -3130,7 +3135,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>ยินดีต้อนรับ</translation> </message> diff --git a/lang/calamares_tr_TR.ts b/lang/calamares_tr_TR.ts index 06e0c8dce..469a247a3 100644 --- a/lang/calamares_tr_TR.ts +++ b/lang/calamares_tr_TR.ts @@ -97,7 +97,7 @@ <translation>Araçlar</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Hata ayıklama bilgisi</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation>Kur</translation> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Sistem Kuruluyor</translation> </message> @@ -431,125 +436,125 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek.</translation> <translation><strong>Elle bölümleme</strong><br/>Bölümler oluşturabilir ve boyutlandırabilirsiniz.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Önyükleyici konumu:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 %2MB küçülecek ve %4 için %3MB bir disk bölümü oluşturacak.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Depolama ay&gıtı seç:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Geçerli:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation> %2 ev bölümü olarak %1 yeniden kullanılsın.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Küçültmek için bir bölüm seçip alttaki çubuğu sürükleyerek boyutlandır</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation>%1, %2MB'a küçülecek ve %4 için yeni bir %3MB disk bölümü oluşturulacak.</translation> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Yükleyeceğin disk bölümünü seç</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>Bu sistemde EFI disk bölümü bulunamadı. Lütfen geri dönün ve %1 kurmak için gelişmiş kurulum seçeneğini kullanın.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>%1 EFI sistem bölümü %2 başlatmak için kullanılacaktır.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>EFI sistem bölümü:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Bu depolama aygıtı üzerinde yüklü herhangi bir işletim sistemi tespit etmedik. Ne yapmak istersiniz?<br/>Yaptığınız değişiklikler disk bölümü üzerine uygulanmadan önce gözden geçirme fırsatınız olacak.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Diski sil</strong><br/>Seçili depolama bölümündeki mevcut veriler şu anda <font color="red">silinecektir.</font></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>Bu depolama aygıtı üzerinde %1 vardır. Ne yapmak istersiniz?<br/>Yaptığınız değişiklikler disk bölümü üzerine uygulanmadan önce gözden geçirme fırsatınız olacak.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation>Takas alanı yok</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation>Yeniden takas alanı</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation>Takas Alanı (uyku modu yok)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation>Takas Alanı (uyku moduyla)</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation>Takas alanı dosyası</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Yanına yükleyin</strong><br/>Sistem yükleyici disk bölümünü küçülterek %1 için yer açacak.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Varolan bir disk bölümüne kur</strong><br/>Varolan bir disk bölümü üzerine %1 kur.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>Bu depolama aygıtı üzerinde bir işletim sistemi yüklü. Ne yapmak istersiniz? <br/>Yaptığınız değişiklikler disk bölümü üzerine uygulanmadan önce gözden geçirme fırsatınız olacak.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>Bu depolama aygıtı üzerinde birden fazla işletim sistemi var. Ne yapmak istersiniz? <br/>Yaptığınız değişiklikler disk bölümü üzerine uygulanmadan önce gözden geçirme fırsatınız olacak.</translation> </message> @@ -557,17 +562,17 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek.</translation> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>%1 bölümleme işlemleri için sorunsuz bağla</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>%1 bölümleme işlemleri için bağlama noktaları temizleniyor.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>%1 için tüm bağlı bölümler ayrıldı</translation> </message> @@ -704,13 +709,13 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek.</translation> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>%4 üzerinde (%3) ile %1 dosya sisteminde %2MB bölüm oluştur.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation>%4 üzerinde (%3) ile %1 dosya sisteminde %2MB disk bölümü oluştur.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation><strong>%4</strong> üzerinde (%3) ile <strong>%1</strong> dosya sisteminde <strong>%2MB</strong> bölüm oluştur.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation><strong>%4</strong> üzerinde (%3) ile <strong>%1</strong> dosya sisteminde <strong>%2MB</strong> disk bölümü oluştur.</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1121,12 +1126,12 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek.</translation> <translation><html><head/><body><p>Bu kutucuk işaretlenerek <span style="font-style:italic;">Tamam</span> butonu tıklandığında ya da sistem yükleyici kapatıldığında bilgisayarınız yeniden başlatılacaktır.</p></body></html></translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation><h1>Kurulum Başarısız</h1><br/>%1 bilgisayarınıza kurulamadı.<br/>Hata mesajı: %2.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>Yükleme Başarısız</h1><br/>%1 bilgisayarınıza yüklenemedi.<br/>Hata mesajı çıktısı: %2.</translation> </message> @@ -1134,27 +1139,27 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek.</translation> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Kurulum Tamam</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation>Kurulum Tamanlandı</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Kurulum Tamamlandı</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation>%1 kurulumu tamamlandı.</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>Kurulum %1 oranında tamamlandı.</translation> </message> @@ -1163,13 +1168,13 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek.</translation> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>%1 Bölümü biçimle (dosya sistemi: %2 boyut: %3) %4 üzerinde.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation>%1 disk bölümü biçimle (dosya sistemi: %2 boyut: %3) %4 üzerinde.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation><strong>%1</strong> diskine <strong>%2</strong> dosya sistemi ile <strong>%3MB</strong> bölüm oluştur.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation><strong>%1</strong> diskine <strong>%2</strong> dosya sistemi ile <strong>%3MB</strong> disk bölümü oluştur.</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1186,22 +1191,22 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek.</translation> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>En az %1 GB disk alanı olduğundan...</translation> + <source>has at least %1 GiB available drive space</source> + <translation>En az %1 GB disk sürücü alanı var</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>Yeterli disk alanı mevcut değil. En az %1 GB disk alanı gereklidir.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation>Yeterli disk sürücü alanı mevcut değil. En az %1 GB disk alanı gereklidir.</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>En az %1 GB bellek bulunduğundan...</translation> + <source>has at least %1 GiB working memory</source> + <translation>En az %1 GB bellek var</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> <translation>Yeterli ram bellek gereksinimi karşılanamıyor. En az %1 GB ram bellek gereklidir.</translation> </message> <message> @@ -1485,12 +1490,12 @@ Sistem güç kaynağına bağlı değil.</translation> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Yerel verileri yükleniyor...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Sistem Yereli</translation> </message> @@ -1879,42 +1884,42 @@ Sistem güç kaynağına bağlı değil.</translation> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Root</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Home</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Boot</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>EFI sistem</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Swap-Takas</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>%1 için yeni disk bölümü</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Yeni disk bölümü</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2303,7 +2308,7 @@ Output: <translation>Swap-Takas</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Bölümlenmemiş alan veya bilinmeyen bölüm tablosu</translation> </message> @@ -2318,7 +2323,7 @@ Output: <translation><i>%1</i> modülü için gerekenler tamamlandı.</translation> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2421,70 +2426,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation>Dosya Sistemini Yeniden Boyutlandır</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>Geçersiz yapılandırma</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation>Dosya sistemi yeniden boyutlandırma işi sorunlu yapılandırıldı ve çalışmayacak.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation>KPMCore Hazır değil</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation>Calamares dosya sistemi yeniden boyutlandırma işi için KPMCore başlatılamıyor.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>Yeniden Boyutlandırılamadı</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation>%1 dosya sistemi bu sistemde bulunamadı ve yeniden boyutlandırılamıyor.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation>%1 aygıtı bu sistemde bulunamadı ve yeniden boyutlandırılamıyor.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation>%1 dosya sistemi yeniden boyutlandırılamıyor.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation>%1 aygıtı yeniden boyutlandırılamıyor.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation>%1 dosya sistemi yeniden boyutlandırılmalıdır, fakat yapılamaz.</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation>%1 dosya sistemi yeniden boyutlandırılmalıdır, ancak yapılamaz.</translation> </message> @@ -2498,12 +2503,12 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation><strong>%2MB</strong> <strong>%1</strong> disk bölümünü <strong>%3MB</strong> olarak yeniden boyutlandır.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation><strong>%2MB</strong> <strong>%1</strong> disk bölümü <strong>%3MB</strong> olarak yeniden boyutlandır.</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> + <source>Resizing %2MiB partition %1 to %3MiB.</source> <translation>%1 disk bölümü %2 boyutundan %3 boyutuna ayarlanıyor.</translation> </message> <message> @@ -2661,8 +2666,8 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.</t </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>%1MB %2 Disk bölümüne bayrak ayarla.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation>%1MB %2 disk bölümüne bayrak ayarla.</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2676,10 +2681,25 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.</t </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> <translation>%1MB <strong>%2</strong> disk bölümünden bayrakları temizle.</translation> </message> <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation>%1MB <strong>%2</strong> disk bölüm bayrağı <strong>%3</strong> olarak belirlendi.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation>%1MB <strong>%2</strong> disk bölümünden bayraklar temizleniyor.</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation><strong>%3</strong> bayrağı %1MB <strong>%2</strong> disk bölümüne ayarlanıyor.</translation> + </message> + <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> <source>Clear flags on new partition.</source> <translation>Yeni disk bölümünden bayrakları temizle.</translation> @@ -2690,11 +2710,6 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.</t <translation>Bayrak bölüm <strong>%1</strong> olarak <strong>%2</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>%1MB <strong>%2</strong> disk bölüm bayrağı <strong>%3</strong> olarak belirlendi.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Yeni disk bölümü <strong>%1</strong> olarak belirlendi.</translation> @@ -2705,11 +2720,6 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.</t <translation><strong>%1</strong> bölümünden bayraklar kaldırılıyor.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>%1MB <strong>%2</strong> disk bölümünden bayraklar temizleniyor.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>Yeni disk bölümünden bayraklar temizleniyor.</translation> @@ -2720,11 +2730,6 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.</t <translation><strong>%2</strong> bayrakları <strong>%1</strong> bölümüne ayarlandı.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation><strong>%3</strong> bayrağı %1MB <strong>%2</strong> disk bölümüne ayarlanıyor.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>Yeni disk bölümüne <strong>%1</strong> bayrağı ayarlanıyor.</translation> @@ -3139,7 +3144,7 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.</t <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Hoşgeldiniz</translation> </message> diff --git a/lang/calamares_uk.ts b/lang/calamares_uk.ts index 5ced55f8f..58ca795fc 100644 --- a/lang/calamares_uk.ts +++ b/lang/calamares_uk.ts @@ -97,7 +97,7 @@ <translation>Інструменти</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>Відлагоджувальна інформація</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>Встановити</translation> </message> @@ -430,124 +435,124 @@ The installer will quit and all changes will be lost.</source> <translation><strong>Розподілення вручну</strong><br/>Ви можете створити або змінити розмір розділів власноруч.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>Місцезнаходження завантажувача:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>Розділ %1 буде зменьшено до %2Мб та створено новий розділ розміром %3MB для %4.</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>Обрати &пристрій зберігання:</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>Зараз:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>Використати %1 як домашній розділ (home) для %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>Оберіть розділ для зменьшення, потім тягніть повзунок, щоб змінити розмір</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>Оберіть розділ, на який встановити</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>В цій системі не знайдено жодного системного розділу EFI. Щоб встановити %1, будь ласка, поверніться та оберіть розподілення вручну.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>Системний розділ EFI %1 буде використано для встановлення %2.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>Системний розділ EFI:</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>Цей пристрій зберігання, схоже, не має жодної операційної системи. Що ви бажаєте зробити?<br/>У вас буде можливість переглянути та підтвердити все, що ви обрали перед тим, як будуть зроблені будь-які зміни на пристрої зберігання.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>Очистити диск</strong><br/>Це <font color="red">знищить</font> всі данні, присутні на обраному пристрої зберігання.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>На цьому пристрої зберігання є %1. Що ви бажаєте зробити?<br/>У вас буде можливість переглянути та підтвердити все, що ви обрали перед тим, як будуть зроблені будь-які зміни на пристрої зберігання.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>Встановити поруч</strong><br/>Установник зменьшить розмір розділу, щоб вивільнити простір для %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>Замінити розділ</strong><br/>Замінити розділу на %1.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>На цьому пристрої зберігання вже є операційна система. Що ви бажаєте зробити?<br/>У вас буде можливість переглянути та підтвердити все, що ви обрали перед тим, як будуть зроблені будь-які зміни на пристрої зберігання.</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>На цьому пристрої зберігання вже є декілька операційних систем. Що ви бажаєте зробити?<br/>У вас буде можливість переглянути та підтвердити все, що ви обрали перед тим, як будуть зроблені будь-які зміни на пристрої зберігання.</translation> </message> @@ -555,17 +560,17 @@ The installer will quit and all changes will be lost.</source> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>Очистити точки підключення для операцій над розділами на %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>Очищення точок підключення для операцій над розділами на %1.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>Очищено всі точки підключення для %1</translation> </message> @@ -702,13 +707,13 @@ The installer will quit and all changes will be lost.</source> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>Створити новий розділ розміром %2Мб на %4 (%3) з файловою системою %1.</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>Створити новий розділ розміром <strong>%2Мб</strong> на <strong>%4</strong> (%3) з файловою системою <strong>%1</strong>.</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1119,12 +1124,12 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>Встановлення зазнало невдачі</h1><br/>%1 не було встановлено на Ваш комп'ютер.<br/>Повідомлення про помилку: %2.</translation> </message> @@ -1132,27 +1137,27 @@ The installer will quit and all changes will be lost.</source> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>Завершити</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>Встановлення завершено</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>Встановлення %1 завершено.</translation> </message> @@ -1161,13 +1166,13 @@ The installer will quit and all changes will be lost.</source> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>Форматувати розділ %1 (файлова система: %2, розмір: %3 Мб) на %4.</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>Форматувати розділ <strong>%1</strong> розміром <strong>%3Мб</strong> з файловою системою <strong>%2</strong>.</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1184,23 +1189,23 @@ The installer will quit and all changes will be lost.</source> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>має хоча б %1 Гб доступного простору</translation> + <source>has at least %1 GiB available drive space</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>Недостатньо простору на диску. Потрібно хоча б %1 Гб.</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>має хоча б %1 Гб операційної пам'яті</translation> + <source>has at least %1 GiB working memory</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>Система не має достатньо операційної пам'яті. Потрібно хоча б %1 Гб.</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1482,12 +1487,12 @@ The installer will quit and all changes will be lost.</source> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>Завантаження данних про місцезнаходження...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>Місцезнаходження</translation> </message> @@ -1877,42 +1882,42 @@ The installer will quit and all changes will be lost.</source> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>Корінь</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>Домівка</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Завантажувальний розділ</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>EFI-система</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Область підкачки</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>Новий розділ для %1</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>Новий розділ</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2297,7 +2302,7 @@ Output: <translation>область підкачки</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>Нерозподілений простір або невідома таблиця розділів</translation> </message> @@ -2312,7 +2317,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2415,70 +2420,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2492,13 +2497,13 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>Змінити розділ <strong>%1</strong> розміром <strong>%2MB</strong> до розміру <strong>%3MB</strong>.</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>Змінюємо розділ %1 розміром %2MB до розміру %3MB.</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2653,8 +2658,8 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>Встановити прапорці на розділі %2 розміром %1 Мб.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2668,8 +2673,23 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>Очистити прапорці на розділі <strong>%2</strong> розміром %1 Мб.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2682,11 +2702,6 @@ Output: <translation>Встановити прапорці <strong>%2</strong> для розділу <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>Встановити прапорці <strong>%3</strong> для розділу <strong>%2</strong> розміром %1 Мб.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>Встановити прапорці <strong>%1</strong> для нового розділу.</translation> @@ -2697,11 +2712,6 @@ Output: <translation>Очищуємо прапорці для розділу <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>Очищуємо прапорці для розділу <strong>%2</strong> розміром %1 Мб.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>Очищуємо прапорці для нового розділу.</translation> @@ -2712,11 +2722,6 @@ Output: <translation>Встановлюємо прапорці <strong>%2</strong> для розділу <strong>%1</strong>.</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>Встановлюємо прапорці <strong>%3</strong> для розділу <strong>%2</strong> розміром %1 Мб.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>Встановлюємо прапорці <strong>%1</strong> для нового розділу.</translation> @@ -3131,7 +3136,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>Вітаємо</translation> </message> diff --git a/lang/calamares_ur.ts b/lang/calamares_ur.ts index 163c54a3d..ce6ab4deb 100644 --- a/lang/calamares_ur.ts +++ b/lang/calamares_ur.ts @@ -97,7 +97,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation type="unfinished"/> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation type="unfinished"/> </message> @@ -429,124 +434,124 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -554,17 +559,17 @@ The installer will quit and all changes will be lost.</source> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation type="unfinished"/> </message> @@ -701,12 +706,12 @@ The installer will quit and all changes will be lost.</source> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1118,12 +1123,12 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> @@ -1131,27 +1136,27 @@ The installer will quit and all changes will be lost.</source> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation type="unfinished"/> </message> @@ -1160,12 +1165,12 @@ The installer will quit and all changes will be lost.</source> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1183,22 +1188,22 @@ The installer will quit and all changes will be lost.</source> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> + <source>has at least %1 GiB available drive space</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> + <source>There is not enough drive space. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> + <source>has at least %1 GiB working memory</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> @@ -1481,12 +1486,12 @@ The installer will quit and all changes will be lost.</source> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation type="unfinished"/> </message> @@ -1875,42 +1880,42 @@ The installer will quit and all changes will be lost.</source> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation type="unfinished"/> @@ -2295,7 +2300,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation type="unfinished"/> </message> @@ -2310,7 +2315,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation type="unfinished"/> @@ -2413,70 +2418,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2490,12 +2495,12 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> + <source>Resizing %2MiB partition %1 to %3MiB.</source> <translation type="unfinished"/> </message> <message> @@ -2651,7 +2656,7 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> + <source>Set flags on %1MiB %2 partition.</source> <translation type="unfinished"/> </message> <message> @@ -2666,7 +2671,22 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> <translation type="unfinished"/> </message> <message> @@ -2680,11 +2700,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation type="unfinished"/> @@ -2695,11 +2710,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation type="unfinished"/> @@ -2710,11 +2720,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation type="unfinished"/> @@ -3129,7 +3134,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation type="unfinished"/> </message> diff --git a/lang/calamares_uz.ts b/lang/calamares_uz.ts index df44284b6..8911bc80c 100644 --- a/lang/calamares_uz.ts +++ b/lang/calamares_uz.ts @@ -97,7 +97,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation type="unfinished"/> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation type="unfinished"/> </message> @@ -429,124 +434,124 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation type="unfinished"/> </message> @@ -554,17 +559,17 @@ The installer will quit and all changes will be lost.</source> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation type="unfinished"/> </message> @@ -701,12 +706,12 @@ The installer will quit and all changes will be lost.</source> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1118,12 +1123,12 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> @@ -1131,27 +1136,27 @@ The installer will quit and all changes will be lost.</source> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation type="unfinished"/> </message> @@ -1160,12 +1165,12 @@ The installer will quit and all changes will be lost.</source> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> <translation type="unfinished"/> </message> <message> @@ -1183,22 +1188,22 @@ The installer will quit and all changes will be lost.</source> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> + <source>has at least %1 GiB available drive space</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> + <source>There is not enough drive space. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> + <source>has at least %1 GiB working memory</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> <translation type="unfinished"/> </message> <message> @@ -1481,12 +1486,12 @@ The installer will quit and all changes will be lost.</source> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation type="unfinished"/> </message> @@ -1875,42 +1880,42 @@ The installer will quit and all changes will be lost.</source> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation type="unfinished"/> @@ -2295,7 +2300,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation type="unfinished"/> </message> @@ -2310,7 +2315,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation type="unfinished"/> @@ -2413,70 +2418,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2490,12 +2495,12 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> + <source>Resizing %2MiB partition %1 to %3MiB.</source> <translation type="unfinished"/> </message> <message> @@ -2651,7 +2656,7 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> + <source>Set flags on %1MiB %2 partition.</source> <translation type="unfinished"/> </message> <message> @@ -2666,7 +2671,22 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> <translation type="unfinished"/> </message> <message> @@ -2680,11 +2700,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation type="unfinished"/> @@ -2695,11 +2710,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation type="unfinished"/> @@ -2710,11 +2720,6 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation type="unfinished"/> @@ -3129,7 +3134,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation type="unfinished"/> </message> diff --git a/lang/calamares_zh_CN.ts b/lang/calamares_zh_CN.ts index 192957da0..20f4af48e 100644 --- a/lang/calamares_zh_CN.ts +++ b/lang/calamares_zh_CN.ts @@ -98,7 +98,7 @@ <translation>工具</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>调试信息</translation> </message> @@ -106,7 +106,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>安装</translation> </message> @@ -431,124 +436,124 @@ The installer will quit and all changes will be lost.</source> <translation><strong>手动分区</strong><br/>您可以自行创建或重新调整分区大小。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>引导程序位置：</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 将会被缩减到 %2 MB，同时将为 %4 创建空间为 %3MB 的新分区。</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>选择存储器(&V)：</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>当前：</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>将 %1 重用为 %2 的家分区。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>选择要缩小的分区，然后拖动底栏改变大小</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>选择要安装到的分区</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>在此系统上找不到任何 EFI 系统分区。请后退到上一步并使用手动分区配置 %1。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>%1 处的 EFI 系统分区将被用来启动 %2。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>EFI 系统分区：</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>这个存储器上似乎还没有操作系统。您想要怎么做？<br/>在任何变更应用到存储器上前，您都可以重新查看并确认您的选择。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>抹除磁盘</strong><br/>这将会<font color="red">删除</font>目前选定的存储器上所有的数据。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>这个存储器上已经有 %1 了。您想要怎么做？<br/>在任何变更应用到存储器上前，您都可以重新查看并确认您的选择。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>并存安装</strong><br/>安装程序将会缩小一个分区，为 %1 腾出空间。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>取代一个分区</strong><br/>以 %1 <strong>替代</strong>一个分区。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>这个存储器上已经有一个操作系统了。您想要怎么做？<br/>在任何变更应用到存储器上前，您都可以重新查看并确认您的选择。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>这个存储器上已经有多个操作系统了。您想要怎么做？<br/>在任何变更应用到存储器上前，您都可以重新查看并确认您的选择。</translation> </message> @@ -556,17 +561,17 @@ The installer will quit and all changes will be lost.</source> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>清理挂载了的分区以在 %1 进行分区操作</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>正在清理挂载了的分区以在 %1 进行分区操作。</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>已清除 %1 的所有挂载点</translation> </message> @@ -703,13 +708,13 @@ The installer will quit and all changes will be lost.</source> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>在 %4 (%3) 上创建新的 %2MB 分区，使用 %1 文件系统。</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>文件系统在 <strong>%4</strong> (%3) 上创建新的 <strong>%2MB</strong> 分区，使用 <strong>%1</strong>文件系统。</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1121,12 +1126,12 @@ The installer will quit and all changes will be lost.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>安装失败</h1><br/>%1 未在你的电脑上安装。<br/>错误信息：%2。</translation> </message> @@ -1134,27 +1139,27 @@ The installer will quit and all changes will be lost.</source> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>结束</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>安装完成</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>%1 的安装操作已完成。</translation> </message> @@ -1163,13 +1168,13 @@ The installer will quit and all changes will be lost.</source> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>格式化在 %4 的分区 %1 (文件系统：%2，大小：%3 MB)。</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>以文件系统 <strong>%2</strong> 格式化 <strong>%3MB</strong> 的分区 <strong>%1</strong>。</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1186,23 +1191,23 @@ The installer will quit and all changes will be lost.</source> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>至少 %1 GB 可用磁盘空间</translation> + <source>has at least %1 GiB available drive space</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>没有足够的磁盘空间。至少需要 %1 GB。</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>至少 %1 GB 可用内存</translation> + <source>has at least %1 GiB working memory</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>系统没有足够的内存。至少需要 %1 GB。</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1484,12 +1489,12 @@ The installer will quit and all changes will be lost.</source> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>加载位置数据...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>位置</translation> </message> @@ -1878,42 +1883,42 @@ The installer will quit and all changes will be lost.</source> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>根目录</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>主目录</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>引导</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>EFI 系统</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>交换</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>%1 的新分区</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>新建分区</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2301,7 +2306,7 @@ Output: <translation>临时存储空间</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>尚未分区的空间或分区表未知</translation> </message> @@ -2316,7 +2321,7 @@ Output: <translation type="unfinished"/> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1（%2）</translation> @@ -2419,70 +2424,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation type="unfinished"/> </message> @@ -2496,13 +2501,13 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>正将 <strong>%2MB</strong> 的分区<strong>%1</strong>为 <strong>%3MB</strong>。</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>正将 %2MB 的分区%1为 %3MB。</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2657,8 +2662,8 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>设置 %1MB %2 分区的标记.</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2672,8 +2677,23 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>删除 %1MB <strong>%2</strong> 分区的标记.</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2686,11 +2706,6 @@ Output: <translation>将分区 <strong>%2</strong> 标记为 <strong>%1</strong>。</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>将 %1MB <strong>%2</strong> 分区标记为 <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>将新分区标记为 <strong>%1</strong>.</translation> @@ -2701,11 +2716,6 @@ Output: <translation>正在清理分区 <strong>%1</strong> 上的标记。</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>正在删除 %1MB <strong>%2</strong> 分区的标记.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>正在删除新分区的标记.</translation> @@ -2716,11 +2726,6 @@ Output: <translation>正在为分区 <strong>%1</strong> 设置标记 <strong>%2</strong>。</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>正在将 %1MB <strong>%2</strong> 分区标记为 <strong>%3</strong>.</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>正在将新分区标记为 <strong>%1</strong>.</translation> @@ -3135,7 +3140,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>欢迎</translation> </message> diff --git a/lang/calamares_zh_TW.ts b/lang/calamares_zh_TW.ts index fa0d54f2c..804df05fb 100644 --- a/lang/calamares_zh_TW.ts +++ b/lang/calamares_zh_TW.ts @@ -97,7 +97,7 @@ <translation>工具</translation> </message> <message> - <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/> + <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="193"/> <source>Debug information</source> <translation>除錯資訊</translation> </message> @@ -105,7 +105,12 @@ <context> <name>Calamares::ExecutionViewStep</name> <message> - <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="82"/> + <source>Set up</source> + <translation>設定</translation> + </message> + <message> + <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="83"/> <source>Install</source> <translation>安裝</translation> </message> @@ -431,124 +436,124 @@ The installer will quit and all changes will be lost.</source> <translation><strong>手動分割</strong><br/>您可以自行建立或重新調整分割區大小。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1025"/> <source>Boot loader location:</source> <translation>開機載入器位置：</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="970"/> - <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source> - <translation>%1 將會被縮減容量到 %2MB 而一個新的 %3MB 分割區將會被建立為 %4。</translation> - </message> - <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="152"/> <source>Select storage de&vice:</source> <translation>選取儲存裝置(&V)：</translation> </message> <message> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="153"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="951"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="997"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1076"/> <source>Current:</source> <translation>目前：</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="827"/> <source>Reuse %1 as home partition for %2.</source> <translation>重新使用 %1 作為 %2 的家目錄分割區。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="953"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/> <source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source> <translation><strong>選取要縮減的分割區，然後拖曳底部條狀物來調整大小</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1068"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="969"/> + <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> + <translation>%1 將會縮減到 %2MiB 且新的 %3MiB 分割區將會被建立為 %4。</translation> + </message> + <message> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1067"/> <source><strong>Select a partition to install on</strong></source> <translation><strong>選取分割區以安裝在其上</strong></translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1124"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1123"/> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <translation>在這個系統上找不到任何的 EFI 系統分割區。請回到上一步並使用手動分割以設定 %1。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1133"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1132"/> <source>The EFI system partition at %1 will be used for starting %2.</source> <translation>在 %1 的 EFI 系統分割區將會在開始 %2 時使用。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1141"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1140"/> <source>EFI system partition:</source> <translation>EFI 系統分割區：</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1259"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1258"/> <source>This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.</source> <translation>這個儲存裝置上似乎還沒有作業系統。您想要怎麼做？<br/>在任何變更套用到儲存裝置上前，您都可以重新檢視並確認您的選擇。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1325"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1263"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1350"/> <source><strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.</source> <translation><strong>抹除磁碟</strong><br/>這將會<font color="red">刪除</font>目前選取的儲存裝置上所有的資料。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1291"/> <source>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.</source> <translation>這個儲存裝置上已經有 %1 了。您想要怎麼做？<br/>在任何變更套用到儲存裝置上前，您都可以重新檢視並確認您的選擇。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1496"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/> <source>No Swap</source> <translation>沒有 Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1501"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1500"/> <source>Reuse Swap</source> <translation>重用 Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1504"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1503"/> <source>Swap (no Hibernate)</source> <translation>Swap（沒有冬眠）</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1507"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1506"/> <source>Swap (with Hibernate)</source> <translation>Swap（有冬眠）</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1510"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1509"/> <source>Swap to file</source> <translation>Swap 到檔案</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1268"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1298"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1321"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1347"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1267"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1346"/> <source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source> <translation><strong>並存安裝</strong><br/>安裝程式將會縮減一個分割區以讓出空間給 %1。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1272"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1307"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1355"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1271"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1354"/> <source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source> <translation><strong>取代一個分割區</strong><br/>用 %1 取代一個分割區。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1315"/> <source>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.</source> <translation>這個儲存裝置上已經有一個作業系統了。您想要怎麼做？<br/>在任何變更套用到儲存裝置上前，您都可以重新檢視並確認您的選擇。</translation> </message> <message> - <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1342"/> + <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1341"/> <source>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.</source> <translation>這個儲存裝置上已經有多個作業系統了。您想要怎麼做？<br/>在任何變更套用到儲存裝置上前，您都可以重新檢視並確認您的選擇。</translation> </message> @@ -556,17 +561,17 @@ The installer will quit and all changes will be lost.</source> <context> <name>ClearMountsJob</name> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="47"/> <source>Clear mounts for partitioning operations on %1</source> <translation>為了準備分割區操作而完全卸載 %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="55"/> <source>Clearing mounts for partitioning operations on %1.</source> <translation>正在為了準備分割區操作而完全卸載 %1</translation> </message> <message> - <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/> + <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="192"/> <source>Cleared all mounts for %1</source> <translation>已清除所有與 %1 相關的掛載</translation> </message> @@ -703,13 +708,13 @@ The installer will quit and all changes will be lost.</source> <name>CreatePartitionJob</name> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/> - <source>Create new %2MB partition on %4 (%3) with file system %1.</source> - <translation>以 %1 檔案系統在 %4 (%3) 上建立新的 %2MB 分割區。</translation> + <source>Create new %2MiB partition on %4 (%3) with file system %1.</source> + <translation>使用檔案系統 %1 在 %4 (%3) 建立新的 %2MiB 分割區。</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/> - <source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> - <translation>以 <strong>%1</strong> 檔案系統在 <strong>%4</strong> (%3) 上建立新的 <strong>%2MB</strong> 分割區。</translation> + <source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source> + <translation>使用檔案系統 <strong>%1</strong> 在 <strong>%4</strong> (%3) 建立新的 <strong>%2MiB</strong> 分割區。</translation> </message> <message> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/> @@ -1120,12 +1125,12 @@ The installer will quit and all changes will be lost.</source> <translation><html><head/><body><p>當這個勾選框被選取時，您的系統將會在按下<span style="font-style:italic;">完成</span>或關閉安裝程式時立刻重新啟動。</p></body></html></translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="130"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="127"/> <source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source> <translation><h1>設定失敗</h1><br/>%1 並未在您的電腦設定好。<br/>錯誤訊息為：%2。</translation> </message> <message> - <location filename="../src/modules/finished/FinishedPage.cpp" line="136"/> + <location filename="../src/modules/finished/FinishedPage.cpp" line="133"/> <source><h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.</source> <translation><h1>安裝失敗</h1><br/>%1 並未安裝到您的電腦上。<br/>錯誤訊息為：%2。</translation> </message> @@ -1133,27 +1138,27 @@ The installer will quit and all changes will be lost.</source> <context> <name>FinishedViewStep</name> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="61"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="78"/> <source>Finish</source> <translation>完成</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="132"/> <source>Setup Complete</source> <translation>設定完成</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="133"/> <source>Installation Complete</source> <translation>安裝完成</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="135"/> <source>The setup of %1 is complete.</source> <translation>%1 的設定完成。</translation> </message> <message> - <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> + <location filename="../src/modules/finished/FinishedViewStep.cpp" line="136"/> <source>The installation of %1 is complete.</source> <translation>%1 的安裝已完成。</translation> </message> @@ -1162,13 +1167,13 @@ The installer will quit and all changes will be lost.</source> <name>FormatPartitionJob</name> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/> - <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source> - <translation>格式化在 %4 的分割區 %1 （檔案系統： %2 ，大小： %3 MB）。</translation> + <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> + <translation>格式化分割區 %1（檔案系統：%2，大小：%3 MiB）在 %4。</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/> - <source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> - <translation>以檔案系統 <strong>%2</strong> 格式化 <strong>%3MB</strong> 的分割區 <strong>%1</strong>。</translation> + <source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source> + <translation>格式化 <strong>%3MiB</strong> 分割區 <strong>%1</strong>，使用檔案系統 <strong>%2</strong>。</translation> </message> <message> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> @@ -1185,23 +1190,23 @@ The installer will quit and all changes will be lost.</source> <name>GeneralRequirements</name> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="108"/> - <source>has at least %1 GB available drive space</source> - <translation>有至少 %1 GB 的可用磁碟空間</translation> + <source>has at least %1 GiB available drive space</source> + <translation>有至少 %1 GiB 的可用磁碟空間</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="109"/> - <source>There is not enough drive space. At least %1 GB is required.</source> - <translation>沒有足夠的磁碟空間。至少需要 %1 GB。</translation> + <source>There is not enough drive space. At least %1 GiB is required.</source> + <translation>沒有足夠的磁碟空間。至少需要 %1 GiB。</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="116"/> - <source>has at least %1 GB working memory</source> - <translation>有至少 %1 GB 的可用記憶體</translation> + <source>has at least %1 GiB working memory</source> + <translation>有至少 %1 GiB 的可用記憶體</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="117"/> - <source>The system does not have enough working memory. At least %1 GB is required.</source> - <translation>系統沒有足夠的記憶體。至少需要 %1 GB。</translation> + <source>The system does not have enough working memory. At least %1 GiB is required.</source> + <translation>系統沒有足夠的記憶體。至少需要 %1 GiB。</translation> </message> <message> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="124"/> @@ -1483,12 +1488,12 @@ The installer will quit and all changes will be lost.</source> <context> <name>LocaleViewStep</name> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="58"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="55"/> <source>Loading location data...</source> <translation>讀取位置資料 ...</translation> </message> <message> - <location filename="../src/modules/locale/LocaleViewStep.cpp" line="173"/> + <location filename="../src/modules/locale/LocaleViewStep.cpp" line="132"/> <source>Location</source> <translation>位置</translation> </message> @@ -1877,42 +1882,42 @@ The installer will quit and all changes will be lost.</source> <context> <name>PartitionLabelsView</name> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/> <source>Root</source> <translation>根目錄</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="204"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="200"/> <source>Home</source> <translation>家目錄</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/> <source>Boot</source> <translation>Boot</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/> <source>EFI system</source> <translation>EFI 系統</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/> <source>Swap</source> <translation>Swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="213"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="209"/> <source>New partition for %1</source> <translation>%1 的新分割區</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/> <source>New partition</source> <translation>新分割區</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="234"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="230"/> <source>%1 %2</source> <extracomment>size[number] filesystem[name]</extracomment> <translation>%1 %2</translation> @@ -2300,7 +2305,7 @@ Output: <translation>swap</translation> </message> <message> - <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/> + <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="51"/> <source>Unpartitioned space or unknown partition table</source> <translation>尚未分割的空間或是未知的分割表</translation> </message> @@ -2315,7 +2320,7 @@ Output: <translation>模組 <i>%1</i> 需求檢查完成。</translation> </message> <message> - <location filename="../src/libcalamares/utils/LocaleLabel.cpp" line="44"/> + <location filename="../src/libcalamares/locale/Label.cpp" line="44"/> <source>%1 (%2)</source> <extracomment>language[name] (country[name])</extracomment> <translation>%1 (%2)</translation> @@ -2418,70 +2423,70 @@ Output: <context> <name>ResizeFSJob</name> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="116"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="59"/> <source>Resize Filesystem Job</source> <translation>調整檔案系統大小工作</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="172"/> <source>Invalid configuration</source> <translation>無效的設定</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="173"/> <source>The file-system resize job has an invalid configuration and will not run.</source> <translation>檔案系統調整大小工作有無效的設定且將不會執行。</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="244"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="197"/> <source>KPMCore not Available</source> <translation>KPMCore 未提供</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="245"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="255"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="188"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="198"/> <source>Calamares cannot start KPMCore for the file-system resize job.</source> <translation>Calamares 無法啟動 KPMCore 來進行調整檔案系統大小的工作。</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="285"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="311"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="228"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="237"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/> <source>Resize Failed</source> <translation>調整大小失敗</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/> <source>The filesystem %1 could not be found in this system, and cannot be resized.</source> <translation>檔案系統 %1 在此系統中找不到，且無法調整大小。</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="265"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="208"/> <source>The device %1 could not be found in this system, and cannot be resized.</source> <translation>裝置 %1 在此系統中找不到，且無法調整大小。</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="286"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="216"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="229"/> <source>The filesystem %1 cannot be resized.</source> <translation>檔案系統 %1 無法調整大小。</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="287"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="217"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/> <source>The device %1 cannot be resized.</source> <translation>裝置 %1 無法調整大小。</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/> <source>The filesystem %1 must be resized, but cannot.</source> <translation>檔案系統 %1 必須調整大小，但是無法調整。</translation> </message> <message> - <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/> + <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/> <source>The device %1 must be resized, but cannot</source> <translation>裝置 %1 必須調整大小，但是無法調整。</translation> </message> @@ -2495,13 +2500,13 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/> - <source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source> - <translation>重新調整 <strong>%2MB</strong> 的分割區 <strong>%1</strong> 到 <strong>%3MB</strong>。</translation> + <source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source> + <translation>調整 <strong>%2MiB</strong> 分割區 <strong>%1</strong> 大小為 <strong>%3MiB</strong>。</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/> - <source>Resizing %2MB partition %1 to %3MB.</source> - <translation>調整 %2MB 分割區 %1 至 %3MB。</translation> + <source>Resizing %2MiB partition %1 to %3MiB.</source> + <translation>正在調整 %2MiB 分割區 %1 大小為 %3MiB。</translation> </message> <message> <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/> @@ -2656,8 +2661,8 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> - <source>Set flags on %1MB %2 partition.</source> - <translation>在 %1MB 的 %2 分割區上設定旗標。</translation> + <source>Set flags on %1MiB %2 partition.</source> + <translation>在 %1MiB %2 分割區設定旗標。</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> @@ -2671,8 +2676,23 @@ Output: </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> - <source>Clear flags on %1MB <strong>%2</strong> partition.</source> - <translation>清除在 %1MB 的 <strong>%2</strong> 分割區上的旗標。</translation> + <source>Clear flags on %1MiB <strong>%2</strong> partition.</source> + <translation>清除在 %1MiB <strong>%2</strong> 分割區上的旗標。</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> + <source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source> + <translation>將 %1MiB <strong>%2</strong> 分割區標記為 <strong>%3</strong>。</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> + <source>Clearing flags on %1MiB <strong>%2</strong> partition.</source> + <translation>正在清除 %1MiB <strong>%2</strong> 分割區上的旗標。</translation> + </message> + <message> + <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> + <source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source> + <translation>正在為 %1MiB <strong>%2</strong> 分割區設定旗標 <strong>%3</strong>。</translation> </message> <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> @@ -2685,11 +2705,6 @@ Output: <translation>將分割區 <strong>%1</strong> 的旗標設定為 <strong>%2</strong>。</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> - <source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source> - <translation>將 %1MB 的 <strong>%2</strong> 分割區旗標設定為 <strong>%3</strong>。</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <source>Flag new partition as <strong>%1</strong>.</source> <translation>將新割區旗標設定為 <strong>%1</strong>。</translation> @@ -2700,11 +2715,6 @@ Output: <translation>正在分割區 <strong>%1</strong> 上清除旗標。</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> - <source>Clearing flags on %1MB <strong>%2</strong> partition.</source> - <translation>清除在 %1MB 的 <strong>%2</strong> 分割區上的旗標。</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <source>Clearing flags on new partition.</source> <translation>清除在新分割區上的旗標。</translation> @@ -2715,11 +2725,6 @@ Output: <translation>正在分割區 <strong>%1</strong> 上設定旗標。</translation> </message> <message> - <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> - <source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source> - <translation>正在 %1MB 的 <strong>%2</strong> 分割區上設定旗標 <strong>%3</strong>。</translation> - </message> - <message> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <source>Setting flags <strong>%1</strong> on new partition.</source> <translation>正在新分割區上設定旗標 <strong>%1</strong>。</translation> @@ -3134,7 +3139,7 @@ Output: <context> <name>WelcomeViewStep</name> <message> - <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> + <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="55"/> <source>Welcome</source> <translation>歡迎</translation> </message> diff --git a/lang/python.pot b/lang/python.pot index e1a334666..45c97bca8 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -22,11 +22,11 @@ msgstr "" msgid "Configure GRUB." msgstr "Configure GRUB." -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "Mounting partitions." -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -39,7 +39,7 @@ msgstr "Mounting partitions." msgid "Configuration Error" msgstr "Configuration Error" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -90,19 +90,19 @@ msgstr "" msgid "Unmount file systems." msgstr "Unmount file systems." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "Filling up filesystems." -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "rsync failed with error code {}." -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "Failed to unpack image \"{}\"" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" @@ -110,36 +110,36 @@ msgstr "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "No mount point for root partition" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "Bad mount point for root partition" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "rootMountPoint is \"{}\", which does not exist, doing nothing" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "Bad unsquash configuration" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "The filesystem for \"{}\" ({}) is not supported" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "The source filesystem \"{}\" does not exist" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "The destination \"{}\" in the target system is not a directory" @@ -316,7 +316,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Removing one package." msgstr[1] "Removing %(num)d packages." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "Install bootloader." diff --git a/lang/python/ar/LC_MESSAGES/python.po b/lang/python/ar/LC_MESSAGES/python.po index c87694d54..a4313c68d 100644 --- a/lang/python/ar/LC_MESSAGES/python.po +++ b/lang/python/ar/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Abubakaragoub Y <Abubakaryagob@gmail.com>, 2018\n" "Language-Team: Arabic (https://www.transifex.com/calamares/teams/20061/ar/)\n" @@ -25,11 +25,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -42,7 +42,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -90,54 +90,54 @@ msgstr "" msgid "Unmount file systems." msgstr "الغاء تحميل ملف النظام" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -311,7 +311,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/ast/LC_MESSAGES/python.mo b/lang/python/ast/LC_MESSAGES/python.mo Binary files differindex 5c04defa8..c3c75acd6 100644 --- a/lang/python/ast/LC_MESSAGES/python.mo +++ b/lang/python/ast/LC_MESSAGES/python.mo diff --git a/lang/python/ast/LC_MESSAGES/python.po b/lang/python/ast/LC_MESSAGES/python.po index 936b835c8..9fe45fc13 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: enolp <enolp@softastur.org>, 2019\n" "Language-Team: Asturian (https://www.transifex.com/calamares/teams/20061/ast/)\n" @@ -25,11 +25,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -42,7 +42,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -90,19 +90,19 @@ msgstr "" msgid "Unmount file systems." msgstr "Desmontaxe de sistemes de ficheros." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "rsync falló col códigu de fallu {}." -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "Fallu al desempaquetar la imaxe «{}»" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" @@ -110,37 +110,37 @@ msgstr "" "Fallu al alcontrar unsquashfs, asegúrate que tienes instaláu'l paquete " "squashfs-tools" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "Nun hai un puntu de montaxe pa la partición del raigañu" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" "globalstorage nun contién una clave «rootMountPoint». Nun va facese nada" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "El puntu de montaxe ye incorreutu pa la partición del raigañu" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "rootMountPoint ye «{}» que nun esiste. Nun va facese nada" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "La configuración d'espardimientu ye incorreuta" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "El sistema de ficheros pa «{}» ({}) nun ta sofitáu" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "El sistema de ficheros d'orixe «{}» nun esiste" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "El destín «{}» nel sistema de destín nun ye un direutoriu" @@ -309,7 +309,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Desaniciando un paquete." msgstr[1] "Desaniciando %(num)d paquetes." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" @@ -347,7 +347,7 @@ msgstr "" #: src/modules/openrcdmcryptcfg/main.py:34 msgid "Configuring OpenRC dmcrypt service." -msgstr "" +msgstr "Configurando'l serviciu dmcrypt d'OpenRC." #: src/modules/luksbootkeyfile/main.py:35 msgid "Configuring LUKS key file." diff --git a/lang/python/be/LC_MESSAGES/python.po b/lang/python/be/LC_MESSAGES/python.po index 1515b16a1..49944ac60 100644 --- a/lang/python/be/LC_MESSAGES/python.po +++ b/lang/python/be/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Belarusian (https://www.transifex.com/calamares/teams/20061/be/)\n" "MIME-Version: 1.0\n" @@ -21,11 +21,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -38,7 +38,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -86,54 +86,54 @@ msgstr "" msgid "Unmount file systems." msgstr "" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -303,7 +303,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/bg/LC_MESSAGES/python.po b/lang/python/bg/LC_MESSAGES/python.po index 0595c7169..728dac817 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Georgi Georgiev <georgiev_1994@abv.bg>, 2018\n" "Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n" @@ -25,11 +25,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -42,7 +42,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -90,54 +90,54 @@ msgstr "" msgid "Unmount file systems." msgstr "Демонтирай файловите системи." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -303,7 +303,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Премахване на един пакет." msgstr[1] "Премахване на %(num)d пакети." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/ca/LC_MESSAGES/python.po b/lang/python/ca/LC_MESSAGES/python.po index 09807ea11..ce6cdf405 100644 --- a/lang/python/ca/LC_MESSAGES/python.po +++ b/lang/python/ca/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Davidmp <medipas@gmail.com>, 2019\n" "Language-Team: Catalan (https://www.transifex.com/calamares/teams/20061/ca/)\n" @@ -25,11 +25,11 @@ msgstr "" msgid "Configure GRUB." msgstr "Configura el GRUB." -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "Es munten les particions." -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -42,7 +42,7 @@ msgstr "Es munten les particions." msgid "Configuration Error" msgstr "Error de configuració" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -94,19 +94,19 @@ msgstr "" msgid "Unmount file systems." msgstr "Desmunta els sistemes de fitxers." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "S'omplen els sistemes de fitxers." -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "Ha fallat rsync amb el codi d'error {}." -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "Ha fallat desempaquetar la imatge \"{}\"." -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" @@ -114,36 +114,36 @@ msgstr "" "Ha fallat trobar unsquashfs, assegureu-vos que tingueu el paquet squashfs-" "tools instal·lat." -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "No hi ha punt de muntatge per a la partició d'arrel." -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "globalstorage no conté cap clau \"rootMountPoint\". No es fa res." -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "Punt de muntatge incorrecte per a la partició d'arrel" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "El punt de muntatge d'arrel és \"{}\", que no existeix. No es fa res." -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "Configuració incorrecta d'unsquash." -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "El sistema de fitxers per a \"{}\" ({}) no s'admet." -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "El sistema de fitxers font \"{}\" no existeix." -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "La destinació \"{}\" al sistema de destinació no és un directori." @@ -323,7 +323,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Se suprimeix un paquet." msgstr[1] "Se suprimeixen %(num)d paquets." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "S'instal·la el carregador d'arrencada." diff --git a/lang/python/cs_CZ/LC_MESSAGES/python.po b/lang/python/cs_CZ/LC_MESSAGES/python.po index 38bcfb4cb..be17fd6d8 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2019\n" "Language-Team: Czech (Czech Republic) (https://www.transifex.com/calamares/teams/20061/cs_CZ/)\n" @@ -26,11 +26,11 @@ msgstr "" msgid "Configure GRUB." msgstr "Nastavování zavaděče GRUB." -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "Připojování oddílů." -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -43,7 +43,7 @@ msgstr "Připojování oddílů." msgid "Configuration Error" msgstr "Chyba nastavení" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -94,19 +94,19 @@ msgstr "" msgid "Unmount file systems." msgstr "Odpojit souborové systémy." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "Naplňování souborových systémů." -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "rsync se nezdařilo s chybových kódem {}." -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "Nepodařilo se rozbalit obraz „{}“" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" @@ -114,36 +114,36 @@ msgstr "" "Nepodařilo se nalézt unsquashfs – ověřte, že máte nainstalovaný balíček " "squashfs-tools" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "Žádný přípojný bot pro kořenový oddíl" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "globalstorage neobsahuje klíč „rootMountPoint“ – nic se nebude dělat" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "Chybný přípojný bod pro kořenový oddíl" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "kořenovýPřípojnýBod je „{}“, který neexistuje – nic se nebude dělat" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "Chybná nastavení unsquash" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "Souborový systém „{}“ ({}) není podporován" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "Zdrojový souborový systém „{}“ neexistuje" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "Cíl „{}“ v cílovém systému není složka" @@ -326,7 +326,7 @@ msgstr[1] "Odebírají se %(num)d balíčky." msgstr[2] "Odebírá se %(num)d balíčků." msgstr[3] "Odebírá se %(num)d balíčků." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "Instalace zavaděče systému." diff --git a/lang/python/da/LC_MESSAGES/python.mo b/lang/python/da/LC_MESSAGES/python.mo Binary files differindex 7786d48e3..60e2bdda8 100644 --- a/lang/python/da/LC_MESSAGES/python.mo +++ b/lang/python/da/LC_MESSAGES/python.mo diff --git a/lang/python/da/LC_MESSAGES/python.po b/lang/python/da/LC_MESSAGES/python.po index dd3326ba6..271154843 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\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" @@ -26,11 +26,11 @@ msgstr "" msgid "Configure GRUB." msgstr "Konfigurer GRUB." -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "Monterer partitioner." -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -43,12 +43,12 @@ msgstr "Monterer partitioner." msgid "Configuration Error" msgstr "Fejl ved konfiguration" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 msgid "No partitions are defined for <pre>{!s}</pre> to use." -msgstr "" +msgstr "Der er ikke angivet nogle partitioner som <pre>{!s}</pre> skal bruge." #: src/modules/services-systemd/main.py:35 msgid "Configure systemd services" @@ -94,19 +94,19 @@ msgstr "" msgid "Unmount file systems." msgstr "Afmonter filsystemer." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." -msgstr "" +msgstr "Udfylder filsystemer." -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "rsync mislykkedes med fejlkoden {}." -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "Kunne ikke udpakke aftrykket \"{}\"" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" @@ -114,36 +114,36 @@ msgstr "" "Kunne ikke finde unsquashfs, sørg for at squashfs-tools-pakken er " "installeret" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "Intet monteringspunkt til rodpartition" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "globalstorage indeholder ikke en \"rootMountPoint\"-nøgle, gør intet" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "Dårligt monteringspunkt til rodpartition" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "rootMountPoint er \"{}\", hvilket ikke findes, gør intet" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "Dårlig unsquash-konfiguration" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "Filsystemet til \"{}\" ({}) understøttes ikke" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "Kildefilsystemet \"{}\" findes ikke" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "Destinationen \"{}\" i målsystemet er ikke en mappe" @@ -215,6 +215,7 @@ msgstr "Konfigurerer mkinitcpio." #: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 msgid "No root mount point is given for <pre>{!s}</pre> to use." msgstr "" +"Der er ikke angivet noget rodmonteringspunkt som <pre>{!s}</pre> skal bruge." #: src/modules/initcpio/main.py:33 msgid "Creating initramfs with mkinitcpio." @@ -229,6 +230,8 @@ msgid "" "Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was " "<pre>{!s}</pre>." msgstr "" +"Processen <pre>mkinitcpio</pre> mislykkedes med fejlkoden {!s}. Kommandoen " +"blev <pre>{!s}</pre>." #: src/modules/luksopenswaphookcfg/main.py:35 msgid "Configuring encrypted swap." @@ -318,7 +321,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Fjerner én pakke." msgstr[1] "Fjerner %(num)d pakker." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "Installér bootloader." @@ -369,6 +372,7 @@ msgstr "Fejl ved opsætning af krypteret rootfs" #: src/modules/luksbootkeyfile/main.py:75 msgid "Rootfs partition {!s} is LUKS but no passphrase found." msgstr "" +"Rootfs-partitionen {!s} er LUKS men der blev ikke fundet nogen adgangskode." #: src/modules/fstab/main.py:38 msgid "Writing fstab." diff --git a/lang/python/de/LC_MESSAGES/python.mo b/lang/python/de/LC_MESSAGES/python.mo Binary files differindex 6123e84f8..d0f2e4e58 100644 --- a/lang/python/de/LC_MESSAGES/python.mo +++ b/lang/python/de/LC_MESSAGES/python.mo diff --git a/lang/python/de/LC_MESSAGES/python.po b/lang/python/de/LC_MESSAGES/python.po index 7116ad3db..dd59b4958 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Andreas Eitel <github-aneitel@online.de>, 2019\n" "Language-Team: German (https://www.transifex.com/calamares/teams/20061/de/)\n" @@ -27,11 +27,11 @@ msgstr "" msgid "Configure GRUB." msgstr "GRUB konfigurieren." -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "Partitionen mounten." -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -42,14 +42,15 @@ msgstr "Partitionen mounten." #: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 msgid "Configuration Error" -msgstr "" +msgstr "Konfigurationsfehler" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 msgid "No partitions are defined for <pre>{!s}</pre> to use." msgstr "" +"Es sind keine Partitionen für <pre>{!s}</pre> zur Verwendung definiert." #: src/modules/services-systemd/main.py:35 msgid "Configure systemd services" @@ -96,19 +97,19 @@ msgstr "" msgid "Unmount file systems." msgstr "Dateisysteme aushängen." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "Auffüllen von Dateisystemen." -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "rsync fehlgeschlagen mit Fehlercode {}." -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "Entpacken des Image \"{}\" fehlgeschlagen" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" @@ -116,36 +117,36 @@ msgstr "" "Konnte kein unsquashfs finden, stellen Sie sicher, dass Sie das squashfs-" "tools Paket installiert haben" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "Kein Mount-Punkt für die Root-Partition" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "globalstorage enthält keinen \"rootMountPoint\"-Schlüssel, tue nichts" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "Schlechter Mount-Punkt für die Root-Partition" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "rootMountPoint ist \"{}\", welcher nicht existiert, tue nichts" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "Schlechte unsquash Konfiguration" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "Das Dateisystem für \"{}\" ({}) wird nicht unterstützt" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "Das Quelldateisystem \"{}\" existiert nicht" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "Das Ziel \"{}\" im Zielsystem ist kein Verzeichnis" @@ -216,6 +217,7 @@ msgstr "mkinitcpio konfigurieren." #: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 msgid "No root mount point is given for <pre>{!s}</pre> to use." msgstr "" +"Es ist kein Root-Mount-Punkt für <pre>{!s}</pre> zur Verwendung angegeben." #: src/modules/initcpio/main.py:33 msgid "Creating initramfs with mkinitcpio." @@ -223,13 +225,15 @@ msgstr "Erstelle initramfs mit mkinitcpio." #: src/modules/initcpio/main.py:47 msgid "Process Failed" -msgstr "" +msgstr "Prozess fehlgeschlagen" #: src/modules/initcpio/main.py:48 msgid "" "Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was " "<pre>{!s}</pre>." msgstr "" +"Der Prozess <pre>mkinitcpio</pre> ist mit dem Fehlercode {!s} " +"fehlgeschlagen. Der Befehl war <pre>{!s}</pre>." #: src/modules/luksopenswaphookcfg/main.py:35 msgid "Configuring encrypted swap." @@ -319,7 +323,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Entferne ein Paket" msgstr[1] "Entferne %(num)d Pakete." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "Installiere Bootloader." diff --git a/lang/python/el/LC_MESSAGES/python.po b/lang/python/el/LC_MESSAGES/python.po index 655c43294..9dab7d28b 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>, 2017\n" "Language-Team: Greek (https://www.transifex.com/calamares/teams/20061/el/)\n" @@ -25,11 +25,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -42,7 +42,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -90,54 +90,54 @@ msgstr "" msgid "Unmount file systems." msgstr "" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -303,7 +303,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/en_GB/LC_MESSAGES/python.po b/lang/python/en_GB/LC_MESSAGES/python.po index 457cb1c17..ae119927c 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Jason Collins <JasonPCollins@protonmail.com>, 2018\n" "Language-Team: English (United Kingdom) (https://www.transifex.com/calamares/teams/20061/en_GB/)\n" @@ -25,11 +25,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -42,7 +42,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -90,54 +90,54 @@ msgstr "" msgid "Unmount file systems." msgstr "Unmount file systems." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -303,7 +303,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Removing one package." msgstr[1] "Removing %(num)d packages." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/eo/LC_MESSAGES/python.po b/lang/python/eo/LC_MESSAGES/python.po index 46ca234b2..17f5f6917 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Kurt Ankh Phoenix <kurtphoenix@tuta.io>, 2018\n" "Language-Team: Esperanto (https://www.transifex.com/calamares/teams/20061/eo/)\n" @@ -25,11 +25,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -42,7 +42,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -90,54 +90,54 @@ msgstr "" msgid "Unmount file systems." msgstr "Demeti dosieraj sistemoj." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -303,7 +303,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Forigante unu pakaĵo." msgstr[1] "Forigante %(num)d pakaĵoj." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/es/LC_MESSAGES/python.po b/lang/python/es/LC_MESSAGES/python.po index bf29bf3cc..e844affae 100644 --- a/lang/python/es/LC_MESSAGES/python.po +++ b/lang/python/es/LC_MESSAGES/python.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Fito JB, 2019\n" "Language-Team: Spanish (https://www.transifex.com/calamares/teams/20061/es/)\n" @@ -28,11 +28,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -45,7 +45,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -93,19 +93,19 @@ msgstr "" msgid "Unmount file systems." msgstr "Desmontar sistemas de archivos." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "No se pudo desempaquetar la imagen «{}»" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" @@ -113,36 +113,36 @@ msgstr "" "No se encontró unsquashfs; cerciórese de que tenga instalado el paquete " "squashfs-tools" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -310,7 +310,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Eliminando un paquete." msgstr[1] "Eliminando %(num)d paquetes." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/es_MX/LC_MESSAGES/python.po b/lang/python/es_MX/LC_MESSAGES/python.po index a6cfc9df5..e8a93134a 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Logan 8192 <wsses11000@gmail.com>, 2018\n" "Language-Team: Spanish (Mexico) (https://www.transifex.com/calamares/teams/20061/es_MX/)\n" @@ -26,11 +26,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -43,7 +43,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -91,54 +91,54 @@ msgstr "" msgid "Unmount file systems." msgstr "Desmontar sistemas de archivo." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -304,7 +304,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Removiendo un paquete." msgstr[1] "Removiendo %(num)dpaquetes." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/es_PR/LC_MESSAGES/python.po b/lang/python/es_PR/LC_MESSAGES/python.po index 91a6ae3aa..c10458354 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\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" @@ -21,11 +21,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -38,7 +38,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -86,54 +86,54 @@ msgstr "" msgid "Unmount file systems." msgstr "" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -299,7 +299,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/et/LC_MESSAGES/python.po b/lang/python/et/LC_MESSAGES/python.po index 7d4254f34..249dd1d08 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Madis, 2019\n" "Language-Team: Estonian (https://www.transifex.com/calamares/teams/20061/et/)\n" @@ -25,11 +25,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -42,7 +42,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -90,54 +90,54 @@ msgstr "" msgid "Unmount file systems." msgstr "Haagi failisüsteemid lahti." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -303,7 +303,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Eemaldan ühe paketi." msgstr[1] "Eemaldan %(num)d paketti." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/eu/LC_MESSAGES/python.po b/lang/python/eu/LC_MESSAGES/python.po index 25a67db77..70b4167a3 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\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" @@ -25,11 +25,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -42,7 +42,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -90,54 +90,54 @@ msgstr "" msgid "Unmount file systems." msgstr "Fitxategi sistemak desmuntatu." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -306,7 +306,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Pakete bat kentzen." msgstr[1] "%(num)dpakete kentzen." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/fa/LC_MESSAGES/python.po b/lang/python/fa/LC_MESSAGES/python.po index 950e89372..094b31bb2 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\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" @@ -21,11 +21,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -38,7 +38,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -86,54 +86,54 @@ msgstr "" msgid "Unmount file systems." msgstr "" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -299,7 +299,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/fi_FI/LC_MESSAGES/python.mo b/lang/python/fi_FI/LC_MESSAGES/python.mo Binary files differindex 391391cef..cc21c37d4 100644 --- a/lang/python/fi_FI/LC_MESSAGES/python.mo +++ b/lang/python/fi_FI/LC_MESSAGES/python.mo diff --git a/lang/python/fi_FI/LC_MESSAGES/python.po b/lang/python/fi_FI/LC_MESSAGES/python.po index 3463447b4..3905c909a 100644 --- a/lang/python/fi_FI/LC_MESSAGES/python.po +++ b/lang/python/fi_FI/LC_MESSAGES/python.po @@ -3,13 +3,17 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # +# Translators: +# Kimmo Kujansuu <mrkujansuu@gmail.com>, 2019 +# #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" +"Last-Translator: Kimmo Kujansuu <mrkujansuu@gmail.com>, 2019\n" "Language-Team: Finnish (Finland) (https://www.transifex.com/calamares/teams/20061/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,13 +23,13 @@ msgstr "" #: src/modules/grubcfg/main.py:37 msgid "Configure GRUB." -msgstr "" +msgstr "Määritä GRUB." -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." -msgstr "" +msgstr "Yhdistä osiot." -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -36,9 +40,9 @@ msgstr "" #: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 msgid "Configuration Error" -msgstr "" +msgstr "Määritysvirhe" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -47,12 +51,12 @@ msgstr "" #: src/modules/services-systemd/main.py:35 msgid "Configure systemd services" -msgstr "" +msgstr "Määritä systemd palvelut" #: src/modules/services-systemd/main.py:68 #: src/modules/services-openrc/main.py:102 msgid "Cannot modify service" -msgstr "" +msgstr "Palvelua ei voi muokata" #: src/modules/services-systemd/main.py:69 msgid "" @@ -84,56 +88,58 @@ msgstr "" #: src/modules/umount/main.py:40 msgid "Unmount file systems." -msgstr "" +msgstr "Irrota tiedostojärjestelmät käytöstä." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." -msgstr "" +msgstr "Paikannetaan tiedostojärjestelmiä." -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." -msgstr "" +msgstr "rsync epäonnistui virhekoodilla {}." -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" -msgstr "" +msgstr "Kuvan purkaminen epäonnistui \"{}\"" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" +"Ei löytynyt unsquashfs, varmista, että sinulla on squashfs-tools paketti " +"asennettuna" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -299,7 +305,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/fr/LC_MESSAGES/python.mo b/lang/python/fr/LC_MESSAGES/python.mo Binary files differindex 97311f1e3..9919ffc53 100644 --- a/lang/python/fr/LC_MESSAGES/python.mo +++ b/lang/python/fr/LC_MESSAGES/python.mo diff --git a/lang/python/fr/LC_MESSAGES/python.po b/lang/python/fr/LC_MESSAGES/python.po index 685169a7e..20aa77057 100644 --- a/lang/python/fr/LC_MESSAGES/python.po +++ b/lang/python/fr/LC_MESSAGES/python.po @@ -12,15 +12,16 @@ # Doryan R, 2019 # Seboss666 <sebastien_verdet@seboss666.info>, 2019 # Florian B <florianb3522@gmail.com>, 2019 +# Arnaud Ferraris <arnaud.ferraris@gmail.com>, 2019 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Florian B <florianb3522@gmail.com>, 2019\n" +"Last-Translator: Arnaud Ferraris <arnaud.ferraris@gmail.com>, 2019\n" "Language-Team: French (https://www.transifex.com/calamares/teams/20061/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,11 +33,11 @@ msgstr "" msgid "Configure GRUB." msgstr "Configuration du GRUB." -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "Montage des partitions." -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -47,14 +48,15 @@ msgstr "Montage des partitions." #: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 msgid "Configuration Error" -msgstr "" +msgstr "Erreur de configuration" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 msgid "No partitions are defined for <pre>{!s}</pre> to use." msgstr "" +"Aucune partition n'est définie pour être utilisée par <pre>{!s}</pre>." #: src/modules/services-systemd/main.py:35 msgid "Configure systemd services" @@ -101,19 +103,19 @@ msgstr "" msgid "Unmount file systems." msgstr "Démonter les systèmes de fichiers" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "Remplir les systèmes de fichiers." -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "rsync a échoué avec le code d'erreur {}." -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "Impossible de décompresser l'image \"{}\"" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" @@ -121,36 +123,36 @@ msgstr "" "Échec de la recherche de unsquashfs, assurez-vous que le paquetage squashfs-" "tools est installé." -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "Pas de point de montage pour la partition racine" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "globalstorage ne contient pas de clé \"rootMountPoint\", ne fait rien" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "Mauvais point de montage pour la partition racine" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "rootMountPoint est \"{}\", ce qui n'existe pas, ne fait rien" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "Mauvaise configuration unsquash" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "Le système de fichiers pour \"{}\" ({}) n'est pas supporté" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "Le système de fichiers source \"{}\" n'existe pas" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "La destination \"{}\" dans le système cible n'est pas un répertoire" @@ -223,6 +225,8 @@ msgstr "Configuration de mkinitcpio." #: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 msgid "No root mount point is given for <pre>{!s}</pre> to use." msgstr "" +"Aucun point de montage racine n'a été donné pour être utilisé par " +"<pre>{!s}</pre>." #: src/modules/initcpio/main.py:33 msgid "Creating initramfs with mkinitcpio." @@ -230,13 +234,15 @@ msgstr "Création de l'initramfs avec mkinitcpio." #: src/modules/initcpio/main.py:47 msgid "Process Failed" -msgstr "" +msgstr "Échec du processus" #: src/modules/initcpio/main.py:48 msgid "" "Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was " "<pre>{!s}</pre>." msgstr "" +"Le processus <pre>mkinitcpio</pre> a échoué avec le code d'erreur {!s}. La " +"commande était <pre>{!s}</pre>." #: src/modules/luksopenswaphookcfg/main.py:35 msgid "Configuring encrypted swap." @@ -328,7 +334,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Suppression d'un paquet." msgstr[1] "Suppression de %(num)d paquets." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "Installation du bootloader." @@ -379,6 +385,8 @@ msgstr "Erreur du chiffrement du setup rootfs" #: src/modules/luksbootkeyfile/main.py:75 msgid "Rootfs partition {!s} is LUKS but no passphrase found." msgstr "" +"La partition racine {!s} est de type LUKS mais aucune phrase de passe n'a " +"été trouvée." #: src/modules/fstab/main.py:38 msgid "Writing fstab." diff --git a/lang/python/fr_CH/LC_MESSAGES/python.po b/lang/python/fr_CH/LC_MESSAGES/python.po index ea282cff2..0a11411ce 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\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" @@ -21,11 +21,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -38,7 +38,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -86,54 +86,54 @@ msgstr "" msgid "Unmount file systems." msgstr "" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -299,7 +299,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/gl/LC_MESSAGES/python.po b/lang/python/gl/LC_MESSAGES/python.po index 0e2c02de1..ec16f9216 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\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" @@ -25,11 +25,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -42,7 +42,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -90,54 +90,54 @@ msgstr "" msgid "Unmount file systems." msgstr "Desmontar sistemas de ficheiros." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -306,7 +306,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "A retirar un paquete." msgstr[1] "A retirar %(num)d paquetes." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/gu/LC_MESSAGES/python.po b/lang/python/gu/LC_MESSAGES/python.po index a040f071a..440bb35bf 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\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" @@ -21,11 +21,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -38,7 +38,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -86,54 +86,54 @@ msgstr "" msgid "Unmount file systems." msgstr "" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -299,7 +299,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/he/LC_MESSAGES/python.po b/lang/python/he/LC_MESSAGES/python.po index 510fa9b09..8f50e96a1 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>, 2019\n" "Language-Team: Hebrew (https://www.transifex.com/calamares/teams/20061/he/)\n" @@ -26,11 +26,11 @@ msgstr "" msgid "Configure GRUB." msgstr "הגדרת GRUB." -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "מחיצות מעוגנות." -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -43,7 +43,7 @@ msgstr "מחיצות מעוגנות." msgid "Configuration Error" msgstr "שגיאת הגדרות" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -94,54 +94,54 @@ msgstr "" msgid "Unmount file systems." msgstr "ניתוק עיגון מערכות קבצים." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "מערכות הקבצים מתמלאות." -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "rsync נכשל עם קוד השגיאה {}." -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "פריסת התמונה „{}” נכשלה" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "איתור unsquashfs לא צלח, נא לוודא שהחבילה squashfs-tools מותקנת" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "אין נקודת עגינה למחיצת העל" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "ב־globalstorage אין את המפתח „rootMountPoint”, לא תתבצע אף פעולה" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "נקודת העגינה של מחיצת השורה שגויה" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "rootMountPoint מוגדרת בתור „{}”, שאינו קיים, לא תתבצע אף פעולה" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "תצורת unsquash שגויה" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "מערכת הקבצים עבור „{}” ({}) אינה נתמכת" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "מערכת הקבצים במקור „{}” אינה קיימת" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "היעד „{}” במערכת הקבצים המיועדת אינו תיקייה" @@ -320,7 +320,7 @@ msgstr[1] "מתבצעת הסרה של %(num)d חבילות." msgstr[2] "מתבצעת הסרה של %(num)d חבילות." msgstr[3] "מתבצעת הסרה של %(num)d חבילות." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "התקנת מנהל אתחול." diff --git a/lang/python/hi/LC_MESSAGES/python.po b/lang/python/hi/LC_MESSAGES/python.po index c1ae66033..def5861be 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Panwar108 <caspian7pena@gmail.com>, 2018\n" "Language-Team: Hindi (https://www.transifex.com/calamares/teams/20061/hi/)\n" @@ -25,11 +25,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -42,7 +42,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -90,54 +90,54 @@ msgstr "" msgid "Unmount file systems." msgstr "फ़ाइल सिस्टम माउंट से हटाएँ।" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -303,7 +303,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "एक पैकेज हटाया जा रहा है।" msgstr[1] "%(num)d पैकेज हटाए जा रहे हैं।" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/hr/LC_MESSAGES/python.po b/lang/python/hr/LC_MESSAGES/python.po index 8856d16ac..6dc371680 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Lovro Kudelić <lovro.kudelic@outlook.com>, 2019\n" "Language-Team: Croatian (https://www.transifex.com/calamares/teams/20061/hr/)\n" @@ -25,11 +25,11 @@ msgstr "" msgid "Configure GRUB." msgstr "Konfigurirajte GRUB." -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "Montiranje particija." -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -42,7 +42,7 @@ msgstr "Montiranje particija." msgid "Configuration Error" msgstr "Greška konfiguracije" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -94,19 +94,19 @@ msgstr "" msgid "Unmount file systems." msgstr "Odmontiraj datotečne sustave." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "Popunjavanje datotečnih sustava." -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "rsync nije uspio s kodom pogreške {}." -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "Otpakiravnje slike nije uspjelo \"{}\"" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" @@ -114,36 +114,36 @@ msgstr "" "Neuspješno pronalaženje unsquashfs, provjerite imate li instaliran paket " "squashfs-tools" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "Nema točke montiranja za root particiju" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "globalstorage ne sadrži ključ \"rootMountPoint\", ne radi ništa" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "Neispravna točka montiranja za root particiju" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "rootMountPoint je \"{}\", što ne postoji, ne radi ništa" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "Neispravna unsquash konfiguracija" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "Datotečni sustav za \"{}\" ({}) nije podržan" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "Izvorni datotečni sustav \"{}\" ne postoji" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "Odredište \"{}\" u ciljnom sustavu nije direktorij" @@ -323,7 +323,7 @@ msgstr[0] "Uklanjam paket." msgstr[1] "Uklanjam %(num)d pakete." msgstr[2] "Uklanjam %(num)d pakete." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "Instalirajte bootloader." diff --git a/lang/python/hu/LC_MESSAGES/python.mo b/lang/python/hu/LC_MESSAGES/python.mo Binary files differindex ad62e5a82..c56dc4aec 100644 --- a/lang/python/hu/LC_MESSAGES/python.mo +++ b/lang/python/hu/LC_MESSAGES/python.mo diff --git a/lang/python/hu/LC_MESSAGES/python.po b/lang/python/hu/LC_MESSAGES/python.po index 4b64aa7f2..312b49a8b 100644 --- a/lang/python/hu/LC_MESSAGES/python.po +++ b/lang/python/hu/LC_MESSAGES/python.po @@ -7,15 +7,16 @@ # Adriaan de Groot <groot@kde.org>, 2018 # Balázs Meskó <meskobalazs@gmail.com>, 2018 # miku84, 2019 +# Lajos Pasztor <mrlajos@gmail.com>, 2019 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: miku84, 2019\n" +"Last-Translator: Lajos Pasztor <mrlajos@gmail.com>, 2019\n" "Language-Team: Hungarian (https://www.transifex.com/calamares/teams/20061/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,13 +26,13 @@ msgstr "" #: src/modules/grubcfg/main.py:37 msgid "Configure GRUB." -msgstr "" +msgstr "GRUB konfigurálása." -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." -msgstr "" +msgstr "Partíciók csatolása." -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -42,14 +43,14 @@ msgstr "" #: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 msgid "Configuration Error" -msgstr "" +msgstr "Konfigurációs hiba" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 msgid "No partitions are defined for <pre>{!s}</pre> to use." -msgstr "" +msgstr "Nincsenek partíciók meghatározva a <pre>{!s}</pre> használatához." #: src/modules/services-systemd/main.py:35 msgid "Configure systemd services" @@ -64,82 +65,89 @@ msgstr "a szolgáltatást nem lehet módosítani" msgid "" "<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}." msgstr "" +"<code>systemctl {arg!s}</code> hívás a chroot-ban hibakódot okozott {num!s}." #: src/modules/services-systemd/main.py:72 #: src/modules/services-systemd/main.py:76 msgid "Cannot enable systemd service <code>{name!s}</code>." msgstr "" +"Nem sikerült a systemd szolgáltatást engedélyezni: <code>{name!s}</code>." #: src/modules/services-systemd/main.py:74 msgid "Cannot enable systemd target <code>{name!s}</code>." -msgstr "" +msgstr "Nem sikerült a systemd célt engedélyezni: <code>{name!s}</code>." #: src/modules/services-systemd/main.py:78 msgid "Cannot disable systemd target <code>{name!s}</code>." -msgstr "" +msgstr "Nem sikerült a systemd cél <code>{name!s}</code> letiltása." #: src/modules/services-systemd/main.py:80 msgid "Cannot mask systemd unit <code>{name!s}</code>." -msgstr "" +msgstr "Nem maszkolható systemd egység: <code>{name!s}</code>." #: src/modules/services-systemd/main.py:82 msgid "" "Unknown systemd commands <code>{command!s}</code> and " "<code>{suffix!s}</code> for unit {name!s}." msgstr "" +"Ismeretlen systemd parancsok <code>{command!s}</code> és " +"<code>{suffix!s}</code> a {name!s} egységhez. " #: src/modules/umount/main.py:40 msgid "Unmount file systems." msgstr "Fájlrendszerek leválasztása." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "Fájlrendszerek betöltése." -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "az rsync elhalt a(z) {} hibakóddal" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "\"{}\" kép kicsomagolása nem sikerült" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" +"unsquashfs nem található, győződj meg róla a squashfs-tools csomag telepítve" +" van." -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "Nincs betöltési pont a root partíciónál" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" +"globalstorage nem tartalmaz \"rootMountPoint\" kulcsot, semmi nem történik" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "Rossz betöltési pont a root partíciónál" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" -msgstr "" +msgstr "rootMountPoint is \"{}\", ami nem létezik, semmi nem történik" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" -msgstr "" +msgstr "Rossz unsquash konfiguráció" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "A(z) ({}) fájlrendszer nem támogatott a következőhöz: \"{}\"" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "A forrás fájlrendszer \"{}\" nem létezik" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "Az elérés \"{}\" nem létező könyvtár a cél rendszerben" @@ -201,7 +209,7 @@ msgstr "A kijelzőkezelő konfigurációja hiányos volt" #: src/modules/initcpiocfg/main.py:36 msgid "Configuring mkinitcpio." -msgstr "" +msgstr "mkinitcpio konfigurálása." #: src/modules/initcpiocfg/main.py:192 #: src/modules/luksopenswaphookcfg/main.py:100 @@ -209,25 +217,27 @@ msgstr "" #: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317 #: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 msgid "No root mount point is given for <pre>{!s}</pre> to use." -msgstr "" +msgstr "Nincs root csatolási pont megadva a <pre>{!s}</pre> használatához." #: src/modules/initcpio/main.py:33 msgid "Creating initramfs with mkinitcpio." -msgstr "" +msgstr "initramfs létrehozása mkinitcpio utasítással." #: src/modules/initcpio/main.py:47 msgid "Process Failed" -msgstr "" +msgstr "Folyamat elhalt" #: src/modules/initcpio/main.py:48 msgid "" "Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was " "<pre>{!s}</pre>." msgstr "" +"<pre>mkinitcpio</pre> folyamat elhalt, hibakód {!s}. A parancs " +"<pre>{!s}</pre> volt." #: src/modules/luksopenswaphookcfg/main.py:35 msgid "Configuring encrypted swap." -msgstr "" +msgstr "Titkosított swap konfigurálása." #: src/modules/rawfs/main.py:35 msgid "Installing data." @@ -239,7 +249,7 @@ msgstr "OpenRC szolgáltatások beállítása" #: src/modules/services-openrc/main.py:66 msgid "Cannot add service {name!s} to run-level {level!s}." -msgstr "" +msgstr "Nem lehet {name!s} szolgáltatást hozzáadni a run-level {level!s}." #: src/modules/services-openrc/main.py:68 msgid "Cannot remove service {name!s} from run-level {level!s}." @@ -250,11 +260,14 @@ msgid "" "Unknown service-action <code>{arg!s}</code> for service {name!s} in run-" "level {level!s}." msgstr "" +"Ismeretlen service-action <code>{arg!s}</code> a szolgáltatáshoz {name!s} in" +" run-level {level!s}." #: src/modules/services-openrc/main.py:103 msgid "" "<code>rc-update {arg!s}</code> call in chroot returned error code {num!s}." msgstr "" +"<code>rc-update {arg!s}</code> hívás a chroot-ban hibakódot adott: {num!s}." #: src/modules/services-openrc/main.py:110 msgid "Target runlevel does not exist" @@ -265,6 +278,8 @@ msgid "" "The path for runlevel {level!s} is <code>{path!s}</code>, which does not " "exist." msgstr "" +"A futási-szint elérési útja {level!s} ami <code>{path!s}</code>, nem " +"létezik." #: src/modules/services-openrc/main.py:119 msgid "Target service does not exist" @@ -275,6 +290,7 @@ msgid "" "The path for service {name!s} is <code>{path!s}</code>, which does not " "exist." msgstr "" +"A szolgáltatás {name!s} elérési útja <code>{path!s}</code>, nem létezik." #: src/modules/plymouthcfg/main.py:36 msgid "Configure Plymouth theme" @@ -307,9 +323,9 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Egy csomag eltávolítása." msgstr[1] "%(num)d csomag eltávolítása." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." -msgstr "" +msgstr "Rendszerbetöltő telepítése." #: src/modules/removeuser/main.py:34 msgid "Remove live user from target system" @@ -317,51 +333,51 @@ msgstr "Éles felhasználó eltávolítása a cél rendszerből" #: src/modules/initramfs/main.py:35 msgid "Creating initramfs." -msgstr "" +msgstr "initramfs létrehozása." #: src/modules/initramfs/main.py:49 msgid "Failed to run update-initramfs on the target" -msgstr "" +msgstr "Nem sikerült futtatni update-initramfs a célon." #: src/modules/initramfs/main.py:50 src/modules/dracut/main.py:59 msgid "The exit code was {}" -msgstr "" +msgstr "A kilépési kód {} volt." #: src/modules/hwclock/main.py:35 msgid "Setting hardware clock." -msgstr "" +msgstr "Rendszeridő beállítása." #: src/modules/dracut/main.py:36 msgid "Creating initramfs with dracut." -msgstr "" +msgstr "initramfs létrehozása ezzel: dracut." #: src/modules/dracut/main.py:58 msgid "Failed to run dracut on the target" -msgstr "" +msgstr "dracut futtatása nem sikerült a célon." #: src/modules/initramfscfg/main.py:41 msgid "Configuring initramfs." -msgstr "" +msgstr "initramfs konfigurálása." #: src/modules/openrcdmcryptcfg/main.py:34 msgid "Configuring OpenRC dmcrypt service." -msgstr "" +msgstr "OpenRC dmcrypt szolgáltatás konfigurálása." #: src/modules/luksbootkeyfile/main.py:35 msgid "Configuring LUKS key file." -msgstr "" +msgstr "LUKS kulcs fájl konfigurálása." #: src/modules/luksbootkeyfile/main.py:74 msgid "Encrypted rootfs setup error" -msgstr "" +msgstr "Titkosított rootfs telepítési hiba" #: src/modules/luksbootkeyfile/main.py:75 msgid "Rootfs partition {!s} is LUKS but no passphrase found." -msgstr "" +msgstr "A rootfs partíció {!s} az LUKS de nem található a jelszó." #: src/modules/fstab/main.py:38 msgid "Writing fstab." -msgstr "" +msgstr "fstab írása." #: src/modules/dummypython/main.py:44 msgid "Dummy python job." @@ -373,8 +389,8 @@ msgstr "Hamis {}. Python lépés" #: src/modules/localecfg/main.py:39 msgid "Configuring locales." -msgstr "" +msgstr "nyelvi értékek konfigurálása." #: src/modules/networkcfg/main.py:37 msgid "Saving network configuration." -msgstr "" +msgstr "Hálózati konfiguráció mentése." diff --git a/lang/python/id/LC_MESSAGES/python.po b/lang/python/id/LC_MESSAGES/python.po index f74367dcf..df50b1c1f 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Wantoyo <wantoyek@gmail.com>, 2018\n" "Language-Team: Indonesian (https://www.transifex.com/calamares/teams/20061/id/)\n" @@ -27,11 +27,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -44,7 +44,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -92,54 +92,54 @@ msgstr "" msgid "Unmount file systems." msgstr "Lepaskan sistem berkas." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -305,7 +305,7 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "mencopot %(num)d paket" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/is/LC_MESSAGES/python.po b/lang/python/is/LC_MESSAGES/python.po index 1fd1b9662..8951d0806 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\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" @@ -25,11 +25,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -42,7 +42,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -90,54 +90,54 @@ msgstr "" msgid "Unmount file systems." msgstr "Aftengja skráarkerfi." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -303,7 +303,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Fjarlægi einn pakka." msgstr[1] "Fjarlægi %(num)d pakka." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/it_IT/LC_MESSAGES/python.po b/lang/python/it_IT/LC_MESSAGES/python.po index 116ad132e..dcfe22404 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Pierfrancesco Passerini <p.passerini@gmail.com>, 2019\n" "Language-Team: Italian (Italy) (https://www.transifex.com/calamares/teams/20061/it_IT/)\n" @@ -27,11 +27,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -44,7 +44,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -92,19 +92,19 @@ msgstr "" msgid "Unmount file systems." msgstr "Smonta i file system." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "rsync fallita con codice d'errore {}." -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "Estrazione dell'immagine \"{}\" fallita" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" @@ -112,36 +112,36 @@ msgstr "" "Impossibile trovare unsquashfs, assicurati di aver installato il pacchetto " "squashfs-tools" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "Nessun punto di montaggio per la partizione di root" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "Punto di montaggio per la partizione di root errato" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "Configurazione unsquash errata" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "Il filesystem per \"{}\" ({}) non è supportato" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "Il filesystem sorgente \"{}\" non esiste" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "La destinazione del sistema \"{}\" non è una directory" @@ -312,7 +312,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Rimuovendo un pacchetto." msgstr[1] "Rimozione di %(num)d pacchetti." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/ja/LC_MESSAGES/python.po b/lang/python/ja/LC_MESSAGES/python.po index 5cab89942..e079227af 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Takefumi Nagata, 2019\n" "Language-Team: Japanese (https://www.transifex.com/calamares/teams/20061/ja/)\n" @@ -27,11 +27,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -44,7 +44,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -92,54 +92,54 @@ msgstr "" msgid "Unmount file systems." msgstr "ファイルシステムをアンマウントする。" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "エラーコード {} によりrsyncを失敗。" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "イメージ \"{}\" の展開に失敗" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "unsquashfs が見つかりませんでした。 squashfs-toolsがインストールされているか、確認してください。" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "ルートパーティションのためのマウントポイントがありません" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "globalstorage に \"rootMountPoint\" キーが含まれていません。何もしません。" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "ルートパーティションのためのマウントポイントが不正です" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "ルートマウントポイントは \"{}\" ですが、存在しません。何もできません。" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "unsquash の設定が不正です" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "ファイルシステム \"{}\" ({}) はサポートされていません" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "ソースファイルシステム \"{}\" は存在しません" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "ターゲットシステムの宛先 \"{}\" はディレクトリではありません" @@ -303,7 +303,7 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] " %(num)d パッケージの削除中。" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/kk/LC_MESSAGES/python.po b/lang/python/kk/LC_MESSAGES/python.po index 70b473fb8..39250d442 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\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" @@ -21,11 +21,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -38,7 +38,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -86,54 +86,54 @@ msgstr "" msgid "Unmount file systems." msgstr "" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -299,7 +299,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/kn/LC_MESSAGES/python.po b/lang/python/kn/LC_MESSAGES/python.po index 6a4bae1cd..42610e704 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\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" @@ -21,11 +21,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -38,7 +38,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -86,54 +86,54 @@ msgstr "" msgid "Unmount file systems." msgstr "" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -299,7 +299,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/ko/LC_MESSAGES/python.mo b/lang/python/ko/LC_MESSAGES/python.mo Binary files differindex 914142618..5a79cb0a1 100644 --- a/lang/python/ko/LC_MESSAGES/python.mo +++ b/lang/python/ko/LC_MESSAGES/python.mo diff --git a/lang/python/ko/LC_MESSAGES/python.po b/lang/python/ko/LC_MESSAGES/python.po index 7045ba76b..b87f21667 100644 --- a/lang/python/ko/LC_MESSAGES/python.po +++ b/lang/python/ko/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: 이정희 <daemul72@gmail.com>, 2019\n" "Language-Team: Korean (https://www.transifex.com/calamares/teams/20061/ko/)\n" @@ -24,13 +24,13 @@ msgstr "" #: src/modules/grubcfg/main.py:37 msgid "Configure GRUB." -msgstr "" +msgstr "GRUB 구성" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." -msgstr "" +msgstr "파티션 마운트 중." -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -41,14 +41,14 @@ msgstr "" #: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 msgid "Configuration Error" -msgstr "" +msgstr "구성 오류" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 msgid "No partitions are defined for <pre>{!s}</pre> to use." -msgstr "" +msgstr "사용할 <pre>{!s}</pre>에 대해 정의된 파티션이 없음." #: src/modules/services-systemd/main.py:35 msgid "Configure systemd services" @@ -93,54 +93,54 @@ msgstr "" msgid "Unmount file systems." msgstr "파일 시스템 마운트를 해제합니다." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "파일 시스템을 채우는 중." -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "rsync가 {} 오류 코드로 실패했습니다." -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "\"{}\" 이미지의 압축을 풀지 못했습니다." -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "unsquashfs를 찾지 못했습니다. squashfs-tools 패키지가 설치되어 있는지 확인하십시오." -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "루트 파티션에 대한 마운트 위치 없음" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "globalstorage에는 \"rootMountPoint \" 키가 포함되어 있지 않으며 아무 작업도 수행하지 않습니다." -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "루트 파티션에 대한 잘못된 마운트 위치" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "rootMountPoint는 \"{}\"이고, 존재하지 않으며, 아무 작업도 수행하지 않습니다." -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "잘못된 unsquash 구성" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "\"{}\" ({})의 파일시스템은 지원되지 않습니다." -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "\"{}\" 소스 파일시스템은 존재하지 않습니다." -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "대상 시스템의 \"{}\" 목적지가 디렉토리가 아닙니다." @@ -201,7 +201,7 @@ msgstr "디스플레이 관리자 구성이 완료되지 않았습니다." #: src/modules/initcpiocfg/main.py:36 msgid "Configuring mkinitcpio." -msgstr "" +msgstr "mkinitcpio 구성 중." #: src/modules/initcpiocfg/main.py:192 #: src/modules/luksopenswaphookcfg/main.py:100 @@ -209,25 +209,27 @@ msgstr "" #: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317 #: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 msgid "No root mount point is given for <pre>{!s}</pre> to use." -msgstr "" +msgstr "<pre>{!s}</pre>에서 사용할 루트 마운트 지점이 제공되지 않음." #: src/modules/initcpio/main.py:33 msgid "Creating initramfs with mkinitcpio." -msgstr "" +msgstr "mkinitcpio를 사용하여 initramfs 만드는 중." #: src/modules/initcpio/main.py:47 msgid "Process Failed" -msgstr "" +msgstr "프로세스 실패" #: src/modules/initcpio/main.py:48 msgid "" "Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was " "<pre>{!s}</pre>." msgstr "" +"오류 코드 {!s}이(가) 포함된 프로세스 <pre>mkinitcpio</pre>가 실패했습니다. 명령은 " +"<pre>{!s}</pre>입니다" #: src/modules/luksopenswaphookcfg/main.py:35 msgid "Configuring encrypted swap." -msgstr "" +msgstr "암호화된 스왑 구성 중." #: src/modules/rawfs/main.py:35 msgid "Installing data." @@ -307,9 +309,9 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "%(num)d개의 패키지들을 제거하는 중입니다." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." -msgstr "" +msgstr "부트로더 설치." #: src/modules/removeuser/main.py:34 msgid "Remove live user from target system" @@ -317,51 +319,51 @@ msgstr "대상 시스템에서 라이브 사용자 제거" #: src/modules/initramfs/main.py:35 msgid "Creating initramfs." -msgstr "" +msgstr "initramfs를 만드는 중." #: src/modules/initramfs/main.py:49 msgid "Failed to run update-initramfs on the target" -msgstr "" +msgstr "대상에서 update-initramfs 실행 실패" #: src/modules/initramfs/main.py:50 src/modules/dracut/main.py:59 msgid "The exit code was {}" -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 "dracut을 사용하여 initramfs 만들기." #: src/modules/dracut/main.py:58 msgid "Failed to run dracut on the target" -msgstr "" +msgstr "대상에서 dracut을 실행하지 못함" #: 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 "OpenRC dmcrypt 서비스 구성 중." #: src/modules/luksbootkeyfile/main.py:35 msgid "Configuring LUKS key file." -msgstr "" +msgstr "LUKS 키 파일 구성 중." #: src/modules/luksbootkeyfile/main.py:74 msgid "Encrypted rootfs setup error" -msgstr "" +msgstr "암호화된 rootfs 설정 오류" #: src/modules/luksbootkeyfile/main.py:75 msgid "Rootfs partition {!s} is LUKS but no passphrase found." -msgstr "" +msgstr "Rootfs 파티션 {!s}은(는) LUKS이지만 암호구문을 찾을 수 없음." #: src/modules/fstab/main.py:38 msgid "Writing fstab." -msgstr "" +msgstr "fstab 쓰기." #: src/modules/dummypython/main.py:44 msgid "Dummy python job." @@ -373,8 +375,8 @@ msgstr "더미 파이썬 단계 {}" #: 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/lo/LC_MESSAGES/python.po b/lang/python/lo/LC_MESSAGES/python.po index 65999615b..0f6f4b98f 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\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" @@ -21,11 +21,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -38,7 +38,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -86,54 +86,54 @@ msgstr "" msgid "Unmount file systems." msgstr "" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -297,7 +297,7 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/lt/LC_MESSAGES/python.po b/lang/python/lt/LC_MESSAGES/python.po index 3730c5c07..33b04a553 100644 --- a/lang/python/lt/LC_MESSAGES/python.po +++ b/lang/python/lt/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Moo, 2019\n" "Language-Team: Lithuanian (https://www.transifex.com/calamares/teams/20061/lt/)\n" @@ -25,11 +25,11 @@ msgstr "" msgid "Configure GRUB." msgstr "Konfigūruoti GRUB." -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "Prijungiami skaidiniai." -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -42,7 +42,7 @@ msgstr "Prijungiami skaidiniai." msgid "Configuration Error" msgstr "Konfigūracijos klaida" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -94,19 +94,19 @@ msgstr "" msgid "Unmount file systems." msgstr "Atjungti failų sistemas." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "Užpildomos failų sistemos." -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "rsync patyrė nesėkmę su klaidos kodu {}." -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "Nepavyko išpakuoti atvaizdį \"{}\"" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" @@ -114,36 +114,36 @@ msgstr "" "Nepavyko rasti unsquashfs, įsitikinkite, kad esate įdiegę squashfs-tools " "paketą" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "Nėra prijungimo taško šaknies skaidiniui" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "globalstorage viduje nėra \"rootMountPoint\" rakto, nieko nedaroma" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "Blogas šaknies skaidinio prijungimo taškas" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "rootMountPoint yra \"{}\", kurio nėra, nieko nedaroma" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "Bloga unsquash konfigūracija" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "\"{}\" ({}) failų sistema yra nepalaikoma" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "Šaltinio failų sistemos \"{}\" nėra" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "Paskirties vieta \"{}\", esanti paskirties sistemoje, nėra katalogas" @@ -326,7 +326,7 @@ msgstr[1] "Šalinami %(num)d paketai." msgstr[2] "Šalinama %(num)d paketų." msgstr[3] "Šalinama %(num)d paketų." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "Įdiegti paleidyklę." diff --git a/lang/python/mk/LC_MESSAGES/python.po b/lang/python/mk/LC_MESSAGES/python.po index 7276122c3..dd8d7be90 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Martin Ristovski <martinristovski@protonmail.com>, 2018\n" "Language-Team: Macedonian (https://www.transifex.com/calamares/teams/20061/mk/)\n" @@ -25,11 +25,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -42,7 +42,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -90,54 +90,54 @@ msgstr "" msgid "Unmount file systems." msgstr "" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -303,7 +303,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/mr/LC_MESSAGES/python.po b/lang/python/mr/LC_MESSAGES/python.po index e2579c928..d78d2a388 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\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" @@ -21,11 +21,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -38,7 +38,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -86,54 +86,54 @@ msgstr "" msgid "Unmount file systems." msgstr "" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -299,7 +299,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/nb/LC_MESSAGES/python.po b/lang/python/nb/LC_MESSAGES/python.po index fe6b94644..d13d8f9db 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Tyler Moss <inactive+lazerbeta@transifex.com>, 2017\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/calamares/teams/20061/nb/)\n" @@ -25,11 +25,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -42,7 +42,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -90,54 +90,54 @@ msgstr "" msgid "Unmount file systems." msgstr "" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -303,7 +303,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/ne_NP/LC_MESSAGES/python.po b/lang/python/ne_NP/LC_MESSAGES/python.po index 8508223a0..dacef3610 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\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" @@ -21,11 +21,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -38,7 +38,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -86,54 +86,54 @@ msgstr "" msgid "Unmount file systems." msgstr "" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -299,7 +299,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/nl/LC_MESSAGES/python.po b/lang/python/nl/LC_MESSAGES/python.po index d0acb569f..c7bfa8a93 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Adriaan de Groot <groot@kde.org>, 2019\n" "Language-Team: Dutch (https://www.transifex.com/calamares/teams/20061/nl/)\n" @@ -25,11 +25,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -42,7 +42,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -90,56 +90,56 @@ msgstr "" msgid "Unmount file systems." msgstr "" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "Geen mount-punt voor de root-partitie" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "globalstorage bevat geen sleutel \"rootMountPoint\", er wordt niks gedaan" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "Onjuist mount-punt voor de root-partitie" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" "rootMountPoint is ingesteld op \"{}\", welke niet bestaat, er wordt niks " "gedaan" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -305,7 +305,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/pl/LC_MESSAGES/python.po b/lang/python/pl/LC_MESSAGES/python.po index ca480c6cd..e7d8ea3be 100644 --- a/lang/python/pl/LC_MESSAGES/python.po +++ b/lang/python/pl/LC_MESSAGES/python.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # # Translators: -# Marcin Mikołajczak <me@m4sk.in>, 2017 +# Marcin Mikołajczak <me@mkljczk.pl>, 2017 # KagiSame, 2018 # Piotr Strębski <strebski@gmail.com>, 2019 # @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Piotr Strębski <strebski@gmail.com>, 2019\n" "Language-Team: Polish (https://www.transifex.com/calamares/teams/20061/pl/)\n" @@ -27,11 +27,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -44,7 +44,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -92,19 +92,19 @@ msgstr "" msgid "Unmount file systems." msgstr "Odmontuj systemy plików." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "rsync zakończyło działanie kodem błędu {}." -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "Błąd rozpakowywania obrazu \"{}\"" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" @@ -112,40 +112,40 @@ msgstr "" "Nie można odnaleźć unsquashfs, upewnij się, że masz zainstalowany pakiet " "squashfs-tools" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "Brak punktu montowania partycji root" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" "globalstorage nie zawiera klucza \"rootMountPoint\", nic nie zostanie " "zrobione" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "Błędny punkt montowania partycji root" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" "Punkt montowania partycji root (rootMountPoint) jest \"{}\", które nie " "istnieje; nic nie zostanie zrobione" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "Błędna konfiguracja unsquash" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "System plików dla \"{}\" ({}) nie jest obsługiwany" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "Źródłowy system plików \"{}\" nie istnieje" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "Miejsce docelowe \"{}\" w docelowym systemie nie jest katalogiem" @@ -317,7 +317,7 @@ msgstr[1] "Usuwanie %(num)d pakietów." msgstr[2] "Usuwanie %(num)d pakietów." msgstr[3] "Usuwanie %(num)d pakietów." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/pt_BR/LC_MESSAGES/python.po b/lang/python/pt_BR/LC_MESSAGES/python.po index a92ff3ca8..34d356d77 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Guilherme <guimarcalsilva@gmail.com>, 2019\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/calamares/teams/20061/pt_BR/)\n" @@ -26,11 +26,11 @@ msgstr "" msgid "Configure GRUB." msgstr "Configurar GRUB." -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "Montando partições." -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -43,7 +43,7 @@ msgstr "Montando partições." msgid "Configuration Error" msgstr "Erro de Configuração." -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -95,19 +95,19 @@ msgstr "" msgid "Unmount file systems." msgstr "Desmontar os sistemas de arquivos." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "Preenchendo sistemas de arquivos." -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "O rsync falhou com o código de erro {}." -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "Ocorreu uma falha ao descompactar a imagem \"{}\"" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" @@ -115,36 +115,36 @@ msgstr "" "Ocorreu uma falha ao localizar o unsquashfs, certifique-se de que o pacote " "squashfs-tools esteja instalado" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "Nenhum ponto de montagem para a partição root" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "O globalstorage não contém uma chave \"rootMountPoint\". Nada foi feito." -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "Ponto de montagem incorreto para a partição root" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "O rootMountPoint é \"{}\", mas ele não existe. Nada foi feito." -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "Configuração incorreta do unsquash" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "O sistema de arquivos para \"{}\" ({}) não é suportado" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "O sistema de arquivos de origem \"{}\" não existe" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "A destinação \"{}\" no sistema de destino não é um diretório" @@ -326,7 +326,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Removendo um pacote." msgstr[1] "Removendo %(num)d pacotes." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "Instalar bootloader." diff --git a/lang/python/pt_PT/LC_MESSAGES/python.mo b/lang/python/pt_PT/LC_MESSAGES/python.mo Binary files differindex 05a5ed7db..a1760e7bd 100644 --- a/lang/python/pt_PT/LC_MESSAGES/python.mo +++ b/lang/python/pt_PT/LC_MESSAGES/python.mo diff --git a/lang/python/pt_PT/LC_MESSAGES/python.po b/lang/python/pt_PT/LC_MESSAGES/python.po index add684bf1..5b8417f60 100644 --- a/lang/python/pt_PT/LC_MESSAGES/python.po +++ b/lang/python/pt_PT/LC_MESSAGES/python.po @@ -5,17 +5,17 @@ # # Translators: # Nuno Amorim <inovaty@gmail.com>, 2018 -# Ricardo Simões <xmcorporation@gmail.com>, 2019 # Hugo Carvalho <hugokarvalho@hotmail.com>, 2019 +# Ricardo Simões <xmcorporation@gmail.com>, 2019 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>, 2019\n" +"Last-Translator: Ricardo Simões <xmcorporation@gmail.com>, 2019\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/calamares/teams/20061/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,11 +27,11 @@ msgstr "" msgid "Configure GRUB." msgstr "Configurar o GRUB." -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "A montar partições." -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -42,14 +42,14 @@ msgstr "A montar partições." #: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 msgid "Configuration Error" -msgstr "" +msgstr "Erro de configuração" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 msgid "No partitions are defined for <pre>{!s}</pre> to use." -msgstr "" +msgstr "Nenhuma partição está definida para <pre>{!s}</pre> usar." #: src/modules/services-systemd/main.py:35 msgid "Configure systemd services" @@ -96,19 +96,19 @@ msgstr "" msgid "Unmount file systems." msgstr "Desmontar sistemas de ficheiro." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." -msgstr "" +msgstr "A preencher os sistemas de ficheiros." -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "rsync falhou com código de erro {}." -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "Falha ao descompactar imagem \"{}\"" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" @@ -116,36 +116,36 @@ msgstr "" "Falha ao procurar unsquashfs, certifique-se que tem o pacote squashfs-tools " "instalado" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "Nenhum ponto de montagem para a partição root" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "globalstorage não contém um \"rootMountPoint\" chave, nada a fazer" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "Ponto de montagem mau para partição root" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "rootMountPoint é \"{}\", que não existe, nada a fazer" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "Má configuração unsquash" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "O sistema de ficheiros \"{}\" ({}) não é suportado" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "O sistema de ficheiros fonte \"{}\" não existe" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "O destino \"{}\" no sistema alvo não é uma diretoria" @@ -208,7 +208,7 @@ msgstr "A configuração do gestor de exibição estava incompleta" #: src/modules/initcpiocfg/main.py:36 msgid "Configuring mkinitcpio." -msgstr "" +msgstr "A configurar o mkintcpio." #: src/modules/initcpiocfg/main.py:192 #: src/modules/luksopenswaphookcfg/main.py:100 @@ -323,7 +323,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "A remover um pacote." msgstr[1] "A remover %(num)d pacotes." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" @@ -357,7 +357,7 @@ msgstr "" #: src/modules/initramfscfg/main.py:41 msgid "Configuring initramfs." -msgstr "" +msgstr "A configurar o initramfs." #: src/modules/openrcdmcryptcfg/main.py:34 msgid "Configuring OpenRC dmcrypt service." diff --git a/lang/python/ro/LC_MESSAGES/python.po b/lang/python/ro/LC_MESSAGES/python.po index 581654d16..d44258d49 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Sebastian Brici <bricisebastian@gmail.com>, 2018\n" "Language-Team: Romanian (https://www.transifex.com/calamares/teams/20061/ro/)\n" @@ -26,11 +26,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -43,7 +43,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -91,54 +91,54 @@ msgstr "" msgid "Unmount file systems." msgstr "Demonteaza sistemul de fisiere" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -306,7 +306,7 @@ msgstr[0] "Se elimină un pachet." msgstr[1] "Se elimină %(num)d pachet." msgstr[2] "Se elimină %(num)d de pachete." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/ru/LC_MESSAGES/python.po b/lang/python/ru/LC_MESSAGES/python.po index 1356437a8..5f7b89f05 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Aleksey Kabanov <ak099@mail.ru>, 2018\n" "Language-Team: Russian (https://www.transifex.com/calamares/teams/20061/ru/)\n" @@ -25,11 +25,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -42,7 +42,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -90,54 +90,54 @@ msgstr "" msgid "Unmount file systems." msgstr "" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -307,7 +307,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/sk/LC_MESSAGES/python.po b/lang/python/sk/LC_MESSAGES/python.po index 22c891284..5b9b232e1 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Dušan Kazik <prescott66@gmail.com>, 2018\n" "Language-Team: Slovak (https://www.transifex.com/calamares/teams/20061/sk/)\n" @@ -25,11 +25,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -42,7 +42,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -90,54 +90,54 @@ msgstr "" msgid "Unmount file systems." msgstr "Odpojenie súborových systémov." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -307,7 +307,7 @@ msgstr[1] "Odstraňujú sa %(num)d balíky." msgstr[2] "Odstraňuje sa %(num)d balíkov." msgstr[3] "Odstraňuje sa %(num)d balíkov." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/sl/LC_MESSAGES/python.po b/lang/python/sl/LC_MESSAGES/python.po index c59499b54..8fd268026 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\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" @@ -21,11 +21,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -38,7 +38,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -86,54 +86,54 @@ msgstr "" msgid "Unmount file systems." msgstr "" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -303,7 +303,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/sq/LC_MESSAGES/python.po b/lang/python/sq/LC_MESSAGES/python.po index e7748261c..f27126d0f 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Besnik <besnik@programeshqip.org>, 2019\n" "Language-Team: Albanian (https://www.transifex.com/calamares/teams/20061/sq/)\n" @@ -25,11 +25,11 @@ msgstr "" msgid "Configure GRUB." msgstr "Formësoni GRUB-in." -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "Po montohen pjesë." -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -42,7 +42,7 @@ msgstr "Po montohen pjesë." msgid "Configuration Error" msgstr "Gabim Formësimi" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -94,19 +94,19 @@ msgstr "" msgid "Unmount file systems." msgstr "Çmontoni sisteme kartelash." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "Po mbushen sisteme kartelash." -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "rsync dështoi me kod gabimi {}." -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "Dështoi shpaketimi i figurës \"{}\"" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" @@ -114,36 +114,36 @@ msgstr "" "S’u arrit të gjendej unsquashfs, sigurohuni se e keni të instaluar paketën " "squashfs-tools" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "S’ka pikë montimi për ndarjen rrënjë" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "globalstorage nuk përmban një vlerë \"rootMountPoint\", s’po bëhet gjë" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "Pikë e gabuar montimi për ndarjen rrënjë" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "rootMountPoint është \"{}\", që s’ekziston, s’po bëhet gjë" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "Formësim i keq i unsquash-it" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "Sistemi i kartelave për \"{}\" ({}) nuk mbulohet" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "Sistemi i kartelave \"{}\" ({}) s’ekziston" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "Destinacioni \"{}\" te sistemi i synuar s’është drejtori" @@ -322,7 +322,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Po hiqet një paketë." msgstr[1] "Po hiqen %(num)d paketa." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "Instalo ngarkues nisjesh." diff --git a/lang/python/sr/LC_MESSAGES/python.po b/lang/python/sr/LC_MESSAGES/python.po index 2bf5222b8..12e7eb789 100644 --- a/lang/python/sr/LC_MESSAGES/python.po +++ b/lang/python/sr/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Serbian (https://www.transifex.com/calamares/teams/20061/sr/)\n" "MIME-Version: 1.0\n" @@ -21,11 +21,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -38,7 +38,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -86,54 +86,54 @@ msgstr "" msgid "Unmount file systems." msgstr "" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -301,7 +301,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/sr@latin/LC_MESSAGES/python.po b/lang/python/sr@latin/LC_MESSAGES/python.po index e6ecd9ae3..e612846bc 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\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" @@ -21,11 +21,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -38,7 +38,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -86,54 +86,54 @@ msgstr "" msgid "Unmount file systems." msgstr "" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -301,7 +301,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/sv/LC_MESSAGES/python.po b/lang/python/sv/LC_MESSAGES/python.po index ee8938470..291e9cf6d 100644 --- a/lang/python/sv/LC_MESSAGES/python.po +++ b/lang/python/sv/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Swedish (https://www.transifex.com/calamares/teams/20061/sv/)\n" "MIME-Version: 1.0\n" @@ -21,11 +21,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -38,7 +38,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -86,54 +86,54 @@ msgstr "" msgid "Unmount file systems." msgstr "" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -299,7 +299,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/th/LC_MESSAGES/python.po b/lang/python/th/LC_MESSAGES/python.po index d4395ecf4..da9cee122 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\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" @@ -21,11 +21,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -38,7 +38,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -86,54 +86,54 @@ msgstr "" msgid "Unmount file systems." msgstr "" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -297,7 +297,7 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/tr_TR/LC_MESSAGES/python.po b/lang/python/tr_TR/LC_MESSAGES/python.po index b4e4468f7..b99773b24 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Demiray Muhterem <mdemiray@msn.com>, 2019\n" "Language-Team: Turkish (Turkey) (https://www.transifex.com/calamares/teams/20061/tr_TR/)\n" @@ -25,11 +25,11 @@ msgstr "" msgid "Configure GRUB." msgstr "GRUB'u yapılandır." -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "Disk bölümleri bağlanıyor." -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -42,7 +42,7 @@ msgstr "Disk bölümleri bağlanıyor." msgid "Configuration Error" msgstr "Yapılandırma Hatası" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -94,56 +94,56 @@ msgstr "" msgid "Unmount file systems." msgstr "Dosya sistemlerini ayırın." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "Dosya sistemini genişlet." -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "rsync {} hata koduyla başarısız oldu." -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "\"{}\" kurulum medyası aktarılamadı" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" "Unsquashfs bulunamadı, squashfs-tools paketinin kurulu olduğundan emin olun." -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "kök disk bölümü için bağlama noktası yok" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" "globalstorage bir \"rootMountPoint\" anahtarı içermiyor, hiçbirşey yapılmadı" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "Kök disk bölümü için hatalı bağlama noktası" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "rootMountPoint \"{}\", mevcut değil, hiçbirşey yapılmadı" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "Unsquash yapılandırma sorunlu" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "\"{}\" ({}) Dosya sistemi desteklenmiyor" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "\"{}\" Kaynak dosya sistemi mevcut değil" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "Hedef sistemdeki \"{}\" hedefi bir dizin değil" @@ -317,7 +317,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "%(num)d paket kaldırılıyor." msgstr[1] "%(num)d paket kaldırılıyor." -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "Önyükleyici kur." diff --git a/lang/python/uk/LC_MESSAGES/python.po b/lang/python/uk/LC_MESSAGES/python.po index 3a31621a1..f65cd5476 100644 --- a/lang/python/uk/LC_MESSAGES/python.po +++ b/lang/python/uk/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Paul S <paul.smbg@gmail.com>, 2019\n" "Language-Team: Ukrainian (https://www.transifex.com/calamares/teams/20061/uk/)\n" @@ -26,11 +26,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -43,7 +43,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -95,19 +95,19 @@ msgstr "" msgid "Unmount file systems." msgstr "Відключити файлові системи." -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "rsync зазнав невдачі з кодом помилки {}." -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "Не вдалося розпакувати образ \"{}\"" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" @@ -115,36 +115,36 @@ msgstr "" "Не вдалося знайти unsquashfs, переконайтеся, що встановлено пакет squashfs-" "tools" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "Немає точки монтування для кореневого розділу" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "Помилка точки монтування для кореневого розділу" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "Неправильна конфігурація unsquash" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "Файлова система для \"{}\" ({}) не підтримується" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "Вихідна файлова система \"{}\" не існує" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "Призначення \"{}\" у цільовій системі не є каталогом" @@ -314,7 +314,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/ur/LC_MESSAGES/python.po b/lang/python/ur/LC_MESSAGES/python.po index 6d762ee8a..f5f0b82fb 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\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" @@ -21,11 +21,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -38,7 +38,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -86,54 +86,54 @@ msgstr "" msgid "Unmount file systems." msgstr "" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -299,7 +299,7 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/uz/LC_MESSAGES/python.po b/lang/python/uz/LC_MESSAGES/python.po index 44688d59e..d890a5899 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\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" @@ -21,11 +21,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -38,7 +38,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -86,54 +86,54 @@ msgstr "" msgid "Unmount file systems." msgstr "" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -297,7 +297,7 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/zh_CN/LC_MESSAGES/python.po b/lang/python/zh_CN/LC_MESSAGES/python.po index b927ca5c9..bb6efe709 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: leonfeng <chaofeng111@qq.com>, 2018\n" "Language-Team: Chinese (China) (https://www.transifex.com/calamares/teams/20061/zh_CN/)\n" @@ -27,11 +27,11 @@ msgstr "" msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -44,7 +44,7 @@ msgstr "" msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -92,54 +92,54 @@ msgstr "" msgid "Unmount file systems." msgstr "卸载文件系统。" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "" @@ -303,7 +303,7 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "移除%(num)d软件包。" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "" diff --git a/lang/python/zh_TW/LC_MESSAGES/python.po b/lang/python/zh_TW/LC_MESSAGES/python.po index fee3edc84..92b62bcf4 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: 2019-05-02 16:52-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Jeff Huang <s8321414@gmail.com>, 2019\n" "Language-Team: Chinese (Taiwan) (https://www.transifex.com/calamares/teams/20061/zh_TW/)\n" @@ -25,11 +25,11 @@ msgstr "" msgid "Configure GRUB." msgstr "設定 GRUB。" -#: src/modules/mount/main.py:36 +#: src/modules/mount/main.py:38 msgid "Mounting partitions." msgstr "正在掛載分割區。" -#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187 +#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187 #: src/modules/initcpiocfg/main.py:191 #: src/modules/luksopenswaphookcfg/main.py:95 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 @@ -42,7 +42,7 @@ msgstr "正在掛載分割區。" msgid "Configuration Error" msgstr "設定錯誤" -#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188 +#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: 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/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 @@ -92,54 +92,54 @@ msgstr "" msgid "Unmount file systems." msgstr "解除掛載檔案系統。" -#: src/modules/unpackfs/main.py:40 +#: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." msgstr "填滿檔案系統。" -#: src/modules/unpackfs/main.py:158 +#: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." msgstr "rsync 失敗，錯誤碼 {} 。" -#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 +#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238 msgid "Failed to unpack image \"{}\"" msgstr "無法解開映像檔 \"{}\"" -#: src/modules/unpackfs/main.py:220 +#: src/modules/unpackfs/main.py:221 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "找不到 unsquashfs，請確定您已安裝 squashfs-tools 軟體包" -#: src/modules/unpackfs/main.py:313 +#: src/modules/unpackfs/main.py:320 msgid "No mount point for root partition" msgstr "沒有 root 分割區的掛載點" -#: src/modules/unpackfs/main.py:314 +#: src/modules/unpackfs/main.py:321 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "globalstorage 不包含 \"rootMountPoint\" 鍵，不做任何事" -#: src/modules/unpackfs/main.py:319 +#: src/modules/unpackfs/main.py:326 msgid "Bad mount point for root partition" msgstr "root 分割區掛載點錯誤" -#: src/modules/unpackfs/main.py:320 +#: src/modules/unpackfs/main.py:327 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr "rootMountPoint 為 \"{}\"，其不存在，不做任何事" -#: src/modules/unpackfs/main.py:333 src/modules/unpackfs/main.py:340 -#: src/modules/unpackfs/main.py:345 +#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347 +#: src/modules/unpackfs/main.py:352 msgid "Bad unsquash configuration" msgstr "錯誤的 unsquash 設定" -#: src/modules/unpackfs/main.py:334 +#: src/modules/unpackfs/main.py:341 msgid "The filesystem for \"{}\" ({}) is not supported" msgstr "不支援 \"{}\" ({}) 的檔案系統" -#: src/modules/unpackfs/main.py:341 +#: src/modules/unpackfs/main.py:348 msgid "The source filesystem \"{}\" does not exist" msgstr "來源檔案系統 \"{}\" 不存在" -#: src/modules/unpackfs/main.py:346 +#: src/modules/unpackfs/main.py:353 msgid "The destination \"{}\" in the target system is not a directory" msgstr "目標系統中的目的地 \"{}\" 不是目錄" @@ -303,7 +303,7 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "正在移除 %(num)d 軟體包。" -#: src/modules/bootloader/main.py:48 +#: src/modules/bootloader/main.py:51 msgid "Install bootloader." msgstr "安裝開機載入程式。" diff --git a/settings.conf b/settings.conf index f66810f9a..c500405b3 100644 --- a/settings.conf +++ b/settings.conf @@ -7,14 +7,26 @@ # path to a directory or the keyword "local". # # "local" means: -# - modules in $LIBDIR/calamares/moduleswith +# - modules in $LIBDIR/calamares/modules, with # - settings in SHARE/calamares/modules or /etc/calamares/modules. +# In debug-mode (e.g. calamares -d) "local" also adds some paths +# that make sense from inside the build-directory, so that you +# can build-and-run with the latest modules immediately. +# +# Strings other than "local" are taken as paths and interpreted +# relative to wherever Calamares is started. It is therefore **strongly** +# recommended to use only absolute paths here. This is mostly useful +# if your distro has forks of standard Calamares modules, but also +# uses some form of upstream packaging which might overwrite those +# forked modules -- then you can keep modules somewhere outside of +# the "regular" module tree. +# # # YAML: list of strings. modules-search: [ local ] # Instances section. This section is optional, and it defines custom instances -# for modules of any kind. An instance entry has an instance name, a module +# for modules of any kind. An instance entry has an module name, an instance # name, and a configuration file name. The primary goal of this mechanism is # to allow loading multiple instances of the same module, with different # configuration. If you don't need this, the instances section can safely be @@ -22,24 +34,27 @@ modules-search: [ local ] # # Module name plus instance name makes an instance key, e.g. # "webview@owncloud", where "webview" is the module name (for the webview -# viewmodule) and "owncloud" is the instance name, which loads a configuration -# file named "owncloud.conf" from any of the configuration file paths, -# including the webview module directory. This instance key can then be -# referenced in the sequence section. -# -# For all modules without a custom instance specification, a default instance -# is generated automatically by Calamares. Therefore a statement such as -# "webview" in the sequence section automatically implies an instance key of -# "webview@webview" even without explicitly defining this instance, and the -# configuration file for this default instance "<modulename>@<modulename>" is -# always assumed to be "<modulename>.conf". +# viewmodule) and "owncloud" is the instance name. In the *sequence* +# section below, use instance-keys to name instances (instead of just +# a module name, for modules which have only a single instance). +# +# Every module implicitly has an instance with the instance name equal +# to its module name, e.g. "welcome@welcome". In the *sequence* section, +# mentioning a module without a full instance key (e.g. "welcome") +# means that implicit module. +# +# An instance must specify its configuration file (e.g. `webview-home.conf`). +# The implicit instances all have configuration files named `<module>.conf`. +# This (implict) way matches the source examples, where the welcome +# module contains an example `welcome.conf`. # # For more information on running module instances, run Calamares in debug # mode and check the Modules page in the Debug information interface. # -# A module that is often used with instances is dummyprocess, which will -# run a single (shell) command. By configuring more than one instance of -# the module, multiple shell commands can be run during install. +# A module that is often used with instances is shellprocess, which will +# run shell commands specified in the configuration file. By configuring +# more than one instance of the module, multiple shell sessions can be run +# during install. # # YAML: list of maps of string:string key-value pairs. #instances: @@ -152,8 +167,8 @@ dont-chroot: false # If this is set to true, the "Cancel" button will be disabled entirely. # The button is also hidden from view. # -# This can be useful if when e.g. Calamares is used as a post-install -# configuration tool and you require the user to go through all the +# This can be useful if when e.g. Calamares is used as a post-install +# configuration tool and you require the user to go through all the # configuration steps. # # Default is false, but Calamares will complain if this is not explicitly set. diff --git a/src/branding/default/branding.desc b/src/branding/default/branding.desc index 5fefc422a..1dd4de03a 100644 --- a/src/branding/default/branding.desc +++ b/src/branding/default/branding.desc @@ -1,3 +1,9 @@ +# Product branding information. This influences some global +# user-visible aspects of Calamares, such as the product +# name, window behavior, and the slideshow during installation. +# +# Additional styling can be done using the stylesheet.qss +# file, also in the branding directory. --- componentName: default @@ -40,8 +46,18 @@ windowSize: 800px,520px # # bootloaderEntryName is how this installation / distro is named # in the boot loader (e.g. in the GRUB menu). +# +# These strings support substitution from /etc/os-release +# if KDE Frameworks 5.58 are available at build-time. When +# enabled, @{var-name} is replaced by the equivalent value +# from os-release. All the supported var-names are in all-caps, +# and are listed on the FreeDesktop.org site, +# https://www.freedesktop.org/software/systemd/man/os-release.html +# Note that ANSI_COLOR and CPE_NAME don't make sense here, and +# are not supported (the rest are). Remember to quote the string +# if it contains substitutions, or you'll get YAML exceptions. strings: - productName: Generic GNU/Linux + productName: "@{NAME}" shortProductName: Generic version: 2017.8 LTS shortVersion: 2017.8 @@ -67,6 +83,8 @@ strings: # any size and proportion, and will be scaled to fit inside # the window. Use `welcomeExpandingLogo` to make it non-scaled. # Recommended size is 320x150. +# +# These strings can also use substitutions from os-release (see above). images: productLogo: "squid.png" productIcon: "squid.png" @@ -84,6 +102,9 @@ slideshow: "show.qml" # Optional, and defaults to the application palette. # - sidebarSelect is the text color of the selected step. # +# These colors can **also** be set through the stylesheet, if the +# branding component also ships a stylesheet.qss. Then they are +# the corresponding CSS attributes of #sidebarApp. style: sidebarBackground: "#292F34" sidebarText: "#FFFFFF" diff --git a/src/branding/default/stylesheet.qss b/src/branding/default/stylesheet.qss index 0ea8118bf..c5341ee0a 100644 --- a/src/branding/default/stylesheet.qss +++ b/src/branding/default/stylesheet.qss @@ -6,6 +6,14 @@ In principle, all parts can be styled through CSS. Missing parts should be filed as issues. The IDs are based on the object names in the C++ code. + +Documentation for styling Qt Widgets through a stylesheet +can be found at + https://doc.qt.io/qt-5/stylesheet-examples.html +In Calamares, styling widget classes is supported (e.g. +using `QComboBox` as a selector). You can also use specific +object names (ids), which you can find through debugging tools. + */ /* Main application window. diff --git a/src/calamares/CMakeLists.txt b/src/calamares/CMakeLists.txt index 97bf044ed..546888750 100644 --- a/src/calamares/CMakeLists.txt +++ b/src/calamares/CMakeLists.txt @@ -1,9 +1,5 @@ add_definitions( -DUIDLLEXPORT_PRO ) -if( NOT CMAKE_BUILD_TYPE STREQUAL "Release" ) - message( "Building in debug mode, enabling all debug updates" ) -endif() - set( calamaresSources main.cpp CalamaresApplication.cpp @@ -39,21 +35,21 @@ set_target_properties(calamares_bin ) calamares_automoc( calamares_bin ) -if( WITH_KF5Crash ) - set( LINK_LIBRARIES - KF5::CoreAddons - KF5::Crash - ) -endif() - target_link_libraries( calamares_bin PRIVATE ${CALAMARES_LIBRARIES} calamaresui Qt5::Core Qt5::Widgets - ${LINK_LIBRARIES} ) +if( WITH_KF5Crash ) + target_link_libraries( calamares_bin + PRIVATE + KF5::CoreAddons + KF5::Crash + ) + target_compile_definitions( calamares_bin PRIVATE WITH_KF5Crash ) +endif() install( TARGETS calamares_bin BUNDLE DESTINATION . diff --git a/src/calamares/CalamaresApplication.cpp b/src/calamares/CalamaresApplication.cpp index 2d5ea41f0..704cde71c 100644 --- a/src/calamares/CalamaresApplication.cpp +++ b/src/calamares/CalamaresApplication.cpp @@ -363,6 +363,12 @@ CalamaresApplication::initViewSteps() ProgressTreeModel* m = new ProgressTreeModel( nullptr ); ProgressTreeView::instance()->setModel( m ); cDebug() << "STARTUP: Window now visible and ProgressTreeView populated"; + + const auto steps = Calamares::ViewManager::instance()->viewSteps(); + cDebug() << Logger::SubEntry << steps.count() << "view steps loaded."; + // Tell the first view that it's been shown. + if ( steps.count() > 0 ) + steps[0]->onActivate(); } void diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp index 82c71d0e0..3fba3a5f1 100644 --- a/src/calamares/CalamaresWindow.cpp +++ b/src/calamares/CalamaresWindow.cpp @@ -56,6 +56,10 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) , m_debugWindow( nullptr ) , m_viewManager( nullptr ) { + // If we can never cancel, don't show the window-close button + if ( Calamares::Settings::instance()->disableCancel() ) + setWindowFlag( Qt::WindowCloseButtonHint, false ); + CALAMARES_RETRANSLATE( setWindowTitle( Calamares::Settings::instance()->isSetupMode() ? tr( "%1 Setup Program" ).arg( *Calamares::Branding::ProductName ) @@ -74,6 +78,7 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) using CalamaresUtils::logoLabelW; using CalamaresUtils::logoLabelH; + // Needs to match what's checked in DebugWindow this->setObjectName("mainApp"); QSize availableSize = qApp->desktop()->availableGeometry( this ).size(); @@ -130,6 +135,7 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) if ( Calamares::Settings::instance()->debugMode() ) { QPushButton* debugWindowBtn = new QPushButton; + debugWindowBtn->setObjectName( "debugButton" ); CALAMARES_RETRANSLATE( debugWindowBtn->setText( tr( "Show debug information" ) ); ) @@ -164,6 +170,14 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) m_viewManager = Calamares::ViewManager::instance( this ); if ( branding->windowExpands() ) connect( m_viewManager, &Calamares::ViewManager::enlarge, this, &CalamaresWindow::enlarge ); + // NOTE: Although the ViewManager has a signal cancelEnabled() that + // signals when the state of the cancel button changes (in + // particular, to disable cancel during the exec phase), + // we don't connect to it here. Changing the window flag + // for the close button causes uncomfortable window flashing + // and requires an extra show() (at least with KWin/X11) which + // is too annoying. Instead, leave it up to ignoring-the-quit- + // event, which is also the ViewManager's responsibility. mainLayout->addWidget( m_viewManager->centralWidget() ); setStyleSheet( Calamares::Branding::instance()->stylesheet() ); diff --git a/src/calamares/main.cpp b/src/calamares/main.cpp index 5ddda33c6..f218b8ab9 100644 --- a/src/calamares/main.cpp +++ b/src/calamares/main.cpp @@ -26,7 +26,7 @@ #include "utils/Logger.h" #include "CalamaresConfig.h" -#ifdef WITH_KCRASH +#ifdef WITH_KF5Crash #include <KF5/KCrash/KCrash> #include <KF5/KCoreAddons/KAboutData> #endif @@ -84,7 +84,7 @@ main( int argc, char* argv[] ) { CalamaresApplication a( argc, argv ); -#ifdef WITH_KCRASH +#ifdef WITH_KF5Crash KAboutData aboutData( "calamares", "Calamares", a.applicationVersion(), diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt index fa82eae19..2fb645dba 100644 --- a/src/libcalamares/CMakeLists.txt +++ b/src/libcalamares/CMakeLists.txt @@ -168,6 +168,16 @@ if ( ECM_FOUND AND BUILD_TESTING ) ${YAMLCPP_LIBRARY} ) calamares_automoc( geoiptest ) + + ecm_add_test( + partition/Tests.cpp + TEST_NAME + libcalamarespartitiontest + LINK_LIBRARIES + calamares + Qt5::Test + ) + calamares_automoc( libcalamarespartitiontest ) endif() if( BUILD_TESTING ) diff --git a/src/libcalamares/CalamaresConfig.h.in b/src/libcalamares/CalamaresConfig.h.in index cafbe9276..6fbab422c 100644 --- a/src/libcalamares/CalamaresConfig.h.in +++ b/src/libcalamares/CalamaresConfig.h.in @@ -10,12 +10,6 @@ //cmakedefines for CMake variables (e.g. for optdepends) go here #cmakedefine WITH_PYTHON - -#cmakedefine WITH_KF5Crash -#ifdef WITH_KF5Crash -#define WITH_KCRASH -#endif - #cmakedefine WITH_PYTHONQT #endif // CALAMARESCONFIG_H diff --git a/src/libcalamares/Settings.cpp b/src/libcalamares/Settings.cpp index 0089b2ef2..71825b1e5 100644 --- a/src/libcalamares/Settings.cpp +++ b/src/libcalamares/Settings.cpp @@ -185,7 +185,7 @@ Settings::Settings( const QString& settingsFilePath, , m_doChroot( true ) , m_promptInstall( false ) , m_disableCancel( false ) - , m_dontCancel( false ) + , m_disableCancelDuringExec( false ) { cDebug() << "Using Calamares settings file at" << settingsFilePath; QFile file( settingsFilePath ); @@ -207,7 +207,7 @@ Settings::Settings( const QString& settingsFilePath, m_doChroot = !requireBool( config, "dont-chroot", false ); m_isSetupMode = requireBool( config, "oem-setup", !m_doChroot ); m_disableCancel = requireBool( config, "disable-cancel", false ); - m_dontCancel = requireBool( config, "disable-cancel-during-exec", false ); + m_disableCancelDuringExec = requireBool( config, "disable-cancel-during-exec", false ); } catch ( YAML::Exception& e ) { @@ -277,9 +277,9 @@ Settings::disableCancel() const } bool -Settings::dontCancel() const +Settings::disableCancelDuringExec() const { - return m_dontCancel; + return m_disableCancelDuringExec; } diff --git a/src/libcalamares/Settings.h b/src/libcalamares/Settings.h index ca77859c3..a095ee567 100644 --- a/src/libcalamares/Settings.h +++ b/src/libcalamares/Settings.h @@ -68,7 +68,7 @@ public: /** @brief Global setting of disable-cancel: can't cancel ever. */ bool disableCancel() const; /** @brief Temporary setting of disable-cancel: can't cancel during exec. */ - bool dontCancel() const; + bool disableCancelDuringExec() const; private: static Settings* s_instance; @@ -85,7 +85,7 @@ private: bool m_isSetupMode; bool m_promptInstall; bool m_disableCancel; - bool m_dontCancel; + bool m_disableCancelDuringExec; }; } diff --git a/src/libcalamares/geoip/GeoIPJSON.cpp b/src/libcalamares/geoip/GeoIPJSON.cpp index 61b9fd8d6..4b7562d7e 100644 --- a/src/libcalamares/geoip/GeoIPJSON.cpp +++ b/src/libcalamares/geoip/GeoIPJSON.cpp @@ -25,7 +25,9 @@ #include <QByteArray> -namespace CalamaresUtils::GeoIP +namespace CalamaresUtils +{ +namespace GeoIP { GeoIPJSON::GeoIPJSON(const QString& attribute) @@ -88,6 +90,5 @@ GeoIPJSON::processReply( const QByteArray& data ) return splitTZString( rawReply( data ) ); } - - +} } // namespace diff --git a/src/libcalamares/geoip/GeoIPJSON.h b/src/libcalamares/geoip/GeoIPJSON.h index 584825d70..4d7ded631 100644 --- a/src/libcalamares/geoip/GeoIPJSON.h +++ b/src/libcalamares/geoip/GeoIPJSON.h @@ -21,7 +21,9 @@ #include "Interface.h" -namespace CalamaresUtils::GeoIP +namespace CalamaresUtils +{ +namespace GeoIP { /** @brief GeoIP lookup for services that return JSON. * @@ -46,5 +48,6 @@ public: virtual QString rawReply(const QByteArray & ) override; } ; +} } // namespace #endif diff --git a/src/libcalamares/geoip/GeoIPXML.cpp b/src/libcalamares/geoip/GeoIPXML.cpp index a4b9bb146..b658042bf 100644 --- a/src/libcalamares/geoip/GeoIPXML.cpp +++ b/src/libcalamares/geoip/GeoIPXML.cpp @@ -23,7 +23,9 @@ #include <QNetworkReply> #include <QtXml/QDomDocument> -namespace CalamaresUtils::GeoIP +namespace CalamaresUtils +{ +namespace GeoIP { GeoIPXML::GeoIPXML( const QString& element ) @@ -87,4 +89,5 @@ GeoIPXML::processReply( const QByteArray& data ) return RegionZonePair(); } +} } // namespace diff --git a/src/libcalamares/geoip/GeoIPXML.h b/src/libcalamares/geoip/GeoIPXML.h index 7dee2ecbe..356e88b12 100644 --- a/src/libcalamares/geoip/GeoIPXML.h +++ b/src/libcalamares/geoip/GeoIPXML.h @@ -21,7 +21,9 @@ #include "Interface.h" -namespace CalamaresUtils::GeoIP +namespace CalamaresUtils +{ +namespace GeoIP { /** @brief GeoIP lookup with XML data * @@ -46,5 +48,6 @@ public: virtual QString rawReply(const QByteArray & ) override; } ; +} } // namespace #endif diff --git a/src/libcalamares/geoip/Handler.cpp b/src/libcalamares/geoip/Handler.cpp index 1e8b03b26..192ab1a7c 100644 --- a/src/libcalamares/geoip/Handler.cpp +++ b/src/libcalamares/geoip/Handler.cpp @@ -47,7 +47,9 @@ handlerTypes() return names; } -namespace CalamaresUtils::GeoIP +namespace CalamaresUtils +{ +namespace GeoIP { Handler::Handler() @@ -110,9 +112,8 @@ create_interface( Handler::Type t, const QString& selector ) #else return nullptr; #endif - default: // there are no others - return nullptr; } + NOTREACHED return nullptr; } static RegionZonePair @@ -179,5 +180,5 @@ Handler::queryRaw() const } ); } - +} } // namespace diff --git a/src/libcalamares/geoip/Handler.h b/src/libcalamares/geoip/Handler.h index 92e5f326e..5c3207b60 100644 --- a/src/libcalamares/geoip/Handler.h +++ b/src/libcalamares/geoip/Handler.h @@ -25,8 +25,9 @@ #include <QString> #include <QVariantMap> -namespace CalamaresUtils {} -namespace CalamaresUtils::GeoIP +namespace CalamaresUtils +{ +namespace GeoIP { /** @brief Handle one complete GeoIP lookup. @@ -86,6 +87,7 @@ private: const QString m_selector; }; +} } // namespace #endif diff --git a/src/libcalamares/geoip/Interface.cpp b/src/libcalamares/geoip/Interface.cpp index 50aa04683..36e680aab 100644 --- a/src/libcalamares/geoip/Interface.cpp +++ b/src/libcalamares/geoip/Interface.cpp @@ -20,7 +20,9 @@ #include "utils/Logger.h" -namespace CalamaresUtils::GeoIP +namespace CalamaresUtils +{ +namespace GeoIP { Interface::Interface(const QString& e) @@ -51,4 +53,5 @@ splitTZString( const QString& tz ) return RegionZonePair( QString(), QString() ); } +} } // namespace diff --git a/src/libcalamares/geoip/Interface.h b/src/libcalamares/geoip/Interface.h index 4b2ff3a5a..7db8c4c91 100644 --- a/src/libcalamares/geoip/Interface.h +++ b/src/libcalamares/geoip/Interface.h @@ -27,8 +27,9 @@ class QByteArray; -namespace CalamaresUtils {} -namespace CalamaresUtils::GeoIP +namespace CalamaresUtils +{ +namespace GeoIP { /** @brief A Region, Zone pair of strings * @@ -94,5 +95,6 @@ protected: QString m_element; // string for selecting from data } ; +} } // namespace #endif diff --git a/src/libcalamares/locale/Label.cpp b/src/libcalamares/locale/Label.cpp index ca528dc75..8d3cd443f 100644 --- a/src/libcalamares/locale/Label.cpp +++ b/src/libcalamares/locale/Label.cpp @@ -19,7 +19,9 @@ #include "Label.h" -namespace CalamaresUtils::Locale +namespace CalamaresUtils +{ +namespace Locale { Label::Label() @@ -70,4 +72,5 @@ QLocale Label::getLocale( const QString& localeName ) return QLocale( localeName ); } +} } // namespace diff --git a/src/libcalamares/locale/Label.h b/src/libcalamares/locale/Label.h index 65befc6b4..7935b0880 100644 --- a/src/libcalamares/locale/Label.h +++ b/src/libcalamares/locale/Label.h @@ -23,8 +23,9 @@ #include <QLocale> #include <QString> -namespace CalamaresUtils {} -namespace CalamaresUtils::Locale +namespace CalamaresUtils +{ +namespace Locale { /** @@ -120,7 +121,7 @@ protected: QString m_englishLabel; } ; - +} } // namespace #endif diff --git a/src/libcalamares/locale/LabelModel.cpp b/src/libcalamares/locale/LabelModel.cpp index 543417212..79ff5d67b 100644 --- a/src/libcalamares/locale/LabelModel.cpp +++ b/src/libcalamares/locale/LabelModel.cpp @@ -22,7 +22,9 @@ #include "CalamaresVersion.h" // For the list of translations -namespace CalamaresUtils::Locale +namespace CalamaresUtils +{ +namespace Locale { LabelModel::LabelModel( const QStringList& locales, QObject* parent ) @@ -121,10 +123,11 @@ LabelModel::find( const QString& countryCode ) const return find( [&]( const Label& l ){ return l.language() == c_l.second; } ); } -LabelModel* const availableTranslations() +LabelModel* availableTranslations() { - static LabelModel model( QString( CALAMARES_TRANSLATION_LANGUAGES ).split( ';') ); - return &model; + static LabelModel* model = new LabelModel( QString( CALAMARES_TRANSLATION_LANGUAGES ).split( ';') ); + return model; } +} } // namespace diff --git a/src/libcalamares/locale/LabelModel.h b/src/libcalamares/locale/LabelModel.h index 178f76343..2f3bee629 100644 --- a/src/libcalamares/locale/LabelModel.h +++ b/src/libcalamares/locale/LabelModel.h @@ -26,8 +26,9 @@ #include <QVector> -namespace CalamaresUtils {} -namespace CalamaresUtils::Locale +namespace CalamaresUtils +{ +namespace Locale { class DLLEXPORT LabelModel : public QAbstractListModel @@ -78,7 +79,7 @@ private: * * NOTE: While the model is not typed const, it should be. Do not modify. */ -DLLEXPORT LabelModel* const availableTranslations(); - +DLLEXPORT LabelModel* availableTranslations(); +} } // namespace #endif diff --git a/src/libcalamares/locale/Lookup.cpp b/src/libcalamares/locale/Lookup.cpp index a096bc679..73d706de6 100644 --- a/src/libcalamares/locale/Lookup.cpp +++ b/src/libcalamares/locale/Lookup.cpp @@ -20,7 +20,9 @@ #include "CountryData_p.cpp" -namespace CalamaresUtils::Locale +namespace CalamaresUtils +{ +namespace Locale { struct TwoChar @@ -87,4 +89,5 @@ QLocale::Language languageForCountry(QLocale::Country country) return p->l; } +} } // namespace diff --git a/src/libcalamares/locale/Lookup.h b/src/libcalamares/locale/Lookup.h index 5712a1120..9d1c23cd8 100644 --- a/src/libcalamares/locale/Lookup.h +++ b/src/libcalamares/locale/Lookup.h @@ -24,8 +24,9 @@ #include <QLocale> #include <QPair> -namespace CalamaresUtils {} -namespace CalamaresUtils::Locale +namespace CalamaresUtils +{ +namespace Locale { /* All the functions in this file do lookups of locale data * based on CLDR tables; these are lookups that you can't (easily) @@ -48,6 +49,7 @@ namespace CalamaresUtils::Locale DLLEXPORT QPair< QLocale::Country, QLocale::Language > countryData( const QString& code ); /// @brief Get a likely locale for a 2-letter country code DLLEXPORT QLocale countryLocale( const QString& code ); +} } // namespace #endif diff --git a/src/libcalamares/partition/PartitionSize.cpp b/src/libcalamares/partition/PartitionSize.cpp index edff0fe1e..ee3d4c80b 100644 --- a/src/libcalamares/partition/PartitionSize.cpp +++ b/src/libcalamares/partition/PartitionSize.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - <https://github.com/calamares> === * * Copyright 2019, Collabora Ltd <arnaud.ferraris@collabora.com> + * Copyright 2019, Adriaan de Groot <groot@kde.org> * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +21,9 @@ #include "utils/Logger.h" #include "utils/Units.h" -namespace Calamares +namespace CalamaresUtils +{ +namespace Partition { static const NamedEnumTable<SizeUnit>& @@ -42,23 +45,23 @@ unitSuffixes() PartitionSize::PartitionSize( const QString& s ) : NamedSuffix( unitSuffixes(), s ) { - if ( ( unit() == unit_t::Percent ) && ( value() > 100 || value() < 0 ) ) + if ( ( unit() == SizeUnit::Percent ) && ( value() > 100 || value() < 0 ) ) { cDebug() << "Percent value" << value() << "is not valid."; m_value = 0; } - if ( m_unit == unit_t::None ) + if ( m_unit == SizeUnit::None ) { m_value = s.toInt(); if ( m_value > 0 ) - m_unit = unit_t::Byte; + m_unit = SizeUnit::Byte; } if ( m_value <= 0 ) { m_value = 0; - m_unit = unit_t::None; + m_unit = SizeUnit::None; } } @@ -72,17 +75,17 @@ PartitionSize::toSectors( qint64 totalSectors, qint64 sectorSize ) const switch ( m_unit ) { - case unit_t::None: + case SizeUnit::None: return -1; - case unit_t::Percent: + case SizeUnit::Percent: if ( value() == 100 ) return totalSectors; // Common-case, avoid futzing around else return totalSectors * value() / 100; - case unit_t::Byte: - case unit_t::KiB: - case unit_t::MiB: - case unit_t::GiB: + case SizeUnit::Byte: + case SizeUnit::KiB: + case SizeUnit::MiB: + case SizeUnit::GiB: return CalamaresUtils::bytesToSectors ( toBytes(), sectorSize ); } @@ -97,19 +100,19 @@ PartitionSize::toBytes( qint64 totalSectors, qint64 sectorSize ) const switch ( m_unit ) { - case unit_t::None: + case SizeUnit::None: return -1; - case unit_t::Percent: + case SizeUnit::Percent: if ( totalSectors < 1 || sectorSize < 1 ) return -1; if ( value() == 100 ) return totalSectors * sectorSize; // Common-case, avoid futzing around else return totalSectors * value() / 100; - case unit_t::Byte: - case unit_t::KiB: - case unit_t::MiB: - case unit_t::GiB: + case SizeUnit::Byte: + case SizeUnit::KiB: + case SizeUnit::MiB: + case SizeUnit::GiB: return toBytes(); } @@ -125,19 +128,19 @@ PartitionSize::toBytes( qint64 totalBytes ) const switch ( m_unit ) { - case unit_t::None: + case SizeUnit::None: return -1; - case unit_t::Percent: + case SizeUnit::Percent: if ( totalBytes < 1 ) return -1; if ( value() == 100 ) return totalBytes; // Common-case, avoid futzing around else return totalBytes * value() / 100; - case unit_t::Byte: - case unit_t::KiB: - case unit_t::MiB: - case unit_t::GiB: + case SizeUnit::Byte: + case SizeUnit::KiB: + case SizeUnit::MiB: + case SizeUnit::GiB: return toBytes(); } @@ -153,86 +156,83 @@ PartitionSize::toBytes() const switch ( m_unit ) { - case unit_t::Byte: + case SizeUnit::None: + case SizeUnit::Percent: + return -1; + case SizeUnit::Byte: return value(); - case unit_t::KiB: + case SizeUnit::KiB: return CalamaresUtils::KiBtoBytes( static_cast<unsigned long long>( value() ) ); - case unit_t::MiB: + case SizeUnit::MiB: return CalamaresUtils::MiBtoBytes( static_cast<unsigned long long>( value() ) ); - case unit_t::GiB: + case SizeUnit::GiB: return CalamaresUtils::GiBtoBytes( static_cast<unsigned long long>( value() ) ); - default: - break; } - - // Reached only when unit is Percent or None - return -1; + NOTREACHED return -1; } bool PartitionSize::operator< ( const PartitionSize& other ) const { - if ( ( m_unit == unit_t::None || other.m_unit == unit_t::None ) || - ( m_unit == unit_t::Percent && other.m_unit != unit_t::Percent ) || - ( m_unit != unit_t::Percent && other.m_unit == unit_t::Percent ) ) + if ( !unitsComparable( m_unit, other.m_unit ) ) return false; switch ( m_unit ) { - case unit_t::Percent: + case SizeUnit::None: + return false; + case SizeUnit::Percent: return ( m_value < other.m_value ); - case unit_t::Byte: - case unit_t::KiB: - case unit_t::MiB: - case unit_t::GiB: + case SizeUnit::Byte: + case SizeUnit::KiB: + case SizeUnit::MiB: + case SizeUnit::GiB: return ( toBytes() < other.toBytes () ); } - - return false; + NOTREACHED return false; } bool PartitionSize::operator> ( const PartitionSize& other ) const { - if ( ( m_unit == unit_t::None || other.m_unit == unit_t::None ) || - ( m_unit == unit_t::Percent && other.m_unit != unit_t::Percent ) || - ( m_unit != unit_t::Percent && other.m_unit == unit_t::Percent ) ) + if ( !unitsComparable( m_unit, other.m_unit ) ) return false; switch ( m_unit ) { - case unit_t::Percent: + case SizeUnit::None: + return false; + case SizeUnit::Percent: return ( m_value > other.m_value ); - case unit_t::Byte: - case unit_t::KiB: - case unit_t::MiB: - case unit_t::GiB: + case SizeUnit::Byte: + case SizeUnit::KiB: + case SizeUnit::MiB: + case SizeUnit::GiB: return ( toBytes() > other.toBytes () ); } - - return false; + NOTREACHED return false; } bool PartitionSize::operator== ( const PartitionSize& other ) const { - if ( ( m_unit == unit_t::None || other.m_unit == unit_t::None ) || - ( m_unit == unit_t::Percent && other.m_unit != unit_t::Percent ) || - ( m_unit != unit_t::Percent && other.m_unit == unit_t::Percent ) ) + if ( !unitsComparable( m_unit, other.m_unit ) ) return false; switch ( m_unit ) { - case unit_t::Percent: + case SizeUnit::None: + return false; + case SizeUnit::Percent: return ( m_value == other.m_value ); - case unit_t::Byte: - case unit_t::KiB: - case unit_t::MiB: - case unit_t::GiB: + case SizeUnit::Byte: + case SizeUnit::KiB: + case SizeUnit::MiB: + case SizeUnit::GiB: return ( toBytes() == other.toBytes () ); } - - return false; + NOTREACHED return false; } -} // namespace Calamares +} +} // namespace diff --git a/src/libcalamares/partition/PartitionSize.h b/src/libcalamares/partition/PartitionSize.h index 13ffa5c70..d8d5593a6 100644 --- a/src/libcalamares/partition/PartitionSize.h +++ b/src/libcalamares/partition/PartitionSize.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - <https://github.com/calamares> === * * Copyright 2019, Collabora Ltd <arnaud.ferraris@collabora.com> + * Copyright 2019, Adriaan de Groot <groot@kde.org> * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,7 +26,9 @@ // Qt #include <QString> -namespace Calamares +namespace CalamaresUtils +{ +namespace Partition { enum class SizeUnit @@ -48,7 +51,7 @@ class PartitionSize : public NamedSuffix<SizeUnit, SizeUnit::None> { public: PartitionSize() : NamedSuffix() { } - PartitionSize( int v, unit_t u ) : NamedSuffix( v, u ) { } + PartitionSize( int v, SizeUnit u ) : NamedSuffix( v, u ) { } PartitionSize( const QString& ); bool isValid() const @@ -91,13 +94,29 @@ public: /** @brief Convert the size to bytes. * * This method is only valid for sizes in Bytes, KiB, MiB or GiB. - * It will return -1 in any other case. + * It will return -1 in any other case. Note that 0KiB and 0MiB and + * 0GiB are considered **invalid** sizes and return -1. * * @return the size in bytes, or -1 if it cannot be calculated. */ qint64 toBytes() const; + + /** @brief Are the units comparable? + * + * None units cannot be compared with anything. Percentages can + * be compared with each other, and all the explicit sizes (KiB, ...) + * can be compared with each other. + */ + static constexpr bool unitsComparable( const SizeUnit u1, const SizeUnit u2 ) + { + return !( ( u1 == SizeUnit::None || u2 == SizeUnit::None ) || + ( u1 == SizeUnit::Percent && u2 != SizeUnit::Percent ) || + ( u1 != SizeUnit::Percent && u2 == SizeUnit::Percent ) ); + } + }; -} // namespace Calamares +} +} // namespace #endif // PARTITION_PARTITIONSIZE_H diff --git a/src/libcalamares/partition/Tests.cpp b/src/libcalamares/partition/Tests.cpp new file mode 100644 index 000000000..c0eb5206a --- /dev/null +++ b/src/libcalamares/partition/Tests.cpp @@ -0,0 +1,144 @@ +/* === This file is part of Calamares - <https://github.com/calamares> === + * + * Copyright 2019, Adriaan de Groot <groot@kde.org> + * + * Calamares is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Calamares is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Calamares. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "Tests.h" + +#include "PartitionSize.h" + +using SizeUnit = CalamaresUtils::Partition::SizeUnit; +using PartitionSize = CalamaresUtils::Partition::PartitionSize; + +Q_DECLARE_METATYPE( SizeUnit ) + +#include "utils/Logger.h" + +#include <QtTest/QtTest> + +QTEST_GUILESS_MAIN( PartitionSizeTests ) + +PartitionSizeTests::PartitionSizeTests() +{ +} + +PartitionSizeTests::~PartitionSizeTests() +{ +} + +void +PartitionSizeTests::initTestCase() +{ +} + +void +PartitionSizeTests::testUnitComparison_data() +{ + QTest::addColumn<SizeUnit>("u1"); + QTest::addColumn<SizeUnit>("u2"); + QTest::addColumn<bool>("comparable"); + + QTest::newRow("nones") << SizeUnit::None << SizeUnit::None << false; + QTest::newRow("none+%") << SizeUnit::None << SizeUnit::Percent<< false; + QTest::newRow("%+none") << SizeUnit::Percent << SizeUnit::None << false; + QTest::newRow("KiB+none") << SizeUnit::KiB << SizeUnit::None << false; + QTest::newRow("none+MiB") << SizeUnit::None << SizeUnit::MiB << false; + + QTest::newRow("KiB+KiB") << SizeUnit::KiB << SizeUnit::KiB << true; + QTest::newRow("KiB+MiB") << SizeUnit::KiB << SizeUnit::MiB << true; + QTest::newRow("KiB+GiB") << SizeUnit::KiB << SizeUnit::GiB << true; + QTest::newRow("MiB+MiB") << SizeUnit::MiB << SizeUnit::MiB << true; + QTest::newRow("MiB+GiB") << SizeUnit::MiB << SizeUnit::GiB << true; + QTest::newRow("GiB+GiB") << SizeUnit::GiB << SizeUnit::GiB << true; + + QTest::newRow("%+None") << SizeUnit::Percent << SizeUnit::None << false; + QTest::newRow("%+%") << SizeUnit::Percent << SizeUnit::Percent << true; + QTest::newRow("%+KiB") << SizeUnit::Percent << SizeUnit::KiB << false; +} + + +static bool +original_compare( SizeUnit m_unit, SizeUnit other_m_unit ) +{ + if ( ( m_unit == SizeUnit::None || other_m_unit == SizeUnit::None ) || + ( m_unit == SizeUnit::Percent && other_m_unit != SizeUnit::Percent ) || + ( m_unit != SizeUnit::Percent && other_m_unit == SizeUnit::Percent ) ) + return false; + return true; +} + +void +PartitionSizeTests::testUnitComparison() +{ + QFETCH( SizeUnit, u1 ); + QFETCH( SizeUnit, u2 ); + QFETCH( bool, comparable ); + + if ( comparable ) + { + QVERIFY( PartitionSize::unitsComparable( u1, u2 ) ); + QVERIFY( PartitionSize::unitsComparable( u2, u1 ) ); + } + else + { + QVERIFY( !PartitionSize::unitsComparable( u1, u2 ) ); + QVERIFY( !PartitionSize::unitsComparable( u2, u1 ) ); + } + + QCOMPARE( original_compare( u1, u2 ), PartitionSize::unitsComparable( u1, u2 ) ); +} + +void +PartitionSizeTests::testUnitNormalisation_data() +{ + QTest::addColumn<SizeUnit>("u1"); + QTest::addColumn<int>("v"); + QTest::addColumn<long>("bytes"); + + QTest::newRow("none") << SizeUnit::None << 16 << -1L; + QTest::newRow("none") << SizeUnit::None << 0 << -1L; + QTest::newRow("none") << SizeUnit::None << -2 << -1L; + + QTest::newRow("percent") << SizeUnit::Percent << 0 << -1L; + QTest::newRow("percent") << SizeUnit::Percent << 16 << -1L; + QTest::newRow("percent") << SizeUnit::Percent << -2 << -1L; + + QTest::newRow("KiB") << SizeUnit::KiB << 0 << -1L; + QTest::newRow("KiB") << SizeUnit::KiB << 1 << 1024L; + QTest::newRow("KiB") << SizeUnit::KiB << 1000 << 1024000L; + QTest::newRow("KiB") << SizeUnit::KiB << 1024 << 1024 * 1024L; + QTest::newRow("KiB") << SizeUnit::KiB << -2 << -1L; + + QTest::newRow("MiB") << SizeUnit::MiB << 0 << -1L; + QTest::newRow("MiB") << SizeUnit::MiB << 1 << 1024 * 1024L; + QTest::newRow("MiB") << SizeUnit::MiB << 1000 << 1024 * 1024000L; + QTest::newRow("MiB") << SizeUnit::MiB << 1024 << 1024 * 1024 * 1024L; + QTest::newRow("MiB") << SizeUnit::MiB << -2 << -1L; + + QTest::newRow("GiB") << SizeUnit::GiB << 0 << -1L; + QTest::newRow("GiB") << SizeUnit::GiB << 1 << 1024 * 1024 * 1024L; + QTest::newRow("GiB") << SizeUnit::GiB << 2 << 2048 * 1024 * 1024L; +} + +void +PartitionSizeTests::testUnitNormalisation() +{ + QFETCH( SizeUnit, u1 ); + QFETCH( int, v ); + QFETCH( long, bytes ); + + QCOMPARE( PartitionSize( v, u1 ).toBytes(), static_cast<qint64>( bytes ) ); +} diff --git a/src/libcalamares/partition/Tests.h b/src/libcalamares/partition/Tests.h new file mode 100644 index 000000000..24398233d --- /dev/null +++ b/src/libcalamares/partition/Tests.h @@ -0,0 +1,41 @@ +/* === This file is part of Calamares - <https://github.com/calamares> === + * + * Copyright 2019, Adriaan de Groot <groot@kde.org> + * + * Calamares is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Calamares is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Calamares. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef LIBCALAMARES_PARTITION_TESTS_H +#define LIBCALAMARES_PARTITION_TESTS_H + +#include <QObject> + +class PartitionSizeTests : public QObject +{ + Q_OBJECT +public: + PartitionSizeTests(); + ~PartitionSizeTests() override; + +private Q_SLOTS: + void initTestCase(); + + void testUnitComparison_data(); + void testUnitComparison(); + + void testUnitNormalisation_data(); + void testUnitNormalisation(); +}; + +#endif diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp index 222ffc1e4..976839f8f 100644 --- a/src/libcalamaresui/Branding.cpp +++ b/src/libcalamaresui/Branding.cpp @@ -1,7 +1,7 @@ /* === This file is part of Calamares - <https://github.com/calamares> === * * Copyright 2014-2015, Teo Mrnjavac <teo@kde.org> - * Copyright 2017-2018, Adriaan de Groot <groot@kde.org> + * Copyright 2017-2019, Adriaan de Groot <groot@kde.org> * Copyright 2018, Raul Rodrigo Segura (raurodse) * * Calamares is free software: you can redistribute it and/or modify @@ -29,9 +29,17 @@ #include <QDir> #include <QFile> +#include <QIcon> #include <QPixmap> #include <QVariantMap> +#include <functional> + +#ifdef WITH_KOSRelease +#include <KMacroExpander> +#include <KOSRelease> +#endif + namespace Calamares { @@ -88,6 +96,32 @@ Branding::WindowDimension::suffixes() return names; } +/** @brief Load the @p map with strings from @p doc + * + * Each key-value pair from the sub-map in @p doc identified by @p key + * is inserted into the @p map, but the value is first transformed by + * the @p transform function, which may change strings. + */ +static void +loadStrings( QMap<QString, QString>& map, const YAML::Node& doc, const std::string& key, const std::function< QString(const QString&) >& transform ) +{ + if ( !doc[ key ].IsMap() ) + throw YAML::Exception( YAML::Mark(), std::string("Branding configuration is not a map: ") + key ); + + const auto& config = CalamaresUtils::yamlMapToVariant( doc[ key ] ).toMap(); + + map.clear(); + for ( auto it = config.constBegin(); it != config.constEnd(); ++it ) + map.insert( it.key(), transform( it.value().toString() ) ); +} + +/** @brief Load the @p map with strings from @p config + * + * If os-release is supported (with KF5 CoreAddons >= 5.58) then + * special substitutions can be done as well. See the branding + * documentation for details. + */ + Branding::Branding( const QString& brandingFilePath, QObject* parent ) : QObject( parent ) @@ -96,16 +130,16 @@ Branding::Branding( const QString& brandingFilePath, , m_welcomeExpandingLogo( true ) { cDebug() << "Using Calamares branding file at" << brandingFilePath; + + QDir componentDir( componentDirectory() ); + if ( !componentDir.exists() ) + bail( "Bad component directory path." ); + QFile file( brandingFilePath ); if ( file.exists() && file.open( QFile::ReadOnly | QFile::Text ) ) { QByteArray ba = file.readAll(); - QFileInfo fi ( m_descriptorPath ); - QDir componentDir = fi.absoluteDir(); - if ( !componentDir.exists() ) - bail( "Bad component directory path." ); - try { YAML::Node doc = YAML::Load( ba.constData() ); @@ -113,37 +147,63 @@ Branding::Branding( const QString& brandingFilePath, m_componentName = QString::fromStdString( doc[ "componentName" ] .as< std::string >() ); - if ( m_componentName != QFileInfo( m_descriptorPath ).absoluteDir().dirName() ) + if ( m_componentName != componentDir.dirName() ) bail( "The branding component name should match the name of the " "component directory." ); initSimpleSettings( doc ); - if ( !doc[ "strings" ].IsMap() ) - bail( "Syntax error in strings map." ); - - QVariantMap strings = - CalamaresUtils::yamlMapToVariant( doc[ "strings" ] ).toMap(); - m_strings.clear(); - for ( auto it = strings.constBegin(); it != strings.constEnd(); ++it ) - m_strings.insert( it.key(), it.value().toString() ); - - if ( !doc[ "images" ].IsMap() ) - bail( "Syntax error in images map." ); - - QVariantMap images = - CalamaresUtils::yamlMapToVariant( doc[ "images" ] ).toMap(); - m_images.clear(); - for ( auto it = images.constBegin(); it != images.constEnd(); ++it ) - { - QString pathString = it.value().toString(); - QFileInfo imageFi( componentDir.absoluteFilePath( pathString ) ); - if ( !imageFi.exists() ) - bail( QString( "Image file %1 does not exist." ) - .arg( imageFi.absoluteFilePath() ) ); - - m_images.insert( it.key(), imageFi.absoluteFilePath() ); - } +#ifdef WITH_KOSRelease + // Copy the os-release information into a QHash for use by KMacroExpander. + KOSRelease relInfo; + + QHash< QString, QString > relMap{ + std::initializer_list< std::pair< QString, QString > > { + { QStringLiteral( "NAME" ), relInfo.name() }, + { QStringLiteral( "VERSION" ), relInfo.version() }, + { QStringLiteral( "ID" ), relInfo.id() }, + { QStringLiteral( "ID_LIKE" ), relInfo.idLike().join( ' ' ) }, + { QStringLiteral( "VERSION_CODENAME" ), relInfo.versionCodename() }, + { QStringLiteral( "VERSION_ID" ), relInfo.versionId() }, + { QStringLiteral( "PRETTY_NAME" ), relInfo.prettyName() }, + { QStringLiteral( "HOME_URL" ), relInfo.homeUrl() }, + { QStringLiteral( "DOCUMENTATION_URL" ), relInfo.documentationUrl() }, + { QStringLiteral( "SUPPORT_URL" ), relInfo.supportUrl() }, + { QStringLiteral( "BUG_REPORT_URL" ), relInfo.bugReportUrl() }, + { QStringLiteral( "PRIVACY_POLICY_URL" ), relInfo.privacyPolicyUrl() }, + { QStringLiteral( "BUILD_ID" ), relInfo.buildId() }, + { QStringLiteral( "VARIANT" ), relInfo.variant() }, + { QStringLiteral( "VARIANT_ID" ), relInfo.variantId() }, + { QStringLiteral( "LOGO" ), relInfo.logo() } + } }; + auto expand = [&]( const QString& s ) -> QString { return KMacroExpander::expandMacros( s, relMap, QLatin1Char( '@' ) ); }; +#else + auto expand = []( const QString& s ) -> QString { return s; }; +#endif + + + // Massage the strings, images and style sections. + loadStrings( m_strings, doc, "strings", expand ); + loadStrings( m_images, doc, "images", + [&]( const QString& s ) -> QString + { + // See also image() + const QString imageName( expand( s ) ); + QFileInfo imageFi( componentDir.absoluteFilePath( imageName ) ); + if ( !imageFi.exists() ) + { + const auto icon = QIcon::fromTheme( imageName ); + // Not found, bail out with the filename used + if ( icon.isNull() ) + bail( QString( "Image file %1 does not exist." ).arg( imageFi.absoluteFilePath() ) ); + return imageName; // Not turned into a path + } + return imageFi.absoluteFilePath(); + } + ); + loadStrings( m_style, doc, "style", + []( const QString& s ) -> QString { return s; } + ); if ( doc[ "slideshow" ].IsSequence() ) { @@ -175,20 +235,11 @@ Branding::Branding( const QString& brandingFilePath, } else bail( "Syntax error in slideshow sequence." ); - - if ( !doc[ "style" ].IsMap() ) - bail( "Syntax error in style map." ); - - QVariantMap style = - CalamaresUtils::yamlMapToVariant( doc[ "style" ] ).toMap(); - m_style.clear(); - for ( auto it = style.constBegin(); it != style.constEnd(); ++it ) - m_style.insert( it.key(), it.value().toString() ); - } catch ( YAML::Exception& e ) { CalamaresUtils::explainYamlException( e, ba, file.fileName() ); + bail( e.what() ); } QDir translationsDir( componentDir.filePath( "lang" ) ); @@ -198,16 +249,6 @@ Branding::Branding( const QString& brandingFilePath, m_translationsPathPrefix.append( QString( "%1calamares-%2" ) .arg( QDir::separator() ) .arg( m_componentName ) ); - - QFileInfo importQSSPath( componentDir.filePath( "stylesheet.qss" ) ); - if ( importQSSPath.exists() && importQSSPath.isReadable() ) - { - QFile stylesheetFile( importQSSPath.filePath() ); - stylesheetFile.open( QFile::ReadOnly ); - m_stylesheet = stylesheetFile.readAll(); - } - else - cWarning() << "the branding component" << componentDir.absolutePath() << "does not ship stylesheet.qss."; } else { @@ -258,17 +299,54 @@ Branding::imagePath( Branding::ImageEntry imageEntry ) const QPixmap Branding::image( Branding::ImageEntry imageEntry, const QSize& size ) const { - QPixmap pixmap = - ImageRegistry::instance()->pixmap( imagePath( imageEntry ), size ); + const auto path = imagePath( imageEntry ); + if ( path.contains( '/' ) ) + { + QPixmap pixmap = ImageRegistry::instance()->pixmap( path, size ); - if ( pixmap.isNull() ) + Q_ASSERT( !pixmap.isNull() ); + return pixmap; + } + else { - Q_ASSERT( false ); - return QPixmap(); + auto icon = QIcon::fromTheme(path); + + Q_ASSERT( !icon.isNull() ); + return icon.pixmap( size ); } - return pixmap; } +QPixmap +Branding::image(const QString& imageName, const QSize& size) const +{ + QDir componentDir( componentDirectory() ); + QFileInfo imageFi( componentDir.absoluteFilePath( imageName ) ); + if ( !imageFi.exists() ) + { + const auto icon = QIcon::fromTheme( imageName ); + // Not found, bail out with the filename used + if ( icon.isNull() ) + return QPixmap(); + return icon.pixmap( size ); + } + return ImageRegistry::instance()->pixmap( imageFi.absoluteFilePath(), size ); +} + +QString +Branding::stylesheet() const +{ + QFileInfo fi( m_descriptorPath ); + QFileInfo importQSSPath( fi.absoluteDir().filePath( "stylesheet.qss" ) ); + if ( importQSSPath.exists() && importQSSPath.isReadable() ) + { + QFile stylesheetFile( importQSSPath.filePath() ); + stylesheetFile.open( QFile::ReadOnly ); + return stylesheetFile.readAll(); + } + else + cWarning() << "The branding component" << fi.absoluteDir().absolutePath() << "does not ship stylesheet.qss."; + return QString(); +} void Branding::setGlobals( GlobalStorage* globalStorage ) const diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h index a0b3f0477..f1cac4428 100644 --- a/src/libcalamaresui/Branding.h +++ b/src/libcalamaresui/Branding.h @@ -124,8 +124,23 @@ public: QString styleString( Branding::StyleEntry styleEntry ) const; QString imagePath( Branding::ImageEntry imageEntry ) const; QPixmap image( Branding::ImageEntry imageEntry, const QSize& size ) const; - /** @brief Stylesheet to apply for this branding. May be empty. */ - QString stylesheet() const { return m_stylesheet; } + + /** @brief Look up an image in the branding directory or as an icon + * + * The @p name is checked in the branding directory: if it is an image + * file, return the pixmap from that file, at the requested size. + * If it isn't a file, look it up as an icon name in the current theme. + * May return a null pixmap if nothing is found. + */ + QPixmap image( const QString& name, const QSize& size ) const; + + /** @brief Stylesheet to apply for this branding. May be empty. + * + * The file is loaded every time this function is called, so + * it may be quite expensive -- although normally it will be + * called only once, on startup. (Or from the debug window) + */ + QString stylesheet() const; bool welcomeStyleCalamares() const { return m_welcomeStyleCalamares; } bool welcomeExpandingLogo() const { return m_welcomeExpandingLogo; } @@ -152,14 +167,13 @@ private: [[noreturn]] void bail( const QString& message ); - QString m_descriptorPath; - QString m_componentName; + QString m_descriptorPath; // Path to descriptor (e.g. "/etc/calamares/default/branding.desc") + QString m_componentName; // Matches last part of full path to containing directory QMap< QString, QString > m_strings; QMap< QString, QString > m_images; QMap< QString, QString > m_style; QString m_slideshowPath; QString m_translationsPathPrefix; - QString m_stylesheet; // Text from file /** @brief Initialize the simple settings below */ void initSimpleSettings( const YAML::Node& doc ); diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt index aaa383fde..f6c8c9ac7 100644 --- a/src/libcalamaresui/CMakeLists.txt +++ b/src/libcalamaresui/CMakeLists.txt @@ -64,8 +64,7 @@ if( WITH_PYTHONQT ) viewpages/PythonQtGlobalStorageWrapper.cpp viewpages/PythonQtUtilsWrapper.cpp ) - set( OPTIONAL_PRIVATE_LIBRARIES - ${OPTIONAL_PRIVATE_LIBRARIES} + set( OPTIONAL_PYTHON_LIBRARIES ${PYTHON_LIBRARIES} ${PYTHONQT_LIBRARIES} ) @@ -76,7 +75,7 @@ calamares_add_library( calamaresui UI ${calamaresui_UI} EXPORT_MACRO UIDLLEXPORT_PRO LINK_PRIVATE_LIBRARIES - ${OPTIONAL_PRIVATE_LIBRARIES} + ${OPTIONAL_PYTHON_LIBRARIES} LINK_LIBRARIES Qt5::Svg Qt5::QuickWidgets @@ -84,3 +83,9 @@ calamares_add_library( calamaresui EXPORT CalamaresLibraryDepends VERSION ${CALAMARES_VERSION_SHORT} ) + +find_package( KF5CoreAddons 5.58 QUIET ) # If it's really new +if ( KF5CoreAddons_FOUND ) + target_compile_definitions( calamaresui PRIVATE WITH_KOSRelease ) + target_link_libraries( calamaresui PRIVATE KF5::CoreAddons ) +endif() diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index be05351a8..ac15f6728 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -256,10 +256,18 @@ ViewManager::currentStepIndex() const return m_currentStep; } +/** @brief Is the given step at @p index an execution step? + * + * Returns true if the step is an execution step, false otherwise. + * Also returns false if the @p index is out of range. + */ static inline bool -stepNextWillExecute(const ViewStepList& steps, int index) +stepIsExecute( const ViewStepList& steps, int index ) { - return ( index + 1 < steps.count() ) && qobject_cast< ExecutionViewStep* >( steps.at( index + 1 ) ); + return + ( 0 <= index ) && + ( index < steps.count() ) && + ( qobject_cast< ExecutionViewStep* >( steps.at( index ) ) != nullptr ); } void @@ -270,11 +278,11 @@ ViewManager::next() if ( step->isAtEnd() ) { const auto* const settings = Calamares::Settings::instance(); - + // Special case when the user clicks next on the very last page in a view phase // and right before switching to an execution phase. // Depending on Calamares::Settings, we show an "are you sure" prompt or not. - if ( settings->showPromptBeforeExecution() && stepNextWillExecute( m_steps, m_currentStep ) ) + if ( settings->showPromptBeforeExecution() && stepIsExecute( m_steps, m_currentStep+1 ) ) { QString title = settings->isSetupMode() ? tr( "Continue with setup?" ) @@ -309,16 +317,7 @@ ViewManager::next() m_steps.at( m_currentStep )->onActivate(); executing = qobject_cast< ExecutionViewStep* >( m_steps.at( m_currentStep ) ) != nullptr; emit currentStepChanged(); - if ( executing ) - { - m_back->setEnabled( false ); - m_next->setEnabled( false ); - // Enabled if there's nothing blocking it during exec - m_quit->setEnabled( !( settings->dontCancel() || settings->disableCancel() ) ); - } - else - // Enabled unless it's also hidden - m_quit->setEnabled( !settings->disableCancel() ); + updateCancelEnabled( !settings->disableCancel() && !(executing && settings->disableCancelDuringExec() ) ); } else step->next(); @@ -332,17 +331,20 @@ ViewManager::next() void ViewManager::updateButtonLabels() { - QString next = Calamares::Settings::instance()->isSetupMode() + const auto* const settings = Calamares::Settings::instance(); + + QString next = settings->isSetupMode() ? tr( "&Set up" ) : tr( "&Install" ); - QString complete = Calamares::Settings::instance()->isSetupMode() + QString complete = settings->isSetupMode() ? tr( "Setup is complete. Close the setup program." ) : tr( "The installation is complete. Close the installer." ); - QString quit = Calamares::Settings::instance()->isSetupMode() + QString quit = settings->isSetupMode() ? tr( "Cancel setup without changing the system." ) : tr( "Cancel installation without changing the system." ); - if ( stepNextWillExecute( m_steps, m_currentStep ) ) + // If we're going into the execution step / install phase, other message + if ( stepIsExecute( m_steps, m_currentStep+1 ) ) m_next->setText( next ); else m_next->setText( tr( "&Next" ) ); @@ -352,15 +354,14 @@ ViewManager::updateButtonLabels() m_quit->setText( tr( "&Done" ) ); m_quit->setToolTip( complete ); m_quit->setVisible( true ); // At end, always visible and enabled. - m_quit->setEnabled( true ); + updateCancelEnabled( true ); } else { - if ( Calamares::Settings::instance()->disableCancel() ) - { - m_quit->setVisible( false ); - m_quit->setEnabled( false ); // Can't be triggered through DBUS - } + if ( settings->disableCancel() ) + m_quit->setVisible( false ); // In case we went back from final + updateCancelEnabled( !settings->disableCancel() && !( stepIsExecute( m_steps, m_currentStep ) && settings->disableCancelDuringExec() ) ); + m_quit->setText( tr( "&Cancel" ) ); m_quit->setToolTip( quit ); } @@ -393,31 +394,44 @@ ViewManager::back() bool ViewManager::confirmCancelInstallation() { - // If it's NOT the last page of the last step, we ask for confirmation - if ( !( m_currentStep == m_steps.count() -1 && - m_steps.last()->isAtEnd() ) ) - { - QString title = Calamares::Settings::instance()->isSetupMode() - ? tr( "Cancel setup?" ) - : tr( "Cancel installation?" ); - QString question = Calamares::Settings::instance()->isSetupMode() - ? tr( "Do you really want to cancel the current setup process?\n" - "The setup program will quit and all changes will be lost." ) - : tr( "Do you really want to cancel the current install process?\n" - "The installer will quit and all changes will be lost." ); - QMessageBox mb( QMessageBox::Question, - title, - question, - QMessageBox::Yes | QMessageBox::No, - m_widget ); - mb.setDefaultButton( QMessageBox::No ); - mb.button( QMessageBox::Yes )->setText( tr( "&Yes" ) ); - mb.button( QMessageBox::No )->setText( tr( "&No" ) ); - int response = mb.exec(); - return response == QMessageBox::Yes; - } - else // Means we're at the end, no need to confirm. + const auto* const settings = Calamares::Settings::instance(); + + // When we're at the very end, then it's always OK to exit. + if ( m_currentStep == m_steps.count() -1 && m_steps.last()->isAtEnd() ) return true; + + // Not at the very end, cancel/quit might be disabled + if ( settings->disableCancel() ) + return false; + if ( settings->disableCancelDuringExec() && stepIsExecute( m_steps, m_currentStep ) ) + return false; + + // Otherwise, confirm cancel/quit. + QString title = settings->isSetupMode() + ? tr( "Cancel setup?" ) + : tr( "Cancel installation?" ); + QString question = settings->isSetupMode() + ? tr( "Do you really want to cancel the current setup process?\n" + "The setup program will quit and all changes will be lost." ) + : tr( "Do you really want to cancel the current install process?\n" + "The installer will quit and all changes will be lost." ); + QMessageBox mb( QMessageBox::Question, + title, + question, + QMessageBox::Yes | QMessageBox::No, + m_widget ); + mb.setDefaultButton( QMessageBox::No ); + mb.button( QMessageBox::Yes )->setText( tr( "&Yes" ) ); + mb.button( QMessageBox::No )->setText( tr( "&No" ) ); + int response = mb.exec(); + return response == QMessageBox::Yes; +} + +void +ViewManager::updateCancelEnabled( bool enabled ) +{ + m_quit->setEnabled( enabled ); + emit cancelEnabled( enabled ); } } // namespace diff --git a/src/libcalamaresui/ViewManager.h b/src/libcalamaresui/ViewManager.h index 65d787e44..50e8d1dc4 100644 --- a/src/libcalamaresui/ViewManager.h +++ b/src/libcalamaresui/ViewManager.h @@ -121,6 +121,7 @@ public slots: signals: void currentStepChanged(); void enlarge( QSize enlarge ) const; // See ViewStep::enlarge() + void cancelEnabled( bool enabled ) const; private: explicit ViewManager( QObject* parent = nullptr ); @@ -128,7 +129,8 @@ private: void insertViewStep( int before, ViewStep* step ); void updateButtonLabels(); - + void updateCancelEnabled( bool enabled ); + static ViewManager* s_instance; ViewStepList m_steps; diff --git a/src/libcalamaresui/modulesystem/ModuleManager.cpp b/src/libcalamaresui/modulesystem/ModuleManager.cpp index 852f41445..185ec37e9 100644 --- a/src/libcalamaresui/modulesystem/ModuleManager.cpp +++ b/src/libcalamaresui/modulesystem/ModuleManager.cpp @@ -358,7 +358,8 @@ ModuleManager::checkDependencies() somethingWasRemovedBecauseOfUnmetDependencies = true; m_availableDescriptorsByModuleName.erase( it ); failed << moduleName; - cWarning() << "Module" << moduleName << "has unknown requirements" << Logger::DebugList( unmet ); + cWarning() << "Module" << moduleName << "requires modules" << Logger::DebugList( unmet ); + cWarning() << Logger::SubEntry << "but these are not available (listed in settings, or installed)."; break; } } diff --git a/src/libcalamaresui/modulesystem/RequirementsChecker.cpp b/src/libcalamaresui/modulesystem/RequirementsChecker.cpp index 7eccdbbc0..f71c24b8b 100644 --- a/src/libcalamaresui/modulesystem/RequirementsChecker.cpp +++ b/src/libcalamaresui/modulesystem/RequirementsChecker.cpp @@ -99,12 +99,18 @@ RequirementsChecker::run() void RequirementsChecker::finished() { - if ( std::all_of( m_watchers.cbegin(), m_watchers.cend(), []( const Watcher *w ) { return w && w->isFinished(); } ) ) + static QMutex finishedMutex; + QMutexLocker lock( &finishedMutex ); + + if ( m_progressTimer && std::all_of( m_watchers.cbegin(), m_watchers.cend(), []( const Watcher *w ) { return w && w->isFinished(); } ) ) { cDebug() << "All requirements have been checked."; - if ( m_progressTimer ) + { m_progressTimer->stop(); + delete m_progressTimer; + m_progressTimer = nullptr; + } bool acceptable = true; int count = 0; diff --git a/src/libcalamaresui/utils/DebugWindow.cpp b/src/libcalamaresui/utils/DebugWindow.cpp index 164da02d9..62ab504d3 100644 --- a/src/libcalamaresui/utils/DebugWindow.cpp +++ b/src/libcalamaresui/utils/DebugWindow.cpp @@ -20,13 +20,17 @@ #include "DebugWindow.h" #include "ui_DebugWindow.h" -#include "utils/Retranslator.h" +#include "Branding.h" +#include "modulesystem/Module.h" +#include "modulesystem/ModuleManager.h" #include "utils/qjsonmodel.h" -#include "JobQueue.h" -#include "Job.h" + #include "GlobalStorage.h" -#include "modulesystem/ModuleManager.h" -#include "modulesystem/Module.h" +#include "Job.h" +#include "JobQueue.h" +#include "utils/Logger.h" +#include "utils/Retranslator.h" + #ifdef WITH_PYTHONQT #include <gui/PythonQtScriptingConsole.h> @@ -49,6 +53,20 @@ crash() *a = 1; } +/// @brief Print out the widget tree (names) in indented form. +static void dumpWidgetTree( QDebug& deb, const QWidget* widget, int depth ) +{ + if ( !widget ) + return; + + deb << Logger::Continuation; + for (int i = 0; i < depth; ++i ) + deb << ' '; + deb << widget->objectName(); + + for ( const auto* w : widget->findChildren<QWidget*>( QString(), Qt::FindDirectChildrenOnly ) ) + dumpWidgetTree( deb, w, depth+1 ); +} namespace Calamares { @@ -186,7 +204,29 @@ DebugWindow::DebugWindow() } } ); + // Tools page connect( m_ui->crashButton, &QPushButton::clicked, this, [] { ::crash(); } ); + connect( m_ui->reloadStylesheetButton, &QPushButton::clicked, + []() + { + for ( auto* w : qApp->topLevelWidgets() ) + { + // Needs to match what's set in CalamaresWindow + if ( w->objectName() == QStringLiteral( "mainApp" ) ) + { + w->setStyleSheet( Calamares::Branding::instance()->stylesheet() ); + } + } + }); + connect( m_ui->widgetTreeButton, &QPushButton::clicked, + []() + { + for ( auto* w : qApp->topLevelWidgets() ) + { + auto deb = cDebug(); + dumpWidgetTree( deb, w, 0 ); + } + }); CALAMARES_RETRANSLATE( m_ui->retranslateUi( this ); diff --git a/src/libcalamaresui/utils/DebugWindow.ui b/src/libcalamaresui/utils/DebugWindow.ui index eb6d5c3e7..63a6a840a 100644 --- a/src/libcalamaresui/utils/DebugWindow.ui +++ b/src/libcalamaresui/utils/DebugWindow.ui @@ -101,6 +101,20 @@ </widget> </item> <item> + <widget class="QPushButton" name="reloadStylesheetButton"> + <property name="text"> + <string>Reload Stylesheet</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="widgetTreeButton"> + <property name="text"> + <string>Widget Tree</string> + </property> + </widget> + </item> + <item> <spacer name="verticalSpacer"> <property name="orientation"> <enum>Qt::Vertical</enum> diff --git a/src/libcalamaresui/utils/ImageRegistry.cpp b/src/libcalamaresui/utils/ImageRegistry.cpp index 442017048..96ea92bbb 100644 --- a/src/libcalamaresui/utils/ImageRegistry.cpp +++ b/src/libcalamaresui/utils/ImageRegistry.cpp @@ -61,9 +61,9 @@ ImageRegistry::cacheKey( const QSize& size, float opacity, QColor tint ) QPixmap ImageRegistry::pixmap( const QString& image, const QSize& size, CalamaresUtils::ImageMode mode, float opacity, QColor tint ) { + Q_ASSERT( !(size.width() < 0 || size.height() < 0) ); if ( size.width() < 0 || size.height() < 0 ) { - Q_ASSERT( false ); return QPixmap(); } @@ -159,15 +159,9 @@ ImageRegistry::putInCache( const QString& image, const QSize& size, CalamaresUti if ( s_cache.contains( image ) ) { subcache = s_cache.value( image ); - if ( subcache.contains( mode ) ) { subsubcache = subcache.value( mode ); - -/* if ( subsubcache.contains( size.width() * size.height() ) ) - { - Q_ASSERT( false ); - }*/ } } diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py index d88136ced..0ffba56fa 100644 --- a/src/modules/bootloader/main.py +++ b/src/modules/bootloader/main.py @@ -7,7 +7,7 @@ # Copyright 2014, Anke Boersma <demm@kaosx.us> # Copyright 2014, Daniel Hillenbrand <codeworkx@bbqlinux.org> # Copyright 2014, Benjamin Vaudour <benjamin.vaudour@yahoo.fr> -# Copyright 2014, Kevin Kofler <kevin.kofler@chello.at> +# Copyright 2014-2019, Kevin Kofler <kevin.kofler@chello.at> # Copyright 2015-2018, Philip Mueller <philm@manjaro.org> # Copyright 2016-2017, Teo Mrnjavac <teo@kde.org> # Copyright 2017, Alf Gaida <agaida@siduction.org> @@ -342,8 +342,8 @@ def install_grub(efi_directory, fw_type): "--force", boot_loader["installPath"]]) - # The file specified in grubCfg should already be filled out - # by the grubcfg job module. + # The input file /etc/default/grub should already be filled out by the + # grubcfg job module. check_target_env_call([libcalamares.job.configuration["grubMkconfig"], "-o", libcalamares.job.configuration["grubCfg"]]) @@ -398,6 +398,12 @@ def install_secureboot(efi_directory): "-p", efi_partition_number, "-l", install_efi_directory + "/" + install_efi_bin]) + # The input file /etc/default/grub should already be filled out by the + # grubcfg job module. + check_target_env_call([libcalamares.job.configuration["grubMkconfig"], + "-o", os.path.join(efi_directory, "EFI", + efi_bootloader_id, "grub.cfg")]) + def vfat_correct_case(parent, name): for candidate in os.listdir(parent): diff --git a/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.mo Binary files differindex 11a10df01..988a78d7e 100644 --- a/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.mo +++ b/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.mo diff --git a/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.po index e67dc081f..19f669849 100644 --- a/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.po @@ -4,16 +4,16 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # # Translators: -# Davidmp <medipas@gmail.com>, 2017 +# Davidmp <medipas@gmail.com>, 2019 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-05 11:34-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2016-12-16 12:18+0000\n" -"Last-Translator: Davidmp <medipas@gmail.com>, 2017\n" +"Last-Translator: Davidmp <medipas@gmail.com>, 2019\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" @@ -39,7 +39,7 @@ msgstr "La tasca Dummy PythonQt" #: src/modules/dummypythonqt/main.py:186 msgid "This is the Dummy PythonQt Job. The dummy job says: {}" -msgstr "Sóc la tasca Dummy PythonQt. La tasca diu el següent: {}" +msgstr "Soc la tasca Dummy PythonQt. La tasca diu el següent: {}" #: src/modules/dummypythonqt/main.py:190 msgid "A status message for Dummy PythonQt Job." diff --git a/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.mo Binary files differindex 0abcc094b..fcc562306 100644 --- a/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.mo +++ b/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.mo diff --git a/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.po index 7d5c359c7..1d8526f2a 100644 --- a/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.po @@ -5,15 +5,16 @@ # # Translators: # Assalat3 <assalat3@gmail.com>, 2017 +# Kimmo Kujansuu <mrkujansuu@gmail.com>, 2019 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-05 11:34-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2016-12-16 12:18+0000\n" -"Last-Translator: Assalat3 <assalat3@gmail.com>, 2017\n" +"Last-Translator: Kimmo Kujansuu <mrkujansuu@gmail.com>, 2019\n" "Language-Team: Finnish (Finland) (https://www.transifex.com/calamares/teams/20061/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,20 +28,20 @@ msgstr "Klikkaa minua!" #: src/modules/dummypythonqt/main.py:94 msgid "A new QLabel." -msgstr "" +msgstr "Uusi Qtyönimi." #: src/modules/dummypythonqt/main.py:97 msgid "Dummy PythonQt ViewStep" -msgstr "" +msgstr "Näppärä Python Qt-näkymä" #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" -msgstr "" +msgstr "Näppärä Python Qt-työkalu" #: src/modules/dummypythonqt/main.py:186 msgid "This is the Dummy PythonQt Job. The dummy job says: {}" -msgstr "" +msgstr "Tämä on näppärä Python Qt-työkalu. Näennäinen työ sanoo: {}" #: src/modules/dummypythonqt/main.py:190 msgid "A status message for Dummy PythonQt Job." -msgstr "" +msgstr "Python Qt-työkalun tilailmoitus." diff --git a/src/modules/dummypythonqt/lang/pl/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/pl/LC_MESSAGES/dummypythonqt.po index 845f85c75..8502113bd 100644 --- a/src/modules/dummypythonqt/lang/pl/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/pl/LC_MESSAGES/dummypythonqt.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # # Translators: -# Marcin Mikołajczak <me@m4sk.in>, 2016 +# Marcin Mikołajczak <me@mkljczk.pl>, 2016 # Piotr Strębski <strebski@gmail.com>, 2017 # #, fuzzy @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-05 11:34-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2016-12-16 12:18+0000\n" "Last-Translator: Piotr Strębski <strebski@gmail.com>, 2017\n" "Language-Team: Polish (https://www.transifex.com/calamares/teams/20061/pl/)\n" diff --git a/src/modules/finished/FinishedPage.cpp b/src/modules/finished/FinishedPage.cpp index c49bb9538..4bffa8221 100644 --- a/src/modules/finished/FinishedPage.cpp +++ b/src/modules/finished/FinishedPage.cpp @@ -39,7 +39,7 @@ FinishedPage::FinishedPage( QWidget* parent ) : QWidget( parent ) , ui( new Ui::FinishedPage ) - , m_restartSetUp( false ) + , m_mode( FinishedViewStep::RestartMode::UserUnchecked ) { ui->setupUi( this ); @@ -83,6 +83,8 @@ FinishedPage::setRestart( FinishedViewStep::RestartMode mode ) { using Mode = FinishedViewStep::RestartMode; + m_mode = mode; + ui->restartCheckBox->setVisible( mode != Mode::Never ); ui->restartCheckBox->setEnabled( mode != Mode::Always ); ui->restartCheckBox->setChecked( ( mode == Mode::Always ) || ( mode == Mode::UserChecked ) ); @@ -99,17 +101,21 @@ FinishedPage::setRestartNowCommand( const QString& command ) void FinishedPage::setUpRestart() { - cDebug() << "FinishedPage::setUpRestart()"; - if ( !m_restartSetUp ) - { - connect( qApp, &QApplication::aboutToQuit, - this, [this] - { - if ( ui->restartCheckBox->isVisible() && - ui->restartCheckBox->isChecked() ) - QProcess::execute( "/bin/sh", { "-c", m_restartNowCommand } ); - } ); - } + cDebug() << "FinishedPage::setUpRestart(), Quit button" + << "setup=" << FinishedViewStep::modeName( m_mode ) + << "command=" << m_restartNowCommand; + + connect( qApp, &QApplication::aboutToQuit, + [this]() + { + if ( ui->restartCheckBox->isVisible() && + ui->restartCheckBox->isChecked() ) + { + cDebug() << "Running restart command" << m_restartNowCommand; + QProcess::execute( "/bin/sh", { "-c", m_restartNowCommand } ); + } + } + ); } diff --git a/src/modules/finished/FinishedPage.h b/src/modules/finished/FinishedPage.h index 9954e6fa0..25b776ead 100644 --- a/src/modules/finished/FinishedPage.h +++ b/src/modules/finished/FinishedPage.h @@ -49,9 +49,8 @@ protected: private: Ui::FinishedPage* ui; + FinishedViewStep::RestartMode m_mode; QString m_restartNowCommand; - - bool m_restartSetUp; }; #endif // FINISHEDPAGE_H diff --git a/src/modules/finished/FinishedViewStep.cpp b/src/modules/finished/FinishedViewStep.cpp index d5c3c3f69..f5c0935c3 100644 --- a/src/modules/finished/FinishedViewStep.cpp +++ b/src/modules/finished/FinishedViewStep.cpp @@ -156,10 +156,10 @@ FinishedViewStep::onActivate() } -QList< Calamares::job_ptr > +Calamares::JobList FinishedViewStep::jobs() const { - return QList< Calamares::job_ptr >(); + return Calamares::JobList(); } void @@ -210,4 +210,11 @@ FinishedViewStep::setConfigurationMap( const QVariantMap& configurationMap ) m_notifyOnFinished = CalamaresUtils::getBool( configurationMap, "notifyOnFinished", false ); } +QString FinishedViewStep::modeName(FinishedViewStep::RestartMode m) +{ + bool ok = false; + return modeNames().find( m, ok ); // May be QString() +} + + CALAMARES_PLUGIN_FACTORY_DEFINITION( FinishedViewStepFactory, registerPlugin<FinishedViewStep>(); ) diff --git a/src/modules/finished/FinishedViewStep.h b/src/modules/finished/FinishedViewStep.h index 314f6acc6..7b3881099 100644 --- a/src/modules/finished/FinishedViewStep.h +++ b/src/modules/finished/FinishedViewStep.h @@ -41,6 +41,8 @@ public: UserChecked, ///< @brief Show button, starts checked Always ///< @brief Show button, can't change, checked }; + /// @brief Returns the config-name of the given restart-mode @p m + static QString modeName( RestartMode m ); explicit FinishedViewStep( QObject* parent = nullptr ); virtual ~FinishedViewStep() override; @@ -57,7 +59,7 @@ public: void onActivate() override; - QList< Calamares::job_ptr > jobs() const override; + Calamares::JobList jobs() const override; void setConfigurationMap( const QVariantMap& configurationMap ) override; diff --git a/src/modules/fsresizer/ResizeFSJob.cpp b/src/modules/fsresizer/ResizeFSJob.cpp index 0ab583367..6b9ef9d3e 100644 --- a/src/modules/fsresizer/ResizeFSJob.cpp +++ b/src/modules/fsresizer/ResizeFSJob.cpp @@ -272,8 +272,8 @@ ResizeFSJob::setConfigurationMap( const QVariantMap& configurationMap ) return; } - m_size = Calamares::PartitionSize( configurationMap["size"].toString() ); - m_atleast = Calamares::PartitionSize( configurationMap["atleast"].toString() ); + m_size = PartitionSize( configurationMap["size"].toString() ); + m_atleast = PartitionSize( configurationMap["atleast"].toString() ); m_required = CalamaresUtils::getBool( configurationMap, "required", false ); } diff --git a/src/modules/fsresizer/ResizeFSJob.h b/src/modules/fsresizer/ResizeFSJob.h index 97696e40b..76ca6c219 100644 --- a/src/modules/fsresizer/ResizeFSJob.h +++ b/src/modules/fsresizer/ResizeFSJob.h @@ -33,6 +33,8 @@ class CoreBackend; // From KPMCore class Device; // From KPMCore class Partition; +using PartitionSize = CalamaresUtils::Partition::PartitionSize; + class PLUGINDLLEXPORT ResizeFSJob : public Calamares::CppJob { Q_OBJECT @@ -54,9 +56,24 @@ public: m_size.isValid(); } + QString name() const + { + return m_fsname.isEmpty() ? m_devicename : m_fsname; + } + + PartitionSize size() const + { + return m_size; + } + + PartitionSize minimumSize() const + { + return m_atleast; + } + private: - Calamares::PartitionSize m_size; - Calamares::PartitionSize m_atleast; + PartitionSize m_size; + PartitionSize m_atleast; QString m_fsname; // Either this, or devicename, is set, not both QString m_devicename; bool m_required; diff --git a/src/modules/fsresizer/Tests.cpp b/src/modules/fsresizer/Tests.cpp index 5e645a95f..cee390b6b 100644 --- a/src/modules/fsresizer/Tests.cpp +++ b/src/modules/fsresizer/Tests.cpp @@ -18,6 +18,8 @@ #include "Tests.h" +#include "ResizeFSJob.h" + #include "GlobalStorage.h" #include "JobQueue.h" #include "Settings.h" @@ -30,9 +32,7 @@ #include <QFileInfo> #include <QStringList> -#define private public -#include "ResizeFSJob.h" -#undef private +using SizeUnit = CalamaresUtils::Partition::SizeUnit; QTEST_GUILESS_MAIN( FSResizerTests ) @@ -55,10 +55,9 @@ void FSResizerTests::testConfigurationRobust() // Empty config j.setConfigurationMap( QVariantMap() ); - QVERIFY( j.m_fsname.isEmpty() ); - QVERIFY( j.m_devicename.isEmpty() ); - QCOMPARE( j.m_size.unit(), Calamares::SizeUnit::None ); - QCOMPARE( j.m_atleast.unit(), Calamares::SizeUnit::None ); + QVERIFY( j.name().isEmpty() ); + QCOMPARE( j.size().unit(), SizeUnit::None ); + QCOMPARE( j.minimumSize().unit(), SizeUnit::None ); // Config is missing fs and dev, so it isn't valid YAML::Node doc0 = YAML::Load( R"(--- @@ -66,12 +65,11 @@ size: 100% atleast: 600MiB )" ); j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ).toMap() ); - QVERIFY( j.m_fsname.isEmpty() ); - QVERIFY( j.m_devicename.isEmpty() ); - QCOMPARE( j.m_size.unit(), Calamares::SizeUnit::None ); - QCOMPARE( j.m_atleast.unit(), Calamares::SizeUnit::None ); - QCOMPARE( j.m_size.value(), 0 ); - QCOMPARE( j.m_atleast.value(), 0 ); + QVERIFY( j.name().isEmpty() ); + QCOMPARE( j.size().unit(), SizeUnit::None ); + QCOMPARE( j.minimumSize().unit(), SizeUnit::None ); + QCOMPARE( j.size().value(), 0 ); + QCOMPARE( j.minimumSize().value(), 0 ); } void FSResizerTests::testConfigurationValues() @@ -85,14 +83,14 @@ size: 100% atleast: 600MiB )" ); j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ).toMap() ); - QVERIFY( !j.m_fsname.isEmpty() ); - QVERIFY( j.m_devicename.isEmpty() ); - QCOMPARE( j.m_size.unit(), Calamares::SizeUnit::Percent ); - QCOMPARE( j.m_atleast.unit(), Calamares::SizeUnit::MiB ); - QCOMPARE( j.m_size.value(), 100 ); - QCOMPARE( j.m_atleast.value(), 600 ); - - // Silly config + QVERIFY( !j.name().isEmpty() ); + QCOMPARE( j.name(), QString("/") ); + QCOMPARE( j.size().unit(), SizeUnit::Percent ); + QCOMPARE( j.minimumSize().unit(), SizeUnit::MiB ); + QCOMPARE( j.size().value(), 100 ); + QCOMPARE( j.minimumSize().value(), 600 ); + + // Silly config has bad atleast value doc0 = YAML::Load( R"(--- fs: / dev: /dev/m00 @@ -100,14 +98,28 @@ size: 72 MiB atleast: 127 % )" ); j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ).toMap() ); - QVERIFY( !j.m_fsname.isEmpty() ); - QVERIFY( !j.m_devicename.isEmpty() ); - QCOMPARE( j.m_size.unit(), Calamares::SizeUnit::MiB ); - QCOMPARE( j.m_atleast.unit(), Calamares::SizeUnit::None ); - QCOMPARE( j.m_size.value(), 72 ); - QCOMPARE( j.m_atleast.value(), 0 ); - - // Silly config + QVERIFY( !j.name().isEmpty() ); + QCOMPARE( j.name(), QString("/") ); + QCOMPARE( j.size().unit(), SizeUnit::MiB ); + QCOMPARE( j.minimumSize().unit(), SizeUnit::None ); + QCOMPARE( j.size().value(), 72 ); + QCOMPARE( j.minimumSize().value(), 0 ); + + // Silly config has bad atleast value + doc0 = YAML::Load( R"(--- +dev: /dev/m00 +size: 72 MiB +atleast: 127 % +)" ); + j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ).toMap() ); + QVERIFY( !j.name().isEmpty() ); + QCOMPARE( j.name(), QString("/dev/m00") ); + QCOMPARE( j.size().unit(), SizeUnit::MiB ); + QCOMPARE( j.minimumSize().unit(), SizeUnit::None ); + QCOMPARE( j.size().value(), 72 ); + QCOMPARE( j.minimumSize().value(), 0 ); + + // Normal config doc0 = YAML::Load( R"(--- fs: / # dev: /dev/m00 @@ -115,10 +127,10 @@ size: 71MiB # atleast: 127% )" ); j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ).toMap() ); - QVERIFY( !j.m_fsname.isEmpty() ); - QVERIFY( j.m_devicename.isEmpty() ); - QCOMPARE( j.m_size.unit(), Calamares::SizeUnit::MiB ); - QCOMPARE( j.m_atleast.unit(), Calamares::SizeUnit::None ); - QCOMPARE( j.m_size.value(), 71 ); - QCOMPARE( j.m_atleast.value(), 0 ); + QVERIFY( !j.name().isEmpty() ); + QCOMPARE( j.name(), QString("/") ); + QCOMPARE( j.size().unit(), SizeUnit::MiB ); + QCOMPARE( j.minimumSize().unit(), SizeUnit::None ); + QCOMPARE( j.size().value(), 71 ); + QCOMPARE( j.minimumSize().value(), 0 ); } diff --git a/src/modules/interactiveterminal/InteractiveTerminalViewStep.cpp b/src/modules/interactiveterminal/InteractiveTerminalViewStep.cpp index d57eb7d05..874c8a9cc 100644 --- a/src/modules/interactiveterminal/InteractiveTerminalViewStep.cpp +++ b/src/modules/interactiveterminal/InteractiveTerminalViewStep.cpp @@ -20,6 +20,8 @@ #include "InteractiveTerminalPage.h" +#include "utils/Logger.h" + #include <QVariant> CALAMARES_PLUGIN_FACTORY_DEFINITION( InteractiveTerminalViewStepFactory, registerPlugin<InteractiveTerminalViewStep>(); ) @@ -84,6 +86,7 @@ InteractiveTerminalViewStep::isAtEnd() const QList< Calamares::job_ptr > InteractiveTerminalViewStep::jobs() const { + cDebug() << "InteractiveTerminal" << prettyName() << "asked for jobs(), this is probably wrong."; return QList< Calamares::job_ptr >(); } @@ -91,6 +94,7 @@ InteractiveTerminalViewStep::jobs() const void InteractiveTerminalViewStep::onActivate() { + cDebug() << "InteractiveTerminal" << prettyName() << "activated."; m_widget->onActivate(); } diff --git a/src/modules/oemid/OEMViewStep.cpp b/src/modules/oemid/OEMViewStep.cpp index 0f076927b..8a12bd17c 100644 --- a/src/modules/oemid/OEMViewStep.cpp +++ b/src/modules/oemid/OEMViewStep.cpp @@ -43,9 +43,15 @@ public: ) } + virtual ~OEMPage() override; + Ui_OEMPage* m_ui; } ; +OEMPage::~OEMPage() +{ +} + OEMViewStep::OEMViewStep(QObject* parent) : Calamares::ViewStep( parent ) diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py index aac1aa6f9..aa4bb8b12 100644 --- a/src/modules/packages/main.py +++ b/src/modules/packages/main.py @@ -290,7 +290,7 @@ class PMPacman(PackageManager): check_target_env_call(["pacman", "-Sy"]) def update_system(self): - check_target_env_call(["pacman", "-Su"]) + check_target_env_call(["pacman", "-Su", "--noconfirm"]) class PMPortage(PackageManager): diff --git a/src/modules/partition/core/BootLoaderModel.cpp b/src/modules/partition/core/BootLoaderModel.cpp index 16c6ce3c8..7f5a0427a 100644 --- a/src/modules/partition/core/BootLoaderModel.cpp +++ b/src/modules/partition/core/BootLoaderModel.cpp @@ -23,9 +23,13 @@ #include "core/PartitionInfo.h" #include "core/KPMHelpers.h" +#include "utils/Logger.h" + // KPMcore #include <kpmcore/core/device.h> +#include <QComboBox> + static QStandardItem* createBootLoaderItem( const QString& description, const QString& path, bool isPartition ) { @@ -47,12 +51,12 @@ BootLoaderModel::~BootLoaderModel() void BootLoaderModel::init( const QList< Device* >& devices ) { + cDebug() << "BLM::init with" << devices.count() << "devices" << rowCount() << "rows"; beginResetModel(); blockSignals( true ); m_devices = devices; - clear(); - createMbrItems(); + updateInternal(); blockSignals( false ); endResetModel(); @@ -74,6 +78,7 @@ BootLoaderModel::createMbrItems() void BootLoaderModel::update() { + cDebug() << "BLM::update holds" << m_devices.count() << "devices" << rowCount() << "rows"; beginResetModel(); blockSignals( true ); updateInternal(); @@ -89,6 +94,10 @@ BootLoaderModel::updateInternal() 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 ) @@ -148,3 +157,48 @@ BootLoaderModel::data( const QModelIndex& index, int role ) const } return QStandardItemModel::data( index, role ); } + +namespace Calamares +{ +int +findBootloader( const QAbstractItemModel* model, const QString& path ) +{ + 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; +} + +void +restoreSelectedBootLoader( QComboBox& combo, const QString& path ) +{ + const auto* model = combo.model(); + if ( model->rowCount() < 1 ) + { + cDebug() << "No items in BootLoaderModel"; + return; + } + + int r = -1; + if ( path.isEmpty() ) + { + combo.setCurrentIndex( 0 ); + } + else if ( (r = findBootloader( model, path )) >= 0 ) + { + combo.setCurrentIndex( r ); + } + else + { + combo.setCurrentIndex( 0 ); + } +} + +} // namespace diff --git a/src/modules/partition/core/BootLoaderModel.h b/src/modules/partition/core/BootLoaderModel.h index fbbb9deb2..a2befad00 100644 --- a/src/modules/partition/core/BootLoaderModel.h +++ b/src/modules/partition/core/BootLoaderModel.h @@ -25,6 +25,7 @@ #include <QStandardItemModel> class Device; +class QComboBox; /** * This model contains one entry for each device MBR plus one entry for the @@ -63,4 +64,20 @@ private: void updateInternal(); }; +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 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 #endif /* BOOTLOADERMODEL_H */ diff --git a/src/modules/partition/core/ColorUtils.cpp b/src/modules/partition/core/ColorUtils.cpp index 40f65d2ba..ffe45d443 100644 --- a/src/modules/partition/core/ColorUtils.cpp +++ b/src/modules/partition/core/ColorUtils.cpp @@ -22,6 +22,8 @@ #include "core/KPMHelpers.h" #include "core/PartitionIterator.h" +#include "utils/Logger.h" + // KPMcore #include <kpmcore/core/partition.h> #include <kpmcore/fs/luks.h> @@ -81,6 +83,12 @@ _findRootForPartition( PartitionNode* partition ) QColor colorForPartition( Partition* partition ) { + if ( !partition ) + { + cWarning() << "NULL partition"; + return FREE_SPACE_COLOR; + } + if ( KPMHelpers::isPartitionFreeSpace( partition ) ) return FREE_SPACE_COLOR; if ( partition->roles().has( PartitionRole::Extended ) ) diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp index 1c89a5b7f..f0d5acdd9 100644 --- a/src/modules/partition/core/PartitionActions.cpp +++ b/src/modules/partition/core/PartitionActions.cpp @@ -103,7 +103,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO { if ( gs->contains( "efiSystemPartitionSize" ) ) { - Calamares::PartitionSize part_size = Calamares::PartitionSize( + CalamaresUtils::Partition::PartitionSize part_size = CalamaresUtils::Partition::PartitionSize( gs->value( "efiSystemPartitionSize" ).toString() ); uefisys_part_sizeB = part_size.toBytes( dev->capacity() ); } diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp index 6dd2b6faf..4b23c86e4 100644 --- a/src/modules/partition/core/PartitionCoreModule.cpp +++ b/src/modules/partition/core/PartitionCoreModule.cpp @@ -402,7 +402,7 @@ PartitionCoreModule::deletePartition( Device* device, Partition* partition ) deletePartition( device, childPartition ); } - QList< Calamares::job_ptr >& jobs = deviceInfo->jobs; + Calamares::JobList& jobs = deviceInfo->jobs; if ( partition->state() == KPM_PARTITION_STATE(New) ) { // First remove matching SetPartFlagsJobs @@ -496,10 +496,10 @@ PartitionCoreModule::setPartitionFlags( Device* device, PartitionInfo::setFlags( partition, flags ); } -QList< Calamares::job_ptr > +Calamares::JobList PartitionCoreModule::jobs() const { - QList< Calamares::job_ptr > lst; + Calamares::JobList lst; QList< Device* > devices; #ifdef DEBUG_PARTITION_UNSAFE @@ -947,12 +947,7 @@ PartitionCoreModule::revertDevice( Device* dev, bool individualRevert ) QList< Device* > devices; for ( DeviceInfo* const info : m_deviceInfos ) { - // device is a QScopedPointer - if ( !info || info->device.isNull() ) - continue; - if ( info->device->type() != Device::Type::Disk_Device ) - continue; - else + if ( info && !info->device.isNull() && info->device->type() == Device::Type::Disk_Device ) devices.append( info->device.data() ); } diff --git a/src/modules/partition/core/PartitionCoreModule.h b/src/modules/partition/core/PartitionCoreModule.h index 906119a74..7faf67863 100644 --- a/src/modules/partition/core/PartitionCoreModule.h +++ b/src/modules/partition/core/PartitionCoreModule.h @@ -247,7 +247,7 @@ private: QScopedPointer< Device > device; QScopedPointer< PartitionModel > partitionModel; const QScopedPointer< Device > immutableDevice; - QList< Calamares::job_ptr > jobs; + Calamares::JobList jobs; // To check if LVM VGs are deactivated bool isAvailable; diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp index a988da3f7..35b90722a 100644 --- a/src/modules/partition/core/PartitionLayout.cpp +++ b/src/modules/partition/core/PartitionLayout.cpp @@ -86,10 +86,10 @@ PartitionLayout::addEntry( PartitionLayout::PartitionEntry entry ) } PartitionLayout::PartitionEntry::PartitionEntry( const QString& size, const QString& min, const QString& max ) + : partSize( size ) + , partMinSize( min ) + , partMaxSize( max ) { - partSize = Calamares::PartitionSize( size ); - partMinSize = Calamares::PartitionSize( min ); - partMaxSize = Calamares::PartitionSize( max ); } bool @@ -150,7 +150,7 @@ PartitionLayout::execute( Device *dev, qint64 firstSector, const PartitionRole& role ) { QList< Partition* > partList; - qint64 size, minSize, maxSize, end; + qint64 minSize, maxSize, end; qint64 totalSize = lastSector - firstSector + 1; qint64 availableSize = totalSize; @@ -161,6 +161,7 @@ PartitionLayout::execute( Device *dev, qint64 firstSector, { Partition *currentPartition = nullptr; + qint64 size = -1; // Calculate partition size if ( part.partSize.isValid() ) { diff --git a/src/modules/partition/core/PartitionLayout.h b/src/modules/partition/core/PartitionLayout.h index 74bc09873..a9b8d410b 100644 --- a/src/modules/partition/core/PartitionLayout.h +++ b/src/modules/partition/core/PartitionLayout.h @@ -43,9 +43,9 @@ public: QString partLabel; QString partMountPoint; FileSystem::Type partFileSystem = FileSystem::Unknown; - Calamares::PartitionSize partSize; - Calamares::PartitionSize partMinSize; - Calamares::PartitionSize partMaxSize; + CalamaresUtils::Partition::PartitionSize partSize; + CalamaresUtils::Partition::PartitionSize partMinSize; + CalamaresUtils::Partition::PartitionSize partMaxSize; /// @brief All-zeroes PartitionEntry PartitionEntry() {} diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index 04eec56ed..5e8260dec 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -960,19 +960,18 @@ ChoicePage::updateActionChoicePreview( ChoicePage::InstallChoice choice ) QLabel* sizeLabel = new QLabel( m_previewAfterFrame ); layout->addWidget( sizeLabel ); sizeLabel->setWordWrap( true ); - connect( m_afterPartitionSplitterWidget, &PartitionSplitterWidget::partitionResized, - this, [ this, sizeLabel ]( const QString& path, - qint64 size, - qint64 sizeNext ) - { - Q_UNUSED( path ) - sizeLabel->setText( tr( "%1 will be shrunk to %2MiB and a new " - "%3MiB partition will be created for %4." ) - .arg( m_beforePartitionBarsView->selectionModel()->currentIndex().data().toString() ) - .arg( CalamaresUtils::BytesToMiB( size ) ) - .arg( CalamaresUtils::BytesToMiB( sizeNext ) ) - .arg( *Calamares::Branding::ShortProductName ) ); - } ); + connect( m_afterPartitionSplitterWidget, &PartitionSplitterWidget::partitionResized, this, + [ this, sizeLabel ]( const QString& path, qint64 size, qint64 sizeNext ) + { + Q_UNUSED( path ) + sizeLabel->setText( tr( "%1 will be shrunk to %2MiB and a new " + "%3MiB partition will be created for %4." ) + .arg( m_beforePartitionBarsView->selectionModel()->currentIndex().data().toString() ) + .arg( CalamaresUtils::BytesToMiB( size ) ) + .arg( CalamaresUtils::BytesToMiB( sizeNext ) ) + .arg( *Calamares::Branding::ShortProductName ) ); + } + ); m_previewAfterFrame->show(); m_previewAfterLabel->show(); @@ -1025,18 +1024,25 @@ ChoicePage::updateActionChoicePreview( ChoicePage::InstallChoice choice ) eraseBootloaderLabel->setText( tr( "Boot loader location:" ) ); m_bootloaderComboBox = createBootloaderComboBox( eraseWidget ); - connect( m_core, &PartitionCoreModule::deviceReverted, - this, [ this ]( Device* dev ) - { - Q_UNUSED( dev ) - if ( !m_bootloaderComboBox.isNull() ) + connect( m_core->bootLoaderModel(), &QAbstractItemModel::modelReset, + [ this ]() { - if ( m_bootloaderComboBox->model() != m_core->bootLoaderModel() ) - m_bootloaderComboBox->setModel( m_core->bootLoaderModel() ); - - m_bootloaderComboBox->setCurrentIndex( m_lastSelectedDeviceIndex ); + if ( !m_bootloaderComboBox.isNull() ) + Calamares::restoreSelectedBootLoader( *m_bootloaderComboBox, m_core->bootLoaderInstallPath() ); } - }, Qt::QueuedConnection ); + ); + connect( m_core, &PartitionCoreModule::deviceReverted, this, + [ this ]( Device* dev ) + { + Q_UNUSED( dev ) + if ( !m_bootloaderComboBox.isNull() ) + { + if ( m_bootloaderComboBox->model() != m_core->bootLoaderModel() ) + m_bootloaderComboBox->setModel( m_core->bootLoaderModel() ); + + m_bootloaderComboBox->setCurrentIndex( m_lastSelectedDeviceIndex ); + } + }, Qt::QueuedConnection ); // ^ Must be Queued so it's sure to run when the widget is already visible. eraseLayout->addWidget( m_bootloaderComboBox ); diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp index 790ff84ab..915f899b2 100644 --- a/src/modules/partition/gui/PartitionPage.cpp +++ b/src/modules/partition/gui/PartitionPage.cpp @@ -219,7 +219,7 @@ PartitionPage::onNewPartitionTableClicked() m_core->createPartitionTable( device, type ); } delete dlg; - // PartionModelReset isn't emmited after createPartitionTable, so we have to manually update + // PartionModelReset isn't emitted after createPartitionTable, so we have to manually update // the bootLoader index after the reset. updateBootLoaderIndex(); } @@ -511,45 +511,10 @@ PartitionPage::updateSelectedBootLoaderIndex() cDebug() << "Selected bootloader index" << m_lastSelectedBootLoaderIndex; } -int -findBootloader( const QAbstractItemModel* model, const QString& path ) -{ - 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; -} - void PartitionPage::restoreSelectedBootLoader() { - const auto* model = m_ui->bootLoaderComboBox->model(); - if ( model->rowCount() < 1 ) - { - cDebug() << "No items in BootLoaderModel"; - return; - } - - int r = -1; - if ( m_core->bootLoaderInstallPath().isEmpty() ) - { - m_ui->bootLoaderComboBox->setCurrentIndex( 0 ); - } - else if ( (r = findBootloader( model, m_core->bootLoaderInstallPath() )) >= 0 ) - { - m_ui->bootLoaderComboBox->setCurrentIndex( r ); - } - else - { - m_ui->bootLoaderComboBox->setCurrentIndex( 0 ); - } + Calamares::restoreSelectedBootLoader( *(m_ui->bootLoaderComboBox), m_core->bootLoaderInstallPath() ); } @@ -564,7 +529,7 @@ PartitionPage::updateFromCurrentDevice() QAbstractItemModel* oldModel = m_ui->partitionTreeView->model(); if ( oldModel ) - disconnect( oldModel, 0, this, 0 ); + disconnect( oldModel, nullptr, this, nullptr ); PartitionModel* model = m_core->partitionModelForDevice( device ); m_ui->partitionBarsView->setModel( model ); diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp index 2e186b3a8..58fa17674 100644 --- a/src/modules/partition/gui/PartitionViewStep.cpp +++ b/src/modules/partition/gui/PartitionViewStep.cpp @@ -619,7 +619,7 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap ) } -QList< Calamares::job_ptr > +Calamares::JobList PartitionViewStep::jobs() const { return m_core->jobs(); @@ -638,7 +638,11 @@ PartitionViewStep::checkRequirements() []{ return tr( "has at least one disk device available." ); }, []{ return tr( "There are no partitons to install on." ); }, m_core->deviceModel()->rowCount() > 0, // satisfied - true // required +#ifdef DEBUG_PARTITION_UNSAFE + false // optional +#else + true // required +#endif } ); return l; diff --git a/src/modules/partition/gui/PartitionViewStep.h b/src/modules/partition/gui/PartitionViewStep.h index 47f8fa127..e3d058e67 100644 --- a/src/modules/partition/gui/PartitionViewStep.h +++ b/src/modules/partition/gui/PartitionViewStep.h @@ -69,7 +69,7 @@ public: void setConfigurationMap( const QVariantMap& configurationMap ) override; - QList< Calamares::job_ptr > jobs() const override; + Calamares::JobList jobs() const override; Calamares::RequirementsList checkRequirements() override; diff --git a/src/modules/partition/gui/ResizeVolumeGroupDialog.cpp b/src/modules/partition/gui/ResizeVolumeGroupDialog.cpp index 1c5eef0ab..2de999360 100644 --- a/src/modules/partition/gui/ResizeVolumeGroupDialog.cpp +++ b/src/modules/partition/gui/ResizeVolumeGroupDialog.cpp @@ -44,7 +44,7 @@ ResizeVolumeGroupDialog::ResizeVolumeGroupDialog( LvmDevice *device, for ( const Partition* p : availablePVs ) pvList()->addItem( new ListPhysicalVolumeWidgetItem( p, false ) ); - peSize()->setValue( device->peSize() / Capacity::unitFactor(Capacity::Unit::Byte, Capacity::Unit::MiB) ); + peSize()->setValue( static_cast<int>( device->peSize() / Capacity::unitFactor(Capacity::Unit::Byte, Capacity::Unit::MiB) ) ); vgName()->setEnabled( false ); peSize()->setEnabled( false ); diff --git a/src/modules/partition/gui/VolumeGroupBaseDialog.cpp b/src/modules/partition/gui/VolumeGroupBaseDialog.cpp index a727fe42a..8078253b3 100644 --- a/src/modules/partition/gui/VolumeGroupBaseDialog.cpp +++ b/src/modules/partition/gui/VolumeGroupBaseDialog.cpp @@ -137,9 +137,9 @@ VolumeGroupBaseDialog::updateTotalSize() void VolumeGroupBaseDialog::updateTotalSectors() { - qint32 totalSectors = 0; + qint64 totalSectors = 0; - qint32 extentSize = ui->peSize->value() * Capacity::unitFactor(Capacity::Unit::Byte, Capacity::Unit::MiB); + qint64 extentSize = ui->peSize->value() * Capacity::unitFactor(Capacity::Unit::Byte, Capacity::Unit::MiB); if ( extentSize > 0 ) totalSectors = m_totalSizeValue / extentSize; diff --git a/src/modules/partition/jobs/CreatePartitionTableJob.cpp b/src/modules/partition/jobs/CreatePartitionTableJob.cpp index 937b8437d..3465a0e2d 100644 --- a/src/modules/partition/jobs/CreatePartitionTableJob.cpp +++ b/src/modules/partition/jobs/CreatePartitionTableJob.cpp @@ -68,7 +68,7 @@ CreatePartitionTableJob::prettyStatusMessage() const static inline QDebug& -operator <<( QDebug& s, PartitionIterator& it ) +operator <<( QDebug&& s, PartitionIterator& it ) { s << ( ( *it ) ? ( *it )->deviceNode() : QString( "<null device>" ) ); return s; @@ -89,7 +89,7 @@ CreatePartitionTableJob::exec() { for ( auto it = PartitionIterator::begin( table ); it != PartitionIterator::end( table ); ++it ) - cDebug() << *it; + cDebug() << it; QProcess lsblk; lsblk.setProgram( "lsblk" ); diff --git a/src/modules/partition/partition.conf b/src/modules/partition/partition.conf index b9262e86f..42d1f2ce2 100644 --- a/src/modules/partition/partition.conf +++ b/src/modules/partition/partition.conf @@ -30,7 +30,7 @@ efiSystemPartition: "/boot/efi" # 8.8GiB on disk in the end). userSwapChoices: - none # Create no swap, use no swap - - reuse # Re-use existing swap, but don't create any + - reuse # Re-use existing swap, but don't create any (unsupported right now) - small # Up to 4GB - suspend # At least main memory size - file # To swap file instead of partition (unsupported right now) diff --git a/src/modules/partition/tests/PartitionJobTests.cpp b/src/modules/partition/tests/PartitionJobTests.cpp index e4707accf..f3bd8dd13 100644 --- a/src/modules/partition/tests/PartitionJobTests.cpp +++ b/src/modules/partition/tests/PartitionJobTests.cpp @@ -77,7 +77,7 @@ static QByteArray generateTestData( qint64 size ) { QByteArray ba; - ba.resize( 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 ) { @@ -130,6 +130,11 @@ QueueRunner::QueueRunner( JobQueue* queue ) connect( m_queue, &JobQueue::failed, this, &QueueRunner::onFailed ); } +QueueRunner::~QueueRunner() +{ + // Nothing to do. We don't own the queue, and disconnect happens automatically +} + bool QueueRunner::run() { @@ -167,7 +172,8 @@ PartitionJobTests::initTestCase() QString devicePath = qgetenv( "CALAMARES_TEST_DISK" ); if ( devicePath.isEmpty() ) { - QSKIP( "Skipping test, CALAMARES_TEST_DISK is not set. It should point to a disk which can be safely formatted" ); + // 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 ); } QVERIFY( KPMHelpers::initKPMcore() ); @@ -322,10 +328,10 @@ PartitionJobTests::testCreatePartitionExtended() void PartitionJobTests::testResizePartition_data() { - QTest::addColumn< int >( "oldStartMiB" ); - QTest::addColumn< int >( "oldSizeMiB" ); - QTest::addColumn< int >( "newStartMiB" ); - QTest::addColumn< int >( "newSizeMiB" ); + QTest::addColumn< unsigned int >( "oldStartMiB" ); + QTest::addColumn< unsigned int >( "oldSizeMiB" ); + QTest::addColumn< unsigned int >( "newStartMiB" ); + QTest::addColumn< unsigned int >( "newSizeMiB" ); QTest::newRow("grow") << 10 << 50 << 10 << 70; QTest::newRow("shrink") << 10 << 70 << 10 << 50; @@ -336,10 +342,10 @@ PartitionJobTests::testResizePartition_data() void PartitionJobTests::testResizePartition() { - QFETCH( int, oldStartMiB ); - QFETCH( int, oldSizeMiB ); - QFETCH( int, newStartMiB ); - QFETCH( int, newSizeMiB ); + QFETCH( unsigned int, oldStartMiB ); + QFETCH( unsigned int, oldSizeMiB ); + QFETCH( unsigned int, newStartMiB ); + QFETCH( unsigned int, newSizeMiB ); const qint64 sectorsPerMiB = 1_MiB / m_device->logicalSize(); diff --git a/src/modules/partition/tests/PartitionJobTests.h b/src/modules/partition/tests/PartitionJobTests.h index 0744cbdda..62d5924ea 100644 --- a/src/modules/partition/tests/PartitionJobTests.h +++ b/src/modules/partition/tests/PartitionJobTests.h @@ -36,6 +36,7 @@ class QueueRunner : public QObject { public: QueueRunner( Calamares::JobQueue* queue ); + virtual ~QueueRunner() override; /** * Synchronously runs the queue. Returns true on success diff --git a/src/modules/plasmalnf/CMakeLists.txt b/src/modules/plasmalnf/CMakeLists.txt index e39b1af9f..93c88b291 100644 --- a/src/modules/plasmalnf/CMakeLists.txt +++ b/src/modules/plasmalnf/CMakeLists.txt @@ -21,14 +21,6 @@ set_package_properties( ) if ( KF5Plasma_FOUND AND KF5Package_FOUND ) - if ( KF5Config_FOUND ) - set( option_kf5 Config ) - set( option_defs WITH_KCONFIG ) - # set( option_libs KF5::Config ) # Not needed anyway - endif() - - find_package( KF5 ${lnf_ver} REQUIRED CoreAddons Plasma Package ${option_kf5} ) - calamares_add_plugin( plasmalnf TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO @@ -45,11 +37,13 @@ if ( KF5Plasma_FOUND AND KF5Package_FOUND ) page_plasmalnf.ui LINK_PRIVATE_LIBRARIES calamaresui - ${option_libs} KF5::Package KF5::Plasma SHARED_LIB ) + if ( KF5Config_FOUND ) + target_compile_definitions(calamares_viewmodule_plasmalnf PRIVATE WITH_KCONFIG) + endif() else() calamares_skip_module( "plasmalnf (missing requirements)" ) endif() diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp index 13676ffe7..98187d49e 100644 --- a/src/modules/welcome/WelcomePage.cpp +++ b/src/modules/welcome/WelcomePage.cpp @@ -286,6 +286,12 @@ WelcomePage::externallySelectedLanguage( int row ) ui->languageWidget->setCurrentIndex( row ); } +void +WelcomePage::setLanguageIcon( QPixmap i ) +{ + ui->languageIcon->setPixmap( i ); +} + void LocaleTwoColumnDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const diff --git a/src/modules/welcome/WelcomePage.h b/src/modules/welcome/WelcomePage.h index f05426d38..6c244bf0c 100644 --- a/src/modules/welcome/WelcomePage.h +++ b/src/modules/welcome/WelcomePage.h @@ -42,6 +42,8 @@ public: void setUpLinks( bool showSupportUrl, bool showKnownIssuesUrl, bool showReleaseNotesUrl ); + /// @brief Set international language-selector icon + void setLanguageIcon( QPixmap ); /// @brief Results of requirements checking bool verdict() const; diff --git a/src/modules/welcome/WelcomePage.ui b/src/modules/welcome/WelcomePage.ui index 51fa19c04..548bd5d27 100644 --- a/src/modules/welcome/WelcomePage.ui +++ b/src/modules/welcome/WelcomePage.ui @@ -67,7 +67,7 @@ </spacer> </item> <item> - <widget class="QLabel" name="label_2"> + <widget class="QLabel" name="languageIcon"> <property name="toolTip"> <string>Select language</string> </property> diff --git a/src/modules/welcome/WelcomeViewStep.cpp b/src/modules/welcome/WelcomeViewStep.cpp index e115565b7..a27cc4cf0 100644 --- a/src/modules/welcome/WelcomeViewStep.cpp +++ b/src/modules/welcome/WelcomeViewStep.cpp @@ -24,10 +24,12 @@ #include "geoip/Handler.h" #include "locale/Lookup.h" -#include "modulesystem/ModuleManager.h" #include "utils/Logger.h" #include "utils/Variant.h" +#include "Branding.h" +#include "modulesystem/ModuleManager.h" + #include <QFutureWatcher> #include <QVariant> @@ -137,6 +139,15 @@ WelcomeViewStep::setConfigurationMap( const QVariantMap& configurationMap ) } ); future->setFuture( handler->queryRaw() ); } + + + QString language = CalamaresUtils::getString( configurationMap, "languageIcon" ); + if ( !language.isEmpty() ) + { + auto icon = Calamares::Branding::instance()->image( language, QSize( 48, 48 ) ); + if ( !icon.isNull() ) + m_widget->setLanguageIcon( icon ); + } } Calamares::RequirementsList diff --git a/src/modules/welcome/welcome.conf b/src/modules/welcome/welcome.conf index 098f734c0..b85fab2ea 100644 --- a/src/modules/welcome/welcome.conf +++ b/src/modules/welcome/welcome.conf @@ -55,8 +55,25 @@ requirements: # connectivity, though. Configuration is like in the locale module, # but remember to use a URL that returns full data **and** to # use a selector that will pick the country, not the timezone. +# +# To disable, either comment-out the entire section, or set +# the *style* key to an unsupported format (e.g. `none`, as is +# done here). + +#geoip: +# style: "none" +# url: "https://geoip.kde.org/v1/ubiquity" # extended XML format +# selector: "CountryCode" # blank uses default, which is wrong -# geoip: -# style: "xml" -# url: "https://geoip.kde.org/v1/ubiquity" # extended XML format -# selector: "CountryCode" # blank uses default, which is wrong +# User interface +# +# The "select language" icon is an international standard, but it +# might not theme very well with your desktop environment. +# Fill in an icon name (following FreeDesktop standards) to +# use that named icon instead of the usual one. +# +# Leave blank or unset to use the international standard. +# +# Known icons in this space are "set-language" and "config-language". +# +# languageIcon: set-language diff --git a/src/qml/calamares/CMakeLists.txt b/src/qml/calamares/CMakeLists.txt index ba2fb38b7..48f8ca96c 100644 --- a/src/qml/calamares/CMakeLists.txt +++ b/src/qml/calamares/CMakeLists.txt @@ -25,3 +25,5 @@ foreach( SUBDIRECTORY ${SUBDIRECTORIES} ) endif() endforeach() + +message( "" ) |