on xenial help sign in
Re-add restart button for power menu. (LP: 1358197) Fixes: 1358197

Approved by: Albert Astals Cid

commit992b0b20ffc7258d9a5695a324daf47a2a6e3101 authorYing-Chun Liu <paul.liu@canonical.com> dateThu 18 Sep 2014, 21:25 (12 years ago) parent628a365ee2dc6c
2 files changed+43−29
po/unity8.pot+33−29 qml/Components/Dialogs.qml+10
po/unity8.pot+33−29
@@ -8,7 +8,7 @@ msgid ""
88msgstr ""
99"Project-Id-Version: unity8\n"
1010"Report-Msgid-Bugs-To: \n"
11−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
11+"POT-Creation-Date: 2014-09-18 20:12+0800\n"
1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,12 +21,12 @@ msgstr ""
2121msgid "Password: "
2222msgstr ""
2323
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
24+#: plugins/Unity/Launcher/launcheritem.cpp:44
25+#: plugins/Unity/Launcher/launcheritem.cpp:74
2626msgid "Pin shortcut"
2727msgstr ""
2828
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
29+#: plugins/Unity/Launcher/launcheritem.cpp:74
3030msgid "Unpin shortcut"
3131msgstr ""
3232
@@ -79,6 +79,10 @@ msgid "Power off"
7979msgstr ""
8080
8181#: qml/Components/Dialogs.qml:157
82+msgid "Restart"
83+msgstr ""
84+
85+#: qml/Components/Dialogs.qml:167
8286msgid "Cancel"
8387msgstr ""
8488
@@ -153,36 +157,36 @@ msgstr ""
153157msgid "Hello"
154158msgstr ""
155159
156−#: qml/Dash/GenericScopeView.qml:361
160+#: qml/Dash/GenericScopeView.qml:364 qml/Dash/GenericScopeView.qml:483
157161msgid "See less"
158162msgstr ""
159163
160−#: qml/Dash/GenericScopeView.qml:361
164+#: qml/Dash/GenericScopeView.qml:364
161165msgid "See all"
162166msgstr ""
163167
164−#: qml/Dash/GenericScopeView.qml:424 qml/Dash/PageHeader.qml:260
168+#: qml/Dash/GenericScopeView.qml:427 qml/Dash/PageHeader.qml:258
165169#: qml/Panel/SearchIndicator.qml:27
166170msgid "Search"
167171msgstr ""
168172
169−#: qml/Dash/PageHeader.qml:270
173+#: qml/Dash/PageHeader.qml:268
170174msgid "Settings"
171175msgstr ""
172176
173−#: qml/Dash/PageHeader.qml:279
177+#: qml/Dash/PageHeader.qml:275
174178msgid "Remove from Favorites"
175179msgstr ""
176180
177−#: qml/Dash/PageHeader.qml:279
181+#: qml/Dash/PageHeader.qml:275
178182msgid "Add to Favorites"
179183msgstr ""
180184
181−#: qml/Dash/Previews/PreviewActionCombo.qml:34
185+#: qml/Dash/Previews/PreviewActionCombo.qml:35
182186msgid "More..."
183187msgstr ""
184188
185−#: qml/Dash/Previews/PreviewActionCombo.qml:34
189+#: qml/Dash/Previews/PreviewActionCombo.qml:35
186190msgid "Less..."
187191msgstr ""
188192
@@ -198,15 +202,15 @@ msgstr ""
198202msgid "Send"
199203msgstr ""
200204
201−#: qml/Dash/ScopesOverview.qml:201
205+#: qml/Dash/ScopesOverview.qml:206
202206msgid "Manage Dash"
203207msgstr ""
204208
205−#: qml/Dash/ScopesOverview.qml:417
209+#: qml/Dash/ScopesOverview.qml:428
206210msgid "Done"
207211msgstr ""
208212
209−#: qml/Dash/ScopesOverview.qml:443
213+#: qml/Dash/ScopesOverview.qml:454
210214msgid "Store"
211215msgstr ""
212216
@@ -242,15 +246,15 @@ msgstr ""
242246msgid "Speaking..."
243247msgstr ""
244248
245−#: qml/Notifications/NotificationMenuItemFactory.qml:105
249+#: qml/Notifications/NotificationMenuItemFactory.qml:108
246250msgid "Show password"
247251msgstr ""
248252
249−#: qml/Notifications/NotificationMenuItemFactory.qml:120
253+#: qml/Notifications/NotificationMenuItemFactory.qml:124
250254msgid "Enter SIM PIN"
251255msgstr ""
252256
253−#: qml/Notifications/NotificationMenuItemFactory.qml:121
257+#: qml/Notifications/NotificationMenuItemFactory.qml:125
254258msgid "Sorry, incorrect PIN"
255259msgstr ""
256260
@@ -294,51 +298,51 @@ msgstr ""
294298msgid "Roaming"
295299msgstr ""
296300
297−#: qml/Shell.qml:279
301+#: qml/Shell.qml:292
298302msgid "Enter your passphrase"
299303msgstr ""
300304
301−#: qml/Shell.qml:280
305+#: qml/Shell.qml:293
302306msgid "Sorry, incorrect passphrase"
303307msgstr ""
304308
305−#: qml/Shell.qml:282
309+#: qml/Shell.qml:295
306310msgid "Enter your passcode"
307311msgstr ""
308312
309−#: qml/Shell.qml:283
313+#: qml/Shell.qml:296
310314msgid "Sorry, incorrect passcode"
311315msgstr ""
312316
313−#: qml/Shell.qml:286
317+#: qml/Shell.qml:299
314318#, qt-format
315319msgid "Enter your %1"
316320msgstr ""
317321
318−#: qml/Shell.qml:287
322+#: qml/Shell.qml:300
319323#, qt-format
320324msgid "Sorry, incorrect %1"
321325msgstr ""
322326
323−#: qml/Shell.qml:323
327+#: qml/Shell.qml:335
324328msgid "Sorry, incorrect passphrase."
325329msgstr ""
326330
327−#: qml/Shell.qml:324
331+#: qml/Shell.qml:336
328332msgid "Sorry, incorrect passcode."
329333msgstr ""
330334
331−#: qml/Shell.qml:325
335+#: qml/Shell.qml:337
332336msgid "This will be your last attempt."
333337msgstr ""
334338
335−#: qml/Shell.qml:327
339+#: qml/Shell.qml:339
336340msgid ""
337341"If passphrase is entered incorrectly, your phone will conduct a factory "
338342"reset and all personal data will be deleted."
339343msgstr ""
340344
341−#: qml/Shell.qml:328
345+#: qml/Shell.qml:340
342346msgid ""
343347"If passcode is entered incorrectly, your phone will conduct a factory reset "
344348"and all personal data will be deleted."
qml/Components/Dialogs.qml+10
@@ -153,6 +153,16 @@ Item {
153153 }
154154 color: UbuntuColors.red
155155 }
156+ Button {
157+ text: i18n.tr("Restart")
158+ onClicked: {
159+ dBusUnitySessionServiceConnection.closeAllApps();
160+ DBusUnitySessionService.Reboot();
161+ PopupUtils.close(dialoguePower);
162+ d.dialogShown = false;
163+ }
164+ color: UbuntuColors.green
165+ }
156166 Button {
157167 text: i18n.tr("Cancel")
158168 onClicked: {