Update translated strings and contexts

This commit is contained in:
Arjen Hiemstra 2015-09-12 19:58:22 +02:00
parent 0148186c7a
commit 67086b4d9f
9 changed files with 70 additions and 78 deletions

View file

@ -17,7 +17,7 @@ def getMetaData():
}, },
"mesh_reader": { "mesh_reader": {
"extension": "3mf", "extension": "3mf",
"description": catalog.i18nc("@item:inlistbox displays the fileformat in a list", "3MF File") "description": catalog.i18nc("@item:inlistbox", "3MF File")
} }
} }

View file

@ -19,7 +19,7 @@ def getMetaData():
"mesh_writer": { "mesh_writer": {
"output": [{ "output": [{
"extension": "gcode", "extension": "gcode",
"description": catalog.i18nc("@item:inlistbox displays the fileformat in a list", "GCode File"), "description": catalog.i18nc("@item:inlistbox", "GCode File"),
"mime_type": "text/x-gcode", "mime_type": "text/x-gcode",
"mode": GCodeWriter.GCodeWriter.OutputMode.TextMode "mode": GCodeWriter.GCodeWriter.OutputMode.TextMode
}] }]

View file

@ -33,7 +33,7 @@ class SliceInfo(Extension):
if not Preferences.getInstance().getValue("info/asked_send_slice_info"): if not Preferences.getInstance().getValue("info/asked_send_slice_info"):
self.send_slice_info_message = Message(catalog.i18nc("@info", "Cura automatically sends slice info. You can disable this in preferences"), lifetime = 0, dismissable = False) self.send_slice_info_message = Message(catalog.i18nc("@info", "Cura automatically sends slice info. You can disable this in preferences"), lifetime = 0, dismissable = False)
self.send_slice_info_message.addAction("Dismiss", catalog.i18nc("@action:button", "Dismiss"), None, catalog.i18nc("@action", "Dismiss")) self.send_slice_info_message.addAction("Dismiss", catalog.i18nc("@action:button", "Dismiss"), None, "")
self.send_slice_info_message.actionTriggered.connect(self.messageActionTriggered) self.send_slice_info_message.actionTriggered.connect(self.messageActionTriggered)
self.send_slice_info_message.show() self.send_slice_info_message.show()
@ -118,4 +118,4 @@ class SliceInfo(Extension):
except Exception as e: except Exception as e:
print("Exception occured", e) print("Exception occured", e)
f.close() f.close()

View file

@ -8,7 +8,6 @@ import UM 1.1 as UM
Item Item
{ {
property alias open: openAction; property alias open: openAction;
property alias save: saveAction;
property alias quit: quitAction; property alias quit: quitAction;
property alias undo: undoAction; property alias undo: undoAction;
@ -49,14 +48,14 @@ Item
{ {
id:toggleFullScreenAction id:toggleFullScreenAction
shortcut: StandardKey.FullScreen; shortcut: StandardKey.FullScreen;
text: catalog.i18nc("@action","Toggle Full Screen"); text: catalog.i18nc("@action:inmenu","Toggle Fu&ll Screen");
iconName: "view-fullscreen"; iconName: "view-fullscreen";
} }
Action Action
{ {
id: undoAction; id: undoAction;
text: catalog.i18nc("@action","Undo"); text: catalog.i18nc("@action:inmenu","&Undo");
iconName: "edit-undo"; iconName: "edit-undo";
shortcut: StandardKey.Undo; shortcut: StandardKey.Undo;
} }
@ -64,7 +63,7 @@ Item
Action Action
{ {
id: redoAction; id: redoAction;
text: catalog.i18nc("@action","Redo"); text: catalog.i18nc("@action:inmenu","&Redo");
iconName: "edit-redo"; iconName: "edit-redo";
shortcut: StandardKey.Redo; shortcut: StandardKey.Redo;
} }
@ -72,7 +71,7 @@ Item
Action Action
{ {
id: quitAction; id: quitAction;
text: catalog.i18nc("@action","Quit"); text: catalog.i18nc("@action:inmenu","&Quit");
iconName: "application-exit"; iconName: "application-exit";
shortcut: StandardKey.Quit; shortcut: StandardKey.Quit;
} }
@ -80,55 +79,55 @@ Item
Action Action
{ {
id: preferencesAction; id: preferencesAction;
text: catalog.i18nc("@action","Preferences..."); text: catalog.i18nc("@action:inmenu","&Preferences...");
iconName: "configure"; iconName: "configure";
} }
Action Action
{ {
id: addMachineAction; id: addMachineAction;
text: catalog.i18nc("@action","Add Printer..."); text: catalog.i18nc("@action:inmenu","&Add Printer...");
} }
Action Action
{ {
id: settingsAction; id: settingsAction;
text: catalog.i18nc("@action","Manage Printers..."); text: catalog.i18nc("@action:inmenu","Manage Pr&inters...");
iconName: "configure"; iconName: "configure";
} }
Action Action
{ {
id: manageProfilesAction; id: manageProfilesAction;
text: catalog.i18nc("@action","Manage Profiles..."); text: catalog.i18nc("@action:inmenu","Manage Profiles...");
iconName: "configure"; iconName: "configure";
} }
Action Action
{ {
id: documentationAction; id: documentationAction;
text: catalog.i18nc("@action","Show Online &Documentation"); text: catalog.i18nc("@action:inmenu","Show Online &Documentation");
iconName: "help-contents"; iconName: "help-contents";
shortcut: StandardKey.Help; shortcut: StandardKey.Help;
} }
Action { Action {
id: reportBugAction; id: reportBugAction;
text: catalog.i18nc("@action","Report a &Bug"); text: catalog.i18nc("@action:inmenu","Report a &Bug");
iconName: "tools-report-bug"; iconName: "tools-report-bug";
} }
Action Action
{ {
id: aboutAction; id: aboutAction;
text: catalog.i18nc("@action","About..."); text: catalog.i18nc("@action:inmenu","&About...");
iconName: "help-about"; iconName: "help-about";
} }
Action Action
{ {
id: deleteSelectionAction; id: deleteSelectionAction;
text: catalog.i18nc("@action","Delete Selection"); text: catalog.i18nc("@action:inmenu","Delete &Selection");
iconName: "edit-delete"; iconName: "edit-delete";
shortcut: StandardKey.Delete; shortcut: StandardKey.Delete;
} }
@ -136,7 +135,7 @@ Item
Action Action
{ {
id: deleteObjectAction; id: deleteObjectAction;
text: catalog.i18nc("@action","Delete Object"); text: catalog.i18nc("@action:inmenu","Delete Object");
iconName: "edit-delete"; iconName: "edit-delete";
shortcut: StandardKey.Backspace; shortcut: StandardKey.Backspace;
} }
@ -144,13 +143,13 @@ Item
Action Action
{ {
id: centerObjectAction; id: centerObjectAction;
text: catalog.i18nc("@action","Center Object on Platform"); text: catalog.i18nc("@action:inmenu","Ce&nter Object on Platform");
} }
Action Action
{ {
id: groupObjectsAction id: groupObjectsAction
text: catalog.i18nc("@action","Group Objects"); text: catalog.i18nc("@action:inmenu","&Group Objects");
enabled: UM.Scene.numObjectsSelected > 1 ? true: false enabled: UM.Scene.numObjectsSelected > 1 ? true: false
iconName: "object-group" iconName: "object-group"
} }
@ -158,7 +157,7 @@ Item
Action Action
{ {
id: unGroupObjectsAction id: unGroupObjectsAction
text: catalog.i18nc("@action","Ungroup Objects"); text: catalog.i18nc("@action:inmenu","Ungroup Objects");
enabled: UM.Scene.isGroupSelected enabled: UM.Scene.isGroupSelected
iconName: "object-ungroup" iconName: "object-ungroup"
} }
@ -166,7 +165,7 @@ Item
Action Action
{ {
id: mergeObjectsAction id: mergeObjectsAction
text: catalog.i18nc("@action","Merge Objects"); text: catalog.i18nc("@action:inmenu","&Merge Objects");
enabled: UM.Scene.numObjectsSelected > 1 ? true: false enabled: UM.Scene.numObjectsSelected > 1 ? true: false
iconName: "merge"; iconName: "merge";
} }
@ -174,56 +173,48 @@ Item
Action Action
{ {
id: multiplyObjectAction; id: multiplyObjectAction;
text: catalog.i18nc("@action","Duplicate Object"); text: catalog.i18nc("@action:inmenu","&Duplicate Object");
iconName: "edit-duplicate" iconName: "edit-duplicate"
} }
Action Action
{ {
id: deleteAllAction; id: deleteAllAction;
text: catalog.i18nc("@action","Clear Build Platform"); text: catalog.i18nc("@action:inmenu","&Clear Build Platform");
iconName: "edit-delete"; iconName: "edit-delete";
} }
Action Action
{ {
id: reloadAllAction; id: reloadAllAction;
text: catalog.i18nc("@action","Reload All Objects"); text: catalog.i18nc("@action:inmenu","Re&load All Objects");
iconName: "document-revert"; iconName: "document-revert";
} }
Action Action
{ {
id: resetAllTranslationAction; id: resetAllTranslationAction;
text: catalog.i18nc("@action","Reset All Object Positions"); text: catalog.i18nc("@action:inmenu","Reset All Object Positions");
} }
Action Action
{ {
id: resetAllAction; id: resetAllAction;
text: catalog.i18nc("@action","Reset All Object Transformations"); text: catalog.i18nc("@action:inmenu","Reset All Object &Transformations");
} }
Action Action
{ {
id: openAction; id: openAction;
text: catalog.i18nc("@action","Open File"); text: catalog.i18nc("@action:inmenu","&Open File...");
iconName: "document-open"; iconName: "document-open";
shortcut: StandardKey.Open; shortcut: StandardKey.Open;
} }
Action
{
id: saveAction;
text: catalog.i18nc("@action","Save...");
iconName: "document-save";
shortcut: StandardKey.Save;
}
Action Action
{ {
id: showEngineLogAction; id: showEngineLogAction;
text: catalog.i18nc("@action","Show Engine &Log..."); text: catalog.i18nc("@action:inmenu","Show Engine &Log...");
iconName: "view-list-text"; iconName: "view-list-text";
} }
} }

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","General"); title: catalog.i18nc("@title:tab","General");
function reset() function reset()
{ {
@ -43,16 +43,18 @@ UM.PreferencesPage
{ {
id: languageList id: languageList
ListElement { text: QT_TR_NOOP("English"); code: "en" } Component.onCompleted: {
ListElement { text: QT_TR_NOOP("German"); code: "de" } append({ text: catalog.i18nc("@item:inlistbox", "Bulgarian"), code: "bg" })
ListElement { text: QT_TR_NOOP("French"); code: "fr" } append({ text: catalog.i18nc("@item:inlistbox", "Czech"), code: "cs" })
ListElement { text: QT_TR_NOOP("Spanish"); code: "es" } append({ text: catalog.i18nc("@item:inlistbox", "English"), code: "en" })
ListElement { text: QT_TR_NOOP("Italian"); code: "it" } append({ text: catalog.i18nc("@item:inlistbox", "Finnish"), code: "fi" })
ListElement { text: QT_TR_NOOP("Finnish"); code: "fi" } append({ text: catalog.i18nc("@item:inlistbox", "French"), code: "fr" })
ListElement { text: QT_TR_NOOP("Russian"); code: "ru" } append({ text: catalog.i18nc("@item:inlistbox", "German"), code: "de" })
ListElement { text: QT_TR_NOOP("Polish"); code: "pl" } append({ text: catalog.i18nc("@item:inlistbox", "Italian"), code: "it" })
ListElement { text: QT_TR_NOOP("Czech"); code: "cs" } append({ text: catalog.i18nc("@item:inlistbox", "Polish"), code: "pl" })
ListElement { text: QT_TR_NOOP("Bulgarian"); code: "bg" } append({ text: catalog.i18nc("@item:inlistbox", "Russian"), code: "ru" })
append({ text: catalog.i18nc("@item:inlistbox", "Spanish"), code: "es" })
}
} }
currentIndex: currentIndex:

View file

@ -112,7 +112,7 @@ Rectangle {
anchors.top: printJobRow.bottom anchors.top: printJobRow.bottom
Item{ Item{
id: time id: time
width: (parent.width / 100 * 45) - UM.Theme.sizes.default_margin.width * 2 width: childrenRect.width;
height: parent.height height: parent.height
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: UM.Theme.sizes.default_margin.width anchors.leftMargin: UM.Theme.sizes.default_margin.width
@ -136,13 +136,14 @@ 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 h:m (abbreviation for hours:minutes) is added to the expected printtime (%1)", "%1 h:m").arg(base.printDuration.getDisplayString(UM.DurationFormat.Short)) text: (!base.printDuration || !base.printDuration.valid) ? "" : base.printDuration.getDisplayString(UM.DurationFormat.Short)
} }
} }
Item{ Item{
width: parent.width / 100 * 55 width: parent.width / 100 * 55
height: parent.height height: parent.height
anchors.left: time.right anchors.left: time.right
anchors.leftMargin: UM.Theme.sizes.default_margin.width;
anchors.top: parent.top anchors.top: parent.top
visible: base.printMaterialAmount > 0 ? true : false visible: base.printMaterialAmount > 0 ? true : false
UM.RecolorImage { UM.RecolorImage {
@ -163,7 +164,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.printMaterialAmount <= 0 ? "" : catalog.i18nc("@label m (abbreviation for meters) is added to the expected length of filament (%1) ","%1 m").arg(base.printMaterialAmount) text: base.printMaterialAmount <= 0 ? "" : catalog.i18nc("@label %1 is length of filament","%1 m").arg(base.printMaterialAmount)
} }
} }
} }
@ -279,4 +280,4 @@ Rectangle {
} }
UM.OutputDevicesModel { id: devicesModel; } UM.OutputDevicesModel { id: devicesModel; }
} }
} }

