git.iko.soy/unity8
on xenial help sign in
Make the Unity 8 session dialogs behave in the same fashion as Unity 7.
6ac4a05Chris Townsend
po/unity8.pot+101−82
compare with xenial
unifiedsplit
@@ -8,7 +8,7 @@ msgid ""
8msgstr ""
8msgstr ""
9"Project-Id-Version: unity8\n"
9"Project-Id-Version: unity8\n"
10"Report-Msgid-Bugs-To: \n"
10"Report-Msgid-Bugs-To: \n"
11−"POT-Creation-Date: 2015-02-13 11:45+0100\n"
11+"POT-Creation-Date: 2015-02-25 08:57-0500\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,81 +31,92 @@ msgstr ""
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr ""
32msgstr ""
33
33
34−#: qml/Components/DelayedLockscreen.qml:47
34+#: qml/Components/DelayedLockscreen.qml:49
35msgid "Device Locked"
35msgid "Device Locked"
36msgstr ""
36msgstr ""
37
37
38−#: qml/Components/DelayedLockscreen.qml:62
38+#: qml/Components/DelayedLockscreen.qml:64
39msgid "You have been locked out due to too many failed passphrase attempts."
39msgid "You have been locked out due to too many failed passphrase attempts."
40msgstr ""
40msgstr ""
41
41
42−#: qml/Components/DelayedLockscreen.qml:63
42+#: qml/Components/DelayedLockscreen.qml:65
43msgid "You have been locked out due to too many failed passcode attempts."
43msgid "You have been locked out due to too many failed passcode attempts."
44msgstr ""
44msgstr ""
45
45
46−#: qml/Components/DelayedLockscreen.qml:72
46+#: qml/Components/DelayedLockscreen.qml:74
47#, qt-format
47#, qt-format
48msgid "Please wait %1 minute and then try again…"
48msgid "Please wait %1 minute and then try again…"
49msgid_plural "Please wait %1 minutes and then try again…"
49msgid_plural "Please wait %1 minutes and then try again…"
50msgstr[0] ""
50msgstr[0] ""
51msgstr[1] ""
51msgstr[1] ""
52
52
53−#: qml/Components/Dialogs.qml:86
53+#: qml/Components/Dialogs.qml:87
54msgid "Log out"
54msgid "Log out"
55msgstr ""
55msgstr ""
56
56
57−#: qml/Components/Dialogs.qml:87
57+#: qml/Components/Dialogs.qml:88
58msgid "Are you sure you want to log out?"
58msgid "Are you sure you want to log out?"
59msgstr ""
59msgstr ""
60
60
61−#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
61+#: qml/Components/Dialogs.qml:90
62−#: qml/Components/Dialogs.qml:134
63−msgid "No"
62+msgid "Lock"
64msgstr ""
63msgstr ""
65
64
66−#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
65+#: qml/Components/Dialogs.qml:97
66+msgid "Log Out"
67+msgstr ""
68+
69+#: qml/Components/Dialogs.qml:104 qml/Components/Dialogs.qml:135
67−#: qml/Components/Dialogs.qml:140
70+#: qml/Components/Dialogs.qml:191
68−msgid "Yes"
71+msgid "Cancel"
69msgstr ""
72msgstr ""
70
73
71−#: qml/Components/Dialogs.qml:108
74+#: qml/Components/Dialogs.qml:116
72msgid "Shut down"
75msgid "Shut down"
73msgstr ""
76msgstr ""
74
77
75−#: qml/Components/Dialogs.qml:109
78+#: qml/Components/Dialogs.qml:117
76msgid "Are you sure you want to shut down?"
79msgid "Are you sure you want to shut down?"
77msgstr ""
80msgstr ""
78
81
79−#: qml/Components/Dialogs.qml:131
82+#: qml/Components/Dialogs.qml:119 qml/Components/Dialogs.qml:147
80msgid "Reboot"
83msgid "Reboot"
81msgstr ""
84msgstr ""
82
85
83−#: qml/Components/Dialogs.qml:132
86+#: qml/Components/Dialogs.qml:127
87+msgid "Shutdown"
88+msgstr ""
89+
90+#: qml/Components/Dialogs.qml:148
84msgid "Are you sure you want to reboot?"
91msgid "Are you sure you want to reboot?"
85msgstr ""
92msgstr ""
86
93
87−#: qml/Components/Dialogs.qml:154
94+#: qml/Components/Dialogs.qml:150
95+msgid "No"
96+msgstr ""
97+
98+#: qml/Components/Dialogs.qml:156
99+msgid "Yes"
100+msgstr ""
101+
102+#: qml/Components/Dialogs.qml:170
88msgid "Power"
103msgid "Power"
89msgstr ""
104msgstr ""
90
105
91−#: qml/Components/Dialogs.qml:155
106+#: qml/Components/Dialogs.qml:171
92msgid ""
107msgid ""
93"Are you sure you would like\n"
108"Are you sure you would like\n"
94"to power off?"
109"to power off?"
95msgstr ""
110msgstr ""
96
111
97−#: qml/Components/Dialogs.qml:157
112+#: qml/Components/Dialogs.qml:173
98msgid "Power off"
113msgid "Power off"
99msgstr ""
114msgstr ""
100
115
101−#: qml/Components/Dialogs.qml:166
116+#: qml/Components/Dialogs.qml:182
102msgid "Restart"
117msgid "Restart"
103msgstr ""
118msgstr ""
104
119
105−#: qml/Components/Dialogs.qml:175
106−msgid "Cancel"
107−msgstr ""
108−
109#: qml/Components/Lockscreen.qml:238
120#: qml/Components/Lockscreen.qml:238
110msgid "Return to Call"
121msgid "Return to Call"
111msgstr ""
122msgstr ""
@@ -191,10 +202,72 @@ msgstr ""
191msgid "Also installed"
202msgid "Also installed"
192msgstr ""
203msgstr ""
193
204
194−#: qml/Greeter/Greeter.qml:141
205+#: qml/Greeter/CoverPage.qml:107
195msgid "Unlock"
206msgid "Unlock"
196msgstr ""
207msgstr ""
197
208
209+#: qml/Greeter/LoginList.qml:236
210+msgid "Retry"
211+msgstr ""
212+
213+#: qml/Greeter/LoginList.qml:237
214+msgid "Tap to unlock"
215+msgstr ""
216+
217+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
218+msgid "Sorry, incorrect passphrase."
219+msgstr ""
220+
221+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
222+msgid "Sorry, incorrect passcode."
223+msgstr ""
224+
225+#: qml/Greeter/NarrowView.qml:55
226+msgid "This will be your last attempt."
227+msgstr ""
228+
229+#: qml/Greeter/NarrowView.qml:57
230+msgid ""
231+"If passphrase is entered incorrectly, your phone will conduct a factory "
232+"reset and all personal data will be deleted."
233+msgstr ""
234+
235+#: qml/Greeter/NarrowView.qml:58
236+msgid ""
237+"If passcode is entered incorrectly, your phone will conduct a factory reset "
238+"and all personal data will be deleted."
239+msgstr ""
240+
241+#: qml/Greeter/NarrowView.qml:115
242+#, qt-format
243+msgid "Enter %1"
244+msgstr ""
245+
246+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
247+msgid "Enter passphrase"
248+msgstr ""
249+
250+#: qml/Greeter/NarrowView.qml:117
251+msgid "Enter passcode"
252+msgstr ""
253+
254+#: qml/Greeter/NarrowView.qml:118
255+#, qt-format
256+msgid "Sorry, incorrect %1"
257+msgstr ""
258+
259+#: qml/Greeter/NarrowView.qml:119
260+msgid "Sorry, incorrect passphrase"
261+msgstr ""
262+
263+#: qml/Greeter/NarrowView.qml:120
264+msgid "Please re-enter"
265+msgstr ""
266+
267+#: qml/Greeter/NarrowView.qml:121
268+msgid "Sorry, incorrect passcode"
269+msgstr ""
270+
198#: qml/Notifications/NotificationMenuItemFactory.qml:128
271#: qml/Notifications/NotificationMenuItemFactory.qml:128
199msgid "Show password"
272msgid "Show password"
200msgstr ""
273msgstr ""
@@ -247,60 +320,6 @@ msgstr ""
247msgid "Roaming"
320msgid "Roaming"
248msgstr ""
321msgstr ""
249
322
250−#: qml/Shell.qml:402
251−#, qt-format
252−msgid "Enter %1"
253−msgstr ""
254−
255−#: qml/Shell.qml:403 qml/Wizard/Pages/passwd-set.qml:60
256−msgid "Enter passphrase"
257−msgstr ""
258−
259−#: qml/Shell.qml:404
260−msgid "Enter passcode"
261−msgstr ""
262−
263−#: qml/Shell.qml:405
264−#, qt-format
265−msgid "Sorry, incorrect %1"
266−msgstr ""
267−
268−#: qml/Shell.qml:406
269−msgid "Sorry, incorrect passphrase"
270−msgstr ""
271−
272−#: qml/Shell.qml:407
273−msgid "Please re-enter"
274−msgstr ""
275−
276−#: qml/Shell.qml:408
277−msgid "Sorry, incorrect passcode"
278−msgstr ""
279−
280−#: qml/Shell.qml:502 qml/Wizard/Pages/passwd-confirm.qml:53
281−msgid "Sorry, incorrect passphrase."
282−msgstr ""
283−
284−#: qml/Shell.qml:503 qml/Wizard/Pages/passwd-confirm.qml:54
285−msgid "Sorry, incorrect passcode."
286−msgstr ""
287−
288−#: qml/Shell.qml:504
289−msgid "This will be your last attempt."
290−msgstr ""
291−
292−#: qml/Shell.qml:506
293−msgid ""
294−"If passphrase is entered incorrectly, your phone will conduct a factory "
295−"reset and all personal data will be deleted."
296−msgstr ""
297−
298−#: qml/Shell.qml:507
299−msgid ""
300−"If passcode is entered incorrectly, your phone will conduct a factory reset "
301−"and all personal data will be deleted."
302−msgstr ""
303−
304#: qml/Tutorial/TutorialBottomFinish.qml:24
323#: qml/Tutorial/TutorialBottomFinish.qml:24
305msgid "This action does different things for different apps"
324msgid "This action does different things for different apps"
306msgstr ""
325msgstr ""
@@ -380,11 +399,11 @@ msgstr ""
380msgid "Add a SIM card and restart your device"
399msgid "Add a SIM card and restart your device"
381msgstr ""
400msgstr ""
382
401
383−#: qml/Wizard/Pages/20-sim.qml:55
402+#: qml/Wizard/Pages/20-sim.qml:59
384msgid "Without it, you won’t be able to make calls or use text messaging."
403msgid "Without it, you won’t be able to make calls or use text messaging."
385msgstr ""
404msgstr ""
386
405
387−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:215
406+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
388msgid "Skip"
407msgid "Skip"
389msgstr ""
408msgstr ""
390
409
qml/Components/Dialogs.qml+20−4
@@ -19,6 +19,7 @@ import QtQuick 2.0
19import Unity.Application 0.1
19import Unity.Application 0.1
20import Unity.Session 0.1
20import Unity.Session 0.1
21import Ubuntu.Components 1.1
21import Ubuntu.Components 1.1
22+import LightDM 0.1 as LightDM
22
23
23Item {
24Item {
24 id: root
25 id: root
@@ -86,18 +87,25 @@ Item {
86 title: i18n.tr("Log out")
87 title: i18n.tr("Log out")
87 text: i18n.tr("Are you sure you want to log out?")
88 text: i18n.tr("Are you sure you want to log out?")
88 Button {
89 Button {
89− text: i18n.tr("No")
90+ text: i18n.tr("Lock")
90 onClicked: {
91 onClicked: {
92+ LightDM.Greeter.showGreeter()
91 logoutDialog.hide();
93 logoutDialog.hide();
92 }
94 }
93 }
95 }
94 Button {
96 Button {
95− text: i18n.tr("Yes")
97+ text: i18n.tr("Log Out")
96 onClicked: {
98 onClicked: {
97 unitySessionService.logout();
99 unitySessionService.logout();
98 logoutDialog.hide();
100 logoutDialog.hide();
99 }
101 }
100 }
102 }
103+ Button {
104+ text: i18n.tr("Cancel")
105+ onClicked: {
106+ logoutDialog.hide();
107+ }
108+ }
101 }
109 }
102 }
110 }
103
111
@@ -108,19 +116,27 @@ Item {
108 title: i18n.tr("Shut down")
116 title: i18n.tr("Shut down")
109 text: i18n.tr("Are you sure you want to shut down?")
117 text: i18n.tr("Are you sure you want to shut down?")
110 Button {
118 Button {
111− text: i18n.tr("No")
119+ text: i18n.tr("Reboot")
112 onClicked: {
120 onClicked: {
121+ root.closeAllApps();
122+ unitySessionService.reboot();
113 shutdownDialog.hide();
123 shutdownDialog.hide();
114 }
124 }
115 }
125 }
116 Button {
126 Button {
117− text: i18n.tr("Yes")
127+ text: i18n.tr("Shutdown")
118 onClicked: {
128 onClicked: {
119 root.closeAllApps();
129 root.closeAllApps();
120 unitySessionService.shutdown();
130 unitySessionService.shutdown();
121 shutdownDialog.hide();
131 shutdownDialog.hide();
122 }
132 }
123 }
133 }
134+ Button {
135+ text: i18n.tr("Cancel")
136+ onClicked: {
137+ shutdownDialog.hide();
138+ }
139+ }
124 }
140 }
125 }
141 }
126
142