Merge lp:~saviq/unity/phablet.raring.i18n-updates into lp:unity/phablet.raring

Proposed by Michał Sawicz
Status: Merged
Approved by: Sergio Schvezov
Approved revision: no longer in the source branch.
Merged at revision: 725
Proposed branch: lp:~saviq/unity/phablet.raring.i18n-updates
Merge into: lp:unity/phablet.raring
Diff against target: 633 lines (+307/-49)
10 files modified
Applications/applications.js (+17/-17)
Dash/DashMusic.qml (+8/-1)
Dash/DashPeople.qml (+8/-1)
Dash/DashVideos.qml (+8/-1)
Dash/Video/VideoPreview.qml (+3/-3)
Panel/SearchIndicator.qml (+1/-1)
debian/changelog (+6/-0)
po/pl.po (+131/-16)
po/unity8.pot (+124/-8)
po/update-unity-pot (+1/-1)
To merge this branch: bzr merge lp:~saviq/unity/phablet.raring.i18n-updates
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Ying-Chun Liu (community) Approve
Review via email: mp+168397@code.launchpad.net

Commit message

Add some new and temporary translations.

Cherry-pick of rev 6 from lp:unity/8.0.

To post a comment you must log in.
Revision history for this message
Ying-Chun Liu (paulliu) wrote :

