Merge lp:~saviq/unity/8.i18n-updates into lp:unity/8.0

Proposed by Michał Sawicz
Status: Merged
Approved by: Ying-Chun Liu
Approved revision: no longer in the source branch.
Merged at revision: 6
Proposed branch: lp:~saviq/unity/8.i18n-updates
Merge into: lp:unity/8.0
Diff against target: 614 lines (+299/-45)
9 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)
po/pl.po (+129/-12)
po/unity8.pot (+124/-8)
po/update-unity-pot (+1/-1)
To merge this branch: bzr merge lp:~saviq/unity/8.i18n-updates
Reviewer Review Type Date Requested Status
Ying-Chun Liu (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+168242@code.launchpad.net

Commit message

Add some new and temporary translations.

Description of the change

Some of these are strings that should ultimately come pre-translated from the backends, but for the sake of UI completion let's have them here for now.

To post a comment you must log in.
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)
Revision history for this message
Ying-Chun Liu (paulliu) wrote :

+1

review: Approve

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-06-05 22:03:08 +0000
3+++ Applications/applications.js 2013-06-08 13:49:25 +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-06-05 22:03:08 +0000
120+++ Dash/DashMusic.qml 2013-06-08 13:49:25 +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-06-05 22:03:08 +0000
147+++ Dash/DashPeople.qml 2013-06-08 13:49:25 +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-06-05 22:03:08 +0000
174+++ Dash/DashVideos.qml 2013-06-08 13:49:25 +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-06-05 22:03:08 +0000
201+++ Dash/Video/VideoPreview.qml 2013-06-08 13:49:25 +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-06-05 22:03:08 +0000
232+++ Panel/SearchIndicator.qml 2013-06-08 13:49:25 +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 'po/pl.po'
244--- po/pl.po 2013-06-06 06:30:35 +0000
245+++ po/pl.po 2013-06-08 13:49:25 +0000
246@@ -6,16 +6,85 @@
247 msgid ""
248 msgstr ""
249 "Project-Id-Version: unity\n"
250-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
251-"POT-Creation-Date: 2013-05-30 21:08+0800\n"
252-"PO-Revision-Date: 2013-06-05 22:43+0000\n"
253-"Last-Translator: Piotr Merski <Unknown>\n"
254+"Report-Msgid-Bugs-To: \n"
255+"POT-Creation-Date: 2013-06-08 14:40+0200\n"
256+"PO-Revision-Date: 2013-06-08 14:43+0100\n"
257+"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"
258 "Language-Team: Polish <pl@li.org>\n"
259+"Language: pl\n"
260 "MIME-Version: 1.0\n"
261 "Content-Type: text/plain; charset=UTF-8\n"
262 "Content-Transfer-Encoding: 8bit\n"
263 "X-Launchpad-Export-Date: 2013-06-06 06:30+0000\n"
264-"X-Generator: Launchpad (build 16667)\n"
265+"X-Generator: Poedit 1.5.4\n"
266+
267+#: Applications/applications.js:23
268+msgid "Phone"
269+msgstr "Telefon"
270+
271+#: Applications/applications.js:29
272+msgid "Camera"
273+msgstr "Aparat"
274+
275+#: Applications/applications.js:35
276+msgid "Gallery"
277+msgstr "Galeria"
278+
279+#: Applications/applications.js:40
280+msgid "Facebook"
281+msgstr "Facebook"
282+
283+#: Applications/applications.js:46
284+msgid "Browser"
285+msgstr "Internet"
286+
287+#: Applications/applications.js:51
288+msgid "Twitter"
289+msgstr "Twitter"
290+
291+#: Applications/applications.js:57
292+msgid "GMail"
293+msgstr "GMail"
294+
295+#: Applications/applications.js:62
296+msgid "Weather"
297+msgstr "Pogoda"
298+
299+#: Applications/applications.js:68
300+msgid "Notepad"
301+msgstr "Notatki"
302+
303+#: Applications/applications.js:74
304+msgid "Calendar"
305+msgstr "Kalendarz"
306+
307+#: Applications/applications.js:80
308+msgid "Media Player"
309+msgstr "Odtwarzacz mediów"
310+
311+#: Applications/applications.js:86
312+msgid "Evernote"
313+msgstr "Evernote"
314+
315+#: Applications/applications.js:91
316+msgid "Map"
317+msgstr "Mapa"
318+
319+#: Applications/applications.js:96
320+msgid "Pinterest"
321+msgstr "Pinterest"
322+
323+#: Applications/applications.js:101
324+msgid "SoundCloud"
325+msgstr "SoundCloud"
326+
327+#: Applications/applications.js:106
328+msgid "Wikipedia"
329+msgstr "Wikipedia"
330+
331+#: Applications/applications.js:111
332+msgid "YouTube"
333+msgstr "YouTube"
334
335 #: Components/PageHeader.qml:300
336 msgid "Recent searches"
337@@ -65,18 +134,66 @@
338 msgid "Home"
339 msgstr "Dom"
340
341-#: Dash/DashMusic.qml:92
342+#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
343+msgid "Featured"
344+msgstr "Polecane"
345+
346+#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29
347+msgid "Recent"
348+msgstr "Najnowsze"
349+
350+#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
351+msgid "New Releases"
352+msgstr "Nowości"
353+
354+#: Dash/DashMusic.qml:30
355+msgid "Top Charting"
356+msgstr "Przeboje"
357+
358+#: Dash/DashMusic.qml:99
359 msgid "Music"
360 msgstr "Muzyka"
361
362-#: Dash/DashPeople.qml:116
363+#: Dash/DashPeople.qml:31
364+msgid "Favourites"
365+msgstr "Ulubione"
366+
367+#: Dash/DashPeople.qml:32
368+msgid "Recently in touch"
369+msgstr "Ostatnio w kontakcie"
370+
371+#: Dash/DashPeople.qml:33
372+msgid "New Contacts"
373+msgstr "Nowe kontakty"
374+
375+#: Dash/DashPeople.qml:34
376+msgid "A-Z"
377+msgstr "A-Z"
378+
379+#: Dash/DashPeople.qml:123
380 msgid "People"
381 msgstr "Ludzie"
382
383-#: Dash/DashVideos.qml:148
384+#: Dash/DashVideos.qml:31
385+msgid "Popular Online"
386+msgstr "Popularne online"
387+
388+#: Dash/DashVideos.qml:155
389 msgid "Videos"
390 msgstr "Filmy"
391
392+#: Dash/Video/VideoPreview.qml:98
393+msgid "Directed by:"
394+msgstr "Reżyseria:"
395+
396+#: Dash/Video/VideoPreview.qml:121
397+msgid "Starring:"
398+msgstr "Obsada:"
399+
400+#: Dash/Video/VideoPreview.qml:144
401+msgid "Author:"
402+msgstr "Autor:"
403+
404 #: Hud/HudParametrizedActionsPage.qml:132
405 msgid "Confirm"
406 msgstr "Potwierdź"
407@@ -105,6 +222,10 @@
408 msgid "Flight mode"
409 msgstr "Tryb samolotowy"
410
411+#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
412+msgid "Search"
413+msgstr "Szukaj"
414+
415 #: plugins/Unity/lens.cpp:333
416 msgid "Sorry, there is nothing that matches your search."
417 msgstr "Nie znaleziono pasujących wyników."
418@@ -112,7 +233,3 @@
419 #: plugins/Unity/lenses.cpp:39
420 msgid "Home screen"
421 msgstr "Ekran domowy"
422-
423-#: plugins/Unity/lenses.cpp:40
424-msgid "Search"
425-msgstr "Szukaj"
426
427=== modified file 'po/unity8.pot'
428--- po/unity8.pot 2013-06-05 22:03:08 +0000
429+++ po/unity8.pot 2013-06-08 13:49:25 +0000
430@@ -8,7 +8,7 @@
431 msgstr ""
432 "Project-Id-Version: unity8\n"
433 "Report-Msgid-Bugs-To: \n"
434-"POT-Creation-Date: 2013-05-30 21:08+0800\n"
435+"POT-Creation-Date: 2013-06-08 14:40+0200\n"
436 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
437 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
438 "Language-Team: LANGUAGE <LL@li.org>\n"
439@@ -17,6 +17,74 @@
440 "Content-Type: text/plain; charset=CHARSET\n"
441 "Content-Transfer-Encoding: 8bit\n"
442
443+#: Applications/applications.js:23
444+msgid "Phone"
445+msgstr ""
446+
447+#: Applications/applications.js:29
448+msgid "Camera"
449+msgstr ""
450+
451+#: Applications/applications.js:35
452+msgid "Gallery"
453+msgstr ""
454+
455+#: Applications/applications.js:40
456+msgid "Facebook"
457+msgstr ""
458+
459+#: Applications/applications.js:46
460+msgid "Browser"
461+msgstr ""
462+
463+#: Applications/applications.js:51
464+msgid "Twitter"
465+msgstr ""
466+
467+#: Applications/applications.js:57
468+msgid "GMail"
469+msgstr ""
470+
471+#: Applications/applications.js:62
472+msgid "Weather"
473+msgstr ""
474+
475+#: Applications/applications.js:68
476+msgid "Notepad"
477+msgstr ""
478+
479+#: Applications/applications.js:74
480+msgid "Calendar"
481+msgstr ""
482+
483+#: Applications/applications.js:80
484+msgid "Media Player"
485+msgstr ""
486+
487+#: Applications/applications.js:86
488+msgid "Evernote"
489+msgstr ""
490+
491+#: Applications/applications.js:91
492+msgid "Map"
493+msgstr ""
494+
495+#: Applications/applications.js:96
496+msgid "Pinterest"
497+msgstr ""
498+
499+#: Applications/applications.js:101
500+msgid "SoundCloud"
501+msgstr ""
502+
503+#: Applications/applications.js:106
504+msgid "Wikipedia"
505+msgstr ""
506+
507+#: Applications/applications.js:111
508+msgid "YouTube"
509+msgstr ""
510+
511 #: Components/PageHeader.qml:300
512 msgid "Recent searches"
513 msgstr ""
514@@ -65,18 +133,66 @@
515 msgid "Home"
516 msgstr ""
517
518-#: Dash/DashMusic.qml:92
519+#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
520+msgid "Featured"
521+msgstr ""
522+
523+#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29
524+msgid "Recent"
525+msgstr ""
526+
527+#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
528+msgid "New Releases"
529+msgstr ""
530+
531+#: Dash/DashMusic.qml:30
532+msgid "Top Charting"
533+msgstr ""
534+
535+#: Dash/DashMusic.qml:99
536 msgid "Music"
537 msgstr ""
538
539-#: Dash/DashPeople.qml:116
540+#: Dash/DashPeople.qml:31
541+msgid "Favourites"
542+msgstr ""
543+
544+#: Dash/DashPeople.qml:32
545+msgid "Recently in touch"
546+msgstr ""
547+
548+#: Dash/DashPeople.qml:33
549+msgid "New Contacts"
550+msgstr ""
551+
552+#: Dash/DashPeople.qml:34
553+msgid "A-Z"
554+msgstr ""
555+
556+#: Dash/DashPeople.qml:123
557 msgid "People"
558 msgstr ""
559
560-#: Dash/DashVideos.qml:148
561+#: Dash/DashVideos.qml:31
562+msgid "Popular Online"
563+msgstr ""
564+
565+#: Dash/DashVideos.qml:155
566 msgid "Videos"
567 msgstr ""
568
569+#: Dash/Video/VideoPreview.qml:98
570+msgid "Directed by:"
571+msgstr ""
572+
573+#: Dash/Video/VideoPreview.qml:121
574+msgid "Starring:"
575+msgstr ""
576+
577+#: Dash/Video/VideoPreview.qml:144
578+msgid "Author:"
579+msgstr ""
580+
581 #: Hud/HudParametrizedActionsPage.qml:132
582 msgid "Confirm"
583 msgstr ""
584@@ -105,6 +221,10 @@
585 msgid "Flight mode"
586 msgstr ""
587
588+#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
589+msgid "Search"
590+msgstr ""
591+
592 #: plugins/Unity/lens.cpp:333
593 msgid "Sorry, there is nothing that matches your search."
594 msgstr ""
595@@ -112,7 +232,3 @@
596 #: plugins/Unity/lenses.cpp:39
597 msgid "Home screen"
598 msgstr ""
599-
600-#: plugins/Unity/lenses.cpp:40
601-msgid "Search"
602-msgstr ""
603
604=== modified file 'po/update-unity-pot'
605--- po/update-unity-pot 2013-06-05 22:03:08 +0000
606+++ po/update-unity-pot 2013-06-08 13:49:25 +0000
607@@ -9,7 +9,7 @@
608 GETTEXT_FILES=$(mktemp --tmpdir uitk-unity.lst.XXXXX)
609 trap 'rm -f "$GETTEXT_FILES"' EXIT
610 cd ..
611-find \( -name '*.h' -o -name '*.cpp' -o -name '*.qml' \) \
612+find \( -name '*.h' -o -name '*.cpp' -o -name '*.qml' -o -name '*.js' \) \
613 -a ! \( -path './debian/*' -o -path './builddir/*' -o -path './build/*' -o -path './.bzr/*' \) | sort \
614 > $GETTEXT_FILES
615

Subscribers

People subscribed via source and target branches

to all changes: