diff options
| author | Lipu Fei <lipu.fei815@gmail.com> | 2019-09-24 15:26:43 +0300 |
|---|---|---|
| committer | Lipu Fei <lipu.fei815@gmail.com> | 2019-09-24 15:26:43 +0300 |
| commit | 94e89ad4ac36e6bdb5784d7a26d78e26da2f42e9 (patch) | |
| tree | 231ffac63681f867fec3640dee1453a1212c179f /plugins/3MFReader/WorkspaceDialog.qml | |
| parent | a741530db27b90013eedab8649bb6e22858938b7 (diff) | |
| parent | bd314a765f6f8c04bd6b58d26876898b4e7b63e6 (diff) | |
Fix merge conflicts with master
Diffstat (limited to 'plugins/3MFReader/WorkspaceDialog.qml')
| -rw-r--r-- | plugins/3MFReader/WorkspaceDialog.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml index 2b881b0fae..a38c53457c 100644 --- a/plugins/3MFReader/WorkspaceDialog.qml +++ b/plugins/3MFReader/WorkspaceDialog.qml @@ -55,8 +55,8 @@ UM.Dialog // See http://stackoverflow.com/questions/7659442/listelement-fields-as-properties Component.onCompleted: { - append({"key": "override", "label": catalog.i18nc("@action:ComboBox option", "Update existing")}); - append({"key": "new", "label": catalog.i18nc("@action:ComboBox option", "Create new")}); + append({"key": "override", "label": catalog.i18nc("@action:ComboBox Update/override existing profile", "Update existing")}); + append({"key": "new", "label": catalog.i18nc("@action:ComboBox Save settings in a new profile", "Create new")}); } } |