Merge lp:~nik90/podbird/10-organize-project-structure into lp:podbird
- 10-organize-project-structure
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Michael Sheldon |
Approved revision: | 77 |
Merged at revision: | 84 |
Proposed branch: | lp:~nik90/podbird/10-organize-project-structure |
Merge into: | lp:podbird |
Diff against target: |
700 lines (+142/-96) 15 files modified
app/CMakeLists.txt (+1/-0) app/Podbird.desktop.in (+1/-1) app/components/CMakeLists.txt (+7/-0) app/podbird.qml (+1/-1) app/settings/About.qml (+1/-0) app/settings/Credits.qml (+2/-1) app/settings/ThemeSetting.qml (+2/-0) app/ui/EpisodesPage.qml (+1/-0) app/ui/NowPlayingPage.qml (+7/-2) app/ui/PodcastsTab.qml (+1/-0) app/ui/SearchPage.qml (+5/-2) app/ui/SettingsPage.qml (+4/-0) app/ui/WhatsNewTab.qml (+1/-0) app/welcomewizard/WelcomeWizard.qml (+1/-1) po/com.mikeasoft.podbird.pot (+107/-88) |
To merge this branch: | bzr merge lp:~nik90/podbird/10-organize-project-structure |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Sheldon | Approve | ||
Review via email: mp+256867@code.launchpad.net |
Commit message
Description of the change
This is a minor MP after the big v0.6 release we had.
- It reorganizes the project structure by moving the generic components to a new folder "components" and separating them from the Pages/Tabs.
- Made the podcast app description in the desktop a tiny bit more descriptive and in line with our welcome wizard introduction.
- Added more translator comments to make strings more clearer.
- In the about page "Creator" was not marked for translation.
- Also in the now playing page, +15s and -15s strings are now translated in a more proper format.
- The string shown in the welcome screen was apparently not translation friendly in other languages. That has been fixed now.
- 76. By Nekhelesh Ramananthan
-
Added more translator comments to make certain strings clear. The word creator has also been marked for translation.
- 77. By Nekhelesh Ramananthan
-
Fixed welcome screen text
Preview Diff
1 | === modified file 'app/CMakeLists.txt' |
2 | --- app/CMakeLists.txt 2015-03-30 20:48:46 +0000 |
3 | +++ app/CMakeLists.txt 2015-04-28 12:09:14 +0000 |
4 | @@ -11,6 +11,7 @@ |
5 | |
6 | add_subdirectory(ui) |
7 | add_subdirectory(themes) |
8 | +add_subdirectory(components) |
9 | add_subdirectory(welcomewizard) |
10 | add_subdirectory(graphics) |
11 | add_subdirectory(settings) |
12 | |
13 | === modified file 'app/Podbird.desktop.in' |
14 | --- app/Podbird.desktop.in 2015-04-23 10:01:54 +0000 |
15 | +++ app/Podbird.desktop.in 2015-04-28 12:09:14 +0000 |
16 | @@ -1,6 +1,6 @@ |
17 | [Desktop Entry] |
18 | Name=Podbird |
19 | -Comment=Podcast manager |
20 | +_Comment=The chirpiest podcast manager for Ubuntu |
21 | Exec=@EXEC@ |
22 | Icon=@ICON@ |
23 | Terminal=false |
24 | |
25 | === added directory 'app/components' |
26 | === renamed file 'app/ui/ActionButton.qml' => 'app/components/ActionButton.qml' |
27 | === renamed file 'app/ui/BlurredBackground.qml' => 'app/components/BlurredBackground.qml' |
28 | === added file 'app/components/CMakeLists.txt' |
29 | --- app/components/CMakeLists.txt 1970-01-01 00:00:00 +0000 |
30 | +++ app/components/CMakeLists.txt 2015-04-28 12:09:14 +0000 |
31 | @@ -0,0 +1,7 @@ |
32 | +file(GLOB COMPONENTS_FILES *.qml) |
33 | + |
34 | +# Make the files visible in the qtcreator tree |
35 | +add_custom_target(podbird_components_QMlFiles ALL SOURCES ${COMPONENTS_FILES}) |
36 | + |
37 | +install(FILES ${COMPONENTS_FILES} DESTINATION ${PODBIRD_DIR}/components) |
38 | + |
39 | |
40 | === renamed file 'app/ui/Card.qml' => 'app/components/Card.qml' |
41 | === renamed file 'app/ui/CardView.qml' => 'app/components/CardView.qml' |
42 | === renamed file 'app/ui/ColumnFlow.qml' => 'app/components/ColumnFlow.qml' |
43 | === renamed file 'app/ui/CustomProgressBar.qml' => 'app/components/CustomProgressBar.qml' |
44 | === renamed file 'app/ui/CustomScrollBar.qml' => 'app/components/CustomScrollBar.qml' |
45 | === renamed file 'app/ui/EmptyState.qml' => 'app/components/EmptyState.qml' |
46 | === renamed file 'app/ui/Walkthrough.qml' => 'app/components/Walkthrough.qml' |
47 | === modified file 'app/podbird.qml' |
48 | --- app/podbird.qml 2015-04-22 13:45:10 +0000 |
49 | +++ app/podbird.qml 2015-04-28 12:09:14 +0000 |
50 | @@ -162,7 +162,7 @@ |
51 | id: podcastsMetric |
52 | name: "podcast-metrics" |
53 | // TRANSLATORS: this refers to a number of songs greater than one. The actual number will be prepended to the string automatically (plural forms are not yet fully supported in usermetrics, the library that displays that string) |
54 | - format: "<b>%1</b> " + i18n.tr("podcasts listened to today") |
55 | + format: i18n.tr("Podcasts listened to today: <b>%1</b>") |
56 | emptyFormat: i18n.tr("No podcasts listened to today") |
57 | domain: "com.mikeasoft.podbird" |
58 | } |
59 | |
60 | === modified file 'app/settings/About.qml' |
61 | --- app/settings/About.qml 2015-04-22 16:28:09 +0000 |
62 | +++ app/settings/About.qml 2015-04-28 12:09:14 +0000 |
63 | @@ -49,6 +49,7 @@ |
64 | Label { |
65 | width: parent.width |
66 | horizontalAlignment: Text.AlignHCenter |
67 | + // TRANSLATORS: Podbird version number e.g Version 0.6 |
68 | text: i18n.tr("Version %1").arg("0.6") |
69 | } |
70 | } |
71 | |
72 | === modified file 'app/settings/Credits.qml' |
73 | --- app/settings/Credits.qml 2015-04-11 23:43:00 +0000 |
74 | +++ app/settings/Credits.qml 2015-04-28 12:09:14 +0000 |
75 | @@ -35,7 +35,8 @@ |
76 | |
77 | ListItem.Standard { |
78 | showDivider: false |
79 | - text: "Michael Sheldon (Creator)" |
80 | + // TRANSLATORS: The first argument is the name of creator of Podbird (Michael Sheldon) |
81 | + text: i18n.tr("%1 (Creator)").arg("Michael Sheldon") |
82 | } |
83 | |
84 | ListItem.Standard { |
85 | |
86 | === modified file 'app/settings/ThemeSetting.qml' |
87 | --- app/settings/ThemeSetting.qml 2015-04-22 10:15:34 +0000 |
88 | +++ app/settings/ThemeSetting.qml 2015-04-28 12:09:14 +0000 |
89 | @@ -30,7 +30,9 @@ |
90 | id: themeModel |
91 | Component.onCompleted: initialize() |
92 | function initialize() { |
93 | + // TRANSLATORS: Light Theme |
94 | themeModel.append({ name: i18n.tr("Light"), file: "Light.qml" }) |
95 | + // TRANSLATORS: Dark Theme |
96 | themeModel.append({ name: i18n.tr("Dark"), file: "Dark.qml" }) |
97 | } |
98 | } |
99 | |
100 | === modified file 'app/ui/EpisodesPage.qml' |
101 | --- app/ui/EpisodesPage.qml 2015-04-22 15:21:17 +0000 |
102 | +++ app/ui/EpisodesPage.qml 2015-04-28 12:09:14 +0000 |
103 | @@ -25,6 +25,7 @@ |
104 | import Ubuntu.Components.Popups 1.0 |
105 | import Ubuntu.Components.ListItems 1.0 as ListItem |
106 | import "../podcasts.js" as Podcasts |
107 | +import "../components" |
108 | |
109 | Page { |
110 | id: episodesPage |
111 | |
112 | === modified file 'app/ui/NowPlayingPage.qml' |
113 | --- app/ui/NowPlayingPage.qml 2015-04-22 10:15:34 +0000 |
114 | +++ app/ui/NowPlayingPage.qml 2015-04-28 12:09:14 +0000 |
115 | @@ -20,6 +20,7 @@ |
116 | import QtMultimedia 5.0 |
117 | import Ubuntu.Components 1.1 |
118 | import "../podcasts.js" as Podcasts |
119 | +import "../components" |
120 | |
121 | Page { |
122 | id: nowPlayingPage |
123 | @@ -147,7 +148,9 @@ |
124 | anchors.centerIn: parent |
125 | |
126 | Label { |
127 | - text: i18n.tr("-15s") |
128 | + // TRANSLATORS: The string shown in the UI is -15s to denote the number of seconds that the podcast playback will skip backward. |
129 | + // xgettext: no-c-format |
130 | + text: i18n.tr("-%1s").arg("15") |
131 | fontSize: "xx-small" |
132 | color: podbird.appTheme.baseText |
133 | anchors.verticalCenter: skipBackwardIcon.verticalCenter |
134 | @@ -206,7 +209,9 @@ |
135 | } |
136 | |
137 | Label { |
138 | - text: i18n.tr("+15s") |
139 | + // TRANSLATORS: The string shown in the UI is +15s to denote the number of seconds that the podcast playback will skip forward. |
140 | + // xgettext: no-c-format |
141 | + text: i18n.tr("+%1s").arg("15") |
142 | fontSize: "xx-small" |
143 | color: podbird.appTheme.baseText |
144 | anchors.verticalCenter: skipForwardIcon.verticalCenter |
145 | |
146 | === modified file 'app/ui/PodcastsTab.qml' |
147 | --- app/ui/PodcastsTab.qml 2015-04-22 10:15:34 +0000 |
148 | +++ app/ui/PodcastsTab.qml 2015-04-28 12:09:14 +0000 |
149 | @@ -25,6 +25,7 @@ |
150 | import Ubuntu.Components.ListItems 1.0 as ListItem |
151 | import Ubuntu.Components.Popups 1.0 |
152 | import "../podcasts.js" as Podcasts |
153 | +import "../components" |
154 | |
155 | Tab { |
156 | id: tab |
157 | |
158 | === modified file 'app/ui/SearchPage.qml' |
159 | --- app/ui/SearchPage.qml 2015-04-22 10:15:34 +0000 |
160 | +++ app/ui/SearchPage.qml 2015-04-28 12:09:14 +0000 |
161 | @@ -23,6 +23,7 @@ |
162 | import Ubuntu.Components.Popups 1.0 |
163 | import Ubuntu.Components.ListItems 1.0 as ListItem |
164 | import "../podcasts.js" as Podcasts |
165 | +import "../components" |
166 | |
167 | Page { |
168 | id: searchPage |
169 | @@ -53,7 +54,7 @@ |
170 | actions: [ |
171 | Action { |
172 | iconName: "search" |
173 | - text: i18n.tr("Search Episode") |
174 | + text: i18n.tr("Search Podcast") |
175 | onTriggered: { |
176 | searchPage.state = "search" |
177 | searchField.forceActiveFocus() |
178 | @@ -87,7 +88,7 @@ |
179 | contents: TextField { |
180 | id: searchField |
181 | inputMethodHints: Qt.ImhNoPredictiveText |
182 | - placeholderText: i18n.tr("Search...") |
183 | + placeholderText: i18n.tr("Search Podcast") |
184 | anchors.left: parent ? parent.left : undefined |
185 | anchors.right: parent ? parent.right : undefined |
186 | anchors.rightMargin: units.gu(2) |
187 | @@ -295,6 +296,8 @@ |
188 | Label { |
189 | id: desc |
190 | clip: true |
191 | + // TRANSLATORS: The first argument here is the date of when the podcast was last updated followed by |
192 | + // the podcast description. |
193 | text: i18n.tr("Last Updated: %1\n%2").arg(model.releaseDate.split("T")[0]).arg(model.description) |
194 | height: listItem.expanded ? contentHeight : 0 |
195 | wrapMode: Text.WordWrap |
196 | |
197 | === modified file 'app/ui/SettingsPage.qml' |
198 | --- app/ui/SettingsPage.qml 2015-04-22 10:15:34 +0000 |
199 | +++ app/ui/SettingsPage.qml 2015-04-28 12:09:14 +0000 |
200 | @@ -115,12 +115,15 @@ |
201 | } |
202 | |
203 | ListItem.Header { |
204 | + // TRANSLATORS: Shortened form of "Miscellaneous" which is shown to denote other setting options |
205 | + // that doesn't fit into any other category. |
206 | text: i18n.tr("Misc.") |
207 | } |
208 | |
209 | ListItem.Standard { |
210 | progression: true |
211 | showDivider: false |
212 | + // TRANSLATORS: About as in information about the app |
213 | text: i18n.tr("About") |
214 | onClicked: mainStack.push(Qt.resolvedUrl("../settings/About.qml")) |
215 | } |
216 | @@ -128,6 +131,7 @@ |
217 | ListItem.Standard { |
218 | progression: true |
219 | showDivider: false |
220 | + // TRANSTORS: Credits as in the code and design contributors to the app |
221 | text: i18n.tr("Credits") |
222 | onClicked: mainStack.push(Qt.resolvedUrl("../settings/Credits.qml")) |
223 | } |
224 | |
225 | === modified file 'app/ui/WhatsNewTab.qml' |
226 | --- app/ui/WhatsNewTab.qml 2015-04-22 10:15:34 +0000 |
227 | +++ app/ui/WhatsNewTab.qml 2015-04-28 12:09:14 +0000 |
228 | @@ -7,6 +7,7 @@ |
229 | import Ubuntu.Components.Popups 1.0 |
230 | import Ubuntu.Components.ListItems 1.0 as ListItem |
231 | import "../podcasts.js" as Podcasts |
232 | +import "../components" |
233 | |
234 | Tab { |
235 | id: whatsNewTab |
236 | |
237 | === modified file 'app/welcomewizard/WelcomeWizard.qml' |
238 | --- app/welcomewizard/WelcomeWizard.qml 2015-04-01 00:53:40 +0000 |
239 | +++ app/welcomewizard/WelcomeWizard.qml 2015-04-28 12:09:14 +0000 |
240 | @@ -18,7 +18,7 @@ |
241 | |
242 | import QtQuick 2.3 |
243 | import Ubuntu.Components 1.1 |
244 | -import "../ui" |
245 | +import "../components" |
246 | |
247 | // Initial Walkthrough tutorial |
248 | Walkthrough { |
249 | |
250 | === modified file 'po/com.mikeasoft.podbird.pot' |
251 | --- po/com.mikeasoft.podbird.pot 2015-04-23 10:01:54 +0000 |
252 | +++ po/com.mikeasoft.podbird.pot 2015-04-28 12:09:14 +0000 |
253 | @@ -8,7 +8,7 @@ |
254 | msgstr "" |
255 | "Project-Id-Version: \n" |
256 | "Report-Msgid-Bugs-To: \n" |
257 | -"POT-Creation-Date: 2015-04-23 09:57+0000\n" |
258 | +"POT-Creation-Date: 2015-04-28 12:08+0000\n" |
259 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
260 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
261 | "Language-Team: LANGUAGE <LL@li.org>\n" |
262 | @@ -18,9 +18,14 @@ |
263 | "Content-Transfer-Encoding: 8bit\n" |
264 | "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" |
265 | |
266 | +#: ../app/components/Walkthrough.qml:87 |
267 | +msgid "Skip" |
268 | +msgstr "" |
269 | + |
270 | #. TRANSLATORS: this refers to a number of songs greater than one. The actual number will be prepended to the string automatically (plural forms are not yet fully supported in usermetrics, the library that displays that string) |
271 | #: ../app/podbird.qml:165 |
272 | -msgid "podcasts listened to today" |
273 | +#, qt-format |
274 | +msgid "Podcasts listened to today: <b>%1</b>" |
275 | msgstr "" |
276 | |
277 | #: ../app/podbird.qml:166 |
278 | @@ -50,20 +55,22 @@ |
279 | msgid "%1 min" |
280 | msgstr "" |
281 | |
282 | -#: ../app/settings/About.qml:25 ../app/ui/SettingsPage.qml:124 |
283 | +#. TRANSLATORS: About as in information about the app |
284 | +#: ../app/settings/About.qml:25 ../app/ui/SettingsPage.qml:127 |
285 | msgid "About" |
286 | msgstr "" |
287 | |
288 | -#: ../app/settings/About.qml:52 |
289 | +#. TRANSLATORS: Podbird version number e.g Version 0.6 |
290 | +#: ../app/settings/About.qml:53 |
291 | #, qt-format |
292 | msgid "Version %1" |
293 | msgstr "" |
294 | |
295 | -#: ../app/settings/About.qml:73 |
296 | +#: ../app/settings/About.qml:74 |
297 | msgid "Released under the terms of the GNU GPL v3" |
298 | msgstr "" |
299 | |
300 | -#: ../app/settings/About.qml:83 |
301 | +#: ../app/settings/About.qml:84 |
302 | #, qt-format |
303 | msgid "Source code available on %1" |
304 | msgstr "" |
305 | @@ -98,7 +105,7 @@ |
306 | msgstr[0] "" |
307 | msgstr[1] "" |
308 | |
309 | -#: ../app/settings/Credits.qml:26 ../app/ui/SettingsPage.qml:131 |
310 | +#: ../app/settings/Credits.qml:26 ../app/ui/SettingsPage.qml:135 |
311 | msgid "Credits" |
312 | msgstr "" |
313 | |
314 | @@ -106,11 +113,17 @@ |
315 | msgid "Developers" |
316 | msgstr "" |
317 | |
318 | -#: ../app/settings/Credits.qml:47 |
319 | +#. TRANSLATORS: The first argument is the name of creator of Podbird (Michael Sheldon) |
320 | +#: ../app/settings/Credits.qml:39 |
321 | +#, qt-format |
322 | +msgid "%1 (Creator)" |
323 | +msgstr "" |
324 | + |
325 | +#: ../app/settings/Credits.qml:48 |
326 | msgid "Designer" |
327 | msgstr "" |
328 | |
329 | -#: ../app/settings/Credits.qml:56 |
330 | +#: ../app/settings/Credits.qml:57 |
331 | msgid "Translators" |
332 | msgstr "" |
333 | |
334 | @@ -121,7 +134,7 @@ |
335 | #: ../app/settings/DownloadSetting.qml:34 |
336 | #: ../app/settings/DownloadSetting.qml:35 |
337 | #: ../app/settings/DownloadSetting.qml:36 |
338 | -#: ../app/settings/DownloadSetting.qml:37 ../app/ui/EpisodesPage.qml:428 |
339 | +#: ../app/settings/DownloadSetting.qml:37 ../app/ui/EpisodesPage.qml:429 |
340 | #, qt-format |
341 | msgid "%1 episode" |
342 | msgid_plural "%1 episodes" |
343 | @@ -132,209 +145,213 @@ |
344 | msgid "Theme" |
345 | msgstr "" |
346 | |
347 | -#: ../app/settings/ThemeSetting.qml:33 ../app/ui/SettingsPage.qml:50 |
348 | +#. TRANSLATORS: Light Theme |
349 | +#: ../app/settings/ThemeSetting.qml:34 ../app/ui/SettingsPage.qml:50 |
350 | msgid "Light" |
351 | msgstr "" |
352 | |
353 | -#: ../app/settings/ThemeSetting.qml:34 ../app/ui/SettingsPage.qml:50 |
354 | +#. TRANSLATORS: Dark Theme |
355 | +#: ../app/settings/ThemeSetting.qml:36 ../app/ui/SettingsPage.qml:50 |
356 | msgid "Dark" |
357 | msgstr "" |
358 | |
359 | -#: ../app/ui/EpisodesPage.qml:33 |
360 | +#: ../app/ui/EpisodesPage.qml:34 |
361 | msgid "Podcast" |
362 | msgstr "" |
363 | |
364 | -#: ../app/ui/EpisodesPage.qml:89 ../app/ui/SearchPage.qml:56 |
365 | -#: ../app/ui/WhatsNewTab.qml:32 |
366 | +#: ../app/ui/EpisodesPage.qml:90 ../app/ui/WhatsNewTab.qml:33 |
367 | msgid "Search Episode" |
368 | msgstr "" |
369 | |
370 | -#: ../app/ui/EpisodesPage.qml:98 ../app/ui/WhatsNewTab.qml:41 |
371 | +#: ../app/ui/EpisodesPage.qml:99 ../app/ui/WhatsNewTab.qml:42 |
372 | msgid "Mark all listened" |
373 | msgstr "" |
374 | |
375 | -#: ../app/ui/EpisodesPage.qml:109 ../app/ui/EpisodesPage.qml:187 |
376 | -#: ../app/ui/SearchPage.qml:267 |
377 | +#: ../app/ui/EpisodesPage.qml:110 ../app/ui/EpisodesPage.qml:188 |
378 | +#: ../app/ui/SearchPage.qml:268 |
379 | msgid "Unsubscribe" |
380 | msgstr "" |
381 | |
382 | -#: ../app/ui/EpisodesPage.qml:124 ../app/ui/PodcastsTab.qml:92 |
383 | -#: ../app/ui/SearchPage.qml:79 ../app/ui/SearchPage.qml:109 |
384 | -#: ../app/ui/WhatsNewTab.qml:77 |
385 | +#: ../app/ui/EpisodesPage.qml:125 ../app/ui/PodcastsTab.qml:93 |
386 | +#: ../app/ui/SearchPage.qml:80 ../app/ui/SearchPage.qml:110 |
387 | +#: ../app/ui/WhatsNewTab.qml:78 |
388 | msgid "Back" |
389 | msgstr "" |
390 | |
391 | -#: ../app/ui/EpisodesPage.qml:136 ../app/ui/WhatsNewTab.qml:88 |
392 | +#: ../app/ui/EpisodesPage.qml:137 ../app/ui/WhatsNewTab.qml:89 |
393 | msgid "Search episode" |
394 | msgstr "" |
395 | |
396 | -#: ../app/ui/EpisodesPage.qml:184 |
397 | +#: ../app/ui/EpisodesPage.qml:185 |
398 | msgid "Unsubscribe Confirmation" |
399 | msgstr "" |
400 | |
401 | -#: ../app/ui/EpisodesPage.qml:185 |
402 | +#: ../app/ui/EpisodesPage.qml:186 |
403 | #, qt-format |
404 | msgid "Are you sure you want to unsubscribe from <b>%1</b>?" |
405 | msgstr "" |
406 | |
407 | -#: ../app/ui/EpisodesPage.qml:204 |
408 | +#: ../app/ui/EpisodesPage.qml:205 |
409 | msgid "Cancel" |
410 | msgstr "" |
411 | |
412 | -#: ../app/ui/EpisodesPage.qml:258 ../app/ui/WhatsNewTab.qml:212 |
413 | +#: ../app/ui/EpisodesPage.qml:259 ../app/ui/WhatsNewTab.qml:213 |
414 | msgid "Delete local file" |
415 | msgstr "" |
416 | |
417 | -#: ../app/ui/EpisodesPage.qml:259 ../app/ui/WhatsNewTab.qml:213 |
418 | +#: ../app/ui/EpisodesPage.qml:260 ../app/ui/WhatsNewTab.qml:214 |
419 | msgid "Episode queued for download" |
420 | msgstr "" |
421 | |
422 | -#: ../app/ui/EpisodesPage.qml:260 ../app/ui/WhatsNewTab.qml:214 |
423 | +#: ../app/ui/EpisodesPage.qml:261 ../app/ui/WhatsNewTab.qml:215 |
424 | msgid "Download episode" |
425 | msgstr "" |
426 | |
427 | -#: ../app/ui/EpisodesPage.qml:309 |
428 | +#: ../app/ui/EpisodesPage.qml:310 |
429 | msgid "Mark episode unlistened" |
430 | msgstr "" |
431 | |
432 | -#: ../app/ui/EpisodesPage.qml:309 ../app/ui/WhatsNewTab.qml:262 |
433 | +#: ../app/ui/EpisodesPage.qml:310 ../app/ui/WhatsNewTab.qml:263 |
434 | msgid "Mark episode listened" |
435 | msgstr "" |
436 | |
437 | -#: ../app/ui/EpisodesPage.qml:335 |
438 | +#: ../app/ui/EpisodesPage.qml:336 |
439 | msgid "No more episodes" |
440 | msgstr "" |
441 | |
442 | -#: ../app/ui/EpisodesPage.qml:335 |
443 | +#: ../app/ui/EpisodesPage.qml:336 |
444 | msgid "No episodes found" |
445 | msgstr "" |
446 | |
447 | -#: ../app/ui/EpisodesPage.qml:336 |
448 | +#: ../app/ui/EpisodesPage.qml:337 |
449 | msgid "All episodes have been listened to." |
450 | msgstr "" |
451 | |
452 | -#: ../app/ui/EpisodesPage.qml:336 |
453 | +#: ../app/ui/EpisodesPage.qml:337 |
454 | msgid "No episodes found matching the search term." |
455 | msgstr "" |
456 | |
457 | -#: ../app/ui/EpisodesPage.qml:381 |
458 | +#: ../app/ui/EpisodesPage.qml:382 |
459 | msgid "Unheard" |
460 | msgstr "" |
461 | |
462 | -#: ../app/ui/EpisodesPage.qml:381 |
463 | +#: ../app/ui/EpisodesPage.qml:382 |
464 | msgid "Listened" |
465 | msgstr "" |
466 | |
467 | -#: ../app/ui/NowPlayingPage.qml:28 |
468 | +#: ../app/ui/NowPlayingPage.qml:29 |
469 | msgid "Now Playing" |
470 | msgstr "" |
471 | |
472 | -#: ../app/ui/NowPlayingPage.qml:150 |
473 | -msgid "-15s" |
474 | -msgstr "" |
475 | - |
476 | -#: ../app/ui/NowPlayingPage.qml:209 |
477 | -msgid "+15s" |
478 | -msgstr "" |
479 | - |
480 | -#: ../app/ui/PodcastsTab.qml:32 |
481 | +#. TRANSLATORS: The string shown in the UI is -15s to denote the number of seconds that the podcast playback will skip backward. |
482 | +#: ../app/ui/NowPlayingPage.qml:153 |
483 | +#, no-c-format, qt-format |
484 | +msgid "-%1s" |
485 | +msgstr "" |
486 | + |
487 | +#. TRANSLATORS: The string shown in the UI is +15s to denote the number of seconds that the podcast playback will skip forward. |
488 | +#: ../app/ui/NowPlayingPage.qml:214 |
489 | +#, no-c-format, qt-format |
490 | +msgid "+%1s" |
491 | +msgstr "" |
492 | + |
493 | +#: ../app/ui/PodcastsTab.qml:33 |
494 | msgid "Podcasts" |
495 | msgstr "" |
496 | |
497 | -#: ../app/ui/PodcastsTab.qml:70 |
498 | +#: ../app/ui/PodcastsTab.qml:71 ../app/ui/SearchPage.qml:57 |
499 | +#: ../app/ui/SearchPage.qml:91 |
500 | msgid "Search Podcast" |
501 | msgstr "" |
502 | |
503 | -#: ../app/ui/PodcastsTab.qml:79 |
504 | +#: ../app/ui/PodcastsTab.qml:80 |
505 | msgid "Grid View" |
506 | msgstr "" |
507 | |
508 | -#: ../app/ui/PodcastsTab.qml:79 |
509 | +#: ../app/ui/PodcastsTab.qml:80 |
510 | msgid "List View" |
511 | msgstr "" |
512 | |
513 | -#: ../app/ui/PodcastsTab.qml:103 |
514 | +#: ../app/ui/PodcastsTab.qml:104 |
515 | msgid "Search podcast" |
516 | msgstr "" |
517 | |
518 | -#: ../app/ui/PodcastsTab.qml:125 |
519 | +#: ../app/ui/PodcastsTab.qml:126 |
520 | msgid "No Podcast Subscriptions" |
521 | msgstr "" |
522 | |
523 | -#: ../app/ui/PodcastsTab.qml:126 |
524 | +#: ../app/ui/PodcastsTab.qml:127 |
525 | msgid "No Podcasts Found" |
526 | msgstr "" |
527 | |
528 | -#: ../app/ui/PodcastsTab.qml:127 |
529 | +#: ../app/ui/PodcastsTab.qml:128 |
530 | msgid "" |
531 | "You haven't subscribed to any podcasts yet, visit the 'Find New Podcasts' " |
532 | "page to add some." |
533 | msgstr "" |
534 | |
535 | -#: ../app/ui/PodcastsTab.qml:128 ../app/ui/SearchPage.qml:166 |
536 | +#: ../app/ui/PodcastsTab.qml:129 ../app/ui/SearchPage.qml:167 |
537 | msgid "No podcasts found matching the search term." |
538 | msgstr "" |
539 | |
540 | -#: ../app/ui/PodcastsTab.qml:159 ../app/ui/PodcastsTab.qml:280 |
541 | +#: ../app/ui/PodcastsTab.qml:160 ../app/ui/PodcastsTab.qml:281 |
542 | #, qt-format |
543 | msgid "%1 unheard episode" |
544 | msgid_plural "%1 unheard episodes" |
545 | msgstr[0] "" |
546 | msgstr[1] "" |
547 | |
548 | -#: ../app/ui/SearchPage.qml:64 |
549 | +#: ../app/ui/SearchPage.qml:65 |
550 | msgid "Add Podcast" |
551 | msgstr "" |
552 | |
553 | -#: ../app/ui/SearchPage.qml:90 |
554 | -msgid "Search..." |
555 | -msgstr "" |
556 | - |
557 | -#: ../app/ui/SearchPage.qml:120 |
558 | +#: ../app/ui/SearchPage.qml:121 |
559 | msgid "Save Podcast" |
560 | msgstr "" |
561 | |
562 | -#: ../app/ui/SearchPage.qml:131 |
563 | +#: ../app/ui/SearchPage.qml:132 |
564 | msgid "Feed URL" |
565 | msgstr "" |
566 | |
567 | -#: ../app/ui/SearchPage.qml:146 |
568 | +#: ../app/ui/SearchPage.qml:147 |
569 | msgid "Unable to subscribe" |
570 | msgstr "" |
571 | |
572 | -#: ../app/ui/SearchPage.qml:147 |
573 | +#: ../app/ui/SearchPage.qml:148 |
574 | msgid "Please check the URL and try again" |
575 | msgstr "" |
576 | |
577 | -#: ../app/ui/SearchPage.qml:149 |
578 | +#: ../app/ui/SearchPage.qml:150 |
579 | msgid "Close" |
580 | msgstr "" |
581 | |
582 | -#: ../app/ui/SearchPage.qml:165 |
583 | +#: ../app/ui/SearchPage.qml:166 |
584 | msgid "Looking to add a new Podcast?" |
585 | msgstr "" |
586 | |
587 | -#: ../app/ui/SearchPage.qml:165 |
588 | +#: ../app/ui/SearchPage.qml:166 |
589 | msgid "No Podcasts found" |
590 | msgstr "" |
591 | |
592 | -#: ../app/ui/SearchPage.qml:166 |
593 | +#: ../app/ui/SearchPage.qml:167 |
594 | msgid "" |
595 | "Click the 'magnifier' at the top to search or the 'plus' button to add by URL" |
596 | msgstr "" |
597 | |
598 | -#: ../app/ui/SearchPage.qml:267 |
599 | +#: ../app/ui/SearchPage.qml:268 |
600 | msgid "Subscribe" |
601 | msgstr "" |
602 | |
603 | -#: ../app/ui/SearchPage.qml:298 |
604 | +#. TRANSLATORS: The first argument here is the date of when the podcast was last updated followed by |
605 | +#. the podcast description. |
606 | +#: ../app/ui/SearchPage.qml:301 |
607 | #, qt-format |
608 | msgid "" |
609 | "Last Updated: %1\n" |
610 | "%2" |
611 | msgstr "" |
612 | |
613 | -#: ../app/ui/SearchPage.qml:353 |
614 | +#: ../app/ui/SearchPage.qml:356 |
615 | msgid "Not Available" |
616 | msgstr "" |
617 | |
618 | @@ -367,59 +384,57 @@ |
619 | msgid "Default number of new episodes to download for each podcast" |
620 | msgstr "" |
621 | |
622 | -#: ../app/ui/SettingsPage.qml:118 |
623 | +#. TRANSLATORS: Shortened form of "Miscellaneous" which is shown to denote other setting options |
624 | +#. that doesn't fit into any other category. |
625 | +#: ../app/ui/SettingsPage.qml:120 |
626 | msgid "Misc." |
627 | msgstr "" |
628 | |
629 | -#: ../app/ui/SettingsPage.qml:138 |
630 | +#: ../app/ui/SettingsPage.qml:142 |
631 | msgid "Report Bug" |
632 | msgstr "" |
633 | |
634 | -#: ../app/ui/Walkthrough.qml:87 |
635 | -msgid "Skip" |
636 | -msgstr "" |
637 | - |
638 | -#: ../app/ui/WhatsNewTab.qml:14 |
639 | +#: ../app/ui/WhatsNewTab.qml:15 |
640 | msgid "What's New" |
641 | msgstr "" |
642 | |
643 | -#: ../app/ui/WhatsNewTab.qml:55 |
644 | +#: ../app/ui/WhatsNewTab.qml:56 |
645 | msgid "Download all" |
646 | msgstr "" |
647 | |
648 | -#: ../app/ui/WhatsNewTab.qml:104 |
649 | +#: ../app/ui/WhatsNewTab.qml:105 |
650 | msgid "No New Episodes" |
651 | msgstr "" |
652 | |
653 | -#: ../app/ui/WhatsNewTab.qml:105 |
654 | +#: ../app/ui/WhatsNewTab.qml:106 |
655 | msgid "No Episodes Found" |
656 | msgstr "" |
657 | |
658 | -#: ../app/ui/WhatsNewTab.qml:106 |
659 | +#: ../app/ui/WhatsNewTab.qml:107 |
660 | msgid "No more episodes to listen to!" |
661 | msgstr "" |
662 | |
663 | -#: ../app/ui/WhatsNewTab.qml:107 |
664 | +#: ../app/ui/WhatsNewTab.qml:108 |
665 | msgid "No Episodes found matching the search term." |
666 | msgstr "" |
667 | |
668 | -#: ../app/ui/WhatsNewTab.qml:302 |
669 | +#: ../app/ui/WhatsNewTab.qml:303 |
670 | msgid "Pause Episode" |
671 | msgstr "" |
672 | |
673 | -#: ../app/ui/WhatsNewTab.qml:303 |
674 | +#: ../app/ui/WhatsNewTab.qml:304 |
675 | msgid "Play Episode" |
676 | msgstr "" |
677 | |
678 | -#: ../app/ui/WhatsNewTab.qml:368 |
679 | +#: ../app/ui/WhatsNewTab.qml:369 |
680 | msgid "Today" |
681 | msgstr "" |
682 | |
683 | -#: ../app/ui/WhatsNewTab.qml:372 |
684 | +#: ../app/ui/WhatsNewTab.qml:373 |
685 | msgid "Yesterday" |
686 | msgstr "" |
687 | |
688 | -#: ../app/ui/WhatsNewTab.qml:376 |
689 | +#: ../app/ui/WhatsNewTab.qml:377 |
690 | msgid "Older" |
691 | msgstr "" |
692 | |
693 | @@ -496,3 +511,7 @@ |
694 | #: ../app/welcomewizard/Slide6.qml:76 |
695 | msgid "Finish" |
696 | msgstr "" |
697 | + |
698 | +#: /home/krnekhelesh/Documents/Ubuntu-Projects/MP-Reviews/builddir/build-10-rearrange-project-structure-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_15_04_vivid-Default/po/Podbird.desktop.in.h:1 |
699 | +msgid "The chirpiest podcast manager for Ubuntu" |
700 | +msgstr "" |
Looks good :)