Merge lp:~verzegnassi-stefano/openstore/add-translations into lp:openstore
- add-translations
- Merge into trunk
Proposed by
Stefano Verzegnassi
Status: | Merged |
---|---|
Merged at revision: | 28 |
Proposed branch: | lp:~verzegnassi-stefano/openstore/add-translations |
Merge into: | lp:openstore |
Diff against target: |
362 lines (+226/-13) 6 files modified
openstore.pro (+2/-2) openstore/AppDetailsPage.qml (+11/-8) openstore/FilteredAppView.qml (+1/-1) openstore/Main.qml (+1/-1) openstore/SearchPage.qml (+1/-1) po/openstore.openstore-team.pot (+210/-0) |
To merge this branch: | bzr merge lp:~verzegnassi-stefano/openstore/add-translations |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Brian Douglass | Approve | ||
Marius Gripsgard | Approve | ||
Review via email: mp+324345@code.launchpad.net |
Commit message
* Fixed wrong UBUNTU_
* Added translation template
Description of the change
* Fixed wrong UBUNTU_
* Added translation template
To post a comment you must log in.
Revision history for this message
Brian Douglass (bhdouglass) wrote : | # |
Stefano, I made some suggestions/
- 29. By Stefano Verzegnassi
-
Updated translations as per Brian's merge review. Removed 'OpenStore' string from translations since it shouldn't be translatable
- 30. By Stefano Verzegnassi
-
Added a few TRANSLATORS comments
Revision history for this message
Stefano Verzegnassi (verzegnassi-stefano) wrote : | # |
Fixed! Let me know if it looks okay now! :)
Revision history for this message
Brian Douglass (bhdouglass) wrote : | # |
Looks great!
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'openstore.pro' |
2 | --- openstore.pro 2016-04-23 15:00:42 +0000 |
3 | +++ openstore.pro 2017-05-20 10:15:00 +0000 |
4 | @@ -22,8 +22,8 @@ |
5 | # template is created in po/template.pot, to create a |
6 | # translation copy the template to e.g. de.po and edit the sources |
7 | UBUNTU_TRANSLATION_SOURCES+= \ |
8 | - $$files(app/*.qml,true) \ |
9 | - $$files(app/*.js,true) |
10 | + $$files(openstore/*.qml,true) \ |
11 | + $$files(openstore/*.js,true) |
12 | |
13 | # specifies all translations files and makes sure they are |
14 | # compiled and installed into the right place in the click package |
15 | |
16 | === modified file 'openstore/AppDetailsPage.qml' |
17 | --- openstore/AppDetailsPage.qml 2017-05-08 18:41:35 +0000 |
18 | +++ openstore/AppDetailsPage.qml 2017-05-20 10:15:00 +0000 |
19 | @@ -123,7 +123,7 @@ |
20 | } |
21 | ListItemLayout { |
22 | anchors.centerIn: parent |
23 | - subtitle.text: i18n.tr("This software requires extra privileges. See below for details.") |
24 | + subtitle.text: i18n.tr("This app has access to restricted system data, see below for details.") |
25 | subtitle.color: UbuntuColors.red |
26 | subtitle.maximumLineCount: 2 |
27 | subtitle.wrapMode: Text.WordWrap |
28 | @@ -269,6 +269,7 @@ |
29 | ListItemLayout { |
30 | id: changelogLayout |
31 | property bool showAll: false |
32 | + // TRANSLATORS: Title of the changelog section |
33 | title.text: i18n.tr("What's New") |
34 | subtitle.text: app.changelog |
35 | subtitle.textSize: Label.Small |
36 | @@ -315,7 +316,7 @@ |
37 | divider.visible: false |
38 | ListItemLayout { |
39 | anchors.centerIn: parent |
40 | - title.text: i18n.tr("License") || i18n.tr("<i>N/A</i>") |
41 | + title.text: i18n.tr("License") || "<i>" + i18n.tr("N/A") + "</i>" |
42 | subtitle.text: app.license |
43 | } |
44 | } |
45 | @@ -324,7 +325,7 @@ |
46 | onClicked: Qt.openUrlExternally(app.source) |
47 | ListItemLayout { |
48 | anchors.centerIn: parent |
49 | - title.text: i18n.tr("Source Code") || i18n.tr("<i>N/A</i>") |
50 | + title.text: i18n.tr("Source Code") || "<i>" + i18n.tr("N/A") + "</i>" |
51 | subtitle.text: app.source |
52 | ProgressionSlot { visible: app.source } |
53 | } |
54 | @@ -347,6 +348,7 @@ |
55 | } |
56 | ListItemLayout { |
57 | anchors.centerIn: parent |
58 | + // TRANSLATORS: This is the button that shows a list of all the packages from the same author. %1 is the name of the author. |
59 | title.text: i18n.tr("More from %1").arg(app.author) |
60 | ProgressionSlot {} |
61 | } |
62 | @@ -370,6 +372,7 @@ |
63 | ListItemLayout { |
64 | anchors.centerIn: parent |
65 | // FIXME: app.category is not localized. |
66 | + // TRANSLATORS: This is the button that shows a list of all the other packages in the same category. %1 is the name of the category. |
67 | title.text: i18n.tr("Other apps in %1").arg(app.category) |
68 | ProgressionSlot {} |
69 | } |
70 | @@ -501,7 +504,7 @@ |
71 | .replace("video_files", "<font color=\"#ED3146\">music_files_read</font>") |
72 | } |
73 | |
74 | - return i18n.tr("<i>none required</i>") |
75 | + return "<i>" + i18n.tr("none required") + "</i>" |
76 | } |
77 | } |
78 | |
79 | @@ -519,7 +522,7 @@ |
80 | } |
81 | |
82 | title.text: i18n.tr("Read paths") |
83 | - subtitle.text: readpaths || i18n.tr("<i>none</i>") |
84 | + subtitle.text: readpaths || "<i>" + i18n.tr("none") + "</i>" |
85 | subtitle.maximumLineCount: Number.MAX_VALUE |
86 | } |
87 | |
88 | @@ -536,7 +539,7 @@ |
89 | } |
90 | |
91 | title.text: i18n.tr("Write paths") |
92 | - subtitle.text: writepaths || i18n.tr("<i>none</i>") |
93 | + subtitle.text: writepaths || "<i>" + i18n.tr("none") + "</i>" |
94 | subtitle.maximumLineCount: Number.MAX_VALUE |
95 | } |
96 | |
97 | @@ -571,8 +574,8 @@ |
98 | // TRANSLATORS: %1 is the size of a file, expressed in kB |
99 | return i18n.tr("%1 kB").arg(parseInt(size / s)); |
100 | |
101 | - // TRANSLATORS: %1 is the size of a file, expressed in byte |
102 | - return i18n.tr("%1 byte").arg(size); |
103 | + // TRANSLATORS: %1 is the size of a file, expressed in bytes |
104 | + return i18n.tr("%1 bytes").arg(size); |
105 | } |
106 | |
107 | function includesUnconfinedLocations(paths) { |
108 | |
109 | === modified file 'openstore/FilteredAppView.qml' |
110 | --- openstore/FilteredAppView.qml 2017-05-04 16:17:19 +0000 |
111 | +++ openstore/FilteredAppView.qml 2017-05-20 10:15:00 +0000 |
112 | @@ -98,7 +98,7 @@ |
113 | anchors.centerIn: parent |
114 | active: view.count == 0 |
115 | sourceComponent: EmptyState { |
116 | - title: rootItem.filterProperty == "category" ? i18n.tr("Nothing here yet") : i18n.tr("No result found.").arg(rootItem.filterPattern) |
117 | + title: rootItem.filterProperty == "category" ? i18n.tr("Nothing here yet") : i18n.tr("No results found.").arg(rootItem.filterPattern) |
118 | subTitle: rootItem.filterProperty == "category" ? i18n.tr("No app has been released in this department yet.") : i18n.tr("Try with a different search.") |
119 | iconName: rootItem.filterProperty == "category" ? "ubuntu-store-symbolic" : "search" |
120 | anchors.centerIn: parent |
121 | |
122 | === modified file 'openstore/Main.qml' |
123 | --- openstore/Main.qml 2017-05-05 22:21:39 +0000 |
124 | +++ openstore/Main.qml 2017-05-20 10:15:00 +0000 |
125 | @@ -139,7 +139,7 @@ |
126 | Page { |
127 | id: mainPage |
128 | header: PageHeader { |
129 | - title: i18n.tr("Open Store") |
130 | + title: "OpenStore" // This is the name of the store - no need for translation. |
131 | automaticHeight: false |
132 | |
133 | leadingActionBar.actions: Action { |
134 | |
135 | === modified file 'openstore/SearchPage.qml' |
136 | --- openstore/SearchPage.qml 2017-05-04 16:17:19 +0000 |
137 | +++ openstore/SearchPage.qml 2017-05-20 10:15:00 +0000 |
138 | @@ -57,7 +57,7 @@ |
139 | name: "search" |
140 | } |
141 | |
142 | - placeholderText: i18n.tr("search in OpenStore...") |
143 | + placeholderText: i18n.tr("Search in OpenStore...") |
144 | onTextChanged: view.search(text) |
145 | Component.onCompleted: view.search(text) |
146 | |
147 | |
148 | === added directory 'po' |
149 | === added file 'po/openstore.openstore-team.pot' |
150 | --- po/openstore.openstore-team.pot 1970-01-01 00:00:00 +0000 |
151 | +++ po/openstore.openstore-team.pot 2017-05-20 10:15:00 +0000 |
152 | @@ -0,0 +1,210 @@ |
153 | +# SOME DESCRIPTIVE TITLE. |
154 | +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER |
155 | +# This file is distributed under the same license as the PACKAGE package. |
156 | +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. |
157 | +# |
158 | +#, fuzzy |
159 | +msgid "" |
160 | +msgstr "" |
161 | +"Project-Id-Version: PACKAGE VERSION\n" |
162 | +"Report-Msgid-Bugs-To: \n" |
163 | +"POT-Creation-Date: 2017-05-20 10:14+0000\n" |
164 | +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
165 | +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
166 | +"Language-Team: LANGUAGE <LL@li.org>\n" |
167 | +"Language: \n" |
168 | +"MIME-Version: 1.0\n" |
169 | +"Content-Type: text/plain; charset=CHARSET\n" |
170 | +"Content-Transfer-Encoding: 8bit\n" |
171 | + |
172 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:79 |
173 | +msgid "Upgrade" |
174 | +msgstr "" |
175 | + |
176 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:79 |
177 | +msgid "Install" |
178 | +msgstr "" |
179 | + |
180 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:89 |
181 | +msgid "Remove" |
182 | +msgstr "" |
183 | + |
184 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:126 |
185 | +msgid "This app has access to restricted system data, see below for details." |
186 | +msgstr "" |
187 | + |
188 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:251 |
189 | +msgid "Description" |
190 | +msgstr "" |
191 | + |
192 | +#. TRANSLATORS: Title of the changelog section |
193 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:273 |
194 | +msgid "What's New" |
195 | +msgstr "" |
196 | + |
197 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:291 |
198 | +msgid "Packager/Publisher" |
199 | +msgstr "" |
200 | + |
201 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:292 |
202 | +msgid "OpenStore team" |
203 | +msgstr "" |
204 | + |
205 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:300 |
206 | +msgid "Installed version" |
207 | +msgstr "" |
208 | + |
209 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:310 |
210 | +msgid "Latest available version" |
211 | +msgstr "" |
212 | + |
213 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:319 |
214 | +msgid "License" |
215 | +msgstr "" |
216 | + |
217 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:319 |
218 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:328 |
219 | +msgid "N/A" |
220 | +msgstr "" |
221 | + |
222 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:328 |
223 | +msgid "Source Code" |
224 | +msgstr "" |
225 | + |
226 | +#. TRANSLATORS: This is the button that shows a list of all the packages from the same author. %1 is the name of the author. |
227 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:352 |
228 | +#, qt-format |
229 | +msgid "More from %1" |
230 | +msgstr "" |
231 | + |
232 | +#. TRANSLATORS: This is the button that shows a list of all the other packages in the same category. %1 is the name of the category. |
233 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:376 |
234 | +#, qt-format |
235 | +msgid "Other apps in %1" |
236 | +msgstr "" |
237 | + |
238 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:382 |
239 | +msgid "Package contents" |
240 | +msgstr "" |
241 | + |
242 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:462 |
243 | +msgid "AppArmor profile" |
244 | +msgstr "" |
245 | + |
246 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:490 |
247 | +msgid "Permissions" |
248 | +msgstr "" |
249 | + |
250 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:507 |
251 | +msgid "none required" |
252 | +msgstr "" |
253 | + |
254 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:524 |
255 | +msgid "Read paths" |
256 | +msgstr "" |
257 | + |
258 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:525 |
259 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:542 |
260 | +msgid "none" |
261 | +msgstr "" |
262 | + |
263 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:541 |
264 | +msgid "Write paths" |
265 | +msgstr "" |
266 | + |
267 | +#. TRANSLATORS: %1 is the size of a file, expressed in GB |
268 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:565 |
269 | +#, qt-format |
270 | +msgid "%1 GB" |
271 | +msgstr "" |
272 | + |
273 | +#. TRANSLATORS: %1 is the size of a file, expressed in MB |
274 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:570 |
275 | +#, qt-format |
276 | +msgid "%1 MB" |
277 | +msgstr "" |
278 | + |
279 | +#. TRANSLATORS: %1 is the size of a file, expressed in kB |
280 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:575 |
281 | +#, qt-format |
282 | +msgid "%1 kB" |
283 | +msgstr "" |
284 | + |
285 | +#. TRANSLATORS: %1 is the size of a file, expressed in bytes |
286 | +#: /tmp/add-translations/openstore/AppDetailsPage.qml:578 |
287 | +#, qt-format |
288 | +msgid "%1 bytes" |
289 | +msgstr "" |
290 | + |
291 | +#: /tmp/add-translations/openstore/CategoriesPage.qml:24 |
292 | +#: /tmp/add-translations/openstore/Main.qml:147 |
293 | +msgid "Categories" |
294 | +msgstr "" |
295 | + |
296 | +#: /tmp/add-translations/openstore/DiscoverTab.qml:166 |
297 | +msgid "Update available" |
298 | +msgstr "" |
299 | + |
300 | +#: /tmp/add-translations/openstore/DiscoverTab.qml:166 |
301 | +msgid "Installed" |
302 | +msgstr "" |
303 | + |
304 | +#: /tmp/add-translations/openstore/FilteredAppView.qml:101 |
305 | +msgid "Nothing here yet" |
306 | +msgstr "" |
307 | + |
308 | +#: /tmp/add-translations/openstore/FilteredAppView.qml:101 |
309 | +msgid "No results found." |
310 | +msgstr "" |
311 | + |
312 | +#: /tmp/add-translations/openstore/FilteredAppView.qml:102 |
313 | +msgid "No app has been released in this department yet." |
314 | +msgstr "" |
315 | + |
316 | +#: /tmp/add-translations/openstore/FilteredAppView.qml:102 |
317 | +msgid "Try with a different search." |
318 | +msgstr "" |
319 | + |
320 | +#: /tmp/add-translations/openstore/Main.qml:153 |
321 | +#: /tmp/add-translations/openstore/SearchPage.qml:29 |
322 | +msgid "Search" |
323 | +msgstr "" |
324 | + |
325 | +#: /tmp/add-translations/openstore/Main.qml:160 |
326 | +msgid "Discover" |
327 | +msgstr "" |
328 | + |
329 | +#: /tmp/add-translations/openstore/Main.qml:160 |
330 | +msgid "My Apps" |
331 | +msgstr "" |
332 | + |
333 | +#: /tmp/add-translations/openstore/Main.qml:254 |
334 | +msgid "Available updates" |
335 | +msgstr "" |
336 | + |
337 | +#: /tmp/add-translations/openstore/Main.qml:254 |
338 | +msgid "Installed apps" |
339 | +msgstr "" |
340 | + |
341 | +#: /tmp/add-translations/openstore/Main.qml:272 |
342 | +msgid "Fetching package list..." |
343 | +msgstr "" |
344 | + |
345 | +#: /tmp/add-translations/openstore/Main.qml:350 |
346 | +#, qt-format |
347 | +msgid "Do you want to install %1?" |
348 | +msgstr "" |
349 | + |
350 | +#: /tmp/add-translations/openstore/SearchPage.qml:37 |
351 | +msgid "Cancel" |
352 | +msgstr "" |
353 | + |
354 | +#: /tmp/add-translations/openstore/SearchPage.qml:60 |
355 | +msgid "Search in OpenStore..." |
356 | +msgstr "" |
357 | + |
358 | +#: /tmp/add-translations/openstore/TextualButtonStyle.qml:46 |
359 | +#: /tmp/add-translations/openstore/TextualButtonStyle.qml:54 |
360 | +#: /tmp/add-translations/openstore/TextualButtonStyle.qml:60 |
361 | +msgid "Pick" |
362 | +msgstr "" |
Looks good to me