Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/untranslatableStrings into lp:ubuntu-ui-toolkit/staging
- untranslatableStrings
- Merge into staging
Proposed by
Cris Dywan
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Zsombor Egri | ||||
Approved revision: | 1217 | ||||
Merged at revision: | 1227 | ||||
Proposed branch: | lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/untranslatableStrings | ||||
Merge into: | lp:ubuntu-ui-toolkit/staging | ||||
Diff against target: |
526 lines (+90/-345) 4 files modified
modules/Ubuntu/Components/Popups/ComposerSheet.qml (+2/-2) modules/Ubuntu/Components/Popups/DefaultSheet.qml (+2/-2) po/ubuntu-ui-toolkit.pot (+83/-341) po/update-pot.sh (+3/-0) |
||||
To merge this branch: | bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/untranslatableStrings | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Zsombor Egri | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email:
|
Commit message
Fix wrong sheet labels and pick up dtr strings
Description of the change
To post a comment you must log in.
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : | # |
review:
Approve
(continuous-integration)
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Zsombor Egri (zsombi) wrote : | # |
Looks good, thanks!!
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'modules/Ubuntu/Components/Popups/ComposerSheet.qml' | |||
2 | --- modules/Ubuntu/Components/Popups/ComposerSheet.qml 2014-06-04 21:17:06 +0000 | |||
3 | +++ modules/Ubuntu/Components/Popups/ComposerSheet.qml 2014-09-01 17:05:51 +0000 | |||
4 | @@ -77,7 +77,7 @@ | |||
5 | 77 | signal confirmClicked | 77 | signal confirmClicked |
6 | 78 | 78 | ||
7 | 79 | __leftButton: Button { | 79 | __leftButton: Button { |
9 | 80 | text: i18n.dtr("ubuntu-sdk", "cancel") | 80 | text: i18n.dtr("ubuntu-ui-toolkit", "Cancel") |
10 | 81 | objectName: "cancelButton" | 81 | objectName: "cancelButton" |
11 | 82 | /*! \internal */ // avoid warning when generating documentation | 82 | /*! \internal */ // avoid warning when generating documentation |
12 | 83 | onClicked: { | 83 | onClicked: { |
13 | @@ -87,7 +87,7 @@ | |||
14 | 87 | } | 87 | } |
15 | 88 | 88 | ||
16 | 89 | __rightButton: Button { | 89 | __rightButton: Button { |
18 | 90 | text: i18n.dtr("ubuntu-sdk", "confirm") | 90 | text: i18n.dtr("ubuntu-ui-toolkit", "Confirm") |
19 | 91 | objectName: "confirmButton" | 91 | objectName: "confirmButton" |
20 | 92 | color: UbuntuColors.orange | 92 | color: UbuntuColors.orange |
21 | 93 | /*! \internal */ // avoid warning when generating documentation | 93 | /*! \internal */ // avoid warning when generating documentation |
22 | 94 | 94 | ||
23 | === modified file 'modules/Ubuntu/Components/Popups/DefaultSheet.qml' | |||
24 | --- modules/Ubuntu/Components/Popups/DefaultSheet.qml 2014-06-04 21:17:06 +0000 | |||
25 | +++ modules/Ubuntu/Components/Popups/DefaultSheet.qml 2014-09-01 17:05:51 +0000 | |||
26 | @@ -86,7 +86,7 @@ | |||
27 | 86 | signal doneClicked | 86 | signal doneClicked |
28 | 87 | 87 | ||
29 | 88 | __leftButton: Button { | 88 | __leftButton: Button { |
31 | 89 | text: i18n.dtr("ubuntu-sdk", "close") | 89 | text: i18n.dtr("ubuntu-ui-toolkit", "Close") |
32 | 90 | visible: !doneButton | 90 | visible: !doneButton |
33 | 91 | /*! \internal */ | 91 | /*! \internal */ |
34 | 92 | onClicked: { | 92 | onClicked: { |
35 | @@ -96,7 +96,7 @@ | |||
36 | 96 | } | 96 | } |
37 | 97 | 97 | ||
38 | 98 | __rightButton: Button { | 98 | __rightButton: Button { |
40 | 99 | text: i18n.dtr("ubuntu-sdk", "done") | 99 | text: i18n.dtr("ubuntu-ui-toolkit", "Done") |
41 | 100 | color: UbuntuColors.orange | 100 | color: UbuntuColors.orange |
42 | 101 | visible: doneButton | 101 | visible: doneButton |
43 | 102 | /*! \internal */ | 102 | /*! \internal */ |
44 | 103 | 103 | ||
45 | === modified file 'po/ubuntu-ui-toolkit.pot' | |||
46 | --- po/ubuntu-ui-toolkit.pot 2013-05-30 12:07:03 +0000 | |||
47 | +++ po/ubuntu-ui-toolkit.pot 2014-09-01 17:05:51 +0000 | |||
48 | @@ -8,7 +8,7 @@ | |||
49 | 8 | msgstr "" | 8 | msgstr "" |
50 | 9 | "Project-Id-Version: ubuntu-ui-toolkit\n" | 9 | "Project-Id-Version: ubuntu-ui-toolkit\n" |
51 | 10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
53 | 11 | "POT-Creation-Date: 2013-05-30 14:06+0200\n" | 11 | "POT-Creation-Date: 2014-09-01 19:02+0200\n" |
54 | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
55 | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
56 | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
57 | @@ -17,374 +17,116 @@ | |||
58 | 17 | "Content-Type: text/plain; charset=CHARSET\n" | 17 | "Content-Type: text/plain; charset=CHARSET\n" |
59 | 18 | "Content-Transfer-Encoding: 8bit\n" | 18 | "Content-Transfer-Encoding: 8bit\n" |
60 | 19 | 19 | ||
331 | 20 | #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22 | 20 | #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:154 |
332 | 21 | msgid "NumberAnimation" | 21 | #, qt-format |
333 | 22 | msgstr "" | 22 | msgid "" |
334 | 23 | 23 | "property \"%1\" of object %2 has type %3 and cannot be set to value \"%4\" " | |
335 | 24 | #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:26 | 24 | "of type %5" |
336 | 25 | #: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:25 | 25 | msgstr "" |
337 | 26 | #: examples/ubuntu-ui-toolkit-gallery/Dialog.qml:27 | 26 | |
338 | 27 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:23 | 27 | #: Ubuntu/Components/plugin/statesaverbackend_p.cpp:163 |
339 | 28 | #: examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml:26 | 28 | #, qt-format |
340 | 29 | #: examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml:59 | 29 | msgid "property \"%1\" does not exist or is not writable for object %2" |
341 | 30 | #: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:38 | 30 | msgstr "" |
342 | 31 | #: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:71 | 31 | |
343 | 32 | #: examples/ubuntu-ui-toolkit-gallery/Sliders.qml:25 | 32 | #: Ubuntu/Components/plugin/ucalarm.cpp:42 |
344 | 33 | #: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:44 | 33 | #: Ubuntu/Components/plugin/ucalarm.cpp:136 |
345 | 34 | msgid "Standard" | 34 | msgid "Alarm" |
346 | 35 | msgstr "" | 35 | msgstr "" |
347 | 36 | 36 | ||
348 | 37 | #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:56 | 37 | #: Ubuntu/Components/plugin/ucalarm.cpp:684 |
349 | 38 | msgid "Standard Durations" | 38 | #: Ubuntu/Components/plugin/ucalarm.cpp:716 |
350 | 39 | msgstr "" | 39 | msgid "Alarm has a pending operation." |
351 | 40 | 40 | msgstr "" | |
352 | 41 | #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:60 | 41 | |
353 | 42 | msgid "Snap" | 42 | #: Ubuntu/Components/plugin/ucarguments.cpp:188 |
84 | 43 | msgstr "" | ||
85 | 44 | |||
86 | 45 | #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:96 | ||
87 | 46 | msgid "Fast" | ||
88 | 47 | msgstr "" | ||
89 | 48 | |||
90 | 49 | #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:132 | ||
91 | 50 | msgid "Slow" | ||
92 | 51 | msgstr "" | ||
93 | 52 | |||
94 | 53 | #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:157 | ||
95 | 54 | msgid "Sleepy" | ||
96 | 55 | msgstr "" | ||
97 | 56 | |||
98 | 57 | #: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:28 | ||
99 | 58 | #: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:36 | ||
100 | 59 | #: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:50 | ||
101 | 60 | #: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:59 | ||
102 | 61 | msgid "Call" | ||
103 | 62 | msgstr "" | ||
104 | 63 | |||
105 | 64 | #: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:33 | ||
106 | 65 | #: examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml:26 | ||
107 | 66 | msgid "Color" | ||
108 | 67 | msgstr "" | ||
109 | 68 | |||
110 | 69 | #: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:42 | ||
111 | 70 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:41 | ||
112 | 71 | msgid "Icon" | ||
113 | 72 | msgstr "" | ||
114 | 73 | |||
115 | 74 | #: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:56 | ||
116 | 75 | #: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:73 | ||
117 | 76 | #: examples/ubuntu-ui-toolkit-gallery/Toggles.qml:41 | ||
118 | 77 | #: examples/ubuntu-ui-toolkit-gallery/Toggles.qml:75 | ||
119 | 78 | msgid "Disabled" | ||
120 | 79 | msgstr "" | ||
121 | 80 | |||
122 | 81 | #: examples/ubuntu-ui-toolkit-gallery/Dialog.qml:30 | ||
123 | 82 | #: examples/ubuntu-ui-toolkit-gallery/Popover.qml:42 | ||
124 | 83 | #: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:41 | ||
125 | 84 | #: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:74 | ||
126 | 85 | msgid "Open" | ||
127 | 86 | msgstr "" | ||
128 | 87 | |||
129 | 88 | #: examples/ubuntu-ui-toolkit-gallery/Icons.qml:25 | ||
130 | 89 | msgid "Scaling" | ||
131 | 90 | msgstr "" | ||
132 | 91 | |||
133 | 92 | #: examples/ubuntu-ui-toolkit-gallery/Icons.qml:50 | ||
134 | 93 | msgid "Colorization" | ||
135 | 94 | msgstr "" | ||
136 | 95 | |||
137 | 96 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:26 | ||
138 | 97 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:34 | ||
139 | 98 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:44 | ||
140 | 99 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:53 | ||
141 | 100 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:62 | ||
142 | 101 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:71 | ||
143 | 102 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:83 | ||
144 | 103 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:95 | ||
145 | 104 | msgid "Label" | ||
146 | 105 | msgstr "" | ||
147 | 106 | |||
148 | 107 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:31 | ||
149 | 108 | msgid "Subtitled" | ||
150 | 109 | msgstr "" | ||
151 | 110 | |||
152 | 111 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:35 | ||
153 | 112 | msgid "Secondary label" | ||
154 | 113 | msgstr "" | ||
155 | 114 | |||
156 | 115 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:50 | ||
157 | 116 | msgid "Progression" | ||
158 | 117 | msgstr "" | ||
159 | 118 | |||
160 | 119 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:59 | ||
161 | 120 | msgid "Single value" | ||
162 | 121 | msgstr "" | ||
163 | 122 | |||
164 | 123 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:63 | ||
165 | 124 | msgid "Value" | ||
166 | 125 | msgstr "" | ||
167 | 126 | |||
168 | 127 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:68 | ||
169 | 128 | msgid "Multi value" | ||
170 | 129 | msgstr "" | ||
171 | 130 | |||
172 | 131 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:72 | ||
173 | 132 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:84 | ||
174 | 133 | msgid "Value 1" | ||
175 | 134 | msgstr "" | ||
176 | 135 | |||
177 | 136 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:73 | ||
178 | 137 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:85 | ||
179 | 138 | msgid "Value 2" | ||
180 | 139 | msgstr "" | ||
181 | 140 | |||
182 | 141 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:74 | ||
183 | 142 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:86 | ||
184 | 143 | msgid "Value 3" | ||
185 | 144 | msgstr "" | ||
186 | 145 | |||
187 | 146 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:75 | ||
188 | 147 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:87 | ||
189 | 148 | msgid "Value 4" | ||
190 | 149 | msgstr "" | ||
191 | 150 | |||
192 | 151 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:80 | ||
193 | 152 | msgid "Value selector" | ||
194 | 153 | msgstr "" | ||
195 | 154 | |||
196 | 155 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:92 | ||
197 | 156 | msgid "Control" | ||
198 | 157 | msgstr "" | ||
199 | 158 | |||
200 | 159 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:103 | ||
201 | 160 | msgid "Removable" | ||
202 | 161 | msgstr "" | ||
203 | 162 | |||
204 | 163 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:106 | ||
205 | 164 | msgid "Slide to remove" | ||
206 | 165 | msgstr "" | ||
207 | 166 | |||
208 | 167 | #: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:116 | ||
209 | 168 | msgid "Grouped list" | ||
210 | 169 | msgstr "" | ||
211 | 170 | |||
212 | 171 | #: examples/ubuntu-ui-toolkit-gallery/Popover.qml:38 | ||
213 | 172 | msgid "Flickable" | ||
214 | 173 | msgstr "" | ||
215 | 174 | |||
216 | 175 | #: examples/ubuntu-ui-toolkit-gallery/Popover.qml:74 | ||
217 | 176 | msgid "Action #1" | ||
218 | 177 | msgstr "" | ||
219 | 178 | |||
220 | 179 | #: examples/ubuntu-ui-toolkit-gallery/Popover.qml:78 | ||
221 | 180 | msgid "Action #2" | ||
222 | 181 | msgstr "" | ||
223 | 182 | |||
224 | 183 | #: examples/ubuntu-ui-toolkit-gallery/Popover.qml:82 | ||
225 | 184 | msgid "Action #3" | ||
226 | 185 | msgstr "" | ||
227 | 186 | |||
228 | 187 | #: examples/ubuntu-ui-toolkit-gallery/Popover.qml:86 | ||
229 | 188 | msgid "Action #4" | ||
230 | 189 | msgstr "" | ||
231 | 190 | |||
232 | 191 | #: examples/ubuntu-ui-toolkit-gallery/Popover.qml:90 | ||
233 | 192 | msgid "Action #5" | ||
234 | 193 | msgstr "" | ||
235 | 194 | |||
236 | 195 | #: examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml:22 | ||
237 | 196 | msgid "Progress Bar" | ||
238 | 197 | msgstr "" | ||
239 | 198 | |||
240 | 199 | #: examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml:45 | ||
241 | 200 | msgid "Infinite" | ||
242 | 201 | msgstr "" | ||
243 | 202 | |||
244 | 203 | #: examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml:55 | ||
245 | 204 | msgid "Activity Indicator" | ||
246 | 205 | msgstr "" | ||
247 | 206 | |||
248 | 207 | #: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:26 | ||
249 | 208 | msgid "The visual style of the Sheet is early work and thus clunky looking." | ||
250 | 209 | msgstr "" | ||
251 | 210 | |||
252 | 211 | #: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:51 | ||
253 | 212 | #: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:84 | ||
254 | 213 | msgid "Title" | ||
255 | 214 | msgstr "" | ||
256 | 215 | |||
257 | 216 | #: examples/ubuntu-ui-toolkit-gallery/Sliders.qml:32 | ||
258 | 217 | #: examples/ubuntu-ui-toolkit-gallery/Sliders.qml:45 | ||
259 | 218 | #: examples/ubuntu-ui-toolkit-gallery/Sliders.qml:60 | ||
260 | 219 | #, qt-format | ||
261 | 220 | msgid "value = %1" | ||
262 | 221 | msgstr "" | ||
263 | 222 | |||
264 | 223 | #: examples/ubuntu-ui-toolkit-gallery/Sliders.qml:37 | ||
265 | 224 | msgid "Live Update" | ||
266 | 225 | msgstr "" | ||
267 | 226 | |||
268 | 227 | #: examples/ubuntu-ui-toolkit-gallery/Sliders.qml:50 | ||
269 | 228 | msgid "Range" | ||
270 | 229 | msgstr "" | ||
271 | 230 | |||
272 | 231 | #: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:47 | ||
273 | 232 | msgid "Type me in..." | ||
274 | 233 | msgstr "" | ||
275 | 234 | |||
276 | 235 | #: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:53 | ||
277 | 236 | msgid "Password" | ||
278 | 237 | msgstr "" | ||
279 | 238 | |||
280 | 239 | #: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:63 | ||
281 | 240 | msgid "Numbers" | ||
282 | 241 | msgstr "" | ||
283 | 242 | |||
284 | 243 | #: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:87 | ||
285 | 244 | msgid "Default" | ||
286 | 245 | msgstr "" | ||
287 | 246 | |||
288 | 247 | #: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:96 | ||
289 | 248 | msgid "Expanding" | ||
290 | 249 | msgstr "" | ||
291 | 250 | |||
292 | 251 | #: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:107 | ||
293 | 252 | msgid "Rich Text" | ||
294 | 253 | msgstr "" | ||
295 | 254 | |||
296 | 255 | #: examples/ubuntu-ui-toolkit-gallery/Toggles.qml:26 | ||
297 | 256 | #: examples/ubuntu-ui-toolkit-gallery/Toggles.qml:60 | ||
298 | 257 | msgid "Unchecked" | ||
299 | 258 | msgstr "" | ||
300 | 259 | |||
301 | 260 | #: examples/ubuntu-ui-toolkit-gallery/Toggles.qml:33 | ||
302 | 261 | #: examples/ubuntu-ui-toolkit-gallery/Toggles.qml:67 | ||
303 | 262 | msgid "Checked" | ||
304 | 263 | msgstr "" | ||
305 | 264 | |||
306 | 265 | #: examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml:44 | ||
307 | 266 | msgid "Image" | ||
308 | 267 | msgstr "" | ||
309 | 268 | |||
310 | 269 | #: examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml:57 | ||
311 | 270 | msgid "Radius" | ||
312 | 271 | msgstr "" | ||
313 | 272 | |||
314 | 273 | #: examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml:87 | ||
315 | 274 | msgid "Sizes" | ||
316 | 275 | msgstr "" | ||
317 | 276 | |||
318 | 277 | #: examples/unit-converter/unit-converter.qml:147 | ||
319 | 278 | msgid "Clear" | ||
320 | 279 | msgstr "" | ||
321 | 280 | |||
322 | 281 | #: examples/unit-converter/unit-converter.qml:161 | ||
323 | 282 | msgid "Lengths" | ||
324 | 283 | msgstr "" | ||
325 | 284 | |||
326 | 285 | #: examples/unit-converter/unit-converter.qml:179 | ||
327 | 286 | msgid "Weights" | ||
328 | 287 | msgstr "" | ||
329 | 288 | |||
330 | 289 | #: modules/Ubuntu/Components/plugin/ucarguments.cpp:188 | ||
354 | 290 | msgid "Usage: " | 43 | msgid "Usage: " |
355 | 291 | msgstr "" | 44 | msgstr "" |
356 | 292 | 45 | ||
358 | 293 | #: modules/Ubuntu/Components/plugin/ucarguments.cpp:209 | 46 | #: Ubuntu/Components/plugin/ucarguments.cpp:209 |
359 | 294 | msgid "Options:" | 47 | msgid "Options:" |
360 | 295 | msgstr "" | 48 | msgstr "" |
361 | 296 | 49 | ||
363 | 297 | #: modules/Ubuntu/Components/plugin/ucarguments.cpp:498 | 50 | #: Ubuntu/Components/plugin/ucarguments.cpp:498 |
364 | 298 | #, qt-format | 51 | #, qt-format |
365 | 299 | msgid "%1 is expecting an additional argument: %2" | 52 | msgid "%1 is expecting an additional argument: %2" |
366 | 300 | msgstr "" | 53 | msgstr "" |
367 | 301 | 54 | ||
369 | 302 | #: modules/Ubuntu/Components/plugin/ucarguments.cpp:503 | 55 | #: Ubuntu/Components/plugin/ucarguments.cpp:503 |
370 | 303 | #, qt-format | 56 | #, qt-format |
371 | 304 | msgid "%1 is expecting a value for argument: %2" | 57 | msgid "%1 is expecting a value for argument: %2" |
372 | 305 | msgstr "" | 58 | msgstr "" |
373 | 306 | 59 | ||
375 | 307 | #: modules/Ubuntu/Components/plugin/ucarguments.cpp:520 | 60 | #: Ubuntu/Components/plugin/ucarguments.cpp:520 |
376 | 308 | #, qt-format | 61 | #, qt-format |
377 | 309 | msgid "%1 is expecting additional arguments: %2" | 62 | msgid "%1 is expecting additional arguments: %2" |
378 | 310 | msgstr "" | 63 | msgstr "" |
379 | 311 | 64 | ||
381 | 312 | #: modules/Ubuntu/Components/TextInputPopover.qml:24 | 65 | #: Ubuntu/Components/plugin/ucmousefilters.cpp:1064 |
382 | 66 | msgid "Ignoring AfterItem priority for InverseMouse filters." | ||
383 | 67 | msgstr "" | ||
384 | 68 | |||
385 | 69 | #: Ubuntu/Components/plugin/ucstatesaver.cpp:46 | ||
386 | 70 | msgid "Warning: attachee must have an ID. State will not be saved." | ||
387 | 71 | msgstr "" | ||
388 | 72 | |||
389 | 73 | #: Ubuntu/Components/plugin/ucstatesaver.cpp:56 | ||
390 | 74 | #, qt-format | ||
391 | 75 | msgid "" | ||
392 | 76 | "Warning: attachee's UUID is already registered, state won't be saved: %1" | ||
393 | 77 | msgstr "" | ||
394 | 78 | |||
395 | 79 | #: Ubuntu/Components/plugin/ucstatesaver.cpp:102 | ||
396 | 80 | #, qt-format | ||
397 | 81 | msgid "" | ||
398 | 82 | "All the parents must have an id.\n" | ||
399 | 83 | "State saving disabled for %1, class %2" | ||
400 | 84 | msgstr "" | ||
401 | 85 | |||
402 | 86 | #: Ubuntu/Components/plugin/uctheme.cpp:233 | ||
403 | 87 | msgid "Theme not found: " | ||
404 | 88 | msgstr "" | ||
405 | 89 | |||
406 | 90 | #: Ubuntu/Components/Popups/ComposerSheet.qml:80 | ||
407 | 91 | msgid "Cancel" | ||
408 | 92 | msgstr "" | ||
409 | 93 | |||
410 | 94 | #: Ubuntu/Components/Popups/ComposerSheet.qml:90 | ||
411 | 95 | msgid "Confirm" | ||
412 | 96 | msgstr "" | ||
413 | 97 | |||
414 | 98 | #: Ubuntu/Components/Popups/DefaultSheet.qml:89 | ||
415 | 99 | msgid "Close" | ||
416 | 100 | msgstr "" | ||
417 | 101 | |||
418 | 102 | #: Ubuntu/Components/Popups/DefaultSheet.qml:99 | ||
419 | 103 | msgid "Done" | ||
420 | 104 | msgstr "" | ||
421 | 105 | |||
422 | 106 | #: Ubuntu/Components/TextInputPopover.qml:27 | ||
423 | 313 | msgid "Select All" | 107 | msgid "Select All" |
424 | 314 | msgstr "" | 108 | msgstr "" |
425 | 315 | 109 | ||
431 | 316 | #: modules/Ubuntu/Components/TextInputPopover.qml:29 | 110 | #: Ubuntu/Components/TextInputPopover.qml:33 |
427 | 317 | msgid "Select Word" | ||
428 | 318 | msgstr "" | ||
429 | 319 | |||
430 | 320 | #: modules/Ubuntu/Components/TextInputPopover.qml:34 | ||
432 | 321 | msgid "Cut" | 111 | msgid "Cut" |
433 | 322 | msgstr "" | 112 | msgstr "" |
434 | 323 | 113 | ||
436 | 324 | #: modules/Ubuntu/Components/TextInputPopover.qml:39 | 114 | #: Ubuntu/Components/TextInputPopover.qml:42 |
437 | 325 | msgid "Copy" | 115 | msgid "Copy" |
438 | 326 | msgstr "" | 116 | msgstr "" |
439 | 327 | 117 | ||
441 | 328 | #: modules/Ubuntu/Components/TextInputPopover.qml:44 | 118 | #: Ubuntu/Components/TextInputPopover.qml:49 |
442 | 329 | msgid "Paste" | 119 | msgid "Paste" |
443 | 330 | msgstr "" | 120 | msgstr "" |
444 | 331 | 121 | ||
503 | 332 | #: modules/Ubuntu/Components/TextInputPopover.qml:49 | 122 | #: Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml:57 |
504 | 333 | msgid "Undo" | 123 | msgid "In Progress" |
505 | 334 | msgstr "" | 124 | msgstr "" |
506 | 335 | 125 | ||
507 | 336 | #: modules/Ubuntu/Components/TextInputPopover.qml:54 | 126 | #: Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml:28 |
508 | 337 | msgid "Redo" | 127 | msgid "Release to refresh..." |
509 | 338 | msgstr "" | 128 | msgstr "" |
510 | 339 | 129 | ||
511 | 340 | #: modules/Ubuntu/Components/ToolbarActions.qml:86 | 130 | #: Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml:28 |
512 | 341 | msgid "Back" | 131 | msgid "Pull to refresh..." |
455 | 342 | msgstr "" | ||
456 | 343 | |||
457 | 344 | #: tests/resources/pagestack/MyCustomPage.qml:21 | ||
458 | 345 | #: tests/resources/tabs/MyCustomPage.qml:21 | ||
459 | 346 | msgid "My custom page" | ||
460 | 347 | msgstr "" | ||
461 | 348 | |||
462 | 349 | #: tests/resources/pagestack/MyCustomPage.qml:33 | ||
463 | 350 | #: tests/resources/tabs/MyCustomPage.qml:33 | ||
464 | 351 | msgid "" | ||
465 | 352 | "This is an external page\n" | ||
466 | 353 | "with a locked toolbar." | ||
467 | 354 | msgstr "" | ||
468 | 355 | |||
469 | 356 | #: tests/resources/pagestack/PageStack.qml:38 | ||
470 | 357 | msgid "Root page" | ||
471 | 358 | msgstr "" | ||
472 | 359 | |||
473 | 360 | #: tests/resources/pagestack/PageStack.qml:44 | ||
474 | 361 | msgid "Page one" | ||
475 | 362 | msgstr "" | ||
476 | 363 | |||
477 | 364 | #: tests/resources/pagestack/PageStack.qml:49 | ||
478 | 365 | msgid "External page" | ||
479 | 366 | msgstr "" | ||
480 | 367 | |||
481 | 368 | #: tests/resources/pagestack/PageStack.qml:58 | ||
482 | 369 | msgid "First page" | ||
483 | 370 | msgstr "" | ||
484 | 371 | |||
485 | 372 | #: tests/resources/pagestack/PageStack.qml:64 | ||
486 | 373 | msgid "Root page (again)" | ||
487 | 374 | msgstr "" | ||
488 | 375 | |||
489 | 376 | #: tests/resources/pagestack/PageStack.qml:69 | ||
490 | 377 | msgid "Red rectangle" | ||
491 | 378 | msgstr "" | ||
492 | 379 | |||
493 | 380 | #: tests/resources/tabs/Tabs.qml:32 | ||
494 | 381 | msgid "Simple page" | ||
495 | 382 | msgstr "" | ||
496 | 383 | |||
497 | 384 | #: tests/resources/tabs/Tabs.qml:77 | ||
498 | 385 | msgid "External" | ||
499 | 386 | msgstr "" | ||
500 | 387 | |||
501 | 388 | #: tests/resources/tabs/Tabs.qml:85 | ||
502 | 389 | msgid "List view" | ||
513 | 390 | msgstr "" | 132 | msgstr "" |
514 | 391 | 133 | ||
515 | === modified file 'po/update-pot.sh' | |||
516 | --- po/update-pot.sh 2014-07-14 17:34:44 +0000 | |||
517 | +++ po/update-pot.sh 2014-09-01 17:05:51 +0000 | |||
518 | @@ -48,6 +48,9 @@ | |||
519 | 48 | --add-comments=TRANSLATORS \ | 48 | --add-comments=TRANSLATORS \ |
520 | 49 | --keyword=tr \ | 49 | --keyword=tr \ |
521 | 50 | --keyword=tr:1,2 \ | 50 | --keyword=tr:1,2 \ |
522 | 51 | --keyword=dtr:2 \ | ||
523 | 52 | --keyword=dtr:2,3 \ | ||
524 | 53 | --package-name $DOMAIN \ | ||
525 | 51 | --package-name $DOMAIN \ | 54 | --package-name $DOMAIN \ |
526 | 52 | --copyright-holder "Canonical Ltd" | 55 | --copyright-holder "Canonical Ltd" |
527 | 53 | 56 |
PASSED: Continuous integration, rev:1217 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- ci/948/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- utopic- touch/4298 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- utopic- amd64-ci/ 780 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- utopic- armhf-ci/ 780 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- utopic- armhf-ci/ 780/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- utopic- i386-ci/ 780 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- mako/4106 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/5550 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/5550/ artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 12444
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- sdk-team- ubuntu- ui-toolkit- staging- ci/948/ rebuild
http://