Unity 8

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

  1. pot_file
  2. Merge into trunk
Proposed by Albert Astals Cid on 2015-04-14
Status: Merged
Approved by: Mirco Müller on 2015-04-15
Approved revision: 1731
Merged at revision: 1738
Proposed branch: lp:~aacid/unity8/pot_file
Merge into: lp:unity8
Diff against target: 210 lines (+43/-38)
1 file modified
po/unity8.pot (+43/-38)
To merge this branch: bzr merge lp:~aacid/unity8/pot_file
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2015-04-14
Mirco Müller (community) 2015-04-14 Approve on 2015-04-14
Review via email: mp+256151@code.launchpad.net

Commit Message

make 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.

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-03-19 15:04:13 +0000
3+++ po/unity8.pot 2015-04-14 14:14:55 +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-03-19 16:03+0100\n"
9+"POT-Creation-Date: 2015-04-14 16:13+0200\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@@ -50,108 +50,108 @@
14 msgstr[0] ""
15 msgstr[1] ""
16
17-#: qml/Components/Dialogs.qml:67
18+#: qml/Components/Dialogs.qml:69
19 msgctxt "Title: Lock/Log out dialog"
20 msgid "Log out"
21 msgstr ""
22
23-#: qml/Components/Dialogs.qml:68
24+#: qml/Components/Dialogs.qml:70
25 msgid "Are you sure you want to log out?"
26 msgstr ""
27
28-#: qml/Components/Dialogs.qml:70
29+#: qml/Components/Dialogs.qml:72
30 msgctxt "Button: Lock the system"
31 msgid "Lock"
32 msgstr ""
33
34-#: qml/Components/Dialogs.qml:77
35+#: qml/Components/Dialogs.qml:79
36 msgctxt "Button: Log out from the system"
37 msgid "Log Out"
38 msgstr ""
39
40-#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
41-#: qml/Components/Dialogs.qml:171
42+#: qml/Components/Dialogs.qml:86 qml/Components/Dialogs.qml:117
43+#: qml/Components/Dialogs.qml:173
44 msgid "Cancel"
45 msgstr ""
46
47-#: qml/Components/Dialogs.qml:96
48+#: qml/Components/Dialogs.qml:98
49 msgctxt "Title: Reboot/Shut down dialog"
50 msgid "Shut down"
51 msgstr ""
52
53-#: qml/Components/Dialogs.qml:97
54+#: qml/Components/Dialogs.qml:99
55 msgid "Are you sure you want to shut down?"
56 msgstr ""
57
58-#: qml/Components/Dialogs.qml:99
59+#: qml/Components/Dialogs.qml:101
60 msgctxt "Button: Reboot the system"
61 msgid "Reboot"
62 msgstr ""
63
64-#: qml/Components/Dialogs.qml:107
65+#: qml/Components/Dialogs.qml:109
66 msgctxt "Button: Shut down the system"
67 msgid "Shut down"
68 msgstr ""
69
70-#: qml/Components/Dialogs.qml:127
71+#: qml/Components/Dialogs.qml:129
72 msgctxt "Title: Reboot dialog"
73 msgid "Reboot"
74 msgstr ""
75
76-#: qml/Components/Dialogs.qml:128
77+#: qml/Components/Dialogs.qml:130
78 msgid "Are you sure you want to reboot?"
79 msgstr ""
80
81-#: qml/Components/Dialogs.qml:130
82+#: qml/Components/Dialogs.qml:132
83 msgid "No"
84 msgstr ""
85
86-#: qml/Components/Dialogs.qml:136
87+#: qml/Components/Dialogs.qml:138
88 msgid "Yes"
89 msgstr ""
90
91-#: qml/Components/Dialogs.qml:150
92+#: qml/Components/Dialogs.qml:152
93 msgctxt "Title: Power off/Restart dialog"
94 msgid "Power"
95 msgstr ""
96
97-#: qml/Components/Dialogs.qml:151
98+#: qml/Components/Dialogs.qml:153
99 msgid ""
100 "Are you sure you would like\n"
101 "to power off?"
102 msgstr ""
103
104-#: qml/Components/Dialogs.qml:153
105+#: qml/Components/Dialogs.qml:155
106 msgctxt "Button: Power off the system"
107 msgid "Power off"
108 msgstr ""
109
110-#: qml/Components/Dialogs.qml:162
111+#: qml/Components/Dialogs.qml:164
112 msgctxt "Button: Restart the system"
113 msgid "Restart"
114 msgstr ""
115
116-#: qml/Components/Lockscreen.qml:238
117+#: qml/Components/Lockscreen.qml:245
118 msgid "Return to Call"
119 msgstr ""
120
121-#: qml/Components/Lockscreen.qml:238
122+#: qml/Components/Lockscreen.qml:245
123 msgid "Emergency Call"
124 msgstr ""
125
126-#: qml/Components/Lockscreen.qml:270
127+#: qml/Components/Lockscreen.qml:277
128 msgid "OK"
129 msgstr ""
130
131-#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
132+#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
133 msgid "See less"
134 msgstr ""
135
136-#: qml/Dash/GenericScopeView.qml:533
137+#: qml/Dash/GenericScopeView.qml:532
138 msgid "See all"
139 msgstr ""
140
141-#: qml/Dash/GenericScopeView.qml:595
142+#: qml/Dash/GenericScopeView.qml:594
143 msgctxt "Label: Hint for dash search line edit"
144 msgid "Search"
145 msgstr ""
146@@ -301,31 +301,31 @@
147 msgid "Conference"
148 msgstr ""
149
150-#: qml/Panel/Indicators/MenuItemFactory.qml:643
151+#: qml/Panel/Indicators/MenuItemFactory.qml:639
152 msgid "Nothing is playing"
153 msgstr ""
154
155+#: qml/Panel/Indicators/MenuItemFactory.qml:787
156+msgid "In queue…"
157+msgstr ""
158+
159 #: qml/Panel/Indicators/MenuItemFactory.qml:791
160-msgid "In queue…"
161-msgstr ""
162-
163-#: qml/Panel/Indicators/MenuItemFactory.qml:795
164 msgid "Downloading"
165 msgstr ""
166
167-#: qml/Panel/Indicators/MenuItemFactory.qml:797
168+#: qml/Panel/Indicators/MenuItemFactory.qml:793
169 msgid "Paused, tap to resume"
170 msgstr ""
171
172-#: qml/Panel/Indicators/MenuItemFactory.qml:799
173+#: qml/Panel/Indicators/MenuItemFactory.qml:795
174 msgid "Canceled"
175 msgstr ""
176
177-#: qml/Panel/Indicators/MenuItemFactory.qml:801
178+#: qml/Panel/Indicators/MenuItemFactory.qml:797
179 msgid "Finished"
180 msgstr ""
181
182-#: qml/Panel/Indicators/MenuItemFactory.qml:803
183+#: qml/Panel/Indicators/MenuItemFactory.qml:799
184 msgid "Failed, tap to retry"
185 msgstr ""
186
187@@ -358,14 +358,19 @@
188 msgid "Swipe up from the bottom edge."
189 msgstr ""
190
191+#: qml/Tutorial/TutorialContent.qml:81 qml/Tutorial/TutorialLeftFinish.qml:25
192+#: qml/Tutorial/TutorialRight.qml:144
193+msgid "Tap here to continue."
194+msgstr ""
195+
196+#: qml/Tutorial/TutorialContent.qml:81
197+msgid "Click here to finish."
198+msgstr ""
199+
200 #: qml/Tutorial/TutorialLeftFinish.qml:24
201 msgid "These are the shortcuts to favorite apps"
202 msgstr ""
203
204-#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
205-msgid "Tap here to continue."
206-msgstr ""
207-
208 #: qml/Tutorial/TutorialLeft.qml:26
209 msgid "Open the launcher"
210 msgstr ""

Subscribers

People subscribed via source and target branches