diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-19 18:03:14 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-19 18:03:14 +0200 |
commit | 77703754d73b9309683c83ca4460e599eb8f28e2 (patch) | |
tree | f5da2114b88a929dd58a36437c9181adc2783063 /src/dialogs/DefaultMessageDialog.qml | |
parent | faa5f59e2f26a5c4cf8b681443f2209d1b516b9c (diff) | |
parent | c3b5a796820d792c5c36e472b917e5a47b28763b (diff) | |
download | qtquickcontrols-77703754d73b9309683c83ca4460e599eb8f28e2.tar.gz |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/controls/Styles/iOS/ComboBoxStyle.qml
src/controls/Styles/iOS/SpinBoxStyle.qml
src/controls/Styles/iOS/TextAreaStyle.qml
src/controls/Styles/iOS/TextFieldStyle.qml
src/controls/Styles/iOS/iOS.pro
Change-Id: Ib31ead16807a952a39aaa611b27ad89d4f86c60c
Diffstat (limited to 'src/dialogs/DefaultMessageDialog.qml')
-rw-r--r-- | src/dialogs/DefaultMessageDialog.qml | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/dialogs/DefaultMessageDialog.qml b/src/dialogs/DefaultMessageDialog.qml index 5fa46cc3..b41b3743 100644 --- a/src/dialogs/DefaultMessageDialog.qml +++ b/src/dialogs/DefaultMessageDialog.qml @@ -140,115 +140,115 @@ AbstractMessageDialog { x: -content.outerSpacing Button { id: okButton - text: "OK" + text: qsTr("OK") onClicked: root.click(StandardButton.Ok) visible: root.standardButtons & StandardButton.Ok } Button { id: openButton - text: "Open" + text: qsTr("Open") onClicked: root.click(StandardButton.Open) visible: root.standardButtons & StandardButton.Open } Button { id: saveButton - text: "Save" + text: qsTr("Save") onClicked: root.click(StandardButton.Save) visible: root.standardButtons & StandardButton.Save } Button { id: saveAllButton - text: "Save All" + text: qsTr("Save All") onClicked: root.click(StandardButton.SaveAll) visible: root.standardButtons & StandardButton.SaveAll } Button { id: retryButton - text: "Retry" + text: qsTr("Retry") onClicked: root.click(StandardButton.Retry) visible: root.standardButtons & StandardButton.Retry } Button { id: ignoreButton - text: "Ignore" + text: qsTr("Ignore") onClicked: root.click(StandardButton.Ignore) visible: root.standardButtons & StandardButton.Ignore } Button { id: applyButton - text: "Apply" + text: qsTr("Apply") onClicked: root.click(StandardButton.Apply) visible: root.standardButtons & StandardButton.Apply } Button { id: yesButton - text: "Yes" + text: qsTr("Yes") onClicked: root.click(StandardButton.Yes) visible: root.standardButtons & StandardButton.Yes } Button { id: yesAllButton - text: "Yes to All" + text: qsTr("Yes to All") onClicked: root.click(StandardButton.YesToAll) visible: root.standardButtons & StandardButton.YesToAll } Button { id: noButton - text: "No" + text: qsTr("No") onClicked: root.click(StandardButton.No) visible: root.standardButtons & StandardButton.No } Button { id: noAllButton - text: "No to All" + text: qsTr("No to All") onClicked: root.click(StandardButton.NoToAll) visible: root.standardButtons & StandardButton.NoToAll } Button { id: discardButton - text: "Discard" + text: qsTr("Discard") onClicked: root.click(StandardButton.Discard) visible: root.standardButtons & StandardButton.Discard } Button { id: resetButton - text: "Reset" + text: qsTr("Reset") onClicked: root.click(StandardButton.Reset) visible: root.standardButtons & StandardButton.Reset } Button { id: restoreDefaultsButton - text: "Restore Defaults" + text: qsTr("Restore Defaults") onClicked: root.click(StandardButton.RestoreDefaults) visible: root.standardButtons & StandardButton.RestoreDefaults } Button { id: cancelButton - text: "Cancel" + text: qsTr("Cancel") onClicked: root.click(StandardButton.Cancel) visible: root.standardButtons & StandardButton.Cancel } Button { id: abortButton - text: "Abort" + text: qsTr("Abort") onClicked: root.click(StandardButton.Abort) visible: root.standardButtons & StandardButton.Abort } Button { id: closeButton - text: "Close" + text: qsTr("Close") onClicked: root.click(StandardButton.Close) visible: root.standardButtons & StandardButton.Close } Button { id: moreButton - text: "Show Details..." + text: qsTr("Show Details...") onClicked: content.state = (content.state === "" ? "expanded" : "") visible: root.detailedText.length > 0 } Button { id: helpButton - text: "Help" + text: qsTr("Help") onClicked: root.click(StandardButton.Help) visible: root.standardButtons & StandardButton.Help } @@ -303,7 +303,7 @@ AbstractMessageDialog { } PropertyChanges { target: moreButton - text: "Hide Details" + text: qsTr("Hide Details") } } ] |