adds/adapts translation context markers

all nescessary in folder: Cura/resources

Contributes to: issue CURA-116
This commit is contained in:
Tamara Hogenhout 2015-09-08 16:30:10 +02:00
parent 4a9bf2b4d6
commit 28aec71c02
13 changed files with 39 additions and 35 deletions

View File

@ -63,7 +63,7 @@ UM.Dialog
width: parent.width width: parent.width
//: About dialog application author note //: About dialog application author note
text: catalog.i18nc("@label","Cura has been developed by Ultimaker B.V. in cooperation with the community.") text: catalog.i18nc("@info:credit","Cura has been developed by Ultimaker B.V. in cooperation with the community.")
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
anchors.top: description.bottom anchors.top: description.bottom
} }

View File

@ -70,7 +70,7 @@ UM.MainWindow
MenuItem MenuItem
{ {
text: catalog.i18nc("@action:menu", "Save Selection to File"); text: catalog.i18nc("@action:inmenu", "Save Selection to File");
enabled: UM.Selection.hasSelection; enabled: UM.Selection.hasSelection;
iconName: "document-save-as"; iconName: "document-save-as";
onTriggered: UM.OutputDeviceManager.requestWriteSelectionToDevice("local_file"); onTriggered: UM.OutputDeviceManager.requestWriteSelectionToDevice("local_file");

View File

@ -11,7 +11,7 @@ import UM 1.1 as UM
UM.PreferencesPage UM.PreferencesPage
{ {
//: General configuration page title //: General configuration page title
title: catalog.i18nc("@title:wizard","General"); title: catalog.i18nc("@title","General");
function reset() function reset()
{ {
@ -80,7 +80,8 @@ UM.PreferencesPage
// Because ListModel is stupid and does not allow using qsTr() for values. // Because ListModel is stupid and does not allow using qsTr() for values.
for(var i = 0; i < languageList.count; ++i) for(var i = 0; i < languageList.count; ++i)
{ {
languageList.setProperty(i, "text", catalog.i18nc("@action:menu",languageList.get(i).text)); //languageList.setProperty(i, "text", catalog.i18nc("@action:menu",languageList.get(i).text));
languageList.setProperty(i, "text", languageList.get(i).text);
} }
// Glorious hack time. ComboBox does not update the text properly after changing the // Glorious hack time. ComboBox does not update the text properly after changing the
@ -112,7 +113,7 @@ UM.PreferencesPage
id: pushFreeText //is a button so the user doesn't have te click inconvenientley precise to enable or disable the checkbox id: pushFreeText //is a button so the user doesn't have te click inconvenientley precise to enable or disable the checkbox
//: Display Overhang preference checkbox //: Display Overhang preference checkbox
text: catalog.i18nc("@action:checkbox","Automatic push free"); text: catalog.i18nc("@option:check","Automatic push free");
onClicked: pushFreeCheckbox.checked = !pushFreeCheckbox.checked onClicked: pushFreeCheckbox.checked = !pushFreeCheckbox.checked
//: Display Overhang preference tooltip //: Display Overhang preference tooltip
@ -145,7 +146,7 @@ UM.PreferencesPage
id: sendDataText //is a button so the user doesn't have te click inconvenientley precise to enable or disable the checkbox id: sendDataText //is a button so the user doesn't have te click inconvenientley precise to enable or disable the checkbox
//: Display Overhang preference checkbox //: Display Overhang preference checkbox
text: catalog.i18nc("@action:checkbox","Send (anonymous) slice info"); text: catalog.i18nc("@option:check","Send (anonymous) slice info");
onClicked: sendDataCheckbox.checked = !sendDataCheckbox.checked onClicked: sendDataCheckbox.checked = !sendDataCheckbox.checked
//: Display Overhang preference tooltip //: Display Overhang preference tooltip
@ -177,7 +178,7 @@ UM.PreferencesPage
id: scaleToFitText //is a button so the user doesn't have te click inconvenientley precise to enable or disable the checkbox id: scaleToFitText //is a button so the user doesn't have te click inconvenientley precise to enable or disable the checkbox
//: Display Overhang preference checkbox //: Display Overhang preference checkbox
text: catalog.i18nc("@action:checkbox","Scale loaded meshes when too large"); text: catalog.i18nc("@option:check","Scale loaded meshes when too large");
onClicked: scaleToFitCheckbox.checked = !scaleToFitCheckbox.checked onClicked: scaleToFitCheckbox.checked = !scaleToFitCheckbox.checked
//: Display Overhang preference tooltip //: Display Overhang preference tooltip

View File

@ -138,7 +138,7 @@ Rectangle {
anchors.leftMargin: UM.Theme.sizes.default_margin.width/2 anchors.leftMargin: UM.Theme.sizes.default_margin.width/2
font: UM.Theme.fonts.default font: UM.Theme.fonts.default
color: UM.Theme.colors.text color: UM.Theme.colors.text
text: (!base.printDuration || !base.printDuration.valid) ? "" : catalog.i18nc("@label", "%1 m").arg(base.printDuration.getDisplayString(UM.DurationFormat.Short)) text: (!base.printDuration || !base.printDuration.valid) ? "" : catalog.i18nc("@label", "%1 h:m").arg(base.printDuration.getDisplayString(UM.DurationFormat.Short))
} }
} }
Item{ Item{

View File

@ -126,7 +126,7 @@ Rectangle
{ {
for(var i = 0; i < modesListModel.count; ++i) for(var i = 0; i < modesListModel.count; ++i)
{ {
modesListModel.setProperty(i, "text", catalog.i18nc("@label", modesListModel.get(i).text)); modesListModel.setProperty(i, "text", modesListModel.get(i).text);
} }
} }
} }

View File

@ -27,7 +27,7 @@ Item
Label{ Label{
id: settingsModeLabel id: settingsModeLabel
text: catalog.i18nc("@label","Print setup: "); text: catalog.i18nc("@label:listbox","Print setup: ");
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: UM.Theme.sizes.default_margin.width; anchors.leftMargin: UM.Theme.sizes.default_margin.width;
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -94,7 +94,7 @@ Item
Label{ Label{
id: machineSelectionLabel id: machineSelectionLabel
//: Machine selection label //: Machine selection label
text: catalog.i18nc("@label","Machine:"); text: catalog.i18nc("@label:listbox","Machine:");
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: UM.Theme.sizes.default_margin.width anchors.leftMargin: UM.Theme.sizes.default_margin.width
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter

View File

@ -138,7 +138,7 @@ Item
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: UM.Theme.sizes.default_margin.width anchors.leftMargin: UM.Theme.sizes.default_margin.width
//: Helpers selection label //: Helpers selection label
text: catalog.i18nc("@label","Helpers:"); text: catalog.i18nc("@label:listbox","Helpers:");
font: UM.Theme.fonts.default; font: UM.Theme.fonts.default;
} }
} }
@ -151,7 +151,7 @@ Item
CheckBox{ CheckBox{
Layout.preferredHeight: UM.Theme.sizes.section.height; Layout.preferredHeight: UM.Theme.sizes.section.height;
//: Setting enable skirt adhesion checkbox //: Setting enable skirt adhesion checkbox
text: catalog.i18nc("@action:checkbox","Enable Skirt Adhesion"); text: catalog.i18nc("@option:check","Enable Skirt Adhesion");
style: UM.Theme.styles.checkbox; style: UM.Theme.styles.checkbox;
checked: Printer.getSettingValue("skirt_line_count") == null ? false: Printer.getSettingValue("skirt_line_count"); checked: Printer.getSettingValue("skirt_line_count") == null ? false: Printer.getSettingValue("skirt_line_count");
onCheckedChanged: onCheckedChanged:
@ -166,7 +166,7 @@ Item
Layout.preferredHeight: UM.Theme.sizes.section.height; Layout.preferredHeight: UM.Theme.sizes.section.height;
//: Setting enable support checkbox //: Setting enable support checkbox
text: catalog.i18nc("@action:checkbox","Enable Support"); text: catalog.i18nc("@option:check","Enable Support");
style: UM.Theme.styles.checkbox; style: UM.Theme.styles.checkbox;

View File

@ -38,7 +38,7 @@ UM.PreferencesPage
id: viewText //is a button so the user doesn't have te click inconvenientley precise to enable or disable the checkbox id: viewText //is a button so the user doesn't have te click inconvenientley precise to enable or disable the checkbox
//: Display Overhang preference checkbox //: Display Overhang preference checkbox
text: catalog.i18nc("@action:button","Display Overhang"); text: catalog.i18nc("@option:check","Display Overhang");
onClicked: overhangCheckbox.checked = !overhangCheckbox.checked onClicked: overhangCheckbox.checked = !overhangCheckbox.checked
//: Display Overhang preference tooltip //: Display Overhang preference tooltip

View File

@ -177,7 +177,7 @@ Item
Label Label
{ {
id: insertNameLabel id: insertNameLabel
text: catalog.i18nc("@label", "Printer Name:"); text: catalog.i18nc("@label:textbox", "Printer Name:");
} }
TextField TextField
{ {

View File

@ -18,6 +18,7 @@ Column
anchors.fill: parent; anchors.fill: parent;
property variant printer_connection: UM.USBPrinterManager.connectedPrinterList.getItem(0).printer property variant printer_connection: UM.USBPrinterManager.connectedPrinterList.getItem(0).printer
Component.onCompleted: printer_connection.homeHead() Component.onCompleted: printer_connection.homeHead()
UM.I18nCatalog { id: catalog; name:"cura"}
Label Label
{ {
text: "" text: ""
@ -25,7 +26,7 @@ Column
} }
Button Button
{ {
text: "Move to next position" text: catalog.i18nc("@action:button","Move to next position");
onClicked: onClicked:
{ {
if(wizardPage.leveling_state == 0) if(wizardPage.leveling_state == 0)

View File

@ -46,20 +46,20 @@ Item
CheckBox CheckBox
{ {
text: catalog.i18nc("@action:checkbox","Extruder driver ugrades") text: catalog.i18nc("@option:check","Extruder driver ugrades")
checked: true checked: true
} }
CheckBox CheckBox
{ {
text: catalog.i18nc("@action:checkbox","Heated printer bed (kit)") text: catalog.i18nc("@option:check","Heated printer bed (kit)")
} }
CheckBox CheckBox
{ {
text: catalog.i18nc("@action:checkbox","Heated printer bed (self built)") text: catalog.i18nc("@option:check","Heated printer bed (self built)")
} }
CheckBox CheckBox
{ {
text: catalog.i18nc("@action:checkbox","Dual extrusion (experimental)") text: catalog.i18nc("@option:check","Dual extrusion (experimental)")
} }
} }

View File

@ -20,6 +20,7 @@ Column
property int extruder_target_temp: 0 property int extruder_target_temp: 0
property int bed_target_temp: 0 property int bed_target_temp: 0
property variant printer_connection: UM.USBPrinterManager.connectedPrinterList.rowCount() != 0 ? UM.USBPrinterManager.connectedPrinterList.getItem(0).printer: null property variant printer_connection: UM.USBPrinterManager.connectedPrinterList.rowCount() != 0 ? UM.USBPrinterManager.connectedPrinterList.getItem(0).printer: null
UM.I18nCatalog { id: catalog; name:"cura"}
Component.onCompleted: Component.onCompleted:
{ {
@ -31,7 +32,6 @@ Column
if (printer_connection != null) if (printer_connection != null)
printer_connection.stopPollEndstop() printer_connection.stopPollEndstop()
} }
UM.I18nCatalog { id: catalog; name:"cura"}
Label Label
{ {
text: parent.title text: parent.title
@ -52,7 +52,7 @@ Column
} }
Label Label
{ {
text: UM.USBPrinterManager.connectedPrinterList.count ? "Done":"Incomplete" text: UM.USBPrinterManager.connectedPrinterList.count ? catalog.i18nc("@info:status","Done"):catalog.i18nc("@info:status","Incomplete")
} }
} }
Row Row
@ -63,7 +63,7 @@ Column
} }
Label Label
{ {
text: x_min_pressed ? catalog.i18nc("@label","Works") : catalog.i18nc("@label","Not checked") text: x_min_pressed ? catalog.i18nc("@info:status","Works") : catalog.i18nc("@info:status","Not checked")
} }
} }
Row Row
@ -74,7 +74,7 @@ Column
} }
Label Label
{ {
text: y_min_pressed ? catalog.i18nc("@label","Works") : catalog.i18nc("@label","Not checked") text: y_min_pressed ? catalog.i18nc("@info:status","Works") : catalog.i18nc("@info:status","Not checked")
} }
} }
@ -86,7 +86,7 @@ Column
} }
Label Label
{ {
text: z_min_pressed ? catalog.i18nc("@label","Works") : catalog.i18nc("@label","Not checked") text: z_min_pressed ? catalog.i18nc("@info:status","Works") : catalog.i18nc("@info:status","Not checked")
} }
} }
@ -107,7 +107,7 @@ Column
{ {
if(printer_connection != null) if(printer_connection != null)
{ {
heater_status_label.text = catalog.i18nc("@label","Checking") heater_status_label.text = catalog.i18nc("@info:progress","Checking")
printer_connection.heatupNozzle(190) printer_connection.heatupNozzle(190)
wizardPage.extruder_target_temp = 190 wizardPage.extruder_target_temp = 190
} }
@ -116,7 +116,7 @@ Column
Label Label
{ {
id: heater_status_label id: heater_status_label
text: catalog.i18nc("@label","Not checked") text: catalog.i18nc("@info:status","Not checked")
} }
} }
@ -137,7 +137,7 @@ Column
{ {
if(printer_connection != null) if(printer_connection != null)
{ {
bed_status_label.text = catalog.i18nc("@label","Checking") bed_status_label.text = catalog.i18nc("@info:progress","Checking")
printer_connection.printer.heatupBed(60) printer_connection.printer.heatupBed(60)
wizardPage.bed_target_temp = 60 wizardPage.bed_target_temp = 60
} }
@ -146,7 +146,7 @@ Column
Label Label
{ {
id: bed_status_label id: bed_status_label
text: catalog.i18nc("@label","Not checked") text: catalog.i18nc("@info:status","Not checked")
} }
} }
@ -175,7 +175,7 @@ Column
{ {
if(printer_connection != null) if(printer_connection != null)
{ {
heater_status_label.text = catalog.i18nc("@label","Works") heater_status_label.text = catalog.i18nc("@info:status","Works")
printer_connection.heatupNozzle(0) printer_connection.heatupNozzle(0)
} }
} }
@ -184,7 +184,7 @@ Column
{ {
if(printer_connection.bedTemperature > wizardPage.bed_target_temp - 5 && printer_connection.bedTemperature < wizardPage.bed_target_temp + 5) if(printer_connection.bedTemperature > wizardPage.bed_target_temp - 5 && printer_connection.bedTemperature < wizardPage.bed_target_temp + 5)
{ {
bed_status_label.text = catalog.i18nc("@label","Works") bed_status_label.text = catalog.i18nc("@info:status","Works")
printer_connection.heatupBed(0) printer_connection.heatupBed(0)
} }
} }

View File

@ -13,6 +13,7 @@ Column
id: wizardPage id: wizardPage
property string title property string title
anchors.fill: parent; anchors.fill: parent;
UM.I18nCatalog { id: catalog; name:"cura"}
Label Label
{ {
text: parent.title text: parent.title
@ -38,12 +39,13 @@ Column
} }
Button Button
{ {
text: "Update"; text: catalog.i18nc("@action:button","Update")
onClicked: onClicked:
{ {
if(!UM.USBPrinterManager.updateFirmwareBySerial(text_area.text)) if(!UM.USBPrinterManager.updateFirmwareBySerial(text_area.text))
{ {
status_text.text = "ERROR" status_text.text = catalog.i18nc("@info:status","ERROR")
} }
} }
} }