Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/untranslatableStrings into lp:ubuntu-ui-toolkit/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
Reviewer Review Type Date Requested Status
Zsombor Egri Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+232915@code.launchpad.net

Commit message

Fix wrong sheet labels and pick up dtr strings

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
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
=== modified file 'modules/Ubuntu/Components/Popups/ComposerSheet.qml'
--- modules/Ubuntu/Components/Popups/ComposerSheet.qml 2014-06-04 21:17:06 +0000
+++ modules/Ubuntu/Components/Popups/ComposerSheet.qml 2014-09-01 17:05:51 +0000
@@ -77,7 +77,7 @@
77 signal confirmClicked77 signal confirmClicked
7878
79 __leftButton: Button {79 __leftButton: Button {
80 text: i18n.dtr("ubuntu-sdk", "cancel")80 text: i18n.dtr("ubuntu-ui-toolkit", "Cancel")
81 objectName: "cancelButton"81 objectName: "cancelButton"
82 /*! \internal */ // avoid warning when generating documentation82 /*! \internal */ // avoid warning when generating documentation
83 onClicked: {83 onClicked: {
@@ -87,7 +87,7 @@
87 }87 }
8888
89 __rightButton: Button {89 __rightButton: Button {
90 text: i18n.dtr("ubuntu-sdk", "confirm")90 text: i18n.dtr("ubuntu-ui-toolkit", "Confirm")
91 objectName: "confirmButton"91 objectName: "confirmButton"
92 color: UbuntuColors.orange92 color: UbuntuColors.orange
93 /*! \internal */ // avoid warning when generating documentation93 /*! \internal */ // avoid warning when generating documentation
9494
=== modified file 'modules/Ubuntu/Components/Popups/DefaultSheet.qml'
--- modules/Ubuntu/Components/Popups/DefaultSheet.qml 2014-06-04 21:17:06 +0000
+++ modules/Ubuntu/Components/Popups/DefaultSheet.qml 2014-09-01 17:05:51 +0000
@@ -86,7 +86,7 @@
86 signal doneClicked86 signal doneClicked
8787
88 __leftButton: Button {88 __leftButton: Button {
89 text: i18n.dtr("ubuntu-sdk", "close")89 text: i18n.dtr("ubuntu-ui-toolkit", "Close")
90 visible: !doneButton90 visible: !doneButton
91 /*! \internal */91 /*! \internal */
92 onClicked: {92 onClicked: {
@@ -96,7 +96,7 @@
96 }96 }
9797
98 __rightButton: Button {98 __rightButton: Button {
99 text: i18n.dtr("ubuntu-sdk", "done")99 text: i18n.dtr("ubuntu-ui-toolkit", "Done")
100 color: UbuntuColors.orange100 color: UbuntuColors.orange
101 visible: doneButton101 visible: doneButton
102 /*! \internal */102 /*! \internal */
103103
=== modified file 'po/ubuntu-ui-toolkit.pot'
--- po/ubuntu-ui-toolkit.pot 2013-05-30 12:07:03 +0000
+++ po/ubuntu-ui-toolkit.pot 2014-09-01 17:05:51 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: ubuntu-ui-toolkit\n"9"Project-Id-Version: ubuntu-ui-toolkit\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2013-05-30 14:06+0200\n"11"POT-Creation-Date: 2014-09-01 19:02+0200\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"
@@ -17,374 +17,116 @@
17"Content-Type: text/plain; charset=CHARSET\n"17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
1919
20#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:2220#: Ubuntu/Components/plugin/statesaverbackend_p.cpp:154
21msgid "NumberAnimation"21#, qt-format
22msgstr ""22msgid ""
2323"property \"%1\" of object %2 has type %3 and cannot be set to value \"%4\" "
24#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:2624"of type %5"
25#: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:2525msgstr ""
26#: examples/ubuntu-ui-toolkit-gallery/Dialog.qml:2726
27#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:2327#: Ubuntu/Components/plugin/statesaverbackend_p.cpp:163
28#: examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml:2628#, qt-format
29#: examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml:5929msgid "property \"%1\" does not exist or is not writable for object %2"
30#: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:3830msgstr ""
31#: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:7131
32#: examples/ubuntu-ui-toolkit-gallery/Sliders.qml:2532#: Ubuntu/Components/plugin/ucalarm.cpp:42
33#: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:4433#: Ubuntu/Components/plugin/ucalarm.cpp:136
34msgid "Standard"34msgid "Alarm"
35msgstr ""35msgstr ""
3636
37#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:5637#: Ubuntu/Components/plugin/ucalarm.cpp:684
38msgid "Standard Durations"38#: Ubuntu/Components/plugin/ucalarm.cpp:716
39msgstr ""39msgid "Alarm has a pending operation."
4040msgstr ""
41#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:6041
42msgid "Snap"42#: Ubuntu/Components/plugin/ucarguments.cpp:188
43msgstr ""
44
45#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:96
46msgid "Fast"
47msgstr ""
48
49#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:132
50msgid "Slow"
51msgstr ""
52
53#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:157
54msgid "Sleepy"
55msgstr ""
56
57#: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:28
58#: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:36
59#: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:50
60#: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:59
61msgid "Call"
62msgstr ""
63
64#: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:33
65#: examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml:26
66msgid "Color"
67msgstr ""
68
69#: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:42
70#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:41
71msgid "Icon"
72msgstr ""
73
74#: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:56
75#: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:73
76#: examples/ubuntu-ui-toolkit-gallery/Toggles.qml:41
77#: examples/ubuntu-ui-toolkit-gallery/Toggles.qml:75
78msgid "Disabled"
79msgstr ""
80
81#: examples/ubuntu-ui-toolkit-gallery/Dialog.qml:30
82#: examples/ubuntu-ui-toolkit-gallery/Popover.qml:42
83#: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:41
84#: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:74
85msgid "Open"
86msgstr ""
87
88#: examples/ubuntu-ui-toolkit-gallery/Icons.qml:25
89msgid "Scaling"
90msgstr ""
91
92#: examples/ubuntu-ui-toolkit-gallery/Icons.qml:50
93msgid "Colorization"
94msgstr ""
95
96#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:26
97#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:34
98#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:44
99#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:53
100#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:62
101#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:71
102#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:83
103#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:95
104msgid "Label"
105msgstr ""
106
107#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:31
108msgid "Subtitled"
109msgstr ""
110
111#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:35
112msgid "Secondary label"
113msgstr ""
114
115#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:50
116msgid "Progression"
117msgstr ""
118
119#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:59
120msgid "Single value"
121msgstr ""
122
123#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:63
124msgid "Value"
125msgstr ""
126
127#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:68
128msgid "Multi value"
129msgstr ""
130
131#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:72
132#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:84
133msgid "Value 1"
134msgstr ""
135
136#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:73
137#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:85
138msgid "Value 2"
139msgstr ""
140
141#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:74
142#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:86
143msgid "Value 3"
144msgstr ""
145
146#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:75
147#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:87
148msgid "Value 4"
149msgstr ""
150
151#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:80
152msgid "Value selector"
153msgstr ""
154
155#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:92
156msgid "Control"
157msgstr ""
158
159#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:103
160msgid "Removable"
161msgstr ""
162
163#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:106
164msgid "Slide to remove"
165msgstr ""
166
167#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:116
168msgid "Grouped list"
169msgstr ""
170
171#: examples/ubuntu-ui-toolkit-gallery/Popover.qml:38
172msgid "Flickable"
173msgstr ""
174
175#: examples/ubuntu-ui-toolkit-gallery/Popover.qml:74
176msgid "Action #1"
177msgstr ""
178
179#: examples/ubuntu-ui-toolkit-gallery/Popover.qml:78
180msgid "Action #2"
181msgstr ""
182
183#: examples/ubuntu-ui-toolkit-gallery/Popover.qml:82
184msgid "Action #3"
185msgstr ""
186
187#: examples/ubuntu-ui-toolkit-gallery/Popover.qml:86
188msgid "Action #4"
189msgstr ""
190
191#: examples/ubuntu-ui-toolkit-gallery/Popover.qml:90
192msgid "Action #5"
193msgstr ""
194
195#: examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml:22
196msgid "Progress Bar"
197msgstr ""
198
199#: examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml:45
200msgid "Infinite"
201msgstr ""
202
203#: examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml:55
204msgid "Activity Indicator"
205msgstr ""
206
207#: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:26
208msgid "The visual style of the Sheet is early work and thus clunky looking."
209msgstr ""
210
211#: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:51
212#: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:84
213msgid "Title"
214msgstr ""
215
216#: examples/ubuntu-ui-toolkit-gallery/Sliders.qml:32
217#: examples/ubuntu-ui-toolkit-gallery/Sliders.qml:45
218#: examples/ubuntu-ui-toolkit-gallery/Sliders.qml:60
219#, qt-format
220msgid "value = %1"
221msgstr ""
222
223#: examples/ubuntu-ui-toolkit-gallery/Sliders.qml:37
224msgid "Live Update"
225msgstr ""
226
227#: examples/ubuntu-ui-toolkit-gallery/Sliders.qml:50
228msgid "Range"
229msgstr ""
230
231#: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:47
232msgid "Type me in..."
233msgstr ""
234
235#: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:53
236msgid "Password"
237msgstr ""
238
239#: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:63
240msgid "Numbers"
241msgstr ""
242
243#: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:87
244msgid "Default"
245msgstr ""
246
247#: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:96
248msgid "Expanding"
249msgstr ""
250
251#: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:107
252msgid "Rich Text"
253msgstr ""
254
255#: examples/ubuntu-ui-toolkit-gallery/Toggles.qml:26
256#: examples/ubuntu-ui-toolkit-gallery/Toggles.qml:60
257msgid "Unchecked"
258msgstr ""
259
260#: examples/ubuntu-ui-toolkit-gallery/Toggles.qml:33
261#: examples/ubuntu-ui-toolkit-gallery/Toggles.qml:67
262msgid "Checked"
263msgstr ""
264
265#: examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml:44
266msgid "Image"
267msgstr ""
268
269#: examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml:57
270msgid "Radius"
271msgstr ""
272
273#: examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml:87
274msgid "Sizes"
275msgstr ""
276
277#: examples/unit-converter/unit-converter.qml:147
278msgid "Clear"
279msgstr ""
280
281#: examples/unit-converter/unit-converter.qml:161
282msgid "Lengths"
283msgstr ""
284
285#: examples/unit-converter/unit-converter.qml:179
286msgid "Weights"
287msgstr ""
288
289#: modules/Ubuntu/Components/plugin/ucarguments.cpp:188
290msgid "Usage: "43msgid "Usage: "
291msgstr ""44msgstr ""
29245
293#: modules/Ubuntu/Components/plugin/ucarguments.cpp:20946#: Ubuntu/Components/plugin/ucarguments.cpp:209
294msgid "Options:"47msgid "Options:"
295msgstr ""48msgstr ""
29649
297#: modules/Ubuntu/Components/plugin/ucarguments.cpp:49850#: Ubuntu/Components/plugin/ucarguments.cpp:498
298#, qt-format51#, qt-format
299msgid "%1 is expecting an additional argument: %2"52msgid "%1 is expecting an additional argument: %2"
300msgstr ""53msgstr ""
30154
302#: modules/Ubuntu/Components/plugin/ucarguments.cpp:50355#: Ubuntu/Components/plugin/ucarguments.cpp:503
303#, qt-format56#, qt-format
304msgid "%1 is expecting a value for argument: %2"57msgid "%1 is expecting a value for argument: %2"
305msgstr ""58msgstr ""
30659
307#: modules/Ubuntu/Components/plugin/ucarguments.cpp:52060#: Ubuntu/Components/plugin/ucarguments.cpp:520
308#, qt-format61#, qt-format
309msgid "%1 is expecting additional arguments: %2"62msgid "%1 is expecting additional arguments: %2"
310msgstr ""63msgstr ""
31164
312#: modules/Ubuntu/Components/TextInputPopover.qml:2465#: Ubuntu/Components/plugin/ucmousefilters.cpp:1064
66msgid "Ignoring AfterItem priority for InverseMouse filters."
67msgstr ""
68
69#: Ubuntu/Components/plugin/ucstatesaver.cpp:46
70msgid "Warning: attachee must have an ID. State will not be saved."
71msgstr ""
72
73#: Ubuntu/Components/plugin/ucstatesaver.cpp:56
74#, qt-format
75msgid ""
76"Warning: attachee's UUID is already registered, state won't be saved: %1"
77msgstr ""
78
79#: Ubuntu/Components/plugin/ucstatesaver.cpp:102
80#, qt-format
81msgid ""
82"All the parents must have an id.\n"
83"State saving disabled for %1, class %2"
84msgstr ""
85
86#: Ubuntu/Components/plugin/uctheme.cpp:233
87msgid "Theme not found: "
88msgstr ""
89
90#: Ubuntu/Components/Popups/ComposerSheet.qml:80
91msgid "Cancel"
92msgstr ""
93
94#: Ubuntu/Components/Popups/ComposerSheet.qml:90
95msgid "Confirm"
96msgstr ""
97
98#: Ubuntu/Components/Popups/DefaultSheet.qml:89
99msgid "Close"
100msgstr ""
101
102#: Ubuntu/Components/Popups/DefaultSheet.qml:99
103msgid "Done"
104msgstr ""
105
106#: Ubuntu/Components/TextInputPopover.qml:27
313msgid "Select All"107msgid "Select All"
314msgstr ""108msgstr ""
315109
316#: modules/Ubuntu/Components/TextInputPopover.qml:29110#: Ubuntu/Components/TextInputPopover.qml:33
317msgid "Select Word"
318msgstr ""
319
320#: modules/Ubuntu/Components/TextInputPopover.qml:34
321msgid "Cut"111msgid "Cut"
322msgstr ""112msgstr ""
323113
324#: modules/Ubuntu/Components/TextInputPopover.qml:39114#: Ubuntu/Components/TextInputPopover.qml:42
325msgid "Copy"115msgid "Copy"
326msgstr ""116msgstr ""
327117
328#: modules/Ubuntu/Components/TextInputPopover.qml:44118#: Ubuntu/Components/TextInputPopover.qml:49
329msgid "Paste"119msgid "Paste"
330msgstr ""120msgstr ""
331121
332#: modules/Ubuntu/Components/TextInputPopover.qml:49122#: Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml:57
333msgid "Undo"123msgid "In Progress"
334msgstr ""124msgstr ""
335125
336#: modules/Ubuntu/Components/TextInputPopover.qml:54126#: Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml:28
337msgid "Redo"127msgid "Release to refresh..."
338msgstr ""128msgstr ""
339129
340#: modules/Ubuntu/Components/ToolbarActions.qml:86130#: Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml:28
341msgid "Back"131msgid "Pull to refresh..."
342msgstr ""
343
344#: tests/resources/pagestack/MyCustomPage.qml:21
345#: tests/resources/tabs/MyCustomPage.qml:21
346msgid "My custom page"
347msgstr ""
348
349#: tests/resources/pagestack/MyCustomPage.qml:33
350#: tests/resources/tabs/MyCustomPage.qml:33
351msgid ""
352"This is an external page\n"
353"with a locked toolbar."
354msgstr ""
355
356#: tests/resources/pagestack/PageStack.qml:38
357msgid "Root page"
358msgstr ""
359
360#: tests/resources/pagestack/PageStack.qml:44
361msgid "Page one"
362msgstr ""
363
364#: tests/resources/pagestack/PageStack.qml:49
365msgid "External page"
366msgstr ""
367
368#: tests/resources/pagestack/PageStack.qml:58
369msgid "First page"
370msgstr ""
371
372#: tests/resources/pagestack/PageStack.qml:64
373msgid "Root page (again)"
374msgstr ""
375
376#: tests/resources/pagestack/PageStack.qml:69
377msgid "Red rectangle"
378msgstr ""
379
380#: tests/resources/tabs/Tabs.qml:32
381msgid "Simple page"
382msgstr ""
383
384#: tests/resources/tabs/Tabs.qml:77
385msgid "External"
386msgstr ""
387
388#: tests/resources/tabs/Tabs.qml:85
389msgid "List view"
390msgstr ""132msgstr ""
391133
=== modified file 'po/update-pot.sh'
--- po/update-pot.sh 2014-07-14 17:34:44 +0000
+++ po/update-pot.sh 2014-09-01 17:05:51 +0000
@@ -48,6 +48,9 @@
48 --add-comments=TRANSLATORS \48 --add-comments=TRANSLATORS \
49 --keyword=tr \49 --keyword=tr \
50 --keyword=tr:1,2 \50 --keyword=tr:1,2 \
51 --keyword=dtr:2 \
52 --keyword=dtr:2,3 \
53 --package-name $DOMAIN \
51 --package-name $DOMAIN \54 --package-name $DOMAIN \
52 --copyright-holder "Canonical Ltd"55 --copyright-holder "Canonical Ltd"
5356

Subscribers

People subscribed via source and target branches