Merge branch 'master' of https://github.com/calamares/calamares into …

…development

CMakeLists.txt

@@ -203,7 +203,8 @@ endif()
 # (sr@latin in particular) may need special handling in CalamaresUtils.cpp.
 #
 # TODO: drop the es_ES translation from Transifex
-# TODO: import Esperanto once it has some translated strings
+# TODO: move eo (Esperanto) to _ok once Qt can actually create a
+#       locale for it.
 #
 # NOTE: when updating the list from Transifex, copy these four lines
 #       and prefix each variable name with "p", so that the automatic
@@ -212,7 +213,7 @@ set( _tx_complete da pt_PT ro tr_TR zh_TW zh_CN pt_BR fr hr ca lt id cs_CZ )
 set( _tx_good sq es pl ja sk it_IT hu ru he de nl bg uk )
 set( _tx_ok ast is ar sv el es_MX gl en_GB th fi_FI hi eu sr nb
             sl sr@latin mr es_PR kk kn et )
-set( _tx_bad uz eo lo ur gu fr_CH fa )
+set( _tx_bad uz lo ur gu fr_CH fa eo )
 
 # check translation update
 set( prev_tx ${p_tx_complete} ${p_tx_good} ${p_tx_ok} ${p_tx_bad} )
@@ -260,7 +261,7 @@ list( SORT CALAMARES_TRANSLATION_LANGUAGES )
 set( CALAMARES_VERSION_MAJOR 3 )
 set( CALAMARES_VERSION_MINOR 2 )
 set( CALAMARES_VERSION_PATCH 0 )
-set( CALAMARES_VERSION_RC 5 )
+set( CALAMARES_VERSION_RC 0 )
 
 set( CALAMARES_VERSION ${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH} )
 set( CALAMARES_VERSION_SHORT "${CALAMARES_VERSION}" )

calamares.desktop

@@ -42,6 +42,10 @@ Icon[es]=calamares
 GenericName[es]=Instalador del Sistema
 Comment[es]=Calamares — Instalador del Sistema
 Name[es]=Instalar Sistema
+Icon[et]=calamares
+GenericName[et]=Süsteemi installija
+Comment[et]=Calamares — Süsteemi installija
+Name[et]=Installi süsteem
 Name[eu]=Sistema instalatu
 Name[es_PR]=Instalar el sistema
 Icon[fr]=calamares
@@ -144,12 +148,15 @@ Icon[ast]=calamares
 GenericName[ast]=Instalador del sistema
 Comment[ast]=Calamares — Instalador del sistema
 Name[ast]=Instalar sistema
+Icon[eo]=calamares
+GenericName[eo]=Sistema Instalilo
+Comment[eo]=Calamares — Sistema Instalilo
+Name[eo]=Instali Sistemo
 Name[es_MX]=Instalar el Sistema
 Icon[pt_PT]=calamares
 GenericName[pt_PT]=Instalador de Sistema
 Comment[pt_PT]=Calamares - Instalador de Sistema
 Name[pt_PT]=Instalar Sistema
-Name[es_ES]=Instalar el sistema
 Icon[tr_TR]=calamares
 GenericName[tr_TR]=Sistem Yükleyici
 Comment[tr_TR]=Calamares — Sistem Yükleyici

calamares.desktop.in

@@ -0,0 +1,15 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Install System
+GenericName=System Installer
+Keywords=calamares;system;installer
+TryExec=calamares
+Exec=pkexec /usr/bin/calamares
+Comment=Calamares — System Installer
+Icon=calamares
+Terminal=false
+StartupNotify=true
+Categories=Qt;System;
+X-AppStream-Ignore=true
+

ci/txpull.sh

@@ -29,6 +29,25 @@ test -f "calamares.desktop" || { echo "! Not at Calamares top-level" ; exit 1 ;
 export QT_SELECT=5
 tx pull --force --source --all
 
+### CLEANUP TRANSLATIONS
+#
+# Some languages have been deprecated. They may still exist in Transifex,
+# so clean them up after pulling.
+#
+drop_language() {
+  rm -rf lang/python/"$1" src/modules/dummypythonqt/lang/"$1" lang/calamares_"$1".ts
+  grep -v "\\[$1]" calamares.desktop > calamares.desktop.new
+  mv calamares.desktop.new calamares.desktop
+}
+
+drop_language es_ES
+drop_language pl_PL
+
+# Also fix the .desktop file, which has some fields removed by Transifex.
+#
+{ cat calamares.desktop.in ; grep "\\[[a-zA-Z_@]*]=" calamares.desktop ; } > calamares.desktop.new
+mv calamares.desktop.new calamares.desktop
+
 ### COMMIT TRANSLATIONS
 #
 # Produce multiple commits (for the various parts of the i18n

lang/calamares_ar.ts

@@ -477,13 +477,13 @@ The installer will quit and all changes will be lost.</source>
 <context>
     <name>CommandList</name>
     <message>
-        <location filename="../src/libcalamares/utils/CommandList.cpp" line="113"/>
+        <location filename="../src/libcalamares/utils/CommandList.cpp" line="124"/>
         <source>Could not run command.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libcalamares/utils/CommandList.cpp" line="114"/>
-        <source>No rootMountPoint is defined, so command cannot be run in the target environment.</source>
+        <location filename="../src/libcalamares/utils/CommandList.cpp" line="125"/>
+        <source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -548,27 +548,27 @@ The installer will quit and all changes will be lost.</source>
         <translation>الح&amp;جم:</translation>
     </message>
     <message>
-        <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="68"/>
+        <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="69"/>
         <source>En&amp;crypt</source>
         <translation>تشفير</translation>
     </message>
     <message>
-        <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="177"/>
+        <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="148"/>
         <source>Logical</source>
         <translation>منطقيّ</translation>
     </message>
     <message>
-        <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="182"/>
+        <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="153"/>
         <source>Primary</source>
         <translation>أساسيّ</translation>
     </message>
     <message>
-        <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="199"/>
+        <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="170"/>
         <source>GPT</source>
         <translation>GPT</translation>
     </message>
     <message>
-        <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="288"/>
+        <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="259"/>
         <source>Mountpoint already in use. Please select another one.</source>
         <translation type="unfinished"/>
     </message>
@@ -858,7 +858,7 @@ The installer will quit and all changes will be lost.</source>
         <translation>الشّارات:</translation>
     </message>
     <message>
-        <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="307"/>
+        <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="268"/>
         <source>Mountpoint already in use. Please select another one.</source>
         <translation type="unfinished"/>
     </message>
@@ -1682,10 +1682,20 @@ The installer will quit and all changes will be lost.</source>
         <translation>ثبّت م&amp;حمّل الإقلاع على:</translation>
     </message>
     <message>
-        <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="168"/>
+        <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="169"/>
         <source>Are you sure you want to create a new partition table on %1?</source>
         <translation>أمتأكّد من إنشاء جدول تقسيم جديد على %1؟</translation>
     </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="193"/>
+        <source>Can not create new partition</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="194"/>
+        <source>The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PartitionViewStep</name>
@@ -2568,7 +2578,7 @@ Output:
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/modules/welcome/WelcomePage.cpp" line="287"/>
+        <location filename="../src/modules/welcome/WelcomePage.cpp" line="290"/>
         <source>%1 support</source>
         <translation>1%  الدعم</translation>
     </message>