Merge lp:~nik90/podbird/fix-translation into lp:podbird

[Nekhelesh Ramananthan]

Fixes the translation issue related to "%1m% string by specifying the no-c-format.

After the request by dpm to translate podbird, it seems there was a issue found by one of translators as pointed out at [1]. I had the same exact issue with clock app and fixed it by adding the translator comment //xgettext: no-c-format to fix it.

This should fix the issue in podbird as well.

[1] https://lists.ubuntu.com/archives/ubuntu-translators/2015-March/006817.html

[David Planella (dpm)]

Looks good to me, IIRC we used the same fix for clock. The only thing I'd say is to leave a space between // and xgettext.

review: Approve

[lp:~nik90/podbird/fix-translation]

34. By Nekhelesh Ramananthan on 2015-03-26

Added space between // and xgettext as mentioned by dpm

35. By Nekhelesh Ramananthan on 2015-03-26

Commited the actual file changes

=== modified file 'app/ui/EpisodesPage.qml'
--- app/ui/EpisodesPage.qml	2015-03-01 20:54:58 +0000
+++ app/ui/EpisodesPage.qml	2015-03-26 12:12:23 +0000
@@ -288,18 +288,27 @@
                         var time = Podcasts.getTimeDiff(seconds)
                         var hour = time[0]
                         var minute = time[1]
+                        // TRANSLATORS: the first argument is the number of hours,
+                        // followed by minute (eg. 20h 3m)
                         if(hour > 0 &&  minute > 0) {
+                            // xgettext: no-c-format
                             return (i18n.tr("%1h %2m"))
                             .arg(hour)
                             .arg(minute)
                         }
 
+                        // TRANSLATORS: this string indicates the number of hours
+                        // eg. 20h (no plural state required)
                         else if(hour > 0 && minute === 0) {
+                            // xgettext: no-c-format
                             return (i18n.tr("%1h"))
                             .arg(hour)
                         }
 
+                        // TRANSLATORS: this string indicates the number of minutes
+                        // eg. 15m (no plural state required)
                         else if(hour === 0 && minute > 0) {
+                            // xgettext: no-c-format
                             return (i18n.tr("%1m"))
                             .arg(minute)
                         }

=== modified file 'po/com.mikeasoft.podbird.pot'
--- po/com.mikeasoft.podbird.pot	2015-03-01 21:27:01 +0000
+++ po/com.mikeasoft.podbird.pot	2015-03-26 12:12:23 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-01 21:21+0000\n"
+"POT-Creation-Date: 2015-03-26 13:11+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -64,18 +64,18 @@
 msgid "No episodes found matching the search term."
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:292
-#, qt-format
+#: ../app/ui/EpisodesPage.qml:295
+#, no-c-format, qt-format
 msgid "%1h %2m"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:298
-#, qt-format
+#: ../app/ui/EpisodesPage.qml:304
+#, no-c-format, qt-format
 msgid "%1h"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:303
-#, c-format, qt-format
+#: ../app/ui/EpisodesPage.qml:312
+#, no-c-format, qt-format
 msgid "%1m"
 msgstr ""
 
@@ -164,6 +164,6 @@
 msgid "Subscribe"
 msgstr ""
 
-#: /home/mike/src/build-podbird-Ubuntu_Device3_GCC_armhf_ubuntu_sdk_14_10_utopic-Default/po/Podbird.desktop.in.h:1
+#: /home/krnekhelesh/Documents/Ubuntu-Projects/MP-Reviews/builddir/build-fix-translation-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_14_10_utopic-Default/po/Podbird.desktop.in.h:1
 msgid "Podbird"
 msgstr ""