Merge lp:~paulliu/unity8/readd_restart_20140915 into lp:unity8

Proposed by Ying-Chun Liu
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 1265
Merged at revision: 1280
Proposed branch: lp:~paulliu/unity8/readd_restart_20140915
Merge into: lp:unity8
Diff against target: 206 lines (+43/-29)
2 files modified
po/unity8.pot (+33/-29)
qml/Components/Dialogs.qml (+10/-0)
To merge this branch: bzr merge lp:~paulliu/unity8/readd_restart_20140915
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Albert Astals Cid (community) Approve
Review via email: mp+235087@code.launchpad.net

Commit message

Re-add restart button for power menu. (LP: 1358197)

Description of the change

* Are there any related MPs required for this MP to build/function as expected?
no

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes.

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
Waiting for review.

To post a comment you must log in.
Albert Astals Cid (aacid) wrote :

Is there a bug for this?

review: Needs Information
Albert Astals Cid (aacid) wrote :

Also you need to regenerate the the .pot file

review: Needs Fixing
1265. By Ying-Chun Liu on 2014-09-18

Refresh pot file.

Albert Astals Cid (aacid) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes, it's also the same code we had previously

 * Did CI run pass? If not, please explain why.
autopilot is an unhappy creature

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/unity8.pot'
2--- po/unity8.pot 2014-08-26 16:27:42 +0000
3+++ po/unity8.pot 2014-09-18 12:14:05 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: unity8\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2014-08-26 18:24+0200\n"
9+"POT-Creation-Date: 2014-09-18 20:12+0800\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13@@ -21,12 +21,12 @@
14 msgid "Password: "
15 msgstr ""
16
17-#: plugins/Unity/Launcher/launcheritem.cpp:43
18-#: plugins/Unity/Launcher/launcheritem.cpp:73
19+#: plugins/Unity/Launcher/launcheritem.cpp:44
20+#: plugins/Unity/Launcher/launcheritem.cpp:74
21 msgid "Pin shortcut"
22 msgstr ""
23
24-#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:74
26 msgid "Unpin shortcut"
27 msgstr ""
28
29@@ -79,6 +79,10 @@
30 msgstr ""
31
32 #: qml/Components/Dialogs.qml:157
33+msgid "Restart"
34+msgstr ""
35+
36+#: qml/Components/Dialogs.qml:167
37 msgid "Cancel"
38 msgstr ""
39
40@@ -153,36 +157,36 @@
41 msgid "Hello"
42 msgstr ""
43
44-#: qml/Dash/GenericScopeView.qml:361
45+#: qml/Dash/GenericScopeView.qml:364 qml/Dash/GenericScopeView.qml:483
46 msgid "See less"
47 msgstr ""
48
49-#: qml/Dash/GenericScopeView.qml:361
50+#: qml/Dash/GenericScopeView.qml:364
51 msgid "See all"
52 msgstr ""
53
54-#: qml/Dash/GenericScopeView.qml:424 qml/Dash/PageHeader.qml:260
55+#: qml/Dash/GenericScopeView.qml:427 qml/Dash/PageHeader.qml:258
56 #: qml/Panel/SearchIndicator.qml:27
57 msgid "Search"
58 msgstr ""
59
60-#: qml/Dash/PageHeader.qml:270
61+#: qml/Dash/PageHeader.qml:268
62 msgid "Settings"
63 msgstr ""
64
65-#: qml/Dash/PageHeader.qml:279
66+#: qml/Dash/PageHeader.qml:275
67 msgid "Remove from Favorites"
68 msgstr ""
69
70-#: qml/Dash/PageHeader.qml:279
71+#: qml/Dash/PageHeader.qml:275
72 msgid "Add to Favorites"
73 msgstr ""
74
75-#: qml/Dash/Previews/PreviewActionCombo.qml:34
76+#: qml/Dash/Previews/PreviewActionCombo.qml:35
77 msgid "More..."
78 msgstr ""
79
80-#: qml/Dash/Previews/PreviewActionCombo.qml:34
81+#: qml/Dash/Previews/PreviewActionCombo.qml:35
82 msgid "Less..."
83 msgstr ""
84
85@@ -198,15 +202,15 @@
86 msgid "Send"
87 msgstr ""
88
89-#: qml/Dash/ScopesOverview.qml:201
90+#: qml/Dash/ScopesOverview.qml:206
91 msgid "Manage Dash"
92 msgstr ""
93
94-#: qml/Dash/ScopesOverview.qml:417
95+#: qml/Dash/ScopesOverview.qml:428
96 msgid "Done"
97 msgstr ""
98
99-#: qml/Dash/ScopesOverview.qml:443
100+#: qml/Dash/ScopesOverview.qml:454
101 msgid "Store"
102 msgstr ""
103
104@@ -242,15 +246,15 @@
105 msgid "Speaking..."
106 msgstr ""
107
108-#: qml/Notifications/NotificationMenuItemFactory.qml:105
109+#: qml/Notifications/NotificationMenuItemFactory.qml:108
110 msgid "Show password"
111 msgstr ""
112
113-#: qml/Notifications/NotificationMenuItemFactory.qml:120
114+#: qml/Notifications/NotificationMenuItemFactory.qml:124
115 msgid "Enter SIM PIN"
116 msgstr ""
117
118-#: qml/Notifications/NotificationMenuItemFactory.qml:121
119+#: qml/Notifications/NotificationMenuItemFactory.qml:125
120 msgid "Sorry, incorrect PIN"
121 msgstr ""
122
123@@ -294,51 +298,51 @@
124 msgid "Roaming"
125 msgstr ""
126
127-#: qml/Shell.qml:279
128+#: qml/Shell.qml:292
129 msgid "Enter your passphrase"
130 msgstr ""
131
132-#: qml/Shell.qml:280
133+#: qml/Shell.qml:293
134 msgid "Sorry, incorrect passphrase"
135 msgstr ""
136
137-#: qml/Shell.qml:282
138+#: qml/Shell.qml:295
139 msgid "Enter your passcode"
140 msgstr ""
141
142-#: qml/Shell.qml:283
143+#: qml/Shell.qml:296
144 msgid "Sorry, incorrect passcode"
145 msgstr ""
146
147-#: qml/Shell.qml:286
148+#: qml/Shell.qml:299
149 #, qt-format
150 msgid "Enter your %1"
151 msgstr ""
152
153-#: qml/Shell.qml:287
154+#: qml/Shell.qml:300
155 #, qt-format
156 msgid "Sorry, incorrect %1"
157 msgstr ""
158
159-#: qml/Shell.qml:323
160+#: qml/Shell.qml:335
161 msgid "Sorry, incorrect passphrase."
162 msgstr ""
163
164-#: qml/Shell.qml:324
165+#: qml/Shell.qml:336
166 msgid "Sorry, incorrect passcode."
167 msgstr ""
168
169-#: qml/Shell.qml:325
170+#: qml/Shell.qml:337
171 msgid "This will be your last attempt."
172 msgstr ""
173
174-#: qml/Shell.qml:327
175+#: qml/Shell.qml:339
176 msgid ""
177 "If passphrase is entered incorrectly, your phone will conduct a factory "
178 "reset and all personal data will be deleted."
179 msgstr ""
180
181-#: qml/Shell.qml:328
182+#: qml/Shell.qml:340
183 msgid ""
184 "If passcode is entered incorrectly, your phone will conduct a factory reset "
185 "and all personal data will be deleted."
186
187=== modified file 'qml/Components/Dialogs.qml'
188--- qml/Components/Dialogs.qml 2014-08-15 14:27:30 +0000
189+++ qml/Components/Dialogs.qml 2014-09-18 12:14:05 +0000
190@@ -154,6 +154,16 @@
191 color: UbuntuColors.red
192 }
193 Button {
194+ text: i18n.tr("Restart")
195+ onClicked: {
196+ dBusUnitySessionServiceConnection.closeAllApps();
197+ DBusUnitySessionService.Reboot();
198+ PopupUtils.close(dialoguePower);
199+ d.dialogShown = false;
200+ }
201+ color: UbuntuColors.green
202+ }
203+ Button {
204 text: i18n.tr("Cancel")
205 onClicked: {
206 PopupUtils.close(dialoguePower);

Subscribers

People subscribed via source and target branches