+1

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Applications/applications.js'
2--- Applications/applications.js 2013-05-22 21:00:05 +0000
3+++ Applications/applications.js 2013-06-10 10:37:26 +0000
4@@ -20,95 +20,95 @@
5
6 var __availableApplications = {
7 '/usr/share/applications/phone-app.desktop': {
8- 'name': 'Phone',
9+ 'name': i18n.tr("Phone"),
10 'icon': 'phone-app',
11 'exec': '/usr/bin/phone-app',
12 'stage': SideStage
13 },
14 '/usr/share/applications/camera-app.desktop': {
15- 'name': 'Camera',
16+ 'name': i18n.tr("Camera"),
17 'icon': 'camera',
18 'fullscreen': true,
19 'exec': '/usr/bin/camera-app --fullscreen'
20 },
21 '/usr/share/applications/gallery-app.desktop': {
22- 'name': 'Gallery',
23+ 'name': i18n.tr("Gallery"),
24 'icon': 'gallery',
25 'exec': '/usr/bin/gallery-app'
26 },
27 '/usr/share/applications/facebook-webapp.desktop': {
28- 'name': 'Facebook',
29+ 'name': i18n.tr("Facebook"),
30 'icon': 'facebook',
31 'exec': '/usr/bin/webbrowser-app --chromeless http://m.facebook.com',
32 'stage': SideStage
33 },
34 '/usr/share/applications/webbrowser-app.desktop': {
35- 'name': 'Browser',
36+ 'name': i18n.tr("Browser"),
37 'icon': 'browser',
38 'exec': '/usr/bin/webbrowser-app'
39 },
40 '/usr/share/applications/twitter-webapp.desktop': {
41- 'name': 'Twitter',
42+ 'name': i18n.tr("Twitter"),
43 'icon': 'twitter',
44 'exec': '/usr/bin/webbrowser-app --chromeless http://www.twitter.com',
45 'stage': SideStage
46 },
47 '/usr/share/applications/gmail-webapp.desktop': {
48- 'name': 'GMail',
49+ 'name': i18n.tr("GMail"),
50 'icon': 'gmail',
51 'exec': '/usr/bin/webbrowser-app --chromeless http://m.gmail.com'
52 },
53 '/usr/share/applications/ubuntu-weather-app.desktop': {
54- 'name': 'Weather',
55+ 'name': i18n.tr("Weather"),
56 'icon': 'weather',
57 'exec': '/usr/bin/qmlscene /usr/share/ubuntu-weather-app/ubuntu-weather-app.qml',
58 'stage': SideStage
59 },
60 '/usr/share/applications/notes-app.desktop': {
61- 'name': 'Notepad',
62+ 'name': i18n.tr("Notepad"),
63 'icon': 'notepad',
64 'exec': '/usr/bin/qmlscene /usr/share/notes-app/NotesApp.qml',
65 'stage': SideStage
66 },
67 '/usr/share/applications/ubuntu-calendar-app.desktop': {
68- 'name': 'Calendar',
69+ 'name': i18n.tr("Calendar"),
70 'icon': 'calendar',
71 'exec': '/usr/bin/qmlscene /usr/share/ubuntu-calendar-app/calendar.qml',
72 'stage': SideStage
73 },
74 '/usr/share/applications/mediaplayer-app.desktop': {
75- 'name': 'Media Player',
76+ 'name': i18n.tr("Media Player"),
77 'icon': 'mediaplayer-app',
78 'fullscreen': true,
79 'exec': '/usr/bin/mediaplayer-app'
80 },
81 '/usr/share/applications/evernote.desktop': {
82- 'name': 'Evernote',
83+ 'name': i18n.tr("Evernote"),
84 'icon': 'evernote',
85 'exec': ''
86 },
87 '/usr/share/applications/map.desktop': {
88- 'name': 'Map',
89+ 'name': i18n.tr("Map"),
90 'icon': 'map',
91 'exec': ''
92 },
93 '/usr/share/applications/pinterest.desktop': {
94- 'name': 'Pinterest',
95+ 'name': i18n.tr("Pinterest"),
96 'icon': 'pinterest',
97 'exec': ''
98 },
99 '/usr/share/applications/soundcloud.desktop': {
100- 'name': 'SoundCloud',
101+ 'name': i18n.tr("SoundCloud"),
102 'icon': 'soundcloud',
103 'exec': ''
104 },
105 '/usr/share/applications/wikipedia.desktop': {
106- 'name': 'Wikipedia',
107+ 'name': i18n.tr("Wikipedia"),
108 'icon': 'wikipedia',
109 'exec': ''
110 },
111 '/usr/share/applications/youtube.desktop': {
112- 'name': 'YouTube',
113+ 'name': i18n.tr("YouTube"),
114 'icon': 'youtube',
115 'exec': ''
116 },
117
118=== modified file 'Dash/DashMusic.qml'
119--- Dash/DashMusic.qml 2013-05-24 13:16:26 +0000
120+++ Dash/DashMusic.qml 2013-06-10 10:37:26 +0000
121@@ -23,6 +23,13 @@
122 LensView {
123 id: lensView
124
125+ property var categoryNames: [
126+ i18n.tr("Featured"),
127+ i18n.tr("Recent"),
128+ i18n.tr("New Releases"),
129+ i18n.tr("Top Charting")
130+ ]
131+
132 onIsCurrentChanged: {
133 pageHeader.resetSearch();
134 }
135@@ -84,7 +91,7 @@
136 sectionProperty: "name"
137 sectionDelegate: ListItems.Header {
138 width: categoryView.width
139- text: section
140+ text: i18n.tr(section)
141 }
142 pageHeader: PageHeader {
143 id: pageHeader
144
145=== modified file 'Dash/DashPeople.qml'
146--- Dash/DashPeople.qml 2013-05-24 08:00:04 +0000
147+++ Dash/DashPeople.qml 2013-06-10 10:37:26 +0000
148@@ -27,6 +27,13 @@
149 id: lensView
150 property alias previewShown: previewLoader.onScreen
151
152+ property var categoryNames: [
153+ i18n.tr("Favourites"),
154+ i18n.tr("Recently in touch"),
155+ i18n.tr("New Contacts"),
156+ i18n.tr("A-Z")
157+ ]
158+
159 onIsCurrentChanged: {
160 pageHeader.resetSearch();
161 }
162@@ -108,7 +115,7 @@
163 sectionProperty: "name"
164 sectionDelegate: ListItems.Header {
165 width: categoryView.width
166- text: section
167+ text: i18n.tr(section)
168 }
169 pageHeader: PageHeader {
170 id: pageHeader
171
172=== modified file 'Dash/DashVideos.qml'
173--- Dash/DashVideos.qml 2013-05-24 13:16:26 +0000
174+++ Dash/DashVideos.qml 2013-06-10 10:37:26 +0000
175@@ -24,6 +24,13 @@
176 id: lensView
177 property alias previewShown: previewLoader.onScreen
178
179+ property var categoryNames: [
180+ i18n.tr("Featured"),
181+ i18n.tr("Recent"),
182+ i18n.tr("New Releases"),
183+ i18n.tr("Popular Online")
184+ ]
185+
186 onIsCurrentChanged: {
187 pageHeader.resetSearch();
188 }
189@@ -139,7 +146,7 @@
190 sectionProperty: "name"
191 sectionDelegate: ListItems.Header {
192 width: categoryView.width
193- text: section
194+ text: i18n.tr(section)
195 }
196
197 pageHeader: PageHeader {
198
199=== modified file 'Dash/Video/VideoPreview.qml'
200--- Dash/Video/VideoPreview.qml 2013-05-21 11:49:22 +0000
201+++ Dash/Video/VideoPreview.qml 2013-06-10 10:37:26 +0000
202@@ -95,7 +95,7 @@
203 color: "white"
204 horizontalAlignment: Text.AlignRight
205 width: parent.firstColWidth
206- text: "Directed by:"
207+ text: i18n.tr("Directed by:")
208 style: Text.Raised
209 styleColor: "black"
210 }
211@@ -118,7 +118,7 @@
212 horizontalAlignment: Text.AlignRight
213 color: "white"
214 width: parent.firstColWidth
215- text: "Starring:"
216+ text: i18n.tr("Starring:")
217 style: Text.Raised
218 styleColor: "black"
219 }
220@@ -141,7 +141,7 @@
221 horizontalAlignment: Text.AlignRight
222 color: "white"
223 width: parent.firstColWidth
224- text: "Author:"
225+ text: i18n.tr("Author:")
226 style: Text.Raised
227 styleColor: "black"
228 }
229
230=== modified file 'Panel/SearchIndicator.qml'
231--- Panel/SearchIndicator.qml 2013-05-20 13:58:30 +0000
232+++ Panel/SearchIndicator.qml 2013-06-10 10:37:26 +0000
233@@ -23,7 +23,7 @@
234 width: units.gu(9)
235 height: units.gu(3)
236
237- property string headerText: "Search"
238+ property string headerText: i18n.tr("Search")
239
240 signal clicked
241
242
243=== modified file 'debian/changelog'
244--- debian/changelog 2013-06-03 16:15:08 +0000
245+++ debian/changelog 2013-06-10 10:37:26 +0000
246@@ -1,3 +1,9 @@
247+qml-phone-shell (1.80.2) raring; urgency=low
248+
249+ * Cherry-pick some new and temporary translations.
250+
251+ -- Michał Sawicz <michal.sawicz@canonical.com> Mon, 10 Jun 2013 12:35:38 +0200
252+
253 qml-phone-shell (1.80.1) raring; urgency=low
254
255 * cherry-pick greeter lock fix
256
257=== modified file 'po/pl.po'
258--- po/pl.po 2013-06-08 07:52:52 +0000
259+++ po/pl.po 2013-06-10 10:37:26 +0000
260@@ -5,19 +5,86 @@
261 #
262 msgid ""
263 msgstr ""
264-"Project-Id-Version: unity8\n"
265-"Report-Msgid-Bugs-To: Ubuntu Developers <ubuntu-devel-"
266-"discuss@lists.ubuntu.com>\n"
267-"POT-Creation-Date: 2013-05-30 21:08+0800\n"
268-"PO-Revision-Date: 2013-06-07 16:50+0000\n"
269+"Project-Id-Version: unity\n"
270+"Report-Msgid-Bugs-To: \n"
271+"POT-Creation-Date: 2013-06-08 14:40+0200\n"
272+"PO-Revision-Date: 2013-06-08 14:43+0100\n"
273 "Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"
274-"Language-Team: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>\n"
275+"Language-Team: Polish <pl@li.org>\n"
276+"Language: pl\n"
277 "MIME-Version: 1.0\n"
278 "Content-Type: text/plain; charset=UTF-8\n"
279 "Content-Transfer-Encoding: 8bit\n"
280-"X-Launchpad-Export-Date: 2013-06-08 07:52+0000\n"
281-"X-Generator: Launchpad (build 16667)\n"
282-"Language: pl\n"
283+"X-Launchpad-Export-Date: 2013-06-06 06:30+0000\n"
284+"X-Generator: Poedit 1.5.4\n"
285+
286+#: Applications/applications.js:23
287+msgid "Phone"
288+msgstr "Telefon"
289+
290+#: Applications/applications.js:29
291+msgid "Camera"
292+msgstr "Aparat"
293+
294+#: Applications/applications.js:35
295+msgid "Gallery"
296+msgstr "Galeria"
297+
298+#: Applications/applications.js:40
299+msgid "Facebook"
300+msgstr "Facebook"
301+
302+#: Applications/applications.js:46
303+msgid "Browser"
304+msgstr "Internet"
305+
306+#: Applications/applications.js:51
307+msgid "Twitter"
308+msgstr "Twitter"
309+
310+#: Applications/applications.js:57
311+msgid "GMail"
312+msgstr "GMail"
313+
314+#: Applications/applications.js:62
315+msgid "Weather"
316+msgstr "Pogoda"
317+
318+#: Applications/applications.js:68
319+msgid "Notepad"
320+msgstr "Notatki"
321+
322+#: Applications/applications.js:74
323+msgid "Calendar"
324+msgstr "Kalendarz"
325+
326+#: Applications/applications.js:80
327+msgid "Media Player"
328+msgstr "Odtwarzacz mediów"
329+
330+#: Applications/applications.js:86
331+msgid "Evernote"
332+msgstr "Evernote"
333+
334+#: Applications/applications.js:91
335+msgid "Map"
336+msgstr "Mapa"
337+
338+#: Applications/applications.js:96
339+msgid "Pinterest"
340+msgstr "Pinterest"
341+
342+#: Applications/applications.js:101
343+msgid "SoundCloud"
344+msgstr "SoundCloud"
345+
346+#: Applications/applications.js:106
347+msgid "Wikipedia"
348+msgstr "Wikipedia"
349+
350+#: Applications/applications.js:111
351+msgid "YouTube"
352+msgstr "YouTube"
353
354 #: Components/PageHeader.qml:300
355 msgid "Recent searches"
356@@ -67,18 +134,66 @@
357 msgid "Home"
358 msgstr "Dom"
359
360-#: Dash/DashMusic.qml:92
361+#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
362+msgid "Featured"
363+msgstr "Polecane"
364+
365+#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29
366+msgid "Recent"
367+msgstr "Najnowsze"
368+
369+#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
370+msgid "New Releases"
371+msgstr "Nowości"
372+
373+#: Dash/DashMusic.qml:30
374+msgid "Top Charting"
375+msgstr "Przeboje"
376+
377+#: Dash/DashMusic.qml:99
378 msgid "Music"
379 msgstr "Muzyka"
380
381-#: Dash/DashPeople.qml:116
382+#: Dash/DashPeople.qml:31
383+msgid "Favourites"
384+msgstr "Ulubione"
385+
386+#: Dash/DashPeople.qml:32
387+msgid "Recently in touch"
388+msgstr "Ostatnio w kontakcie"
389+
390+#: Dash/DashPeople.qml:33
391+msgid "New Contacts"
392+msgstr "Nowe kontakty"
393+
394+#: Dash/DashPeople.qml:34
395+msgid "A-Z"
396+msgstr "A-Z"
397+
398+#: Dash/DashPeople.qml:123
399 msgid "People"
400 msgstr "Ludzie"
401
402-#: Dash/DashVideos.qml:148
403+#: Dash/DashVideos.qml:31
404+msgid "Popular Online"
405+msgstr "Popularne online"
406+
407+#: Dash/DashVideos.qml:155
408 msgid "Videos"
409 msgstr "Filmy"
410
411+#: Dash/Video/VideoPreview.qml:98
412+msgid "Directed by:"
413+msgstr "Reżyseria:"
414+
415+#: Dash/Video/VideoPreview.qml:121
416+msgid "Starring:"
417+msgstr "Obsada:"
418+
419+#: Dash/Video/VideoPreview.qml:144
420+msgid "Author:"
421+msgstr "Autor:"
422+
423 #: Hud/HudParametrizedActionsPage.qml:132
424 msgid "Confirm"
425 msgstr "Potwierdź"
426@@ -107,6 +222,10 @@
427 msgid "Flight mode"
428 msgstr "Tryb samolotowy"
429
430+#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
431+msgid "Search"
432+msgstr "Szukaj"
433+
434 #: plugins/Unity/lens.cpp:333
435 msgid "Sorry, there is nothing that matches your search."
436 msgstr "Nie znaleziono pasujących wyników."
437@@ -114,7 +233,3 @@
438 #: plugins/Unity/lenses.cpp:39
439 msgid "Home screen"
440 msgstr "Ekran domowy"
441-
442-#: plugins/Unity/lenses.cpp:40
443-msgid "Search"
444-msgstr "Szukaj"
445
446=== modified file 'po/unity8.pot'
447--- po/unity8.pot 2013-05-31 11:36:06 +0000
448+++ po/unity8.pot 2013-06-10 10:37:26 +0000
449@@ -8,7 +8,7 @@
450 msgstr ""
451 "Project-Id-Version: unity8\n"
452 "Report-Msgid-Bugs-To: \n"
453-"POT-Creation-Date: 2013-05-30 21:08+0800\n"
454+"POT-Creation-Date: 2013-06-08 14:40+0200\n"
455 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
456 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
457 "Language-Team: LANGUAGE <LL@li.org>\n"
458@@ -17,6 +17,74 @@
459 "Content-Type: text/plain; charset=CHARSET\n"
460 "Content-Transfer-Encoding: 8bit\n"
461
462+#: Applications/applications.js:23
463+msgid "Phone"
464+msgstr ""
465+
466+#: Applications/applications.js:29
467+msgid "Camera"
468+msgstr ""
469+
470+#: Applications/applications.js:35
471+msgid "Gallery"
472+msgstr ""
473+
474+#: Applications/applications.js:40
475+msgid "Facebook"
476+msgstr ""
477+
478+#: Applications/applications.js:46
479+msgid "Browser"
480+msgstr ""
481+
482+#: Applications/applications.js:51
483+msgid "Twitter"
484+msgstr ""
485+
486+#: Applications/applications.js:57
487+msgid "GMail"
488+msgstr ""
489+
490+#: Applications/applications.js:62
491+msgid "Weather"
492+msgstr ""
493+
494+#: Applications/applications.js:68
495+msgid "Notepad"
496+msgstr ""
497+
498+#: Applications/applications.js:74
499+msgid "Calendar"
500+msgstr ""
501+
502+#: Applications/applications.js:80
503+msgid "Media Player"
504+msgstr ""
505+
506+#: Applications/applications.js:86
507+msgid "Evernote"
508+msgstr ""
509+
510+#: Applications/applications.js:91
511+msgid "Map"
512+msgstr ""
513+
514+#: Applications/applications.js:96
515+msgid "Pinterest"
516+msgstr ""
517+
518+#: Applications/applications.js:101
519+msgid "SoundCloud"
520+msgstr ""
521+
522+#: Applications/applications.js:106
523+msgid "Wikipedia"
524+msgstr ""
525+
526+#: Applications/applications.js:111
527+msgid "YouTube"
528+msgstr ""
529+
530 #: Components/PageHeader.qml:300
531 msgid "Recent searches"
532 msgstr ""
533@@ -65,18 +133,66 @@
534 msgid "Home"
535 msgstr ""
536
537-#: Dash/DashMusic.qml:92
538+#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
539+msgid "Featured"
540+msgstr ""
541+
542+#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29
543+msgid "Recent"
544+msgstr ""
545+
546+#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
547+msgid "New Releases"
548+msgstr ""
549+
550+#: Dash/DashMusic.qml:30
551+msgid "Top Charting"
552+msgstr ""
553+
554+#: Dash/DashMusic.qml:99
555 msgid "Music"
556 msgstr ""
557
558-#: Dash/DashPeople.qml:116
559+#: Dash/DashPeople.qml:31
560+msgid "Favourites"
561+msgstr ""
562+
563+#: Dash/DashPeople.qml:32
564+msgid "Recently in touch"
565+msgstr ""
566+
567+#: Dash/DashPeople.qml:33
568+msgid "New Contacts"
569+msgstr ""
570+
571+#: Dash/DashPeople.qml:34
572+msgid "A-Z"
573+msgstr ""
574+
575+#: Dash/DashPeople.qml:123
576 msgid "People"
577 msgstr ""
578
579-#: Dash/DashVideos.qml:148
580+#: Dash/DashVideos.qml:31
581+msgid "Popular Online"
582+msgstr ""
583+
584+#: Dash/DashVideos.qml:155
585 msgid "Videos"
586 msgstr ""
587
588+#: Dash/Video/VideoPreview.qml:98
589+msgid "Directed by:"
590+msgstr ""
591+
592+#: Dash/Video/VideoPreview.qml:121
593+msgid "Starring:"
594+msgstr ""
595+
596+#: Dash/Video/VideoPreview.qml:144
597+msgid "Author:"
598+msgstr ""
599+
600 #: Hud/HudParametrizedActionsPage.qml:132
601 msgid "Confirm"
602 msgstr ""
603@@ -105,6 +221,10 @@
604 msgid "Flight mode"
605 msgstr ""
606
607+#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
608+msgid "Search"
609+msgstr ""
610+
611 #: plugins/Unity/lens.cpp:333
612 msgid "Sorry, there is nothing that matches your search."
613 msgstr ""
614@@ -112,7 +232,3 @@
615 #: plugins/Unity/lenses.cpp:39
616 msgid "Home screen"
617 msgstr ""
618-
619-#: plugins/Unity/lenses.cpp:40
620-msgid "Search"
621-msgstr ""
622
623=== modified file 'po/update-unity-pot'
624--- po/update-unity-pot 2013-05-24 08:00:04 +0000
625+++ po/update-unity-pot 2013-06-10 10:37:26 +0000
626@@ -9,7 +9,7 @@
627 GETTEXT_FILES=$(mktemp --tmpdir uitk-unity.lst.XXXXX)
628 trap 'rm -f "$GETTEXT_FILES"' EXIT
629 cd ..
630-find \( -name '*.h' -o -name '*.cpp' -o -name '*.qml' \) \
631+find \( -name '*.h' -o -name '*.cpp' -o -name '*.qml' -o -name '*.js' \) \
632 -a ! \( -path './debian/*' -o -path './builddir/*' -o -path './build/*' -o -path './.bzr/*' \) | sort \
633 > $GETTEXT_FILES
634

Subscribers

People subscribed via source and target branches

to all changes: