Merge lp:~michihenning/unity-scope-mediascanner/bug-1351696 into lp:unity-scope-mediascanner

[Michi Henning]

Fixed ambiguous string: "%s Features" -> "Featured on %s".

Fixed ambiguous string: "%s Features" -> "Featured on %s".

[lp:~michihenning/unity-scope-mediascanner/bug-1351696]

281. By Michi Henning on 2016-01-19

Merged trunk.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:280
http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-ci/193/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-vivid-amd64-ci/27/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-vivid-armhf-ci/27
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-vivid-i386-ci/27/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-wily-amd64-ci/20/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-wily-armhf-ci/20
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-wily-i386-ci/20/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-mediascanner-ci/193/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:281
http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-ci/194/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-vivid-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-vivid-armhf-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-vivid-i386-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-wily-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-wily-armhf-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-wily-i386-ci/21

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-mediascanner-ci/194/rebuild

review: Approve (continuous-integration)

[James Henstridge (jamesh)]

Looks good.

review: Approve

=== modified file 'po/unity-scope-mediascanner.pot'
--- po/unity-scope-mediascanner.pot	2016-01-13 16:37:58 +0000
+++ po/unity-scope-mediascanner.pot	2016-01-19 16:35:44 +0000
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Canonical Ltd.
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the unity-scope-mediascanner package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: unity-scope-mediascanner\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 16:37+0000\n"
+"POT-Creation-Date: 2016-01-20 02:34+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,40 +17,80 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/mymusic/music-scope.cpp:291 ../src/mymusic/music-scope.cpp:300
-#: tmp/mediascanner-music.ini.in.h:1
-msgid "My Music"
-msgstr ""
-
-#: ../src/mymusic/music-scope.cpp:316 ../src/myvideos/video-scope.cpp:191
+#. TRANSLATORS: Featured on YouTube, Featured on Grooveshark, etc.
+#: ../src/videoaggregator/videoaggregatorquery.cpp:137
+#: ../src/musicaggregator/musicaggregatorquery.cpp:308
+#, c-format
+msgid "Featured on %s"
+msgstr ""
+
+#: ../src/videoaggregator/videoaggregatorquery.cpp:139
+#: ../src/musicaggregator/musicaggregatorquery.cpp:310
+#, c-format
+msgid "Results from %s"
+msgstr ""
+
+#: ../src/myvideos/video-scope.cpp:191 ../src/mymusic/music-scope.cpp:318
 msgid "Get started!"
 msgstr ""
 
-#: ../src/mymusic/music-scope.cpp:317 ../src/myvideos/video-scope.cpp:192
+#: ../src/myvideos/video-scope.cpp:192 ../src/mymusic/music-scope.cpp:319
 msgid ""
 "Drag and drop items from another devices. Alternatively, load your files "
 "onto a SD card."
 msgstr ""
 
-#: ../src/mymusic/music-scope.cpp:378 ../src/mymusic/music-scope.cpp:441
+#: ../src/myvideos/video-scope.cpp:201
+msgid ""
+"Nothing here yet...\n"
+"Make a video!"
+msgstr ""
+
+#: ../src/myvideos/video-scope.cpp:208
+msgid "Everything"
+msgstr ""
+
+#: ../src/myvideos/video-scope.cpp:210
+msgid "My Roll"
+msgstr ""
+
+#: ../src/myvideos/video-scope.cpp:211
+msgid "Downloaded"
+msgstr ""
+
+#: ../src/myvideos/video-scope.cpp:227 ../src/myvideos/video-scope.cpp:232
+#: tmp/mediascanner-video.ini.in.h:1
+msgid "My Videos"
+msgstr ""
+
+#: ../src/myvideos/video-scope.cpp:331
+msgid "Play"
+msgstr ""
+
+#: ../src/mymusic/music-scope.cpp:293 ../src/mymusic/music-scope.cpp:302
+#: tmp/mediascanner-music.ini.in.h:1
+msgid "My Music"
+msgstr ""
+
+#: ../src/mymusic/music-scope.cpp:380 ../src/mymusic/music-scope.cpp:443
 msgid "Artists"
 msgstr ""
 
-#: ../src/mymusic/music-scope.cpp:379 ../src/mymusic/music-scope.cpp:655
-#: ../src/mymusic/music-scope.cpp:703
+#: ../src/mymusic/music-scope.cpp:381 ../src/mymusic/music-scope.cpp:657
+#: ../src/mymusic/music-scope.cpp:705
 msgid "Albums"
 msgstr ""
 
-#: ../src/mymusic/music-scope.cpp:380 ../src/mymusic/music-scope.cpp:490
-#: ../src/mymusic/music-scope.cpp:527
+#: ../src/mymusic/music-scope.cpp:382 ../src/mymusic/music-scope.cpp:492
+#: ../src/mymusic/music-scope.cpp:529
 msgid "Tracks"
 msgstr ""
 
-#: ../src/mymusic/music-scope.cpp:381
+#: ../src/mymusic/music-scope.cpp:383
 msgid "Genres"
 msgstr ""
 
-#: ../src/mymusic/music-scope.cpp:780 ../src/mymusic/music-scope.cpp:812
+#: ../src/mymusic/music-scope.cpp:784 ../src/mymusic/music-scope.cpp:818
 msgid "Play in music app"
 msgstr ""
 
@@ -86,45 +126,6 @@
 msgid "Youtube"
 msgstr ""
 
-#: ../src/musicaggregator/musicaggregatorquery.cpp:307
-#: ../src/videoaggregator/videoaggregatorquery.cpp:136
-#, c-format
-msgid "%s Features"
-msgstr ""
-
-#: ../src/musicaggregator/musicaggregatorquery.cpp:309
-#: ../src/videoaggregator/videoaggregatorquery.cpp:138
-#, c-format
-msgid "Results from %s"
-msgstr ""
-
-#: ../src/myvideos/video-scope.cpp:201
-msgid ""
-"Nothing here yet...\n"
-"Make a video!"
-msgstr ""
-
-#: ../src/myvideos/video-scope.cpp:208
-msgid "Everything"
-msgstr ""
-
-#: ../src/myvideos/video-scope.cpp:210
-msgid "My Roll"
-msgstr ""
-
-#: ../src/myvideos/video-scope.cpp:211
-msgid "Downloaded"
-msgstr ""
-
-#: ../src/myvideos/video-scope.cpp:227 ../src/myvideos/video-scope.cpp:232
-#: tmp/mediascanner-video.ini.in.h:1
-msgid "My Videos"
-msgstr ""
-
-#: ../src/myvideos/video-scope.cpp:331
-msgid "Play"
-msgstr ""
-
 #: tmp/mediascanner-music.ini.in.h:2
 msgid ""
 "This is an Ubuntu search plugin that scans the device for music and allows "

=== modified file 'src/musicaggregator/musicaggregatorquery.cpp'
--- src/musicaggregator/musicaggregatorquery.cpp	2016-01-13 16:36:09 +0000
+++ src/musicaggregator/musicaggregatorquery.cpp	2016-01-19 16:35:44 +0000
@@ -304,7 +304,8 @@
                         auto const renderer = res.category()->renderer_template();
                         char title[500];
                         if (empty_search) {
-                            snprintf(title, sizeof(title), _("%s Features"), child_name.c_str());
+                            /* TRANSLATORS: Featured on YouTube, Featured on Grooveshark, etc. */
+                            snprintf(title, sizeof(title), _("Featured on %s"), child_name.c_str());
                         } else {
                             snprintf(title, sizeof(title), _("Results from %s"), child_name.c_str());
                         }

=== modified file 'src/videoaggregator/videoaggregatorquery.cpp'
--- src/videoaggregator/videoaggregatorquery.cpp	2015-04-11 10:55:25 +0000
+++ src/videoaggregator/videoaggregatorquery.cpp	2016-01-19 16:35:44 +0000
@@ -133,7 +133,8 @@
                                                         : res.category()->renderer_template();
                             char title[500];
                             if (surfacing) {
-                                snprintf(title, sizeof(title), _("%s Features"), child_name.c_str());
+                                /* TRANSLATORS: Featured on YouTube, Featured on Grooveshark, etc. */
+                                snprintf(title, sizeof(title), _("Featured on %s"), child_name.c_str());
                             } else {
                                 snprintf(title, sizeof(title), _("Results from %s"), child_name.c_str());
                             }