Merge branch 'master' of github.com:Ultimaker/Cura

plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml

@@ -31,7 +31,7 @@ Item {
             spacing: UM.Theme.getSize("default_margin").width
             Label
             {
-                text: catalog.i18nc("@label", "Print model with")
+                text: catalog.i18nc("@label Followed by extruder selection drop-down.", "Print model with")
                 anchors.verticalCenter: extruderSelector.verticalCenter
 
                 color: UM.Theme.getColor("setting_control_text")

resources/i18n/de/cura.po

@@ -919,7 +919,7 @@ msgid "Cancel"
 msgstr "Abbrechen"
 
 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:34
-msgctxt "@label"
+msgctxt "@label Followed by extruder selection drop-down."
 msgid "Print model with"
 msgstr "Modell drucken mit"
 
@@ -1781,12 +1781,12 @@ msgid ""
 msgstr "Einige ausgeblendete Einstellungen verwenden Werte, die von ihren normalen, berechneten Werten abweichen.\n\nKlicken Sie, um diese Einstellungen sichtbar zu machen."
 
 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:59
-msgctxt "@label"
+msgctxt "@label Header for list of settings."
 msgid "Affects"
 msgstr "Hat Einfluss auf"
 
 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:64
-msgctxt "@label"
+msgctxt "@label Header for list of settings."
 msgid "Affected By"
 msgstr "Wird beeinflusst von"
 

resources/i18n/en/cura.po

@@ -953,7 +953,7 @@ msgid "Cancel"
 msgstr "Cancel"
 
 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:34
-msgctxt "@label"
+msgctxt "@label Followed by extruder selection drop-down."
 msgid "Print model with"
 msgstr "Print model with"
 
@@ -1852,12 +1852,12 @@ msgstr ""
 "Click to make these settings visible."
 
 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:59
-msgctxt "@label"
+msgctxt "@label Header for list of settings."
 msgid "Affects"
 msgstr "Affects"
 
 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:64
-msgctxt "@label"
+msgctxt "@label Header for list of settings."
 msgid "Affected By"
 msgstr "Affected By"
 

resources/i18n/es/cura.po

@@ -919,7 +919,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:34
-msgctxt "@label"
+msgctxt "@label Followed by extruder selection drop-down."
 msgid "Print model with"
 msgstr "Imprimir modelo con"
 
@@ -1781,12 +1781,12 @@ msgid ""
 msgstr "Algunos ajustes ocultos utilizan valores diferentes de los valores normales calculados.\n\nHaga clic para mostrar estos ajustes."
 
 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:59
-msgctxt "@label"
+msgctxt "@label Header for list of settings."
 msgid "Affects"
 msgstr "Afecta a"
 
 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:64
-msgctxt "@label"
+msgctxt "@label Header for list of settings."
 msgid "Affected By"
 msgstr "Afectado por"
 

resources/i18n/fi/cura.po

@@ -919,7 +919,7 @@ msgid "Cancel"
 msgstr "Peruuta"
 
 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:34
-msgctxt "@label"
+msgctxt "@label Followed by extruder selection drop-down."
 msgid "Print model with"
 msgstr "Tulosta malli seuraavalla:"
 
@@ -1781,12 +1781,12 @@ msgid ""
 msgstr "Jotkin piilotetut asetukset käyttävät arvoja, jotka eroavat normaaleista lasketuista arvoista.\n\nTee asetuksista näkyviä napsauttamalla."
 
 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:59
-msgctxt "@label"
+msgctxt "@label Header for list of settings."
 msgid "Affects"
 msgstr "Koskee seuraavia:"
 
 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:64
-msgctxt "@label"
+msgctxt "@label Header for list of settings."
 msgid "Affected By"
 msgstr "Riippuu seuraavista:"
 

resources/i18n/fr/cura.po

@@ -919,7 +919,7 @@ msgid "Cancel"
 msgstr "Annuler"
 
 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:34
-msgctxt "@label"
+msgctxt "@label Followed by extruder selection drop-down."
 msgid "Print model with"
 msgstr "Imprimer le modèle avec"
 
@@ -1781,12 +1781,12 @@ msgid ""
 msgstr "Certains paramètres masqués utilisent des valeurs différentes de leur valeur normalement calculée.\n\nCliquez pour rendre ces paramètres visibles."
 
 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:59
-msgctxt "@label"
+msgctxt "@label Header for list of settings."
 msgid "Affects"
 msgstr "Touche"
 
 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:64
-msgctxt "@label"
+msgctxt "@label Header for list of settings."
 msgid "Affected By"
 msgstr "Touché par"
 

resources/i18n/it/cura.po

@@ -919,7 +919,7 @@ msgid "Cancel"
 msgstr "Annulla"
 
 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:34
-msgctxt "@label"
+msgctxt "@label Followed by extruder selection drop-down."
 msgid "Print model with"
 msgstr "Modello di stampa con"
 
@@ -1781,12 +1781,12 @@ msgid ""
 msgstr "Alcune impostazioni nascoste utilizzano valori diversi dal proprio valore normale calcolato.\n\nFare clic per rendere visibili queste impostazioni."
 
 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:59
-msgctxt "@label"
+msgctxt "@label Header for list of settings."
 msgid "Affects"
 msgstr "Influisce su"
 
 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:64
-msgctxt "@label"
+msgctxt "@label Header for list of settings."
 msgid "Affected By"
 msgstr "Influenzato da"
 

resources/i18n/nl/cura.po

@@ -919,7 +919,7 @@ msgid "Cancel"
 msgstr "Annuleren"
 
 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:34
-msgctxt "@label"
+msgctxt "@label Followed by extruder selection drop-down."
 msgid "Print model with"
 msgstr "Model printen met"
 
@@ -1781,12 +1781,12 @@ msgid ""
 msgstr "Een aantal verborgen instellingen gebruiken andere waarden dan hun normale berekende waarde.\n\nKlik om deze instellingen zichtbaar te maken."
 
 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:59
-msgctxt "@label"
+msgctxt "@label Header for list of settings."
 msgid "Affects"
 msgstr "Beïnvloedt"
 
 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:64
-msgctxt "@label"
+msgctxt "@label Header for list of settings."
 msgid "Affected By"
 msgstr "Beïnvloed door"
 

resources/i18n/tr/cura.po

@@ -919,7 +919,7 @@ msgid "Cancel"
 msgstr "İptal et"
 
 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:34
-msgctxt "@label"
+msgctxt "@label Followed by extruder selection drop-down."
 msgid "Print model with"
 msgstr "........... İle modeli yazdır"
 
@@ -1781,12 +1781,12 @@ msgid ""
 msgstr "Gizlenen bazı ayarlar normal hesaplanan değerden farklı değerler kullanır.\n\nBu ayarları görmek için tıklayın."
 
 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:59
-msgctxt "@label"
+msgctxt "@label Header for list of settings."
 msgid "Affects"
 msgstr "Etkileri"
 
 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:64
-msgctxt "@label"
+msgctxt "@label Header for list of settings."
 msgid "Affected By"
 msgstr ".........den etkilenir"
 

resources/qml/MonitorButton.qml

@@ -161,9 +161,9 @@ Rectangle
         visible: showProgress;
         indeterminate:
         {
-            if (!printerConnected)
+            if(!showProgress)
             {
-                return true;
+                return false; //Never be indeterminate when not visible, since that triggers a redraw of the screen.
             }
             switch(Cura.MachineManager.printerOutputDevices[0].jobState)
             {