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
=== modified file 'app/ui/SettingsPage.qml'
--- app/ui/SettingsPage.qml 2016-03-05 16:25:11 +0000
+++ app/ui/SettingsPage.qml 2016-03-16 22:09:21 +0000
@@ -67,7 +67,7 @@
67 minimumValue: 067 minimumValue: 0
68 maximumValue: 6068 maximumValue: 60
69 value: podbird.settings.skipForward69 value: podbird.settings.skipForward
70 function formatValue(v) { return i18n.tr("%1 seconds").arg(Math.round(v)) }70 function formatValue(v) { return i18n.tr("%1 second", "%1 seconds", Math.round(v)).arg(Math.round(v)) }
71 StyleHints { foregroundColor: podbird.appTheme.focusText }71 StyleHints { foregroundColor: podbird.appTheme.focusText }
72 }72 }
7373
@@ -102,7 +102,7 @@
102 minimumValue: 0102 minimumValue: 0
103 maximumValue: 60103 maximumValue: 60
104 value: podbird.settings.skipBack104 value: podbird.settings.skipBack
105 function formatValue(v) { return i18n.tr("%1 seconds").arg(Math.round(v)) }105 function formatValue(v) { return i18n.tr("%1 second", "%1 seconds", Math.round(v)).arg(Math.round(v)) }
106 StyleHints { foregroundColor: podbird.appTheme.focusText }106 StyleHints { foregroundColor: podbird.appTheme.focusText }
107 }107 }
108108
109109
=== modified file 'po/podbird.nik90.pot'
--- po/podbird.nik90.pot 2016-03-16 15:30:47 +0000
+++ po/podbird.nik90.pot 2016-03-16 22:09:21 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: \n"9"Project-Id-Version: \n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2016-03-16 20:58+0530\n"11"POT-Creation-Date: 2016-03-17 03:34+0530\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -286,23 +286,23 @@
286msgid "No Episodes found matching the search term."286msgid "No Episodes found matching the search term."
287msgstr ""287msgstr ""
288288
289#: ../app/ui/EpisodesTab.qml:457289#: ../app/ui/EpisodesTab.qml:456
290msgid "Downloads in progress"290msgid "Downloads in progress"
291msgstr ""291msgstr ""
292292
293#: ../app/ui/EpisodesTab.qml:497293#: ../app/ui/EpisodesTab.qml:496
294msgid "Downloaded episodes"294msgid "Downloaded episodes"
295msgstr ""295msgstr ""
296296
297#: ../app/ui/EpisodesTab.qml:507297#: ../app/ui/EpisodesTab.qml:506
298msgid "Today"298msgid "Today"
299msgstr ""299msgstr ""
300300
301#: ../app/ui/EpisodesTab.qml:511301#: ../app/ui/EpisodesTab.qml:510
302msgid "Yesterday"302msgid "Yesterday"
303msgstr ""303msgstr ""
304304
305#: ../app/ui/EpisodesTab.qml:515305#: ../app/ui/EpisodesTab.qml:514
306msgid "Older"306msgid "Older"
307msgstr ""307msgstr ""
308308
@@ -425,10 +425,11 @@
425msgstr ""425msgstr ""
426426
427#: ../app/ui/SettingsPage.qml:70 ../app/ui/SettingsPage.qml:105427#: ../app/ui/SettingsPage.qml:70 ../app/ui/SettingsPage.qml:105
428#: ../app/ui/SettingsPage.qml:170 ../app/ui/SettingsPage.qml:177
429#, qt-format428#, qt-format
430msgid "%1 seconds"429msgid "%1 second"
431msgstr ""430msgid_plural "%1 seconds"
431msgstr[0] ""
432msgstr[1] ""
432433
433#: ../app/ui/SettingsPage.qml:75 ../app/ui/SettingsPage.qml:110434#: ../app/ui/SettingsPage.qml:75 ../app/ui/SettingsPage.qml:110
434msgid "Ok"435msgid "Ok"
@@ -454,6 +455,11 @@
454msgid "Playback Settings"455msgid "Playback Settings"
455msgstr ""456msgstr ""
456457
458#: ../app/ui/SettingsPage.qml:170 ../app/ui/SettingsPage.qml:177
459#, qt-format
460msgid "%1 seconds"
461msgstr ""
462
457#: ../app/ui/SettingsPage.qml:182463#: ../app/ui/SettingsPage.qml:182
458msgid "Podcast Episode Settings"464msgid "Podcast Episode Settings"
459msgstr ""465msgstr ""
@@ -559,10 +565,10 @@
559msgid "Finish"565msgid "Finish"
560msgstr ""566msgstr ""
561567
562#: /home/krnekhelesh/Development/add-batch-actions-build/po/Podbird.desktop.in.h:1568#: /home/krnekhelesh/Development/fix-podbird-1518076-build/po/Podbird.desktop.in.h:1
563msgid "The chirpiest podcast manager for Ubuntu"569msgid "The chirpiest podcast manager for Ubuntu"
564msgstr ""570msgstr ""
565571
566#: /home/krnekhelesh/Development/add-batch-actions-build/po/Podbird.desktop.in.h:2572#: /home/krnekhelesh/Development/fix-podbird-1518076-build/po/Podbird.desktop.in.h:2
567msgid "podcast;audio;itunes;broadcast;digital;stream;podcatcher;video;vodcast;"573msgid "podcast;audio;itunes;broadcast;digital;stream;podcatcher;video;vodcast;"
568msgstr ""574msgstr ""

Subscribers

People subscribed via source and target branches