Unity 8

Merge lp:~aacid/unity8/update_pot into lp:unity8

  1. update_pot
  2. Merge into trunk
Proposed by Albert Astals Cid on 2015-11-20
Status: Merged
Approved by: Lukáš Tinkl on 2015-11-20
Approved revision: 2055
Merged at revision: 2068
Proposed branch: lp:~aacid/unity8/update_pot
Merge into: lp:unity8
Diff against target: 145 lines (+43/-19)
1 file modified
po/unity8.pot (+43/-19)
To merge this branch: bzr merge lp:~aacid/unity8/update_pot
Reviewer Review Type Date Requested Status
Michael Terry Approve on 2015-11-20
Lukáš Tinkl (community) 2015-11-20 Approve on 2015-11-20
Review via email: mp+278147@code.launchpad.net

Commit Message

Update pot file

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?
N/A

 * Did you make sure that your branch does not contain spurious tags?
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?
N/A

To post a comment you must log in.
Lukáš Tinkl (lukas-kde) wrote :

No brainer :) LGTM

review: Approve
Michael Terry (mterry) wrote :

Like it.

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 2015-11-04 15:02:19 +0000
3+++ po/unity8.pot 2015-11-20 13:49:37 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: unity8\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2015-11-04 15:02+0000\n"
9+"POT-Creation-Date: 2015-11-20 14:45+0100\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@@ -54,83 +54,83 @@
14 msgstr[0] ""
15 msgstr[1] ""
16
17-#: qml/Components/Dialogs.qml:116
18+#: qml/Components/Dialogs.qml:144
19 msgctxt "Title: Lock/Log out dialog"
20 msgid "Log out"
21 msgstr ""
22
23-#: qml/Components/Dialogs.qml:117
24+#: qml/Components/Dialogs.qml:145
25 msgid "Are you sure you want to log out?"
26 msgstr ""
27
28-#: qml/Components/Dialogs.qml:119
29+#: qml/Components/Dialogs.qml:147
30 msgctxt "Button: Lock the system"
31 msgid "Lock"
32 msgstr ""
33
34-#: qml/Components/Dialogs.qml:126
35+#: qml/Components/Dialogs.qml:154
36 msgctxt "Button: Log out from the system"
37 msgid "Log Out"
38 msgstr ""
39
40-#: qml/Components/Dialogs.qml:133 qml/Components/Dialogs.qml:166
41-#: qml/Components/Dialogs.qml:225
42+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
43+#: qml/Components/Dialogs.qml:253
44 msgid "Cancel"
45 msgstr ""
46
47-#: qml/Components/Dialogs.qml:145
48+#: qml/Components/Dialogs.qml:173
49 msgctxt "Title: Reboot/Shut down dialog"
50 msgid "Shut down"
51 msgstr ""
52
53-#: qml/Components/Dialogs.qml:146
54+#: qml/Components/Dialogs.qml:174
55 msgid "Are you sure you want to shut down?"
56 msgstr ""
57
58-#: qml/Components/Dialogs.qml:148
59+#: qml/Components/Dialogs.qml:176
60 msgctxt "Button: Reboot the system"
61 msgid "Reboot"
62 msgstr ""
63
64-#: qml/Components/Dialogs.qml:157
65+#: qml/Components/Dialogs.qml:185
66 msgctxt "Button: Shut down the system"
67 msgid "Shut down"
68 msgstr ""
69
70-#: qml/Components/Dialogs.qml:179
71+#: qml/Components/Dialogs.qml:207
72 msgctxt "Title: Reboot dialog"
73 msgid "Reboot"
74 msgstr ""
75
76-#: qml/Components/Dialogs.qml:180
77+#: qml/Components/Dialogs.qml:208
78 msgid "Are you sure you want to reboot?"
79 msgstr ""
80
81-#: qml/Components/Dialogs.qml:182
82+#: qml/Components/Dialogs.qml:210
83 msgid "No"
84 msgstr ""
85
86-#: qml/Components/Dialogs.qml:189
87+#: qml/Components/Dialogs.qml:217
88 msgid "Yes"
89 msgstr ""
90
91-#: qml/Components/Dialogs.qml:204
92+#: qml/Components/Dialogs.qml:232
93 msgctxt "Title: Power off/Restart dialog"
94 msgid "Power"
95 msgstr ""
96
97-#: qml/Components/Dialogs.qml:205
98+#: qml/Components/Dialogs.qml:233
99 msgid ""
100 "Are you sure you would like\n"
101 "to power off?"
102 msgstr ""
103
104-#: qml/Components/Dialogs.qml:207
105+#: qml/Components/Dialogs.qml:235
106 msgctxt "Button: Power off the system"
107 msgid "Power off"
108 msgstr ""
109
110-#: qml/Components/Dialogs.qml:216
111+#: qml/Components/Dialogs.qml:244
112 msgctxt "Button: Restart the system"
113 msgid "Restart"
114 msgstr ""
115@@ -147,6 +147,30 @@
116 msgid "OK"
117 msgstr ""
118
119+#: qml/Components/ModeSwitchWarningDialog.qml:32
120+msgid "Apps may have unsaved data:"
121+msgstr ""
122+
123+#: qml/Components/ModeSwitchWarningDialog.qml:57
124+msgid "Re-dock, save your work and close these apps to continue."
125+msgstr ""
126+
127+#: qml/Components/ModeSwitchWarningDialog.qml:63
128+msgid "Or force close now (unsaved data will be lost)."
129+msgstr ""
130+
131+#: qml/Components/ModeSwitchWarningDialog.qml:75
132+msgid "OK, I will reconnect"
133+msgstr ""
134+
135+#: qml/Components/ModeSwitchWarningDialog.qml:76
136+msgid "Reconnect now!"
137+msgstr ""
138+
139+#: qml/Components/ModeSwitchWarningDialog.qml:88
140+msgid "Close all"
141+msgstr ""
142+
143 #: qml/Dash/DashPageHeader.qml:265
144 msgctxt "Button: Open the Ubuntu Store"
145 msgid "Store"

Subscribers

People subscribed via source and target branches