on xenial help sign in
Fix messages.
81daf5aYing-Chun Liu
qml/Components/Dialogs.qml+9−9
@@ -67,10 +67,10 @@ Item {
67 id: logoutDialog
67 id: logoutDialog
68 Dialog {
68 Dialog {
69 id: dialogueLogout
69 id: dialogueLogout
70− title: i18n.tr("Logout")
70+ title: i18n.tr("Log out")
71− text: i18n.tr("Are you sure that you want to logout?")
71+ text: i18n.tr("Are you sure you want to log out?")
72 Button {
72 Button {
73− text: i18n.tr("Cancel")
73+ text: i18n.tr("No")
74 onClicked: {
74 onClicked: {
75 PopupUtils.close(dialogueLogout);
75 PopupUtils.close(dialogueLogout);
76 d.dialogShown = false;
76 d.dialogShown = false;
@@ -91,10 +91,10 @@ Item {
91 id: shutdownDialog
91 id: shutdownDialog
92 Dialog {
92 Dialog {
93 id: dialogueShutdown
93 id: dialogueShutdown
94− title: i18n.tr("Shutdown")
94+ title: i18n.tr("Shut down")
95− text: i18n.tr("Are you sure that you want to shutdown?")
95+ text: i18n.tr("Are you sure you want to shut down?")
96 Button {
96 Button {
97− text: i18n.tr("Cancel")
97+ text: i18n.tr("No")
98 onClicked: {
98 onClicked: {
99 PopupUtils.close(dialogueShutdown);
99 PopupUtils.close(dialogueShutdown);
100 d.dialogShown = false;
100 d.dialogShown = false;
@@ -117,9 +117,9 @@ Item {
117 Dialog {
117 Dialog {
118 id: dialogueReboot
118 id: dialogueReboot
119 title: i18n.tr("Reboot")
119 title: i18n.tr("Reboot")
120− text: i18n.tr("Are you sure that you want to reboot?")
120+ text: i18n.tr("Are you sure you want to reboot?")
121 Button {
121 Button {
122− text: i18n.tr("Cancel")
122+ text: i18n.tr("No")
123 onClicked: {
123 onClicked: {
124 PopupUtils.close(dialogueReboot)
124 PopupUtils.close(dialogueReboot)
125 d.dialogShown = false;
125 d.dialogShown = false;
@@ -142,7 +142,7 @@ Item {
142 Dialog {
142 Dialog {
143 id: dialoguePower
143 id: dialoguePower
144 title: i18n.tr("Power")
144 title: i18n.tr("Power")
145− text: i18n.tr("Are you sure you would like to turn power off?")
145+ text: i18n.tr("Are you sure you would like\nto power off?")
146 Button {
146 Button {
147 text: i18n.tr("Power off")
147 text: i18n.tr("Power off")
148 onClicked: {
148 onClicked: {
qml/Shell.qml−6
@@ -391,12 +391,6 @@ Item {
391 } else if (status == Powerd.On) {
391 } else if (status == Powerd.On) {
392 edgeDemo.paused = false;
392 edgeDemo.paused = false;
393 }
393 }
394−
395− // Stop the timer to avoid displaying the power dialog when display
396− // state is changed.
397− if (status == Powerd.Off) {
398− dialogs.onPowerKeyReleased();
399− }
400 }
394 }
401 }
395 }
402
396