Update translated strings and contexts

plugins/3MFReader/__init__.py

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

plugins/GCodeWriter/__init__.py

@@ -19,7 +19,7 @@ def getMetaData():
         "mesh_writer": {
             "output": [{
                 "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",
                 "mode": GCodeWriter.GCodeWriter.OutputMode.TextMode
             }]

plugins/SliceInfoPlugin/SliceInfo.py

@@ -33,7 +33,7 @@ class SliceInfo(Extension):
 
         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.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.show()
 
@@ -118,4 +118,4 @@ class SliceInfo(Extension):
         except Exception as e:
             print("Exception occured", e)
 
-        f.close()
+        f.close()

resources/qml/Actions.qml

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

resources/qml/GeneralPage.qml

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

resources/qml/SaveButton.qml

@@ -112,7 +112,7 @@ Rectangle {
         anchors.top: printJobRow.bottom
         Item{
             id: time
-            width: (parent.width / 100 * 45) - UM.Theme.sizes.default_margin.width * 2
+            width: childrenRect.width;
             height: parent.height
             anchors.left: parent.left
             anchors.leftMargin: UM.Theme.sizes.default_margin.width
@@ -136,13 +136,14 @@ Rectangle {
                 anchors.leftMargin: UM.Theme.sizes.default_margin.width/2
                 font: UM.Theme.fonts.default
                 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{
             width: parent.width / 100 * 55
             height: parent.height
             anchors.left: time.right
+            anchors.leftMargin: UM.Theme.sizes.default_margin.width;
             anchors.top: parent.top
             visible: base.printMaterialAmount > 0 ? true : false
             UM.RecolorImage {
@@ -163,7 +164,7 @@ Rectangle {
                 anchors.leftMargin: UM.Theme.sizes.default_margin.width/2
                 font: UM.Theme.fonts.default
                 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; }
     }
-}
+}

resources/qml/Sidebar.qml

@@ -116,17 +116,12 @@ Rectangle
     ListModel
     {
         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:
     {
-        for(var i = 0; i < modesListModel.count; ++i)
-        {
-            modesListModel.setProperty(i, "text", catalog.i18nc("@label", modesListModel.get(i).text));
-        }
+        modesListModel.append({ text: catalog.i18nc("@title:tab", "Simple"), file: "SidebarSimple.qml" })
+        modesListModel.append({ text: catalog.i18nc("@title:tab", "Advanced"), file: "SidebarAdvanced.qml" })
+        sidebarContents.setSource(modesListModel.get(header.currentModeIndex).file)
     }
 }

resources/qml/SidebarHeader.qml

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

resources/qml/SidebarSimple.qml

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