diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..003a869f9c95b71ec926a02c3147090400914f7f
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,25 @@
+language:
+ - cpp
+ - python
+
+python:
+ - 3.5
+
+sudo: required
+
+services:
+ - docker
+
+notifications:
+ irc:
+ - "chat.freenode.net#calamares"
+
+install:
+ - docker build -t calamares .
+ - pip install pycodestyle
+
+script:
+ - docker run -v $PWD:/build calamares bash -lc "cd /build && cmake -DWEBVIEW_FORCE_WEBKIT=1 -DKDE_INSTALL_USE_QT_SYS_PATHS=ON . && make -j2"
+ - pycodestyle --exclude=thirdparty,.git $PWD
+
+group: deprecated-2017Q2
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 246778646dc367deb6161d134cf350798e77facf..1457b2a41c19ef825048cf58c7b921ac2abda335 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,7 +120,7 @@ set( CALAMARES_TRANSLATION_LANGUAGES ar ast bg ca cs_CZ da de el en en_GB es_MX
### Bump version here
set( CALAMARES_VERSION_MAJOR 3 )
set( CALAMARES_VERSION_MINOR 1 )
-set( CALAMARES_VERSION_PATCH 0.2 )
+set( CALAMARES_VERSION_PATCH 1 )
set( CALAMARES_VERSION_RC 0 )
set( CALAMARES_VERSION ${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH} )
@@ -260,6 +260,13 @@ install(
${CMAKE_INSTALL_DATADIR}/applications
)
+install(
+ FILES
+ man/calamares.8
+ DESTINATION
+ ${CMAKE_INSTALL_MANDIR}/man8/
+)
+
# uninstall target
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..cd0e4f3656d834a3128293b0c4a4c1c43d14dbef
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,2 @@
+FROM kdeneon/all
+RUN sudo apt-get update && sudo apt-get -y install build-essential cmake extra-cmake-modules gettext kio-dev libatasmart-dev libboost-python-dev libkf5config-dev libkf5coreaddons-dev libkf5i18n-dev libkf5iconthemes-dev libkf5parts-dev libkf5service-dev libkf5solid-dev libkpmcore-dev libparted-dev libpolkit-qt5-1-dev libqt5svg5-dev libqt5webkit5-dev libyaml-cpp-dev os-prober pkg-config python3-dev qtbase5-dev qtdeclarative5-dev qttools5-dev qttools5-dev-tools
diff --git a/HACKING.md b/HACKING.md
index 4881dec036d7da1eec3a3856d1429af55e3b5c0e..92d1a5a488ccc662735c7b1d35694af11c80c42c 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -26,10 +26,21 @@ Example:
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
```
-Copyright holders must be physical or legal personalities. A statement such as `Copyright 2014, The FooBarQuux project` has no legal value if "The FooBarQuux project" is not the legal name of a person, company, incorporated organization, etc.
+Copyright holders must be physical or legal personalities. A statement such as
+`Copyright 2014, The FooBarQuux project` has no legal value if "The FooBarQuux
+project" is not the legal name of a person, company, incorporated
+organization, etc.
+
+Please add your name to files you touch when making any contribution (even if
+it's just a typo-fix which might not be copyrightable in all jurisdictions).
Formatting
----------
+
+This formatting guide applies to C++ code only; for Python modules, we use
+[pycodestyle][https://github.com/PyCQA/pycodestyle] to apply a check of
+some PEP8 guidelines.
+
* Spaces, not tabs.
* Indentation is 4 spaces.
* Lines should be limited to 90 characters.
@@ -70,7 +81,9 @@ You can use the `hacking/calamaresstyle` script to run
[astyle](http://astyle.sf.net) on your code and have it formatted the right
way.
-**NOTE:** An .editorconfig file is included to assist with formatting. In order to take advantage of this functionality you will need to acquire the [EditorConfig](http://editorconfig.org/#download) plug-in for your editor.
+**NOTE:** An .editorconfig file is included to assist with formatting. In
+order to take advantage of this functionality you will need to acquire the
+[EditorConfig](http://editorconfig.org/#download) plug-in for your editor.
Naming
------
diff --git a/README.md b/README.md
index ecc28ab08fd6f3a0296483e8563ab6ac64057c38..e30b671558410f14949a32f95a176cb0fab1ac42 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
[](https://github.com/calamares/calamares/releases)
[](https://calamares.io/ci/job/calamares-post_commit/)
+[](https://travis-ci.org/calamares/calamares)
[](https://scan.coverity.com/projects/5389)
[](https://github.com/calamares/calamares/blob/master/LICENSE)
diff --git a/lang/calamares_ar.ts b/lang/calamares_ar.ts
index 602064a4daac66e87ab2f61c1f8c56c5d9f77ab2..0c5c84c5fb0b6a2c537bfeae23b1d55bf2512514 100644
--- a/lang/calamares_ar.ts
+++ b/lang/calamares_ar.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="ar" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>اختر قسما لتقليصه:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>قم بتخصيص مساحة القرص بسحب الفاصل في الأسفل:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>في هذه العمليّة، سيتقلّص القسم <strong>%1</strong> والذي فيه %4 إلى %2م.بايت وقسم %3م.بايت آخر جديد سيُنشأ ل%5.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>قسم نظام EFI:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -103,18 +70,18 @@
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="57"/>
<source>Type:</source>
- <translation type="unfinished"/>
+ <translation>النوع:</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="64"/>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="78"/>
<source>none</source>
- <translation type="unfinished"/>
+ <translation>لاشيء</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="71"/>
<source>Interface:</source>
- <translation type="unfinished"/>
+ <translation>الواجهة:</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="93"/>
@@ -343,12 +310,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1 المثبت</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>أظهر معلومات التّنقيح</translation>
</message>
@@ -407,17 +374,17 @@ The installer will quit and all changes will be lost.</source>
<translation>بعد:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation><strong>تقسيم يدويّ</strong><br/>يمكنك إنشاء أو تغيير حجم الأقسام بنفسك.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>مكان محمّل الإقلاع:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<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>
@@ -428,83 +395,83 @@ The installer will quit and all changes will be lost.</source>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>الحاليّ:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>قسم نظام EFI:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -600,7 +567,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="65"/>
<source>En&crypt</source>
- <translation type="unfinished"/>
+ <translation>تشفير</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="161"/>
@@ -1116,12 +1083,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>اضبط طراز لوحة المفتاتيح ليكون %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>اضبط تخطيط لوحة المفاتيح إلى %1/%2.</translation>
</message>
@@ -1137,12 +1104,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>إعداد محليّة النّظام</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>إعداد محليّة النّظام يؤثّر على لغة بعض عناصر واجهة مستخدم سطر الأوامر وأطقم محارفها.<br/>الإعداد الحاليّ هو <strong>%1</strong>.</translation>
</message>
@@ -1228,40 +1195,38 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>&غيّر...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>اضبط المنطقة الزّمنيّة إلى %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1332,17 +1297,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
- <translation type="unfinished"/>
+ <translation>الاسم</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
- <translation type="unfinished"/>
+ <translation>الوصف</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1479,7 +1444,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/>
<source>New partition</source>
- <translation type="unfinished"/>
+ <translation>قسم جديد</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="222"/>
@@ -1785,55 +1750,60 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>يجمع معلومات النّظام...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation>فيه على الأقل مساحة بحجم %1 غ.بايت حرّة</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation>ليست في القرص مساحة كافية. المطلوب هو %1 غ.بايت على الأقلّ.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>فيه ذاكرة شاغرة بحجم %1 غ.بايت على الأقلّ</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation>ليس في النّظام ذاكرة شاغرة كافية. المطلوب هو %1 غ.بايت على الأقلّ.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>موصول بمصدر للطّاقة</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>النّظام ليس متّصلًا بمصدر للطّاقة.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>موصول بالإنترنت</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>النّظام ليس موصولًا بالإنترنت</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>المثبّت لا يعمل بصلاحيّات المدير.</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2069,42 +2039,42 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>اضبط كلمة مرور للمستخدم %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>يضبط كلمة مرور للمستخدم %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>مسار النّظام المقصد سيّء.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>rootMountPoint هو %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>تعذّر ضبط كلمة مرور للمستخدم %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>أُنهي usermod برمز الخطأ %1.</translation>
</message>
@@ -2238,22 +2208,27 @@ The installer will quit and all changes will be lost.</source>
<translation>&حول</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>مرحبًا بك في مثبّت %1.</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>حول 1% المثبت</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>1%الدعم</translation>
</message>
diff --git a/lang/calamares_ast.ts b/lang/calamares_ast.ts
index 9b234a5db588251c2f43999aa9e9bdc9bc73e9ff..63a1979a08ed003ebcd7c9cb2d50c394edacae7f 100644
--- a/lang/calamares_ast.ts
+++ b/lang/calamares_ast.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="ast" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Escueyi la partición pa redimensionar:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Alluga l'espaciu d'unidá arrastrando'l divisor d'embaxo:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>Con esta operación, redimensionaráse a %2MB la partición <strong>%1</strong> que contién %4 y crearáse una partición nueva de %3MB pa %5.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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 pue alcontrase per nenyures una partición del sistema EFI nesti ordenador. Vuelvi atrás y usa'l particionáu manual pa configurar %1, por favor.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="208"/>
- <source>The EFI system partition at %1 will be used for starting %2.</source>
- <translation>La partición del sistema EFI en %1 usaráse p'aniciar %2.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>Partición del sistema EFI:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -343,12 +310,12 @@ L'instalador colará y perderánse toles camudancies.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>Instalador %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Amosar información de depuración</translation>
</message>
@@ -407,17 +374,17 @@ L'instalador colará y perderánse toles camudancies.</translation>
<translation>Dempués:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation><strong>Particionáu manual</strong><br/>Pues crear o redimensionar particiones tu mesmu.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>Allugamientu del xestor d'arranque:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
<translation>%1 redimensionaráse a %2MB y crearáse la partición nueva de %3MB pa %4.</translation>
</message>
@@ -428,83 +395,83 @@ L'instalador colará y perderánse toles camudancies.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Anguaño:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation>Reusar %1 como partición home pa %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<source><strong>Select a partition to install on</strong></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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 pue alcontrase una partición EFI nesti sistema. Torna y usa'l particionáu a mano pa configurar %1, por favor.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>La partición del sistema EFI en %1 usaráse p'aniciar %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>Partición EFI del sistema:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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 tener un sistema operativu nelli. ¿Qué te prestaría facer?<br/>Sedrás capaz a revisar y confirmar les tos escoyetes enantes de facer cualesquier camudancia al preséu d'almacenamientu.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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>Desaniciar discu</strong><br/>Esto <font color="red">desaniciará</font> tolos datos anguaño presentes nel preséu d'almacenamientu esbilláu.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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/>Sedrás capaz a revisar y confirmar les tos escoyetes enantes de facer cualesquier camudancia al preséu d'almacenamientu.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source>
<translation><strong>Tocar una partición</strong><br/>Troca una partición con %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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/>Sedrás capaz a revisar y confirmar les tos escoyetes enantes de facer cualesquier camudancia al preséu d'almacenamientu.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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 múltiples sistemes operativos nelli. ¿Qué te prestaría facer?<br/>Sedrás capaz a revisar y confirmar les tos escoyetes enantes de facer cualesquier camudancia al preséu d'almacenamientu.</translation>
</message>
@@ -620,7 +587,7 @@ L'instalador colará y perderánse toles camudancies.</translation>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="268"/>
<source>Mountpoint already in use. Please select another one.</source>
- <translation type="unfinished"/>
+ <translation>Puntu de montaxe yá n'usu. Esbilla otru, por favor.</translation>
</message>
</context>
<context>
@@ -945,7 +912,7 @@ L'instalador colará y perderánse toles camudancies.</translation>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="306"/>
<source>Mountpoint already in use. Please select another one.</source>
- <translation type="unfinished"/>
+ <translation>Puntu de montaxe yá n'usu. Esbilla otru, por favor.</translation>
</message>
</context>
<context>
@@ -1116,12 +1083,12 @@ L'instalador colará y perderánse toles camudancies.</translation>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Afitóse'l modelu de tecláu a %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Afitóse la distribución de tecláu a %1/%2.</translation>
</message>
@@ -1137,12 +1104,12 @@ L'instalador colará y perderánse toles camudancies.</translation>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>Axuste de locale del sistema</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>L'axustes de locale del sistema afeuta a la llingua y al conxuntu de caráuteres afitáu pa dellos elementos de la interfaz d'usuaru de llinia comandos.<br/>L'axuste actual ye <strong>%1</strong>.</translation>
</message>
@@ -1228,40 +1195,38 @@ L'instalador colará y perderánse toles camudancies.</translation>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation>Afitaráse la llingua'l sistema a %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Los númberos y dates afitaránse a %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Rexón:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Zona:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>&Cambiar...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Afitóse'l fusu horariu a %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation>%1 (%2)</translation>
@@ -1332,17 +1297,17 @@ L'instalador colará y perderánse toles camudancies.</translation>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
- <translation type="unfinished"/>
+ <translation>Nome</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
- <translation type="unfinished"/>
+ <translation>Descripción</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation>Instalación de rede. (Deshabilitáu: Nun pue dise en cata del llistáu de paquetes, comprueba la conexón de rede)</translation>
</message>
@@ -1785,55 +1750,60 @@ L'instalador colará y perderánse toles camudancies.</translation>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>Axuntando información del sistema...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation>tien polo menos %1 GB disponibles d'espaciu en discu</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation>Nun hai espaciu abondu na unidá. Ríquense polo menos %1 GB.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>polo menos %1 GB de memoria de trabayu</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation>El sistema nun tien abonda memoria de trabayu. Ríquense polo menos %1 GB.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>ta enchufáu a una fonte d'enerxía</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>El sistema nun ta enchufáu a una fonte d'enerxía.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>ta coneutáu a internet</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>El sistema nun ta coneutáu a internet.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>L'instalador nun ta executándose con drechos alministrativos.</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2069,42 +2039,42 @@ L'instalador colará y perderánse toles camudancies.</translation>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Afitar la contraseña pal usuariu %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>Afitando la contraseña pal usuariu %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>Camín incorreutu del destín del sistema.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>rootMountPoint ye %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation>Nun pue deshabilitase la cuenta root.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation>passwd finó col códigu de fallu %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>Nun pue afitase la contraseña pal usuariu %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>usermod finó col códigu de fallu %1.</translation>
</message>
@@ -2238,22 +2208,27 @@ L'instalador colará y perderánse toles camudancies.</translation>
<translation>&Tocante a</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>Bienllegáu al instalador %1.</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>Tocante al instaldor %1</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
- <translation type="unfinished"/>
+ <translation><h1>%1</h1><br/><strong>%2<br/>por %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Gracies a: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan y los <a href="https://www.transifex.com/calamares/calamares/">equipos de traducción de Calamares</a>.<br/><br/>El desendolcu de <a href="http://calamares.io/">Calamares</a> ta sofitáu por <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>Sofitu %1</translation>
</message>
diff --git a/lang/calamares_bg.ts b/lang/calamares_bg.ts
index 43c4616756687fa364a13b4b688880a53111a97e..39e8e1559d068d5b82d57b80f609f4f9957a4394 100644
--- a/lang/calamares_bg.ts
+++ b/lang/calamares_bg.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="bg" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Избери дял, който да смалиш:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Разпредели дисковото пространство, като влачиш разделителя по-долу:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>С това действие, дялът <strong>%1</strong>, който съдържа %4, ще бъде смален до %2МБ и нов %3МБ дял ще бъде създаден за %5.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>EFI системен дял:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -343,12 +310,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1 Инсталатор</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Покажи информация за отстраняване на грешки</translation>
</message>
@@ -408,17 +375,17 @@ The installer will quit and all changes will be lost.</source>
<translation>След:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation><strong>Самостоятелно поделяне</strong><br/>Можете да създадете или преоразмерите дяловете сами.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>Локация на програмата за начално зареждане:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<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>
@@ -429,83 +396,83 @@ The installer will quit and all changes will be lost.</source>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Сегашен:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>EFI системен дял:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1117,12 +1084,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Постави модел на клавиатурата на %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Постави оформлението на клавиатурата на %1/%2.</translation>
</message>
@@ -1138,12 +1105,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>Настройка на локацията на системата</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>Локацията на системата засяга езика и символите зададени за някои елементи на командния ред.<br/>Текущата настройка е <strong>%1</strong>.</translation>
</message>
@@ -1229,40 +1196,38 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Регион:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Зона:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>&Промени...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Постави часовата зона на %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1333,17 +1298,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1786,55 +1751,60 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>Събиране на системна информация...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation>има поне %1 ГБ свободено дисково пространство</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation>Няма достатъчно дисково пространство. Необходимо е поне %1 ГБ.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>има поне %1 ГБ работна памет</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation>Системата не разполага с достатъчно работна памет. Необходима е поне %1 ГБ.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>е включен към източник на захранване</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>Системата не е включена към източник на захранване.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>е свързан към интернет</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>Системата не е свързана с интернет.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>Инсталаторът не е стартиран с права на администратор.</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2070,42 +2040,42 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Задай парола за потребител %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>Задаване на парола за потребител %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>Лоша дестинация за системен път.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>root точка на монтиране е %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>Не може да се постави парола за потребител %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>usermod е прекратен с грешка %1.</translation>
</message>
@@ -2239,22 +2209,27 @@ The installer will quit and all changes will be lost.</source>
<translation>&Относно</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>Добре дошли при инсталатора на %1.</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>Относно инсталатор %1</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>%1 поддръжка</translation>
</message>
diff --git a/lang/calamares_ca.ts b/lang/calamares_ca.ts
index 97c3527f8cb06bc405aed0ae98d92b4e2e44e9ab..f16da7ace61f55ebd417a48198f98b0696ea41f6 100644
--- a/lang/calamares_ca.ts
+++ b/lang/calamares_ca.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="ca" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Trieu la partició per reduir:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Assigneu l'espai del disc arrossegant el separador inferior:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>Amb aquesta operació la partició <strong>%1</strong>, la qual conté %4, s'encongirà a %2MB i es crearà una nova partició de %3MB per a %5.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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 useu el particionament manual per a instal·lar %1.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="208"/>
- <source>The EFI system partition at %1 will be used for starting %2.</source>
- <translation>S'utilitzarà la partició del sistema EFI a %1 per a iniciar %2.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>Partició EFI de sistema:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -343,12 +310,12 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>Instal·lador de %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Mostra la informació de depuració</translation>
</message>
@@ -407,17 +374,17 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
<translation>Després:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation><strong>Partiment manual</strong><br/>Podeu crear o redimensionar les particions vosaltres mateixos.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>Ubicació del carregador d'arrencada:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
<translation>%1 s'encongirà a %2MB i es crearà una partició nova de %3MB per a %4.</translation>
</message>
@@ -428,83 +395,83 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Actual:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<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="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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 useu el partiment manual per configurar %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>Partició EFI del sistema:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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">esborrarà</font> totes les dades del dispositiu seleccionat.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1116,12 +1083,12 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Assigna el model del teclat a %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Assigna la distribució del teclat a %1/%2.</translation>
</message>
@@ -1137,12 +1104,12 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>Configuració de la llengua del sistema</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>La configuració local del sistema afecta la llengua i el joc de caràcters d'alguns elements de la interície de línia d'ordres. <br/>La configuració actual és <strong>%1</strong>.</translation>
</message>
@@ -1228,40 +1195,38 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation>La llengua del sistema s'establirà a %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Els números i les dates de la configuració local s'establiran a %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Regió:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Zona:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>&Canvi...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Estableix la zona horària a %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation>%1 (%2)</translation>
@@ -1332,17 +1297,17 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation>Nom</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation>Descripció</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation>Instal·lació per xarxa. (Inhabilitada: no es poden obtenir les llistes de paquets, comproveu la connexió.)</translation>
</message>
@@ -1785,55 +1750,60 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>Recopilant informació del sistema...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation>té com a mínim %1 GB d'espai de disc disponible.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>té com a mínim %1 GB de memòria de treball</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>està connectat a una font de corrent</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>El sistema no està connectat a una font de corrent.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>està connectat a Internet</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>El sistema no està connectat a Internet.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>L'instal·lador no s'ha executat amb privilegis d'administrador.</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation>La pantalla és massa petita per mostrar l'instal·lador.</translation>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2069,42 +2039,42 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Assigneu una contrasenya per a l'usuari %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>Establint la contrasenya de l'usuari %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>Destinació errònia de la ruta del sistema.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>El punt de muntatge rootMountPoint és %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation>No es pot inhabilitar el compte d'arrel.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation>El procés passwd ha acabat amb el codi d'error %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>No s'ha pogut assignar la contrasenya de l'usuari %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>usermod ha terminat amb el codi d'error %1.</translation>
</message>
@@ -2238,22 +2208,27 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
<translation>&Quant a</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>Benvinguts a l'instal·lador %1.</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation><h1>Us donem la benvinguda a l'instal·lador Calamares per a %1.</h1></translation>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>Quant a l'instal·lador %1</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Agraïments a Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg i a <a href="https://www.transifex.com/calamares/calamares/">l'equip de traducció del Calamares</a>.<br/><br/><a href="http://calamares.io/">El desenvolupament del Calamares</a> està patrocinat per <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>%1 suport</translation>
</message>
diff --git a/lang/calamares_cs_CZ.ts b/lang/calamares_cs_CZ.ts
index 3a1183bbb339751c5bddd78f08142a99880642ba..aade8fd8243a3172dbe72aa00df427e6f10d2ec0 100644
--- a/lang/calamares_cs_CZ.ts
+++ b/lang/calamares_cs_CZ.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="cs_CZ" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Zvolte oddíl, který si přejete zmenšit:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Přidělte místo na disku pomocí rozdělovače níže:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>Oddíl <strong>%1</strong> obsahující %4 bude zmenšen na %2MB a nový oddíl o velikosti %3MB bude vytvořen pro %5.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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ý systémový EFI oddíl. Prosím, vraťte se zpět a zkuste pro nastavení %1 použít ruční rozdělení disku.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="208"/>
- <source>The EFI system partition at %1 will be used for starting %2.</source>
- <translation>Pro zavedení %2 se využije systémový oddíl EFI %1.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>Systémový oddíl EFI:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -343,12 +310,12 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1 Instalátor</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Ukázat ladící informace</translation>
</message>
@@ -407,17 +374,17 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
<translation>Po:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation><strong>Ruční rozdělení disku</strong><br/>Můžete si vytvořit a upravit oddíly sami.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>Umístění zaváděcího oddílu:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<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>
@@ -428,83 +395,83 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Aktuální:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation>Opakované použití %1 jako domovský oddíl pro %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source>
<translation><strong>Vyberte, který oddíl chcete zmenšit, poté tažením spodní lišty můžete změnit jeho velikost.</strong></translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<source><strong>Select a partition to install on</strong></source>
<translation><strong>Vyberte oddíl pro provedení instalace</strong></translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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ý systémový EFI oddíl. Prosím, vraťte se zpět a zkuste pro nastavení %1 použít ruční rozdělení disku.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>Pro zavedení %2 se využije systémový oddíl EFI %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>Systémový oddíl EFI:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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ž se provedou jakékoliv změny nastavení Vašich úložných zařízení, ukáže se Vám přehled změn a budete požádáni o jejich potvrzení.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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 disk</strong><br/>Touto volbou <font color="red">smažete</font> všechna data, která se nyní nachází na vybraném úložišti.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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í jsem našel %1. Jak chcete postupovat?<br/>Než se provedou jakékoliv změny nastavení Vašich úložných zařízení, ukáže se Vám přehled změn a budete požádáni o jejich potvrzení.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source>
<translation><strong>Instalovat vedle</strong><br/>Instalační program zmenší oddíl a vytvoří místo pro %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source>
<translation><strong>Nahradit oddíl</strong><br/>Původní oddíl nahradí %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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í již je operační systém. Jak chcete postupovat?<br/>Než se provedou jakékoliv změny nastavení Vašich úložných zařízení, ukáže se Vám přehled změn a budete požádáni o jejich potvrzení.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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í již je několik operačních systémů. Jak chcete postupovat?<br/>Než se provedou jakékoliv změny nastavení Vašich úložných zařízení, ukáže se Vám přehled změn a budete požádáni o jejich potvrzení.</translation>
</message>
@@ -1116,12 +1083,12 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Nastavit model klávesnice na %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Nastavit rozložení klávesnice na %1/%2.</translation>
</message>
@@ -1137,12 +1104,12 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>Nastavení locale systému</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>Nastavené locale systému ovlivňuje jazyk a znakovou sadu pro UI příkazové řádky.<br/>Současné nastavení je <strong>%1</strong>.</translation>
</message>
@@ -1228,40 +1195,38 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation>Jazyk systému bude nastaven na 1%.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Čísla a data národního prostředí budou nastavena na %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Oblast:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Pásmo:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>&Změnit...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Nastavit časové pásmo na %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation>%1 (%2)</translation>
@@ -1332,17 +1297,17 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
- <translation type="unfinished"/>
+ <translation>Jméno</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
- <translation type="unfinished"/>
+ <translation>Popis</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation>Síťová instalace. (Zakázáno: Nelze načíst seznamy balíků, zkontrolujte připojení k síti)</translation>
</message>
@@ -1785,55 +1750,60 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>Shromažďuji informace o systému...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation>má minimálně %1 GB dostupného místa na disku.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation>Nedostatek místa na disku. Je potřeba nejméně %1 GB.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>má alespoň %1 GB operační paměti</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation>Systém nemá dostatek paměti. Je potřeba nejméně %1 GB.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>je připojený ke zdroji napájení</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>Systém není připojen ke zdroji napájení.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>je připojený k Internetu</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>Systém není připojený k Internetu.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>Instalační program není spuštěn s právy administrátora.</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2069,42 +2039,42 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Nastavit heslo pro uživatele %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>Nastavuji heslo pro uživatele %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>Špatná cílová systémová cesta.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>rootMountPoint je %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>Nelze nastavit heslo uživatele %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>usermod ukončen s chybovým kódem %1.</translation>
</message>
@@ -2238,22 +2208,27 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
<translation>&O nás</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>Vítejte v instalačním programu %1.</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>O instalačním programu %1.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>%1 podpora</translation>
</message>
diff --git a/lang/calamares_da.ts b/lang/calamares_da.ts
index ff418ef0835a7ca5cfed4f5e8f0dee2f2ae74544..97fe5b03c2553b1e93c0ba43daf09e0755993a50 100644
--- a/lang/calamares_da.ts
+++ b/lang/calamares_da.ts
@@ -1,53 +1,20 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="da" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Vælg partitionen der skal krympes:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Fordel disk plads ved at trække fordeleren nedenunder:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>Med denne handling, vil partitionen <strong>%1</strong>, som indeholder %4, blive skrumpet til %2MB og en ny %3MB partition vil blive lavet for %5.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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. Venligst gå tilbage og brug manuel partitionering til at sætte %1 op.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="208"/>
- <source>The EFI system partition at %1 will be used for starting %2.</source>
- <translation>EFI system partitionen ved %1 vil blive brugt til at starte %2.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>EFI system partition:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
<location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="61"/>
<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><strong>Boot miljøet</strong> for dette system.<br><br>Ældre x86 systemer understøtter kun <strong>BIOS</strong>.<br>Moderne systemer bruger normalt <strong>EFI</strong>, men kan sommetider vise sig som BIOS hvis startet i kompatibilitets mode.</translation>
+ <translation><strong>Bootmiljøet</strong> for dette system.<br><br>Ældre x86-systemer understøtter kun <strong>BIOS</strong>.<br>Moderne systemer bruger normalt <strong>EFI</strong>, men kan også vises som BIOS hvis det startes i kompatibilitetstilstand.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="75"/>
<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>Dette system er startet med en <strong>EFI</strong> boot miljø.<br><br>For at konfigurere opstart fra et EFI miljø, bliver installationsprogrammet nødt til installere et boot loader program, som <strong>GRUB</strong> eller <strong>systemd-boot</strong> på en <strong>EFI System Partition</strong>. Dette vil ske automatisk, med mindre du vælger manuel partitionering, hvor du i så fald skal vælge eller lave den selv.</translation>
+ <translation>Dette system blev startet med et <strong>EFI</strong>-bootmiljø.<br><br>For at konfigurere opstart fra et EFI-miljø, bliver installationsprogrammet nødt til at installere et bootloaderprogram, såsom <strong>GRUB</strong> eller <strong>systemd-boot</strong> på en <strong>EFI-systempartition</strong>. Dette vil ske automatisk, med mindre du vælger manuel partitionering, hvor du i så fald skal vælge eller oprette den selv.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="87"/>
<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>Dette system blev startet med et <strong>BIOS</strong> boot miljø.<br><br>For at konfigurere opstart fra et BIOS miljø, bliver installationsprogrammet nødt til at installere en boot loader, som <strong>GRUB</strong>, enten i begyndelsen af en partition eller på <strong>Master Boot Record</strong> nær begyndelsen af partitionstabellen (foretrukket). Dette vil ske automatisk, med mindre du vælger manuel partitionering, hvor du i så fald skal sætte den op selv.</translation>
+ <translation>Dette system blev startet med et <strong>BIOS</strong>-bootmiljø.<br><br>For at konfigurere opstart fra et BIOS-miljø, bliver installationsprogrammet nødt til at installere en bootloader, såsom <strong>GRUB</strong>, enten i begyndelsen af en partition eller på <strong>Master Boot Record</strong> nær begyndelsen af partitionstabellen (foretrukket). Dette sker automatisk, med mindre du vælger manuel partitionering, hvor du i så fald skal opsætte den selv.</translation>
</message>
</context>
<context>
@@ -60,17 +27,17 @@
<message>
<location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="76"/>
<source>Boot Partition</source>
- <translation>Boot Partition</translation>
+ <translation>Bootpartition</translation>
</message>
<message>
<location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="81"/>
<source>System Partition</source>
- <translation>System Partition</translation>
+ <translation>Systempartition</translation>
</message>
<message>
<location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="111"/>
<source>Do not install a boot loader</source>
- <translation>Installér ikke en boot loader</translation>
+ <translation>Installér ikke en bootloader</translation>
</message>
<message>
<location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="125"/>
@@ -83,22 +50,22 @@
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="14"/>
<source>Form</source>
- <translation>Form</translation>
+ <translation>Formular</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="24"/>
<source>GlobalStorage</source>
- <translation>GlobalStorage</translation>
+ <translation>Globalt lager</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="34"/>
<source>JobQueue</source>
- <translation>JobQueue</translation>
+ <translation>Jobkø</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="44"/>
<source>Modules</source>
- <translation>Modules</translation>
+ <translation>Moduler</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="57"/>
@@ -114,7 +81,7 @@
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="71"/>
<source>Interface:</source>
- <translation>Brugerflade:</translation>
+ <translation>Grænseflade:</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="93"/>
@@ -124,7 +91,7 @@
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
<source>Debug information</source>
- <translation>Debug information</translation>
+ <translation>Fejlretningsinformation</translation>
</message>
</context>
<context>
@@ -132,7 +99,7 @@
<message>
<location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="77"/>
<source>Install</source>
- <translation>Installér</translation>
+ <translation>Installation</translation>
</message>
</context>
<context>
@@ -158,26 +125,26 @@
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="89"/>
<source>External command crashed</source>
- <translation>Extern kommando fejlede</translation>
+ <translation>Ekstern kommando holdt op med at virke</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="90"/>
<source>Command %1 crashed.
Output:
%2</source>
- <translation>Kommando %1 fejlede.
-Udskrift:
+ <translation>Kommando %1 holdt op med at virke.
+Output:
%2</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="95"/>
<source>External command failed to start</source>
- <translation>Extern kommando fejlede i at starte</translation>
+ <translation>Start af ekstern kommando mislykkedes</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="96"/>
<source>Command %1 failed to start.</source>
- <translation>Kommando %1 fejlede i at starte.</translation>
+ <translation>Start af kommando %1 mislykkedes.</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="100"/>
@@ -187,34 +154,34 @@ Udskrift:
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="101"/>
<source>Bad parameters for process job call.</source>
- <translation>Dårlige parametre til process job kald.</translation>
+ <translation>Ugyldige parametre til kald af procesjob.</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="104"/>
<source>External command failed to finish</source>
- <translation>Extern kommando fejlede i at færdiggøre</translation>
+ <translation>Ekstern kommando kunne ikke færdiggøres</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="105"/>
<source>Command %1 failed to finish in %2s.
Output:
%3</source>
- <translation>Kommando %1 fejlede i at færdiggøre efter %2s.
-Udskrift:
+ <translation>Kommando %1 kunne ikke færdiggøres på %2 s.
+Output:
%3</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="111"/>
<source>External command finished with errors</source>
- <translation>Extern kommando blev færdiggjort uden fejl</translation>
+ <translation>Ekstern kommando blev færdiggjort uden fejl</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="112"/>
<source>Command %1 finished with exit code %2.
Output:
%3</source>
- <translation>Kommando %1 blev færdiggjort med exit kode %2.
-Udskrift:
+ <translation>Kommando %1 blev færdiggjort med afslutningskode %2.
+Output:
%3</translation>
</message>
</context>
@@ -223,32 +190,32 @@ Udskrift:
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="250"/>
<source>Running %1 operation.</source>
- <translation>Kører %1 handling.</translation>
+ <translation>Kører %1-handling.</translation>
</message>
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="263"/>
<source>Bad working directory path</source>
- <translation>Dårlig arbejdsmappe sti</translation>
+ <translation>Ugyldig arbejdsmappesti</translation>
</message>
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="264"/>
<source>Working directory %1 for python job %2 is not readable.</source>
- <translation>Arbejdsmappe %1 for python job %2 er ikke læsbar.</translation>
+ <translation>Arbejdsmappe %1 for python-job %2 er ikke læsbar.</translation>
</message>
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="274"/>
<source>Bad main script file</source>
- <translation>Dårlig hoved script fil</translation>
+ <translation>Ugyldig primær skriptfil</translation>
</message>
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="275"/>
<source>Main script file %1 for python job %2 is not readable.</source>
- <translation>Hoved script fil %1 for python job %2 er ikke læsbar.</translation>
+ <translation>Primær skriptfil %1 for python-job %2 er ikke læsbar.</translation>
</message>
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="320"/>
<source>Boost.Python error in job "%1".</source>
- <translation>Boost.Python fejl i job "%1".</translation>
+ <translation>Boost.Python-fejl i job "%1".</translation>
</message>
</context>
<context>
@@ -278,7 +245,7 @@ Udskrift:
<location filename="../src/libcalamaresui/ViewManager.cpp" line="91"/>
<source>Do you really want to cancel the current install process?
The installer will quit and all changes will be lost.</source>
- <translation>Vil du virkelig annullere den igangværende installationsprocess?
+ <translation>Vil du virkelig annullere den igangværende installationsproces?
Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation>
</message>
<message>
@@ -289,7 +256,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="225"/>
<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>%1 installationsprogrammet er ved at lave ændringer til din disk for at installere %2. <br/><strong>Det vil ikke være muligt at fortryde disse ændringer.</strong></translation>
+ <translation>%1-installationsprogrammet er ved at lave ændringer til din disk for at installere %2. <br/><strong>Det vil ikke være muligt at fortryde disse ændringer.</strong></translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="232"/>
@@ -304,7 +271,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="264"/>
<source>&Quit</source>
- <translation>&Luk</translation>
+ <translation>&Afslut</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="170"/>
@@ -314,7 +281,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="171"/>
<source>Installation Failed</source>
- <translation>Installation Fejlede</translation>
+ <translation>Installation mislykkedes</translation>
</message>
</context>
<context>
@@ -327,30 +294,30 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/libcalamares/PythonHelper.cpp" line="276"/>
<source>unparseable Python error</source>
- <translation>Utilgængelig Python-fejl</translation>
+ <translation>Python-fejl som ikke kan fortolkes</translation>
</message>
<message>
<location filename="../src/libcalamares/PythonHelper.cpp" line="292"/>
<source>unparseable Python traceback</source>
- <translation>Utilgængeligt Python-traceback</translation>
+ <translation>Python-traceback som ikke kan fortolkes</translation>
</message>
<message>
<location filename="../src/libcalamares/PythonHelper.cpp" line="296"/>
<source>Unfetchable Python error.</source>
- <translation>Uhentbar Python fejl.</translation>
+ <translation>Python-fejl som ikke kan hentes.</translation>
</message>
</context>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
- <translation>%1 Installationsprogram</translation>
+ <translation>%1-installationsprogram</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
- <translation>Vis debug information</translation>
+ <translation>Vis fejlretningsinformation</translation>
</message>
</context>
<context>
@@ -363,7 +330,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/CheckFileSystemJob.cpp" line="77"/>
<source>The file system check on partition %1 failed.</source>
- <translation>Filsystem tjekket på partition %1 fejlede.</translation>
+ <translation>Filsystemtjek på partition %1 mislykkedes.</translation>
</message>
</context>
<context>
@@ -371,22 +338,22 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="95"/>
<source>This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a></source>
- <translation>Denne computer møder ikke minimum systemkrav for at installere %1.<br/>Installationen kan ikke fortsætte. <a href="#details">Detaljer...</a></translation>
+ <translation>Denne computer møder 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/CheckerWidget.cpp" line="113"/>
<source>This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.</source>
- <translation>Denne computer møder ikke nogle af de anbefalede systemkrav for at installere %1.<br/>Installationen kan fortsætte, men nogle features kan være slået fra.</translation>
+ <translation>Denne computer møder ikke nogle af de anbefalede systemkrav for at installere %1.<br/>Installationen kan fortsætte, men nogle funktionaliteter kan være deaktiveret.</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="142"/>
<source>This program will ask you some questions and set up %2 on your computer.</source>
- <translation>Dette program vil stille dig et par spørgsmål og sætte %2 op på din computer.</translation>
+ <translation>Dette program vil stille dig nogle spørgsmål og opsætte %2 på din computer.</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="166"/>
<source>For best results, please ensure that this computer:</source>
- <translation>For det bedste resultat, vær sikker på at denne computer:</translation>
+ <translation>For det bedste resultat sørg venligst for at denne computer:</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="194"/>
@@ -399,7 +366,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/ChoicePage.ui" line="14"/>
<source>Form</source>
- <translation>Form</translation>
+ <translation>Formular</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="127"/>
@@ -407,106 +374,106 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<translation>Efter:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
- <translation><strong>Manuel partitionering</strong><br/>Do kan lave og ændre størrelse på partitioner selv.</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="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
- <translation>Boot loader lokation:</translation>
+ <translation>Bootloaderplacering:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
- <translation>%1 vil blive krympet til %2MB og en ny %3MB partition vil blive lavet til %4.</translation>
+ <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="125"/>
<source>Select storage de&vice:</source>
- <translation>Vælg lager en&hed:</translation>
+ <translation>Vælg lageren&hed:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Nuværende:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
- <translation>Genbrug %1 som hjemme partition til %2.</translation>
+ <translation>Genbrug %1 som hjemmepartition til %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source>
- <translation><strong>Vælg en partition at krympe, herefter træk den nederste bar for at ændre størrelsen</strong></translation>
+ <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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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. Venligst gå tilbage og brug manuel partitionering til at sætte %1 op.</translation>
+ <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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
- <translation>EFI system partitionen ved %1 vil blive brugt til at starte %2.</translation>
+ <translation>EFI-systempartitionen ved %1 vil blive brugt til at starte %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
- <translation>EFI system partition:</translation>
+ <translation>EFI-systempartition:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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>Denne lagerenhed ser ikke ud til at indeholde et styresystem. Hvad vil du gerne gøre?<br/>Du vil få mulighed for at se og bekræfte dine valg før der sker ændringer til lagerenheden.</translation>
+ <translation>Denne lagerenhed ser ikke ud til at indeholde et styresystem. Hvad ønsker du at gøre?<br/>Du vil få mulighed for at se og bekræfte dine valg før der sker ændringer til lagerenheden.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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/>Dette vil <font color="red">slette</font> alt data der er på den valgte lagerenhed lige nu.</translation>
+ <translation><strong>Slet disk</strong><br/>Dette vil <font color="red">slette</font> alt data der er på den valgte lagerenhed.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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>Denne lagerenhed har %1 på den. Hvad vil du gerne gøre?</br>Du vil få mulighed for at se og bekræfte dine valg før det sker ændringer til lagerenheden.</translation>
+ <translation>Denne lagerenhed har %1 på sig. Hvad ønsker du at gøre?<br/>Du vil få mulighed for at se og bekræfte dine valg før det sker ændringer til lagerenheden.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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 krympe en partition for at gøre plads til %1.</translation>
+ <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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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>Denne lagerenhed indeholder allerede et styresystem. Hvad vil du gerne gøre?<br/>Du vil få mulighed for at se og bekræfte dine valg før der sker ændringer til lagerenheden.</translation>
+ <translation>Denne lagerenhed indeholder allerede et styresystem. Hvad ønsker du at gøre?<br/>Du vil få mulighed for at se og bekræfte dine valg før der sker ændringer til lagerenheden.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>Denne lagerenhed indeholder flere styresystemer. Hvad vil du gerne gøre?</br>Du vil få mulighed for at se og bekræfte dine valg før der sker ændringer til lagerenheden.</translation>
+ <translation>Denne lagerenhed indeholder flere styresystemer. Hvad ønsker du at gøre?<br/>Du vil få mulighed for at se og bekræfte dine valg før der sker ændringer til lagerenheden.</translation>
</message>
</context>
<context>
@@ -514,17 +481,17 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="45"/>
<source>Clear mounts for partitioning operations on %1</source>
- <translation>Frigør monteringer til partitionering på %1</translation>
+ <translation>Ryd monteringspunkter for partitioneringshandlinger på %1</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="53"/>
<source>Clearing mounts for partitioning operations on %1.</source>
- <translation>Renser monteringspunkter for partitionerings handling på %1.</translation>
+ <translation>Rydder monteringspunkter for partitioneringshandlinger på %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="190"/>
<source>Cleared all mounts for %1</source>
- <translation>Frigjorde alle monteringer til %1</translation>
+ <translation>Ryddede alle monteringspunkter til %1</translation>
</message>
</context>
<context>
@@ -532,12 +499,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/ClearTempMountsJob.cpp" line="40"/>
<source>Clear all temporary mounts.</source>
- <translation>Rens alle midlertidige monteringspunkter.</translation>
+ <translation>Ryd alle midlertidige monteringspunkter.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ClearTempMountsJob.cpp" line="47"/>
<source>Clearing all temporary mounts.</source>
- <translation>Renser alle midlertidige monteringspunkter.</translation>
+ <translation>Rydder alle midlertidige monteringspunkter.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ClearTempMountsJob.cpp" line="58"/>
@@ -547,7 +514,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/ClearTempMountsJob.cpp" line="97"/>
<source>Cleared all temporary mounts.</source>
- <translation>Rensede alle midlertidige monteringspunkter.</translation>
+ <translation>Rydder alle midlertidige monteringspunkter.</translation>
</message>
</context>
<context>
@@ -560,7 +527,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="55"/>
<source>Partition &Type:</source>
- <translation>Partition &Type:</translation>
+ <translation>Partitions&type:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="67"/>
@@ -575,7 +542,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="119"/>
<source>Fi&le System:</source>
- <translation>Fi&l System:</translation>
+ <translation>Fi&lsystem:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="178"/>
@@ -585,7 +552,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="151"/>
<source>&Mount Point:</source>
- <translation>&Bindingspunkt:</translation>
+ <translation>&Monteringspunkt:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="38"/>
@@ -595,7 +562,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="48"/>
<source> MB</source>
- <translation>MB</translation>
+ <translation> MB</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="65"/>
@@ -620,7 +587,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="268"/>
<source>Mountpoint already in use. Please select another one.</source>
- <translation>Monteringspunkt allerede i brug. Vælg venligst en anden.</translation>
+ <translation>Monteringspunktet er allerede i brug. Vælg venligst et andet.</translation>
</message>
</context>
<context>
@@ -628,12 +595,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="48"/>
<source>Create new %2MB partition on %4 (%3) with file system %1.</source>
- <translation>Opret en ny %2MB partition på %4 (%3) med %1 fil system.</translation>
+ <translation>Opret en ny %2 MB partition på %4 (%3) med %1-filsystem.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="59"/>
<source>Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source>
- <translation>Opret en ny <strong>%2MB</strong> partition på <strong>%4</strong> (%3) med <strong>%1</strong> fil system.</translation>
+ <translation>Opret en ny <strong>%2 MB</strong> partition på <strong>%4</strong> (%3) med <strong>%1</strong>-filsystem.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="71"/>
@@ -643,7 +610,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="83"/>
<source>The installer failed to create partition on disk '%1'.</source>
- <translation>Installationsprogrammet fejlede i at oprette partition på disk '%1'.</translation>
+ <translation>Installationsprogrammet kunne ikke oprette partition på disk '%1'.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="92"/>
@@ -658,12 +625,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="126"/>
<source>The installer failed to create file system on partition %1.</source>
- <translation>Installationsprogrammet fejlede i at oprette filsystem på partition %1.</translation>
+ <translation>Installationsprogrammet kunne ikke oprette filsystem på partition %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="134"/>
<source>The installer failed to update partition table on disk '%1'.</source>
- <translation>Installationsprogrammet fejlede i at opdatere partitionstabel på disk '%1'.</translation>
+ <translation>Installationsprogrammet kunne ikke opdatere partitionstabel på disk '%1'.</translation>
</message>
</context>
<context>
@@ -676,7 +643,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="39"/>
<source>Creating a new partition table will delete all existing data on the disk.</source>
- <translation>Hvis du opretter en ny partitionstabel vil det slette alle data på disken.</translation>
+ <translation>Oprettelse af en ny partitionstabel vil slette alle data på disken.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="65"/>
@@ -691,7 +658,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="82"/>
<source>GUID Partition Table (GPT)</source>
- <translation>GUID Partition Table (GPT)</translation>
+ <translation>GUID-partitiontabel (GPT)</translation>
</message>
</context>
<context>
@@ -714,7 +681,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="76"/>
<source>The installer failed to create a partition table on %1.</source>
- <translation>Installationsprogrammet fejlede i at oprette en partitionstabel på %1.</translation>
+ <translation>Installationsprogrammet kunne ikke oprette en partitionstabel på %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="84"/>
@@ -742,17 +709,17 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="80"/>
<source>Sudoers dir is not writable.</source>
- <translation>Sudoernes mappe er ikke skrivbar.</translation>
+ <translation>Sudoers mappe er skrivebeskyttet.</translation>
</message>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="84"/>
<source>Cannot create sudoers file for writing.</source>
- <translation>Kan ikke oprette sudoer fil til skrivning.</translation>
+ <translation>Kan ikke oprette sudoers fil til skrivning.</translation>
</message>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="92"/>
<source>Cannot chmod sudoers file.</source>
- <translation>Kan ikke chmod sudoer filen.</translation>
+ <translation>Kan ikke chmod sudoers fil.</translation>
</message>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="98"/>
@@ -767,7 +734,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="162"/>
<source>useradd terminated with error code %1.</source>
- <translation>useradd stoppet med fejl kode %1.</translation>
+ <translation>useradd stoppet med fejlkode %1.</translation>
</message>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="171"/>
@@ -777,17 +744,17 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="174"/>
<source>usermod terminated with error code %1.</source>
- <translation>usermod stoppede med fejl kode %1.</translation>
+ <translation>usermod stoppet med fejlkode %1.</translation>
</message>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="184"/>
<source>Cannot set home directory ownership for user %1.</source>
- <translation>Kan ikke indstille hjemmemappe ejerskab for bruger %1.</translation>
+ <translation>Kan ikke sætte hjemmemappens ejerskab for bruger %1.</translation>
</message>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="186"/>
<source>chown terminated with error code %1.</source>
- <translation>chown stoppet med fejl kode %1.</translation>
+ <translation>chown stoppet med fejlkode %1.</translation>
</message>
</context>
<context>
@@ -810,7 +777,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="67"/>
<source>The installer failed to delete partition %1.</source>
- <translation>Installationsprogrammet fejlede ved sletning af partition %1.</translation>
+ <translation>Installationsprogrammet kunne ikke slette partition %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="73"/>
@@ -833,7 +800,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="63"/>
<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>Typen af <strong>partitionstabel</strong> på den valgte lagerenhed.<br><br>Den eneste måde at ændre partitionstabel typen er at slette og genskabe partitionstabellen på ny, hvilket vil destruere al data på lagerenheden.<br>Installationsprogrammet vil beholde den nuværende partitionstabel medmindre du specifikt vælger andet.<br>Hvis usikker, er GPT foretrukket på moderne systemer.</translation>
+ <translation>Typen af <strong>partitionstabel</strong> på den valgte lagerenhed.<br><br>Den eneste måde at ændre partitionstabeltypen, er at slette og oprette partitionstabellen igen, hvilket vil destruere al data på lagerenheden.<br>Installationsprogrammet vil beholde den nuværende partitionstabel medmindre du specifikt vælger andet.<br>Hvis usikker, er GPT foretrukket på moderne systemer.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="107"/>
@@ -843,22 +810,22 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="114"/>
<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>Dette er en <strong>loop</strong> enhed.<br><br>Det er en pseudo-enhed uden en partitionstabel, der gør en fil tilgængelig som en blok enhed. Denne type opsætning indeholder typisk kun et enkelt filsystem.</translation>
+ <translation>Dette er en <strong>loop</strong>-enhed.<br><br>Det er en pseudo-enhed uden en partitionstabel, der gør en fil tilgængelig som en blokenhed. Denne type opsætning indeholder typisk kun et enkelt filsystem.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="121"/>
<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>Installationsprogrammet <strong>kan ikke finde en partitionstabel</strong> på den valgte lagerenhed.<br><br>Enten har enheden ikke nogen partitionstabel, eller partitionstabellen er korrupt eller også er den af den ukendt type.<br>Installationsprogrammet kan lave en ny partitionstabel for dig, enten automatisk, eller igennem den manuelle partitionerings side.</translation>
+ <translation>Installationsprogrammet <strong>kan ikke finde en partitionstabel</strong> på den valgte lagerenhed.<br><br>Enten har enheden ikke nogen partitionstabel, eller partitionstabellen er ødelagt eller også er den af en ukendt type.<br>Installationsprogrammet kan oprette en ny partitionstabel for dig, enten automatisk, eller igennem den manuelle partitioneringsside.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="131"/>
<source><br><br>This is the recommended partition table type for modern systems which start from an <strong>EFI</strong> boot environment.</source>
- <translation><br><br>Dette er den anbefalede partitionstabel type til moderne systemer som starter fra et <strong>EFI</strong> boot miljø.</translation>
+ <translation><br><br>Dette er den anbefalede partitionstabeltype til moderne systemer som starter fra et <strong>EFI</strong>-bootmiljø.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="137"/>
<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><br><br>Denne partitionstabel type er kun anbefalet på ændre systemer der starter fra et <strong>BIOS</strong> boot miljø. GPT er anbefalet i de fleste tilfælde.<br><br><strong>Advarsel:</strong> MBR partitionstabel typen er en forældet MS-DOS æra standard.<br>Kun 4 <em>primære</em> partitioner var tilladt, og ud af de 4, kunne én af dem være en <em>udvidet</em> partition, som måtte indeholde mange <em>logiske</em> partitioner.</translation>
+ <translation><br><br>Denne partitionstabeltype er kun anbefalet på ældre systemer der starter fra et <strong>BIOS</strong>-bootmiljø. GPT anbefales i de fleste tilfælde.<br><br><strong>Advarsel:</strong> MBR-partitionstabeltypen er en forældet MS-DOS-æra standard.<br>Kun 4 <em>primære</em> partitioner var tilladt, og ud af de fire kan én af dem være en <em>udvidet</em> partition, som igen må indeholde mange <em>logiske</em> partitioner.</translation>
</message>
</context>
<context>
@@ -874,17 +841,17 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="131"/>
<source>Write LUKS configuration for Dracut to %1</source>
- <translation>Skriv LUKS konfiguration for Dracut til %1</translation>
+ <translation>Skriv LUKS-konfiguration for Dracut til %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>Spring skrivning af LUKS konfiguration over for Dracut: "/" partitionen er ikke krypteret</translation>
+ <translation>Spring skrivning af LUKS-konfiguration over for Dracut: "/"-partitionen er ikke krypteret</translation>
</message>
<message>
<location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="149"/>
<source>Failed to open %1</source>
- <translation>Fejlede i at åbne %1</translation>
+ <translation>Kunne ikke åbne %1</translation>
</message>
</context>
<context>
@@ -892,7 +859,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/dummycpp/DummyCppJob.cpp" line="46"/>
<source>Dummy C++ Job</source>
- <translation>Dummy C++ Opgave</translation>
+ <translation>Dummy C++-job</translation>
</message>
</context>
<context>
@@ -900,7 +867,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="20"/>
<source>Edit Existing Partition</source>
- <translation>Rediger Eksisterende Partition</translation>
+ <translation>Redigér eksisterende partition</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="50"/>
@@ -915,7 +882,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="70"/>
<source>Format</source>
- <translation>Formater</translation>
+ <translation>Formatér</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="89"/>
@@ -925,7 +892,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="99"/>
<source>&Mount Point:</source>
- <translation>&Forbindingspunkt:</translation>
+ <translation>&Monteringspunkt:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="119"/>
@@ -935,7 +902,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="132"/>
<source>Fi&le System:</source>
- <translation>Fi&l System:</translation>
+ <translation>Fi&lsystem:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="145"/>
@@ -945,7 +912,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="306"/>
<source>Mountpoint already in use. Please select another one.</source>
- <translation>Monteringspunkt allerede i brug. Vælg venligst en anden.</translation>
+ <translation>Monteringspunktet er allerede i brug. Vælg venligst et andet.</translation>
</message>
</context>
<context>
@@ -953,7 +920,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/EncryptWidget.ui" line="14"/>
<source>Form</source>
- <translation>Form</translation>
+ <translation>Formular</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EncryptWidget.ui" line="32"/>
@@ -973,7 +940,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/EncryptWidget.cpp" line="150"/>
<source>Please enter the same passphrase in both boxes.</source>
- <translation>Indtast venligst samme adgangskode i begge felter.</translation>
+ <translation>Indtast venligst samme adgangskode i begge bokse.</translation>
</message>
</context>
<context>
@@ -981,12 +948,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="123"/>
<source>Set partition information</source>
- <translation>Indstil partitionsinformation</translation>
+ <translation>Sæt partitionsinformation</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="147"/>
<source>Install %1 on <strong>new</strong> %2 system partition.</source>
- <translation>Installér %1 på den <strong>nye</strong> %2 system partition.</translation>
+ <translation>Installér %1 på den <strong>nye</strong> %2 systempartition.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="152"/>
@@ -996,7 +963,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="160"/>
<source>Install %2 on %3 system partition <strong>%1</strong>.</source>
- <translation>Installér %2 på %3 system partition <strong>%1</strong>.</translation>
+ <translation>Installér %2 på %3 systempartition <strong>%1</strong>.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="166"/>
@@ -1006,7 +973,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="178"/>
<source>Install boot loader on <strong>%1</strong>.</source>
- <translation>Installér boot loader på <strong>%1</strong>.</translation>
+ <translation>Installér bootloader på <strong>%1</strong>.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="188"/>
@@ -1019,7 +986,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/finished/FinishedPage.ui" line="14"/>
<source>Form</source>
- <translation>Form</translation>
+ <translation>Formular</translation>
</message>
<message>
<location filename="../src/modules/finished/FinishedPage.ui" line="77"/>
@@ -1029,7 +996,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="50"/>
<source><h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment.</source>
- <translation><h1>Færdig.</h1><br/>%1 er blevet installeret på din computer.<br/>Du kan nu genstarte ind i dit nye system, eller fortsætte med at bruge %2 Live miljøet.</translation>
+ <translation><h1>Færdig.</h1><br/>%1 er blevet installeret på din computer.<br/>Du kan nu genstarte for at komme ind i dit nye system eller fortsætte med at bruge %2 live-miljøet.</translation>
</message>
</context>
<context>
@@ -1045,22 +1012,22 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="49"/>
<source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source>
- <translation>Formater partition %1 (filsystem: %2, størrelse: %3 MB) på %4.</translation>
+ <translation>Formatér partition %1 (filsystem: %2, størrelse: %3 MB) på %4.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="60"/>
<source>Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source>
- <translation>Formatér <strong>%3MB</strong> partition <strong>%1</strong> med fil system <strong>%2</strong>.</translation>
+ <translation>Formatér <strong>%3 MB</strong> partition <strong>%1</strong> med <strong>%2</strong>-filsystem.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="71"/>
<source>Formatting partition %1 with file system %2.</source>
- <translation>Formatterer partition %1 med fil system %2.</translation>
+ <translation>Formatterer partition %1 med %2-filsystem.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="83"/>
<source>The installer failed to format partition %1 on disk '%2'.</source>
- <translation>Installationsprogrammet fejlede i at formatere partition %1 på disk '%2'.</translation>
+ <translation>Installationsprogrammet kunne ikke formatere partition %1 på disk '%2'.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="91"/>
@@ -1075,12 +1042,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="124"/>
<source>The installer failed to create file system on partition %1.</source>
- <translation>Installationsprogrammet fejlede i at oprette filsystem på partition %1.</translation>
+ <translation>Installationsprogrammet kunne ikke oprette filsystem på partition %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="133"/>
<source>The installer failed to update partition table on disk '%1'.</source>
- <translation>Installationsprogrammet fejlede i at opdatere partitionstabel på disk '%1'.</translation>
+ <translation>Installationsprogrammet kunne ikke opdatere partitionstabel på disk '%1'.</translation>
</message>
</context>
<context>
@@ -1097,12 +1064,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="85"/>
<location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="97"/>
<source>Please install the kde konsole and try again!</source>
- <translation>Vær venlig at installere kde konsole og prøv igen!</translation>
+ <translation>Installér venligst kde-konsolen og prøv igen!</translation>
</message>
<message>
<location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="122"/>
<source>Executing script: &nbsp;<code>%1</code></source>
- <translation>Eksekverer script: &nbsp;<code>%1</code></translation>
+ <translation>Eksekverer skript: &nbsp;<code>%1</code></translation>
</message>
</context>
<context>
@@ -1110,20 +1077,20 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/interactiveterminal/InteractiveTerminalViewStep.cpp" line="45"/>
<source>Script</source>
- <translation>Script</translation>
+ <translation>Skript</translation>
</message>
</context>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
- <translation>Indstil tastatur model til %1.<br/></translation>
+ <translation>Sæt tastaturmodel til %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
- <translation>Indstil tastatur layout til %1/%2.</translation>
+ <translation>Sæt tastaturlayout til %1/%2.</translation>
</message>
</context>
<context>
@@ -1137,14 +1104,14 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
- <translation>System område indstilling</translation>
+ <translation>Systemets lokalitetsindstilling</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>Systemets locale indstilling har indflydelse på sproget og tegnsæt for nogle kommandolinje bruger elementer.<br/>Denne indstilling er nu <strong>%1</strong>.</translation>
+ <translation>Systemets lokalitetsindstilling har indflydelse på sproget og tegnsættet for nogle kommandolinje-brugerelementer.<br/>Den nuværende indstilling er <strong>%1</strong>.</translation>
</message>
</context>
<context>
@@ -1152,7 +1119,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/license/LicensePage.ui" line="14"/>
<source>Form</source>
- <translation>Form</translation>
+ <translation>Formular</translation>
</message>
<message>
<location filename="../src/modules/license/LicensePage.cpp" line="88"/>
@@ -1162,22 +1129,22 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/license/LicensePage.cpp" line="115"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
- <translation><h1>Licens Aftale</h1>Denne installations procedure vil installere proprietær software der er under licenserings vilkår.</translation>
+ <translation><h1>Licensaftale</h1>Denne installationsprocedure vil installere proprietær software der er underlagt licenseringsvilkår.</translation>
</message>
<message>
<location filename="../src/modules/license/LicensePage.cpp" line="118"/>
<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>Venligst gennemse Slut Bruger Licens Aftalerne (EULAs) herover. <br/>Hvis du ikke er enig med disse vilkår, kan installationen ikke fortsætte.</translation>
+ <translation>Gennemgå venligst slutbrugerlicensaftalerne (EULA'er) ovenfor.<br/>Hvis du ikke er enig med disse vilkår, kan installationen ikke fortsætte.</translation>
</message>
<message>
<location filename="../src/modules/license/LicensePage.cpp" line="124"/>
<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><h1>Licens Aftale</h1>Denne installations procedure kan installere proprietær software der er underlagt licens vilkår for at kunne tilbyde ekstra funktioner og forbedre bruger oplevelsen.</translation>
+ <translation><h1>Licensaftale</h1>Denne installationsprocedure kan installere proprietær software der er underlagt licenseringsvilkår, for at kunne tilbyde yderligere funktionaliteter og forbedre brugeroplevelsen.</translation>
</message>
<message>
<location filename="../src/modules/license/LicensePage.cpp" line="129"/>
<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>Venligst gennemse Slut Bruger Licens Aftalerne (EULAs) herover.<br/>Hvis du ikke er enig med disse vilkår, vil der ikke blive installeret proprietær software, og open source alternativer vil blive brugt i stedet.</translation>
+ <translation>Gennemgå venligst slutbrugerlicensaftalerne (EULA'er) ovenfor.<br/>Hvis du ikke er enig med disse vilkår vil der ikke blive installeret proprietær software, og open source-alternativer vil blive brugt i stedet.</translation>
</message>
<message>
<location filename="../src/modules/license/LicensePage.cpp" line="159"/>
@@ -1189,12 +1156,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<location filename="../src/modules/license/LicensePage.cpp" line="166"/>
<source><strong>%1 graphics driver</strong><br/><font color="Grey">by %2</font></source>
<extracomment>%1 is usually a vendor name, example: Nvidia graphics driver</extracomment>
- <translation><strong>%1 grafik driver</strong><br/><font color="Grey">af %2</font></translation>
+ <translation><strong>%1 grafikdriver</strong><br/><font color="Grey">af %2</font></translation>
</message>
<message>
<location filename="../src/modules/license/LicensePage.cpp" line="172"/>
<source><strong>%1 browser plugin</strong><br/><font color="Grey">by %2</font></source>
- <translation><strong>%1 browser plugin</strong><br/><font color="Grey">af %2</font></translation>
+ <translation><strong>%1 browser-plugin</strong><br/><font color="Grey">af %2</font></translation>
</message>
<message>
<location filename="../src/modules/license/LicensePage.cpp" line="178"/>
@@ -1214,7 +1181,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/license/LicensePage.cpp" line="202"/>
<source><a href="%1">view license agreement</a></source>
- <translation><a href="%1">Se licensaftalen</a></translation>
+ <translation><a href="%1">vis licensaftalen</a></translation>
</message>
</context>
<context>
@@ -1228,40 +1195,38 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
- <translation>System sproget vil blive sat til %1.</translation>
+ <translation>Systemsproget vil blive sat til %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
- <translation>Tal og dato lokal indstillingen vil blive sat til %1.</translation>
+ <translation>Lokalitet for tal og datoer vil blive sat til %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Region:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Zone:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
- <translation>&Ændre...</translation>
+ <translation>&Skift...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
- <translation>Indstil tidszone til %1/%2.<br/></translation>
+ <translation>Sæt tidszone til %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation>%1 (%2)</translation>
@@ -1272,12 +1237,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/locale/LocaleViewStep.cpp" line="52"/>
<source>Loading location data...</source>
- <translation>Loader lokationsdata...</translation>
+ <translation>Indlæser placeringsdata...</translation>
</message>
<message>
<location filename="../src/modules/locale/LocaleViewStep.cpp" line="160"/>
<source>Location</source>
- <translation>Lokation</translation>
+ <translation>Placering</translation>
</message>
</context>
<context>
@@ -1300,49 +1265,49 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/MoveFileSystemJob.cpp" line="95"/>
<source>Moving of partition %1 failed, changes have been rolled back.</source>
- <translation>Flytning af partition %1 fejlede, ændringer er tilbageført.</translation>
+ <translation>Flytning af partition %1 mislykkedes, ændringer er tilbageført.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/MoveFileSystemJob.cpp" line="101"/>
<source>Moving of partition %1 failed. Roll back of the changes have failed.</source>
- <translation>Flytning af partition %1 fejlede. Tilbageføring af ændringer fejlede.</translation>
+ <translation>Flytning af partition %1 mislykkedes. Tilbageføring af ændringerne mislykkedes.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/MoveFileSystemJob.cpp" line="113"/>
<source>Updating boot sector after the moving of partition %1 failed.</source>
- <translation>Opdaterer boot sektor efter flytning af partition %1 fejlede.</translation>
+ <translation>Opdatering af bootsektor efter flytning af partition %1 mislykkedes.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/MoveFileSystemJob.cpp" line="127"/>
<source>The logical sector sizes in the source and target for copying are not the same. This is currently unsupported.</source>
- <translation>De logiske sektor størrelser for kilden og destination af kopiering er ikke den samme. Dette er ligenu ikke supporteret.</translation>
+ <translation>De logiske sektorstørrelser for kilden og destination for kopiering er ikke ens. Det understøttes ikke på nuværende tidspunkt.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/MoveFileSystemJob.cpp" line="197"/>
<source>Source and target for copying do not overlap: Rollback is not required.</source>
- <translation>Kilde og destination for kopiering overlapper ikke: Tilebageføring ikke krævet.</translation>
+ <translation>Kilde og destination for kopiering overlapper ikke: Tilbageføring ikke påkrævet.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/MoveFileSystemJob.cpp" line="221"/>
<location filename="../src/modules/partition/jobs/MoveFileSystemJob.cpp" line="229"/>
<source>Could not open device %1 to rollback copying.</source>
- <translation>Kunne ikke åbne enhed %1 til at tilbageføre kopiering.</translation>
+ <translation>Kunne ikke åbne enhed %1 til tilbageføring af kopiering.</translation>
</message>
</context>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation>Navn</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation>Beskrivelse</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation>Netværksinstallation. (Deaktiveret: Kunne ikke hente pakkelister, tjek din netværksforbindelse)</translation>
</message>
@@ -1352,7 +1317,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="51"/>
<source>Package selection</source>
- <translation>Pakke valg</translation>
+ <translation>Valg af pakke</translation>
</message>
</context>
<context>
@@ -1360,12 +1325,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/keyboard/KeyboardPage.ui" line="14"/>
<source>Form</source>
- <translation>Form</translation>
+ <translation>Formular</translation>
</message>
<message>
<location filename="../src/modules/keyboard/KeyboardPage.ui" line="70"/>
<source>Keyboard Model:</source>
- <translation>Tastatur Model:</translation>
+ <translation>Tastaturmodel:</translation>
</message>
<message>
<location filename="../src/modules/keyboard/KeyboardPage.ui" line="131"/>
@@ -1378,7 +1343,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="14"/>
<source>Form</source>
- <translation>Form</translation>
+ <translation>Formular</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="36"/>
@@ -1388,7 +1353,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="117"/>
<source>What name do you want to use to log in?</source>
- <translation>Hvilket navn vil du bruge til at logge ind?</translation>
+ <translation>Hvilket navn vil du bruge til at logge ind med?</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="197"/>
@@ -1396,12 +1361,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<location filename="../src/modules/users/page_usersetup.ui" line="437"/>
<location filename="../src/modules/users/page_usersetup.ui" line="582"/>
<source>font-weight: normal</source>
- <translation>font-vægt: normal</translation>
+ <translation>font-weight: normal</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="200"/>
<source><small>If more than one person will use this computer, you can set up multiple accounts after installation.</small></source>
- <translation><small>Hvis mere end én person vil bruge denne computer, kan du indstille flere konti efter installationen.</small></translation>
+ <translation><small>Hvis mere end én person vil bruge denne computer, kan du opsætte flere konti efter installationen.</small></translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="335"/>
@@ -1411,7 +1376,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="440"/>
<source><small>Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.</small></source>
- <translation><small>Skriv kodeordet to gange, så det kan blive tjekket for skrivefejl. Et godt kodeord vil indeholde et mix af bogstaver, tal og specialtegn, være mindst 8 cifre langt og bør skiftes jævnligt.</small></translation>
+ <translation><small>Skriv den samme adgangskode to gange, så det kan blive tjekket for skrivefejl. En god adgangskode indeholder en blanding af bogstaver, tal og specialtegn, og bør være mindst 8 tegn langt og bør skiftes jævnligt.</small></translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="226"/>
@@ -1426,22 +1391,22 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="450"/>
<source>Log in automatically without asking for the password.</source>
- <translation>Log ind automatisk uden at spørge om kodeordet.</translation>
+ <translation>Log ind automatisk uden at spørge om adgangskoden.</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="457"/>
<source>Use the same password for the administrator account.</source>
- <translation>Brug det samme kodeord til administrator kontoen.</translation>
+ <translation>Brug den samme adgangskode til administratorkontoen.</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="480"/>
<source>Choose a password for the administrator account.</source>
- <translation>Vælg et kodeord til administrator kontoen.</translation>
+ <translation>Vælg en adgangskode til administratorkontoen.</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="585"/>
<source><small>Enter the same password twice, so that it can be checked for typing errors.</small></source>
- <translation><small>Skriv kodeordet to gange, så det kan blive tjekket for skrivefejl.</small></translation>
+ <translation><small>Skriv den samme adgangskode to gange, så det kan blive tjekket for skrivefejl.</small></translation>
</message>
</context>
<context>
@@ -1464,7 +1429,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="199"/>
<source>EFI system</source>
- <translation>EFI system</translation>
+ <translation>EFI-system</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/>
@@ -1484,7 +1449,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="222"/>
<source>%1 %2</source>
- <translation>%1 %2</translation>
+ <translation>%1 %2</translation>
</message>
</context>
<context>
@@ -1493,7 +1458,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<location filename="../src/modules/partition/core/PartitionModel.cpp" line="137"/>
<location filename="../src/modules/partition/core/PartitionModel.cpp" line="169"/>
<source>Free Space</source>
- <translation>Fri Plads</translation>
+ <translation>Ledig plads</translation>
</message>
<message>
<location filename="../src/modules/partition/core/PartitionModel.cpp" line="141"/>
@@ -1514,7 +1479,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/core/PartitionModel.cpp" line="261"/>
<source>Mount Point</source>
- <translation>Forbindelsespunkt</translation>
+ <translation>Monteringspunkt</translation>
</message>
<message>
<location filename="../src/modules/partition/core/PartitionModel.cpp" line="263"/>
@@ -1527,7 +1492,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="14"/>
<source>Form</source>
- <translation>Form</translation>
+ <translation>Formular</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="22"/>
@@ -1537,12 +1502,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="51"/>
<source>&Revert All Changes</source>
- <translation>&Tilbagefør Alle Ændringer</translation>
+ <translation>&Tilbagefør alle ændringer</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="87"/>
<source>New Partition &Table</source>
- <translation>Ny Partitionstabel</translation>
+ <translation>Ny partitions&tabel</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="107"/>
@@ -1562,12 +1527,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="148"/>
<source>Install boot &loader on:</source>
- <translation>Installér boot &loader på:</translation>
+ <translation>Installér boot&loader på:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionPage.cpp" line="160"/>
<source>Are you sure you want to create a new partition table on %1?</source>
- <translation>Er du sikker på at du vil oprette en ny partitionstabel på %1?</translation>
+ <translation>Er du sikker på, at du vil oprette en ny partitionstabel på %1?</translation>
</message>
</context>
<context>
@@ -1575,7 +1540,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="70"/>
<source>Gathering system information...</source>
- <translation>Samler system information...</translation>
+ <translation>Indsamler systeminformation...</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="121"/>
@@ -1640,32 +1605,32 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="405"/>
<source>No EFI system partition configured</source>
- <translation>Ingen EFI system partition konfigureret</translation>
+ <translation>Ingen EFI-systempartition konfigureret</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.</source>
- <translation>En EFI system partition er nødvendig for at starte %1.<br/><br/>For at konfigurere en EFI system partition, skal du gå tilbage og vælge eller lave et FAT32 filsystem med <strong>esp</strong> flaget aktiveret og montereringspunkt <strong>%2</strong>.<br/><br/>Du kan fortsætte uden at opsætte en EFI system partition, men dit system vil muligvis ikke starte.</translation>
+ <translation>En EFI-systempartition er nødvendig for at starte %1.<br/><br/>For at konfigurere en EFI-systempartition skal du gå tilbage og vælge eller oprette et FAT32-filsystem med <strong>esp</strong>-flaget aktiveret og monteringspunkt <strong>%2</strong>.<br/><br/>Du kan fortsætte uden at opsætte en EFI-systempartition, men dit system vil muligvis ikke kunne starte.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
- <translation>EFI system partition flag ikke sat</translation>
+ <translation>EFI-systempartitionsflag ikke sat</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.</source>
- <translation>en EFI system partition er nødvendig for at starte %1.<br/><br/>En partition var konfigureret med menteringspunkt <strong>%2</strong> men dens <strong>esp</strong> flag var ikke sat.<br/>For at sætte flaget, skal du gå tilbage og redigere partitionen.<br/><br/>Du kan fortsætte uden at konfigurere flaget, men dit system vil muligvis ikke starte.</translation>
+ <translation>En EFI-systempartition er nødvendig for at starte %1.<br/><br/>En partition var konfigureret med monteringspunkt <strong>%2</strong>, men dens <strong>esp</strong>-flag var ikke sat.<br/>For at sætte flaget skal du gå tilbage og redigere partitionen.<br/><br/>Du kan fortsætte uden at konfigurere flaget, men dit system vil muligvis ikke kunne starte.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
- <translation>Boot partition ikke krypteret</translation>
+ <translation>Bootpartition ikke krypteret</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.</source>
- <translation>En seperat boot partition blev sat op sammen med en krypteret rod partition, men boot partitionen er ikke krypteret.<br/><br/>Der er sikkerheds bekymringer med denne type installationer, fordi vigtige system filer er gemt på en ikke-krypteret partition.<br/>Du må fortsætte hvis du ønsker, men oplåsning af filsystemet sker senere i systemets opstart.<br/>For at kryptere boot partitionen, skal du gå tilbage og genskabe den, vælge <strong>Kryptér</strong> i partition skabe vinduet.</translation>
+ <translation>En separat bootpartition blev opsat sammen med en krypteret rodpartition, men bootpartitionen er ikke krypteret.<br/><br/>Der er sikkerhedsmæssige bekymringer med denne type opsætning, da vigtige systemfiler er gemt på en ikke-krypteret partition.<br/>Du kan fortsætte hvis du vil, men oplåsning af filsystemet sker senere under systemets opstart.<br/>For at kryptere bootpartitionen skal du gå tilbage og oprette den igen, vælge <strong>Kryptér</strong> i partitionsoprettelsesvinduet.</translation>
</message>
</context>
<context>
@@ -1673,7 +1638,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/keyboard/keyboardwidget/keyboardglobal.cpp" line="82"/>
<source>Default Keyboard Model</source>
- <translation>Standard Tastatur Model</translation>
+ <translation>Standardtastaturmodel</translation>
</message>
<message>
<location filename="../src/modules/keyboard/keyboardwidget/keyboardglobal.cpp" line="127"/>
@@ -1712,12 +1677,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.ui" line="14"/>
<source>Form</source>
- <translation>Form</translation>
+ <translation>Formular</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
- <translation>Vælg hvor %1 skal installeres.<br/><font color="red">Advarsel: </font>dette vil slette alle filerne på den valgte partition.</translation>
+ <translation>Vælg hvor %1 skal installeres.<br/><font color="red">Advarsel: </font>Dette vil slette alle filer på den valgte partition.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
@@ -1727,7 +1692,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
- <translation>%1 kan ikke installeres på tomt plads. Vælg venligst en eksisterende partition.</translation>
+ <translation>%1 kan ikke installeres på tom plads. Vælg venligst en eksisterende partition.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="180"/>
@@ -1742,17 +1707,17 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="198"/>
<source>Data partition (%1)</source>
- <translation>Data partition (%1)</translation>
+ <translation>Datapartition (%1)</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="215"/>
<source>Unknown system partition (%1)</source>
- <translation>Ukendt system partition (%1)</translation>
+ <translation>Ukendt systempartition (%1)</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="220"/>
<source>%1 system partition (%2)</source>
- <translation>%1 system partition (%2)</translation>
+ <translation>%1 systempartition (%2)</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="231"/>
@@ -1762,7 +1727,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="255"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
- <translation><strong>%2</strong><br/><br/>En EFI system partition kunne ikke findes på systemet. Venligst gå tilbage og brug manuel partitionering til at opsætte %1.</translation>
+ <translation><strong>%2</strong><br/><br/>En EFI-systempartition kunne ikke findes på systemet. Gå venligst tilbage og brug manuel partitionering til at opsætte %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="267"/>
@@ -1774,65 +1739,70 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="277"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
- <translation>EFI system partitionen ved %1 vil blive brugt til at starte %2.</translation>
+ <translation>EFI-systempartitionen ved %1 vil blive brugt til at starte %2.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="295"/>
<source>EFI system partition:</source>
- <translation>EFI system partition:</translation>
+ <translation>EFI-systempartition:</translation>
</message>
</context>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
- <translation>Samler system informationer...</translation>
+ <translation>Indsamler systeminformation...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
- <translation>har mindst %1 GB fri plads på drevet</translation>
+ <translation>har mindst %1 GB ledig plads på drevet</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
- <translation>Der er ikke nok fri plads på drevet. Mindst %1 GB er påkrævet.</translation>
+ <translation>Der er ikke nok ledig plads på drevet. Mindst %1 GB er påkrævet.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
- <translation>har mindst %1 GB virkende hukkommelse</translation>
+ <translation>har mindst %1 GB arbejdshukommelse</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
- <translation>Systemet har ikke nok virkende hukkommelse. Mindst %1 GB er påkrævet.</translation>
+ <translation>Systemet har ikke nok arbejdshukommelse. Mindst %1 GB er påkrævet.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
- <translation>er sat til en strømkilde</translation>
+ <translation>er tilsluttet en strømkilde</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
- <translation>Systemet er ikke sat til en strømkilde.</translation>
+ <translation>Systemet er ikke tilsluttet en strømkilde.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>er forbundet til internettet</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>Systemet er ikke forbundet til internettet.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
- <translation>Installationsprogrammet kører ikke med administrator rettigheder.</translation>
+ <translation>Installationsprogrammet kører ikke med administratorrettigheder.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1840,17 +1810,17 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="76"/>
<source>Resize file system on partition %1.</source>
- <translation>Ændre størrelse af filsystem på partition %1.</translation>
+ <translation>Ændr størrelse af filsystem på partition %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="91"/>
<source>Parted failed to resize filesystem.</source>
- <translation>Parted fejlede i at ændre størrelse på filsystem.</translation>
+ <translation>Parted kunne ikke ændre størrelse på filsystem.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="101"/>
<source>Failed to resize filesystem.</source>
- <translation>Fejlede i at ændre størrelse på filsystem.</translation>
+ <translation>Kunne ikke ændre størrelse på filsystem.</translation>
</message>
</context>
<context>
@@ -1858,23 +1828,23 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="187"/>
<source>Resize partition %1.</source>
- <translation>Ændre størrelse på partition %1.</translation>
+ <translation>Ændr størrelse på partition %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="194"/>
<source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source>
- <translation>Størrelsesændring af <strong>%2MB</strong> partition <strong>%1</strong> til <strong>%3MB</strong>.</translation>
+ <translation>Ændr størrelse af <strong>%2 MB</strong> partition <strong>%1</strong> til <strong>%3 MB</strong>.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="205"/>
<source>Resizing %2MB partition %1 to %3MB.</source>
- <translation>Ændrer nu størrelsen af %2MB partition %1 til %3MB.</translation>
+ <translation>Ændrer nu størrelsen af %2 MB partition %1 til %3 MB.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="232"/>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="298"/>
<source>The installer failed to resize partition %1 on disk '%2'.</source>
- <translation>Installationsprogrammet fejlede i at ændre størrelse på partition %1 på disk '%2'.</translation>
+ <translation>Installationsprogrammet kunne ikke ændre størrelse på partition %1 på disk '%2'.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="237"/>
@@ -1900,29 +1870,29 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/users/SetHostNameJob.cpp" line="37"/>
<source>Set hostname %1</source>
- <translation>Indstil værtsnavn %1</translation>
+ <translation>Sæt værtsnavn %1</translation>
</message>
<message>
<location filename="../src/modules/users/SetHostNameJob.cpp" line="44"/>
<source>Set hostname <strong>%1</strong>.</source>
- <translation>Sæt hostname <strong>%1</strong>.</translation>
+ <translation>Sæt værtsnavn <strong>%1</strong>.</translation>
</message>
<message>
<location filename="../src/modules/users/SetHostNameJob.cpp" line="51"/>
<source>Setting hostname %1.</source>
- <translation>Sætter hostname %1.</translation>
+ <translation>Sætter værtsnavn %1.</translation>
</message>
<message>
<location filename="../src/modules/users/SetHostNameJob.cpp" line="61"/>
<location filename="../src/modules/users/SetHostNameJob.cpp" line="68"/>
<source>Internal Error</source>
- <translation>Intern Fejl</translation>
+ <translation>Intern fejl</translation>
</message>
<message>
<location filename="../src/modules/users/SetHostNameJob.cpp" line="75"/>
<location filename="../src/modules/users/SetHostNameJob.cpp" line="86"/>
<source>Cannot write hostname to target system</source>
- <translation>Kan ikke skrive værtsnavn til mål system</translation>
+ <translation>Kan ikke skrive værtsnavn til destinationssystem</translation>
</message>
</context>
<context>
@@ -1930,29 +1900,29 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="59"/>
<source>Set keyboard model to %1, layout to %2-%3</source>
- <translation>Indstil tastatur model til %1, layout til %2-%3</translation>
+ <translation>Sæt tastaturmodel til %1, layout til %2-%3</translation>
</message>
<message>
<location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="320"/>
<source>Failed to write keyboard configuration for the virtual console.</source>
- <translation>Fejl ved at skrive tastatur konfiguration for den virtuelle konsol.</translation>
+ <translation>Kunne ikke skrive tastaturkonfiguration for den virtuelle konsol.</translation>
</message>
<message>
<location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="321"/>
<location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="325"/>
<location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="331"/>
<source>Failed to write to %1</source>
- <translation>Fejlede at skrive til %1</translation>
+ <translation>Kunne ikke skrive til %1</translation>
</message>
<message>
<location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="324"/>
<source>Failed to write keyboard configuration for X11.</source>
- <translation>Fejlede at skrive tastatur konfiguration til X11.</translation>
+ <translation>Kunne ikke skrive tastaturkonfiguration for X11.</translation>
</message>
<message>
<location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="330"/>
<source>Failed to write keyboard configuration to existing /etc/default directory.</source>
- <translation>Fejlede i at skrive tastatur konfigurationen til eksisterende /etc/default mappe.</translation>
+ <translation>Kunne ikke skrive tastaturkonfiguration til eksisterende /etc/default-mappe.</translation>
</message>
</context>
<context>
@@ -1965,7 +1935,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="51"/>
<source>Set flags on %1MB %2 partition.</source>
- <translation>Sæt flag på %1MB %2 partition.</translation>
+ <translation>Sæt flag på %1 MB %2 partition.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="55"/>
@@ -1980,7 +1950,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="70"/>
<source>Clear flags on %1MB <strong>%2</strong> partition.</source>
- <translation>Ryd flag på %1MB <strong>%2</strong> partition.</translation>
+ <translation>Ryd flag på %1 MB <strong>%2</strong> partition.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="74"/>
@@ -1995,7 +1965,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="84"/>
<source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source>
- <translation>Flag %1MB <strong>%2</strong> partition som <strong>%3</strong>.</translation>
+ <translation>Flag %1 MB <strong>%2</strong> partition som <strong>%3</strong>.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="90"/>
@@ -2010,7 +1980,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="106"/>
<source>Clearing flags on %1MB <strong>%2</strong> partition.</source>
- <translation>Rydder flag på %1MB <strong>%2</strong> partition.</translation>
+ <translation>Rydder flag på %1 MB <strong>%2</strong> partition.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="110"/>
@@ -2025,7 +1995,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="120"/>
<source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source>
- <translation>Sætter flag <strong>%3</strong> på %1MB <strong>%2</strong> partition.</translation>
+ <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="126"/>
@@ -2035,7 +2005,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="140"/>
<source>The installer failed to set flags on partition %1.</source>
- <translation>Installationsprogrammet fejlede i at sætte flag på partition %1.</translation>
+ <translation>Installationsprogrammet kunne ikke sætte flag på partition %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="148"/>
@@ -2058,55 +2028,55 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="144"/>
<source>Update geometry of partition %1.</source>
- <translation>Opdatér geometri af partition %1.</translation>
+ <translation>Opdatér %1-partitions geometri.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="156"/>
<source>Failed to change the geometry of the partition.</source>
- <translation>Fejlede i at ændre geometri af partitionen.</translation>
+ <translation>Kunne ikke ændre partitionens geometri.</translation>
</message>
</context>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
- <translation>Indstil kodeord for bruger %1</translation>
+ <translation>Sæt adgangskode for bruger %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
- <translation>Opsætter kodeord for bruger %1.</translation>
+ <translation>Sætter adgangskode for bruger %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
- <translation>Dårlig destination systemsti.</translation>
+ <translation>Ugyldig destinationssystemsti.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>rodMonteringsPunkt er %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
- <translation>Kan ikke deaktivere root konto.</translation>
+ <translation>Kan ikke deaktivere root-konto.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
- <translation>passwd stopped med fejlkode %1.</translation>
+ <translation>passwd stoppet med fejlkode %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
- <translation>Kan ikke indstille kodeord for bruger %1.</translation>
+ <translation>Kan ikke sætte adgangskode for bruger %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
- <translation>usermod stoppede med fejl kode %1.</translation>
+ <translation>usermod stoppet med fejlkode %1.</translation>
</message>
</context>
<context>
@@ -2114,32 +2084,32 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/locale/SetTimezoneJob.cpp" line="43"/>
<source>Set timezone to %1/%2</source>
- <translation>Indstil tidszone til %1/%2</translation>
+ <translation>Sæt tidszone til %1/%2</translation>
</message>
<message>
<location filename="../src/modules/locale/SetTimezoneJob.cpp" line="71"/>
<source>Cannot access selected timezone path.</source>
- <translation>Kan ikke tilgå den valgte tidszone sti.</translation>
+ <translation>Kan ikke tilgå den valgte tidszonesti.</translation>
</message>
<message>
<location filename="../src/modules/locale/SetTimezoneJob.cpp" line="72"/>
<source>Bad path: %1</source>
- <translation>Dårlig sti: %1</translation>
+ <translation>Ugyldig sti: %1</translation>
</message>
<message>
<location filename="../src/modules/locale/SetTimezoneJob.cpp" line="86"/>
<source>Cannot set timezone.</source>
- <translation>Kan ikke indstille tidszone.</translation>
+ <translation>Kan ikke sætte tidszone.</translation>
</message>
<message>
<location filename="../src/modules/locale/SetTimezoneJob.cpp" line="87"/>
<source>Link creation failed, target: %1; link name: %2</source>
- <translation>Link oprettelse fejlede, mål: %1; link navn: %2</translation>
+ <translation>Oprettelse af link mislykkedes, destination: %1; linknavn: %2</translation>
</message>
<message>
<location filename="../src/modules/locale/SetTimezoneJob.cpp" line="96"/>
<source>Cannot set timezone,</source>
- <translation>Kan ikke definere tidszone,</translation>
+ <translation>Kan ikke sætte tidszone,</translation>
</message>
<message>
<location filename="../src/modules/locale/SetTimezoneJob.cpp" line="97"/>
@@ -2173,28 +2143,28 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="285"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
- <translation>Dit brugernavn indeholder ugyldige tegn. Kun små bogstaver og numre er gyldige.</translation>
+ <translation>Dit brugernavn indeholder ugyldige tegn. Kun små bogstaver og tal er tilladt.</translation>
</message>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="329"/>
<source>Your hostname is too short.</source>
- <translation>Dit hostname er for kort.</translation>
+ <translation>Dit værtsnavn er for kort.</translation>
</message>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="340"/>
<source>Your hostname is too long.</source>
- <translation>Dit hostname er for langt.</translation>
+ <translation>Dit værtsnavn er for langt.</translation>
</message>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="351"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
- <translation>Dit hostname indeholder ugyldige tegn. Kun bogstaver, numre og tankestreger er gyldige.</translation>
+ <translation>Dit værtsnavn indeholder ugyldige tegn. Kun bogstaver, tal og tankestreger er tilladt.</translation>
</message>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="382"/>
<location filename="../src/modules/users/UsersPage.cpp" line="415"/>
<source>Your passwords do not match!</source>
- <translation>Dine kodeord er ikke ens!</translation>
+ <translation>Dine adgangskoder er ikke ens!</translation>
</message>
</context>
<context>
@@ -2210,12 +2180,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="14"/>
<source>Form</source>
- <translation>Form</translation>
+ <translation>Formular</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="75"/>
<source>&Language:</source>
- <translation>&Sprog</translation>
+ <translation>&Sprog:</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
@@ -2238,22 +2208,27 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<translation>&Om</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
- <translation><h1>Velkommen til %1 installationsprogrammet.</h1></translation>
+ <translation><h1>Velkommen til %1-installationsprogrammet.</h1></translation>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation><h1>Velkommen til Calamares-installationsprogrammet for %1.</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
- <translation>Om %1 installationsprogrammet</translation>
+ <translation>Om %1-installationsprogrammet</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
- <translation><h1>%1</h1><br/><strong>%2<br/>til %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Tak til: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg og <a href="https://www.transifex.com/calamares/calamares/">Calamares oversætter holdet</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> udvikling sponsoreret af <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</translation>
+ <translation><h1>%1</h1><br/><strong>%2<br/>til %3</strong><br/><br/>Ophavsret 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Tak til: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg og <a href="https://www.transifex.com/calamares/calamares/">Calamares oversætterhold</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> udvikling er sponsoreret af <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>%1 support</translation>
</message>
diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts
index 8df16b3d3dfb921035a95bf4703a20cf2977feef..a236942f32193596b3376ee5c94f5e619e9981c5 100644
--- a/lang/calamares_de.ts
+++ b/lang/calamares_de.ts
@@ -1,38 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Wählen Sie eine Partition zum Verkleinern:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Teilen Sie Festplattenplatz zu, indem Sie den Trenner unten verschieben:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>Durch diesen Vorgang wird die Partition <strong>%1</strong>, welche %4 enthält, auf %2MB verkleinert, und für %5 wird eine neue Partition mit %3MB erstellt.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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, um %1 aufzusetzen.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="208"/>
- <source>The EFI system partition at %1 will be used for starting %2.</source>
- <translation>Die EFI-Systempartition auf %1 wird benutzt, um %2 zu starten.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>EFI-Systempartition:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -344,12 +310,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1 Installationsprogramm</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Debug-Information anzeigen</translation>
</message>
@@ -408,17 +374,17 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<translation>Nachher:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<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="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>Installationsziel des Bootloaders:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<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>
@@ -429,83 +395,83 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Aktuell:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<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="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>EFI-Systempartition:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1117,12 +1083,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Setze Tastaturmodell auf %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Setze Tastaturbelegung auf %1/%2.</translation>
</message>
@@ -1138,12 +1104,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>Regions- und Spracheinstellungen</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>Die Lokalisierung des Systems beeinflusst die Sprache und den Zeichensatz einiger Elemente der Kommandozeile.<br/>Die derzeitige Einstellung ist <strong>%1</strong>.</translation>
</message>
@@ -1229,40 +1195,38 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation>Die Systemsprache wird auf %1 gestellt.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Das Format für Zahlen und Datum wird auf %1 gesetzt.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Region:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Zeitzone:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>&Ändern...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Setze Zeitzone auf %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation>%1 (%2)</translation>
@@ -1333,17 +1297,17 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation>Name</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation>Beschreibung</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation>Netzwerk-Installation. (Deaktiviert: Paketlisten nicht erreichbar, prüfe deine Netzwerk-Verbindung)</translation>
</message>
@@ -1786,55 +1750,60 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>Sammle Systeminformationen...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation>mindestens %1 GB freien Festplattenplatz hat</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>hat mindestens %1 GB Arbeitsspeicher</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>ist an eine Stromquelle angeschlossen</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>Das System ist an keine Stromquelle angeschlossen.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>ist mit dem Internet verbunden</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>Das System ist nicht mit dem Internet verbunden.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>Das Installationsprogramm wird nicht mit Administratorrechten ausgeführt.</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2070,42 +2039,42 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Setze Passwort für Benutzer %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>Setze Passwort für Benutzer %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>Ungültiger System-Zielpfad.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>root-Einhängepunkt ist %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation>Das Root-Konto kann nicht deaktiviert werden.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation>Passwd beendet mit Fehlercode %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>Passwort für Benutzer %1 kann nicht gesetzt werden.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>usermod wurde mit Fehlercode %1 beendet.</translation>
</message>
@@ -2239,22 +2208,27 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<translation>&Über</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>Willkommen im %1 Installationsprogramm.</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>Über das %1 Installationsprogramm</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Dank an: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> wird unterstützt von <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>Unterstützung für %1</translation>
</message>
diff --git a/lang/calamares_el.ts b/lang/calamares_el.ts
index 76eeb26795693c381a77ac09d0f43e0df04b5e03..6c3b6fa54c60c168b923e698e3bdb4b267e119c7 100644
--- a/lang/calamares_el.ts
+++ b/lang/calamares_el.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="el" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Επιλέξτε κατάτμηση για συρρίκνωση:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Διανείμετε τον χώρο του δίσκου σύροντας το παρακάτω διαχωριστικό:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>Με αυτή τη λειτουργία, η κατάτμηση <strong>%1</strong> που περιέχει το %4 θα συρρικνωθεί σε %2MB και μία νέα κατάτμηση %3MB θα δημιουργηθεί για το %5.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>Κατάτμηση συστήματος EFI:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -343,12 +310,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>Εφαρμογή εγκατάστασης του %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Εμφάνιση πληροφοριών απασφαλμάτωσης</translation>
</message>
@@ -407,17 +374,17 @@ The installer will quit and all changes will be lost.</source>
<translation>Μετά:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation><strong>Χειροκίνητη τμηματοποίηση</strong><br/>Μπορείτε να δημιουργήσετε κατατμήσεις ή να αλλάξετε το μέγεθός τους μόνοι σας.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>Τοποθεσία προγράμματος εκκίνησης:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<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>
@@ -428,83 +395,83 @@ The installer will quit and all changes will be lost.</source>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Τρέχον:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>Κατάτμηση συστήματος EFI:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1116,12 +1083,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Ορισμός του μοντέλου πληκτρολογίου σε %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Ορισμός της διάταξης πληκτρολογίου σε %1/%2.</translation>
</message>
@@ -1137,12 +1104,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>Τοπική ρύθμιση συστήματος</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>Η τοπική ρύθμιση του συστήματος επηρεάζει τη γλώσσα και το σύνολο χαρακτήρων για ορισμένα στοιχεία διεπαφής χρήστη της γραμμής εντολών.<br/>Η τρέχουσα ρύθμιση είναι <strong>%1</strong>.</translation>
</message>
@@ -1228,40 +1195,38 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation>Η τοπική γλώσσα του συστήματος έχει οριστεί σε %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Περιοχή:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Ζώνη:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>&Αλλαγή...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Ορισμός της ζώνης ώρας σε %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1332,17 +1297,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1785,55 +1750,60 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>Συλλογή πληροφοριών συστήματος...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation>έχει τουλάχιστον %1 GB διαθέσιμου χώρου στον δίσκο</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation>Δεν υπάρχει αρκετός χώρος στον δίσκο. Απαιτείται τουλάχιστον %1 GB.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>έχει τουλάχιστον %1 GB μνημης</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation>Το σύστημα δεν έχει αρκετή μνήμη. Απαιτείται τουλάχιστον %1 GB.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>είναι συνδεδεμένος σε πηγή ρεύματος</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>Το σύστημα δεν είναι συνδεδεμένο σε πηγή ρεύματος.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>είναι συνδεδεμένος στο διαδίκτυο</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>Το σύστημα δεν είναι συνδεδεμένο στο διαδίκτυο.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>Το πρόγραμμα εγκατάστασης δεν εκτελείται με δικαιώματα διαχειριστή.</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2069,42 +2039,42 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Ορισμός κωδικού για τον χρήστη %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>Ορίζεται κωδικός για τον χρήστη %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
@@ -2238,22 +2208,27 @@ The installer will quit and all changes will be lost.</source>
<translation>Σ&χετικά με</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>Καλώς ήλθατε στην εγκατάσταση του %1.</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>Σχετικά με το πρόγραμμα εγκατάστασης %1</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>Υποστήριξη %1</translation>
</message>
diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts
index 50edaff863558e03f3c8135196928301012276cc..0e1e82d710c40171a8a9f46e9a7d82c5cfb7a077 100644
--- a/lang/calamares_en.ts
+++ b/lang/calamares_en.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="en" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Choose partition to shrink:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Allocate drive space by dragging the divider below:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>EFI system partition:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -343,12 +310,12 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1 Installer</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Show debug information</translation>
</message>
@@ -407,17 +374,17 @@ The installer will quit and all changes will be lost.</translation>
<translation>After:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<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="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>Boot loader location:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<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>
@@ -428,83 +395,83 @@ The installer will quit and all changes will be lost.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Current:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<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="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>EFI system partition:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1116,12 +1083,12 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Set keyboard model to %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Set keyboard layout to %1/%2.</translation>
</message>
@@ -1137,12 +1104,12 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>System locale setting</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>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>.</translation>
</message>
@@ -1228,40 +1195,38 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation>The system language will be set to %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>The numbers and dates locale will be set to %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Region:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Zone:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>&Change...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Set timezone to %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation>%1 (%2)</translation>
@@ -1332,17 +1297,17 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation>Name</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation>Description</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</translation>
</message>
@@ -1785,55 +1750,60 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>Gathering system information...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation>has at least %1 GB available drive space</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>has at least %1 GB working memory</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>is plugged in to a power source</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>The system is not plugged in to a power source.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>is connected to the Internet</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>The system is not connected to the Internet.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>The installer is not running with administrator rights.</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation>The screen is too small to display the installer.</translation>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2069,42 +2039,42 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Set password for user %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>Setting password for user %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>Bad destination system path.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>rootMountPoint is %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation>Cannot disable root account.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation>passwd terminated with error code %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>Cannot set password for user %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>usermod terminated with error code %1.</translation>
</message>
@@ -2238,22 +2208,27 @@ The installer will quit and all changes will be lost.</translation>
<translation>&About</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>Welcome to the %1 installer.</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation><h1>Welcome to the Calamares installer for %1.</h1></translation>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>About %1 installer</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>%1 support</translation>
</message>
diff --git a/lang/calamares_en_GB.ts b/lang/calamares_en_GB.ts
index b13337f27b92b58a96f20bcebfe87036e7716af9..66a53b6be0424e5f4189f9e5475a299bd567c100 100644
--- a/lang/calamares_en_GB.ts
+++ b/lang/calamares_en_GB.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="en_GB" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Choose partition to shrink:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Allocate drive space by dragging the divider below:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -343,12 +310,12 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1 Installer</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Show debug information</translation>
</message>
@@ -407,17 +374,17 @@ The installer will quit and all changes will be lost.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
<translation type="unfinished"/>
</message>
@@ -428,83 +395,83 @@ The installer will quit and all changes will be lost.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<source><strong>Select a partition to install on</strong></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1116,12 +1083,12 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Set keyboard model to %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Set keyboard layout to %1/%2.</translation>
</message>
@@ -1137,12 +1104,12 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>System locale setting</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>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>.</translation>
</message>
@@ -1228,40 +1195,38 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Region:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Zone:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>&Change...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Set timezone to %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1332,17 +1297,17 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1785,55 +1750,60 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2069,42 +2039,42 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Set password for user %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>Bad destination system path.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>rootMountPoint is %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>Cannot set password for user %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>usermod terminated with error code %1.</translation>
</message>
@@ -2238,22 +2208,27 @@ The installer will quit and all changes will be lost.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_es.ts b/lang/calamares_es.ts
index f0a1a2aa63456167ed633f631cce3bfbb617a214..89222f81d0cf789f6afa80513f1fb316ebcfbb76 100644
--- a/lang/calamares_es.ts
+++ b/lang/calamares_es.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="es" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Selecciona la partición a reducir:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Asignar espacio en el disco arrastrando el separador de abajo:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>Con esta operación, la partición <strong>%1</strong> que contiene %4 será reducida a %2MB y una nueva partición de %3MB será creada para %5</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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 a atrás y use el particionamiento manual para configurar %1.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>Partición del sistema EFI:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -344,12 +311,12 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1 Instalador</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Mostrar información de depuración.</translation>
</message>
@@ -408,17 +375,17 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
<translation>Despues:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<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="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>Ubicación del cargador de arranque:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<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>
@@ -429,83 +396,83 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Corriente</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<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="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>Partición del sistema EFI:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1117,12 +1084,12 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Establecer el modelo de teclado a %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Configurar la disposición de teclado a %1/%2.</translation>
</message>
@@ -1138,12 +1105,12 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>Configuración regional del sistema.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>La configuración regional del sistema afecta al idioma y a al conjunto de caracteres para algunos elementos de interfaz de la linea de comandos.<br/>La configuración actual es <strong>%1</strong>.</translation>
</message>
@@ -1229,40 +1196,38 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation>El idioma del sistema se establecerá a %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>La localización de números y fechas se establecerá a %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Región:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Zona:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>&Cambiar...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Configurar zona horaria a %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation>%1 (%2)</translation>
@@ -1333,17 +1298,17 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation>Nombre</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation>Descripción</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation>Instalación a través de la Red. (Desactivada: no se ha podido obtener una lista de paquetes, comprueba tu conexión a la red)</translation>
</message>
@@ -1786,55 +1751,60 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>Obteniendo información del sistema...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>tiene al menos %1 GB de memoria.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>esta conectado a una fuente de alimentación</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>El sistema no esta conectado a una fuente de alimentación.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>esta conectado a Internet</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>El sistema no esta conectado a Internet</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>El instalador no esta ejecutándose con permisos de administrador.</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2070,42 +2040,42 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Definir contraseña para el usuario %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>Configurando contraseña para el usuario %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>Destino erróneo del sistema.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>El punto de montaje de la raíz es %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation>No se puede deshabilitar la cuenta root</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation>passwd finalizó con el código de error %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>No se puede definir contraseña para el usuario %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>usermod ha terminado con el código de error %1</translation>
</message>
@@ -2239,22 +2209,27 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
<translation>&Acerca de</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>Bienvenido al instalador %1.</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation><h1>Bienvenido al instalador de Calamares para %1.</h1></translation>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>Acerca del instalador %1</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Gracias a: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg y al <a href="https://www.transifex.com/calamares/calamares/">el equipo de traductores de Calamares</a>.<br/><br/>El desarrollo de <a href="http://calamares.io/">Calamares</a> está patrocinado por <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberando Software.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>%1 ayuda</translation>
</message>
diff --git a/lang/calamares_es_ES.ts b/lang/calamares_es_ES.ts
index fd5831a6bb34228e828c0285b7875e93604be6b9..b5b266bdb46990c935f88512e3965c27b5d37927 100644
--- a/lang/calamares_es_ES.ts
+++ b/lang/calamares_es_ES.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_ES" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Elige la partición a reducir:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Asigna el espacio de disco moviendo el separado de debajo:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>Con esta operación la partición <strong>%1</strong> que tiene %4 se va a reducir a %2MB y se va a crear una nueva partición de %3MB para %5</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -343,12 +310,12 @@ El instalador se cerrará y se perderán todos los cambios.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>Instalador %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Mostrar la información de depuración</translation>
</message>
@@ -407,17 +374,17 @@ El instalador se cerrará y se perderán todos los cambios.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
<translation type="unfinished"/>
</message>
@@ -428,83 +395,83 @@ El instalador se cerrará y se perderán todos los cambios.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<source><strong>Select a partition to install on</strong></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1116,12 +1083,12 @@ El instalador se cerrará y se perderán todos los cambios.</translation>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Establecer el modelo de teclado a %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Establecer la disposición del teclado a %1/%2.</translation>
</message>
@@ -1137,12 +1104,12 @@ El instalador se cerrará y se perderán todos los cambios.</translation>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>Ajustar configuración local</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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"/>
</message>
@@ -1228,40 +1195,38 @@ El instalador se cerrará y se perderán todos los cambios.</translation>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Región:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Zona:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>&Cambiar</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Establecer la zona horaria a %1%2. <br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1332,17 +1297,17 @@ El instalador se cerrará y se perderán todos los cambios.</translation>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1785,55 +1750,60 @@ El instalador se cerrará y se perderán todos los cambios.</translation>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2069,42 +2039,42 @@ El instalador se cerrará y se perderán todos los cambios.</translation>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Establecer contraseña del usuario %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>El destino de la ruta del sistema es errónea.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>El punto de montaje de root es %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>No se puede establecer la contraseña del usuario %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>usermod ha terminado con el código de error %1.</translation>
</message>
@@ -2238,22 +2208,27 @@ El instalador se cerrará y se perderán todos los cambios.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_es_MX.ts b/lang/calamares_es_MX.ts
index ec7118309a81b80182c1dec2d58f89a4ed55bd69..a0efb734bdc978f58d5df49816bb33502c20e22e 100644
--- a/lang/calamares_es_MX.ts
+++ b/lang/calamares_es_MX.ts
@@ -1,38 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_MX" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Escoja la partición a reducir</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Asignar el espacio en disco moviendo el separador de debajo:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>Con esta operación, la partición <strong>%1</strong>, que contiene %4 será reducida a %2MB y una nueva partición de %3MB será creada para %5.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>Partición de sistema EFI:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -344,12 +310,12 @@ El instalador terminará y se perderán todos los cambios.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1 Instalador</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Mostrar información de depuración</translation>
</message>
@@ -409,17 +375,17 @@ El instalador terminará y se perderán todos los cambios.</translation>
<translation>Después:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<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="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>Ubicación del cargador de arranque:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
<translation type="unfinished"/>
</message>
@@ -430,83 +396,83 @@ El instalador terminará y se perderán todos los cambios.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Actual:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1119,12 +1085,12 @@ El instalador terminará y se perderán todos los cambios.</translation>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Ajustar el modelo de teclado a %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Ajustar teclado a %1/%2.</translation>
</message>
@@ -1140,12 +1106,12 @@ El instalador terminará y se perderán todos los cambios.</translation>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>Configuración de localización del sistema</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>La configuración regional del sistema afecta al idioma y a al conjunto de caracteres para algunos elementos de interfaz de la linea de comandos.<br/>La configuración actual es <strong>%1</strong>.</translation>
</message>
@@ -1231,40 +1197,38 @@ El instalador terminará y se perderán todos los cambios.</translation>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Región:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Zona:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>&Cambiar...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Definir la zona horaria como %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1335,17 +1299,17 @@ El instalador terminará y se perderán todos los cambios.</translation>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1788,55 +1752,60 @@ El instalador terminará y se perderán todos los cambios.</translation>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>Obteniendo información del sistema...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>tiene al menos %1 GB de memoria para trabajar</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>está conectado a una fuente de energía</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>El sistema no está conectado a una fuente de energía.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>está conectado a Internet</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>El sistema no está conectado a Internet.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>El instalador no se está ejecutando con privilegios de administrador.</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2072,42 +2041,42 @@ El instalador terminará y se perderán todos los cambios.</translation>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Definir contraseña para el usuario %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>Configurando contraseña para el usuario %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>Destino erróneo del sistema.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>El punto de montaje de root es %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>No se puede definir contraseña para el usuario %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>usermod ha terminado con el código de error %1</translation>
</message>
@@ -2241,22 +2210,27 @@ El instalador terminará y se perderán todos los cambios.</translation>
<translation>&Acerca de</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>Bienvenido al instalador de %1.</h1> </translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>Acerca del instalador %1</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>%1 Soporte</translation>
</message>
diff --git a/lang/calamares_es_PR.ts b/lang/calamares_es_PR.ts
index 16b0ba941f87fe85fedbed7341987ba16ccc4ece..0eac393d898795970558513c197664161dc67721 100644
--- a/lang/calamares_es_PR.ts
+++ b/lang/calamares_es_PR.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_PR" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Selecciona la partición a reducir:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Asignar el espacio en el disco arrastrando el separador a continuación:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -342,12 +309,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation type="unfinished"/>
</message>
@@ -406,17 +373,17 @@ 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="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
<translation type="unfinished"/>
</message>
@@ -427,83 +394,83 @@ The installer will quit and all changes will be lost.</source>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<source><strong>Select a partition to install on</strong></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1115,12 +1082,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
@@ -1136,12 +1103,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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"/>
</message>
@@ -1227,40 +1194,38 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1331,17 +1296,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1784,55 +1749,60 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2068,42 +2038,42 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
@@ -2237,22 +2207,27 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_et.ts b/lang/calamares_et.ts
index e3ec90b8b0cacad6236be7a715253f91e776f1e7..9458634e1126aa06704b709cc1c1c1477d69074a 100644
--- a/lang/calamares_et.ts
+++ b/lang/calamares_et.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="et" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -336,12 +303,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation type="unfinished"/>
</message>
@@ -400,17 +367,17 @@ 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="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
<translation type="unfinished"/>
</message>
@@ -421,83 +388,83 @@ The installer will quit and all changes will be lost.</source>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<source><strong>Select a partition to install on</strong></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1109,12 +1076,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
@@ -1130,12 +1097,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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"/>
</message>
@@ -1221,40 +1188,38 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1325,17 +1290,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1778,55 +1743,60 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2062,42 +2032,42 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
@@ -2231,22 +2201,27 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_eu.ts b/lang/calamares_eu.ts
index d67c15b983fd02ed6e2d169de411010e91d15772..602ee9339d411475a104fb47b093fe8d6b9c6b7a 100644
--- a/lang/calamares_eu.ts
+++ b/lang/calamares_eu.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="eu" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Hautatu txikitu nahi duzun partizioa:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Disko-espazioa esleitu beheko barra mugituz:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>EFI sistema-partizioa:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -103,7 +70,7 @@
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="57"/>
<source>Type:</source>
- <translation type="unfinished"/>
+ <translation>Mota:</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="64"/>
@@ -148,12 +115,12 @@
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="51"/>
<source>Run command %1 %2</source>
- <translation type="unfinished"/>
+ <translation>%1 %2 komandoa abiarazi</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="60"/>
<source>Running command %1 %2</source>
- <translation type="unfinished"/>
+ <translation>%1 %2 komandoa exekutatzen</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="89"/>
@@ -340,12 +307,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1 Instalatzailea</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation type="unfinished"/>
</message>
@@ -404,17 +371,17 @@ 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="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
<translation type="unfinished"/>
</message>
@@ -425,83 +392,83 @@ The installer will quit and all changes will be lost.</source>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<source><strong>Select a partition to install on</strong></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1113,12 +1080,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
@@ -1134,12 +1101,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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"/>
</message>
@@ -1225,40 +1192,38 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Eskualdea:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Zonaldea:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>&Aldatu...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1329,17 +1294,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1782,55 +1747,60 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>Sistemaren informazioa eskuratzen...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>Sistema ez dago indar iturri batetara konektatuta.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>Internetera konektatuta dago</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>Sistema ez dago Internetera konektatuta.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2066,42 +2036,42 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Ezarri %1 erabiltzailearen pasahitza</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>root Muntatze Puntua %1 da</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
@@ -2235,22 +2205,27 @@ The installer will quit and all changes will be lost.</source>
<translation>Honi &buruz</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>Ongi etorri %1 instalatzailera.</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>%1 instalatzaileari buruz</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>%1 euskarria</translation>
</message>
diff --git a/lang/calamares_fa.ts b/lang/calamares_fa.ts
index fdc08f7caa4a5f4e4eca9b216869553abc08c8c2..41bf2f85e5005ca81685961ea14fe5628bd47642 100644
--- a/lang/calamares_fa.ts
+++ b/lang/calamares_fa.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="fa" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -336,12 +303,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation type="unfinished"/>
</message>
@@ -400,17 +367,17 @@ 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="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
<translation type="unfinished"/>
</message>
@@ -421,83 +388,83 @@ The installer will quit and all changes will be lost.</source>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<source><strong>Select a partition to install on</strong></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1109,12 +1076,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
@@ -1130,12 +1097,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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"/>
</message>
@@ -1221,40 +1188,38 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1325,17 +1290,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1778,55 +1743,60 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2062,42 +2032,42 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
@@ -2231,22 +2201,27 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_fi_FI.ts b/lang/calamares_fi_FI.ts
index 5603372575ba0ba03183f5369e0126a9d7f15032..c42d4474d0bfa944cdaf1aa3d1497a1dafc9909a 100644
--- a/lang/calamares_fi_FI.ts
+++ b/lang/calamares_fi_FI.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="fi_FI" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Valitse osio jota supistetaan:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Jaa aseman tila raahaamalla alla olevaa jakajaa:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -343,12 +310,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1 Asennusohjelma</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation type="unfinished"/>
</message>
@@ -407,17 +374,17 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
<translation type="unfinished"/>
</message>
@@ -428,83 +395,83 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<source><strong>Select a partition to install on</strong></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1116,12 +1083,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Aseta näppäimiston malli %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Aseta näppäimiston asetelmaksi %1/%2.</translation>
</message>
@@ -1137,12 +1104,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>Järjestelmän maa-asetus</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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"/>
</message>
@@ -1228,40 +1195,38 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Alue:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Vyöhyke:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>&Vaihda...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Aseta aikavyöhyke %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1332,17 +1297,17 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1785,55 +1750,60 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2069,42 +2039,42 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Aseta salasana käyttäjälle %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>Huono kohteen järjestelmäpolku</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>rootMountPoint on %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>Salasanaa ei voi asettaa käyttäjälle %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>usermod päättyi virhekoodilla %1.</translation>
</message>
@@ -2238,22 +2208,27 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_fr.ts b/lang/calamares_fr.ts
index 2531dc998ee7dd890d16f216ced1ca899da9e303..5b70dc9acda441a37347bdbdbc1a5eb9f55863e7 100644
--- a/lang/calamares_fr.ts
+++ b/lang/calamares_fr.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Choisir la partition à réduire :</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Allouer l'espace disque en faisant glisser le séparateur ci-dessous :</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>Avec cette opération, la partition <strong>%1</strong> qui contient %4 sera réduite à %2Mo et une nouvelle partition %3 sera créée pour %5.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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 est introuvable sur ce système. Merci de revenir en arrière et d'utiliser le partitionnement manuel pour configurer %1.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="208"/>
- <source>The EFI system partition at %1 will be used for starting %2.</source>
- <translation>La partition système EFI à %1 sera utilisée pour démarrer %2.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>Partition système EFI:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -343,12 +310,12 @@ L'installateur se fermera et les changements seront perdus.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>Installateur %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Afficher les informations de dépannage</translation>
</message>
@@ -407,17 +374,17 @@ L'installateur se fermera et les changements seront perdus.</translation>
<translation>Après:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<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="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>Emplacement du chargeur de démarrage:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<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>
@@ -428,83 +395,83 @@ L'installateur se fermera et les changements seront perdus.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Actuel :</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<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="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>Partition système EFI :</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1116,12 +1083,12 @@ L'installateur se fermera et les changements seront perdus.</translation>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Configurer le modèle de clavier à %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Configurer la disposition clavier à %1/%2.</translation>
</message>
@@ -1137,12 +1104,12 @@ L'installateur se fermera et les changements seront perdus.</translation>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>Paramètre régional</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>Les paramètres régionaux systèmes affectent la langue et le jeu de caractère pour la ligne de commande et différents éléments d'interface.<br/>Le paramètre actuel est <strong>%1</strong>.</translation>
</message>
@@ -1228,40 +1195,38 @@ L'installateur se fermera et les changements seront perdus.</translation>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation>La langue du système sera réglée sur %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Les nombres et les dates seront réglés sur %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Région :</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Zone :</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>&Modifier...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Configurer le fuseau horaire à %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation>%1 (%2)</translation>
@@ -1332,17 +1297,17 @@ L'installateur se fermera et les changements seront perdus.</translation>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation>Nom</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation>Description</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation>Installation par le réseau (Désactivée : impossible de récupérer leslistes de paquets, vérifiez la connexion réseau)</translation>
</message>
@@ -1785,55 +1750,60 @@ L'installateur se fermera et les changements seront perdus.</translation>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>Récupération des informations système...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation>a au moins %1 Go d'espace disque disponible</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>a au moins %1 Go de mémoire vive</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>est relié à une source de courant</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>Le système n'est pas relié à une source de courant.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>est connecté à Internet</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>Le système n'est pas connecté à Internet.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>L'installateur ne dispose pas des droits administrateur.</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2069,42 +2039,42 @@ L'installateur se fermera et les changements seront perdus.</translation>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Définir le mot de passe pour l'utilisateur %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>Configuration du mot de passe pour l'utilisateur %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>Mauvaise destination pour le chemin système.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>Le point de montage racine est %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation>Impossible de désactiver le compte root.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation>passwd c'est arrêté avec le code d'erreur %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>Impossible de créer le mot de passe pour l'utilisateur %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>usermod s'est terminé avec le code erreur %1.</translation>
</message>
@@ -2238,22 +2208,27 @@ L'installateur se fermera et les changements seront perdus.</translation>
<translation>&À propos</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>Bienvenue dans l'installateur de %1.</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>À propos de l'installateur %1</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation><h1>%1</h1><br/><strong>%2<br/>pour %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Merci à: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg et <a href="https://www.transifex.com/calamares/calamares/">l'équipe de traduction de Calamares</a>.<br/><br/>Le développement de <a href="http://calamares.io/">Calamares</a> est sponsorisé par <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>Support de %1</translation>
</message>
diff --git a/lang/calamares_fr_CH.ts b/lang/calamares_fr_CH.ts
index 16841745062082ab39cdc73a861e11c97b7b67b2..018bc3c6feb48134ddaba49f8c4d67b3a808af12 100644
--- a/lang/calamares_fr_CH.ts
+++ b/lang/calamares_fr_CH.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_CH" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -336,12 +303,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation type="unfinished"/>
</message>
@@ -400,17 +367,17 @@ 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="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
<translation type="unfinished"/>
</message>
@@ -421,83 +388,83 @@ The installer will quit and all changes will be lost.</source>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<source><strong>Select a partition to install on</strong></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1109,12 +1076,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
@@ -1130,12 +1097,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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"/>
</message>
@@ -1221,40 +1188,38 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1325,17 +1290,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1778,55 +1743,60 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2062,42 +2032,42 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
@@ -2231,22 +2201,27 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_gl.ts b/lang/calamares_gl.ts
index 6137b5057d09cfe41c1106e85e1668bed80cb179..619392d0cc6b9e2242ce9f19e5a6ddc18e407fdf 100644
--- a/lang/calamares_gl.ts
+++ b/lang/calamares_gl.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="gl" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Escolla a partición a acurtar</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Reparta o espazo do disco arrastrando o divisor de abaixo</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>Mediante esta operación, a partición <strong>%1<\strong> que contén %4 será acurtada a %2MB e unha nova partición de %3MB será creada para %5.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>Partición EFI do sistema:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -344,12 +311,12 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>Instalador de %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Mostrar informes de depuración</translation>
</message>
@@ -408,17 +375,17 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<translation>Despois:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<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="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>Localización do cargador de arranque:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<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>
@@ -429,83 +396,83 @@ O instalador pecharase e perderanse todos os cambios.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Actual:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<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="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>Partición EFI do sistema:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -806,22 +773,22 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<message>
<location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="58"/>
<source>Deleting partition %1.</source>
- <translation type="unfinished"/>
+ <translation>Eliminando partición %1</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="67"/>
<source>The installer failed to delete partition %1.</source>
- <translation type="unfinished"/>
+ <translation>O instalador fallou ó eliminar a partición %1</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="73"/>
<source>Partition (%1) and device (%2) do not match.</source>
- <translation type="unfinished"/>
+ <translation>A partición (%1) e o dispositivo (%2) non coinciden</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="85"/>
<source>Could not open device %1.</source>
- <translation type="unfinished"/>
+ <translation>Non foi posíbel abrir o dispositivo %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="94"/>
@@ -1117,12 +1084,12 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
@@ -1138,12 +1105,12 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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"/>
</message>
@@ -1229,40 +1196,38 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1333,17 +1298,17 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1786,55 +1751,60 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2070,42 +2040,42 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
@@ -2239,22 +2209,27 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<translation>&Acerca de</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>Benvido o instalador %1.</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>Acerca do instalador %1</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>%1 axuda</translation>
</message>
diff --git a/lang/calamares_gu.ts b/lang/calamares_gu.ts
index cbdd7fbd821bc1f9c887116a28242c0912ecce89..830eefb50ef8b6cbd7ec46860ab3b41cebc3f6ab 100644
--- a/lang/calamares_gu.ts
+++ b/lang/calamares_gu.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="gu" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -336,12 +303,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation type="unfinished"/>
</message>
@@ -400,17 +367,17 @@ 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="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
<translation type="unfinished"/>
</message>
@@ -421,83 +388,83 @@ The installer will quit and all changes will be lost.</source>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<source><strong>Select a partition to install on</strong></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1109,12 +1076,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
@@ -1130,12 +1097,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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"/>
</message>
@@ -1221,40 +1188,38 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1325,17 +1290,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1778,55 +1743,60 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2062,42 +2032,42 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
@@ -2231,22 +2201,27 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_hi.ts b/lang/calamares_hi.ts
index 0b169c7b3b38edf7fc5d4f3872b13d75859d2dfe..6a0c1a39ca747d6555288ae12270e6ff6aa50447 100644
--- a/lang/calamares_hi.ts
+++ b/lang/calamares_hi.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="hi" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>संकुचन हेतु विभाजन चुनें</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -336,12 +303,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation type="unfinished"/>
</message>
@@ -400,17 +367,17 @@ 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="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
<translation type="unfinished"/>
</message>
@@ -421,83 +388,83 @@ The installer will quit and all changes will be lost.</source>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<source><strong>Select a partition to install on</strong></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1109,12 +1076,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
@@ -1130,12 +1097,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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"/>
</message>
@@ -1221,40 +1188,38 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1325,17 +1290,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1778,55 +1743,60 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2062,42 +2032,42 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
@@ -2231,22 +2201,27 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_hr.ts b/lang/calamares_hr.ts
index ed00c923b9aa374cfd1ff44a841ead0e424a74fe..4bf93fcf4d41be494b69d2f55193229f47c33ac1 100644
--- a/lang/calamares_hr.ts
+++ b/lang/calamares_hr.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="hr" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Odaberi particiju za smanjivanje:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Dodijeli prostor na disku povlačeći razdjelnik koja se nalazi ispod:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>Sa ovom operacijom, particija <strong>%1</strong> koja sadrži %4 će biti smanjena za %2MB i stvorit će se nova %3MB particija za %5.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>EFI particija:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -343,12 +310,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1 Instalacijski program</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Prikaži debug informaciju</translation>
</message>
@@ -407,17 +374,17 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<translation>Poslije:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<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="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>Lokacija boot učitavača:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<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>
@@ -428,83 +395,83 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Trenutni:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<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="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>EFI particija:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1116,12 +1083,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Postavi model tipkovnice na %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Postavi raspored tipkovnice na %1%2.</translation>
</message>
@@ -1137,12 +1104,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>Postavke jezične sheme sustava</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>Jezična shema sustava ima efekt na jezični i znakovni skup za neke komandno linijske elemente sučelja.<br/>Trenutačna postavka je <strong>%1</strong>.</translation>
</message>
@@ -1228,40 +1195,38 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation>Jezik sustava će se postaviti na %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Jezična shema brojeva i datuma će se postaviti na %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Regija:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Zona:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>&Promijeni...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Postavi vremesku zonu na %1%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation>%1 (%2)</translation>
@@ -1332,17 +1297,17 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation>Ime</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation>Opis</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation>Mrežna instalacija. (Onemogućeno: Ne mogu dohvatiti listu paketa, provjerite da li ste spojeni na mrežu)</translation>
</message>
@@ -1785,55 +1750,60 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>Skupljanje informacija o sustavu...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation>ima barem %1 GB dostupne slobodne memorije na disku</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation>Nema dovoljno prostora na disku. Potrebno je najmanje %1 GB.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>ima barem %1 GB radne memorije</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation>Ovaj sustav nema dovoljno radne memorije. Potrebno je najmanje %1 GB.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>je spojeno na izvor struje</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>Ovaj sustav nije spojen na izvor struje.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>je spojeno na Internet</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>Ovaj sustav nije spojen na internet.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>Instalacijski program nije pokrenut sa administratorskim dozvolama.</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2069,42 +2039,42 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Postavi lozinku za korisnika %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>Postavljam lozinku za korisnika %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>Loš odredišni put sustava.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>rootTočkaMontiranja je %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation>Ne mogu onemogućiti root račun.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation>passwd je prekinut s greškom %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>Ne mogu postaviti lozinku za korisnika %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>usermod je prekinut s greškom %1.</translation>
</message>
@@ -2238,22 +2208,27 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<translation>&O programu</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>Dobrodošli u %1 instalacijski program.</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation>Dobrodošli u Calamares instalacijski program za %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>O %1 instalacijskom programu</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Autorska prava 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Hvala: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg i <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> razvoj je sponzoriran od <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>%1 podrška</translation>
</message>
diff --git a/lang/calamares_hu.ts b/lang/calamares_hu.ts
index 39c1eaec2fa5a7e64e4d09104fa93b2211194475..d9b0329bcddbc593e8a86dc2e398d608ee01f471 100644
--- a/lang/calamares_hu.ts
+++ b/lang/calamares_hu.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="hu" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Válaszd ki melyik partíció legyen átméretezve, zsugorítva:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Az alábbi osztósáv húzásával meghatározhatod a lefoglalandó meghajtó területet:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>Ezzel a művelettel, a <strong>%1</strong> partíció, ami %4-et tartalmaz, %2MB-ra lesz zsugorítva és egy új %3MB partíció lesz létrehozva %5 számára.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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>Az EFI rendszerpartíció nem található a rendszerben. Kérlek, lépj vissza és állítsd be manuális partícionálással %1- et.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="208"/>
- <source>The EFI system partition at %1 will be used for starting %2.</source>
- <translation>A %2 indításához az EFI rendszer partíciót használja a következőn: %1</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>EFI rendszer partíció:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -343,12 +310,12 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1 Telepítő</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Hibakeresési információk mutatása</translation>
</message>
@@ -408,17 +375,17 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l
<translation>Utána:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<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="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>Rendszerbetöltő helye:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<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>
@@ -429,83 +396,83 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Aktuális:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<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="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>EFI rendszerpartíció:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1117,12 +1084,12 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Billentyűzet típus beállítása %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Billentyűzet kiosztás beállítása %1/%2.</translation>
</message>
@@ -1138,12 +1105,12 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>Területi beállítások</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>A nyelvi beállítás kihat a nyelvi és karakter beállításokra a parancssori elemeknél.<br/>A jelenlegi beállítás <strong>%1</strong>.</translation>
</message>
@@ -1229,40 +1196,38 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation>A rendszer területi beállítása %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>A számok és dátumok területi beállítása %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Régió:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Zóna:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>&Változtat...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Időzóna beállítása %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation>%1 (%2)</translation>
@@ -1333,17 +1298,17 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
- <translation type="unfinished"/>
+ <translation>Név</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
- <translation type="unfinished"/>
+ <translation>Leírás</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation>Hálózati telepítés. (Kikapcsolva: A csomagokat nem lehet letölteni, ellenőrizd a hálózati kapcsolatot)</translation>
</message>
@@ -1786,55 +1751,60 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>Rendszerinformációk gyűjtése...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation>Legalább %1 GB lemezterület elérhető</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>Legalább %1 GB elérhető memória</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>csatlakoztatva van külső áramforráshoz</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>A rendszer nincs csatlakoztatva külső áramforráshoz</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>csatlakozik az internethez</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>A rendszer nem csatlakozik az internethez.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>A telepítő nem adminisztrátori jogokkal fut.</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2070,42 +2040,42 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>%1 felhasználó jelszó beállítása</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>%1 felhasználói jelszó beállítása</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>Rossz célrendszer elérési út</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>rootMountPoint is %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
- <translation type="unfinished"/>
+ <translation>A root account- ot nem lehet inaktiválni.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
- <translation type="unfinished"/>
+ <translation>passwd megszakítva %1 hibakóddal.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>Nem lehet a %1 felhasználó jelszavát beállítani.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>usermod megszakítva %1 hibakóddal.</translation>
</message>
@@ -2239,22 +2209,28 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l
<translation>&Névjegy</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>Üdvözlet a %1 telepítőben.</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>A %1 telepítőről</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
- <translation type="unfinished"/>
+ <translation><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Minden jog fenntartva 2014-2017 Teo Mrnjavac <teo@kde.org><br/>;Köszönet: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Philip Müller, Pier Luigi Fiorini and Rohan Garg és a <a href="https://www.transifex.com/calamares/calamares/" Calamares Fordító Csapat/a>.
+<br/><br/><a href="http://calamares.io/">Calamares</a> fejlesztés támogatói:<br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>%1 támogatás</translation>
</message>
diff --git a/lang/calamares_id.ts b/lang/calamares_id.ts
index 98ef5ff38975c80d3d67322703a09ea70a752b55..b8772d2828b49364fe176f1e0438133b93e2d7d7 100644
--- a/lang/calamares_id.ts
+++ b/lang/calamares_id.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="id" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Pilih partisi untuk diiris:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Alokasikan ruang penyimpanan dengan menyeret pembatas di bawah:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>Dengan operasi ini, partisi <b>%1</b> yang berisi %4 akan disusutkan menjadi %2MB dan sebuah partisi %3MB baru akan dibuat untuk %5.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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>Partisi sistem EFI tidak ditemukan di sistem ini. Silakan kembali dan gunakan pemartisian manual untuk menyetel %1.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="208"/>
- <source>The EFI system partition at %1 will be used for starting %2.</source>
- <translation>Sistem partisi EFI pada %1 akan digunakan untuk memulai %2.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>Partisi sistem EFI:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -343,12 +310,12 @@ Pemasangan akan ditutup dan semua perubahan akan hilang.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>Pemasang %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Tampilkan informasi debug</translation>
</message>
@@ -409,17 +376,17 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
<translation>Setelah:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<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="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>Lokasi Boot loader:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<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>
@@ -430,83 +397,83 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Saat ini:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<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="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>Partisi sistem EFI:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source>
<translation><strong>Pasang berdampingan dengan</strong><br/>Pemasang akan mengiris sebuah partisi untuk memberi ruang bagi %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -894,7 +861,7 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
<message>
<location filename="../src/modules/dummycpp/DummyCppJob.cpp" line="46"/>
<source>Dummy C++ Job</source>
- <translation type="unfinished"/>
+ <translation>Tugas C++ Kosong</translation>
</message>
</context>
<context>
@@ -1118,12 +1085,12 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Setel model papan ketik ke %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Setel tata letak papan ketik ke %1/%2.</translation>
</message>
@@ -1139,12 +1106,12 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>Setelan lokal sistem</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>Pengaturan system locale berpengaruh pada bahasa dan karakter pada beberapa elemen antarmuka Command Line. <br/>Pengaturan saat ini adalah <strong>%1</strong>.</translation>
</message>
@@ -1230,40 +1197,38 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation>Bahasa sistem akan disetel ke %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Nomor dan tanggal lokal akan disetel ke %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Wilayah:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Zona:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>&Ubah...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Setel zona waktu ke %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation>%1 (%2)</translation>
@@ -1334,17 +1299,17 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation>Nama</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation>Deskripsi</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation>Pemasangan Jaringan. (Dinonfungsikan: Tak mampu menarik daftar paket, periksa sambungan jaringanmu)</translation>
</message>
@@ -1787,55 +1752,60 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>Mengumpulkan informasi sistem...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation>memiliki paling sedikit %1 GB ruang drive tersedia</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation>Ruang drive tidak cukup. Butuh minial %1 GB.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>memiliki paling sedikit %1 GB memori bekerja</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>terhubung dengan sumber listrik</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>Sistem tidak terhubung dengan sumber listrik.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>terkoneksi dengan internet</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>Sistem tidak terkoneksi dengan internet.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>Pemasang tidak dijalankan dengan kewenangan administrator.</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2071,42 +2041,42 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Setel sandi untuk pengguna %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>Mengatur sandi untuk pengguna %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>Jalur lokasi sistem tujuan buruk.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>rootMountPoint adalah %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation>Tak bisa menonfungsikan akun root.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation>passwd terhenti dengan kode galat %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>Tidak dapat menyetel sandi untuk pengguna %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>usermod dihentikan dengan kode kesalahan %1.</translation>
</message>
@@ -2240,22 +2210,27 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
<translation>&Tentang</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>Selamat datang di pemasang %1.</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>Tentang pemasang %1</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation><h1>%1</h1><br/><strong>%2<br/>untuk %3</strong><br/><br/>Hak Cipta 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Terimakasih kepada: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg dan <a href="https://www.transifex.com/calamares/calamares/">regu penerjemah Calamares</a>.<br/><br/>Pengembangan <a href="http://calamares.io/">Calamares</a> disponsori oleh <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>Dukungan %1</translation>
</message>
diff --git a/lang/calamares_is.ts b/lang/calamares_is.ts
index 77a8067327a10467b87e7c225a99508e38eb657b..74cc35b3604eb14491a5b26ac719ef9f287e46ed 100644
--- a/lang/calamares_is.ts
+++ b/lang/calamares_is.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="is" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Veldu disksneið sem þú vilt minnka:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Úthlutaðu diskplássi með því að draga til aðgreininn hér fyrir neðan:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <source>The EFI system partition at %1 will be used for starting %2.</source>
- <translation>EFI kerfis stýring á %1 mun vera notuð til að byrja %2.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>EFI kerfisdisksneið:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -70,7 +37,7 @@
<message>
<location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="111"/>
<source>Do not install a boot loader</source>
- <translation>Setja ekki upp ræsistjórann</translation>
+ <translation>Ekki setja upp ræsistjóra</translation>
</message>
<message>
<location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="125"/>
@@ -88,7 +55,7 @@
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="24"/>
<source>GlobalStorage</source>
- <translation>Alsherja geymsla</translation>
+ <translation>VíðværGeymsla</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="34"/>
@@ -103,18 +70,18 @@
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="57"/>
<source>Type:</source>
- <translation type="unfinished"/>
+ <translation>Tegund:</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="64"/>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="78"/>
<source>none</source>
- <translation type="unfinished"/>
+ <translation>ekkert</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="71"/>
<source>Interface:</source>
- <translation type="unfinished"/>
+ <translation>Viðmót:</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="93"/>
@@ -158,26 +125,26 @@
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="89"/>
<source>External command crashed</source>
- <translation>Ytri stjórn hrundi</translation>
+ <translation>Ytri skipun hrundi</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="90"/>
<source>Command %1 crashed.
Output:
%2</source>
- <translation>Stjórn %1 hrundi.
-Framleiðsla:
+ <translation>Skipun %1 hrundi.
+Frálag:
%2</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="95"/>
<source>External command failed to start</source>
- <translation>Ytri stjórn mistókst að byrja</translation>
+ <translation>Ytri skipun ræstist ekki</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="96"/>
<source>Command %1 failed to start.</source>
- <translation>Skipun %1 mistókst að byrja.</translation>
+ <translation>Skipun %1 ræstist ekki.</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="100"/>
@@ -192,29 +159,29 @@ Framleiðsla:
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="104"/>
<source>External command failed to finish</source>
- <translation>Ytri stjórn mistókst að ljúka</translation>
+ <translation>Ytri skipun lauk ekki</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="105"/>
<source>Command %1 failed to finish in %2s.
Output:
%3</source>
- <translation>Stjórn %1 mistókst að klára í %2
-Framleiðsla:
+ <translation>Skipun %1 lauk ekki í %2
+Frálag:
%3</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="111"/>
<source>External command finished with errors</source>
- <translation>Ytri stjórn skipun kláruð með villum</translation>
+ <translation>Ytri skipun kláruð með villum</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="112"/>
<source>Command %1 finished with exit code %2.
Output:
%3</source>
- <translation>Stjórn %1 kláruð með hætti kóða %2.
-Framleiðsla:
+ <translation>Skipun %1 lauk með lokakóða %2
+Frálag:
%3</translation>
</message>
</context>
@@ -233,7 +200,7 @@ Framleiðsla:
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="264"/>
<source>Working directory %1 for python job %2 is not readable.</source>
- <translation>Vinnslu mappa %1 fyrir python vinnslu %2 er ekki lesanleg.</translation>
+ <translation>Vinnslumappa %1 fyrir python-verkið %2 er ekki lesanleg.</translation>
</message>
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="274"/>
@@ -243,12 +210,12 @@ Framleiðsla:
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="275"/>
<source>Main script file %1 for python job %2 is not readable.</source>
- <translation>Aðal-skriftuskrá %1 fyrir python verkið %2 er ekki lesanleg.</translation>
+ <translation>Aðal-skriftuskrá %1 fyrir python-verkið %2 er ekki lesanleg.</translation>
</message>
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="320"/>
<source>Boost.Python error in job "%1".</source>
- <translation>Boost.Python villa í vinnslu "%1".</translation>
+ <translation>Boost.Python villa í verkinu "%1".</translation>
</message>
</context>
<context>
@@ -278,8 +245,8 @@ Framleiðsla:
<location filename="../src/libcalamaresui/ViewManager.cpp" line="91"/>
<source>Do you really want to cancel the current install process?
The installer will quit and all changes will be lost.</source>
- <translation>Viltu virkilega að hætta við að setja upp ferli?
-Uppsetning mun hætta og allar breytingar tapast.</translation>
+ <translation>Viltu virkilega að hætta við núverandi uppsetningarferli?
+Uppsetningarforritið mun hætta og allar breytingar tapast.</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="224"/>
@@ -289,7 +256,7 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="225"/>
<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>%1 Uppsetningin er um að gera breytingar á diskinum til að setja upp %2.<br/><strong>Þú munt ekki vera fær um að losa þessar breytingar.</strong></translation>
+ <translation>%1 uppsetningarforritið er um það bil að gera breytingar á diskinum til að setja upp %2.<br/><strong>Þú munt ekki geta afturkallað þessar breytingar.</strong></translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="232"/>
@@ -322,7 +289,7 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<message>
<location filename="../src/libcalamares/PythonHelper.cpp" line="263"/>
<source>Unknown exception type</source>
- <translation>Óþekkt undantekning gerð</translation>
+ <translation>Óþekkt tegund fráviks</translation>
</message>
<message>
<location filename="../src/libcalamares/PythonHelper.cpp" line="276"/>
@@ -337,18 +304,18 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<message>
<location filename="../src/libcalamares/PythonHelper.cpp" line="296"/>
<source>Unfetchable Python error.</source>
- <translation>Ónáanleg Python villa.</translation>
+ <translation>Ósækjanleg Python villa.</translation>
</message>
</context>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1 uppsetningarforrit</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Birta villuleitarupplýsingar</translation>
</message>
@@ -363,7 +330,7 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<message>
<location filename="../src/modules/partition/jobs/CheckFileSystemJob.cpp" line="77"/>
<source>The file system check on partition %1 failed.</source>
- <translation>Skráakerfis athugun á skiptingu %1 mistókst.</translation>
+ <translation>Prófun skráakerfis á disksneið %1 mistókst.</translation>
</message>
</context>
<context>
@@ -407,19 +374,19 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<translation>Eftir:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
- <translation><strong>Leiðarvísir skiptingu</strong><br/>Þú getur búið til eða breytt stærð skiptingu sjálf(ur).</translation>
+ <translation><strong>Handvirk disksneiðing</strong><br/>Þú getur búið til eða breytt stærð disksneiða sjálf(ur).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>Staðsetning ræsistjóra</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
- <translation>%1 verður minnkað í %2MB og nýtt %3MB skipting verður búin til %4.</translation>
+ <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="125"/>
@@ -428,83 +395,83 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Núverandi:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<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="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source>
- <translation><strong>Veldu hvaða skipting að skreppa saman, svo draga að neðsta bar til að endurstækka</strong></translation>
+ <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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<source><strong>Select a partition to install on</strong></source>
- <translation><strong>Veldu disksnið til að setja upp á </strong></translation>
+ <translation><strong>Veldu disksneið til að setja upp á </strong></translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>EFI kerfisdisksneið:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<source><strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.</source>
- <translation><strong>Setja upp með</strong><br/>Uppsetningin mun minnka disksnið til að búa til pláss fyrir %1.</translation>
+ <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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source>
- <translation><strong>leysa af hólmi</strong><br/>Kemur í stað skiptingu með %1.</translation>
+ <translation><strong>Skipta út disksneið</strong><br/>Skiptir disksneið út með %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -628,7 +595,7 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="48"/>
<source>Create new %2MB partition on %4 (%3) with file system %1.</source>
- <translation>Búa til nýtt %2MB skiptingu á %4 (%3) með skrár kerfi %1.</translation>
+ <translation>Búa til nýja %2MB disksneið á %4 (%3) með %1 skráakerfi.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="59"/>
@@ -643,7 +610,7 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="83"/>
<source>The installer failed to create partition on disk '%1'.</source>
- <translation>Uppsetningin mistósk að búa til disksnið á disk '%1'.</translation>
+ <translation>Uppsetningarforritinu mistókst að búa til disksneið á diski '%1'.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="92"/>
@@ -658,12 +625,12 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="126"/>
<source>The installer failed to create file system on partition %1.</source>
- <translation type="unfinished"/>
+ <translation>Uppsetningarforritinu mistókst að búa til skráakerfi á disksneið %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="134"/>
<source>The installer failed to update partition table on disk '%1'.</source>
- <translation>Uppsetningin mistósk að uppfæra disksniðstöflu á disk '%1'.</translation>
+ <translation>Uppsetningarforritinu mistókst að uppfæra disksneið á diski '%1'.</translation>
</message>
</context>
<context>
@@ -676,7 +643,7 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="39"/>
<source>Creating a new partition table will delete all existing data on the disk.</source>
- <translation>Búa til nýja disksniðtöflu mun eyða öllum gögnum á harðadiskinum.</translation>
+ <translation>Gerð nýrrar disksneiðatöflu mun eyða öllum gögnum á diskinum.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="65"/>
@@ -704,7 +671,7 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="56"/>
<source>Create new <strong>%1</strong> partition table on <strong>%2</strong> (%3).</source>
- <translation>Búa til nýja <strong>%1</strong> disksniðstöflu á <strong>%2</strong> (%3).</translation>
+ <translation>Búa til nýja <strong>%1</strong> disksneiðatöflu á <strong>%2</strong> (%3).</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="66"/>
@@ -714,7 +681,7 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="76"/>
<source>The installer failed to create a partition table on %1.</source>
- <translation>Uppsetning mistóskt að búa til disksneiðstöflu á %1.</translation>
+ <translation>Uppsetningarforritinu mistókst að búa til disksneiðatöflu á diski '%1'.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="84"/>
@@ -777,7 +744,7 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="174"/>
<source>usermod terminated with error code %1.</source>
- <translation type="unfinished"/>
+ <translation>usermod endaði með villu kóðann %1.</translation>
</message>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="184"/>
@@ -810,12 +777,12 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<message>
<location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="67"/>
<source>The installer failed to delete partition %1.</source>
- <translation>Uppsetningin mistókst að eyða disksnið %1.</translation>
+ <translation>Uppsetningarforritinu mistókst að eyða disksneið %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="73"/>
<source>Partition (%1) and device (%2) do not match.</source>
- <translation>Skipting (%1) og tæki (%2) passa ekki saman.</translation>
+ <translation>Disksneið (%1) og tæki (%2) passa ekki saman.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="85"/>
@@ -874,7 +841,7 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<message>
<location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="131"/>
<source>Write LUKS configuration for Dracut to %1</source>
- <translation type="unfinished"/>
+ <translation>Skrifa LUKS stillingar fyrir Dracut til %1</translation>
</message>
<message>
<location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="133"/>
@@ -892,7 +859,7 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<message>
<location filename="../src/modules/dummycpp/DummyCppJob.cpp" line="46"/>
<source>Dummy C++ Job</source>
- <translation type="unfinished"/>
+ <translation>Dummy C++ Job</translation>
</message>
</context>
<context>
@@ -945,7 +912,7 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="306"/>
<source>Mountpoint already in use. Please select another one.</source>
- <translation type="unfinished"/>
+ <translation>Tengipunktur er þegar í notkun. Veldu einhvern annan.</translation>
</message>
</context>
<context>
@@ -973,7 +940,7 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<message>
<location filename="../src/modules/partition/gui/EncryptWidget.cpp" line="150"/>
<source>Please enter the same passphrase in both boxes.</source>
- <translation type="unfinished"/>
+ <translation>Vinsamlegast sláðu inn sama lykilorðið í báða kassana.</translation>
</message>
</context>
<context>
@@ -1060,7 +1027,7 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="83"/>
<source>The installer failed to format partition %1 on disk '%2'.</source>
- <translation type="unfinished"/>
+ <translation>Uppsetningarforritinu mistókst að forsníða disksneið %1 á diski '%2'.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="91"/>
@@ -1075,12 +1042,12 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="124"/>
<source>The installer failed to create file system on partition %1.</source>
- <translation type="unfinished"/>
+ <translation>Uppsetningarforritinu mistókst að búa til skráakerfi á disksneið %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="133"/>
<source>The installer failed to update partition table on disk '%1'.</source>
- <translation>Uppsetningin mistósk að uppfæra disksniðstöflu á disk '%1'.</translation>
+ <translation>Uppsetningarforritinu mistókst að uppfæra disksneiðatöflu á diski '%1'.</translation>
</message>
</context>
<context>
@@ -1116,12 +1083,12 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
@@ -1137,12 +1104,12 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>Staðfærsla kerfisins stilling</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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"/>
</message>
@@ -1228,40 +1195,38 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation>Tungumál kerfisins verður sett sem %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Hérað:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Svæði:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>&Breyta...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Setja tímabelti sem %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation>%1 (%2)</translation>
@@ -1332,17 +1297,17 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
- <translation type="unfinished"/>
+ <translation>Heiti</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
- <translation type="unfinished"/>
+ <translation>Lýsing</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1542,7 +1507,7 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="87"/>
<source>New Partition &Table</source>
- <translation>Ný Skipting &Tafla</translation>
+ <translation>Ný disksneiðatafla</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="107"/>
@@ -1595,12 +1560,12 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
<source><strong>Replace</strong> a partition with %1.</source>
- <translation><strong>Skipta</strong> skiptingu með %1.</translation>
+ <translation><strong>Skipta út</strong> disksneið með %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="173"/>
<source><strong>Manual</strong> partitioning.</source>
- <translation><strong>Handvirkt</strong> skipting.</translation>
+ <translation><strong>Handvirk</strong> disksneiðaskipting.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="186"/>
@@ -1615,12 +1580,12 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="200"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
- <translation><strong>Skipta</strong> skiptingu á disk <strong>%2</strong> (%3) með %1.</translation>
+ <translation><strong>Skipta út</strong> disksneið á diski <strong>%2</strong> (%3) með %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="207"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
- <translation><strong>Handvikt</strong> skipting á disk <strong>%1</strong> (%2).</translation>
+ <translation><strong>Handvirk</strong> disksneiðaskipting á diski <strong>%1</strong> (%2).</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="215"/>
@@ -1640,7 +1605,7 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="405"/>
<source>No EFI system partition configured</source>
- <translation type="unfinished"/>
+ <translation>Ekkert EFI kerfisdisksneið stillt</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
@@ -1717,12 +1682,12 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
- <translation>Veldu hvar á að setja upp %1.<br/><font color="red">Aðvörun: </font>þetta mun eyða öllum skrám á valinn skiptingu.</translation>
+ <translation>Veldu hvar á að setja upp %1.<br/><font color="red">Aðvörun: </font>þetta mun eyða öllum skrám á valinni disksneið.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
- <translation type="unfinished"/>
+ <translation>Valið atriði virðist ekki vera gild disksneið.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
@@ -1785,54 +1750,59 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>Söfnun kerfis upplýsingar...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation>hefur að minnsta kosti %1 GB laus á harðadisk</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>hefur að minnsta kosti %1 GB vinnsluminni</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>er í sambandi við aflgjafa</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>Kerfið er ekki í sambandi við aflgjafa.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>er tengd við Internetið</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>Kerfið er ekki tengd við internetið.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
- <translation>Uppsetningin er ekki keyrandi með kerfisstjórnar réttindi.</translation>
+ <translation>Uppsetningarforritið er ekki keyrandi með kerfisstjóraheimildum.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1858,23 +1828,23 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="187"/>
<source>Resize partition %1.</source>
- <translation>Breyti stærð skiptingu %1.</translation>
+ <translation>Breyti stærð disksneiðar %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="194"/>
<source>Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>.</source>
- <translation>Breyta stærð <strong>%2MB</strong> skipting <strong>%1</strong> til <strong>%3MB</strong>.</translation>
+ <translation>Breyta stærð <strong>%2MB</strong> disksneiðar <strong>%1</strong> í <strong>%3MB</strong>.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="205"/>
<source>Resizing %2MB partition %1 to %3MB.</source>
- <translation>Breyti stærð %2MB skiptingu %1 til %3MB.</translation>
+ <translation>Breyti stærð %2MB disksneiðar %1 í %3MB.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="232"/>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="298"/>
<source>The installer failed to resize partition %1 on disk '%2'.</source>
- <translation type="unfinished"/>
+ <translation>Uppsetningarforritinu mistókst að breyta stærð disksneiðar %1 á diski '%2'.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="237"/>
@@ -1905,12 +1875,12 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<message>
<location filename="../src/modules/users/SetHostNameJob.cpp" line="44"/>
<source>Set hostname <strong>%1</strong>.</source>
- <translation type="unfinished"/>
+ <translation>Setja vélarheiti <strong>%1</strong>.</translation>
</message>
<message>
<location filename="../src/modules/users/SetHostNameJob.cpp" line="51"/>
<source>Setting hostname %1.</source>
- <translation type="unfinished"/>
+ <translation>Stilla vélarheiti %1.</translation>
</message>
<message>
<location filename="../src/modules/users/SetHostNameJob.cpp" line="61"/>
@@ -2035,7 +2005,7 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="140"/>
<source>The installer failed to set flags on partition %1.</source>
- <translation type="unfinished"/>
+ <translation>Uppsetningarforritinu mistókst að setja flögg á disksneið %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="148"/>
@@ -2069,44 +2039,44 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Gerðu lykilorð fyrir notanda %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>Geri lykilorð fyrir notanda %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
- <translation type="unfinished"/>
+ <translation>Ekki er hægt að aftengja kerfisstjóra reikning.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>Get ekki sett lykilorð fyrir notanda %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
- <translation type="unfinished"/>
+ <translation>usermod endaði með villu kóðann %1.</translation>
</message>
</context>
<context>
@@ -2238,22 +2208,27 @@ Uppsetning mun hætta og allar breytingar tapast.</translation>
<translation>&Um</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
- <translation><h1>Velkomin(n) til %1 uppsetningu.</h1></translation>
+ <translation><h1>Velkomin í %1 uppsetningarforritið.</h1></translation>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>Um %1 uppsetningarforrrit</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
- <translation type="unfinished"/>
+ <translation><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Þakkir til: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini og Rohan Garg.<a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating hugbúnað.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>%1 stuðningur</translation>
</message>
diff --git a/lang/calamares_it_IT.ts b/lang/calamares_it_IT.ts
index 6db51df16cccc246c94a7252a37598aa6332ce72..1b991920d7a1280112d62cb05aaf21f635f504ab 100644
--- a/lang/calamares_it_IT.ts
+++ b/lang/calamares_it_IT.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="it_IT" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Scegliere la partizione da ridurre:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Assegnare spazio su disco trascinando il separatore sottostante:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>Con questa operazione, la partizione <strong>%1</strong> che contiene %4 verrà ridotta a %2MB e verrà creata una nuova partizione su %5 da %3MB.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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 è stato possibile trovare alcuna partizione EFI su questo sistema. Torna indietro e usa il partizionamento manuale per configurarla %1.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="208"/>
- <source>The EFI system partition at %1 will be used for starting %2.</source>
- <translation>La partizione EFI a %1 verrà usata per avviare %2.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>Partizione EFI di sistema:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -343,12 +310,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1 Programma di installazione</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Mostra le informazioni di debug</translation>
</message>
@@ -407,17 +374,17 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno
<translation>Dopo:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<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="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>Posizionamento del boot loader:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<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>
@@ -428,83 +395,83 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Corrente:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<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="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>Partizione EFI di sistema:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1116,12 +1083,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Impostare il modello di tastiera a %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Impostare il layout della tastiera a %1%2.</translation>
</message>
@@ -1137,12 +1104,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>Impostazioni di localizzazione del sistema</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>Le impostazioni di localizzazione del sistema influenzano la lingua e il set di caratteri per alcuni elementi di interfaccia da linea di comando. <br/>L'impostazione attuale è <strong>%1</strong>.</translation>
</message>
@@ -1228,40 +1195,38 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation>La lingua di sistema sarà impostata a %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>I numeri e le date locali saranno impostati a %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Area:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Zona:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>&Cambia...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Imposta il fuso orario a %1%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation>%1 (%2)</translation>
@@ -1332,17 +1297,17 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
- <translation type="unfinished"/>
+ <translation>Nome</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
- <translation type="unfinished"/>
+ <translation>Descrizione</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation>Installazione di rete. (Disabilitata: impossibile recuperare le liste dei pacchetti, controllare la connessione di rete)</translation>
</message>
@@ -1383,7 +1348,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="36"/>
<source>What is your name?</source>
- <translation>Qual'è il nome?</translation>
+ <translation>Qual è il tuo nome?</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="117"/>
@@ -1785,55 +1750,60 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>Raccolta delle informazioni di sistema...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation>ha almeno %1 GB di spazio disponibile</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>ha almeno %1 GB di memoria </translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>è collegato a una presa di alimentazione</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>Il sistema non è collegato a una presa di alimentazione.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>è connesso a Internet</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>Il sistema non è connesso a internet.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>Il programma di installazione non è stato avviato con i diritti di amministrazione.</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2058,53 +2028,53 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno
<message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="144"/>
<source>Update geometry of partition %1.</source>
- <translation>Aggiornare la geometria della partizione %1.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="156"/>
<source>Failed to change the geometry of the partition.</source>
- <translation>Impossibile modificare la geometria della partizione.</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Impostare la password per l'utente %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>Impostare la password per l'utente %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>Percorso di destinazione del sistema errato.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>punto di mount per root è %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation>Impossibile disabilitare l'account di root.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation>passwd è terminato con codice di errore %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>Impossibile impostare la password per l'utente %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>usermod si è chiuso con codice di errore %1.</translation>
</message>
@@ -2134,7 +2104,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno
<message>
<location filename="../src/modules/locale/SetTimezoneJob.cpp" line="87"/>
<source>Link creation failed, target: %1; link name: %2</source>
- <translation>Creazione del collegamento non riuscita, destinazione: %1; nome collegamento: %2</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/modules/locale/SetTimezoneJob.cpp" line="96"/>
@@ -2238,22 +2208,27 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno
<translation>&Informazioni su</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>Benvenuto nel programma d'installazione di %1.</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>Informazioni sul programma di installazione %1</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
- <translation type="unfinished"/>
+ <translation><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Grazie a: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg e ai <a href="https://www.transifex.com/calamares/calamares/">traduttori di Calamares</a>.<br/><br/>Lo sviluppo di <a href="http://calamares.io/">Calamares</a> è sponsorizzato da <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>supporto %1</translation>
</message>
diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts
index 323f993b32bf31e7b4fb3b47a8e01a2b867040ba..1ea936c90f0ffaa9ce1e04a7a22da3a6c86cc0b8 100644
--- a/lang/calamares_ja.ts
+++ b/lang/calamares_ja.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="ja" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>縮小するパーティションを選択してください:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>下の仕切りをドラッグして、ドライブの空き容量を割り当ててください:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>この操作によって、%4 を含むパーティション <strong>%1</strong>が %2MB に縮小し、%5 のための新しい %3MBのパーティションが作成されます。</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>EFI システムパーティション:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -70,7 +37,7 @@
<message>
<location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="111"/>
<source>Do not install a boot loader</source>
- <translation>ブートローダーをインストールしない</translation>
+ <translation>ブートローダーをインストールしません</translation>
</message>
<message>
<location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="125"/>
@@ -158,7 +125,7 @@
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="89"/>
<source>External command crashed</source>
- <translation>外部コマンドがクラッシュしました</translation>
+ <translation>外部コマンドのクラッシュ</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="90"/>
@@ -213,7 +180,7 @@ Output:
<source>Command %1 finished with exit code %2.
Output:
%3</source>
- <translation>コマンド %1 がコード %2 によって終了しました
+ <translation>コマンド %1 がコード %2 によって終了
出力:
%3</translation>
</message>
@@ -228,7 +195,7 @@ Output:
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="263"/>
<source>Bad working directory path</source>
- <translation>作業ディレクトリパスが不正です</translation>
+ <translation>不正なワーキングディレクトリパス</translation>
</message>
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="264"/>
@@ -256,23 +223,23 @@ Output:
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="65"/>
<source>&Back</source>
- <translation>戻る (&B)</translation>
+ <translation>戻る（&B）</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="66"/>
<source>&Next</source>
- <translation>次へ (&N)</translation>
+ <translation>次へ（&N）</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="67"/>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="295"/>
<source>&Cancel</source>
- <translation>中止 (&C)</translation>
+ <translation>中止（&C）</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="90"/>
<source>Cancel installation?</source>
- <translation>インストールを中止しますか？</translation>
+ <translation>インストールを中止しますか?</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="91"/>
@@ -284,7 +251,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="224"/>
<source>Continue with setup?</source>
- <translation>セットアップを続行しますか？</translation>
+ <translation>セットアップを続行しますか?</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="225"/>
@@ -294,17 +261,17 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="232"/>
<source>&Install now</source>
- <translation>今すぐインストール (&I)</translation>
+ <translation>今すぐインストール（&I）</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="233"/>
<source>Go &back</source>
- <translation>戻る (&B)</translation>
+ <translation>戻る（&B）</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="264"/>
<source>&Quit</source>
- <translation>終了 (&Q)</translation>
+ <translation>終了（&Q）</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="170"/>
@@ -322,12 +289,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/libcalamares/PythonHelper.cpp" line="263"/>
<source>Unknown exception type</source>
- <translation>不明な例外タイプ</translation>
+ <translation>不明な例外型</translation>
</message>
<message>
<location filename="../src/libcalamares/PythonHelper.cpp" line="276"/>
<source>unparseable Python error</source>
- <translation>解析不能な Python エラー</translation>
+ <translation>解析不能なPythonエラー</translation>
</message>
<message>
<location filename="../src/libcalamares/PythonHelper.cpp" line="292"/>
@@ -337,18 +304,18 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/libcalamares/PythonHelper.cpp" line="296"/>
<source>Unfetchable Python error.</source>
- <translation>取得不能な Python エラー。</translation>
+ <translation>取得不能なPythonエラー。</translation>
</message>
</context>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1 インストーラー</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>デバッグ情報を表示</translation>
</message>
@@ -376,7 +343,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="113"/>
<source>This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.</source>
- <translation>このコンピュータは %1 をインストールするための推奨条件をいくつか満たしていません。<br/>インストールは続行しますが、一部の機能が無効になる場合があります。</translation>
+ <translation>このコンピュータは、 %1 をインストールするための推奨条件をいくつか満たしていません。<br/>インストールは続行しますが、一部の機能が無効になる場合があります。</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="142"/>
@@ -386,7 +353,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="166"/>
<source>For best results, please ensure that this computer:</source>
- <translation>良好な結果を得るために、このコンピュータについて以下の項目を確認してください:</translation>
+ <translation>良好な結果を得るために、このコンピュータについて以下の項目を確認してください：</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="194"/>
@@ -407,104 +374,104 @@ The installer will quit and all changes will be lost.</source>
<translation>後:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation><strong>手動パーティション</strong><br/>パーティションの作成、あるいはサイズ変更を行うことができます。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>ブートローダーの場所:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<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="125"/>
<source>Select storage de&vice:</source>
- <translation>ストレージデバイスを選択(&V):</translation>
+ <translation>ストレージデバイスを選択（&V）:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>現在:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation>%1 を %2 のホームパーティションとして再利用する</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<source><strong>Select a partition to shrink, then drag the bottom bar to resize</strong></source>
- <translation><strong>縮小するパーティションを選択し、その下にあるバーをドラッグしてサイズを変更して下さい</strong></translation>
+ <translation><strong>縮小するパーティションを選択し、下のバーをドラッグしてサイズを変更して下さい</strong></translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>EFI システムパーティション:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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>
+ <translation><strong>ディスクの消去</strong><br/>選択したストレージデバイス上のデータがすべて <font color="red">削除</font>されます。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<source><strong>Replace a partition</strong><br/>Replaces a partition with %1.</source>
- <translation><strong>パーティションの置換</strong><br/>パーティション %1 に置き換えます。</translation>
+ <translation><strong>パーティションの置換</strong><br/>パーティションを %1 に置き換えます。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -560,17 +527,17 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="55"/>
<source>Partition &Type:</source>
- <translation>パーティションの種類 (&T) :</translation>
+ <translation>パーティションの種類（&T）:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="67"/>
<source>&Primary</source>
- <translation>プライマリ (&P)</translation>
+ <translation>プライマリ（&P）</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="77"/>
<source>E&xtended</source>
- <translation>拡張 (&X)</translation>
+ <translation>拡張（&x）</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="119"/>
@@ -585,12 +552,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="151"/>
<source>&Mount Point:</source>
- <translation>マウントポイント (&M)</translation>
+ <translation>マウントポイント（&M）</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="38"/>
<source>Si&ze:</source>
- <translation>サイズ (&Z)</translation>
+ <translation>サイズ（&Z）</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="48"/>
@@ -628,7 +595,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="48"/>
<source>Create new %2MB partition on %4 (%3) with file system %1.</source>
- <translation>ファイルシステム %1 で %4 (%3) 上に新しく %2MB のパーティションを作成</translation>
+ <translation>ファイルシステム %1 で %4 (%3) 上に新しく%2 MBのパーティションを作成</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="59"/>
@@ -691,7 +658,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="82"/>
<source>GUID Partition Table (GPT)</source>
- <translation>GUID パーティションテーブル (GPT)</translation>
+ <translation>GUID パーティションテーブル(GPT)</translation>
</message>
</context>
<context>
@@ -742,17 +709,17 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="80"/>
<source>Sudoers dir is not writable.</source>
- <translation>sudoers ディレクトリに書き込みできません。</translation>
+ <translation>sudoers ディレクトリは書き込み可能ではありません。</translation>
</message>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="84"/>
<source>Cannot create sudoers file for writing.</source>
- <translation>sudoers ファイルを作成できません。</translation>
+ <translation>sudoersファイルを作成できません。</translation>
</message>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="92"/>
<source>Cannot chmod sudoers file.</source>
- <translation>sudoers のファイル権限を変更できません。</translation>
+ <translation>sudoersファイルの権限を変更できません。</translation>
</message>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="98"/>
@@ -767,7 +734,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="162"/>
<source>useradd terminated with error code %1.</source>
- <translation>エラーコード %1 により useradd を中止しました。</translation>
+ <translation>エラーコード %1 によりuseraddを中止しました。</translation>
</message>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="171"/>
@@ -787,7 +754,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="186"/>
<source>chown terminated with error code %1.</source>
- <translation>エラーコード %1 により chown は中止しました。</translation>
+ <translation>エラーコード %1 によりchown は中止しました。</translation>
</message>
</context>
<context>
@@ -900,7 +867,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="20"/>
<source>Edit Existing Partition</source>
- <translation>既存のパーティションの編集</translation>
+ <translation>パーティションの編集</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="50"/>
@@ -910,7 +877,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="60"/>
<source>&Keep</source>
- <translation>保持 (&K)</translation>
+ <translation>保持（&K）</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="70"/>
@@ -920,22 +887,22 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="89"/>
<source>Warning: Formatting the partition will erase all existing data.</source>
- <translation>警告: パーティションのフォーマットはすべてのデータを削除します。</translation>
+ <translation>警告: パーティションのフォーマットはすべてのデータを消去します。</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="99"/>
<source>&Mount Point:</source>
- <translation>マウントポイント (&M)</translation>
+ <translation>マウントポイント（&M）</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="119"/>
<source>Si&ze:</source>
- <translation>サイズ (&Z):</translation>
+ <translation>サイズ（&Z）:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="132"/>
<source>Fi&le System:</source>
- <translation>ファイルシステム (&L)</translation>
+ <translation>ファイルシステム（&L）</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="145"/>
@@ -996,7 +963,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="160"/>
<source>Install %2 on %3 system partition <strong>%1</strong>.</source>
- <translation>%3 システムパーティション <strong>%1</strong> に %2 をインストール。</translation>
+ <translation>%3 システムパーティション <strong>%1</strong> に%2 をインストール。</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="166"/>
@@ -1024,7 +991,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/finished/FinishedPage.ui" line="77"/>
<source>&Restart now</source>
- <translation>今すぐ再起動 (&R)</translation>
+ <translation>今すぐ再起動（&R）</translation>
</message>
<message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="50"/>
@@ -1050,7 +1017,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="60"/>
<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>
+ <translation><strong>%3MB</strong> パーティション <strong>%1</strong> をファイルシステム<strong>%2</strong>でフォーマット。</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="71"/>
@@ -1075,12 +1042,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="124"/>
<source>The installer failed to create file system on partition %1.</source>
- <translation>インストーラーは %1 パーティションのシステム作成に失敗しました。</translation>
+ <translation>インストラーは %1 パーティションにシステムを作成することに失敗しました。</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="133"/>
<source>The installer failed to update partition table on disk '%1'.</source>
- <translation>インストーラーはディスク '%1' 上にあるパーティションテーブルの更新に失敗しました。</translation>
+ <translation>インストーラーはディスク '%1' 上のパーティションテーブルのアップデートに失敗しました。</translation>
</message>
</context>
<context>
@@ -1090,14 +1057,14 @@ The installer will quit and all changes will be lost.</source>
<location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="84"/>
<location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="96"/>
<source>Konsole not installed</source>
- <translation>konsole がインストールされていません</translation>
+ <translation>Konsoleがインストールされていません</translation>
</message>
<message>
<location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="70"/>
<location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="85"/>
<location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="97"/>
<source>Please install the kde konsole and try again!</source>
- <translation>kde konsoleをインストールして、再度行ってください！</translation>
+ <translation>kde konsoleをインストールして、再度試してください!</translation>
</message>
<message>
<location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="122"/>
@@ -1116,12 +1083,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>キーボードのモデルを %1 に設定。<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>キーボードのレイアウトを %1/%2 に設定。</translation>
</message>
@@ -1137,12 +1104,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
- <translation>システムロケールの設定</translation>
+ <translation>システムのロケールの設定</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>システムロケールの設定はコマンドラインやインターフェース上での言語や文字の表示に影響をおよぼします。<br/>現在の設定 <strong>%1</strong>.</translation>
</message>
@@ -1228,40 +1195,38 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation>システムの言語が %1 に設定されます。</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>数字と日付のロケールが %1 に設定されます。</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>地域:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>ゾーン:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
- <translation>変更 (&C)...</translation>
+ <translation>変更（&C）...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>タイムゾーンを %1/%2 に設定。<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation>%1 (%2)</translation>
@@ -1300,7 +1265,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/MoveFileSystemJob.cpp" line="95"/>
<source>Moving of partition %1 failed, changes have been rolled back.</source>
- <translation>パーティション %1 の移動に失敗しました。変更内容は戻されます。</translation>
+ <translation>パーティション %1 の移動に失敗しました。変更は取り消されます。</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/MoveFileSystemJob.cpp" line="101"/>
@@ -1332,17 +1297,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation>名前</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation>説明</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation>ネットワークインストール。(無効: パッケージリストを取得できません。ネットワーク接続を確認してください。)</translation>
</message>
@@ -1388,7 +1353,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="117"/>
<source>What name do you want to use to log in?</source>
- <translation>ログインではどの名前を使用しますか?</translation>
+ <translation>ログインの際、どの名前を使用しますか?</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="197"/>
@@ -1396,12 +1361,12 @@ The installer will quit and all changes will be lost.</source>
<location filename="../src/modules/users/page_usersetup.ui" line="437"/>
<location filename="../src/modules/users/page_usersetup.ui" line="582"/>
<source>font-weight: normal</source>
- <translation>font-weight: normal</translation>
+ <translation>フォントウェイト: normal</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="200"/>
<source><small>If more than one person will use this computer, you can set up multiple accounts after installation.</small></source>
- <translation><small>複数人がこのコンピュータを使用する場合、インストール後に複数のアカウントを設定することができます。</small></translation>
+ <translation><small>もし複数の人間がこのコンピュータを使用する場合、インストールの後で複数のアカウントのセットアップを行うことができます。</small></translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="335"/>
@@ -1411,7 +1376,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="440"/>
<source><small>Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.</small></source>
- <translation><small>入力ミスを確認することができるよう、同じパスワードを 2 回入力します。良いパスワードにするためには 8文字以上にする必要があり、英文・数字・句読点を組み合わせたものにします。パスワードは定期的に変更してください。</small></translation>
+ <translation>確認のため、同じパスワードを二回入力して下さい。最低8字で、文字・数値・句読点を含めれば、強いパスワードになります。また、パスワードを定期的に変更することを変更してください。</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="226"/>
@@ -1421,22 +1386,22 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="309"/>
<source><small>This name will be used if you make the computer visible to others on a network.</small></source>
- <translation><small>ネットワーク上から他の人よりコンピュータが見えるようにする場合、この名前が使用されます。</small></translation>
+ <translation><small>ネットワーク上からコンピュータが見えるようにする場合、この名前が使用されます。</small></translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="450"/>
<source>Log in automatically without asking for the password.</source>
- <translation>パスワードの入力を求めず自動的にログインする</translation>
+ <translation>パスワードを尋ねずに自動的にログインする。</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="457"/>
<source>Use the same password for the administrator account.</source>
- <translation>管理者アカウントに同じパスワードを使用する</translation>
+ <translation>管理者アカウントと同じパスワードを使用する。</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="480"/>
<source>Choose a password for the administrator account.</source>
- <translation>管理者アカウントのパスワードを選択する</translation>
+ <translation>管理者アカウントのパスワードを選択する。</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="585"/>
@@ -1532,8 +1497,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="22"/>
<source>Storage de&vice:</source>
- <translation>
-ストレージデバイス (&V):</translation>
+ <translation>ストレージデバイス （&V）:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="51"/>
@@ -1543,27 +1507,27 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="87"/>
<source>New Partition &Table</source>
- <translation>新しいパーティションテーブル (&T)</translation>
+ <translation>新しいパーティションテーブル（&T）</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="107"/>
<source>&Create</source>
- <translation>作成 (&C)</translation>
+ <translation>作成（&C）</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="114"/>
<source>&Edit</source>
- <translation>編集 (&E)</translation>
+ <translation>編集（&E）</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="121"/>
<source>&Delete</source>
- <translation>削除 (&D)</translation>
+ <translation>削除（&D）</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="148"/>
<source>Install boot &loader on:</source>
- <translation>ブートローダーインストール先 (&L):</translation>
+ <translation>ブートローダーインストール先 （&L）:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionPage.cpp" line="160"/>
@@ -1723,22 +1687,22 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
- <translation>選択した項目は有効なパーティションではありません。</translation>
+ <translation>選択した項目は有効なパーティションではないようです。</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
- <translation>%1 は空きスペースにインストールすることはできません。既存のパーティションを選択してください。</translation>
+ <translation>%1 は空き領域にインストールすることはできません。既存のパーティションを選択してください。</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="180"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
- <translation>%1 は拡張パーティションにインストールする事はできません。既存のプライマリまたは論理パーティションを選択してください。</translation>
+ <translation>%1 は拡張パーティションにインストールできません。既存のプライマリまたは論理パーティションを選択してください。</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="191"/>
<source>%1 cannot be installed on this partition.</source>
- <translation>このパーティションには %1 をインストールできません。</translation>
+ <translation>%1 はこのパーティションにインストールできません。</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="198"/>
@@ -1786,72 +1750,77 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>システム情報を取得中...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
- <translation>最低 %1 GB のディスク空き容量があること</translation>
+ <translation>最低 %1 GBのディスク空き領域があること</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
- <translation>十分なドライブ空き容量がありません。少なくとも %1 GB 必要です。</translation>
+ <translation>十分なドライブ容量がありません。少なくとも %1 GB 必要です。</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>最低 %1 GB のワーキングメモリーがあること</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation>システムには十分なワーキングメモリがありません。少なくとも %1 GB 必要です。</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>電源が接続されていること</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>システムに電源が接続されていません。</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>インターネットに接続されていること</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>システムはインターネットに接続されていません。</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>インストーラーは管理者権限で実行されていません。</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
<message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="76"/>
<source>Resize file system on partition %1.</source>
- <translation>パーティション %1 ファイルシステムのサイズ変更</translation>
+ <translation>パーティション %1 でのファイルシステムのリサイズ</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="91"/>
<source>Parted failed to resize filesystem.</source>
- <translation>Parted はファイルシステムのサイズ変更に失敗しました。</translation>
+ <translation>Partedは、ファイルシステムのリサイズに失敗しました。</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="101"/>
<source>Failed to resize filesystem.</source>
- <translation>ファイルシステムのサイズ変更に失敗しました。</translation>
+ <translation>ファイルシステムリサイズに失敗しました。</translation>
</message>
</context>
<context>
@@ -1875,7 +1844,7 @@ The installer will quit and all changes will be lost.</source>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="232"/>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="298"/>
<source>The installer failed to resize partition %1 on disk '%2'.</source>
- <translation>インストーラはディスク '%2' パーティション %1 のサイズ変更に失敗しました。</translation>
+ <translation>インストーラが、ディスク '%2' でのパーティション %1 のリサイズに失敗しました。</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="237"/>
@@ -1923,7 +1892,7 @@ The installer will quit and all changes will be lost.</source>
<location filename="../src/modules/users/SetHostNameJob.cpp" line="75"/>
<location filename="../src/modules/users/SetHostNameJob.cpp" line="86"/>
<source>Cannot write hostname to target system</source>
- <translation>ターゲットシステムにホスト名を書き込めません</translation>
+ <translation>ターゲットとするシステムにホスト名を書き込めません</translation>
</message>
</context>
<context>
@@ -2070,42 +2039,42 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>ユーザ %1 のパスワード設定</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>ユーザ %1 のパスワード設定中。</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>不正なシステムパス。</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>root のマウントポイントは %1 。</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation>rootアカウントを使用することができません。</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation>passwd がエラーコード %1 のため終了しました。</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>ユーザ %1 のパスワードは設定できませんでした。</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>エラーコード %1 によりusermodが停止しました。</translation>
</message>
@@ -2153,7 +2122,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/summary/SummaryPage.cpp" line="46"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
- <translation>これはインストール開始時に行われる事の概要です。</translation>
+ <translation>これはインストールを開始した時に起こることの概要です。</translation>
</message>
</context>
<context>
@@ -2216,17 +2185,17 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="75"/>
<source>&Language:</source>
- <translation>言語 (&L) :</translation>
+ <translation>言語（&L）:</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
<source>&Release notes</source>
- <translation>リリースノート (&R)</translation>
+ <translation>リリースノート（&R）</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
<source>&Known issues</source>
- <translation>既知の問題 (&K)</translation>
+ <translation>既知の問題（&K）</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
@@ -2236,25 +2205,30 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="146"/>
<source>&About</source>
- <translation>説明 (&A)</translation>
+ <translation>説明（&A）</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>%1 インストーラーへようこそ。</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation><h1>%1 Calamares インストーラーにようこそ</h1></translation>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>%1 インストーラーについて</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>%1 サポート</translation>
</message>
diff --git a/lang/calamares_kk.ts b/lang/calamares_kk.ts
index 1f87786d095f0bb1dc29c47ca2b52c91258c5f71..03d280a7e51f15ae400462d44cf736e1a936b690 100644
--- a/lang/calamares_kk.ts
+++ b/lang/calamares_kk.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="kk" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -119,12 +86,12 @@
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="93"/>
<source>Tools</source>
- <translation type="unfinished"/>
+ <translation>Саймандар</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
<source>Debug information</source>
- <translation type="unfinished"/>
+ <translation>Жөндеу ақпараты</translation>
</message>
</context>
<context>
@@ -132,7 +99,7 @@
<message>
<location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="77"/>
<source>Install</source>
- <translation type="unfinished"/>
+ <translation>Орнату</translation>
</message>
</context>
<context>
@@ -140,7 +107,7 @@
<message>
<location filename="../src/libcalamares/JobQueue.cpp" line="89"/>
<source>Done</source>
- <translation type="unfinished"/>
+ <translation>Дайын</translation>
</message>
</context>
<context>
@@ -336,12 +303,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation type="unfinished"/>
</message>
@@ -400,17 +367,17 @@ 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="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
<translation type="unfinished"/>
</message>
@@ -421,83 +388,83 @@ The installer will quit and all changes will be lost.</source>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<source><strong>Select a partition to install on</strong></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1109,12 +1076,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
@@ -1130,12 +1097,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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"/>
</message>
@@ -1221,40 +1188,38 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1325,17 +1290,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1778,55 +1743,60 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2062,42 +2032,42 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
@@ -2231,22 +2201,27 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>%1 қолдауы</translation>
</message>
diff --git a/lang/calamares_lo.ts b/lang/calamares_lo.ts
index 04cc68c476cba9dc97de94b86b0660d76173a7c4..3f25c14e3dd2542e559d628889723a0544841eb9 100644
--- a/lang/calamares_lo.ts
+++ b/lang/calamares_lo.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="lo" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -336,12 +303,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation type="unfinished"/>
</message>
@@ -400,17 +367,17 @@ 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="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
<translation type="unfinished"/>
</message>
@@ -421,83 +388,83 @@ The installer will quit and all changes will be lost.</source>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<source><strong>Select a partition to install on</strong></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1109,12 +1076,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
@@ -1130,12 +1097,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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"/>
</message>
@@ -1221,40 +1188,38 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1325,17 +1290,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1778,55 +1743,60 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2062,42 +2032,42 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
@@ -2231,22 +2201,27 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_lt.ts b/lang/calamares_lt.ts
index e65f99be1ab9a9b677bd45a0545b5c4a08a3ce95..06fb96889ef8ae66135165119cd5ada56ebf53c7 100644
--- a/lang/calamares_lt.ts
+++ b/lang/calamares_lt.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="lt" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Pasirinkite skaidinį, kurį mažinsite:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Paskirstykite diską, traukdami paskirstytoją apačioje:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>Po šios operacijos, skaidinys <strong>%1</strong> kuriame yra %4 bus sumažintas iki %2MB ir bus sukurtas naujas %3MB skaidinys sistemai %5.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <source>The EFI system partition at %1 will be used for starting %2.</source>
- <translation>%2 paleidimui bus naudojamas EFI sistemos skaidinys, esantis %1.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>EFI sistemos skaidinys:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -261,7 +228,7 @@ Išvestis:
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="66"/>
<source>&Next</source>
- <translation>&Kitas</translation>
+ <translation>&Toliau</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="67"/>
@@ -289,7 +256,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="225"/>
<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>%1 diegimo programa, siekdama įdiegti %2, ketina atlikti pakeitimus jūsų diske.<br/><strong>Jūs negalėsite atšaukti šių pakeitimų.</strong></translation>
+ <translation>%1 diegimo programa, siekdama įdiegti %2, ketina atlikti pakeitimus diske.<br/><strong>Negalėsite atšaukti šių pakeitimų.</strong></translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="232"/>
@@ -343,12 +310,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1 diegimo programa</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Rodyti derinimo informaciją</translation>
</message>
@@ -376,12 +343,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<message>
<location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="113"/>
<source>This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.</source>
- <translation>Šis kompiuteris netenkina kai kurių %1 diegimo rekomenduojamų reikalavimų.<br/>Diegimas gali būti tęsiamas, bet kai kurios funkcijos gali būti išjungtos.</translation>
+ <translation>Šis kompiuteris netenkina kai kurių %1 diegimui rekomenduojamų reikalavimų.<br/>Diegti galite, bet kai kurios funkcijos gali būti išjungtos.</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="142"/>
<source>This program will ask you some questions and set up %2 on your computer.</source>
- <translation>Ši programa užduos jums kelis klausimus ir padės jums savo kompiuteryje nusistatyti %2.</translation>
+ <translation>Programa užduos klausimus ir padės įsidiegti %2.</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="166"/>
@@ -407,17 +374,17 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<translation>Po:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<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="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>Paleidyklės vieta:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<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>
@@ -428,83 +395,83 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Dabartinis:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<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="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>EFI sistemos skaidinys:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -874,7 +841,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<message>
<location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="131"/>
<source>Write LUKS configuration for Dracut to %1</source>
- <translation>Įrašyti LUKS konfigūraciją, skirtą Dracut į %1</translation>
+ <translation>Dracut skirtąją LUKS konfigūraciją įrašyti į %1</translation>
</message>
<message>
<location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="133"/>
@@ -1116,12 +1083,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Nustatyti klaviatūros modelį kaip %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Nustatyti klaviatūros išdėstymą kaip %1/%2.</translation>
</message>
@@ -1137,12 +1104,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>Sistemos lokalės nustatymas</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>Sistemos lokalės nustatymas įtakoja, kai kurių komandų eilutės naudotojo sąsajos elementų, kalbos ir simbolių rinkinį.<br/>Dabar yra nustatyta <strong>%1</strong>.</translation>
</message>
@@ -1228,40 +1195,38 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation>Sistemos kalba bus nustatyta į %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Skaičių ir datų lokalė bus nustatyta į %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Regionas:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Zona:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>K&eisti...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Nustatyti laiko juostą kaip %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation>%1 (%2)</translation>
@@ -1332,17 +1297,17 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation>Pavadinimas</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation>Aprašas</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation>Tinklo diegimas. (Išjungta: Nepavyksta gauti paketų sąrašus, patikrinkite savo tinklo ryšį)</translation>
</message>
@@ -1785,55 +1750,60 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>Renkama sistemos informacija...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation>turi bent %1 GB laisvos vietos diske</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation>Neužtenka vietos diske. Reikia bent %1 GB.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>turi bent %1 GB darbinės atminties</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
- <translation>yra įjungtas į maitinimo šaltinį</translation>
+ <translation>prijungta prie maitinimo šaltinio</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
- <translation>Sistema nėra įjungta į maitinimo šaltinį.</translation>
+ <translation>Sistema nėra prijungta prie maitinimo šaltinio.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
- <translation>yra prijungtas prie Interneto</translation>
+ <translation>prijungta prie Interneto</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>Sistema nėra prijungta prie Interneto.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>Diegimo programa yra vykdoma be administratoriaus teisių.</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation>Ekranas yra per mažas, kad būtų parodyta diegimo programa.</translation>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2069,42 +2039,42 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Nustatyti naudotojo %1 slaptažodį</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>Nustatomas slaptažodis naudotojui %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>Neteisingas paskirties sistemos kelias.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>šaknies prijungimo vieta yra %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation>Nepavyksta išjungti administratoriaus (root) paskyros.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation>komanda passwd nutraukė darbą dėl klaidos kodo %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>Nepavyko nustatyti slaptažodžio naudotojui %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>komanda usermod nutraukė darbą dėl klaidos kodo %1.</translation>
</message>
@@ -2238,22 +2208,27 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<translation>&Apie</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
- <translation><h1>Sveiki atvykę į %1 diegimo programą.</h1></translation>
+ <translation><h1>Jus sveikina %1 diegimo programa.</h1></translation>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation><h1>Sveiki atvykę į Calamares diegimo programą, skirtą %1.</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>Apie %1 diegimo programą</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation><h1>%1</h1><br/><strong>%2<br/>sistemai %3</strong><br/><br/>Autorių teisės 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Dėkojame: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg ir <a href="https://www.transifex.com/calamares/calamares/">Calamares vertėjų komandai</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> kūrimą remia <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Išlaisvinanti programinė įranga.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>%1 palaikymas</translation>
</message>
diff --git a/lang/calamares_mr.ts b/lang/calamares_mr.ts
index 6895f587537f0bf3652e99c1574e0cced82e3a0c..4996da1606f212c60917e5ff7c8e263781c54ece 100644
--- a/lang/calamares_mr.ts
+++ b/lang/calamares_mr.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="mr" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -336,12 +303,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation type="unfinished"/>
</message>
@@ -400,17 +367,17 @@ 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="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
<translation type="unfinished"/>
</message>
@@ -421,83 +388,83 @@ The installer will quit and all changes will be lost.</source>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<source><strong>Select a partition to install on</strong></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1109,12 +1076,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
@@ -1130,12 +1097,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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"/>
</message>
@@ -1221,40 +1188,38 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1325,17 +1290,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1778,55 +1743,60 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2062,42 +2032,42 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
@@ -2231,22 +2201,27 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_nb.ts b/lang/calamares_nb.ts
index 998d8b6978e6db1807612ab6fda98755966944ca..493a3c384547f789e1a13fcca1afbbb8b4a8d225 100644
--- a/lang/calamares_nb.ts
+++ b/lang/calamares_nb.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="nb" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Velg en partisjon som skal krympes</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Fordel diskplass ved å flytte skillelinjen nedenfor:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>Med denne handlingen vil partisjon <b>%1</b> som inneholder %4 bli krympet til %2MB og en ny partisjon på %3MB vil bli opprettet for %5.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -343,12 +310,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1 Installasjonsprogram</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Vis feilrettingsinformasjon</translation>
</message>
@@ -407,17 +374,17 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
<translation type="unfinished"/>
</message>
@@ -428,83 +395,83 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<source><strong>Select a partition to install on</strong></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1116,12 +1083,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
@@ -1137,12 +1104,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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"/>
</message>
@@ -1228,40 +1195,38 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1332,17 +1297,17 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1785,55 +1750,60 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2069,42 +2039,42 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
@@ -2238,22 +2208,27 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_nl.ts b/lang/calamares_nl.ts
index 3dc5948df7f6aee7f58b34aec9c1342f9a3574dd..92f688c3e69234a6207db8449df87e6d827a95ca 100644
--- a/lang/calamares_nl.ts
+++ b/lang/calamares_nl.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Kies een partitie om te verkleinen:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Reserveer schijfruimte door de balkjes hieronder te verslepen:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>Tijdens deze bewerking zal partitie <strong>%1</strong>, die %4 bevat, verkleind worden tot %2MB en zal een nieuwe %3MB partitie aangemaakt worden voor %5.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>EFI systeempartitie:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -343,12 +310,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1 Installatieprogramma</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Toon debug informatie</translation>
</message>
@@ -407,17 +374,17 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
<translation>Na:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<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="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>Bootloader locatie:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<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>
@@ -428,83 +395,83 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Huidig:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<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="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>EFI systeempartitie:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1116,12 +1083,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Instellen toetsenbord model naar %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Instellen toetsenbord lay-out naar %1/%2.</translation>
</message>
@@ -1137,12 +1104,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>Landinstellingen</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>De landinstellingen bepalen de taal en het tekenset voor sommige opdrachtregelelementen.<br/>De huidige instelling is <strong>%1</strong>.</translation>
</message>
@@ -1228,40 +1195,38 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation>De taal van het systeem zal worden ingesteld op %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>De getal- en datumnotatie worden ingesteld op %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Regio:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Zone:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>&Aanpassen</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Instellen tijdzone naar %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation>%1 (%2)</translation>
@@ -1332,17 +1297,17 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation>Naam</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation>Beschrijving</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation>Netwerkinstallatie. (Uitgeschakeld: kon de pakketlijsten niet binnenhalen, controleer de netwerkconnectie)</translation>
</message>
@@ -1785,55 +1750,60 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>Systeeminformatie verzamelen...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation>tenminste %1 GB vrije schijfruimte heeft</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>tenminste %1 GB werkgeheugen heeft</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>aangesloten is op netstroom</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>Dit systeem is niet aangesloten op netstroom. </translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>verbonden is met het Internet</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>Dit systeem is niet verbonden met het Internet.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>Het installatieprogramma draait zonder administratorrechten.</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation>Het schem is te klein on het installatieprogramma te vertonen.</translation>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2069,42 +2039,42 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Instellen wachtwoord voor gebruiker %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>Wachtwoord instellen voor gebruiker %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>Onjuiste bestemming systeempad.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
- <translation>rootAankoppelpunt is %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation>Kan root account niet uitschakelen.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation>passwd is afgesloten met foutcode %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>Kan het wachtwoord niet instellen voor gebruiker %1 </translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>usermod beëindigd met foutcode %1.</translation>
</message>
@@ -2238,22 +2208,27 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
<translation>&Over</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>Welkom in het %1 installatieprogramma.</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation><h1>Welkom in het Calamares installatieprogramma voor %1.</h1></translation>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>Over het %1 installatieprogramma</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation><h1>%1</h1><br/><strong>%2<br/>voor %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Met dank aan: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg en het <a href="https://www.transifex.com/calamares/calamares/">Calamares vertaalteam</a>.<br/><br/>De ontwikkeling van <a href="http://calamares.io/">Calamares</a> is gesponsord door <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>%1 ondersteuning</translation>
</message>
diff --git a/lang/calamares_pl.ts b/lang/calamares_pl.ts
index 8625c113d4cf88a87c3372bfb5c5ad67b6e83009..760c896a13fdf575ac6c2e3595dbcc371d4746c9 100644
--- a/lang/calamares_pl.ts
+++ b/lang/calamares_pl.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Wybierz partycję do zmniejszenia:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Przydziel przestrzeń na dysku poprzez przeciągnięcie poniżej suwaka:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>Po zakończeniu tej operacji, partycja <strong>%1</strong>, która zawiera %4, będzie zmniejszona do %2MB, a nowa partycja %3MB zostanie utworzona dla %5.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>Partycja systemowa EFI:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -343,12 +310,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>Instalator %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Pokaż informacje debugowania</translation>
</message>
@@ -407,17 +374,17 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<translation>Po:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<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="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>Położenie programu rozruchowego:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<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>
@@ -428,83 +395,83 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Bieżący:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<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="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>Partycja systemowa EFI:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1116,12 +1083,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Ustaw model klawiatury na %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Ustaw model klawiatury na %1/%2.</translation>
</message>
@@ -1137,12 +1104,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>Systemowe ustawienia lokalne</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>Systemowe ustawienia lokalne wpływają na ustawienia języka i znaków w niektórych elementach wiersza poleceń interfejsu użytkownika.<br/>Bieżące ustawienie to <strong>%1</strong>.</translation>
</message>
@@ -1228,40 +1195,38 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation>Język systemu zostanie ustawiony na %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Format liczb i daty zostanie ustawiony na %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Region:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Strefa:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>&Zmień...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Ustaw strefę czasową na %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation>%1 (%2)</translation>
@@ -1332,17 +1297,17 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation>Nazwa</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation>Opis</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation>Instalacja sieciowa. (Wyłączona: Nie można pobrać listy pakietów, sprawdź swoje połączenie z siecią)</translation>
</message>
@@ -1785,55 +1750,60 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>Zbieranie informacji o systemie...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation>ma przynajmniej %1 GB dostępnego miejsca na dysku</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>ma przynajmniej %1 GB pamięci roboczej</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>jest podłączony do źródła zasilania</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>System nie jest podłączony do źródła zasilania.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>jest podłączony do Internetu</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>System nie jest podłączony do Internetu.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>Instalator jest uruchomiony bez praw administratora.</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation>Zbyt niska rozdzielczość ekranu, aby wyświetlić instalator.</translation>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2069,42 +2039,42 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Ustaw hasło dla użytkownika %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>Ustawianie hasła użytkownika %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>Błędna ścieżka docelowa systemu.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>Punkt montowania / to %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation>Nie można wyłączyć konta administratora.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation>Zakończono passwd z kodem błędu %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>Nie można ustawić hasła dla użytkownika %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>Polecenie usermod przerwane z kodem błędu %1.</translation>
</message>
@@ -2238,22 +2208,27 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<translation>&Informacje</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>Witamy w instalatorze %1.</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation><h1>Witamy w instalatorze Calamares dla systemu %1.</h1></translation>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>O instalatorze %1</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation><h1>%1</h1><br/><strong>%2<br/>dla %3</strong><br/><br/>Prawa autorskie 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Podziękowania dla: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg i <a href="https://www.transifex.com/calamares/calamares/">zespołu tłumaczy Calamares</a>.<br/><br/>Rozwój <a href="http://calamares.io/">Calamares</a> jest sponsorowany przez <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>Wsparcie %1</translation>
</message>
diff --git a/lang/calamares_pl_PL.ts b/lang/calamares_pl_PL.ts
index 0fdfd806df103467eb099439e7b1d7e391e1285f..6a6ce19be174ee76d8d2304f7a43c4de27d1847d 100644
--- a/lang/calamares_pl_PL.ts
+++ b/lang/calamares_pl_PL.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl_PL" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Wybierz partycję do zmniejszenia:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Przydziel przestrzeń na dysku poprzez przeciągnięcie suwaka poniżej:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>Partycja systemowa EFI:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -343,12 +310,12 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone.</translati
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>Instalator %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Pokaż informację debugowania</translation>
</message>
@@ -407,17 +374,17 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone.</translati
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
<translation type="unfinished"/>
</message>
@@ -428,83 +395,83 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone.</translati
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<source><strong>Select a partition to install on</strong></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1116,12 +1083,12 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone.</translati
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Model klawiatury %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Model klawiatury %1/%2.</translation>
</message>
@@ -1137,12 +1104,12 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone.</translati
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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"/>
</message>
@@ -1228,40 +1195,38 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone.</translati
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Region:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Strefa:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Strefa czasowa %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1332,17 +1297,17 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone.</translati
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1785,55 +1750,60 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone.</translati
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2069,42 +2039,42 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone.</translati
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Ustaw hasło użytkownika %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>Błędna ścieżka docelowa.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>Punkt montowania / to %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>Nie można ustawić hasła dla użytkownika %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>usermod przerwany z kodem błędu %1.</translation>
</message>
@@ -2238,22 +2208,27 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone.</translati
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts
index 29b206275bf903ae9911e0f8ad73db06c9d09552..64923a6fc3d795e810362207f2c52c56a42c2862 100644
--- a/lang/calamares_pt_BR.ts
+++ b/lang/calamares_pt_BR.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Escolha a partição a ser encolhida:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Aloque espaço no disco deslizando o divisor abaixo:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>Com esta operação, a partição <strong>%1</strong> que contém %4 será reduzida para %2MB e uma nova partição de %3MB será criada para %5.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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ão foi possível encontrar uma partição EFI no sistema. Por favor, volte e use o particionamento manual para configurar %1.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="208"/>
- <source>The EFI system partition at %1 will be used for starting %2.</source>
- <translation>A partição do sistema EFI em %1 será utilizada para iniciar %2.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>Partição de sistema EFI:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -289,7 +256,7 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="225"/>
<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>O instalador %1 está prestes a fazer alterações no dispositivo de armazenamento a fim de instalar %2.<br/><strong>Você não será capaz de desfazer estas mudanças.</strong></translation>
+ <translation>O instalador %1 está prestes a fazer alterações no disco a fim de instalar %2.<br/><strong>Você não será capaz de desfazer estas mudanças.</strong></translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="232"/>
@@ -343,12 +310,12 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>Instalador %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Exibir informações de depuração</translation>
</message>
@@ -383,7 +350,7 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<message>
<location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="142"/>
<source>This program will ask you some questions and set up %2 on your computer.</source>
- <translation>Este programa irá lhe fazer algumas perguntas e configurar %2 no computador.</translation>
+ <translation>Este programa irá fazer-lhe algumas perguntas e configurar %2 no computador.</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="166"/>
@@ -409,17 +376,17 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<translation>Depois:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<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="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>Local do gerenciador de inicialização:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<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>
@@ -430,83 +397,83 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Atual:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<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="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>Partição de sistema EFI:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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 gostaria de fazer?<br/>Você poderá revisar e confirmar suas opções antes que as alterações sejam feitas no dispositivo de armazenamento.</translation>
+ <translation>Parece que não há um sistema operacional neste dispositivo. O que gostaria de fazer?<br/>Você poderá revisar e confirmar suas opções antes que as alterações sejam feitas no dispositivo de armazenamento.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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 unidade</strong><br/>Isto <font color="red">excluirá</font> todos os dados no dispositivo de armazenamento selecionado.</translation>
+ <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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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 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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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 irá reduzir uma partição para liberar espaço para %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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 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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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 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>
@@ -582,7 +549,7 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="178"/>
<source>Flags:</source>
- <translation>Flags:</translation>
+ <translation>Marcadores:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="151"/>
@@ -622,7 +589,7 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="268"/>
<source>Mountpoint already in use. Please select another one.</source>
- <translation>Ponto de montagem já em uso. Selecione outro.</translation>
+ <translation>Ponto de montagem já em uso. Por favor, selecione outro.</translation>
</message>
</context>
<context>
@@ -640,7 +607,7 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="71"/>
<source>Creating new %1 partition on %2.</source>
- <translation>Criando nova partição %1 em %2</translation>
+ <translation>Criando nova partição %1 em %2.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="83"/>
@@ -665,7 +632,7 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="134"/>
<source>The installer failed to update partition table on disk '%1'.</source>
- <translation>O instalador falhou ao atualizar a tabela de partições na unidade '%1'.</translation>
+ <translation>O instalador falhou ao atualizar a tabela de partições no disco '%1'.</translation>
</message>
</context>
<context>
@@ -678,7 +645,7 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<message>
<location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="39"/>
<source>Creating a new partition table will delete all existing data on the disk.</source>
- <translation>A criação de uma nova tabela de partições excluirá todos os dados no dispositivo.</translation>
+ <translation>A criação de uma nova tabela de partições excluirá todos os dados no disco.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="65"/>
@@ -876,12 +843,12 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<message>
<location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="131"/>
<source>Write LUKS configuration for Dracut to %1</source>
- <translation>Configuração de gravação LUKS para Dracut %1</translation>
+ <translation>Escrever configuração LUKS para o Dracut em %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>Ignorar a configuração de gravação LUKS para Dracut: a partição "/" não está criptografada</translation>
+ <translation>Pular escrita de configuração LUKS para o Dracut: a partição "/" não está criptografada</translation>
</message>
<message>
<location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="149"/>
@@ -937,17 +904,17 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="132"/>
<source>Fi&le System:</source>
- <translation>Sistema de Arquivos</translation>
+ <translation>Sistema de Arquivos:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="145"/>
<source>Flags:</source>
- <translation>Flags:</translation>
+ <translation>Marcadores:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="306"/>
<source>Mountpoint already in use. Please select another one.</source>
- <translation>Ponto de montagem já em uso. Selecione outro.</translation>
+ <translation>Ponto de montagem já em uso. Por favor, selecione outro.</translation>
</message>
</context>
<context>
@@ -1062,7 +1029,7 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="83"/>
<source>The installer failed to format partition %1 on disk '%2'.</source>
- <translation>O instalador falhou em formatar a partição %1 no dispositivo '%2'.</translation>
+ <translation>O instalador falhou em formatar a partição %1 no disco '%2'.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="91"/>
@@ -1118,12 +1085,12 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Definir o modelo de teclado para %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Definir o layout do teclado para %1/%2.</translation>
</message>
@@ -1139,12 +1106,12 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>Definição de localidade do sistema</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>A configuração de localidade do sistema afeta a linguagem e o conjunto de caracteres para algumas linhas de comando e elementos da interface do usuário.<br/>A configuração atual é <strong>%1</strong>.</translation>
</message>
@@ -1230,40 +1197,38 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation>O idioma do sistema será definido como %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>O local dos números e datas será definido como %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Região:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Área:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>&Mudar...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Definir o fuso horário para %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation>%1 (%2)</translation>
@@ -1334,17 +1299,17 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
- <translation type="unfinished"/>
+ <translation>Nome</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
- <translation type="unfinished"/>
+ <translation>Descrição</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation>Instalação pela Rede. (Desabilitada: Não foi possível adquirir lista de pacotes, verifique sua conexão com a internet)</translation>
</message>
@@ -1592,7 +1557,7 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="163"/>
<source><strong>Erase</strong> disk and install %1.</source>
- <translation><strong>Apagar</strong> unidade e instalar %1.</translation>
+ <translation><strong>Apagar</strong> disco e instalar %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
@@ -1607,32 +1572,32 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="186"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
- <translation>Instalar %1 <strong>ao lado de</strong> outro sistema operacional na unidade <strong>%2</strong> (%3).</translation>
+ <translation>Instalar %1 <strong>ao lado de</strong> outro sistema operacional no disco <strong>%2</strong> (%3).</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="193"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
- <translation><strong>Apagar</strong> unidade <strong>%2</strong> (%3) e instalar %1.</translation>
+ <translation><strong>Apagar</strong> disco <strong>%2</strong> (%3) e instalar %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="200"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
- <translation><strong>Substituir</strong> uma partição na unidade <strong>%2</strong> (%3) com %1.</translation>
+ <translation><strong>Substituir</strong> uma partição no disco <strong>%2</strong> (%3) com %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="207"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
- <translation>Particionamento <strong>manual</strong> na unidade <strong>%1</strong> (%2).</translation>
+ <translation>Particionamento <strong>manual</strong> no disco <strong>%1</strong> (%2).</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="215"/>
<source>Disk <strong>%1</strong> (%2)</source>
- <translation>Unidade de armazenamento <strong>%1</strong> (%2)</translation>
+ <translation>Disco <strong>%1</strong> (%2)</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="243"/>
<source>Current:</source>
- <translation>Atual:</translation>
+ <translation>Atualmente:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="261"/>
@@ -1647,17 +1612,17 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.</source>
- <translation>Uma partição de sistema EFI é necessária para iniciar %1.<br/><br/>Para configurar uma partição de sistema EFI, volte, selecione ou crie um sistema de arquivos FAT32 com a flag <strong>esp</strong> ativada e ponto de montagem <strong>%2</strong>.<br/><br/>Você pode continuar sem definir uma partição de sistema EFI, mas seu sistema pode não iniciar.</translation>
+ <translation>Uma partição de sistema EFI é necessária para iniciar %1.<br/><br/>Para configurar uma partição de sistema EFI, volte, selecione ou crie um sistema de arquivos FAT32 com o marcador <strong>esp</strong> ativado e ponto de montagem <strong>%2</strong>.<br/><br/>Você pode continuar sem definir uma partição de sistema EFI, mas seu sistema pode não iniciar.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
- <translation>Flag de partição de sistema EFI não definida</translation>
+ <translation>Marcador da partição do sistema EFI não definida</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.</source>
- <translation>Uma partição de sistema EFI é necessária para iniciar %1.<br/><br/>Uma partição foi configurada com o ponto de montagem <strong>%2</strong>, mas sua flag <strong>esp</strong> não foi definida.<br/>Para definir a flag, volte e edite a partição.<br/><br/>Você pode continuar sem definir uma flag, mas seu sistema pode não iniciar.</translation>
+ <translation>Uma partição de sistema EFI é necessária para iniciar %1.<br/><br/>Uma partição foi configurada com o ponto de montagem <strong>%2</strong>, mas seu marcador <strong>esp</strong> não foi definido.<br/>Para definir o marcador, volte e edite a partição.<br/><br/>Você pode continuar sem definir um marcador, mas seu sistema pode não iniciar.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
@@ -1667,7 +1632,7 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.</source>
- <translation>Uma partição de inicialização separada foi configurada juntamente com uma partição raiz criptografada, mas a partição de inicialização não é criptografada.<br/><br/>Há preocupações de segurança com este tipo de configuração, porque arquivos de sistema importantes são mantidos em uma partição não criptografada.<br/>Você pode continuar se quiser, mas o desbloqueio do sistema de arquivos acontecerá mais tarde durante a inicialização do sistema.<br/>Para criptografar a partição de inicialização, volte e recrie-a, selecionando <strong>Criptografar</strong> Na janela de criação da partição.</translation>
+ <translation>Uma partição de inicialização separada foi configurada juntamente com uma partição raiz criptografada, mas a partição de inicialização não é criptografada.<br/><br/>Há preocupações de segurança com este tipo de configuração, porque arquivos de sistema importantes são mantidos em uma partição não criptografada.<br/>Você pode continuar se quiser, mas o desbloqueio do sistema de arquivos acontecerá mais tarde durante a inicialização do sistema.<br/>Para criptografar a partição de inicialização, volte e recrie-a, selecionando <strong>Criptografar</strong> na janela de criação da partição.</translation>
</message>
</context>
<context>
@@ -1719,7 +1684,7 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
- <translation>Selecione onde instalar %1.<br/><font color="red">Atenção: </font>isto excluirá todos os arquivos existentes na partição selecionada.</translation>
+ <translation>Selecione onde instalar %1.<br/><font color="red">Atenção:</font> isto excluirá todos os arquivos existentes na partição selecionada.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
@@ -1787,55 +1752,60 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>Coletando informações do sistema...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>tenha pelo menos %1 GB de memória</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>está conectado a uma fonte de energia</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>O sistema não está conectado a uma fonte de energia.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>está conectado à Internet</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>O sistema não está conectado à Internet.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>O instalador não está sendo executado com permissões de administrador.</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -1876,7 +1846,7 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="232"/>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="298"/>
<source>The installer failed to resize partition %1 on disk '%2'.</source>
- <translation>O instalador falhou em redimensionar a partição %1 na unidade '%2'.</translation>
+ <translation>O instalador falhou em redimensionar a partição %1 no disco '%2'.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="237"/>
@@ -1962,32 +1932,32 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="48"/>
<source>Set flags on partition %1.</source>
- <translation>Definir flags na partição %1.</translation>
+ <translation>Definir marcadores na partição %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="51"/>
<source>Set flags on %1MB %2 partition.</source>
- <translation>Definir sinalizadores na partição %1MB %2.</translation>
+ <translation>Definir marcadores na partição %1MB %2.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="55"/>
<source>Set flags on new partition.</source>
- <translation>Definir sinalizadores na nova partição.</translation>
+ <translation>Definir marcadores na nova partição.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="66"/>
<source>Clear flags on partition <strong>%1</strong>.</source>
- <translation>Limpar flags na partição <strong>%1</strong>.</translation>
+ <translation>Limpar marcadores na partição <strong>%1</strong>.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="70"/>
<source>Clear flags on %1MB <strong>%2</strong> partition.</source>
- <translation>Limpar bandeiras %1MB <strong>%2</strong> Partição.</translation>
+ <translation>Limpar marcadores na partição %1MB <strong>%2</strong>.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="74"/>
<source>Clear flags on new partition.</source>
- <translation>Limpar bandeiras na nova partição.</translation>
+ <translation>Limpar marcadores na nova partição.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="78"/>
@@ -1997,47 +1967,47 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="84"/>
<source>Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>.</source>
- <translation>Sinalizar %1MB <strong>%2</strong> a partição como <strong>%3</strong>.</translation>
+ <translation>Marcar partição %1MB <strong>%2</strong> como <strong>%3</strong>.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="90"/>
<source>Flag new partition as <strong>%1</strong>.</source>
- <translation>Sinalizar nova partição como <strong>%1</strong>.</translation>
+ <translation>Marcar nova partição como <strong>%1</strong>.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="102"/>
<source>Clearing flags on partition <strong>%1</strong>.</source>
- <translation>Limpando flags na partição <strong>%1</strong>.</translation>
+ <translation>Limpando marcadores na partição <strong>%1</strong>.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="106"/>
<source>Clearing flags on %1MB <strong>%2</strong> partition.</source>
- <translation>Limpar sinalizadores na %1MB <strong>%2</strong> Partição.</translation>
+ <translation>Limpar marcadores na partição %1MB <strong>%2</strong>.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="110"/>
<source>Clearing flags on new partition.</source>
- <translation>Limpar sinalizadores na nova partição.</translation>
+ <translation>Limpando marcadores na nova partição.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="114"/>
<source>Setting flags <strong>%2</strong> on partition <strong>%1</strong>.</source>
- <translation>Definindo flags <strong>%2</strong> na partição <strong>%1</strong>.</translation>
+ <translation>Definindo marcadores <strong>%2</strong> na partição <strong>%1</strong>.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="120"/>
<source>Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition.</source>
- <translation>Definindo sinalizadores <strong>%3</strong> em %1MB <strong>%2</strong> Partição.</translation>
+ <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="126"/>
<source>Setting flags <strong>%1</strong> on new partition.</source>
- <translation>Definindo sinalizadores <strong>%1</strong> na nova partição.</translation>
+ <translation>Definindo marcadores <strong>%1</strong> na nova partição.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="140"/>
<source>The installer failed to set flags on partition %1.</source>
- <translation>O instalador falhou em definir flags na partição %1.</translation>
+ <translation>O instalador falhou em definir marcadores na partição %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="148"/>
@@ -2071,42 +2041,42 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Definir senha para usuário %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>Definindo senha para usuário %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>O caminho para o sistema está mal direcionado.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>rootMountPoint é %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation>Não é possível desativar a conta root.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation>passwd terminado com código de erro %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>Não foi possível definir senha para o usuário %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>usermod terminou com código de erro %1.</translation>
</message>
@@ -2154,7 +2124,7 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<message>
<location filename="../src/modules/summary/SummaryPage.cpp" line="46"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
- <translation>Este é um resumo do que acontecerá assim que iniciar o processo de instalação.</translation>
+ <translation>Este é um resumo do que acontecerá assim que o processo de instalação for iniciado.</translation>
</message>
</context>
<context>
@@ -2240,22 +2210,27 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<translation>S&obre</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>Bem-vindo ao instalador %1 .</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>Sobre o instalador %1</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation><h1>%1</h1><br/><strong>%2<br/>para %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Agradecimentos: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg e a <a href="https://www.transifex.com/calamares/calamares/">equipe de tradutores do Calamares</a>.<br/><br/>O desenvolvimento do <a href="http://calamares.io/">Calamares</a> tem o apoio da <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>%1 suporte</translation>
</message>
diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts
index 5537440931b75016d98b3edfb7090f3c3c88ccec..bea7b268a84ad1762774e90576d184075326899f 100644
--- a/lang/calamares_pt_PT.ts
+++ b/lang/calamares_pt_PT.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_PT" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Escolha a partição a encolher:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Alocar espaço em disco arrastando o divisor abaixo:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>Com esta operação, a partição <strong>%1</strong> que contém %4 será reduzida para %2MB e uma nova partição %3MB será criada para %5.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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 foi encontrada em parte alguma neste sistema. Por favor volte atrás e use o particionamento manual para configurar %1.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>Partição de sistema EFI:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -343,12 +310,12 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1 Instalador</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Mostrar informação de depuração</translation>
</message>
@@ -407,17 +374,17 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<translation>Depois:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<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="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>Localização do carregador de arranque:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<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>
@@ -428,83 +395,83 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Atual:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<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="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>Partição de sistema EFI:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1116,12 +1083,12 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Definir o modelo do teclado para %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Definir esquema do teclado para %1/%2.</translation>
</message>
@@ -1137,12 +1104,12 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>Definição de localização do Sistema</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>A definição local do sistema afeta o idioma e conjunto de carateres para alguns elementos do interface da linha de comandos.<br/>A definição atual é <strong>%1</strong>.</translation>
</message>
@@ -1228,40 +1195,38 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation>A linguagem do sistema será definida para %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Os números e datas locais serão definidos para %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Região:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Zona:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>&Alterar...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Definir fuso horário para %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation>%1 (%2)</translation>
@@ -1332,17 +1297,17 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation>Nome</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation>Descrição</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation>Instalaçao de Rede. (Desativada: Incapaz de buscar listas de pacotes, verifique a sua ligação de rede)</translation>
</message>
@@ -1785,55 +1750,60 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>A recolher informação de sistema...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>tem pelo menos %1 GB de memória disponível</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>está ligado a uma fonte de energia</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>O sistema não está ligado a uma fonte de energia.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>está ligado à internet</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>O sistema não está ligado à internet.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>O instalador não está a correr com permissões de administrador.</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation>O ecrã tem um tamanho demasiado pequeno para mostrar o instalador.</translation>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2069,42 +2039,42 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Definir palavra-passe para o utilizador %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>A definir palavra-passe para o utilizador %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>Mau destino do caminho do sistema.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>rootMountPoint é %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation>Não é possível desativar a conta root.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation>passwd terminado com código de erro %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>Não é possível definir a palavra-passe para o utilizador %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>usermod terminou com código de erro %1.</translation>
</message>
@@ -2238,22 +2208,27 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<translation>&Sobre</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>Bem vindo ao instalador do %1.</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation><h1>Bem vindo ao instalador Calamares para %1.</h1></translation>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>Sobre %1 instalador</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation><h1>%1</h1><br/><strong>%2<br/>para %3</strong><br/><br/>Direitos de cópia 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Agradecimentos a: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg e à <a href="https://www.transifex.com/calamares/calamares/">equipa de tradutores Calamares</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> desenvolvimento patrocinado por <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>%1 suporte</translation>
</message>
diff --git a/lang/calamares_ro.ts b/lang/calamares_ro.ts
index c86f25da8bdb4bb1a196553822b1e0030f63a5a1..b59a3841598798b2b209464a2ef9ba28379257d2 100644
--- a/lang/calamares_ro.ts
+++ b/lang/calamares_ro.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="ro" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Alegeți partiția de micșorat:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Alocați spațiu pe disc trăgând despărțitorul:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>Cu această operație, partiția <strong>%1</strong>, cu mărimea de %4, va fi redusă la %2MB și se va crea o nouă partiție de %3MB pentru %5.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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 se găsește nicăieri pe acest sistem. Vă rugăm să reveniți și să utilizați partiționarea manuală pentru a seta %1.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="208"/>
- <source>The EFI system partition at %1 will be used for starting %2.</source>
- <translation>Partiția de sistem EFI de pe %1 va fi folosită pentru a începe %2.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>Partiție de sistem EFI</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -343,12 +310,12 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>Program de instalare %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Arată informația de depanare</translation>
</message>
@@ -407,17 +374,17 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans
<translation>După:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<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="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>Locație boot loader:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<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>
@@ -428,83 +395,83 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Actual:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<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="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>Partiție de sistem EFI:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -620,7 +587,7 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="268"/>
<source>Mountpoint already in use. Please select another one.</source>
- <translation type="unfinished"/>
+ <translation>Punct de montare existent. Vă rugăm alegeţi altul.</translation>
</message>
</context>
<context>
@@ -945,7 +912,7 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="306"/>
<source>Mountpoint already in use. Please select another one.</source>
- <translation type="unfinished"/>
+ <translation>Punct de montare existent. Vă rugăm alegeţi altul.</translation>
</message>
</context>
<context>
@@ -1116,12 +1083,12 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Setează modelul tastaturii la %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Setează aranjamentul de tastatură la %1/%2.</translation>
</message>
@@ -1137,12 +1104,12 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>Setările de localizare</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>Setările de localizare ale sistemului afectează limba și setul de caractere folosit pentru unele elemente de interfață la linia de comandă.<br/>Setările actuale sunt <strong>%1</strong>.</translation>
</message>
@@ -1228,40 +1195,38 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation>Limba sistemului va fi %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Formatul numerelor și datelor calendaristice va fi %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Regiune:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Zonă:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>S&chimbă</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Setează fusul orar la %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation>%1 (%2)</translation>
@@ -1332,17 +1297,17 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
- <translation type="unfinished"/>
+ <translation>Nume</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
- <translation type="unfinished"/>
+ <translation>Despre</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation>Instalarea rețelei. (Dezactivat: Nu se pot obține listele de pachete, verificați conexiunea la rețea)</translation>
</message>
@@ -1785,55 +1750,60 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>Se adună informații despre sistem...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation>are cel puțin %1 spațiu disponibil</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>are cel puțin %1 GB de memorie utilizabilă</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>este alimentat cu curent</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>Sistemul nu este alimentat cu curent.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>este conectat la Internet</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>Sistemul nu este conectat la Internet.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>Programul de instalare nu rulează cu privilegii de administrator.</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2069,42 +2039,42 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Setează parola pentru utilizatorul %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>Se setează parola pentru utilizatorul %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>Cale de sistem destinație proastă.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>rootMountPoint este %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
- <translation type="unfinished"/>
+ <translation>Nu pot dezactiva contul root</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
- <translation type="unfinished"/>
+ <translation>eroare la setarea parolei cod %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>Nu se poate seta parola pentru utilizatorul %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>usermod s-a terminat cu codul de eroare %1.</translation>
</message>
@@ -2238,22 +2208,27 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans
<translation>&Despre</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>Bine ați venit la programul de instalare pentru %1.</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>Despre programul de instalare %1</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
- <translation type="unfinished"/>
+ <translation><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Mulţumiri: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg şi <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> dezvoltarea sponsorizată de <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>%1 suport</translation>
</message>
diff --git a/lang/calamares_ru.ts b/lang/calamares_ru.ts
index 0871abb9468a55a6ecc436e5c1db18875a2748b6..470ad2a6aa3dd67e0ce0f4ba8bc63de0e7c85a0b 100644
--- a/lang/calamares_ru.ts
+++ b/lang/calamares_ru.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Выберите раздел для уменьшения:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Выделите дисковое пространство, перемещая ползунок:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>Это действие уменьшит раздел <strong>%1</strong>, содержащий %4, до %2 MB, и создаст новый раздел %3 MB для %5.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>Системный раздел EFI:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -342,12 +309,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>Программа установки %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Показать отладочную информацию</translation>
</message>
@@ -406,17 +373,17 @@ The installer will quit and all changes will be lost.</source>
<translation>После:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation><strong>Ручная разметка</strong><br/>Вы можете самостоятельно создавать разделы или изменять их размеры.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>Расположение загрузчика:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<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>
@@ -427,83 +394,83 @@ The installer will quit and all changes will be lost.</source>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Текущий:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation>Использовать %1 как домашний раздел для %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>Системный раздел EFI:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1115,12 +1082,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Установить модель клавиатуры на %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Установить раскладку клавиатуры на %1/%2.</translation>
</message>
@@ -1136,12 +1103,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>Общие региональные настройки</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>Общие региональные настройки влияют на язык и кодировку для отдельных элементов интерфейса командной строки.<br/>Текущий выбор <strong>%1</strong>.</translation>
</message>
@@ -1227,40 +1194,38 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation>Системным языком будет установлен %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Региональным форматом чисел и дат будет установлен %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Регион:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Зона:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>И&зменить...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Установить часовой пояс на %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation>%1 (%2)</translation>
@@ -1331,17 +1296,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation>Установка по сети. (Отключено: не удается получить список пакетов, проверьте сетевое подключение)</translation>
</message>
@@ -1784,55 +1749,60 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>Сбор информации о системе...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation>доступно как минимум %1 ГБ свободного дискового пространства</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation>Недостаточно места на дисках. Необходимо как минимум %1 ГБ.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>доступно как минимум %1 ГБ оперативной памяти</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation>Недостаточно оперативной памяти. Необходимо как минимум %1 ГБ.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>подключено сетевое питание</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>Сетевое питание не подключено.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>присутствует выход в сеть Интернет</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>Отсутствует выход в Интернет.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>Программа установки не запущена с привилегиями администратора.</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2068,42 +2038,42 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Задать пароль для пользователя %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>Устанавливаю пароль для учетной записи %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>Неверный путь целевой системы.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>Точка монтирования корневого раздела %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation>Невозможно отключить учетную запись root</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>Не удалось задать пароль для пользователя %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>Команда usermod завершилась с кодом ошибки %1.</translation>
</message>
@@ -2237,22 +2207,27 @@ The installer will quit and all changes will be lost.</source>
<translation>&О</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>Добро пожаловать в программу установки %1 .</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>О программе установки %1</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>%1 поддержка</translation>
</message>
diff --git a/lang/calamares_sk.ts b/lang/calamares_sk.ts
index e53e7ed573ce1711d2f7b027d7ba3b9594626cd9..ba85215b648d531a264ed3072935ef9b69a74469 100644
--- a/lang/calamares_sk.ts
+++ b/lang/calamares_sk.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="sk" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Zvoľte oddiel na zmenšenie:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Miesto na disku vyhradíte posunutím oddeľovača nižšie:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>Touto operáciou, sa oddiel <strong>%1</strong>, ktorý obsahuje %4 zmenší na %2MB a vytvorí sa nový %3MB oddiel pre distribúciu %5.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <source>The EFI system partition at %1 will be used for starting %2.</source>
- <translation>Oddiel systému EFI na %1 bude použitý na spustenie distribúcie %2.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>Oddiel systému EFI:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -261,7 +228,7 @@ Výstup:
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="66"/>
<source>&Next</source>
- <translation>Ď&aľej</translation>
+ <translation>Ď&alej</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="67"/>
@@ -343,12 +310,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>Inštalátor distribúcie %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Zobraziť ladiace informácie</translation>
</message>
@@ -407,17 +374,17 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<translation>Potom:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<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="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>Umiestnenie zavádzača:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<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>
@@ -428,83 +395,83 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Teraz:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<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="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>Oddiel systému EFI:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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 vybratom úložnom zariadení.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1116,12 +1083,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Nastavenie modelu klávesnice na %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Nastavenie rozloženia klávesnice na %1/%2.</translation>
</message>
@@ -1137,12 +1104,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>Miestne nastavenie systému</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>Miestne nastavenie systému ovplyvní jazyk a znakovú sadu niektorých prvkov používateľského rozhrania v príkazovom riadku.<br/>Aktuálne nastavenie je <strong>%1</strong>.</translation>
</message>
@@ -1228,40 +1195,38 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation>Jazyk systému bude nastavený na %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Miestne nastavenie čísel a dátumov bude nastavené na %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Oblasť:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Zóna:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>Z&meniť...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Nastavenie časovej zóny na %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation>%1 (%2)</translation>
@@ -1332,17 +1297,17 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation>Názov</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation>Popis</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation>Sieťová inštalácia. (Zakázaná: Nie je možné získať zoznamy balíkov. Skontrolujte vaše sieťové pripojenie.)</translation>
</message>
@@ -1785,55 +1750,60 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>Zbierajú sa informácie o počítači...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>obsahuje aspoň %1 GB voľnej operačnej pamäte</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>je pripojený k zdroju napájania</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>Počítač nie je pripojený k zdroju napájania.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>je pripojený k internetu</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>Počítač nie je pripojený k internetu.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>Inštalátor nie je spustený s právami správcu.</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation>Obrazovka je príliš malá na to, aby bolo možné zobraziť inštalátor.</translation>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2069,42 +2039,42 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Nastavenie hesla pre používateľa %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>Nastavuje sa heslo pre používateľa %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>Nesprávny cieľ systémovej cesty.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>rootMountPoint je %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation>Nedá sa zakázať účet správcu.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation>Príkaz passwd ukončený s chybovým kódom %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>Nedá sa nastaviť heslo pre používateľa %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>Príkaz usermod ukončený s chybovým kódom %1.</translation>
</message>
@@ -2238,22 +2208,27 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<translation>&O inštalátore</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>Vitajte v inštalátore distribúcie %1.</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation><h1>Vitajte v aplikácii Calamares, inštalátore distribúcie %1.</h1></translation>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>O inštalátore %1</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation><h1>%1</h1><br/><strong>%2<br/>pre distribúciu %3</strong><br/><br/>Autorské práva 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Poďakovanie: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg a <a href="https://www.transifex.com/calamares/calamares/">tím prekladateľov programu Calamares</a>.<br/><br/>Vývoj programu <a href="http://calamares.io/">Calamares</a> je podporovaný projektom <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Oslobodzujúci softvér.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>Podpora distribúcie %1</translation>
</message>
diff --git a/lang/calamares_sl.ts b/lang/calamares_sl.ts
index 81fcd924d4585a4a10386e21d816353f67d7e346..432aa2b3fbb2c0b7fabac6c2c2eeb4e244a33aaf 100644
--- a/lang/calamares_sl.ts
+++ b/lang/calamares_sl.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="sl" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Izberite razdelek, ki naj bo zmanjšan:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Dodelite prostor na disku prek vlečenja razdelilnika spodaj:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>S to operacijo bo razdelek <strong>%1</strong>, ki vsebuje %4 zmanjšan na %2MB, pri čemer bo za %5 ustvarjen nov razdelek velikosti %3MB.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -343,12 +310,12 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1 Namestilnik</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation type="unfinished"/>
</message>
@@ -407,17 +374,17 @@ 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="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
<translation type="unfinished"/>
</message>
@@ -428,83 +395,83 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<source><strong>Select a partition to install on</strong></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1116,12 +1083,12 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Nastavi model tipkovnice na %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Nastavi razporeditev tipkovnice na %1/%2.</translation>
</message>
@@ -1137,12 +1104,12 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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"/>
</message>
@@ -1228,40 +1195,38 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Območje:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Časovni pas:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Nastavi časovni pas na %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1332,17 +1297,17 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1785,55 +1750,60 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2069,42 +2039,42 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
@@ -2238,22 +2208,27 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_sr.ts b/lang/calamares_sr.ts
index 672230c34ef725fe2bf0cdf8a39ba465dc340f7f..f8299b04e68647da68bffcfdda3fa260deb4c1ac 100644
--- a/lang/calamares_sr.ts
+++ b/lang/calamares_sr.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="sr" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Изаберите партицију за смањивање:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Издвојте простор на диску повлачећи граничник испод:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -60,7 +27,7 @@
<message>
<location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="76"/>
<source>Boot Partition</source>
- <translation>Партиција за покретање система</translation>
+ <translation>Подизна партиција</translation>
</message>
<message>
<location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="81"/>
@@ -70,12 +37,12 @@
<message>
<location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="111"/>
<source>Do not install a boot loader</source>
- <translation type="unfinished"/>
+ <translation>Не инсталирај подизни учитавач</translation>
</message>
<message>
<location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="125"/>
<source>%1 (%2)</source>
- <translation type="unfinished"/>
+ <translation>%1 (%2)</translation>
</message>
</context>
<context>
@@ -83,7 +50,7 @@
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="14"/>
<source>Form</source>
- <translation type="unfinished"/>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="24"/>
@@ -98,28 +65,28 @@
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="44"/>
<source>Modules</source>
- <translation type="unfinished"/>
+ <translation>Модули</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="57"/>
<source>Type:</source>
- <translation type="unfinished"/>
+ <translation>Тип:</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="64"/>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="78"/>
<source>none</source>
- <translation type="unfinished"/>
+ <translation>ништа</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="71"/>
<source>Interface:</source>
- <translation type="unfinished"/>
+ <translation>Сучеље:</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="93"/>
<source>Tools</source>
- <translation type="unfinished"/>
+ <translation>Алатке</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
@@ -132,7 +99,7 @@
<message>
<location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="77"/>
<source>Install</source>
- <translation type="unfinished"/>
+ <translation>Инсталирај</translation>
</message>
</context>
<context>
@@ -148,73 +115,74 @@
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="51"/>
<source>Run command %1 %2</source>
- <translation type="unfinished"/>
+ <translation>Покрени команду %1 %2</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="60"/>
<source>Running command %1 %2</source>
- <translation type="unfinished"/>
+ <translation>Извршавам команду %1 %2</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="89"/>
<source>External command crashed</source>
- <translation>Извршавање спољашње команде није успело</translation>
+ <translation>Спољашња наредба се срушила</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="90"/>
<source>Command %1 crashed.
Output:
%2</source>
- <translation>Извршавање команде %1 није успело.
-Порука:
+ <translation>Наредба %1 се срушила.
+Излаз:
%2</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="95"/>
<source>External command failed to start</source>
- <translation>Покретање спољашње команде није успело</translation>
+ <translation>Покретање спољашње наредбе није успело</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="96"/>
<source>Command %1 failed to start.</source>
- <translation>Покретање команде %1 није успело</translation>
+ <translation>Покретање наредбе %1 није успело</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="100"/>
<source>Internal error when starting command</source>
- <translation>Интерна грешка при покретању команде</translation>
+ <translation>Интерна грешка при покретању наредбе</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="101"/>
<source>Bad parameters for process job call.</source>
- <translation>Погрешни параметри код позива функције у процесу.</translation>
+ <translation>Лоши параметри при позиву посла процеса.</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="104"/>
<source>External command failed to finish</source>
- <translation>Извршавање екстерне команде није завршено.</translation>
+ <translation>Спољашња наредба није завршила</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="105"/>
<source>Command %1 failed to finish in %2s.
Output:
%3</source>
- <translation>Извршавање команде %1 није завршено у %2s.
-Повратна порука:
+ <translation>Наредба %1 није завршила у %2s.
+Излаз:
%3</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="111"/>
<source>External command finished with errors</source>
- <translation>Извршавање спољашње команде извршено уз грешке.</translation>
+ <translation>Спољашња наредба извршена уз грешке</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="112"/>
<source>Command %1 finished with exit code %2.
Output:
%3</source>
- <translation>Команда %1 завршена са излазним кодом %2.
-Повратна порука: %3</translation>
+ <translation>Наредба %1 извршена са излазним кодом %2.
+Излаз:
+%3</translation>
</message>
</context>
<context>
@@ -222,7 +190,7 @@ Output:
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="250"/>
<source>Running %1 operation.</source>
- <translation type="unfinished"/>
+ <translation>Извршавам %1 операцију.</translation>
</message>
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="263"/>
@@ -232,22 +200,22 @@ Output:
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="264"/>
<source>Working directory %1 for python job %2 is not readable.</source>
- <translation>Није могуће прочитати радни директоријум %1 за функцију %2 у питону.</translation>
+ <translation>Радни директоријум %1 за питонов посао %2 није читљив.</translation>
</message>
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="274"/>
<source>Bad main script file</source>
- <translation>Неисправан главни фајл скрипте</translation>
+ <translation>Лош фајл главне скрипте</translation>
</message>
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="275"/>
<source>Main script file %1 for python job %2 is not readable.</source>
- <translation>Није могуће прочитати главни фајл скрипте %1 за питон функцију %2</translation>
+ <translation>Фајл главне скрипте %1 за питонов посао %2 није читљив.</translation>
</message>
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="320"/>
<source>Boost.Python error in job "%1".</source>
- <translation>Грешка у функцији %1 C++ библиотеке Boost.Python. </translation>
+ <translation>Boost.Python грешка у послу „%1“.</translation>
</message>
</context>
<context>
@@ -260,18 +228,18 @@ Output:
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="66"/>
<source>&Next</source>
- <translation>&Даље</translation>
+ <translation>&Следеће</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="67"/>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="295"/>
<source>&Cancel</source>
- <translation>&Прекини</translation>
+ <translation>&Откажи</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="90"/>
<source>Cancel installation?</source>
- <translation>Прекини инсталацију</translation>
+ <translation>Отказати инсталацију?</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="91"/>
@@ -283,7 +251,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="224"/>
<source>Continue with setup?</source>
- <translation type="unfinished"/>
+ <translation>Наставити са подешавањем?</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="225"/>
@@ -293,12 +261,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="232"/>
<source>&Install now</source>
- <translation type="unfinished"/>
+ <translation>&Инсталирај сада</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="233"/>
<source>Go &back</source>
- <translation type="unfinished"/>
+ <translation>Иди &назад</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="264"/>
@@ -342,12 +310,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1 инсталер</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation type="unfinished"/>
</message>
@@ -385,12 +353,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="166"/>
<source>For best results, please ensure that this computer:</source>
- <translation type="unfinished"/>
+ <translation>За најбоље резултате обезбедите да овај рачунар:</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="194"/>
<source>System requirements</source>
- <translation type="unfinished"/>
+ <translation>Системски захтеви</translation>
</message>
</context>
<context>
@@ -398,112 +366,112 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.ui" line="14"/>
<source>Form</source>
- <translation type="unfinished"/>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="127"/>
<source>After:</source>
- <translation type="unfinished"/>
+ <translation>После:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
- <translation type="unfinished"/>
+ <translation><strong>Ручно партиционисање</strong><br/>Сами можете креирати или мењати партције.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
- <translation type="unfinished"/>
+ <translation>Подизни учитавач на:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
- <translation type="unfinished"/>
+ <translation>%1 биће змањена на %2MB а нова %3MB партиција биће направљена за %4.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="125"/>
<source>Select storage de&vice:</source>
- <translation type="unfinished"/>
+ <translation>Изаберите у&ређај за смештање:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
- <translation type="unfinished"/>
+ <translation>Тренутно:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<source><strong>Select a partition to install on</strong></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -736,7 +704,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="64"/>
<source>Creating user %1.</source>
- <translation type="unfinished"/>
+ <translation>Правим корисника %1</translation>
</message>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="80"/>
@@ -909,7 +877,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="60"/>
<source>&Keep</source>
- <translation type="unfinished"/>
+ <translation>&Очувај</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="70"/>
@@ -924,17 +892,17 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="99"/>
<source>&Mount Point:</source>
- <translation type="unfinished"/>
+ <translation>&Тачка монтирања:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="119"/>
<source>Si&ze:</source>
- <translation type="unfinished"/>
+ <translation>&Величина:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="132"/>
<source>Fi&le System:</source>
- <translation type="unfinished"/>
+ <translation>Фајл &систем:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="145"/>
@@ -1036,7 +1004,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="43"/>
<source>Finish</source>
- <translation type="unfinished"/>
+ <translation>Заврши</translation>
</message>
</context>
<context>
@@ -1109,18 +1077,18 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/interactiveterminal/InteractiveTerminalViewStep.cpp" line="45"/>
<source>Script</source>
- <translation type="unfinished"/>
+ <translation>Скрипта</translation>
</message>
</context>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
@@ -1130,18 +1098,18 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/keyboard/KeyboardViewStep.cpp" line="50"/>
<source>Keyboard</source>
- <translation type="unfinished"/>
+ <translation>Тастатура</translation>
</message>
</context>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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"/>
</message>
@@ -1221,46 +1189,44 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/license/LicenseViewStep.cpp" line="51"/>
<source>License</source>
- <translation type="unfinished"/>
+ <translation>Лиценца</translation>
</message>
</context>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
- <translation type="unfinished"/>
+ <translation>Системски језик биће постављен на %1</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
- <translation type="unfinished"/>
+ <translation>Регион:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
- <translation type="unfinished"/>
+ <translation>Зона:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
- <translation type="unfinished"/>
+ <translation>&Измени...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1276,7 +1242,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/locale/LocaleViewStep.cpp" line="160"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Локација</translation>
</message>
</context>
<context>
@@ -1331,17 +1297,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
- <translation type="unfinished"/>
+ <translation>Назив</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
- <translation type="unfinished"/>
+ <translation>Опис</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1351,7 +1317,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="51"/>
<source>Package selection</source>
- <translation type="unfinished"/>
+ <translation>Избор пакета</translation>
</message>
</context>
<context>
@@ -1369,7 +1335,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/keyboard/KeyboardPage.ui" line="131"/>
<source>Type here to test your keyboard</source>
- <translation type="unfinished"/>
+ <translation>куцајте овде да тестирате тастатуру</translation>
</message>
</context>
<context>
@@ -1377,12 +1343,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="14"/>
<source>Form</source>
- <translation type="unfinished"/>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="36"/>
<source>What is your name?</source>
- <translation type="unfinished"/>
+ <translation>Како се зовете?</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="117"/>
@@ -1405,7 +1371,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="335"/>
<source>Choose a password to keep your account safe.</source>
- <translation type="unfinished"/>
+ <translation>Изаберите лозинку да обезбедите свој налог.</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="440"/>
@@ -1415,7 +1381,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="226"/>
<source>What is the name of this computer?</source>
- <translation type="unfinished"/>
+ <translation>Како ћете звати ваш рачунар?</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="309"/>
@@ -1629,12 +1595,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="243"/>
<source>Current:</source>
- <translation type="unfinished"/>
+ <translation>Тренутно:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="261"/>
<source>After:</source>
- <translation type="unfinished"/>
+ <translation>После:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="405"/>
@@ -1678,22 +1644,22 @@ The installer will quit and all changes will be lost.</source>
<location filename="../src/modules/keyboard/keyboardwidget/keyboardglobal.cpp" line="127"/>
<location filename="../src/modules/keyboard/keyboardwidget/keyboardglobal.cpp" line="163"/>
<source>Default</source>
- <translation type="unfinished"/>
+ <translation>подразумевано</translation>
</message>
<message>
<location filename="../src/modules/partition/core/KPMHelpers.cpp" line="201"/>
<source>unknown</source>
- <translation type="unfinished"/>
+ <translation>непознато</translation>
</message>
<message>
<location filename="../src/modules/partition/core/KPMHelpers.cpp" line="203"/>
<source>extended</source>
- <translation type="unfinished"/>
+ <translation>проширена</translation>
</message>
<message>
<location filename="../src/modules/partition/core/KPMHelpers.cpp" line="205"/>
<source>unformatted</source>
- <translation type="unfinished"/>
+ <translation>неформатирана</translation>
</message>
<message>
<location filename="../src/modules/partition/core/KPMHelpers.cpp" line="207"/>
@@ -1784,55 +1750,60 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -1891,7 +1862,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/ScanningDialog.cpp" line="84"/>
<source>Partitioning</source>
- <translation type="unfinished"/>
+ <translation>Партиционисање</translation>
</message>
</context>
<context>
@@ -1915,7 +1886,7 @@ The installer will quit and all changes will be lost.</source>
<location filename="../src/modules/users/SetHostNameJob.cpp" line="61"/>
<location filename="../src/modules/users/SetHostNameJob.cpp" line="68"/>
<source>Internal Error</source>
- <translation type="unfinished"/>
+ <translation>Интерна грешка</translation>
</message>
<message>
<location filename="../src/modules/users/SetHostNameJob.cpp" line="75"/>
@@ -2068,42 +2039,42 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
@@ -2159,7 +2130,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/summary/SummaryViewStep.cpp" line="43"/>
<source>Summary</source>
- <translation type="unfinished"/>
+ <translation>Сажетак</translation>
</message>
</context>
<context>
@@ -2167,7 +2138,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="275"/>
<source>Your username is too long.</source>
- <translation type="unfinished"/>
+ <translation>Ваше корисничко име је предугачко.</translation>
</message>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="285"/>
@@ -2201,7 +2172,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/UsersViewStep.cpp" line="48"/>
<source>Users</source>
- <translation type="unfinished"/>
+ <translation>Корисници</translation>
</message>
</context>
<context>
@@ -2209,12 +2180,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="14"/>
<source>Form</source>
- <translation type="unfinished"/>
+ <translation>Форма</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="75"/>
<source>&Language:</source>
- <translation type="unfinished"/>
+ <translation>&Језик:</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
@@ -2224,37 +2195,42 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
<source>&Known issues</source>
- <translation type="unfinished"/>
+ <translation>&Познати проблеми</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
<source>&Support</source>
- <translation type="unfinished"/>
+ <translation>По&дршка</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="146"/>
<source>&About</source>
- <translation type="unfinished"/>
+ <translation>&О програму</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
- <source>About %1 installer</source>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
+ <source>About %1 installer</source>
+ <translation>О %1 инсталатеру</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
- <translation type="unfinished"/>
+ <translation>%1 подршка</translation>
</message>
</context>
<context>
@@ -2262,7 +2238,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/>
<source>Welcome</source>
- <translation type="unfinished"/>
+ <translation>Добродошли</translation>
</message>
</context>
</TS>
\ No newline at end of file
diff --git a/lang/calamares_sr@latin.ts b/lang/calamares_sr@latin.ts
index 791fe93fdfbf21d7d2bb09f370e8be8b3b7991c4..d1d11ddec2cdbf88c4cfe2eb8ceddaa614bd4920 100644
--- a/lang/calamares_sr@latin.ts
+++ b/lang/calamares_sr@latin.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="sr@latin" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Odaberite particiju koju želite smanjiti:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Izdvojite prostor na disku tako što ćete povući graničnik ispod:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -343,12 +310,12 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1 Instaler</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation type="unfinished"/>
</message>
@@ -407,17 +374,17 @@ 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="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
<translation type="unfinished"/>
</message>
@@ -428,83 +395,83 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<source><strong>Select a partition to install on</strong></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1116,12 +1083,12 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
@@ -1137,12 +1104,12 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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"/>
</message>
@@ -1228,40 +1195,38 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Regija:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Zona:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Postavi vremensku zonu na %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1332,17 +1297,17 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1785,55 +1750,60 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2069,42 +2039,42 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
@@ -2238,22 +2208,27 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts
index 420cd590999de392f16f10b815df7d27d3d284bf..7d27bfb54bac448fff6a41a18498bd3170885916 100644
--- a/lang/calamares_sv.ts
+++ b/lang/calamares_sv.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="sv" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Välj partition att förminska:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Fördela diskutrymme genom att flytta markören nedanför:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>Med denna handling kommer partitionen <strong>%1</strong> som innehåller %4 att förminskas till %2 MB och en ny %3 MB stor partition kommer att skapas för %5.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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-systempartition kunde hittas. Gå tillbaka och partitionera din hårddisk manuellt för %1.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="208"/>
- <source>The EFI system partition at %1 will be used for starting %2.</source>
- <translation>EFI-systempartitionen %1 kommer att användas för att starta %2.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>EFI-systempartition:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -343,12 +310,12 @@ Alla ändringar kommer att gå förlorade.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1-installationsprogram</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Visa avlusningsinformation</translation>
</message>
@@ -407,17 +374,17 @@ Alla ändringar kommer att gå förlorade.</translation>
<translation>Efter:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<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="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>Sökväg till uppstartshanterare:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<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>
@@ -428,83 +395,83 @@ Alla ändringar kommer att gå förlorade.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Nuvarande:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<source><strong>Select a partition to install on</strong></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>EFI system partition:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1116,12 +1083,12 @@ Alla ändringar kommer att gå förlorade.</translation>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Sätt tangenbordsmodell till %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Sätt tangentbordslayout till %1/%2.</translation>
</message>
@@ -1137,12 +1104,12 @@ Alla ändringar kommer att gå förlorade.</translation>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>Systemspråksinställning</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>Systemspråket påverkar vilket språk och teckenuppsättning somliga kommandoradsprogram använder.<br/>Det nuvarande språket är <strong>%1</strong>.</translation>
</message>
@@ -1228,40 +1195,38 @@ Alla ändringar kommer att gå förlorade.</translation>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Region:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Zon:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>Ändra...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Sätt tidszon till %1/%2.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1332,17 +1297,17 @@ Alla ändringar kommer att gå förlorade.</translation>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1785,55 +1750,60 @@ Alla ändringar kommer att gå förlorade.</translation>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>Samlar systeminformation...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>har minst %1 GB arbetsminne</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>är ansluten till en strömkälla</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>Systemet är inte anslutet till någon strömkälla.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>är ansluten till internet</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>Systemet är inte anslutet till internet.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>Installationsprogammet körs inte med administratörsrättigheter.</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2069,42 +2039,42 @@ Alla ändringar kommer att gå förlorade.</translation>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>Ange lösenord för användare %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>Ställer in lösenord för användaren %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>Ogiltig systemsökväg till målet.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>rootMonteringspunkt är %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>Kan inte ställa in lösenord för användare %1.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>usermod avslutade med felkod %1.</translation>
</message>
@@ -2238,22 +2208,27 @@ Alla ändringar kommer att gå förlorade.</translation>
<translation>Om</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>V&auml;lkommen till %1-installeraren.</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>Om %1-installationsprogrammet</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>%1-support</translation>
</message>
diff --git a/lang/calamares_th.ts b/lang/calamares_th.ts
index 858055a3920044bf639e67f95eba059a7ee06061..baf78f034244d57af9a187be3ea8fc30d0e3ed18 100644
--- a/lang/calamares_th.ts
+++ b/lang/calamares_th.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="th" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>เลือกพาร์ทิชันที่ต้องการย่อขนาด:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>จองพื้นที่ในไดรฟ์โดยการเลื่อนตัวแบ่งพื้นที่ที่ด้านล่าง:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>ในการปฏิบัติการนี้ พาร์ทิชัน <strong>%1</strong> ซึ่งมี %4 จะถูกทำการ shrunk ไปเป็น %2MB และพาร์ทิชัน %3MB ใหม่จะถูกสร้างขึ้นสำหรับ %5</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>พาร์ทิชันสำหรับระบบ EFI:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -343,12 +310,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>ตัวติดตั้ง %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>แสดงข้อมูลการดีบั๊ก</translation>
</message>
@@ -407,17 +374,17 @@ 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="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
<translation type="unfinished"/>
</message>
@@ -428,83 +395,83 @@ The installer will quit and all changes will be lost.</source>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<source><strong>Select a partition to install on</strong></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1116,12 +1083,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>ตั้งค่าโมเดลแป้นพิมพ์เป็น %1<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>ตั้งค่าแบบแป้นพิมพ์เป็น %1/%2</translation>
</message>
@@ -1137,12 +1104,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>การตั้งค่า locale ระบบ</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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"/>
</message>
@@ -1228,40 +1195,38 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>ภูมิภาค:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>โซน:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>&C เปลี่ยนแปลง...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>ตั้งโซนเวลาเป็น %1/%2<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1332,17 +1297,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1785,55 +1750,60 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2069,42 +2039,42 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>ตั้งรหัสผ่านสำหรับผู้ใช้ %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>path ของระบบเป้าหมายไม่ถูกต้อง</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>rootMountPoint คือ %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>ไม่สามารถตั้งค่ารหัสผ่านสำหรับผู้ใช้ %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>usermod จบด้วยโค้ดข้อผิดพลาด %1</translation>
</message>
@@ -2238,22 +2208,27 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_tr_TR.ts b/lang/calamares_tr_TR.ts
index 806ff0f94a5c14ba658dfaad753580397792cab3..591fa71121e3cd0649b8ccbface13a4d2f2e141f 100644
--- a/lang/calamares_tr_TR.ts
+++ b/lang/calamares_tr_TR.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="tr_TR" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Küçültmek için bir disk bölümü seçin:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Aşağıdaki bölümleyiciyi sürükleyerek kullanılabilir disk alanı belirle:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>Bu işlem ile <strong>%1</strong> bölümü içeren %4 %2MB küçültülecek ve yeni bölüm %3MB oluşturulacak %5 için.</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>EFI sistem bölümü:</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -343,12 +310,12 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1 Yükleniyor</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>Hata ayıklama bilgisini göster</translation>
</message>
@@ -409,17 +376,17 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.</t
<translation>Sonra:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<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="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>Önyükleyici konumu:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<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>
@@ -430,84 +397,84 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.</t
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>Geçerli:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<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="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>EFI sistem bölümü:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1040,7 +1007,7 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.</t
<message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="43"/>
<source>Finish</source>
- <translation>Kurulum Tamamlanıyor</translation>
+ <translation>Kurulum Tamam</translation>
</message>
</context>
<context>
@@ -1119,12 +1086,12 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.</t
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>%1 Klavye düzeni olarak seçildi.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Alt klavye türevi olarak %1/%2 seçildi.</translation>
</message>
@@ -1140,12 +1107,12 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.</t
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>Sistem yerel ayarları</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>Sistem yerel ayarı, bazı uçbirim, kullanıcı ayarlamaları ve başkaca dil seçeneklerini belirler ve etkiler. <br/>Varsayılan geçerli ayarlar <strong>%1</strong>.</translation>
</message>
@@ -1231,40 +1198,38 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.</t
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation>Sistem dili %1 olarak ayarlanacak.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Sayılar ve günler için sistem yereli %1 olarak ayarlanacak.</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>Bölge:</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>Şehir:</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>&Değiştir...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>Bölge ve zaman dilimi %1/%2 olarak ayarlandı.<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation>%1 (%2)</translation>
@@ -1335,17 +1300,17 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.</t
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation>İsim</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation>Açıklama</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation>Ağ Üzerinden Kurulum. (Devre Dışı: Paket listeleri alınamıyor, ağ bağlantısını kontrol ediniz)</translation>
</message>
@@ -1789,56 +1754,61 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.</t
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>Sistem bilgileri toplanıyor...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation>En az %1 GB disk alanı olduğundan...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<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>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>En az %1 GB bellek bulunduğundan...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation>Yeterli ram bellek gereksinimi karşılanamıyor. En az %1 GB ram bellek gereklidir.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>Bir güç kaynağına takılı olduğundan...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>
Sistem güç kaynağına bağlı değil.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>İnternete bağlı olduğundan...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>Sistem internete bağlı değil.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>Sistem yükleyici yönetici haklarına sahip olmadan çalışmıyor.</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2074,42 +2044,42 @@ Sistem güç kaynağına bağlı değil.</translation>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>%1 Kullanıcı için parola ayarla</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>%1 Kullanıcısı için parola ayarlanıyor.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>Hedef sistem yolu bozuk.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>rootBağlamaNoktası %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation>root hesap devre dışı bırakılamaz.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation>passwd %1 hata kodu ile sonlandı.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>%1 Kullanıcısı için parola ayarlanamadı.</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>usermod %1 hata koduyla çöktü.</translation>
</message>
@@ -2243,22 +2213,27 @@ Sistem güç kaynağına bağlı değil.</translation>
<translation>&Hakkında</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>%1 Sistem Yükleyiciye Hoşgeldiniz.</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>%1 sistem yükleyici hakkında</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Telif Hakkı 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Teşekkürler: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg ve <a href="https://www.transifex.com/calamares/calamares/">Calamares çeviri takımı</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> gelişim sponsoru <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Özgür Yazılım.</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>%1 destek</translation>
</message>
diff --git a/lang/calamares_uk.ts b/lang/calamares_uk.ts
index ce36d5e9af33632679cdccd0016b638f2ae04bfa..0f22d74fa67f09f2cef93018b1feb0b86b8225ea 100644
--- a/lang/calamares_uk.ts
+++ b/lang/calamares_uk.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="uk" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>Оберіть розділ для зменьшення:</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>Виділіть місце на диску, перетягнувши роздільник нижче</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -336,12 +303,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1 Установник</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation type="unfinished"/>
</message>
@@ -400,17 +367,17 @@ 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="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
<translation type="unfinished"/>
</message>
@@ -421,83 +388,83 @@ The installer will quit and all changes will be lost.</source>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<source><strong>Select a partition to install on</strong></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1109,12 +1076,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
@@ -1130,12 +1097,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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"/>
</message>
@@ -1221,40 +1188,38 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1325,17 +1290,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1778,55 +1743,60 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2062,42 +2032,42 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
@@ -2231,22 +2201,27 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_ur.ts b/lang/calamares_ur.ts
index 2a42f343572c672a82d5e2c53344828c18e8fcc3..6394bb85d34ccefaaa6d3834f6a188a9fa01eda6 100644
--- a/lang/calamares_ur.ts
+++ b/lang/calamares_ur.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="ur" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -336,12 +303,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation type="unfinished"/>
</message>
@@ -400,17 +367,17 @@ 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="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
<translation type="unfinished"/>
</message>
@@ -421,83 +388,83 @@ The installer will quit and all changes will be lost.</source>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<source><strong>Select a partition to install on</strong></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1109,12 +1076,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
@@ -1130,12 +1097,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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"/>
</message>
@@ -1221,40 +1188,38 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1325,17 +1290,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1778,55 +1743,60 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2062,42 +2032,42 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
@@ -2231,22 +2201,27 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_uz.ts b/lang/calamares_uz.ts
index f38ef17a2f4eb25ae7b00f871713138eb92c7648..20523b332f0950eb81840ff7c6187ffe3ffddeb2 100644
--- a/lang/calamares_uz.ts
+++ b/lang/calamares_uz.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="uz" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -336,12 +303,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation type="unfinished"/>
</message>
@@ -400,17 +367,17 @@ 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="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
<translation type="unfinished"/>
</message>
@@ -421,83 +388,83 @@ The installer will quit and all changes will be lost.</source>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<source><strong>Select a partition to install on</strong></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1109,12 +1076,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
@@ -1130,12 +1097,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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"/>
</message>
@@ -1221,40 +1188,38 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
@@ -1325,17 +1290,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
</message>
@@ -1778,55 +1743,60 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2062,42 +2032,42 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation type="unfinished"/>
</message>
@@ -2231,22 +2201,27 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_zh_CN.ts b/lang/calamares_zh_CN.ts
index ace52baf259b2275f3f7d993c962f51eb48e0426..58ce0f72d86a149a6e73102667eb787719dc2405 100644
--- a/lang/calamares_zh_CN.ts
+++ b/lang/calamares_zh_CN.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_CN" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>选择要缩小的分区：</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>拖动下方的分隔来调整分区空间：</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>在此操作后，带有 %4 的分区 <strong>%1</strong> 将缩小到 %2MB，而后将为 %5 创建一个 %3MB 大小的分区。</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>EFI 系统分区：</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -344,12 +311,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1 安装程序</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>显示调试信息</translation>
</message>
@@ -408,17 +375,17 @@ The installer will quit and all changes will be lost.</source>
<translation>之后：</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation><strong>手动分区</strong><br/>您可以自行创建或重新调整分区大小。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>引导程序位置：</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<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>
@@ -429,83 +396,83 @@ The installer will quit and all changes will be lost.</source>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>当前：</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation>将 %1 重用为 %2 的家分区。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>EFI 系统分区：</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1118,12 +1085,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>设置键盘型号为 %1。<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>设置键盘布局为 %1/%2。</translation>
</message>
@@ -1139,12 +1106,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>系统语区设置</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>系统语言区域设置会影响部份命令行用户界面的语言及字符集。<br/>目前的设置为 <strong>%1</strong>。</translation>
</message>
@@ -1230,40 +1197,38 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation>系统语言将设置为 %1。</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>数字和日期地域将设置为 %1。</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>地区：</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>区域：</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>更改 (&C) ...</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>设置时区为 %1/%2。<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation>%1（%2）</translation>
@@ -1334,17 +1299,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation>名称</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation>描述</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation>网络安装。（已禁用：无法获取软件包列表，请检查网络连接）</translation>
</message>
@@ -1787,55 +1752,60 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>正在收集系统信息 ...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation>至少 %1 GB 可用磁盘空间</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation>没有足够的磁盘空间。至少需要 %1 GB。</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>至少 %1 GB 可用内存</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation>系统没有足够的内存。至少需要 %1 GB。</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>已连接到电源</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>系统未连接到电源。</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>已连接到互联网</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>系统未连接到互联网。</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>安装器未以管理员权限运行</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2071,42 +2041,42 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>设置用户 %1 的密码</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>正在为用户 %1 设置密码。</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>非法的目标系统路径。</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>根挂载点为 %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation>无法禁用 root 帐号。</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation>passwd 以错误代码 %1 终止。</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>无法设置用户 %1 的密码。</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>usermod 以错误代码 %1 中止。</translation>
</message>
@@ -2240,22 +2210,27 @@ The installer will quit and all changes will be lost.</source>
<translation>关于(&A)</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>欢迎来到 %1 安装程序。</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>关于 %1 安装程序</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>感谢：Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg 以及 <a href="https://www.transifex.com/calamares/calamares/">Calamares 翻译团队</a>。<br/><br/><a href="http://calamares.io/">Calamares</a> 的开发由 <br/><a href="http://www.blue-systems.com/">Blue Systems</a> 赞助。</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>%1 的支持信息</translation>
</message>
diff --git a/lang/calamares_zh_TW.ts b/lang/calamares_zh_TW.ts
index 4b1495c394c2be2967aa5b2dde6ce50fcc7c072f..ca64e9389320e6f34fab48cbe56bd678819cc092 100644
--- a/lang/calamares_zh_TW.ts
+++ b/lang/calamares_zh_TW.ts
@@ -1,37 +1,4 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_TW" version="2.1">
-<context>
- <name>AlongsidePage</name>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="77"/>
- <source>Choose partition to shrink:</source>
- <translation>請選擇要縮減的磁區：</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="78"/>
- <source>Allocate drive space by dragging the divider below:</source>
- <translation>拖曳以下的分界線以分配裝置空間</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="121"/>
- <source>With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5.</source>
- <translation>將會執行以下操作：縮減原容量為 %4 的分割區 <strong>%1</strong> 為 %2MB 並新建一個新的 %3MB 分割區以容納 %5 。</translation>
- </message>
- <message>
- <location filename="../src/modules/partition/gui/AlongsidePage.cpp" line="198"/>
- <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/AlongsidePage.cpp" line="208"/>
- <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/AlongsidePage.cpp" line="218"/>
- <source>EFI system partition:</source>
- <translation>EFI 系統分割區：</translation>
- </message>
-</context>
<context>
<name>BootInfoWidget</name>
<message>
@@ -343,12 +310,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation>%1 安裝程式</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="98"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="113"/>
<source>Show debug information</source>
<translation>顯示除錯資訊</translation>
</message>
@@ -407,17 +374,17 @@ The installer will quit and all changes will be lost.</source>
<translation>之後：</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="240"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="234"/>
<source><strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.</source>
<translation><strong>手動分割</strong><br/>您可以自行建立或重新調整分割區大小。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="975"/>
<source>Boot loader location:</source>
<translation>開機載入器位置：</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="923"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="917"/>
<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>
@@ -428,83 +395,83 @@ The installer will quit and all changes will be lost.</source>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="905"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="952"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1032"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="899"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="946"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1026"/>
<source>Current:</source>
<translation>目前：</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="782"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="776"/>
<source>Reuse %1 as home partition for %2.</source>
<translation>重新使用 %1 作為 %2 的家目錄分割區。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="906"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="900"/>
<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="1023"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1017"/>
<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="1079"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1073"/>
<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="1089"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1083"/>
<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="1098"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1092"/>
<source>EFI system partition:</source>
<translation>EFI 系統分割區：</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1183"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1177"/>
<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="1188"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1228"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1252"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1290"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1182"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1222"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1246"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1284"/>
<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="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1211"/>
<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="1192"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1223"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1247"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1285"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1186"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1217"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1241"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
<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="1197"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1233"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1256"/>
- <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1294"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1191"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1227"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1250"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1288"/>
<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="1242"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1236"/>
<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="1280"/>
+ <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
<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>
@@ -1116,12 +1083,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>KeyboardPage</name>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="193"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
<source>Set keyboard model to %1.<br/></source>
<translation>設定鍵盤型號為 %1 。<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="195"/>
+ <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="210"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>設定鍵盤佈局為 %1/%2 。</translation>
</message>
@@ -1137,12 +1104,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LCLocaleDialog</name>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="33"/>
+ <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
<source>System locale setting</source>
<translation>系統語系設定</translation>
</message>
<message>
- <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="40"/>
+ <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>系統語系設定會影響部份命令列使用者介面的語言及字元集。<br/>目前的設定為 <strong>%1</strong>。</translation>
</message>
@@ -1228,40 +1195,38 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>LocalePage</name>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="174"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="237"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="236"/>
<source>The system language will be set to %1.</source>
<translation>系統語言將會設定為 %1。</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="206"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="240"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="239"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>數字與日期語系將會被設定為 %1。</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation>地區</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="217"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation>時區</translation>
</message>
<message>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
- <location filename="../src/modules/locale/LocalePage.cpp" line="222"/>
<source>&Change...</source>
<translation>變更...(&C)</translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="390"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="391"/>
<source>Set timezone to %1/%2.<br/></source>
<translation>設定時區為 %1/%2 。<br/></translation>
</message>
<message>
- <location filename="../src/modules/locale/LocalePage.cpp" line="465"/>
+ <location filename="../src/modules/locale/LocalePage.cpp" line="466"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation>%1 (%2)</translation>
@@ -1332,17 +1297,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>NetInstallPage</name>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="71"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Name</source>
<translation>名稱</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="72"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="74"/>
<source>Description</source>
<translation>描述</translation>
</message>
<message>
- <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="81"/>
+ <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="83"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation>網路安裝。（已停用：無法擷取軟體包清單，請檢查您的網路連線）</translation>
</message>
@@ -1785,55 +1750,60 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>RequirementsChecker</name>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="61"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="64"/>
<source>Gathering system information...</source>
<translation>收集系統資訊中...</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="102"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="108"/>
<source>has at least %1 GB available drive space</source>
<translation>有至少 %1 GB 的可用磁碟空間</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="104"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="110"/>
<source>There is not enough drive space. At least %1 GB is required.</source>
<translation>沒有足夠的磁碟空間。至少需要 %1 GB。</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="112"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
<source>has at least %1 GB working memory</source>
<translation>有至少 %1 GB 的可用記憶體</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="114"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
<source>The system does not have enough working memory. At least %1 GB is required.</source>
<translation>系統沒有足夠的記憶體。至少需要 %1 GB。</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
<source>is plugged in to a power source</source>
<translation>已插入外接電源</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="129"/>
<source>The system is not plugged in to a power source.</source>
<translation>系統未插入外接電源。</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is connected to the Internet</source>
<translation>已連上網際網路</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not connected to the Internet.</source>
<translation>系統未連上網際網路</translation>
</message>
<message>
- <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The installer is not running with administrator rights.</source>
<translation>安裝程式並未以管理員權限執行。</translation>
</message>
+ <message>
+ <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
+ <source>The screen is too small to display the installer.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ResizeFileSystemJob</name>
@@ -2069,42 +2039,42 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>SetPasswordJob</name>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="42"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="44"/>
<source>Set password for user %1</source>
<translation>為使用者 %1 設定密碼</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="49"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="51"/>
<source>Setting password for user %1.</source>
<translation>正在為使用者 %1 設定密碼。</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="59"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="108"/>
<source>Bad destination system path.</source>
<translation>非法的目標系統路徑。</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="60"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="109"/>
<source>rootMountPoint is %1</source>
<translation>根掛載點為 %1</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="70"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="119"/>
<source>Cannot disable root account.</source>
<translation>無法停用 root 帳號。</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="71"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="120"/>
<source>passwd terminated with error code %1.</source>
<translation>passwd 以錯誤代碼 %1 終止。</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="87"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="135"/>
<source>Cannot set password for user %1.</source>
<translation>無法為使用者 %1 設定密碼。</translation>
</message>
<message>
- <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+ <location filename="../src/modules/users/SetPasswordJob.cpp" line="137"/>
<source>usermod terminated with error code %1.</source>
<translation>usermod 以錯誤代碼 %1 終止。</translation>
</message>
@@ -2238,22 +2208,27 @@ The installer will quit and all changes will be lost.</source>
<translation>關於(&A)</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source><h1>Welcome to the %1 installer.</h1></source>
<translation><h1>歡迎使用 %1 安裝程式。</h1></translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+ <source><h1>Welcome to the Calamares installer for %1.</h1></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="74"/>
<source>About %1 installer</source>
<translation>關於 %1 安裝程式</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="76"/>
<source><h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
<translation><h1>%1</h1><br/><strong>%2<br/>為 %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac <teo@kde.org><br/>感謝：Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg 與 <a href="https://www.transifex.com/calamares/calamares/">Calamares 翻譯團隊</a>。<br/><br/><a href="http://calamares.io/">Calamares</a> 開發由 <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software 贊助。</translation>
</message>
<message>
- <location filename="../src/modules/welcome/WelcomePage.cpp" line="196"/>
+ <location filename="../src/modules/welcome/WelcomePage.cpp" line="200"/>
<source>%1 support</source>
<translation>%1 支援</translation>
</message>
diff --git a/man/calamares.8 b/man/calamares.8
new file mode 100644
index 0000000000000000000000000000000000000000..028e616d1e5c54a864a8666073f72b36d355c1a4
--- /dev/null
+++ b/man/calamares.8
@@ -0,0 +1,41 @@
+.TH CALAMARES "8"
+.SH NAME
+calamares \- distribution-independent system installer
+.SH SYNOPSIS
+.B calamares
+[\fI\,options\/\fR]
+.SH DESCRIPTION
+.B calamares
+is a distribution-independent system installer, with an advanced partitioning
+feature for both manual and automated partitioning operations. It is the
+first installer with an automated “Replace Partition” option, which makes it
+easy to reuse a partition over and over for distribution testing. Calamares is
+designed to be customizable by distribution maintainers without need for
+cumbersome patching, thanks to third party branding and external modules
+support.
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Displays this help.
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Displays version information.
+.TP
+\fB\-d\fR, \fB\-\-debug\fR
+Verbose output for debugging purposes.
+.TP
+\fB\-c\fR, \fB\-\-config\fR <config>
+Configuration directory to use, for testing purposes.
+.SH "SEE ALSO"
+The
+.B calamares
+website: https://calamares.io
+.SH "BUGS"
+Please report any bugs to https://calamares.io/issues
+.SH AUTHORS
+.B calamares
+is written by Teo Mrnjavac <teo@kde.org>,
+Adriaan de Groot <groot@kde.org> and
+an international group of contributors.
+.LP
+This man page is written by Jonathan Carter <jcarter@linux.com>
diff --git a/src/branding/default/branding.desc b/src/branding/default/branding.desc
index 4c14c9cae08641cacac90ba762031f1d97d91764..22443c3502c87e719212c6bc45ccd98458b480a3 100644
--- a/src/branding/default/branding.desc
+++ b/src/branding/default/branding.desc
@@ -1,6 +1,13 @@
---
componentName: default
+# This selects between different welcome texts. When false, uses
+# the traditional "Welcome to the %1 installer.", and when true,
+# uses "Welcome to the Calamares installer for %1." This allows
+# to distinguish this installer from other installers for the
+# same distribution.
+welcomeStyleCalamares: false
+
strings:
productName: Generic GNU/Linux
shortProductName: Generic
@@ -21,7 +28,16 @@ images:
slideshow: "show.qml"
+# Colors for text and background components.
+#
+# - sidebarBackground is the background of the sidebar
+# - sidebarText is the (foreground) text color
+# - sidebarTextHighlight sets the background of the selected (current) step.
+# Optional, and defaults to the application palette.
+# - sidebarSelect is the text color of the selected step.
+#
style:
sidebarBackground: "#292F34"
sidebarText: "#FFFFFF"
sidebarTextSelect: "#292F34"
+ sidebarTextHighlight: "#D35400"
diff --git a/src/calamares/CalamaresApplication.h b/src/calamares/CalamaresApplication.h
index 5aa33ed976efc6b365117de9018a25ade28462f6..2c1cd1a098561ef584b80081697afe712c66b5b6 100644
--- a/src/calamares/CalamaresApplication.h
+++ b/src/calamares/CalamaresApplication.h
@@ -32,6 +32,11 @@ namespace Calamares
class ModuleManager;
}
+
+/**
+ * @brief The CalamaresApplication class extends QApplication to handle
+ * Calamares startup and lifetime of main components.
+ */
class CalamaresApplication : public QApplication
{
Q_OBJECT
@@ -39,12 +44,27 @@ public:
CalamaresApplication( int& argc, char* argv[] );
virtual ~CalamaresApplication();
+ /**
+ * @brief init handles the first part of Calamares application startup.
+ * After the main window shows up, the latter part of the startup sequence
+ * (including modules loading) happens asynchronously.
+ */
void init();
static CalamaresApplication* instance();
+ /**
+ * @brief setDebug controls whether debug mode is enabled
+ */
void setDebug( bool enabled );
+
+ /**
+ * @brief isDebug returns true if running in debug mode, otherwise false.
+ */
bool isDebug();
+ /**
+ * @brief mainWindow returns the Calamares application main window.
+ */
CalamaresWindow* mainWindow();
private slots:
diff --git a/src/calamares/CalamaresWindow.h b/src/calamares/CalamaresWindow.h
index 6ea9602a5c5dc02aa39a118d99a316e8098df211..7b2cfa6fac07238a40a4629709732d7ddefb3545 100644
--- a/src/calamares/CalamaresWindow.h
+++ b/src/calamares/CalamaresWindow.h
@@ -27,6 +27,9 @@ namespace Calamares
class DebugWindow;
}
+/**
+ * @brief The CalamaresWindow class represents the main window of the Calamares UI.
+ */
class CalamaresWindow : public QWidget
{
Q_OBJECT
diff --git a/src/calamares/progresstree/ProgressTreeDelegate.cpp b/src/calamares/progresstree/ProgressTreeDelegate.cpp
index 4b2ab65bb0c8ed1fe212376f514b6b8b8e590ec2..e8f7700c3bba55b339eed1a1c6992eca00237e51 100644
--- a/src/calamares/progresstree/ProgressTreeDelegate.cpp
+++ b/src/calamares/progresstree/ProgressTreeDelegate.cpp
@@ -1,6 +1,7 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
*
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ * Copyright 2017, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -104,7 +105,12 @@ ProgressTreeDelegate::paintViewStep( QPainter* painter,
{
painter->setPen( Calamares::Branding::instance()->
styleString( Calamares::Branding::SidebarTextSelect ) );
- painter->setBrush( APP->mainWindow()->palette().background() );
+ QString textHighlight = Calamares::Branding::instance()->
+ styleString( Calamares::Branding::SidebarTextHighlight );
+ if ( textHighlight.isEmpty() )
+ painter->setBrush( APP->mainWindow()->palette().background() );
+ else
+ painter->setBrush( QColor( textHighlight ) );
}
painter->fillRect( option.rect, painter->brush().color() );
diff --git a/src/calamares/progresstree/ProgressTreeDelegate.h b/src/calamares/progresstree/ProgressTreeDelegate.h
index b3f6d4ab2a7be86134435f3309b1c81b6f8742c2..ed3aae9dea3286b93f41c3e7279653be10910a10 100644
--- a/src/calamares/progresstree/ProgressTreeDelegate.h
+++ b/src/calamares/progresstree/ProgressTreeDelegate.h
@@ -21,6 +21,12 @@
#include <QStyledItemDelegate>
+
+/**
+ * @brief The ProgressTreeDelegate class customizes the look and feel of the
+ * ProgressTreeView elements.
+ * @see ProgressTreeView
+ */
class ProgressTreeDelegate : public QStyledItemDelegate
{
Q_OBJECT
diff --git a/src/calamares/progresstree/ProgressTreeItem.h b/src/calamares/progresstree/ProgressTreeItem.h
index 66c07863a3ff97c24b67063b34dafc2db1e4cbbd..bfce062a7f00c5a1d428266197ae2126b668dc60 100644
--- a/src/calamares/progresstree/ProgressTreeItem.h
+++ b/src/calamares/progresstree/ProgressTreeItem.h
@@ -22,6 +22,12 @@
#include <QList>
#include <QVariant>
+
+/**
+ * @brief The ProgressTreeItem class represents an item in the
+ * ProgressTreeModel/ProgressTreeView.
+ * Each item generally represents a ViewStep.
+ */
class ProgressTreeItem
{
public:
diff --git a/src/calamares/progresstree/ProgressTreeModel.h b/src/calamares/progresstree/ProgressTreeModel.h
index 39ec64a3eb93390a63777be8318994e443f4fd99..60db779397b941b06ab85e69cdb808c140509af6 100644
--- a/src/calamares/progresstree/ProgressTreeModel.h
+++ b/src/calamares/progresstree/ProgressTreeModel.h
@@ -24,6 +24,10 @@
class ProgressTreeRoot;
class ProgressTreeItem;
+
+/**
+ * @brief The ProgressTreeModel class implements a model for the ProgressTreeView.
+ */
class ProgressTreeModel : public QAbstractItemModel
{
Q_OBJECT
diff --git a/src/calamares/progresstree/ProgressTreeView.h b/src/calamares/progresstree/ProgressTreeView.h
index b908449c2c65ba25478e53c56d9702e6414ff6b8..fae75d0dc65367a2ec1fb6b6650c62b4e358afc5 100644
--- a/src/calamares/progresstree/ProgressTreeView.h
+++ b/src/calamares/progresstree/ProgressTreeView.h
@@ -23,6 +23,11 @@
class ProgressTreeDelegate;
+/**
+ * @brief The ProgressTreeView class is a modified QTreeView which displays the
+ * available view steps and the user's progress through them.
+ * @note singleton, only access through ProgressTreeView::instance().
+ */
class ProgressTreeView : public QTreeView
{
Q_OBJECT
@@ -32,6 +37,9 @@ public:
explicit ProgressTreeView( QWidget* parent = 0 );
virtual ~ProgressTreeView();
+ /**
+ * @brief setModel assigns a model to this view.
+ */
void setModel( QAbstractItemModel* model ) override;
private:
diff --git a/src/libcalamares/GlobalStorage.cpp b/src/libcalamares/GlobalStorage.cpp
index 1ade3d3bc2ecad81d456a86b4330bff4953689e4..c872482be3682df48420a43a7db4b0117088c813 100644
--- a/src/libcalamares/GlobalStorage.cpp
+++ b/src/libcalamares/GlobalStorage.cpp
@@ -1,6 +1,7 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
*
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ * Copyright 2017, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/libcalamares/GlobalStorage.h b/src/libcalamares/GlobalStorage.h
index 301800adc5c8f6d262b69a42b91cc17b501e5ece..012a516a18d223ab816dad903a73394654fca9f7 100644
--- a/src/libcalamares/GlobalStorage.h
+++ b/src/libcalamares/GlobalStorage.h
@@ -1,6 +1,7 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
*
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ * Copyright 2017, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/libcalamares/utils/CalamaresUtils.h b/src/libcalamares/utils/CalamaresUtils.h
index bc6eb92cbbf00f240883d71ec246a116278d1eab..66650ff571dd7d710fd9edb011605fc079a5349f 100644
--- a/src/libcalamares/utils/CalamaresUtils.h
+++ b/src/libcalamares/utils/CalamaresUtils.h
@@ -33,15 +33,41 @@
class QDir;
class QObject;
+/**
+ * @brief The CalamaresUtils namespace contains utility functions.
+ */
namespace CalamaresUtils
{
DLLEXPORT QDir qmlModulesDir();
+
+ /**
+ * @brief appDataDir returns the directory with common application data.
+ * Defaults to CMAKE_INSTALL_FULL_DATADIR (usually /usr/share/calamares).
+ */
DLLEXPORT QDir appDataDir();
+
+ /**
+ * @brief appLogDir returns the directory for Calamares logs.
+ * Defaults to QStandardPaths::CacheLocation (usually ~/.cache/Calamares).
+ */
DLLEXPORT QDir appLogDir();
+
+ /**
+ * @brief systemLibDir returns the system's lib directory.
+ * Defaults to CMAKE_INSTALL_FULL_LIBDIR (usually /usr/lib64 or /usr/lib).
+ */
DLLEXPORT QDir systemLibDir();
+
+ /**
+ * @brief installTranslator changes the application language.
+ * @param locale the new locale.
+ * @param brandingTranslationsPrefix the branding path prefix, from Calamares::Branding.
+ * @param parent the parent QObject.
+ */
DLLEXPORT void installTranslator( const QLocale& locale,
const QString& brandingTranslationsPrefix,
QObject* parent );
+
DLLEXPORT QString translatorLocaleName();
/**
@@ -52,10 +78,24 @@ namespace CalamaresUtils
DLLEXPORT void setQmlModulesDir( const QDir& dir );
+ /**
+ * @brief removeDiacritics replaces letters with diacritics and ligatures with
+ * alternative forms and digraphs.
+ * @param string the string to transform.
+ * @return the output string with plain characters.
+ */
DLLEXPORT QString removeDiacritics( const QString& string );
+ /**
+ * @brief obscure is a bidirectional obfuscation function, from KStringHandler.
+ * @param string the input string.
+ * @return the obfuscated string.
+ */
DLLEXPORT QString obscure( const QString& string );
+ /**
+ * @brief crash makes Calamares crash immediately.
+ */
DLLEXPORT void crash();
}
diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.h b/src/libcalamares/utils/CalamaresUtilsSystem.h
index c5e99744b38789cc3c4847fe1aa82363a0369cdb..bf3acb41cacd08d93295b7597f9784deade55c2b 100644
--- a/src/libcalamares/utils/CalamaresUtilsSystem.h
+++ b/src/libcalamares/utils/CalamaresUtilsSystem.h
@@ -26,10 +26,20 @@
namespace CalamaresUtils
{
+/**
+ * @brief The System class is a singleton with utility functions that perform
+ * system-specific operations.
+ */
class DLLEXPORT System : public QObject
{
Q_OBJECT
public:
+ /**
+ * @brief System the constructor. Only call this once in a Calamares instance.
+ * @param doChroot set to true if all external commands should run in the
+ * target system chroot, otherwise false to run everything on the current system.
+ * @param parent the QObject parent.
+ */
explicit System( bool doChroot, QObject* parent = nullptr );
virtual ~System();
@@ -37,6 +47,10 @@ public:
/**
* Runs the mount utility with the specified parameters.
+ * @param devicePath the path of the partition to mount.
+ * @param mountPoint the full path of the target mount point.
+ * @param filesystemName the name of the filesystem (optional).
+ * @param options any additional options as passed to mount -o (optional).
* @returns the program's exit code, or:
* -1 = QProcess crash
* -2 = QProcess cannot start
@@ -49,6 +63,13 @@ public:
/**
* Runs the specified command in the chroot of the target system.
+ * @param args the call with arguments, as a string list.
+ * @param workingPath the current working directory for the QProcess
+ * call (optional).
+ * @param stdInput the input string to send to the running process as
+ * standard input (optional).
+ * @param timeoutSec the timeout after which the process will be
+ * killed (optional, default is 0 i.e. no timeout).
* @returns the program's exit code, or:
* -1 = QProcess crash
* -2 = QProcess cannot start
@@ -77,9 +98,11 @@ public:
const QString& stdInput = QString(),
int timeoutSec = 0 );
- DLLEXPORT qint64 getPhysicalMemoryB(); //Better guess, doesn't work in VirualBox
-
+ /**
+ * @brief getTotalMemoryB returns the total main memory, in bytes.
+ */
DLLEXPORT qint64 getTotalMemoryB(); //Always underguessed, but always works on Linux
+ DLLEXPORT qint64 getPhysicalMemoryB(); //Better guess, doesn't work in VirualBox
private:
static System* s_instance;
diff --git a/src/libcalamares/utils/Logger.cpp b/src/libcalamares/utils/Logger.cpp
index a8bcf8f4aa4c95a3cce9b8a41aad1dfb542e6c02..5c18c2d290e3a5b4dcb9dfb5c89c16b5302a287f 100644
--- a/src/libcalamares/utils/Logger.cpp
+++ b/src/libcalamares/utils/Logger.cpp
@@ -2,6 +2,7 @@
*
* Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
* Copyright 2014, Teo Mrnjavac <teo@kde.org>
+ * Copyright 2017, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/libcalamares/utils/Logger.h b/src/libcalamares/utils/Logger.h
index 8ab6b8515521c34c93bc739711ae917806183096..72bed20007703740fc6afda9363a2b85dd57fbbf 100644
--- a/src/libcalamares/utils/Logger.h
+++ b/src/libcalamares/utils/Logger.h
@@ -2,6 +2,7 @@
*
* Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
* Copyright 2014, Teo Mrnjavac <teo@kde.org>
+ * Copyright 2017, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp
index b86172f0a2832e60b398a98a95d3aaa2c86492c6..bb4a63422276a807e63dce6e389c936723475ebc 100644
--- a/src/libcalamaresui/Branding.cpp
+++ b/src/libcalamaresui/Branding.cpp
@@ -1,6 +1,7 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
*
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ * Copyright 2017, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -71,7 +72,8 @@ const QStringList Branding::s_styleEntryStrings =
{
"sidebarBackground",
"sidebarText",
- "sidebarTextSelect"
+ "sidebarTextSelect",
+ "sidebarTextHighlight"
};
@@ -106,6 +108,8 @@ Branding::Branding( const QString& brandingFilePath,
if ( !doc[ "strings" ].IsMap() )
bail( "Syntax error in strings map." );
+ m_welcomeStyleCalamares = doc[ "welcomeStyleCalamares" ].as< bool >( false );
+
QVariantMap strings =
CalamaresUtils::yamlMapToVariant( doc[ "strings" ] ).toMap();
m_strings.clear();
@@ -271,6 +275,11 @@ Branding::slideshowPath() const
return m_slideshowPath;
}
+bool
+Branding::welcomeStyleCalamares() const
+{
+ return m_welcomeStyleCalamares;
+}
void
Branding::setGlobals( GlobalStorage* globalStorage ) const
diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h
index 09e12ecda6069d4fb63d2708e4cfb06624db4860..36534ea4485ab91f6806d7c7db5e2c938b0f835e 100644
--- a/src/libcalamaresui/Branding.h
+++ b/src/libcalamaresui/Branding.h
@@ -1,6 +1,7 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
*
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ * Copyright 2017, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -62,7 +63,8 @@ public:
{
SidebarBackground,
SidebarText,
- SidebarTextSelect
+ SidebarTextSelect,
+ SidebarTextHighlight
};
static Branding* instance();
@@ -81,6 +83,8 @@ public:
QPixmap image( Branding::ImageEntry imageEntry, const QSize& size ) const;
QString slideshowPath() const;
+ bool welcomeStyleCalamares() const;
+
/**
* Creates a map called "branding" in the global storage, and inserts an
* entry for each of the branding strings. This makes the branding
@@ -104,6 +108,8 @@ private:
QMap< QString, QString > m_style;
QString m_slideshowPath;
QString m_translationsPathPrefix;
+
+ bool m_welcomeStyleCalamares;
};
}
diff --git a/src/libcalamaresui/Settings.cpp b/src/libcalamaresui/Settings.cpp
index b2ed81acf6b2860d82006d19a5e6d81f7e82b14b..719f950fe89360f1336f89307db1dce0eac0d176 100644
--- a/src/libcalamaresui/Settings.cpp
+++ b/src/libcalamaresui/Settings.cpp
@@ -1,6 +1,7 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
*
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ * Copyright 2017, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/libcalamaresui/Settings.h b/src/libcalamaresui/Settings.h
index 90658513eba80cc997800ea1a8fd4c8080886af5..4c99eb81135f46f9cfc3286260af6e1c20fe863a 100644
--- a/src/libcalamaresui/Settings.h
+++ b/src/libcalamaresui/Settings.h
@@ -1,6 +1,7 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
*
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ * Copyright 2017, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/libcalamaresui/ViewManager.h b/src/libcalamaresui/ViewManager.h
index 01599d6a77089b795d3aa7eb89440bd11e683677..6e694a14a11544f99ddcea6ea05c69e7382fa453 100644
--- a/src/libcalamaresui/ViewManager.h
+++ b/src/libcalamaresui/ViewManager.h
@@ -33,28 +33,82 @@ namespace Calamares
class ViewStep;
class ExecutionViewStep;
+/**
+ * @brief The ViewManager class handles progression through view pages.
+ * @note Singleton object, only use through ViewManager::instance().
+ */
class UIDLLEXPORT ViewManager : public QObject
{
Q_OBJECT
public:
+ /**
+ * @brief instance access to the ViewManager singleton.
+ * @return
+ */
static ViewManager* instance();
explicit ViewManager( QObject* parent = nullptr );
virtual ~ViewManager();
+ /**
+ * @brief centralWidget always returns the central widget in the Calamares main
+ * window.
+ * @return a pointer to the active QWidget (usually a wizard page provided by a
+ * view module).
+ */
QWidget* centralWidget();
+ /**
+ * @brief addViewStep appends a view step to the roster.
+ * @param step a pointer to the ViewStep object to add.
+ * @note a ViewStep is the active instance of a view module, it aggregates one
+ * or more view pages, plus zero or more jobs which may be created at runtime.
+ */
void addViewStep( ViewStep* step );
+ /**
+ * @brief viewSteps returns the list of currently present view steps.
+ * @return the ViewStepList.
+ * This should only return an empty list before startup is complete.
+ */
ViewStepList viewSteps() const;
+
+ /**
+ * @brief currentStep returns the currently active ViewStep, i.e. the ViewStep
+ * which owns the currently visible view page.
+ * @return the active ViewStep. Do not confuse this with centralWidget().
+ * @see ViewStep::centralWidget
+ */
ViewStep* currentStep() const;
+
+ /**
+ * @brief currentStepIndex returns the index of the currently active ViewStep.
+ * @return the index.
+ */
int currentStepIndex() const;
public slots:
+ /**
+ * @brief next moves forward to the next page of the current ViewStep (if any),
+ * or to the first page of the next ViewStep if the current ViewStep doesn't
+ * have any more pages.
+ */
void next();
+
+ /**
+ * @brief back moves backward to the previous page of the current ViewStep (if any),
+ * or to the last page of the previous ViewStep if the current ViewStep doesn't
+ * have any pages before the current one.
+ */
void back();
+ /**
+ * @brief onInstallationFailed displays an error message when a fatal failure
+ * happens in a ViewStep.
+ * @param message the error string.
+ * @param details the details string.
+ */
void onInstallationFailed( const QString& message, const QString& details );
signals:
diff --git a/src/libcalamaresui/modulesystem/Module.cpp b/src/libcalamaresui/modulesystem/Module.cpp
index 1b3da87e8d197e874dafb0e7af84e27939886827..6f19d36a44d818e82e43f09e3aa500563a0e4fee 100644
--- a/src/libcalamaresui/modulesystem/Module.cpp
+++ b/src/libcalamaresui/modulesystem/Module.cpp
@@ -1,6 +1,7 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
*
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ * Copyright 2017, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/libcalamaresui/modulesystem/Module.h b/src/libcalamaresui/modulesystem/Module.h
index 6934a554ecd91301ee2d1f5e4f8da55518541dc5..7c331351d5a69105603b679216b294b4282093ec 100644
--- a/src/libcalamaresui/modulesystem/Module.h
+++ b/src/libcalamaresui/modulesystem/Module.h
@@ -37,15 +37,32 @@ void operator>>( const QVariantMap& moduleDescriptor, Calamares::Module* m );
namespace Calamares
{
+/**
+ * @brief The Module class is a common supertype for Calamares modules.
+ * It enforces a common interface for all the different types of modules, and it
+ * takes care of creating an object of the correct type starting from a module
+ * descriptor structure.
+ */
class UIDLLEXPORT Module
{
public:
+ /**
+ * @brief The Type enum represents the intended functionality of the module
+ * Every module is either a job module or a view module.
+ * A job module is a single Calamares job.
+ * A view module has a UI (one or more view pages) and zero-to-many jobs.
+ */
enum Type
{
Job,
View
};
+ /**
+ * @brief The Interface enum represents the interface through which the module
+ * talks to Calamares.
+ * Not all Type-Interface associations are valid.
+ */
enum Interface
{
QtPluginInterface,
@@ -55,27 +72,100 @@ public:
};
virtual ~Module();
+ /**
+ * @brief fromDescriptor creates a new Module object of the correct type.
+ * @param moduleDescriptor a module descriptor, already parsed into a variant map.
+ * @param instanceId the instance id of the new module instance.
+ * @param configFileName the name of the configuration file to read.
+ * @param moduleDirectory the path to the directory with this module's files.
+ * @return a pointer to an object of a subtype of Module.
+ */
static Module* fromDescriptor( const QVariantMap& moduleDescriptor,
const QString& instanceId,
const QString& configFileName,
const QString& moduleDirectory );
+ /**
+ * @brief name returns the name of this module.
+ * @return a string with this module's name.
+ */
virtual QString name() const final;
+
+ /**
+ * @brief instanceId returns the instance id of this module.
+ * @return a string with this module's instance id.
+ */
virtual QString instanceId() const final;
+
+ /**
+ * @brief instanceKey returns the instance key of this module.
+ * @return a string with the instance key.
+ * A module instance's instance key is modulename@instanceid.
+ * @example "partition@partition" (default configuration) or
+ * "locale@someconfig" (custom configuration)
+ */
virtual QString instanceKey() const final;
+
+ /**
+ * @brief requiredModules a list of names of modules required by this one.
+ * @return the list of names.
+ * The module dependencies system is currently incomplete and unused.
+ */
virtual QStringList requiredModules() const;
+
+ /**
+ * @brief location returns the full path of this module's directory.
+ * @return the path.
+ */
virtual QString location() const final;
+
+ /**
+ * @brief type returns the Type of this module object.
+ * @return the type enum value.
+ */
virtual Type type() const = 0;
+
+ /**
+ * @brief typeString returns a user-visible string for the module's type.
+ * @return the type string.
+ */
virtual QString typeString() const;
+
+ /**
+ * @brief interface the Interface used by this module.
+ * @return the interface enum value.
+ */
virtual Interface interface() const = 0;
+
+ /**
+ * @brief interface returns a user-visible string for the module's interface.
+ * @return the interface string.
+ */
virtual QString interfaceString() const;
+ /**
+ * @brief isLoaded reports on the loaded status of a module.
+ * @return true if the module's loading phase has finished, otherwise false.
+ */
virtual bool isLoaded() const;
+ /**
+ * @brief loadSelf initialized the module.
+ * Subclasses must reimplement this depending on the module type and interface.
+ */
virtual void loadSelf() = 0;
+ /**
+ * @brief jobs returns any jobs exposed by this module.
+ * @return a list of jobs (can be empty).
+ */
virtual QList< job_ptr > jobs() const = 0;
+ /**
+ * @brief configurationMap returns the contents of the configuration file for
+ * this module instance.
+ * @return the instance's configuration, already parsed from YAML into a variant map.
+ */
QVariantMap configurationMap();
protected:
diff --git a/src/libcalamaresui/modulesystem/ModuleManager.cpp b/src/libcalamaresui/modulesystem/ModuleManager.cpp
index 109882692e13614c99e9966eb883fca549ebc517..dd7abdf29cb33e46ff7337299b86e0587a9c1469 100644
--- a/src/libcalamaresui/modulesystem/ModuleManager.cpp
+++ b/src/libcalamaresui/modulesystem/ModuleManager.cpp
@@ -303,10 +303,6 @@ ModuleManager::loadModules()
evs = new ExecutionViewStep( ViewManager::instance() );
ViewManager::instance()->addViewStep( evs );
}
- else
- {
- cDebug() << "LAST VS IS EVS!";
- }
evs->appendJobModuleInstanceKey( instanceKey );
}
diff --git a/src/libcalamaresui/modulesystem/ModuleManager.h b/src/libcalamaresui/modulesystem/ModuleManager.h
index 7aa3ca418edaf5aadc5b904f5c77611353b47de2..05ad151781f18eeb757d351000ec0889efc1790a 100644
--- a/src/libcalamaresui/modulesystem/ModuleManager.h
+++ b/src/libcalamaresui/modulesystem/ModuleManager.h
@@ -30,6 +30,13 @@ namespace Calamares
class Module;
+/**
+ * @brief The ModuleManager class is a singleton which manages Calamares modules.
+ *
+ * It goes through the module search directories and reads module metadata. It then
+ * constructs objects of type Module, loads them and makes them accessible by their
+ * instance key.
+ */
class ModuleManager : public QObject
{
Q_OBJECT
@@ -46,11 +53,31 @@ public:
*/
void init();
+ /**
+ * @brief loadedInstanceKeys returns a list of instance keys for the available
+ * modules.
+ * @return a QStringList with the instance keys.
+ */
QStringList loadedInstanceKeys();
+
+ /**
+ * @brief moduleDescriptor returns the module descriptor structure for a given module.
+ * @param name the name of the module for which to return the module descriptor.
+ * @return the module descriptor, as a variant map already parsed from YAML.
+ */
QVariantMap moduleDescriptor( const QString& name );
+ /**
+ * @brief moduleInstance returns a Module object for a given instance key.
+ * @param instanceKey the instance key for a module instance.
+ * @return a pointer to an object of a subtype of Module.
+ */
Module* moduleInstance( const QString& instanceKey );
+ /**
+ * @brief loadModules initiates the asynchronous module loading operation.
+ * When this is done, the signal modulesLoaded is emitted.
+ */
void loadModules();
signals:
diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.h b/src/libcalamaresui/utils/CalamaresUtilsGui.h
index 24b23a9461e36c417db590ffa6ca21a1e1338a33..3c57d593008314c5cb2b3daddefa2d8386b952a8 100644
--- a/src/libcalamaresui/utils/CalamaresUtilsGui.h
+++ b/src/libcalamaresui/utils/CalamaresUtilsGui.h
@@ -30,6 +30,14 @@ class QLayout;
namespace CalamaresUtils
{
+
+/**
+ * @brief The ImageType enum lists all common Calamares icons.
+ * Icons are loaded from SVGs and cached. Each icon has an enum value, through which
+ * it can be accessed.
+ * You can forward-declare this as:
+ * enum ImageType : int;
+ */
enum ImageType : int
{
Yes,
@@ -50,6 +58,10 @@ enum ImageType : int
Squid
};
+/**
+ * @brief The ImageMode enum contains different transformations that can be applied.
+ * Most of these are currently unused.
+ */
enum ImageMode
{
Original,
@@ -59,15 +71,46 @@ enum ImageMode
RoundedCorners
};
-UIDLLEXPORT QPixmap defaultPixmap( ImageType type, ImageMode mode = CalamaresUtils::Original, const QSize& size = QSize( 0, 0 ) );
-UIDLLEXPORT QPixmap createRoundedImage( const QPixmap& avatar, const QSize& size, float frameWidthPct = 0.20 );
+/**
+ * @brief defaultPixmap returns a resized and/or transformed pixmap for a given
+ * ImageType.
+ * @param type the ImageType i.e. the enum value for an SVG.
+ * @param mode the transformation to apply (default: no transformation).
+ * @param size the target pixmap size (default: original SVG size).
+ * @return the new pixmap.
+ */
+UIDLLEXPORT QPixmap defaultPixmap( ImageType type,
+ ImageMode mode = CalamaresUtils::Original,
+ const QSize& size = QSize( 0, 0 ) );
+/**
+ * @brief createRoundedImage returns a rounded version of a pixmap.
+ * @param avatar the input pixmap.
+ * @param size the new size.
+ * @param frameWidthPct the frame size, as percentage of width.
+ * @return the transformed pixmap.
+ * This one is currently unused.
+ */
+UIDLLEXPORT QPixmap createRoundedImage( const QPixmap& avatar,
+ const QSize& size,
+ float frameWidthPct = 0.20 );
+
+/**
+ * @brief unmarginLayout recursively walks the QLayout tree and removes all margins.
+ * @param layout the layout to unmargin.
+ */
UIDLLEXPORT void unmarginLayout( QLayout* layout );
+
+/**
+ * @brief clearLayout recursively walks the QLayout tree and deletes all the child
+ * widgets and layouts.
+ * @param layout the layout to clear.
+ */
UIDLLEXPORT void clearLayout( QLayout* layout );
UIDLLEXPORT void setDefaultFontSize( int points );
-UIDLLEXPORT int defaultFontSize();
-UIDLLEXPORT int defaultFontHeight();
+UIDLLEXPORT int defaultFontSize(); // in points
+UIDLLEXPORT int defaultFontHeight(); // in pixels, DPI-specific
UIDLLEXPORT QFont defaultFont();
UIDLLEXPORT QSize defaultIconSize();
diff --git a/src/libcalamaresui/utils/YamlUtils.cpp b/src/libcalamaresui/utils/YamlUtils.cpp
index 313639537df87c8d950fed925dcb77f94cb37f14..1eb7599637c69ce87b364b46e0869a1f77fd065d 100644
--- a/src/libcalamaresui/utils/YamlUtils.cpp
+++ b/src/libcalamaresui/utils/YamlUtils.cpp
@@ -1,6 +1,7 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
*
* Copyright 2014, Teo Mrnjavac <teo@kde.org>
+ * Copyright 2017, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/libcalamaresui/viewpages/PythonQtUtilsWrapper.h b/src/libcalamaresui/viewpages/PythonQtUtilsWrapper.h
index 4e383383308eac230a6faa54ee73e41ce446e039..d1d9bed7bc63bd2a53ef0167a0939b68d7d9413b 100644
--- a/src/libcalamaresui/viewpages/PythonQtUtilsWrapper.h
+++ b/src/libcalamaresui/viewpages/PythonQtUtilsWrapper.h
@@ -24,6 +24,10 @@
#include <QObject>
+/**
+ * @brief The Utils class wraps around functions from CalamaresUtils to make them
+ * available in the PythonQt interface.
+ */
class Utils : public QObject
{
Q_OBJECT
diff --git a/src/libcalamaresui/viewpages/ViewStep.h b/src/libcalamaresui/viewpages/ViewStep.h
index c9dadb18db26c756a1f7df16374aad18d9dcd81a..c68ae31f589b9ff43be8fdbc12d230caa3eb958d 100644
--- a/src/libcalamaresui/viewpages/ViewStep.h
+++ b/src/libcalamaresui/viewpages/ViewStep.h
@@ -27,6 +27,14 @@
namespace Calamares
{
+/**
+ * @brief The ViewStep class is the base class for all view modules.
+ * A view module is a Calamares module which has at least one UI page (exposed as
+ * ViewStep::widget), and can optionally create Calamares jobs at runtime.
+ * As of early 2017, a view module can be implemented by deriving from ViewStep
+ * in C++ (as a Qt Plugin) or in Python with the PythonQt interface (which also
+ * mimics the ViewStep class).
+ */
class UIDLLEXPORT ViewStep : public QObject
{
Q_OBJECT
diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py
index 50845838803459e922f9dbbe4b997cfd1451a29f..fd5990490c01cb125c48de91fc234e8b64fab535 100644
--- a/src/modules/bootloader/main.py
+++ b/src/modules/bootloader/main.py
@@ -176,7 +176,7 @@ def install_systemd_boot(efi_directory):
conf_path = os.path.join(install_efi_directory,
"loader",
"entries",
- distribution_translated +".conf")
+ distribution_translated + ".conf")
fallback_path = os.path.join(install_efi_directory,
"loader",
"entries",
@@ -324,7 +324,7 @@ def run():
esp_found = False
for partition in partitions:
- if (partition["mountPoint"] ==
+ if (partition["mountPoint"] ==
libcalamares.globalstorage.value("efiSystemPartition")):
esp_found = True
diff --git a/src/modules/chrootcfg/main.py b/src/modules/chrootcfg/main.py
index 59f9409b6a225c1accbf71d846c53286194b680c..d9f76d5df44a68f7914a8e1c4969a89f4e77d36b 100644
--- a/src/modules/chrootcfg/main.py
+++ b/src/modules/chrootcfg/main.py
@@ -4,6 +4,7 @@
# === This file is part of Calamares - <http://github.com/calamares> ===
#
# Copyright 2016, Artoo <artoo@manjaro.org>
+# Copyright 2017, Philip Müller <philm@manjaro.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
@@ -18,14 +19,18 @@
# You should have received a copy of the GNU General Public License
# along with Calamares. If not, see <http://www.gnu.org/licenses/>.
-import os, shutil, subprocess, sys, re
-
+import os
+import shutil
+import subprocess
+import sys
+import re
import libcalamares
from libcalamares.utils import check_target_env_call, target_env_call, debug
from os.path import join
from subprocess import call
+
class OperationTracker:
def __init__(self):
self._downloaded = 0
@@ -77,14 +82,21 @@ class OperationTracker:
libcalamares.job.setprogress(self.progress)
+
ON_POSIX = 'posix' in sys.builtin_module_names
+
class PacmanController:
def __init__(self, root):
self.__root = root
- self.__operations = libcalamares.globalstorage.value("packageOperations")
+ self.__operations = libcalamares.globalstorage.value(
+ "packageOperations"
+ )
self.__tracker = OperationTracker()
- self.__keyrings = libcalamares.job.configuration.get('keyrings', [])
+ self.__keyrings = libcalamares.job.configuration.get(
+ 'keyrings',
+ []
+ )
@property
def tracker(self):
@@ -114,7 +126,13 @@ class PacmanController:
last = []
phase = 0
- process = subprocess.Popen(cmd, env=cal_env, bufsize=1, stdout=subprocess.PIPE, close_fds=ON_POSIX)
+ process = subprocess.Popen(
+ cmd,
+ env=cal_env,
+ bufsize=1,
+ stdout=subprocess.PIPE,
+ close_fds=ON_POSIX
+ )
for line in iter(process.stdout.readline, b''):
pkgs = re.findall(r'\((\d+)\)', line.decode())
@@ -130,8 +148,13 @@ class PacmanController:
self.tracker.downloaded += 1
phase = 1
debug("Downloading: {}".format(dl[0]))
- debug("Downloaded packages: {}".format(self.tracker.downloaded))
- self.tracker.send_progress(self.tracker.downloaded, phase)
+ debug("Downloaded packages: {}".format(
+ self.tracker.downloaded
+ ))
+ self.tracker.send_progress(
+ self.tracker.downloaded,
+ phase
+ )
last = dl
elif inst:
@@ -141,7 +164,6 @@ class PacmanController:
debug("Installed packages: {}".format(self.tracker.installed))
self.tracker.send_progress(self.tracker.installed, phase)
-
if process.returncode != 0:
return process.kill()
@@ -156,8 +178,15 @@ class PacmanController:
else:
args.extend(["-Sy"])
- args.extend(["--cachedir", cachedir, "--root", self.root, "--dbpath", dbdir])
- cmd = args + pkglist
+ args.extend([
+ "--cachedir",
+ cachedir,
+ "--root",
+ self.root,
+ "--dbpath",
+ dbdir
+ ])
+ cmd = args + pkglist
self.parse_output(cmd)
def remove(self, pkglist):
@@ -175,7 +204,7 @@ class PacmanController:
elif key == "localInstall":
for pkg in self.operations[key]:
pkgs.extend([pkg["package"]])
- self.install(pkgs,local=True)
+ self.install(pkgs, local=True)
elif key == "remove":
for pkg in self.operations[key]:
pkgs.extend([pkg["package"]])
@@ -195,10 +224,14 @@ class PacmanController:
return None
+
class ChrootController:
def __init__(self):
self.__root = libcalamares.globalstorage.value('rootMountPoint')
- self.__requirements = libcalamares.job.configuration.get('requirements', [])
+ self.__requirements = libcalamares.job.configuration.get(
+ 'requirements',
+ []
+ )
self.__isRank = libcalamares.job.configuration['isRank']
@property
@@ -218,7 +251,7 @@ class ChrootController:
dest = self.root + target["name"]
if not os.path.exists(dest):
debug("Create: {}".format(dest))
- mod = int(target["mode"],8)
+ mod = int(target["mode"], 8)
debug("Mode: {}".format(oct(mod)))
os.makedirs(dest, mode=mod)
@@ -226,14 +259,16 @@ class ChrootController:
call(["pacman-mirrors", "-f", "5"])
def copy_file(self, file):
- if os.path.exists(os.path.join("/",file)):
- shutil.copy2(os.path.join("/",file), os.path.join(self.root, file))
+ if os.path.exists(os.path.join("/", file)):
+ shutil.copy2(
+ os.path.join("/", file),
+ os.path.join(self.root, file)
+ )
def prepare(self):
cal_umask = os.umask(0)
self.make_dirs()
path = join(self.root, "run")
- #debug("Fix permissions: {}".format(path))
os.chmod(path, 0o755)
os.umask(cal_umask)
self.copy_file('etc/pacman-mirrors.conf')
@@ -248,8 +283,12 @@ class ChrootController:
return pacman.run()
+
def run():
- """ Create chroot dirs and install pacman, kernel and netinstall selection """
+ """
+ Create chroot dirs and install pacman,
+ kernel and netinstall selection
+ """
targetRoot = ChrootController()
diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py
index 0aba7baea6cbef265a9707dd3b588cdebc3ad329..84bb460d935efb460bba276e0570a3c631838305 100644
--- a/src/modules/displaymanager/main.py
+++ b/src/modules/displaymanager/main.py
@@ -35,8 +35,12 @@ DesktopEnvironment = collections.namedtuple(
desktop_environments = [
DesktopEnvironment('/usr/bin/startkde', 'plasma'), # KDE Plasma 5
DesktopEnvironment('/usr/bin/startkde', 'kde-plasma'), # KDE Plasma 4
- DesktopEnvironment('/usr/bin/budgie-desktop', 'budgie-desktop'), # Budgie v10.x
- DesktopEnvironment('/usr/bin/budgie-session', 'budgie-desktop'), # Budgie v8.x
+ DesktopEnvironment(
+ '/usr/bin/budgie-desktop', 'budgie-desktop' # Budgie v10
+ ),
+ DesktopEnvironment(
+ '/usr/bin/budgie-session', 'budgie-desktop' # Budgie v8
+ ),
DesktopEnvironment('/usr/bin/gnome-session', 'gnome'),
DesktopEnvironment('/usr/bin/startxfce4', 'xfce'),
DesktopEnvironment('/usr/bin/cinnamon-session-cinnamon', 'cinnamon'),
diff --git a/src/modules/dracut/main.py b/src/modules/dracut/main.py
index 46902fb07f40ff7fb01a84cca421b03dc030396e..d7a9bc4945e00f02d24dab35bf6e94471a1c387d 100644
--- a/src/modules/dracut/main.py
+++ b/src/modules/dracut/main.py
@@ -5,6 +5,7 @@
#
# Copyright 2014-2015, Philip Müller <philm@manjaro.org>
# Copyright 2014, Teo Mrnjavac <teo@kde.org>
+# Copyright 2017, Alf Gaida <agaid@siduction.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
@@ -24,7 +25,8 @@ from libcalamares.utils import target_env_call
def run_dracut():
- """ Creates initramfs, even when initramfs already exists.
+ """
+ Creates initramfs, even when initramfs already exists.
:return:
"""
@@ -32,11 +34,14 @@ def run_dracut():
def run():
- """ Starts routine to create initramfs. It passes back the exit code if it fails.
+ """
+ Starts routine to create initramfs. It passes back the exit code
+ if it fails.
:return:
"""
return_code = run_dracut()
if return_code != 0:
- return "Failed to run dracut on the target", "The exit code was {}".format(return_code)
+ return ("Failed to run dracut on the target",
+ "The exit code was {}".format(return_code))
diff --git a/src/modules/dummypython/main.py b/src/modules/dummypython/main.py
index acf47ac4e066081d233a21ad21ef5cd9711626a0..4a68cf9630887a6d38f1e4ded21301666ee9e9a8 100644
--- a/src/modules/dummypython/main.py
+++ b/src/modules/dummypython/main.py
@@ -4,6 +4,7 @@
# === This file is part of Calamares - <http://github.com/calamares> ===
#
# Copyright 2014, Teo Mrnjavac <teo@kde.org>
+# Copyright 2017, Alf Gaida <agaida@siduction.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
@@ -24,11 +25,12 @@ from time import gmtime, strftime, sleep
def run():
- """ Example Python jobmodule.
+ """
+ Example Python jobmodule.
A Python jobmodule is a Python program which imports libcalamares and
has a function run() as entry point. run() must return None if everything
- went well, or a tuple (str,str) with an error message and description
+ went well, or a tuple (str,str) with an error message and description
if something went wrong.
:return:
@@ -40,13 +42,16 @@ def run():
accumulator += "This job's path: " + libcalamares.job.working_path + "\n"
accumulator += str(libcalamares.job.configuration)
accumulator += " *** globalstorage test ***\n"
- accumulator += "lala: " + str(libcalamares.globalstorage.contains("lala")) + "\n"
- accumulator += "foo: " + str(libcalamares.globalstorage.contains("foo")) + "\n"
+ accumulator += "lala: "
+ accumulator += str(libcalamares.globalstorage.contains("lala")) + "\n"
+ accumulator += "foo: "
+ accumulator += str(libcalamares.globalstorage.contains("foo")) + "\n"
accumulator += "count: " + str(libcalamares.globalstorage.count()) + "\n"
libcalamares.globalstorage.insert("item2", "value2")
libcalamares.globalstorage.insert("item3", 3)
accumulator += "keys: {}\n".format(str(libcalamares.globalstorage.keys()))
- accumulator += "remove: {}\n".format(str(libcalamares.globalstorage.remove("item2")))
+ accumulator += "remove: {}\n".format(
+ str(libcalamares.globalstorage.remove("item2")))
accumulator += "values: {} {} {}\n".format(
str(libcalamares.globalstorage.value("foo")),
str(libcalamares.globalstorage.value("item2")),
diff --git a/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.mo
index becd45fc73d599df3d06b6964f89699313dc744b..2dbb577b9a5727267b7227699ee63533d3d65844 100644
Binary files a/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.po
index a11edab6c256f0314f4b8e726579ccebfcbfd336..42c2cc471bfdcd3f25d28bda0304330b18f09bb6 100644
--- a/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Arabic (https://www.transifex.com/calamares/teams/20061/ar/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.po
index 471fa215bd7963655f9b4c34afbaedebf9e9da6c..dbd5b6269cf24c07859314033545d8e772951390 100644
--- a/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: enolp <enolp@softastur.org>, 2017\n"
"Language-Team: Asturian (https://www.transifex.com/calamares/teams/20061/ast/)\n"
@@ -18,22 +18,22 @@ msgstr ""
"Language: ast\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr "¡Prímime!"
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr "Una QLabel nueva."
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr "El trabayu maniquín de PythonQt"
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr "Esti ye'l trabayu maniquín de PythonQt. El trabayu maniquín diz: {}"
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr "Un mensaxe d'estáu pal trabayu maniquín de PythonQt."
diff --git a/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.mo
index 8b4a5ebad774b14f6f9185bcc3c10590eae6268a..2a4200c122f681599205eb3ac8173fdbc17c6a32 100644
Binary files a/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.po
index 2f8503c5049d16aa815e357f8c403e3d583e3e68..466ebb592ded320b7c4cf2d8f689cf422c3ade3d 100644
--- a/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: bg\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.po
index 97527f5eadb0a9ba045e8986d10b755fe3f1b720..927580eb748c060d6304a83bf0ed9fd30692b3b4 100644
--- a/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Davidmp <medipas@gmail.com>, 2016\n"
"Language-Team: Catalan (https://www.transifex.com/calamares/teams/20061/ca/)\n"
@@ -18,22 +18,22 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr "Clica'm!"
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr "Una etiqueta Q nova."
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr "La tasca Dummy PythonQt"
-#: src/modules/dummypythonqt/main.py:179
+#: 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: {}"
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr "Un missatge d'estat per a la tasca Dummy PythonQt."
diff --git a/src/modules/dummypythonqt/lang/cs_CZ/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/cs_CZ/LC_MESSAGES/dummypythonqt.po
index 93431c5036d722cc7dcfd228c17a03422815ebe3..fd17e4af7391b9559b2fb7d527a7f2f85ddb47fb 100644
--- a/src/modules/dummypythonqt/lang/cs_CZ/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/cs_CZ/LC_MESSAGES/dummypythonqt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: pavelrz <pavel@rzehak.cz>, 2016\n"
"Language-Team: Czech (Czech Republic) (https://www.transifex.com/calamares/teams/20061/cs_CZ/)\n"
@@ -18,22 +18,22 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr "Klikni na mě!"
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr "Nový QLabel."
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr "Testovací úloha PythonQt"
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr "Toto je testovací úloha PythonQt. Testovací úloha říká: {}"
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr "Stavová zpráva o testovací úloze PythonQt."
diff --git a/src/modules/dummypythonqt/lang/da/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/da/LC_MESSAGES/dummypythonqt.po
index 151d0512cf55a6e6c48cfb97359db79396b3a2a5..63d9714450faf405f4e5c123953ed184903e87be 100644
--- a/src/modules/dummypythonqt/lang/da/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/da/LC_MESSAGES/dummypythonqt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: scootergrisen <scootergrisen@gmail.com>, 2017\n"
"Language-Team: Danish (https://www.transifex.com/calamares/teams/20061/da/)\n"
@@ -18,22 +18,22 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr "Klik på mig!"
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr "En ny QLabel."
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr "Dummy PythonQt-jobbet"
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr "Dette er dummy PythonQt-jobbet. Dummy-jobbet siger: {}"
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr "En statusmeddelelse til dummy PythonQt-job."
diff --git a/src/modules/dummypythonqt/lang/de/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/de/LC_MESSAGES/dummypythonqt.po
index e1e048e69c0b7ca83d528d0f3ca2128f617abaf4..05869c0dd718f41cf23ab4c70e0180d036d4a55f 100644
--- a/src/modules/dummypythonqt/lang/de/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/de/LC_MESSAGES/dummypythonqt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Christian Spaan <gyges@gmx.net>, 2017\n"
"Language-Team: German (https://www.transifex.com/calamares/teams/20061/de/)\n"
@@ -18,22 +18,22 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr "Klick mich!"
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr "Ein neues QLabel."
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr "Der Dummy-PythonQt-Job"
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr "Dies ist der Dummy-PythonQt-Job. Der Dummy-Job lautet: {}"
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr "Eine Statusmeldung für den Dummy-PythonQt-Job."
diff --git a/src/modules/dummypythonqt/lang/dummypythonqt.pot b/src/modules/dummypythonqt/lang/dummypythonqt.pot
index 749c441c36377936eada814508bbf06454b0e69f..5c31ddde271e31387bcfefb669cb1d2f9ab84a55 100644
--- a/src/modules/dummypythonqt/lang/dummypythonqt.pot
+++ b/src/modules/dummypythonqt/lang/dummypythonqt.pot
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\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"
@@ -14,22 +14,22 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py 1.5\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr "Click me!"
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr "A new QLabel."
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr "The Dummy PythonQt Job"
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr "This is the Dummy PythonQt Job. The dummy job says: {}"
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr "A status message for Dummy PythonQt Job."
diff --git a/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.mo
index f2fdcb6e670ef30bec70ab2cbc7ac93f70a4160d..84139d5ac4af3093407dcbce1f6ee5412977238e 100644
Binary files a/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.po
index 27ec00a880d704d2748965c55c37cd32d3714d34..dd1ec9ebbf23c4ae42bb215e05c4ab3432c5f322 100644
--- a/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Greek (https://www.transifex.com/calamares/teams/20061/el/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/en_GB/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/en_GB/LC_MESSAGES/dummypythonqt.mo
index 6ab2670c7515fa80a8c3ef73e56b0acb0cfbe812..c87b425b56f30703e64bec6705c2084dbc22b1fa 100644
Binary files a/src/modules/dummypythonqt/lang/en_GB/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/en_GB/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/en_GB/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/en_GB/LC_MESSAGES/dummypythonqt.po
index 27c42ec974b24049a8073fa274a7516bd0f9d0ac..aa0a417ecf51f9739bfa71f39641d6e4fb9d04a2 100644
--- a/src/modules/dummypythonqt/lang/en_GB/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/en_GB/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: English (United Kingdom) (https://www.transifex.com/calamares/teams/20061/en_GB/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/es/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/es/LC_MESSAGES/dummypythonqt.po
index 7dec8d7cc51d207b141db3df30531d8feb059abe..8409e287054154b143c316c96fa4b48562069a88 100644
--- a/src/modules/dummypythonqt/lang/es/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/es/LC_MESSAGES/dummypythonqt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: strel <strelnic@gmail.com>, 2016\n"
"Language-Team: Spanish (https://www.transifex.com/calamares/teams/20061/es/)\n"
@@ -18,22 +18,22 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr "¡Púlsame!"
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr "Una nueva QLabel."
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr "La Tarea PythonQt Ficticia"
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr "Esta es la Tarea PythonQt Ficticia. La tarea ficticia dice: {}"
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr "Un mensaje de estado para la Tarea PythonQt Ficticia."
diff --git a/src/modules/dummypythonqt/lang/es_ES/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/es_ES/LC_MESSAGES/dummypythonqt.mo
index 1d7d8329813f5807096be6a41656604812ad663b..7892bf4aec5058dabe37af95b306f6707f22f1df 100644
Binary files a/src/modules/dummypythonqt/lang/es_ES/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/es_ES/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/es_ES/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/es_ES/LC_MESSAGES/dummypythonqt.po
index 25d3339e1243fd846cf04217b9f67247b1727169..cba2930c4aff92cc7260ab53e33d2a5a67704685 100644
--- a/src/modules/dummypythonqt/lang/es_ES/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/es_ES/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Spanish (Spain) (https://www.transifex.com/calamares/teams/20061/es_ES/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: es_ES\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/es_MX/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/es_MX/LC_MESSAGES/dummypythonqt.mo
index aa5b54c28c7dadc0533e503a36b10d583c59dd68..7e1791fd35fc8ca4ac9ba61332f2890bb32899ee 100644
Binary files a/src/modules/dummypythonqt/lang/es_MX/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/es_MX/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/es_MX/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/es_MX/LC_MESSAGES/dummypythonqt.po
index 2d07c796dcc6594030a8cf000d4481da9b7ab190..90b12e099cfbe05409e24da9cfac6a2d1308dead 100644
--- a/src/modules/dummypythonqt/lang/es_MX/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/es_MX/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Spanish (Mexico) (https://www.transifex.com/calamares/teams/20061/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: es_MX\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/es_PR/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/es_PR/LC_MESSAGES/dummypythonqt.mo
index acb56d2cd8a923581fc1db7780e4974cde6c8c1a..33b7c8f9bb0f763b32da1554660639861b764ffb 100644
Binary files a/src/modules/dummypythonqt/lang/es_PR/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/es_PR/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/es_PR/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/es_PR/LC_MESSAGES/dummypythonqt.po
index e073dadb4c26f2a1ea3c9cfbf3fc0545fd94e8a9..ebf57f400a0222236fe7716693f677ff6da10e4a 100644
--- a/src/modules/dummypythonqt/lang/es_PR/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/es_PR/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Spanish (Puerto Rico) (https://www.transifex.com/calamares/teams/20061/es_PR/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: es_PR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.mo
index df61b034810eb2bbca3a8cf48c8c92974d143056..f2a0d7658c1e74c9576d250ca692d91fb4268172 100644
Binary files a/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.po
index f621b4ea16459b4a5d5a37ea9cda3b58f52e0244..3225728be8f0b1dab2d78a039e7bca76d3416c2c 100644
--- a/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Estonian (https://www.transifex.com/calamares/teams/20061/et/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: et\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.mo
index 849eb7ea33bc22ad1e21471d39ee227d2009dd04..7a189862b0f5d60b356d0fc7c0de49f57555b3fc 100644
Binary files a/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.po
index 3c6ef9739689071f9cc4e8f94218086cf3d88a08..e1ac1a562b56f1d539a47181c8d4f78dce7d10f5 100644
--- a/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Basque (https://www.transifex.com/calamares/teams/20061/eu/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.mo
index b0639281d07e7472ffbf1288cbefd1a264e6eea3..0958fc58b452c4f0fdce2b01ec5ee35d54b94931 100644
Binary files a/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.po
index 4d48416ec94e5d9bae1d44973710da5c41bc4130..3e84dec225eadff2f841a81d6956f6d21ca411c7 100644
--- a/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Persian (https://www.transifex.com/calamares/teams/20061/fa/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.mo
index dfc95be9342d80fdb13413fb1e5c14b9ffefb87f..c6458f7d365f3eb147e7e1c439284b507dbb3c57 100644
Binary files a/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.po
index f0fd044204908077379bbeb970bb2b67b097c247..92ffeac3afb280ef3b2ca64a1b4a8bb53ddf096a 100644
--- a/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Finnish (Finland) (https://www.transifex.com/calamares/teams/20061/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: fi_FI\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.mo
index 251fc3757f280cd1b915ccfbc86ab8e54220375a..7c52eaec2405a2da339e21e267e3f97b80968102 100644
Binary files a/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.po
index 13b5b35e5f42fd1aafd209c65eb763752b2e4ee8..3e5db156cf9a33c0b1f0007fc2672a9d150cdc92 100644
--- a/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: French (https://www.transifex.com/calamares/teams/20061/fr/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/fr_CH/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/fr_CH/LC_MESSAGES/dummypythonqt.mo
index 6c342e167383dbe8e7383542b30c6eb390fd971d..0f3dd6a542547b0e4143d6259017d8db9604ad2a 100644
Binary files a/src/modules/dummypythonqt/lang/fr_CH/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/fr_CH/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/fr_CH/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/fr_CH/LC_MESSAGES/dummypythonqt.po
index 9ef3c4d4bcee56aab146581026dad18fe38831af..89607dde918a888f4c903eb30d8b6153d86d8794 100644
--- a/src/modules/dummypythonqt/lang/fr_CH/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/fr_CH/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: French (Switzerland) (https://www.transifex.com/calamares/teams/20061/fr_CH/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: fr_CH\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.mo
index dd1510df4c85117e5fea55055ac0eda994622838..ee5159d122cd4b4cef1a7260aa6ea7800c644cc9 100644
Binary files a/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.po
index a43328d0a264b535556de2c2538ba4e0c8031597..64f194bddc53a851dd936761f6a01f981d65044a 100644
--- a/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Galician (https://www.transifex.com/calamares/teams/20061/gl/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.mo
index 7db6ec7f367cee988a1824ac5afdb37359fde9ee..755a05709ea217dcbfed5d68d451f05b58d330e7 100644
Binary files a/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.po
index 3e8ce435dc1039bbb82472e907259b805b5c6ea2..03cb10268f9901375b0bcee60c3ef61eebf63d62 100644
--- a/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Gujarati (https://www.transifex.com/calamares/teams/20061/gu/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: gu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.mo
index 3211515981e5a5c39260c93840be275935cb7126..68d6e64f4c10bd096dd7d733ad16b382693ce9dd 100644
Binary files a/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.po
index 554b30506996d250185883103869b8292aa5fee8..64b90df7c8b86f5035cd19300cf4a88cd4769695 100644
--- a/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Hindi (https://www.transifex.com/calamares/teams/20061/hi/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/hr/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/hr/LC_MESSAGES/dummypythonqt.po
index 6d3951633f9c64ba311d00be57ece87d3f67cc68..897506e4011435d99949726c1619846dffaf4a05 100644
--- a/src/modules/dummypythonqt/lang/hr/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/hr/LC_MESSAGES/dummypythonqt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Lovro Kudelić <lovro.kudelic@outlook.com>, 2016\n"
"Language-Team: Croatian (https://www.transifex.com/calamares/teams/20061/hr/)\n"
@@ -18,22 +18,22 @@ msgstr ""
"Language: hr\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr "Klikni me!"
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr "Novi QLabel."
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr "Testni PythonQt posao"
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr "Ovo je testni PythonQt posao. Testni posao kaže: {}"
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr "Statusna poruka za testni PythonQt posao."
diff --git a/src/modules/dummypythonqt/lang/hu/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/hu/LC_MESSAGES/dummypythonqt.po
index ef39fdb31c56f82e54831c7e0bd85f49fd2bb94a..189869f8e995cd053c9df127b293383ea9eac58a 100644
--- a/src/modules/dummypythonqt/lang/hu/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/hu/LC_MESSAGES/dummypythonqt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Lajos Pasztor <mrlajos@gmail.com>, 2016\n"
"Language-Team: Hungarian (https://www.transifex.com/calamares/teams/20061/hu/)\n"
@@ -18,22 +18,22 @@ msgstr ""
"Language: hu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr "Kattints ide!"
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr "Egy új QLabel."
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr "Egy PythonQt Job teszt"
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr "Ez egy PythonQt Job teszt. A teszt job azt mondja: {}"
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr "Sztátus üzenet egy PythonQt Job-hoz."
diff --git a/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.mo
index 2457e104563603df3fba5d3ffae13d463a1ad55f..c61b722e32ac7202f0ec26eb33c326e56c03eaf9 100644
Binary files a/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.po
index 625d158ceed2b760b41e8a85e97ae041d7c0783d..4be47c13ee37498a3911d222121a69c43f1694a5 100644
--- a/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Kukuh Syafaat <syafaatkukuh@gmail.com>, 2016\n"
"Language-Team: Indonesian (https://www.transifex.com/calamares/teams/20061/id/)\n"
@@ -18,22 +18,22 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr "Klik saya!"
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr "QLabel baru."
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr "Dummy PythonQt Job"
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr "Ini adalah Dummy PythonQt Job. Dummy job mengatakan: {}"
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr "Sebuah pesan status untuk Dummy PythonQt Job."
diff --git a/src/modules/dummypythonqt/lang/is/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/is/LC_MESSAGES/dummypythonqt.mo
index 60afb38b65671e58be188cd2bef93d6bf081bd82..f9585197dd4009c05628af3dbfa90f84807bbef3 100644
Binary files a/src/modules/dummypythonqt/lang/is/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/is/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/is/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/is/LC_MESSAGES/dummypythonqt.po
index 4f70514e63af35ccaae6eeb6fa7114bf6c65da8e..7a292e2521f3b51031099f6c091c18b377f4793d 100644
--- a/src/modules/dummypythonqt/lang/is/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/is/LC_MESSAGES/dummypythonqt.po
@@ -2,11 +2,14 @@
# Copyright (C) YEAR ORGANIZATION
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
+# Translators:
+# Kristján Magnússon <kristjanmagnus@gmail.com>, 2017
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kristján Magnússon <kristjanmagnus@gmail.com>, 2017\n"
"Language-Team: Icelandic (https://www.transifex.com/calamares/teams/20061/is/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ANSI_X3.4-1968\n"
@@ -15,22 +18,22 @@ msgstr ""
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
-msgstr ""
+msgstr "Smelltu mig!"
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
-msgstr ""
+msgstr "Nýtt QLabel."
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
-msgstr ""
+msgstr "Dummy PythonQt Job"
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr ""
+msgstr "Þetta er Dummy PythonQt Job. Dummy job segir: {}"
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
-msgstr ""
+msgstr "Stöðuskilaboð fyrir Dummy PythonQt Job."
diff --git a/src/modules/dummypythonqt/lang/it_IT/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/it_IT/LC_MESSAGES/dummypythonqt.po
index 21732842d1e2ecf9cdfaf0d6ec44aefe705032e7..01df8bf0f9132831f336b808088cbc9f9cba838e 100644
--- a/src/modules/dummypythonqt/lang/it_IT/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/it_IT/LC_MESSAGES/dummypythonqt.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Saverio <saverio.brancaccio@gmail.com>, 2016\n"
"Language-Team: Italian (Italy) (https://www.transifex.com/calamares/teams/20061/it_IT/)\n"
@@ -19,22 +19,22 @@ msgstr ""
"Language: it_IT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr "Clicca qui!"
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr "Una nuova QLabel."
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr "Il Job Dummy PythonQt"
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr "Questo è il Job Dummy PythonQt. Il dummy job notifica: {}"
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr "Un messaggio di stato per il Job Dummy PythonQt."
diff --git a/src/modules/dummypythonqt/lang/ja/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ja/LC_MESSAGES/dummypythonqt.po
index 2bae18f749807262766405ac329b94edc0cd2b2f..752de40c350516453fa6aa742db78a001f081ffd 100644
--- a/src/modules/dummypythonqt/lang/ja/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/ja/LC_MESSAGES/dummypythonqt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Takefumi Nagata <take1975@kumamoto.email.ne.jp>, 2016\n"
"Language-Team: Japanese (https://www.transifex.com/calamares/teams/20061/ja/)\n"
@@ -18,22 +18,22 @@ msgstr ""
"Language: ja\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr "クリックしてください!"
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr "新しいQLabel"
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr "ダミーのPythonQtジョブ"
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr "これはダミーのPythonQtジョブです。ダミーのジョブの出力: {}"
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr "ダミーのPythonQtジョブの状態"
diff --git a/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.mo
index 29e1cb26bfa112f264a442fdb68d57406838b7d7..a3d33cc080736becac962fccd9f20ebd969899ae 100644
Binary files a/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.po
index 5f7dae0ae89ec6033ec8e201909ded6a84a642ac..f6f50b068de5dc249cf00c7319a1d2bac895cc0e 100644
--- a/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Kazakh (https://www.transifex.com/calamares/teams/20061/kk/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: kk\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.mo
index a675f0f2038fe3cb81e9bc2b2d867562a15c232c..5bef52457116e12d7df26a9d04864a5b39604b7c 100644
Binary files a/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.po
index d0b16d02518dcb177db3a44af416d0f95f7a9464..3a3e424ce94db2dae4ca07c886fd445fdae715f5 100644
--- a/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Lao (https://www.transifex.com/calamares/teams/20061/lo/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: lo\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/lt/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/lt/LC_MESSAGES/dummypythonqt.po
index 95adb50a97ab28bcc018ec940ab4bfc52099cbe1..6ca7963981a9e6a6bf1aac6d53bbf3128a51eac0 100644
--- a/src/modules/dummypythonqt/lang/lt/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/lt/LC_MESSAGES/dummypythonqt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Moo <moose@mail.ru>, 2016\n"
"Language-Team: Lithuanian (https://www.transifex.com/calamares/teams/20061/lt/)\n"
@@ -18,22 +18,22 @@ msgstr ""
"Language: lt\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr "Spustelėkite mane!"
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr "Naujas QLabel."
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr "Fiktyvi PythonQt užduotis"
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr "Tai yra fiktyvi PythonQt užduotis. Fiktyvi užduotis sako: {}"
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr "Fiktyvios PythonQt užduoties būsenos pranešimas."
diff --git a/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.mo
index 2f523a0d19961d1eec9a70c78f7ad5d9d8175436..4d604df89cf12100f3b4f3200e05ec60e12d0eff 100644
Binary files a/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.po
index 64d9ef421fd55164d101ea48dab1a3d8e6e0c018..e4e1648668f5528fbbc7e45a954b1fc342abfdc6 100644
--- a/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Marathi (https://www.transifex.com/calamares/teams/20061/mr/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: mr\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.mo
index 6e6ab06e7a1a45e1e72d0980f403041243a789df..993023380aa205474a18c60cf9e073964909b62e 100644
Binary files a/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.po
index 875a37ba65ef5d3a0965c4ffa319a7240a894fc5..bf530de5cd6b0c3a66cf516e6a33334e7323c360 100644
--- a/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Norwegian Bokmål (https://www.transifex.com/calamares/teams/20061/nb/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: nb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.mo
index 6d3f55d4176cd2b5ba377baf4cf02b382b11e8d8..aa2811015288e5db6e00c0a2036b9545d6932e6c 100644
Binary files a/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.po
index c190418152df052828e3618f89f713cf05f2ed7d..52442d01ac184fa7566bba61e9b35bc08b54ca0c 100644
--- a/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: De Zeeappel <zeeappel@gmail.com>, 2016\n"
"Language-Team: Dutch (https://www.transifex.com/calamares/teams/20061/nl/)\n"
@@ -18,22 +18,22 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr "Klik mij!"
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr "Een nieuw QLabel"
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr "De Dummy PythonQt opdracht"
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr "Dit is de Dummy PythonQt opdracht. De opdracht zegt: {}"
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr "Een statusbericht voor de Dummy PythonQt opdracht."
diff --git a/src/modules/dummypythonqt/lang/pl/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/pl/LC_MESSAGES/dummypythonqt.po
index 6b4fda5b6355ece8ddc9b3dc7bbb7e070e976ae0..1c88b0863f16da8cf3efa39a7a190599635129b3 100644
--- a/src/modules/dummypythonqt/lang/pl/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/pl/LC_MESSAGES/dummypythonqt.po
@@ -3,37 +3,37 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
-# m4sk1n <m4sk1n@o2.pl>, 2016
+# m4sk1n <m4sk1n@vivaldi.net>, 2016
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: m4sk1n <m4sk1n@o2.pl>, 2016\n"
+"Last-Translator: m4sk1n <m4sk1n@vivaldi.net>, 2016\n"
"Language-Team: Polish (https://www.transifex.com/calamares/teams/20061/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ANSI_X3.4-1968\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py 1.5\n"
"Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr "Naciśnij mnie!"
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr "Nowy QLabel."
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr "Zadanie Dummy PythonQt"
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr "To jest zadanie Dummy PythonQt mówiące: {}"
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr "Wiadomość o stanie zadania Dummy PythonQt."
diff --git a/src/modules/dummypythonqt/lang/pl_PL/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/pl_PL/LC_MESSAGES/dummypythonqt.mo
index 0ea5a646b4ca66c14689c6c20534ee817f09344f..a79176180b79689de31aab4380089e31c86e55cc 100644
Binary files a/src/modules/dummypythonqt/lang/pl_PL/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/pl_PL/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/pl_PL/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/pl_PL/LC_MESSAGES/dummypythonqt.po
index 9ca5820db4fdc50479a0e574bf67e12fbad97596..abe5d7df31ca04bfd3270b85a3f1eedcdce8ae2a 100644
--- a/src/modules/dummypythonqt/lang/pl_PL/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/pl_PL/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Polish (Poland) (https://www.transifex.com/calamares/teams/20061/pl_PL/)\n"
"MIME-Version: 1.0\n"
@@ -13,24 +13,24 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py 1.5\n"
"Language: pl_PL\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/pt_BR/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/pt_BR/LC_MESSAGES/dummypythonqt.po
index a05c76cfb932b2859b7e5840748dab5e42bc78d9..d215aee5eef052d1debe219c9c1cbeab6b3947e9 100644
--- a/src/modules/dummypythonqt/lang/pt_BR/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/pt_BR/LC_MESSAGES/dummypythonqt.po
@@ -3,13 +3,13 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
-# Rodrigo Macedo <rmsolucoeseminformatic4@gmail.com>, 2017
+# Rodrigo de Almeida Sottomaior Macedo <rmsolucoeseminformatic4@gmail.com>, 2017
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Rodrigo Macedo <rmsolucoeseminformatic4@gmail.com>, 2017\n"
+"Last-Translator: Rodrigo de Almeida Sottomaior Macedo <rmsolucoeseminformatic4@gmail.com>, 2017\n"
"Language-Team: Portuguese (Brazil) (https://www.transifex.com/calamares/teams/20061/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ANSI_X3.4-1968\n"
@@ -18,22 +18,22 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr "Clique em mim!"
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr "Uma nova QLabel."
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr "O trabalho de modelo do PythonQt"
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr "Este é o trabalho do modelo PythonQt. O trabalho fictício diz: {}"
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr "Uma mensagem de status para Dummy PythonQt Job."
diff --git a/src/modules/dummypythonqt/lang/pt_PT/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/pt_PT/LC_MESSAGES/dummypythonqt.po
index 0e86d899b40e6cb74755a5f7324b0a9ff8e883f3..3b2fc3fad6a1a9553f2f2884635170456138e351 100644
--- a/src/modules/dummypythonqt/lang/pt_PT/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/pt_PT/LC_MESSAGES/dummypythonqt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Ricardo Simões <xmcorporation@gmail.com>, 2016\n"
"Language-Team: Portuguese (Portugal) (https://www.transifex.com/calamares/teams/20061/pt_PT/)\n"
@@ -18,22 +18,22 @@ msgstr ""
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr "Clique-me!"
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr "Uma nova QLabel."
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr "A Tarefa Dummy PythonQt"
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr "Esta é a tarefa Dummy PythonQt. A tarefa dummy diz: {}"
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr "Uma mensagem de estado para a Tarefa Dummy PythonQt."
diff --git a/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.mo
index d38b6d1c5649bb67d45e4dc731a0e8a29d0d48c5..09c89c927135ac5b9477d1e5f693340c6083d83b 100644
Binary files a/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.po
index 18b53508542910d27323819f7ba5bc0b21e8bba3..b669d5eac77acc814a7c4c7e1eb98e89a1bb92f9 100644
--- a/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Baadur Jobava <jobaval10n@gmail.com>, 2016\n"
"Language-Team: Romanian (https://www.transifex.com/calamares/teams/20061/ro/)\n"
@@ -18,22 +18,22 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr "Clic aici!"
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr "Un nou QLabel."
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr "Un job job fictiv PythonQt"
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr "Acesta este jobul fictiv PythonQt. Descrierea jobului: {}"
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr "Un mesaj de stare pentru jobul fictiv PythonQt."
diff --git a/src/modules/dummypythonqt/lang/ru/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ru/LC_MESSAGES/dummypythonqt.po
index d374cd2cdec86a8df55fa1d7ee82f68ef0c30816..f2aa61e8fdc3dd7c5c2e285b6f494fa0d28f63cc 100644
--- a/src/modules/dummypythonqt/lang/ru/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/ru/LC_MESSAGES/dummypythonqt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Вадим Сабынич <vadim@sabini.ch>, 2017\n"
"Language-Team: Russian (https://www.transifex.com/calamares/teams/20061/ru/)\n"
@@ -18,22 +18,22 @@ msgstr ""
"Language: ru\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr "Нажать здесь!"
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr "Новый QLabel."
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr "The Dummy PythonQt Job"
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/sk/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/sk/LC_MESSAGES/dummypythonqt.po
index 87c21e590c16b4f47cc429748cb35e1aa7824563..f2bb5a178b49c6932dadf39f154bac62c6558e8b 100644
--- a/src/modules/dummypythonqt/lang/sk/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/sk/LC_MESSAGES/dummypythonqt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Dušan Kazik <prescott66@gmail.com>, 2016\n"
"Language-Team: Slovak (https://www.transifex.com/calamares/teams/20061/sk/)\n"
@@ -18,22 +18,22 @@ msgstr ""
"Language: sk\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr "Kliknite sem!"
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr "Nová menovka QLabel."
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr "Fiktívna úloha PythonQt"
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr "Toto je fiktívna úloha PythonQt. Fiktívna úloha hovorí: {}"
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr "Stavová správa pre fiktívnu úlohu PythonQt."
diff --git a/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.mo
index 258c152821ec03c0d54d34b08df03782847bf711..c5967e71ba08f935364fd1da90319899e0f6870a 100644
Binary files a/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.po
index 8cd4a8b238fe07303aea49a90d597a7227325c4e..d7cd663dd4cc46ca0e40ee22e4f7813fcd81fc66 100644
--- a/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Slovenian (https://www.transifex.com/calamares/teams/20061/sl/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/sr/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/sr/LC_MESSAGES/dummypythonqt.mo
index 35061d6b11f7515cb53c6fb6f906286d9b9e6242..a2771e965b6532eb04cdb91ebbbb5e54d4952cec 100644
Binary files a/src/modules/dummypythonqt/lang/sr/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/sr/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/sr/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/sr/LC_MESSAGES/dummypythonqt.po
index 53616a1582ae2a7ec0d6c480a1f6e9ffcd683792..3e9cdce3dd471f0b71c8b416ed93f70888110ca2 100644
--- a/src/modules/dummypythonqt/lang/sr/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/sr/LC_MESSAGES/dummypythonqt.po
@@ -2,11 +2,14 @@
# Copyright (C) YEAR ORGANIZATION
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
+# Translators:
+# Slobodan Simić <slsimic@gmail.com>, 2017
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Slobodan Simić <slsimic@gmail.com>, 2017\n"
"Language-Team: Serbian (https://www.transifex.com/calamares/teams/20061/sr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ANSI_X3.4-1968\n"
@@ -15,22 +18,22 @@ msgstr ""
"Language: sr\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
-msgstr ""
+msgstr "Кликни ме!"
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
-msgstr ""
+msgstr "Нова КуОзнака"
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
-msgstr ""
+msgstr "Провизорни ПитонКуТ посао"
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr ""
+msgstr "Ово је провизорни ПитонКуТ посао. Он каже: {}"
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
-msgstr ""
+msgstr "Порука стања за провизорни ПитонКуТ посао."
diff --git a/src/modules/dummypythonqt/lang/sr@latin/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/sr@latin/LC_MESSAGES/dummypythonqt.mo
index 879fab810301405bd1afc737cdac808b6e748e5f..0eb9c3ef333a2c996b5355c823bb7e0d6c94a627 100644
Binary files a/src/modules/dummypythonqt/lang/sr@latin/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/sr@latin/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/sr@latin/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/sr@latin/LC_MESSAGES/dummypythonqt.po
index e692d7cdfe92e2e284f38655bd535eb0add748b5..b027d48b76064b3fec05524447b8a94391a07cd7 100644
--- a/src/modules/dummypythonqt/lang/sr@latin/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/sr@latin/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Serbian (Latin) (https://www.transifex.com/calamares/teams/20061/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: sr@latin\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.mo
index ba8dfa6a773a829860d1d49ef9608cdf34b420ea..1b82dda9892513079495d9743032f187d50d4055 100644
Binary files a/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.po
index 91d6a0231b359d6a781c03d39af75c56e7310403..e0dbe13bd2215c33b97e9f3ba4ca1d3ffd17cb14 100644
--- a/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Swedish (https://www.transifex.com/calamares/teams/20061/sv/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.mo
index b4911358ea78c18af3e52af6ef79528574ae2108..2554acb71b9916fa423b210c1651385d8047cb2b 100644
Binary files a/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.po
index 3aaa7cba991b63370e1e27312719594b81274ef5..f372732dcfcdbb812aaa331e21d9f05f9ecfbb0a 100644
--- a/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Thai (https://www.transifex.com/calamares/teams/20061/th/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: th\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.po
index 4d897934b5b805b986133729c8ec65923f3d2f8e..7bc6ab14872fe6016ac16a2dd70884f4f2013141 100644
--- a/src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Demiray Muhterem <mdemiray@msn.com>, 2016\n"
"Language-Team: Turkish (Turkey) (https://www.transifex.com/calamares/teams/20061/tr_TR/)\n"
@@ -18,22 +18,22 @@ msgstr ""
"Language: tr_TR\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr "Buraya tıkla!"
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr "Yeni bir QLabel."
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr "Kukla PythonQt Çalışması"
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr "Kukla PythonQt Çalışması. Kukla çalışması şöyle der: {}"
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr "Kukla PythonQt Çalışması için bir durum mesajı."
diff --git a/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.mo
index a734e199b9431386e6139c65509ef7bbaeb2ff80..a6c883273c20271932eabfd340012bdcdbd63e5b 100644
Binary files a/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.po
index caca64dcf528b3e0521911a189c9e9badfab8733..55b0085b84d85cc05816a640df1f9b3f226ff2ac 100644
--- a/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Ukrainian (https://www.transifex.com/calamares/teams/20061/uk/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: uk\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.mo
index 8967b68bbf93a3d1398bb60d29a7d7309c383cb9..222758d85275fdea85e1c298d0cd6282e6de9086 100644
Binary files a/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.po
index bf22ec91694fc8c4bd51259018fc0e32c99eeca7..36888457abb5ccd0cb6437252e7089ec57761530 100644
--- a/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Urdu (https://www.transifex.com/calamares/teams/20061/ur/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: ur\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.mo
index 6f421e784f6e78be0c3dcb98e15ce4bfd0b8ec61..a93d85443f800f2792c20f20951172fe54058d8a 100644
Binary files a/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.mo differ
diff --git a/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.po
index 36238cc5ab2d287d82fd5545a630e96079bce815..a61a4a2c1c3f02096d95067f10ecbaa6a7dc77a5 100644
--- a/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Uzbek (https://www.transifex.com/calamares/teams/20061/uz/)\n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,22 @@ msgstr ""
"Language: uz\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr ""
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr ""
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr ""
diff --git a/src/modules/dummypythonqt/lang/zh_CN/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/zh_CN/LC_MESSAGES/dummypythonqt.po
index 1b10d68f16cd348bf62b25ad20714dda200f0952..9d4be18b7a7f4d31c81853b2f1c50b8b2d778d59 100644
--- a/src/modules/dummypythonqt/lang/zh_CN/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/zh_CN/LC_MESSAGES/dummypythonqt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mingcong Bai <jeffbai@aosc.xyz>, 2017\n"
"Language-Team: Chinese (China) (https://www.transifex.com/calamares/teams/20061/zh_CN/)\n"
@@ -18,22 +18,22 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr "按我按我！"
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr "一个平淡无奇的 QLabel。"
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr "PythonQt 任务"
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr "我是个 PythonQt 任务。任务提示：{}"
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr "来自 PythonQt 任务的状态消息。"
diff --git a/src/modules/dummypythonqt/lang/zh_TW/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/zh_TW/LC_MESSAGES/dummypythonqt.po
index 15d4b15c4947ce0ad1c7c3b90ee5df0d7996d620..f9a3e97b66825d4a2d043490b8d7a781d562d6bd 100644
--- a/src/modules/dummypythonqt/lang/zh_TW/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/zh_TW/LC_MESSAGES/dummypythonqt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-23 00:58+0000\n"
+"POT-Creation-Date: 2017-06-23 01:03+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Jeff Huang <s8321414@gmail.com>, 2016\n"
"Language-Team: Chinese (Taiwan) (https://www.transifex.com/calamares/teams/20061/zh_TW/)\n"
@@ -18,22 +18,22 @@ msgstr ""
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: src/modules/dummypythonqt/main.py:80
+#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr "點擊我！"
-#: src/modules/dummypythonqt/main.py:90
+#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr "一個新的 QLabel。"
-#: src/modules/dummypythonqt/main.py:176
+#: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job"
msgstr "假的 PythonQt 工作"
-#: src/modules/dummypythonqt/main.py:179
+#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr "這是一個假的 PythonQt 工作。假工作表示：{}"
-#: src/modules/dummypythonqt/main.py:183
+#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."
msgstr "假的 PythonQt 工作的狀態訊息。"
diff --git a/src/modules/dummypythonqt/main.py b/src/modules/dummypythonqt/main.py
index 79a1c3b423ac4f2d444b39f718d6698a59786a8d..80b8fc4e9565cc61488f3ad449dd505df32d0798 100644
--- a/src/modules/dummypythonqt/main.py
+++ b/src/modules/dummypythonqt/main.py
@@ -4,6 +4,7 @@
# === This file is part of Calamares - <http://github.com/calamares> ===
#
# Copyright 2016-2017, Teo Mrnjavac <teo@kde.org>
+# Copyright 2017, Alf Gaida <agaida@siduction.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
@@ -54,10 +55,13 @@ _ = gettext.gettext
# exposed as a single QWidget, returned by the widget function.
#
# For convenience, both C++ and PythonQt ViewSteps are considered to be
-# implementations of ViewStep.h. Additionally, the Calamares PythonQt API allows
-# Python developers to keep their identifiers more Pythonic on the Python side.
-# Thus, all of the following are considered valid method identifiers in a
-# ViewStep implementation: isNextEnabled, isnextenabled, is_next_enabled.
+# implementations of ViewStep.h. Additionally, the Calamares PythonQt API
+# allows Python developers to keep their identifiers more Pythonic on the
+# Python side. Thus, all of the following are considered valid method
+# identifiers in a ViewStep implementation: isNextEnabled, isnextenabled,
+# is_next_enabled.
+
+
@calamares_module
class DummyPythonQtViewStep:
def __init__(self):
@@ -80,10 +84,10 @@ class DummyPythonQtViewStep:
btn.setText(_("Click me!"))
self.main_widget.layout().addWidget(btn)
- # The syntax for signal-slot connections is very simple, though slightly
- # different from the C++ equivalent. There are no SIGNAL and SLOT
- # macros, and a signal can be connected to any Python method (without a
- # special "slot" designation).
+ # The syntax for signal-slot connections is very simple, though
+ # slightly different from the C++ equivalent. There are no SIGNAL and
+ # SLOT macros, and a signal can be connected to any Python method
+ # (without a special "slot" designation).
btn.connect("clicked(bool)", self.on_btn_clicked)
def on_btn_clicked(self):
@@ -93,26 +97,27 @@ class DummyPythonQtViewStep:
return "Dummy PythonQt ViewStep"
def isNextEnabled(self):
- return True # The "Next" button should be clickable
+ return True # The "Next" button should be clickable
def isBackEnabled(self):
- return True # The "Back" button should be clickable
+ return True # The "Back" button should be clickable
def isAtBeginning(self):
# True means the currently shown UI page is the first page of this
- # module, thus a "Back" button click will not be handled by this module,
- # and will cause a skip to the previous ViewStep instead (if any).
- # Fals means that the present ViewStep provides other UI pages placed
- # logically "before" the current one, thus a "Back" button click will
- # be handled by this module instead of skipping to another ViewStep.
- # A module (ViewStep) with only one page will always return True here.
+ # module, thus a "Back" button click will not be handled by this
+ # module and will cause a skip to the previous ViewStep instead
+ # (if any). False means that the present ViewStep provides other UI
+ # pages placed logically "before" the current one, thus a "Back" button
+ # click will be handled by this module instead of skipping to another
+ # ViewStep. A module (ViewStep) with only one page will always return
+ # True here.
return True
def isAtEnd(self):
# True means the currently shown UI page is the last page of this
- # module, thus a "Next" button click will not be handled by this module,
- # and will cause a skip to the next ViewStep instead (if any).
- # Fals means that the present ViewStep provides other UI pages placed
+ # module, thus a "Next" button click will not be handled by this
+ # module and will cause a skip to the next ViewStep instead (if any).
+ # False means that the present ViewStep provides other UI pages placed
# logically "after" the current one, thus a "Next" button click will
# be handled by this module instead of skipping to another ViewStep.
# A module (ViewStep) with only one page will always return True here.
@@ -139,9 +144,9 @@ class DummyPythonQtViewStep:
# user-visible strings must be retranslated (by calling tr() in C++ or
# _() in Python) and reapplied on the relevant widgets.
# When the user picks a new UI translation language, Qt raises a QEvent
- # of type LanguageChange, which propagates through the QObject hierarchy.
- # By catching and reacting to this event, we can show user-visible
- # strings in the new language at the right time.
+ # of type LanguageChange, which propagates through the QObject
+ # hierarchy. By catching and reacting to this event, we can show
+ # user-visible strings in the new language at the right time.
# The C++ side of the Calamares PythonQt API catches the LanguageChange
# event and calls the present method. It is then up to the module
# developer to add here all the needed code to load the module's
@@ -168,6 +173,8 @@ class DummyPythonQtViewStep:
# same rules apply as for ViewStep. No decorators are necessary here, because
# only the ViewStep implementation is the unique entry point, and a module can
# have any number of jobs.
+
+
class DummyPQJob:
def __init__(self, my_msg):
self.my_msg = my_msg
diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py
index 622f55c4419e20515bd87dbd09359bc7fd90bba4..384dadbb62430f5aa8f5aa55d68ed44c1d26df1e 100644
--- a/src/modules/fstab/main.py
+++ b/src/modules/fstab/main.py
@@ -5,6 +5,7 @@
#
# Copyright 2014, Aurélien Gâteau <agateau@kde.org>
# Copyright 2016, Teo Mrnjavac <teo@kde.org>
+# Copyright 2017, Alf Gaida <agaida@siduction.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
@@ -32,7 +33,7 @@ FSTAB_HEADER = """# /etc/fstab: static file system information.
# be used with UUID= as a more robust way to name devices that works even if
# disks are added and removed. See fstab(5).
#
-# <file system> <mount point> <type> <options> <dump> <pass>"""
+# <file system> <mount point> <type> <options> <dump> <pass>"""
CRYPTTAB_HEADER = """# /etc/crypttab: mappings for encrypted partitions.
#
@@ -46,7 +47,7 @@ CRYPTTAB_HEADER = """# /etc/crypttab: mappings for encrypted partitions.
# to encrypted swap, which should be set up with mkinitcpio-openswap
# for resume support.
#
-# <name> <device> <password> <options>"""
+# <name> <device> <password> <options>"""
# Turn Parted filesystem names into fstab names
FS_MAP = {
@@ -168,7 +169,7 @@ class FstabGenerator(object):
dct["device"],
dct["password"],
dct["options"],
- )
+ )
print(line, file=file)
@@ -181,8 +182,10 @@ class FstabGenerator(object):
print(FSTAB_HEADER, file=fstab_file)
for partition in self.partitions:
- # Special treatment for a btrfs root with @ and @home subvolumes
- if partition["fs"] == "btrfs" and partition["mountPoint"] == "/":
+ # Special treatment for a btrfs root with @ and @home
+ # subvolumes
+ if (partition["fs"] == "btrfs"
+ and partition["mountPoint"] == "/"):
output = subprocess.check_output(['btrfs',
'subvolume',
'list',
@@ -216,7 +219,7 @@ class FstabGenerator(object):
fs="tmpfs",
options="defaults,noatime,mode=1777",
check=0,
- )
+ )
self.print_fstab_line(dct, file=fstab_file)
def generate_fstab_line_info(self, partition):
@@ -249,13 +252,15 @@ class FstabGenerator(object):
self.root_is_ssd = is_ssd
if filesystem == "btrfs" and "subvol" in partition:
- return dict(device="UUID=" + partition["uuid"],
- mount_point=mount_point,
- fs=filesystem,
- options=",".join(["subvol={}".format(partition["subvol"]),
- options]),
- check=check,
- )
+ return dict(
+ device="UUID=" + partition["uuid"],
+ mount_point=mount_point,
+ fs=filesystem,
+ options=",".join(
+ ["subvol={}".format(partition["subvol"]), options]
+ ),
+ check=check,
+ )
return dict(device="UUID=" + partition["uuid"],
mount_point=mount_point or "swap",
@@ -266,12 +271,12 @@ class FstabGenerator(object):
def print_fstab_line(self, dct, file=None):
""" Prints line to '/etc/fstab' file. """
- line = "{:41} {:<14} {:<7} {:<10} 0 {}".format(dct["device"],
- dct["mount_point"],
- dct["fs"],
- dct["options"],
- dct["check"],
- )
+ line = "{:41} {:<14} {:<7} {:<10} 0 {}".format(dct["device"],
+ dct["mount_point"],
+ dct["fs"],
+ dct["options"],
+ dct["check"],
+ )
print(line, file=file)
def create_mount_points(self):
diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py
index 05d86df2ae53d6d07028e207db197d5f8ec170a0..59497cf033c1438934f28ddbcdaaf4988a2bfad6 100644
--- a/src/modules/grubcfg/main.py
+++ b/src/modules/grubcfg/main.py
@@ -5,6 +5,7 @@
#
# Copyright 2014-2015, Philip Müller <philm@manjaro.org>
# Copyright 2015-2017, Teo Mrnjavac <teo@kde.org>
+# Copyright 2017, Alf Gaida <agaida@siduction.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,8 @@ import re
def modify_grub_default(partitions, root_mount_point, distributor):
- """ Configures '/etc/default/grub' for hibernation and plymouth.
+ """
+ Configures '/etc/default/grub' for hibernation and plymouth.
:param partitions:
:param root_mount_point:
@@ -35,7 +37,9 @@ def modify_grub_default(partitions, root_mount_point, distributor):
default_dir = os.path.join(root_mount_point, "etc/default")
default_grub = os.path.join(default_dir, "grub")
distributor_replace = distributor.replace("'", "'\\''")
- dracut_bin = libcalamares.utils.target_env_call(["sh", "-c", "which dracut"])
+ dracut_bin = libcalamares.utils.target_env_call(
+ ["sh", "-c", "which dracut"]
+ )
use_splash = ""
swap_uuid = ""
swap_outer_uuid = ""
@@ -51,20 +55,26 @@ def modify_grub_default(partitions, root_mount_point, distributor):
if partition["fs"] == "linuxswap":
swap_uuid = partition["uuid"]
- if partition["fs"] == "linuxswap" and "luksMapperName" in partition:
+ if (partition["fs"] == "linuxswap"
+ and "luksMapperName" in partition):
swap_outer_uuid = partition["luksUuid"]
- if partition["mountPoint"] == "/" and "luksMapperName" in partition:
- cryptdevice_params = ["rd.luks.uuid={!s}".format(partition["luksUuid"])]
+ if (partition["mountPoint"] == "/"
+ and "luksMapperName" in partition):
+ cryptdevice_params = [
+ "rd.luks.uuid={!s}".format(partition["luksUuid"])
+ ]
else:
for partition in partitions:
if partition["fs"] == "linuxswap":
swap_uuid = partition["uuid"]
- if partition["mountPoint"] == "/" and "luksMapperName" in partition:
+ if (partition["mountPoint"] == "/"
+ and "luksMapperName" in partition):
cryptdevice_params = [
- "cryptdevice=UUID={!s}:{!s}".format(partition["luksUuid"],
- partition["luksMapperName"]),
+ "cryptdevice=UUID={!s}:{!s}".format(
+ partition["luksUuid"], partition["luksMapperName"]
+ ),
"root=/dev/mapper/{!s}".format(partition["luksMapperName"])
]
@@ -101,7 +111,9 @@ def modify_grub_default(partitions, root_mount_point, distributor):
for i in range(len(lines)):
if lines[i].startswith("#GRUB_CMDLINE_LINUX_DEFAULT"):
- kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"{!s}\"".format(" ".join(kernel_params))
+ kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"{!s}\"".format(
+ " ".join(kernel_params)
+ )
lines[i] = kernel_cmd
have_kernel_cmd = True
elif lines[i].startswith("GRUB_CMDLINE_LINUX_DEFAULT"):
@@ -118,20 +130,26 @@ def modify_grub_default(partitions, root_mount_point, distributor):
for existing_param in existing_params:
existing_param_name = existing_param.split("=")[0]
- if existing_param_name not in ["quiet", "resume", "splash"]: # the only ones we ever add
+ # the only ones we ever add
+ if existing_param_name not in [
+ "quiet", "resume", "splash"]:
kernel_params.append(existing_param)
- kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"{!s}\"".format(" ".join(kernel_params))
+ kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"{!s}\"".format(
+ " ".join(kernel_params)
+ )
lines[i] = kernel_cmd
have_kernel_cmd = True
- elif lines[i].startswith("#GRUB_DISTRIBUTOR") or lines[i].startswith("GRUB_DISTRIBUTOR"):
+ elif (lines[i].startswith("#GRUB_DISTRIBUTOR")
+ or lines[i].startswith("GRUB_DISTRIBUTOR")):
lines[i] = distributor_line
have_distributor_line = True
else:
lines = []
if "defaults" in libcalamares.job.configuration:
- for key, value in libcalamares.job.configuration["defaults"].items():
+ for key, value in libcalamares.job.configuration[
+ "defaults"].items():
if value.__class__.__name__ == "bool":
if value:
escaped_value = "true"
@@ -143,7 +161,9 @@ def modify_grub_default(partitions, root_mount_point, distributor):
lines.append("{!s}='{!s}'".format(key, escaped_value))
if not have_kernel_cmd:
- kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"{!s}\"".format(" ".join(kernel_params))
+ kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"{!s}\"".format(
+ " ".join(kernel_params)
+ )
lines.append(kernel_cmd)
if not have_distributor_line:
@@ -159,14 +179,16 @@ def modify_grub_default(partitions, root_mount_point, distributor):
def run():
- """ Calls routine with given parameters to modify '/etc/default/grub'.
+ """
+ Calls routine with given parameters to modify '/etc/default/grub'.
:return:
"""
fw_type = libcalamares.globalstorage.value("firmwareType")
- if libcalamares.globalstorage.value("bootLoader") is None and fw_type != "efi":
+ if (libcalamares.globalstorage.value("bootLoader") is None
+ and fw_type != "efi"):
return None
partitions = libcalamares.globalstorage.value("partitions")
@@ -175,7 +197,8 @@ def run():
esp_found = False
for partition in partitions:
- if partition["mountPoint"] == libcalamares.globalstorage.value("efiSystemPartition"):
+ if (partition["mountPoint"]
+ == libcalamares.globalstorage.value("efiSystemPartition")):
esp_found = True
if not esp_found:
diff --git a/src/modules/hwclock/main.py b/src/modules/hwclock/main.py
index 54dea7451f66ebf28d1be52c781f62535777f5b6..bfb3d1df749ede32bd9e7ce41ed7fa99a68f7302 100644
--- a/src/modules/hwclock/main.py
+++ b/src/modules/hwclock/main.py
@@ -5,6 +5,7 @@
#
# Copyright 2014 - 2015, Philip Müller <philm@manjaro.org>
# Copyright 2014, Teo Mrnjavac <teo@kde.org>
+# Copyright 2017. Alf Gaida <agaida@siduction.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
@@ -26,13 +27,18 @@ import libcalamares
def run():
- """ Set hardware clock """
+ """
+ Set hardware clock
+ """
root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
try:
subprocess.check_call(["hwclock", "--systohc", "--utc"])
except subprocess.CalledProcessError as e:
- return "Cannot set hardware clock.", "hwclock terminated with exit code {}.".format(e.returncode)
+ return (
+ "Cannot set hardware clock.",
+ "hwclock terminated with exit code {}.".format(e.returncode)
+ )
shutil.copy2("/etc/adjtime", "{!s}/etc/".format(root_mount_point))
diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py
index 5a0d028da0b85b2e259a7f5ad966d0e7322c967f..eb29d7def86c912cf138eb11c437ec10d24ed9bd 100644
--- a/src/modules/initcpiocfg/main.py
+++ b/src/modules/initcpiocfg/main.py
@@ -5,6 +5,7 @@
#
# Copyright 2014, Rohan Garg <rohan@kde.org>
# Copyright 2015, Philip Müller <philm@manjaro.org>
+# Copyright 2017, Alf Gaida <agaida@sidution.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 @@ from collections import OrderedDict
def cpuinfo():
- """ Return the information in /proc/cpuinfo as a dictionary in the following format:
+ """
+ Return the information in /proc/cpuinfo as a dictionary in the following
+ format:
cpu_info['proc0']={...}
cpu_info['proc1']={...}
@@ -45,7 +48,8 @@ def cpuinfo():
procinfo = OrderedDict()
else:
if len(line.split(':')) == 2:
- procinfo[line.split(':')[0].strip()] = line.split(':')[1].strip()
+ splitted_line = line.split(':')[1].strip()
+ procinfo[line.split(':')[0].strip()] = splitted_line
else:
procinfo[line.split(':')[0].strip()] = ''
@@ -53,7 +57,8 @@ def cpuinfo():
def write_mkinitcpio_lines(hooks, modules, files, root_mount_point):
- """ Set up mkinitcpio.conf.
+ """
+ Set up mkinitcpio.conf.
:param hooks:
:param modules:
@@ -81,7 +86,8 @@ def write_mkinitcpio_lines(hooks, modules, files, root_mount_point):
def modify_mkinitcpio_conf(partitions, root_mount_point):
- """ Modifies mkinitcpio.conf
+ """
+ Modifies mkinitcpio.conf
:param partitions:
:param root_mount_point:
@@ -89,7 +95,8 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
cpu = cpuinfo()
swap_uuid = ""
btrfs = ""
- hooks = ["base", "udev", "autodetect", "modconf", "block", "keyboard", "keymap"]
+ hooks = ["base", "udev", "autodetect", "modconf", "block", "keyboard",
+ "keymap"]
modules = []
files = []
encrypt_hook = False
@@ -113,25 +120,29 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
if partition["mountPoint"] == "/" and "luksMapperName" in partition:
encrypt_hook = True
- if partition["mountPoint"] == "/boot" and "luksMapperName" not in partition:
+ if (partition["mountPoint"] == "/boot"
+ and "luksMapperName" not in partition):
unencrypted_separate_boot = True
if encrypt_hook:
hooks.append("encrypt")
if not unencrypted_separate_boot and \
- os.path.isfile(os.path.join(root_mount_point, "crypto_keyfile.bin")):
+ os.path.isfile(
+ os.path.join(root_mount_point, "crypto_keyfile.bin")
+ ):
files.append("/crypto_keyfile.bin")
- if swap_uuid is not "":
+ if swap_uuid != "":
if encrypt_hook and openswap_hook:
hooks.extend(["openswap"])
hooks.extend(["resume", "filesystems"])
else:
hooks.extend(["filesystems"])
- if btrfs is "yes" and cpu['proc0']['vendor_id'].lower() != "genuineintel":
+ if btrfs == "yes" and cpu['proc0']['vendor_id'].lower() != "genuineintel":
modules.append("crc32c")
- elif btrfs is "yes" and cpu['proc0']['vendor_id'].lower() == "genuineintel":
+ elif (btrfs == "yes"
+ and cpu['proc0']['vendor_id'].lower() == "genuineintel"):
modules.append("crc32c-intel")
else:
hooks.append("fsck")
@@ -140,7 +151,8 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
def run():
- """ Calls routine with given parameters to modify '/etc/mkinitcpio.conf'.
+ """
+ Calls routine with given parameters to modify '/etc/mkinitcpio.conf'.
:return:
"""
diff --git a/src/modules/initramfs/main.py b/src/modules/initramfs/main.py
index 58fb296b95521c800bfd2abf5d893614cecb2a31..947c034ea6b92af6a296431a08d2686a9bd66f00 100644
--- a/src/modules/initramfs/main.py
+++ b/src/modules/initramfs/main.py
@@ -4,6 +4,7 @@
# === This file is part of Calamares - <http://github.com/calamares> ===
#
# Copyright 2014, Philip Müller <philm@manjaro.org>
+# Copyright 2017, Alf Gaida <agaida@siduction.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
@@ -29,4 +30,7 @@ def run():
return_code = target_env_call(["update-initramfs", "-k", "all", "-u"])
if return_code != 0:
- return "Failed to run update-initramfs on the target", "The exit code was {}".format(return_code)
+ return (
+ "Failed to run update-initramfs on the target",
+ "The exit code was {}".format(return_code)
+ )
diff --git a/src/modules/initramfscfg/main.py b/src/modules/initramfscfg/main.py
index f889b7b16da5b9acea2281ca766d95c71f5ba3af..3f77ccd6d6242d1c026954ba2bb48818e6634359 100644
--- a/src/modules/initramfscfg/main.py
+++ b/src/modules/initramfscfg/main.py
@@ -7,6 +7,7 @@
# Copyright 2015, Philip Müller <philm@manjaro.org>
# Copyright 2016, David McKinney <mckinney@subgraph.com>
# Copyright 2016, Kevin Kofler <kevin.kofler@chello.at>
+# Copyright 2017, Alf Gaida <agaida@siduction.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,8 +26,10 @@ import libcalamares
import os
import shutil
+
def copy_initramfs_hooks(partitions, root_mount_point):
- """ Copies initramfs hooks so they are picked up by update-initramfs
+ """
+ Copies initramfs hooks so they are picked up by update-initramfs
:param partitions:
:param root_mount_point:
@@ -38,18 +41,29 @@ def copy_initramfs_hooks(partitions, root_mount_point):
if partition["mountPoint"] == "/" and "luksMapperName" in partition:
encrypt_hook = True
- if partition["mountPoint"] == "/boot" and "luksMapperName" not in partition:
+ if (partition["mountPoint"] == "/boot"
+ and "luksMapperName" not in partition):
unencrypted_separate_boot = True
if encrypt_hook:
+ target = "{!s}/usr/share/initramfs-tools/hooks/encrypt_hook".format(
+ root_mount_point)
if unencrypted_separate_boot:
- shutil.copy2("/usr/lib/calamares/modules/initramfscfg/encrypt_hook_nokey", "{!s}/usr/share/initramfs-tools/hooks/encrypt_hook".format(root_mount_point))
+ shutil.copy2(
+ "/usr/lib/calamares/modules/initramfscfg/encrypt_hook_nokey",
+ target
+ )
else:
- shutil.copy2("/usr/lib/calamares/modules/initramfscfg/encrypt_hook", "{!s}/usr/share/initramfs-tools/hooks/".format(root_mount_point))
- os.chmod("{!s}/usr/share/initramfs-tools/hooks/encrypt_hook".format(root_mount_point), 0o755)
+ shutil.copy2(
+ "/usr/lib/calamares/modules/initramfscfg/encrypt_hook",
+ target
+ )
+ os.chmod(target, 0o755)
+
def run():
- """ Calls routine with given parameters to configure initramfs
+ """
+ Calls routine with given parameters to configure initramfs
:return:
"""
diff --git a/src/modules/interactiveterminal/CMakeLists.txt b/src/modules/interactiveterminal/CMakeLists.txt
index dc0e90de0e271c91d7e430f23988ea28b99c06e3..7b35fae0d1556009824e501795f8612cbdc7d74d 100644
--- a/src/modules/interactiveterminal/CMakeLists.txt
+++ b/src/modules/interactiveterminal/CMakeLists.txt
@@ -1,8 +1,8 @@
-find_package(ECM 0.0.13 REQUIRED NO_MODULE)
+find_package(ECM 5.10.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH})
-include(KDEInstallDirs) # this seems to be necessary for KF5::CoreAddons
-include(GenerateExportHeader) # this too, because KDE frameworks always want omnomnom more stuff
+include(KDEInstallDirs)
+include(GenerateExportHeader)
find_package( KF5 REQUIRED Service Parts )
diff --git a/src/modules/locale/LCLocaleDialog.cpp b/src/modules/locale/LCLocaleDialog.cpp
index 4acef03e14899e6bf4b1fa5651afeb6fe5d60622..c6b475b24453d4411c9f1b84f741b5ad1ce3926a 100644
--- a/src/modules/locale/LCLocaleDialog.cpp
+++ b/src/modules/locale/LCLocaleDialog.cpp
@@ -1,6 +1,7 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
*
* Copyright 2014, Teo Mrnjavac <teo@kde.org>
+ * Copyright 2017, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp
index 027c80fa537612794955665d7a7a36b1ebe6ec97..c950b415c30e7f5104ec528f1d58e78603eaeda4 100644
--- a/src/modules/locale/LocalePage.cpp
+++ b/src/modules/locale/LocalePage.cpp
@@ -435,7 +435,7 @@ LocalePage::onActivate()
LocaleConfiguration
LocalePage::guessLocaleConfiguration()
{
- QLocale myLocale = QLocale(); // User-selected language
+ QLocale myLocale; // User-selected language
// If we cannot say anything about available locales
if ( m_localeGenLines.isEmpty() )
diff --git a/src/modules/luksbootkeyfile/main.py b/src/modules/luksbootkeyfile/main.py
index a598f3cf3fd642b150275141860f1091f7f6bff0..af8f444b49a9b7fa55d2b332ca2c11cb7920408b 100644
--- a/src/modules/luksbootkeyfile/main.py
+++ b/src/modules/luksbootkeyfile/main.py
@@ -4,6 +4,8 @@
# === This file is part of Calamares - <http://github.com/calamares> ===
#
# Copyright 2016, Teo Mrnjavac <teo@kde.org>
+# Copyright 2017, Alf Gaida <agaida@siduction.org>
+# Copyright 2017, Adriaan de Groot <groot@kde.org>
#
# Calamares is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -25,10 +27,10 @@ from libcalamares.utils import check_target_env_call
def run():
"""
- This module sets up a file crypto_keyfile.bin on the rootfs, assuming the rootfs
- is LUKS encrypted and a passphrase is provided. This file is then included in the
- initramfs and used for unlocking the rootfs from a previously unlocked GRUB2
- session.
+ This module sets up a file crypto_keyfile.bin on the rootfs, assuming the
+ rootfs is LUKS encrypted and a passphrase is provided. This file is then
+ included in the initramfs and used for unlocking the rootfs from a
+ previously unlocked GRUB2 session.
:return:
"""
@@ -52,8 +54,10 @@ def run():
return None
if not luks_root_passphrase:
- return ("Encrypted rootfs setup error",
- "Rootfs partition {!s} is LUKS but no passphrase found.".format(luks_root_device))
+ return (
+ "Encrypted rootfs setup error",
+ "Rootfs partition {!s} is LUKS but no passphrase found."
+ .format(luks_root_device))
# Generate random keyfile
check_target_env_call(["dd",
diff --git a/src/modules/luksopenswaphookcfg/main.py b/src/modules/luksopenswaphookcfg/main.py
index 4654e93a088fd3d7ea8a1c06248f6390ca81b897..a2bd9c5b1cc4694cfd2a21db707328a7530db8c5 100644
--- a/src/modules/luksopenswaphookcfg/main.py
+++ b/src/modules/luksopenswaphookcfg/main.py
@@ -4,6 +4,7 @@
# === This file is part of Calamares - <http://github.com/calamares> ===
#
# Copyright 2016, Teo Mrnjavac <teo@kde.org>
+# Copyright 2017, Alf Gaida <agaida@siduction.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
@@ -33,7 +34,9 @@ def write_openswap_conf(partitions, root_mount_point, openswap_conf_path):
swap_mapper_name = partition["luksMapperName"]
elif partition["mountPoint"] == "/" and "luksMapperName" in partition:
- mountable_keyfile_device = "/dev/mapper/{!s}".format(partition["luksMapperName"])
+ mountable_keyfile_device = (
+ "/dev/mapper/{!s}".format(partition["luksMapperName"])
+ )
if not mountable_keyfile_device or not swap_outer_uuid:
return None
@@ -41,7 +44,8 @@ def write_openswap_conf(partitions, root_mount_point, openswap_conf_path):
swap_device_path = "/dev/disk/by-uuid/{!s}".format(swap_outer_uuid)
lines = []
- with open(os.path.join(root_mount_point, openswap_conf_path), 'r') as openswap_file:
+ with open(os.path.join(root_mount_point,
+ openswap_conf_path), 'r') as openswap_file:
lines = [x.strip() for x in openswap_file.readlines()]
for i in range(len(lines)):
@@ -57,7 +61,8 @@ def write_openswap_conf(partitions, root_mount_point, openswap_conf_path):
elif lines[i].startswith("keyfile_filename"):
lines[i] = "keyfile_filename=crypto_keyfile.bin"
- with open(os.path.join(root_mount_point, openswap_conf_path), 'w') as openswap_file:
+ with open(os.path.join(root_mount_point,
+ openswap_conf_path), 'w') as openswap_file:
openswap_file.write("\n".join(lines) + "\n")
return None
@@ -75,4 +80,6 @@ def run():
openswap_conf_path = openswap_conf_path.lstrip('/')
- return write_openswap_conf(partitions, root_mount_point, openswap_conf_path)
+ return write_openswap_conf(
+ partitions, root_mount_point, openswap_conf_path
+ )
diff --git a/src/modules/machineid/main.py b/src/modules/machineid/main.py
index 2b1149c5a67303023128070f6a437dff1a3a61ae..7d0ac2c5485cecf8047787035d2ae2dc36e4109b 100644
--- a/src/modules/machineid/main.py
+++ b/src/modules/machineid/main.py
@@ -5,6 +5,7 @@
#
# Copyright 2014, Kevin Kofler <kevin.kofler@chello.at>
# Copyright 2016, Philip Müller <philm@manjaro.org>
+# Copyright 2017, Alf Gaida <agaida@siduction.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,8 @@ from libcalamares.utils import check_target_env_call
def run():
- """ Generate machine-id using dbus and systemd.
+ """
+ Generate machine-id using dbus and systemd.
:return:
"""
@@ -33,8 +35,8 @@ def run():
enable_systemd = libcalamares.job.configuration["systemd"]
enable_dbus = libcalamares.job.configuration["dbus"]
enable_symlink = libcalamares.job.configuration["symlink"]
- target_systemd_machineid_file = "{}/etc/machine-id".format(root_mount_point)
- target_dbus_machineid_file = "{}/var/lib/dbus/machine-id".format(root_mount_point)
+ target_systemd_machineid_file = root_mount_point + "/etc/machine-id"
+ target_dbus_machineid_file = root_mount_point + "/var/lib/dbus/machine-id"
if os.path.exists(target_dbus_machineid_file):
os.remove(target_dbus_machineid_file)
@@ -46,7 +48,8 @@ def run():
if enable_dbus:
if enable_symlink and os.path.exists(target_systemd_machineid_file):
- check_target_env_call(["ln", "-s", "/etc/machine-id", "/var/lib/dbus/machine-id"])
+ check_target_env_call(["ln", "-s", "/etc/machine-id",
+ "/var/lib/dbus/machine-id"])
else:
check_target_env_call(["dbus-uuidgen", "--ensure"])
diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
index c1abe091002ce63be996adb0cfc9ee83c76564e9..68f042af9fee458133af0685b3fbe368498e1e17 100644
--- a/src/modules/mount/main.py
+++ b/src/modules/mount/main.py
@@ -4,6 +4,7 @@
# === This file is part of Calamares - <http://github.com/calamares> ===
#
# Copyright 2014, Aurélien Gâteau <agateau@kde.org>
+# Copyright 2017, Alf Gaida <agaida@siduction.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,8 @@ import libcalamares
def mount_partitions(root_mount_point, partitions):
- """ Pass back mount point and filesystem for each partition.
+ """
+ Pass back mount point and filesystem for each partition.
:param root_mount_point:
:param partitions:
@@ -42,12 +44,14 @@ def mount_partitions(root_mount_point, partitions):
fstype = "vfat"
if "luksMapperName" in partition:
- libcalamares.utils.debug("about to mount {!s}".format(partition["luksMapperName"]))
- libcalamares.utils.mount("/dev/mapper/{!s}".format(partition["luksMapperName"]),
- mount_point,
- fstype,
- partition.get("options", ""),
- )
+ libcalamares.utils.debug(
+ "about to mount {!s}".format(partition["luksMapperName"]))
+ libcalamares.utils.mount(
+ "/dev/mapper/{!s}".format(partition["luksMapperName"]),
+ mount_point,
+ fstype,
+ partition.get("options", ""),
+ )
else:
libcalamares.utils.mount(partition["device"],
@@ -80,37 +84,41 @@ def mount_partitions(root_mount_point, partitions):
subprocess.check_call(["umount", "-v", root_mount_point])
if "luksMapperName" in partition:
- libcalamares.utils.mount("/dev/mapper/{!s}".format(partition["luksMapperName"]),
- mount_point,
- fstype,
- ",".join(["subvol=@",
- partition.get("options", "")]),
- )
+ libcalamares.utils.mount(
+ "/dev/mapper/{!s}".format(partition["luksMapperName"]),
+ mount_point,
+ fstype,
+ ",".join(
+ ["subvol=@", partition.get("options", "")]),
+ )
if not has_home_mount_point:
- libcalamares.utils.mount("/dev/mapper/{!s}".format(partition["luksMapperName"]),
- root_mount_point + "/home",
- fstype,
- ",".join(["subvol=@home",
- partition.get("options", "")]),
- )
+ libcalamares.utils.mount(
+ "/dev/mapper/{!s}".format(partition["luksMapperName"]),
+ root_mount_point + "/home",
+ fstype,
+ ",".join(
+ ["subvol=@home", partition.get("options", "")]),
+ )
else:
- libcalamares.utils.mount(partition["device"],
- mount_point,
- fstype,
- ",".join(["subvol=@",
- partition.get("options", "")]),
- )
+ libcalamares.utils.mount(
+ partition["device"],
+ mount_point,
+ fstype,
+ ",".join(["subvol=@", partition.get("options", "")]),
+ )
if not has_home_mount_point:
- libcalamares.utils.mount(partition["device"],
- root_mount_point + "/home",
- fstype,
- ",".join(["subvol=@home",
- partition.get("options", "")]),
- )
+ libcalamares.utils.mount(
+ partition["device"],
+ root_mount_point + "/home",
+ fstype,
+ ",".join(
+ ["subvol=@home", partition.get("options", "")]),
+ )
def run():
- """ Define mountpoints.
+ """
+ Define mountpoints.
:return:
"""
@@ -132,7 +140,8 @@ def run():
# Remember the extra mounts for the unpackfs module
if fw_type == 'efi':
- libcalamares.globalstorage.insert("extraMounts", extra_mounts + extra_mounts_efi)
+ libcalamares.globalstorage.insert(
+ "extraMounts", extra_mounts + extra_mounts_efi)
else:
libcalamares.globalstorage.insert("extraMounts", extra_mounts)
diff --git a/src/modules/netinstall/NetInstallPage.cpp b/src/modules/netinstall/NetInstallPage.cpp
index 94ba641ae491fa4188054e52700fd93c36b9a2b5..b5fa702d622cb45d910b66d38982dfdf4eac0f20 100644
--- a/src/modules/netinstall/NetInstallPage.cpp
+++ b/src/modules/netinstall/NetInstallPage.cpp
@@ -2,6 +2,7 @@
* Copyright 2016, Luca Giambonini <almack@chakraos.org>
* Copyright 2016, Lisa Vitolo <shainer@chakraos.org>
* Copyright 2017, Kyle Robbertze <krobbertze@gmail.com>
+ * Copyright 2017, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/modules/networkcfg/main.py b/src/modules/networkcfg/main.py
index 4ad9afe20cafd8de7b24e0d2c5fa98af5b45460a..3a9d653184f17a1c3916112b53bd11fc4bda9e68 100644
--- a/src/modules/networkcfg/main.py
+++ b/src/modules/networkcfg/main.py
@@ -5,6 +5,7 @@
#
# Copyright 2014, Philip Müller <philm@manjaro.org>
# Copyright 2014, Teo Mrnjavac <teo@kde.org>
+# Copyright 2017, Alf Gaida <agaida@siduction.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
@@ -26,11 +27,15 @@ import libcalamares
def run():
- """ Setup network configuration """
+ """
+ Setup network configuration
+ """
root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
source_nm = "/etc/NetworkManager/system-connections/"
- target_nm = os.path.join(root_mount_point, "etc/NetworkManager/system-connections/")
+ target_nm = os.path.join(
+ root_mount_point, "etc/NetworkManager/system-connections/"
+ )
# Sanity checks. We don't want to do anything if a network
# configuration already exists on the target
@@ -49,7 +54,10 @@ def run():
try:
shutil.copy(source_network, target_network)
except FileNotFoundError:
- libcalamares.utils.debug("Can't copy network configuration files in {}".format(source_network))
+ libcalamares.utils.debug(
+ "Can't copy network configuration files in "
+ + "{}".format(source_network)
+ )
except FileExistsError:
pass
@@ -60,11 +68,15 @@ def run():
try:
os.remove(target_resolv)
except Exception as err:
- libcalamares.utils.debug("Couldn't remove {}: {}".format(target_resolv, err))
+ libcalamares.utils.debug(
+ "Couldn't remove {}: {}".format(target_resolv, err)
+ )
try:
shutil.copy(source_resolv, target_resolv)
except Exception as err:
- libcalamares.utils.debug("Can't copy resolv.conf from {}: {}".format(source_resolv, err))
+ libcalamares.utils.debug(
+ "Can't copy resolv.conf from {}: {}".format(source_resolv, err)
+ )
return None
diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py
index bfd8636f5acd7d2b827b2d4f076f3c164b65195b..93fcc9eb7fd6770ccc162ec478b97c624480e1e7 100644
--- a/src/modules/packages/main.py
+++ b/src/modules/packages/main.py
@@ -6,6 +6,7 @@
# Copyright 2014, Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
# Copyright 2015-2017, Teo Mrnjavac <teo@kde.org>
# Copyright 2016-2017, Kyle Robbertze <kyle@aims.ac.za>
+# Copyright 2017, Alf Gaida <agaida@siduction.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,8 +26,10 @@ import libcalamares
from libcalamares.utils import check_target_env_call, target_env_call
from string import Template
+
class PackageManager:
- """ Package manager class.
+ """
+ Package manager class.
:param backend:
"""
@@ -43,15 +46,19 @@ class PackageManager:
for pkg in pkgs:
check_target_env_call(["pkcon", "-py", "install", pkg])
elif self.backend == "zypp":
- check_target_env_call(["zypper", "--non-interactive", "--quiet-install", "install",
- "--auto-agree-with-licenses", "install"] + pkgs)
+ check_target_env_call(["zypper", "--non-interactive",
+ "--quiet-install", "install",
+ "--auto-agree-with-licenses",
+ "install"] + pkgs)
elif self.backend == "yum":
check_target_env_call(["yum", "install", "-y"] + pkgs)
elif self.backend == "dnf":
check_target_env_call(["dnf", "install", "-y"] + pkgs)
elif self.backend == "urpmi":
- check_target_env_call(["urpmi", "--download-all", "--no-suggests", "--no-verify-rpm",
- "--fastunsafe", "--ignoresize", "--nolock", "--auto"] + pkgs)
+ check_target_env_call(["urpmi", "--download-all", "--no-suggests",
+ "--no-verify-rpm", "--fastunsafe",
+ "--ignoresize", "--nolock",
+ "--auto"] + pkgs)
elif self.backend == "apt":
check_target_env_call(["apt-get", "-q", "-y", "install"] + pkgs)
elif self.backend == "pacman":
@@ -60,7 +67,8 @@ class PackageManager:
else:
pacman_flags = "-Sy"
- check_target_env_call(["pacman", pacman_flags, "--noconfirm"] + pkgs)
+ check_target_env_call(["pacman", pacman_flags,
+ "--noconfirm"] + pkgs)
elif self.backend == "portage":
check_target_env_call(["emerge", "-v"] + pkgs)
elif self.backend == "entropy":
@@ -75,17 +83,23 @@ class PackageManager:
for pkg in pkgs:
check_target_env_call(["pkcon", "-py", "remove", pkg])
elif self.backend == "zypp":
- check_target_env_call(["zypper", "--non-interactive", "remove"] + pkgs)
+ check_target_env_call(["zypper", "--non-interactive",
+ "remove"] + pkgs)
elif self.backend == "yum":
- check_target_env_call(["yum", "--disablerepo=*", "-C", "-y", "remove"] + pkgs)
+ check_target_env_call(["yum", "--disablerepo=*", "-C", "-y",
+ "remove"] + pkgs)
elif self.backend == "dnf":
- # ignore the error code for now because dnf thinks removing a nonexistent package is an error
- target_env_call(["dnf", "--disablerepo=*", "-C", "-y", "remove"] + pkgs)
+ # ignore the error code for now because dnf thinks removing a
+ # nonexistent package is an error
+ target_env_call(["dnf", "--disablerepo=*", "-C", "-y",
+ "remove"] + pkgs)
elif self.backend == "urpmi":
check_target_env_call(["urpme", "--auto"] + pkgs)
elif self.backend == "apt":
- check_target_env_call(["apt-get", "--purge", "-q", "-y", "remove"] + pkgs)
- check_target_env_call(["apt-get", "--purge", "-q", "-y", "autoremove"])
+ check_target_env_call(["apt-get", "--purge", "-q", "-y",
+ "remove"] + pkgs)
+ check_target_env_call(["apt-get", "--purge", "-q", "-y",
+ "autoremove"])
elif self.backend == "pacman":
check_target_env_call(["pacman", "-Rs", "--noconfirm"] + pkgs)
elif self.backend == "portage":
@@ -120,7 +134,7 @@ def subst_locale(list):
locale = libcalamares.globalstorage.value("locale")
if locale:
for e in list:
- if locale != "en":
+ if locale != "en":
entry = Template(e)
ret.append(entry.safe_substitute(LOCALE=locale))
elif 'LOCALE' not in e:
@@ -129,8 +143,10 @@ def subst_locale(list):
ret = list
return ret
+
def run_operations(pkgman, entry):
- """ Call package manager with given parameters.
+ """
+ Call package manager with given parameters.
:param pkgman:
:param entry:
@@ -146,21 +162,25 @@ def run_operations(pkgman, entry):
else:
pkgman.install(entry[key])
elif key == "try_install":
- # we make a separate package manager call for each package so a single
- # failing package won't stop all of them
+ # we make a separate package manager call for each package so a
+ # single failing package won't stop all of them
for package in entry[key]:
if isinstance(package, str):
try:
pkgman.install([package])
except subprocess.CalledProcessError:
- libcalamares.utils.debug("WARNING: could not install package {}".format(package))
+ warn_text = "WARNING: could not install package "
+ warn_text += package
+ libcalamares.utils.debug(warn_text)
else:
try:
pkgman.run(package["pre-script"])
pkgman.install([package["package"]])
pkgman.run(package["post-script"])
except subprocess.CalledProcessError:
- libcalamares.utils.debug("WARNING: could not install packages {}".format(package["package"]))
+ warn_text = "WARNING: could not install packages "
+ warn_text += package["package"]
+ libcalamares.utils.debug(warn_text)
elif key == "remove":
pkgman.remove(entry[key])
elif key == "try_remove":
@@ -168,20 +188,24 @@ def run_operations(pkgman, entry):
try:
pkgman.remove([package])
except subprocess.CalledProcessError:
- libcalamares.utils.debug("WARNING: could not remove package {}".format(package))
+ warn_text = "WARNING: could not remove package "
+ warn_text += package
+ libcalamares.utils.debug(warn_text)
elif key == "localInstall":
pkgman.install(entry[key], from_local=True)
def run():
- """ Calls routine with detected package manager to install locale packages
+ """
+ Calls routine with detected package manager to install locale packages
or remove drivers not needed on the installed system.
:return:
"""
backend = libcalamares.job.configuration.get("backend")
- if backend not in ("packagekit", "zypp", "yum", "dnf", "urpmi", "apt", "pacman", "portage", "entropy"):
+ if backend not in ("packagekit", "zypp", "yum", "dnf", "urpmi", "apt",
+ "pacman", "portage", "entropy"):
return "Bad backend", "backend=\"{}\"".format(backend)
pkgman = PackageManager(backend)
@@ -195,6 +219,7 @@ def run():
run_operations(pkgman, entry)
if libcalamares.globalstorage.contains("packageOperations"):
- run_operations(pkgman, libcalamares.globalstorage.value("packageOperations"))
+ run_operations(pkgman,
+ libcalamares.globalstorage.value("packageOperations"))
return None
diff --git a/src/modules/partition/CMakeLists.txt b/src/modules/partition/CMakeLists.txt
index ceebbcf1f6365dca2073160538f9d736abd959a8..4ecf51016000715b50ae66b302c16e7ce89366e2 100644
--- a/src/modules/partition/CMakeLists.txt
+++ b/src/modules/partition/CMakeLists.txt
@@ -1,5 +1,5 @@
# ECM used for something in the tests directory
-find_package(ECM 0.0.13 REQUIRED NO_MODULE)
+find_package(ECM 5.10.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH})
# KF5::CoreAddons seems to be used for *something* in this module, not sure what
diff --git a/src/modules/partition/core/ColorUtils.h b/src/modules/partition/core/ColorUtils.h
index e5a77dea73248a6df5725081df28dbc6d62d03a7..50f4fd7857622efd39777a1ff5fb2fd2ae4c65d5 100644
--- a/src/modules/partition/core/ColorUtils.h
+++ b/src/modules/partition/core/ColorUtils.h
@@ -34,6 +34,12 @@ QColor freeSpaceColor();
QColor unknownDisklabelColor();
+/**
+ * @brief colorForPartition iterates over partitions, caches their colors and returns
+ * a color for the given partition.
+ * @param partition the partition for which to return a color.
+ * @return a color for the partition.
+ */
QColor colorForPartition( Partition* partition );
/**
@@ -42,6 +48,9 @@ QColor colorForPartition( Partition* partition );
*/
QColor colorForPartitionInFreeSpace( Partition* freeSpacePartition );
+/**
+ * @brief invalidateCache clears the partition colors cache.
+ */
void invalidateCache();
}
diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index 0f9b4203a5087349de65150d660c4cde3f6db222..875de3a63cb8318f8735ca10f86f221927220ff4 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -94,21 +94,22 @@ canBeResized( Partition* candidate )
->globalStorage()
->value( "requiredStorageGB" )
.toDouble( &ok );
+ double advisedStorageGB = requiredStorageGB + 0.5 + 2.0;
qint64 availableStorageB = candidate->available();
// We require a little more for partitioning overhead and swap file
// TODO: maybe make this configurable?
- qint64 requiredStorageB = ( requiredStorageGB + 0.5 + 2.0 ) * 1024 * 1024 * 1024;
- cDebug() << "Required storage B:" << requiredStorageB
- << QString( "(%1GB)" ).arg( requiredStorageB / 1024 / 1024 / 1024 );
+ qint64 advisedStorageB = advisedStorageGB * 1024 * 1024 * 1024;
+ cDebug() << "Required storage B:" << advisedStorageB
+ << QString( "(%1GB)" ).arg( advisedStorageGB );
cDebug() << "Available storage B:" << availableStorageB
<< QString( "(%1GB)" ).arg( availableStorageB / 1024 / 1024 / 1024 )
<< "for" << candidate->partitionPath() << " length:" << candidate->length()
<< " sectorsUsed:" << candidate->sectorsUsed() << " fsType:" << candidate->fileSystem().name();
if ( ok &&
- availableStorageB > requiredStorageB )
+ availableStorageB > advisedStorageB )
{
cDebug() << "Partition" << candidate->partitionPath() << "authorized for resize + autopartition install.";
diff --git a/src/modules/partition/core/PartUtils.h b/src/modules/partition/core/PartUtils.h
index 2cd63c24175ec4f1e2ed8560459ff844b8982d93..21d995965f0520bf1e2084130359bed69a61e1c9 100644
--- a/src/modules/partition/core/PartUtils.h
+++ b/src/modules/partition/core/PartUtils.h
@@ -29,12 +29,37 @@ class Partition;
namespace PartUtils
{
+/**
+ * @brief canBeReplaced checks whether the given Partition satisfies the criteria
+ * for replacing it with the new OS.
+ * @param candidate the candidate partition to replace.
+ * @return true if the criteria are met, otherwise false.
+ */
bool canBeReplaced( Partition* candidate );
+/**
+ * @brief canBeReplaced checks whether the given Partition satisfies the criteria
+ * for resizing (shrinking) it to make room for a new OS.
+ * @param candidate the candidate partition to resize.
+ * @return true if the criteria are met, otherwise false.
+ */
bool canBeResized( Partition* candidate );
+/**
+ * @brief canBeReplaced checks whether the given Partition satisfies the criteria
+ * for resizing (shrinking) it to make room for a new OS.
+ * @param core the PartitionCoreModule instance.
+ * @param partitionPath the device path of the candidate partition to resize.
+ * @return true if the criteria are met, otherwise false.
+ */
bool canBeResized( PartitionCoreModule* core, const QString& partitionPath );
+/**
+ * @brief runOsprober executes os-prober, parses the output and writes relevant
+ * data to GlobalStorage.
+ * @param core the PartitionCoreModule instance.
+ * @return a list of os-prober entries, parsed.
+ */
OsproberEntryList runOsprober( PartitionCoreModule* core );
}
diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp
index a8ef335f926f9aa984e09b6958e53f7c15d27bcd..dbb7e4000f6b9b7f04d5f4a2ab257d9d435a4cb8 100644
--- a/src/modules/partition/core/PartitionActions.cpp
+++ b/src/modules/partition/core/PartitionActions.cpp
@@ -35,14 +35,29 @@
namespace PartitionActions
{
+constexpr qint64 operator ""_MiB( unsigned long long m )
+{
+ return m * static_cast< qint64 >( 1024 ) * 1024;
+}
-qint64
-swapSuggestion( const qint64 availableSpaceB )
+constexpr qint64 operator ""_GiB( unsigned long long m )
+{
+ return operator ""_MiB(m) * static_cast< qint64 >( 1024 );
+}
+
+constexpr qint64 toMiB( unsigned long long m )
{
+ return operator ""_MiB( m );
+}
-#define MiB * static_cast< qint64 >( 1024 ) * 1024
-#define GiB * static_cast< qint64 >( 1024 ) * 1024 * 1024
+constexpr qint64 toGiB( unsigned long long m )
+{
+ return operator ""_GiB( m );
+}
+qint64
+swapSuggestion( const qint64 availableSpaceB )
+{
// swap(mem) = max(2, 2 * mem), if mem < 2 GiB
// = mem, if 2 GiB <= mem < 8 GiB
// = mem / 2, if 8 GIB <= mem < 64 GiB
@@ -63,10 +78,10 @@ swapSuggestion( const qint64 availableSpaceB )
if ( ensureSuspendToDisk )
{
- if ( availableRamB < 4 GiB )
- suggestedSwapSizeB = qMax( 2 GiB, availableRamB * 2 );
- else if ( availableRamB >= 4 GiB && availableRamB < 8 GiB )
- suggestedSwapSizeB = 8 GiB;
+ if ( availableRamB < 4_GiB )
+ suggestedSwapSizeB = qMax( 2_GiB, availableRamB * 2 );
+ else if ( availableRamB >= 4_GiB && availableRamB < 8_GiB )
+ suggestedSwapSizeB = 8_GiB;
else
suggestedSwapSizeB = availableRamB;
@@ -74,14 +89,14 @@ swapSuggestion( const qint64 availableSpaceB )
}
else //if we don't care about suspend to disk
{
- if ( availableRamB < 2 GiB )
- suggestedSwapSizeB = qMax( 2 GiB, availableRamB * 2 );
- else if ( availableRamB >= 2 GiB && availableRamB < 8 GiB )
+ if ( availableRamB < 2_GiB )
+ suggestedSwapSizeB = qMax( 2_GiB, availableRamB * 2 );
+ else if ( availableRamB >= 2_GiB && availableRamB < 8_GiB )
suggestedSwapSizeB = availableRamB;
- else if ( availableRamB >= 8 GiB && availableRamB < 64 GiB )
+ else if ( availableRamB >= 8_GiB && availableRamB < 64_GiB )
suggestedSwapSizeB = availableRamB / 2;
else
- suggestedSwapSizeB = 4 GiB;
+ suggestedSwapSizeB = 4_GiB;
suggestedSwapSizeB *= overestimationFactor;
@@ -111,9 +126,6 @@ doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPass
if ( FileSystem::typeForName( defaultFsType ) == FileSystem::Unknown )
defaultFsType = "ext4";
-#define MiB * static_cast< qint64 >( 1024 ) * 1024
-#define GiB * static_cast< qint64 >( 1024 ) * 1024 * 1024
-
// Partition sizes are expressed in MiB, should be multiples of
// the logical sector size (usually 512B).
int uefisys_part_size = 0;
@@ -129,11 +141,11 @@ doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPass
empty_space_size = 1;
}
- qint64 firstFreeSector = empty_space_size MiB / dev->logicalSize() + 1;
+ qint64 firstFreeSector = toMiB(empty_space_size) / dev->logicalSize() + 1;
if ( isEfi )
{
- qint64 lastSector = firstFreeSector + ( uefisys_part_size MiB / dev->logicalSize() );
+ qint64 lastSector = firstFreeSector + ( toMiB(uefisys_part_size) / dev->logicalSize() );
core->createPartitionTable( dev, PartitionTable::gpt );
Partition* efiPartition = KPMHelpers::createNewPartition(
dev->partitionTable(),
@@ -164,7 +176,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPass
qint64 availableSpaceB = ( dev->totalLogical() - firstFreeSector ) * dev->logicalSize();
suggestedSwapSizeB = swapSuggestion( availableSpaceB );
qint64 requiredSpaceB =
- ( gs->value( "requiredStorageGB" ).toDouble() + 0.1 + 2.0 ) GiB +
+ toGiB( gs->value( "requiredStorageGB" ).toDouble() + 0.1 + 2.0 ) +
suggestedSwapSizeB;
// If there is enough room for ESP + root + swap, create swap, otherwise don't.
diff --git a/src/modules/partition/core/PartitionActions.h b/src/modules/partition/core/PartitionActions.h
index 41871eb4c9eb51ba8f5bf2aa48af854f4c55b875..5bdf86c76e6fd261f7d71753d866bde9568ade62 100644
--- a/src/modules/partition/core/PartitionActions.h
+++ b/src/modules/partition/core/PartitionActions.h
@@ -27,10 +27,25 @@ class Partition;
namespace PartitionActions
{
+
+/**
+ * @brief doAutopartition sets up an autopartitioning operation on the given Device.
+ * @param core a pointer to the PartitionCoreModule instance.
+ * @param dev the device to wipe.
+ * @param luksPassphrase the passphrase for LUKS encryption (optional, default is empty).
+ */
void doAutopartition( PartitionCoreModule* core,
Device* dev,
const QString& luksPassphrase = QString() );
+/**
+ * @brief doReplacePartition sets up replace-partitioning with the given partition.
+ * @param core a pointer to the PartitionCoreModule instance.
+ * @param dev a pointer to the Device on which to replace a partition.
+ * @param partition a pointer to the Partition to be replaced.
+ * @param luksPassphrase the passphrase for LUKS encryption (optional, default is empty).
+ * @note this function also takes care of requesting PCM to delete the partition.
+ */
void doReplacePartition( PartitionCoreModule* core,
Device* dev,
Partition* partition,
diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp
index 6abb4b03d17e326cef35ac325570bdaff92024a4..608508d60aaaaa8171302a0d65f54f149cb3aead 100644
--- a/src/modules/partition/core/PartitionCoreModule.cpp
+++ b/src/modules/partition/core/PartitionCoreModule.cpp
@@ -2,6 +2,7 @@
*
* Copyright 2014, Aurélien Gâteau <agateau@kde.org>
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ * Copyright 2017, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/modules/partition/core/PartitionCoreModule.h b/src/modules/partition/core/PartitionCoreModule.h
index 4a0d89afcb58be233d8157b0016ffd1468ce48f0..c035670f01a34d696eb5a0b50ca9ee475aa4da44 100644
--- a/src/modules/partition/core/PartitionCoreModule.h
+++ b/src/modules/partition/core/PartitionCoreModule.h
@@ -53,6 +53,11 @@ class PartitionCoreModule : public QObject
{
Q_OBJECT
public:
+ /**
+ * @brief The SummaryInfo struct is a wrapper for PartitionModel instances for
+ * a given Device.
+ * Each Device gets a mutable "after" model and an immutable "before" model.
+ */
struct SummaryInfo
{
QString deviceName;
@@ -64,21 +69,41 @@ public:
PartitionCoreModule( QObject* parent = nullptr );
~PartitionCoreModule();
+ /**
+ * @brief init performs a devices scan and initializes all KPMcore data
+ * structures.
+ * This function is thread safe.
+ */
void init();
+ /**
+ * @brief deviceModel returns a model which exposes a list of available
+ * storage devices.
+ * @return the device model.
+ */
DeviceModel* deviceModel() const;
+ /**
+ * @brief partitionModelForDevice returns the PartitionModel for the given device.
+ * @param device the device for which to get a model.
+ * @return a PartitionModel which represents the partitions of a device.
+ */
PartitionModel* partitionModelForDevice( const Device* device ) const;
//HACK: all devices change over time, and together make up the state of the CoreModule.
// However this makes it hard to show the *original* state of a device.
- // With this horrible hack we rescan a single device node to create a Device object
- // that contains the current state of a disk regardless of subsequent changes.
- // This should probably be redone some other way.
+ // For each DeviceInfo we keep a second Device object that contains the
+ // current state of a disk regardless of subsequent changes.
// -- Teo 4/2015
//FIXME: make this horrible method private. -- Teo 12/2015
Device* immutableDeviceCopy( const Device* device );
+ /**
+ * @brief bootLoaderModel returns a model which represents the available boot
+ * loader locations.
+ * The single BootLoaderModel instance belongs to the PCM.
+ * @return the BootLoaderModel.
+ */
QAbstractItemModel* bootLoaderModel() const;
void createPartitionTable( Device* device, PartitionTable::TableType type );
@@ -96,21 +121,35 @@ public:
void setBootLoaderInstallPath( const QString& path );
+ /**
+ * @brief jobs creates and returns a list of jobs which can then apply the changes
+ * requested by the user.
+ * @return a list of jobs.
+ */
QList< Calamares::job_ptr > jobs() const;
bool hasRootMountPoint() const;
QList< Partition* > efiSystemPartitions() const;
+
+ /**
+ * @brief findPartitionByMountPoint returns a Partition* for a given mount point.
+ * @param mountPoint the mount point to find a partition for.
+ * @return a pointer to a Partition object.
+ * Note that this function looks for partitions in live devices (the "proposed"
+ * state), not the immutable copies. Comparisons with Partition* objects that
+ * refer to immutable Device*s will fail.
+ */
Partition* findPartitionByMountPoint( const QString& mountPoint ) const;
- void revert();
- void revertAllDevices();
- void revertDevice( Device* dev );
- void asyncRevertDevice( Device* dev, std::function< void() > callback );
+ void revert(); // full revert, thread safe, calls doInit
+ void revertAllDevices(); // convenience function, calls revertDevice
+ void revertDevice( Device* dev ); // rescans a single Device and updates DeviceInfo
+ void asyncRevertDevice( Device* dev, std::function< void() > callback ); //like revertDevice, but asynchronous
- void clearJobs();
+ void clearJobs(); // only clear jobs, the Device* states are preserved
- bool isDirty();
+ bool isDirty(); // true if there are pending changes, otherwise false
/**
* To be called when a partition has been altered, but only for changes
@@ -125,9 +164,9 @@ public:
*/
QList< SummaryInfo > createSummaryInfo() const;
- void dumpQueue() const;
+ void dumpQueue() const; // debug output
- const OsproberEntryList osproberEntries() const;
+ const OsproberEntryList osproberEntries() const; // os-prober data structure, cached
Q_SIGNALS:
void hasRootMountPointChanged( bool value );
diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 68a75c2df94767a287866b308e66b0a4a65e674e..a213e62fa319ad1ed4107a16bd7f900f1b93b02b 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -141,12 +141,6 @@ ChoicePage::~ChoicePage()
{}
-/**
- * @brief ChoicePage::init runs when the PartitionViewStep and the PartitionCoreModule are
- * ready. Sets up the rest of the UI based on os-prober output.
- * @param core the PartitionCoreModule pointer.
- * @param osproberEntries the output of os-prober, cleaned up and structured.
- */
void
ChoicePage::init( PartitionCoreModule* core )
{
diff --git a/src/modules/partition/gui/ChoicePage.h b/src/modules/partition/gui/ChoicePage.h
index 0c3f0b5a8f1c9ceb4c7e4af1a8ea5bac642295cc..f102cf419c6ce610f542ed5751282f9c8f45d976 100644
--- a/src/modules/partition/gui/ChoicePage.h
+++ b/src/modules/partition/gui/ChoicePage.h
@@ -42,6 +42,12 @@ class DeviceInfoWidget;
class Device;
+
+/**
+ * @brief The ChoicePage class is the first page of the partitioning interface.
+ * It offers a choice between partitioning operations and initiates all automated
+ * partitioning modes. For manual partitioning, see PartitionPage.
+ */
class ChoicePage : public QWidget, private Ui::ChoicePage
{
Q_OBJECT
@@ -58,13 +64,36 @@ public:
explicit ChoicePage( QWidget* parent = nullptr );
virtual ~ChoicePage();
+ /**
+ * @brief init runs when the PartitionViewStep and the PartitionCoreModule are
+ * ready. Sets up the rest of the UI based on os-prober output.
+ * @param core the PartitionCoreModule pointer.
+ */
void init( PartitionCoreModule* core );
+ /**
+ * @brief isNextEnabled answers whether the current state of the page is such
+ * that progressing to the next page should be allowed.
+ * @return true if next is allowed, otherwise false.
+ */
bool isNextEnabled() const;
+ /**
+ * @brief currentChoice returns the enum Choice value corresponding to the
+ * currently selected partitioning mode (with a PrettyRadioButton).
+ * @return the enum Choice value.
+ */
Choice currentChoice() const;
+ /**
+ * @brief onLeave runs when control passes from this page to another one.
+ */
void onLeave();
+
+ /**
+ * @brief applyActionChoice reacts to a choice of partitioning mode.
+ * @param choice the partitioning action choice.
+ */
void applyActionChoice( ChoicePage::Choice choice );
signals:
diff --git a/src/modules/partition/gui/PartitionViewStep.h b/src/modules/partition/gui/PartitionViewStep.h
index ce66e4bf9eccbe8ca607733be9a5d21f86572fa8..7f31a3d1b77f80463b6105b5941bf7cab88056ea 100644
--- a/src/modules/partition/gui/PartitionViewStep.h
+++ b/src/modules/partition/gui/PartitionViewStep.h
@@ -33,8 +33,8 @@ class PartitionCoreModule;
class QStackedWidget;
/**
- * The starting point of the module. Instantiates PartitionCoreModule and
- * PartitionPage, then connect them.
+ * The starting point of the module. Instantiates PartitionCoreModule,
+ * ChoicePage and PartitionPage, then connects them.
*/
class PLUGINDLLEXPORT PartitionViewStep : public Calamares::ViewStep
{
diff --git a/src/modules/partition/partition.conf b/src/modules/partition/partition.conf
index 88d7fee98d63b06e4f6138ec5fa91df0db519d3b..610fb7b4296acedc44b3d49c3c4c9e7e70e0009a 100644
--- a/src/modules/partition/partition.conf
+++ b/src/modules/partition/partition.conf
@@ -4,7 +4,14 @@
efiSystemPartition: "/boot/efi"
# Make sure an autogenerated swap partition is big enough for hibernation in
-# automated partitioning modes.
+# automated partitioning modes. Swap can be disabled through *neverCreateSwap*.
+#
+# When *ensureSuspendToDisk* is true, swap is never smaller than physical
+# memory, follows the guideline 2 * memory until swap reaches 8GiB.
+# When *ensureSuspendToDisk* is false, swap size scales up with memory
+# size until 8GiB, then at roughly half of memory size.
+#
+#
# Default is true.
ensureSuspendToDisk: true
@@ -31,6 +38,7 @@ defaultFileSystemType: "ext4"
# and/or your distribution's initramfs solution.
#
# BIG FAT WARNING:
+#
# This option is unsupported, as it cuts out a crucial security feature.
# Disabling LUKS and shipping Calamares without a correctly configured GRUB2
# and initramfs is considered suboptimal use of the Calamares software. The
diff --git a/src/modules/partition/tests/PartitionJobTests.cpp b/src/modules/partition/tests/PartitionJobTests.cpp
index 2b7ccc653aeacbc7f562d57a6d9943868ee6d54a..8521f4224f779ad6fca79e2b0f212ce69ff91c9f 100644
--- a/src/modules/partition/tests/PartitionJobTests.cpp
+++ b/src/modules/partition/tests/PartitionJobTests.cpp
@@ -1,6 +1,7 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
*
* Copyright 2014, Aurélien Gâteau <agateau@kde.org>
+ * Copyright 2017, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/modules/plymouthcfg/main.py b/src/modules/plymouthcfg/main.py
index 9612735cd4e65f39f79d52193e0b34a7fd60c19b..dd59f84d3c832dfb642e105459bc57994c67f077 100644
--- a/src/modules/plymouthcfg/main.py
+++ b/src/modules/plymouthcfg/main.py
@@ -4,6 +4,7 @@
# === This file is part of Calamares - <http://github.com/calamares> ===
#
# Copyright 2016, Artoo <artoo@manjaro.org>
+# Copyright 2017, Alf Gaida <agaida@siduction.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
@@ -35,7 +36,8 @@ class PlymouthController:
def setTheme(self):
plymouth_theme = libcalamares.job.configuration["plymouth_theme"]
target_env_call(["sed", "-e", 's|^.*Theme=.*|Theme=' +
- plymouth_theme + '|', "-i", "/etc/plymouth/plymouthd.conf"])
+ plymouth_theme + '|', "-i",
+ "/etc/plymouth/plymouthd.conf"])
def detect(self):
isPlymouth = target_env_call(["which", "plymouth"])
@@ -50,7 +52,8 @@ class PlymouthController:
def run(self):
if self.detect() == 0:
- if "plymouth_theme" in libcalamares.job.configuration and libcalamares.job.configuration["plymouth_theme"] is not None:
+ if (("plymouth_theme" in libcalamares.job.configuration) and
+ (libcalamares.job.configuration["plymouth_theme"] is not None)):
self.setTheme()
return None
@@ -58,4 +61,3 @@ class PlymouthController:
def run():
pc = PlymouthController()
return pc.run()
-
diff --git a/src/modules/postcfg/main.py b/src/modules/postcfg/main.py
index 81c7f53c795f88744bf7e215b0753c91ff0f53a1..4659ac545e93d2fe972d3fa930b67fe0183dbbb4 100644
--- a/src/modules/postcfg/main.py
+++ b/src/modules/postcfg/main.py
@@ -26,6 +26,7 @@ from distutils.dir_util import copy_tree
from os.path import join, exists
from libcalamares.utils import target_env_call
+
class ConfigController:
def __init__(self):
self.__root = libcalamares.globalstorage.value("rootMountPoint")
@@ -77,17 +78,21 @@ class ConfigController:
# Copy skel to root
self.copy_folder('etc/skel', 'root')
- # Workaround for pacman-key bug FS#45351 https://bugs.archlinux.org/task/45351
- # We have to kill gpg-agent because if it stays around we can't reliably unmount
+ # Workaround for pacman-key bug
+ # FS#45351 https://bugs.archlinux.org/task/45351
+ # We have to kill gpg-agent because if it stays
+ # around we can't reliably unmount
# the target partition.
self.terminate('gpg-agent')
# Update grub.cfg
- if exists(join(self.root, "usr/bin/update-grub")) and libcalamares.globalstorage.value("bootLoader") is not None:
+ if exists(join(self.root, "usr/bin/update-grub")) \
+ and libcalamares.globalstorage.value("bootLoader") is not None:
target_env_call(["update-grub"])
return None
+
def run():
""" Misc postinstall configurations """
diff --git a/src/modules/removeuser/main.py b/src/modules/removeuser/main.py
index f31e1dc9df869e873df26f20eb0a4b9952f564e1..45ccac6a18045c79600cbeb284841a2f502a9bd3 100644
--- a/src/modules/removeuser/main.py
+++ b/src/modules/removeuser/main.py
@@ -4,6 +4,7 @@
# === This file is part of Calamares - <http://github.com/calamares> ===
#
# Copyright 2015, Teo Mrnjavac <teo@kde.org>
+# Copyright 2017. Alf Gaida <agaida@siduction.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
@@ -23,12 +24,16 @@ import libcalamares
def run():
- """ Remove live user from target system """
+ """
+ Remove live user from target system
+ """
username = libcalamares.job.configuration["username"]
try:
- libcalamares.utils.check_target_env_call(["userdel", "-f", "-r", username])
+ libcalamares.utils.check_target_env_call(["userdel", "-f",
+ "-r", username])
except subprocess.CalledProcessError as e:
- libcalamares.utils.debug("Cannot remove user.", "'userdel' terminated with exit code {}.".format(e.returncode))
-
+ libcalamares.utils.debug("Cannot remove user.",
+ "'userdel' terminated with exit code",
+ "{}.".format(e.returncode))
return None
diff --git a/src/modules/services/main.py b/src/modules/services/main.py
index 55c720c3f7aef485a95842b458aac2c34ec0ef85..516979e497339f22a174a0a6c3efa6ea69c7c323 100644
--- a/src/modules/services/main.py
+++ b/src/modules/services/main.py
@@ -6,6 +6,7 @@
# Copyright 2014-2016, Philip Müller <philm@manjaro.org>
# Copyright 2014, Teo Mrnjavac <teo@kde.org>
# Copyright 2016, Artoo <artoo@manjaro.org>
+# Copyright 2017, Alf Gaida <agaida@siduction.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 @@ from os.path import join, exists
def run():
- """ Setup systemd services """
+ """
+ Setup systemd services
+ """
services = libcalamares.job.configuration['services']
targets = libcalamares.job.configuration['targets']
disable = libcalamares.job.configuration['disable']
@@ -38,49 +41,86 @@ def run():
# enable services
for svc in services:
- ec = libcalamares.utils.target_env_call(['systemctl', 'enable', '{}.service'.format(svc['name'])])
+ ec = libcalamares.utils.target_env_call(
+ ['systemctl', 'enable', '{}.service'.format(svc['name'])]
+ )
if ec != 0:
if svc['mandatory']:
- return "Cannot enable systemd service {}".format(svc['name']), \
- "systemctl enable call in chroot returned error code {}".format(ec)
+ return ("Cannot enable systemd service {}".format(svc['name']),
+ "systemctl enable call in chroot returned error code "
+ "{}".format(ec)
+ )
else:
- libcalamares.utils.debug("Cannot enable systemd service {}".format(svc['name']))
- libcalamares.utils.debug("systemctl enable call in chroot returned error code {}".format(ec))
+ libcalamares.utils.debug(
+ "Cannot enable systemd service {}".format(svc['name'])
+ )
+ libcalamares.utils.debug(
+ "systemctl enable call in chroot returned error code "
+ "{}".format(ec)
+ )
# enable targets
for tgt in targets:
- ec = libcalamares.utils.target_env_call(['systemctl', 'enable', '{}.target'.format(tgt['name'])])
+ ec = libcalamares.utils.target_env_call(
+ ['systemctl', 'enable', '{}.target'.format(tgt['name'])]
+ )
if ec != 0:
if tgt['mandatory']:
- return "Cannot enable systemd target {}".format(tgt['name']), \
- "systemctl enable call in chroot returned error code {}".format(ec)
+ return ("Cannot enable systemd target {}".format(tgt['name']),
+ "systemctl enable call in chroot returned error code "
+ "{}".format(ec)
+ )
else:
- libcalamares.utils.debug("Cannot enable systemd target {}".format(tgt['name']))
- libcalamares.utils.debug("systemctl enable call in chroot returned error code {}".format(ec))
+ libcalamares.utils.debug(
+ "Cannot enable systemd target {}".format(tgt['name'])
+ )
+ libcalamares.utils.debug(
+ "systemctl enable call in chroot returned error code "
+ "{}".format(ec)
+ )
for dbl in disable:
- ec = libcalamares.utils.target_env_call(['systemctl', 'disable', '{}.service'.format(dbl['name'])])
+ ec = libcalamares.utils.target_env_call(
+ ['systemctl', 'disable', '{}.service'.format(dbl['name'])]
+ )
if ec != 0:
if dbl['mandatory']:
- return "Cannot disable systemd service {}".format(dbl['name']), \
- "systemctl disable call in chroot returned error code {}".format(ec)
+ return ("Cannot disable systemd service"
+ "{}".format(dbl['name']),
+ "systemctl disable call in chroot returned error code "
+ "{}".format(ec))
else:
- libcalamares.utils.debug("Cannot disable systemd service {}".format(dbl['name']))
- libcalamares.utils.debug("systemctl disable call in chroot returned error code {}".format(ec))
-
+ libcalamares.utils.debug(
+ "Cannot disable systemd service {}".format(dbl['name'])
+ )
+ libcalamares.utils.debug(
+ "systemctl disable call in chroot returned error code "
+ "{}".format(ec)
+ )
+
if libcalamares.globalstorage.contains("displayManagers"):
for dm in libcalamares.globalstorage.value("displayManagers"):
- if not exists(join(rootmnt, "etc/systemd/system/display-manager.service")):
- ec = libcalamares.utils.target_env_call(['systemctl', 'enable', '{}.service'.format(dm)])
-
+ if not exists(join(
+ rootmnt, "etc/systemd/system/display-manager.service"
+ )):
+ ec = libcalamares.utils.target_env_call(
+ ['systemctl', 'enable', '{}.service'.format(dm)]
+ )
+
if ec != 0:
return "Cannot enable systemd service {}".format(dm), \
- "systemctl enable call in chroot returned error code {}".format(ec)
+ "systemctl enable call in chroot returned error " \
+ "code {}".format(ec)
else:
- libcalamares.utils.debug("Cannot enable systemd service {}".format(dm))
- libcalamares.utils.debug("systemctl enable call in chroot returned error code {}".format(ec))
+ libcalamares.utils.debug(
+ "Cannot enable systemd service {}".format(dm)
+ )
+ libcalamares.utils.debug(
+ "systemctl enable call in chroot returned error code "
+ "{}".format(ec)
+ )
return None
diff --git a/src/modules/servicescfg/main.py b/src/modules/servicescfg/main.py
index 9091a690e687fb4b56159d178fcc48391796e9ae..e64c69ed07be687df36afa10a109c49c4eea7a25 100644
--- a/src/modules/servicescfg/main.py
+++ b/src/modules/servicescfg/main.py
@@ -4,6 +4,7 @@
# === This file is part of Calamares - <http://github.com/calamares> ===
#
# Copyright 2016, Artoo <artoo@manjaro.org>
+# Copyright 2017, Philip Müller <philm@manjaro.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
@@ -23,6 +24,7 @@ import libcalamares
from libcalamares.utils import target_env_call
from os.path import exists, join
+
class ServicesController:
def __init__(self):
self.__root = libcalamares.globalstorage.value('rootMountPoint')
@@ -40,24 +42,49 @@ class ServicesController:
target_env_call(["sed", "-e", pattern, "-i", file])
def configure(self):
- self.setExpression('s|^.*rc_shell=.*|rc_shell="/usr/bin/sulogin"|', "/etc/rc.conf")
- self.setExpression('s|^.*rc_controller_cgroups=.*|rc_controller_cgroups="YES"|', "/etc/rc.conf")
- exp = 's|^.*keymap=.*|keymap="' + libcalamares.globalstorage.value("keyboardLayout") + '"|'
+ self.setExpression(
+ 's|^.*rc_shell=.*|rc_shell="/usr/bin/sulogin"|',
+ "/etc/rc.conf"
+ )
+ self.setExpression(
+ 's|^.*rc_controller_cgroups=.*|rc_controller_cgroups="YES"|',
+ "/etc/rc.conf"
+ )
+ exp = 's|^.*keymap=.*|keymap="' \
+ + libcalamares.globalstorage.value("keyboardLayout") \
+ + '"|'
self.setExpression(exp, "/etc/conf.d/keymaps")
- self.setExpression('s|pam_systemd.so|pam_ck_connector.so nox11|', "/etc/pam.d/system-login")
+ self.setExpression(
+ 's|pam_systemd.so|pam_ck_connector.so nox11|',
+ "/etc/pam.d/system-login"
+ )
for dm in libcalamares.globalstorage.value("displayManagers"):
exp = 's|^.*DISPLAYMANAGER=.*|DISPLAYMANAGER="' + dm + '"|'
self.setExpression(exp, "/etc/conf.d/xdm")
if dm == "lightdm":
- self.setExpression('s|^.*minimum-vt=.*|minimum-vt=7|', "/etc/lightdm/lightdm.conf")
- self.setExpression('s|pam_systemd.so|pam_ck_connector.so nox11|', "/etc/pam.d/lightdm-greeter")
+ self.setExpression(
+ 's|^.*minimum-vt=.*|minimum-vt=7|',
+ "/etc/lightdm/lightdm.conf"
+ )
+ self.setExpression(
+ 's|pam_systemd.so|pam_ck_connector.so nox11|',
+ "/etc/pam.d/lightdm-greeter"
+ )
if exists(join(self.root, "etc/pulse/client.conf")):
- self.setExpression('s|autospawn = no|autospawn = yes|', "/etc/pulse/client.conf")
+ self.setExpression(
+ 's|autospawn = no|autospawn = yes|',
+ "/etc/pulse/client.conf"
+ )
def update(self, action, state):
for svc in self.services[state]:
if exists(self.root + "/etc/init.d/" + svc["name"]):
- target_env_call(["rc-update", action, svc["name"], svc["runlevel"]])
+ target_env_call([
+ "rc-update",
+ action,
+ svc["name"],
+ svc["runlevel"]
+ ])
def run(self):
self.configure()
@@ -69,6 +96,7 @@ class ServicesController:
return None
+
def run():
""" Setup openrc services """
sc = ServicesController()
diff --git a/src/modules/testmodule.py b/src/modules/testmodule.py
index a2d7130dd14d300c41ec4ae0e8dc1b9b73e444cf..907e704b41bcc3e0f563fc7175346318a62dfb09 100755
--- a/src/modules/testmodule.py
+++ b/src/modules/testmodule.py
@@ -67,8 +67,8 @@ def main():
help="Dir containing the Python module.")
parser.add_argument("globalstorage_yaml", nargs="?",
help="A yaml file to initialize GlobalStorage.")
- parser.add_argument("configuration_yaml", nargs="?",
- help="A yaml file to initialize the configuration dict.")
+ help_desc = "A yaml file to initialize the configuration dict."
+ parser.add_argument("configuration_yaml", nargs="?", help=help_desc)
args = parser.parse_args()
print("Testing module in: " + args.moduledir)
diff --git a/src/modules/unpackfs/main.py b/src/modules/unpackfs/main.py
index 34d9829d9e07a988ab6a0bd8ca8277f3468ba8c4..c0970ddfef60f13dce2bd38bef56c06472f68a2b 100644
--- a/src/modules/unpackfs/main.py
+++ b/src/modules/unpackfs/main.py
@@ -6,6 +6,7 @@
# Copyright 2014, Teo Mrnjavac <teo@kde.org>
# Copyright 2014, Daniel Hillenbrand <codeworkx@bbqlinux.org>
# Copyright 2014, Philip Müller <philm@manjaro.org>
+# Copyright 2017, Alf Gaida <agaida@siduction.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
@@ -31,7 +32,8 @@ from libcalamares import *
class UnpackEntry:
- """ Extraction routine using rsync.
+ """
+ Extraction routine using rsync.
:param source:
:param sourcefs:
@@ -51,7 +53,8 @@ ON_POSIX = 'posix' in sys.builtin_module_names
def list_excludes(destination):
- """ List excludes for rsync.
+ """
+ List excludes for rsync.
:param destination:
:return:
@@ -69,7 +72,8 @@ def list_excludes(destination):
def file_copy(source, dest, progress_cb):
- """ Extract given image using rsync.
+ """
+ Extract given image using rsync.
:param source:
:param dest:
@@ -89,7 +93,9 @@ def file_copy(source, dest, progress_cb):
args = ['rsync', '-aHAXr']
args.extend(list_excludes(dest))
args.extend(['--progress', source, dest])
- process = subprocess.Popen(args, env=at_env, bufsize=1, stdout=subprocess.PIPE, close_fds=ON_POSIX)
+ process = subprocess.Popen(
+ args, env=at_env, bufsize=1, stdout=subprocess.PIPE, close_fds=ON_POSIX
+ )
for line in iter(process.stdout.readline, b''):
# small comment on this regexp.
@@ -119,15 +125,16 @@ def file_copy(source, dest, progress_cb):
process.wait()
- # 23 is the return code rsync returns if it cannot write extended attributes
- # (with -X) because the target file system does not support it, e.g., the
- # FAT EFI system partition. We need -X because distributions using file
- # system capabilities and/or SELinux require the extended attributes. But
- # distributions using SELinux may also have SELinux labels set on files
- # under /boot/efi, and rsync complains about those. The only clean way would
- # be to split the rsync into one with -X and --exclude /boot/efi and a
- # separate one without -X for /boot/efi, but only if /boot/efi is actually
- # an EFI system partition. For now, this hack will have to do. See also:
+ # 23 is the return code rsync returns if it cannot write extended
+ # attributes (with -X) because the target file system does not support it,
+ # e.g., the FAT EFI system partition. We need -X because distributions
+ # using file system capabilities and/or SELinux require the extended
+ # attributes. But distributions using SELinux may also have SELinux labels
+ # set on files under /boot/efi, and rsync complains about those. The only
+ # clean way would be to split the rsync into one with -X and
+ # --exclude /boot/efi and a separate one without -X for /boot/efi, but only
+ # if /boot/efi is actually an EFI system partition. For now, this hack will
+ # have to do. See also:
# https://bugzilla.redhat.com/show_bug.cgi?id=868755#c50
# for the same issue in Anaconda, which uses a similar workaround.
if process.returncode != 0 and process.returncode != 23:
@@ -137,7 +144,8 @@ def file_copy(source, dest, progress_cb):
class UnpackOperation:
- """ Extraction routine using unsquashfs.
+ """
+ Extraction routine using unsquashfs.
:param entries:
"""
@@ -147,7 +155,9 @@ class UnpackOperation:
self.entry_for_source = dict((x.source, x) for x in self.entries)
def report_progress(self):
- """ Pass progress to user interface """
+ """
+ Pass progress to user interface
+ """
progress = float(0)
for entry in self.entries:
@@ -162,7 +172,8 @@ class UnpackOperation:
job.setprogress(progress)
def run(self):
- """ Extract given image using unsquashfs.
+ """
+ Extract given image using unsquashfs.
:return:
"""
@@ -170,7 +181,8 @@ class UnpackOperation:
try:
for entry in self.entries:
- imgbasename = os.path.splitext(os.path.basename(entry.source))[0]
+ imgbasename = os.path.splitext(
+ os.path.basename(entry.source))[0]
imgmountdir = os.path.join(source_mount_path, imgbasename)
os.mkdir(imgmountdir)
@@ -186,10 +198,14 @@ class UnpackOperation:
return ("Failed to unpack image",
msg)
- fslist = subprocess.check_output(["unsquashfs", "-l", entry.source])
+ fslist = subprocess.check_output(
+ ["unsquashfs", "-l", entry.source]
+ )
if entry.sourcefs == "ext4":
- fslist = subprocess.check_output(["find", imgmountdir, "-type", "f"])
+ fslist = subprocess.check_output(
+ ["find", imgmountdir, "-type", "f"]
+ )
entry.total = len(fslist.splitlines())
@@ -197,25 +213,35 @@ class UnpackOperation:
error_msg = self.unpack_image(entry, imgmountdir)
if error_msg:
- return "Failed to unpack image {}".format(entry.source), error_msg
+ return ("Failed to unpack image {}".format(entry.source),
+ error_msg)
return None
finally:
shutil.rmtree(source_mount_path)
def mount_image(self, entry, imgmountdir):
- """ Mount given image as loop device.
+ """
+ Mount given image as loop device.
:param entry:
:param imgmountdir:
"""
if os.path.isdir(entry.source):
- subprocess.check_call(["mount", "--bind", entry.source, imgmountdir])
+ subprocess.check_call(["mount",
+ "--bind", entry.source,
+ imgmountdir])
else:
- subprocess.check_call(["mount", entry.source, imgmountdir, "-t", entry.sourcefs, "-o", "loop"])
+ subprocess.check_call(["mount",
+ entry.source,
+ imgmountdir,
+ "-t", entry.sourcefs,
+ "-o", "loop"
+ ])
def unpack_image(self, entry, imgmountdir):
- """ Unpacks image.
+ """
+ Unpacks image.
:param entry:
:param imgmountdir:
@@ -236,12 +262,13 @@ class UnpackOperation:
def run():
- """ Unsquashes filesystem from given image file.
+ """
+ Unsquashes filesystem from given image file.
from globalstorage: rootMountPoint
- from job.configuration: the path to where to mount the source image(s) for copying
- an ordered list of unpack mappings for image file <-> target dir relative
- to rootMountPoint, e.g.:
+ from job.configuration: the path to where to mount the source image(s) for
+ copying an ordered list of unpack mappings for image file <-> target dir
+ relative to rootMountPoint, e.g.:
configuration:
unpack:
- source: "/path/to/filesystem.img"
@@ -280,7 +307,8 @@ def run():
if os.path.isfile(PATH_PROCFS) and os.access(PATH_PROCFS, os.R_OK):
with open(PATH_PROCFS, 'r') as procfile:
filesystems = procfile.read()
- filesystems = filesystems.replace("nodev", "").replace("\t", "").splitlines()
+ filesystems = filesystems.replace(
+ "nodev", "").replace("\t", "").splitlines()
# Check if the source filesystem is supported
for fs in filesystems:
@@ -292,7 +320,7 @@ def run():
destination = os.path.abspath(root_mount_point + entry["destination"])
- if not os.path.exists(source):
+ if not os.path.exists(source):
return "Bad source", "source=\"{}\"".format(source)
if not os.path.isdir(destination):
diff --git a/src/modules/users/UsersPage.h b/src/modules/users/UsersPage.h
index 3445a420766e50944771ee425da65703443d6fbc..0f328f46cc15c283d7eb3c696dae413ab10b54a2 100644
--- a/src/modules/users/UsersPage.h
+++ b/src/modules/users/UsersPage.h
@@ -1,6 +1,7 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
*
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ * Copyright 2017, Adriaan de Groot <groot@kde.org>
*
* Portions from the Manjaro Installation Framework
* by Roland Singer <roland@manjaro.org>
diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp
index 986e38de589e4d313d90320d23175551105a7764..0ddf267ee1e8423b63b23fbfe0e6f482fe5ccb8a 100644
--- a/src/modules/welcome/WelcomePage.cpp
+++ b/src/modules/welcome/WelcomePage.cpp
@@ -2,6 +2,7 @@
*
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
* Copyright 2015, Anke Boersma <demm@kaosx.us>
+ * Copyright 2017, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -52,8 +53,11 @@ WelcomePage::WelcomePage( RequirementsChecker* requirementsChecker, QWidget* par
ui->mainText->setWordWrap( true );
ui->mainText->setOpenExternalLinks( true );
+ cDebug() << "Welcome string" << Calamares::Branding::instance()->welcomeStyleCalamares()
+ << Calamares::Branding::instance()->string( Calamares::Branding::VersionedName );
+
CALAMARES_RETRANSLATE(
- ui->mainText->setText( tr( "<h1>Welcome to the %1 installer.</h1>" )
+ ui->mainText->setText( (Calamares::Branding::instance()->welcomeStyleCalamares() ? tr( "<h1>Welcome to the Calamares installer for %1.</h1>" ) : tr( "<h1>Welcome to the %1 installer.</h1>" ))
.arg( Calamares::Branding::instance()->
string( Calamares::Branding::VersionedName ) ) );
ui->retranslateUi( this );