3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 14:04:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

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
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
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")

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

@ -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"

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

@ -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"

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

@ -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"

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

@ -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:"

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

@ -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"

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

@ -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"

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

@ -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"

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

@ -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"

4
resources/qml/MonitorButton.qml
View file

@ -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)
{

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

@ -56,12 +56,12 @@ Item {
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 != "")
{
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