GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 02:16:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jaime van Kessel 2016-10-05 13:49:11 +02:00
commit f24fd5660d
11 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View File

@ -31,7 +31,7 @@ Item {
spacing: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("default_margin").width
Label 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 anchors.verticalCenter: extruderSelector.verticalCenter
color: UM.Theme.getColor("setting_control_text") color: UM.Theme.getColor("setting_control_text")

6
resources/i18n/de/cura.po
View File

@ -919,7 +919,7 @@ msgid "Cancel"
msgstr "Abbrechen" msgstr "Abbrechen"
#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:34 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:34
msgctxt "@label" msgctxt "@label Followed by extruder selection drop-down."
msgid "Print model with" msgid "Print model with"
msgstr "Modell drucken mit" 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." 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 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:59
msgctxt "@label" msgctxt "@label Header for list of settings."
msgid "Affects" msgid "Affects"
msgstr "Hat Einfluss auf" msgstr "Hat Einfluss auf"
#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:64 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:64
msgctxt "@label" msgctxt "@label Header for list of settings."
msgid "Affected By" msgid "Affected By"
msgstr "Wird beeinflusst von" msgstr "Wird beeinflusst von"

6
resources/i18n/en/cura.po
View File

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

6
resources/i18n/es/cura.po
View File

@ -919,7 +919,7 @@ msgid "Cancel"
msgstr "Cancelar" msgstr "Cancelar"
#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:34 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:34
msgctxt "@label" msgctxt "@label Followed by extruder selection drop-down."
msgid "Print model with" msgid "Print model with"
msgstr "Imprimir modelo con" 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." 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 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:59
msgctxt "@label" msgctxt "@label Header for list of settings."
msgid "Affects" msgid "Affects"
msgstr "Afecta a" msgstr "Afecta a"
#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:64 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:64
msgctxt "@label" msgctxt "@label Header for list of settings."
msgid "Affected By" msgid "Affected By"
msgstr "Afectado por" msgstr "Afectado por"

6
resources/i18n/fi/cura.po
View File

@ -919,7 +919,7 @@ msgid "Cancel"
msgstr "Peruuta" msgstr "Peruuta"
#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:34 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:34
msgctxt "@label" msgctxt "@label Followed by extruder selection drop-down."
msgid "Print model with" msgid "Print model with"
msgstr "Tulosta malli seuraavalla:" 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." 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 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:59
msgctxt "@label" msgctxt "@label Header for list of settings."
msgid "Affects" msgid "Affects"
msgstr "Koskee seuraavia:" msgstr "Koskee seuraavia:"
#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:64 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:64
msgctxt "@label" msgctxt "@label Header for list of settings."
msgid "Affected By" msgid "Affected By"
msgstr "Riippuu seuraavista:" msgstr "Riippuu seuraavista:"

6
resources/i18n/fr/cura.po
View File

@ -919,7 +919,7 @@ msgid "Cancel"
msgstr "Annuler" msgstr "Annuler"
#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:34 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:34
msgctxt "@label" msgctxt "@label Followed by extruder selection drop-down."
msgid "Print model with" msgid "Print model with"
msgstr "Imprimer le modèle avec" 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." 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 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:59
msgctxt "@label" msgctxt "@label Header for list of settings."
msgid "Affects" msgid "Affects"
msgstr "Touche" msgstr "Touche"
#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:64 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:64
msgctxt "@label" msgctxt "@label Header for list of settings."
msgid "Affected By" msgid "Affected By"
msgstr "Touché par" msgstr "Touché par"

6
resources/i18n/it/cura.po
View File

@ -919,7 +919,7 @@ msgid "Cancel"
msgstr "Annulla" msgstr "Annulla"
#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:34 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:34
msgctxt "@label" msgctxt "@label Followed by extruder selection drop-down."
msgid "Print model with" msgid "Print model with"
msgstr "Modello di stampa con" 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." 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 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:59
msgctxt "@label" msgctxt "@label Header for list of settings."
msgid "Affects" msgid "Affects"
msgstr "Influisce su" msgstr "Influisce su"
#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:64 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:64
msgctxt "@label" msgctxt "@label Header for list of settings."
msgid "Affected By" msgid "Affected By"
msgstr "Influenzato da" msgstr "Influenzato da"

6
resources/i18n/nl/cura.po
View File

@ -919,7 +919,7 @@ msgid "Cancel"
msgstr "Annuleren" msgstr "Annuleren"
#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:34 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:34
msgctxt "@label" msgctxt "@label Followed by extruder selection drop-down."
msgid "Print model with" msgid "Print model with"
msgstr "Model printen met" 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." 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 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:59
msgctxt "@label" msgctxt "@label Header for list of settings."
msgid "Affects" msgid "Affects"
msgstr "Beïnvloedt" msgstr "Beïnvloedt"
#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:64 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:64
msgctxt "@label" msgctxt "@label Header for list of settings."
msgid "Affected By" msgid "Affected By"
msgstr "Beïnvloed door" msgstr "Beïnvloed door"

6
resources/i18n/tr/cura.po
View File

@ -919,7 +919,7 @@ msgid "Cancel"
msgstr "İptal et" msgstr "İptal et"
#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:34 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:34
msgctxt "@label" msgctxt "@label Followed by extruder selection drop-down."
msgid "Print model with" msgid "Print model with"
msgstr "........... İle modeli yazdır" 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." 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 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:59
msgctxt "@label" msgctxt "@label Header for list of settings."
msgid "Affects" msgid "Affects"
msgstr "Etkileri" msgstr "Etkileri"
#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:64 #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:64
msgctxt "@label" msgctxt "@label Header for list of settings."
msgid "Affected By" msgid "Affected By"
msgstr ".........den etkilenir" msgstr ".........den etkilenir"

4
resources/qml/MonitorButton.qml
View File

@ -161,9 +161,9 @@ Rectangle
visible: showProgress; visible: showProgress;
indeterminate: 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) switch(Cura.MachineManager.printerOutputDevices[0].jobState)
{ {

4
resources/qml/Settings/SettingItem.qml
View File

@ -56,12 +56,12 @@ Item {
if(affects_list != "") if(affects_list != "")
{ {
tooltip += "<br/><b>%1</b>\n<ul>\n%2</ul>".arg(catalog.i18nc("@label", "Affects")).arg(affects_list) tooltip += "<br/><b>%1</b>\n<ul>\n%2</ul>".arg(catalog.i18nc("@label Header for list of settings.", "Affects")).arg(affects_list)
} }
if(affected_by_list != "") if(affected_by_list != "")
{ {
tooltip += "<br/><b>%1</b>\n<ul>\n%2</ul>".arg(catalog.i18nc("@label", "Affected By")).arg(affected_by_list) tooltip += "<br/><b>%1</b>\n<ul>\n%2</ul>".arg(catalog.i18nc("@label Header for list of settings.", "Affected By")).arg(affected_by_list)
} }
return tooltip return tooltip