Merge lp:~nik90/podbird/fix-podbird-1518076 into lp:podbird/devel

Proposed by Nekhelesh Ramananthan
Status: Merged
Merged at revision: 135
Proposed branch: lp:~nik90/podbird/fix-podbird-1518076
Merge into: lp:podbird/devel
Diff against target: 103 lines (+19/-13)
2 files modified
app/ui/SettingsPage.qml (+2/-2)
po/podbird.nik90.pot (+17/-11)
To merge this branch: bzr merge lp:~nik90/podbird/fix-podbird-1518076
Reviewer Review Type Date Requested Status
Podbird Developers Pending
Review via email: mp+289306@code.launchpad.net

Description of the change

Adds plural forms for %1 seconds in settings page.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/ui/SettingsPage.qml'
2--- app/ui/SettingsPage.qml 2016-03-05 16:25:11 +0000
3+++ app/ui/SettingsPage.qml 2016-03-16 22:09:21 +0000
4@@ -67,7 +67,7 @@
5 minimumValue: 0
6 maximumValue: 60
7 value: podbird.settings.skipForward
8- function formatValue(v) { return i18n.tr("%1 seconds").arg(Math.round(v)) }
9+ function formatValue(v) { return i18n.tr("%1 second", "%1 seconds", Math.round(v)).arg(Math.round(v)) }
10 StyleHints { foregroundColor: podbird.appTheme.focusText }
11 }
12
13@@ -102,7 +102,7 @@
14 minimumValue: 0
15 maximumValue: 60
16 value: podbird.settings.skipBack
17- function formatValue(v) { return i18n.tr("%1 seconds").arg(Math.round(v)) }
18+ function formatValue(v) { return i18n.tr("%1 second", "%1 seconds", Math.round(v)).arg(Math.round(v)) }
19 StyleHints { foregroundColor: podbird.appTheme.focusText }
20 }
21
22
23=== modified file 'po/podbird.nik90.pot'
24--- po/podbird.nik90.pot 2016-03-16 15:30:47 +0000
25+++ po/podbird.nik90.pot 2016-03-16 22:09:21 +0000
26@@ -8,7 +8,7 @@
27 msgstr ""
28 "Project-Id-Version: \n"
29 "Report-Msgid-Bugs-To: \n"
30-"POT-Creation-Date: 2016-03-16 20:58+0530\n"
31+"POT-Creation-Date: 2016-03-17 03:34+0530\n"
32 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
33 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
34 "Language-Team: LANGUAGE <LL@li.org>\n"
35@@ -286,23 +286,23 @@
36 msgid "No Episodes found matching the search term."
37 msgstr ""
38
39-#: ../app/ui/EpisodesTab.qml:457
40+#: ../app/ui/EpisodesTab.qml:456
41 msgid "Downloads in progress"
42 msgstr ""
43
44-#: ../app/ui/EpisodesTab.qml:497
45+#: ../app/ui/EpisodesTab.qml:496
46 msgid "Downloaded episodes"
47 msgstr ""
48
49-#: ../app/ui/EpisodesTab.qml:507
50+#: ../app/ui/EpisodesTab.qml:506
51 msgid "Today"
52 msgstr ""
53
54-#: ../app/ui/EpisodesTab.qml:511
55+#: ../app/ui/EpisodesTab.qml:510
56 msgid "Yesterday"
57 msgstr ""
58
59-#: ../app/ui/EpisodesTab.qml:515
60+#: ../app/ui/EpisodesTab.qml:514
61 msgid "Older"
62 msgstr ""
63
64@@ -425,10 +425,11 @@
65 msgstr ""
66
67 #: ../app/ui/SettingsPage.qml:70 ../app/ui/SettingsPage.qml:105
68-#: ../app/ui/SettingsPage.qml:170 ../app/ui/SettingsPage.qml:177
69 #, qt-format
70-msgid "%1 seconds"
71-msgstr ""
72+msgid "%1 second"
73+msgid_plural "%1 seconds"
74+msgstr[0] ""
75+msgstr[1] ""
76
77 #: ../app/ui/SettingsPage.qml:75 ../app/ui/SettingsPage.qml:110
78 msgid "Ok"
79@@ -454,6 +455,11 @@
80 msgid "Playback Settings"
81 msgstr ""
82
83+#: ../app/ui/SettingsPage.qml:170 ../app/ui/SettingsPage.qml:177
84+#, qt-format
85+msgid "%1 seconds"
86+msgstr ""
87+
88 #: ../app/ui/SettingsPage.qml:182
89 msgid "Podcast Episode Settings"
90 msgstr ""
91@@ -559,10 +565,10 @@
92 msgid "Finish"
93 msgstr ""
94
95-#: /home/krnekhelesh/Development/add-batch-actions-build/po/Podbird.desktop.in.h:1
96+#: /home/krnekhelesh/Development/fix-podbird-1518076-build/po/Podbird.desktop.in.h:1
97 msgid "The chirpiest podcast manager for Ubuntu"
98 msgstr ""
99
100-#: /home/krnekhelesh/Development/add-batch-actions-build/po/Podbird.desktop.in.h:2
101+#: /home/krnekhelesh/Development/fix-podbird-1518076-build/po/Podbird.desktop.in.h:2
102 msgid "podcast;audio;itunes;broadcast;digital;stream;podcatcher;video;vodcast;"
103 msgstr ""

Subscribers

People subscribed via source and target branches