View file

@ -116,17 +116,12 @@ Rectangle
ListModel ListModel
{ {
id: modesListModel; id: modesListModel;
//: Simple configuration mode option
ListElement { text: QT_TR_NOOP("Simple"); file: "SidebarSimple.qml" }
//: Advanced configuration mode option
ListElement { text: QT_TR_NOOP("Advanced"); file: "SidebarAdvanced.qml" }
} }
Component.onCompleted: Component.onCompleted:
{ {
for(var i = 0; i < modesListModel.count; ++i) modesListModel.append({ text: catalog.i18nc("@title:tab", "Simple"), file: "SidebarSimple.qml" })
{ modesListModel.append({ text: catalog.i18nc("@title:tab", "Advanced"), file: "SidebarAdvanced.qml" })
modesListModel.setProperty(i, "text", catalog.i18nc("@label", modesListModel.get(i).text)); sidebarContents.setSource(modesListModel.get(header.currentModeIndex).file)
}
} }
} }

View file

@ -27,7 +27,7 @@ Item
Label{ Label{
id: settingsModeLabel id: settingsModeLabel
text: catalog.i18nc("@label:listbox","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

View file

@ -113,23 +113,26 @@ Item
ListModel { ListModel {
id: infillModel id: infillModel
ListElement { Component.onCompleted:
name: "Sparse" {
percentage: 20 infillModel.append({
text: "Sparse (20%) infill will give your model an average strength" name: catalog.i18nc("@label", "Sparse"),
icon: "sparse" percentage: 20,
} text: catalog.i18nc("@label", "Sparse (20%) infill will give your model an average strength"),
ListElement { icon: "sparse"
name: "Dense" })
percentage: 50 infillModel.append({
text: "Dense (50%) infill will give your model an above average strength" name: catalog.i18nc("@label", "Dense"),
icon: "dense" percentage: 50,
} text: catalog.i18nc("@label", "Dense (50%) infill will give your model an above average strength"),
ListElement { icon: "dense"
name: "Solid" })
percentage: 100; infillModel.append({
text: "Solid (100%) infill will make your model completely solid" name: catalog.i18nc("@label", "Solid"),
icon: "solid" percentage: 100,
text: catalog.i18nc("@label", "Solid (100%) infill will make your model completely solid"),
icon: "solid"
})
} }
} }
} }