diff --git a/data/qml/StationView.qml b/data/qml/StationView.qml index ed032e4ab..009f7b6ac 100644 --- a/data/qml/StationView.qml +++ b/data/qml/StationView.qml @@ -48,9 +48,9 @@ Rectangle { ListModel { id: modeModel - ListElement { label: "By Artist"; image: "../../images/station-artist.svg"; creatorContent: "stations/CreateByArtist.qml"; headerSubtitle: "by" } - ListElement { label: "By Genre"; image: "../../images/station-genre.svg"; creatorContent: "stations/CreateByGenre.qml"; headerSubtitle: "like" } - ListElement { label: "By Year"; image: "../../images/station-year.svg"; creatorContent: "stations/CreateByYear.qml"; headerSubtitle: "from" } + ListElement { label: "By Artist"; image: "../../images/station-artist.svg"; creatorContent: "stations/CreateByArtist.qml"; headerSubtitle: "Songs from" } + ListElement { label: "By Genre"; image: "../../images/station-genre.svg"; creatorContent: "stations/CreateByGenre.qml"; headerSubtitle: "Songs of genre" } + ListElement { label: "By Year"; image: "../../images/station-year.svg"; creatorContent: "stations/CreateByYear.qml"; headerSubtitle: "Songs from" } } VisualItemModel { diff --git a/data/qml/stations/CreateByArtist.qml b/data/qml/stations/CreateByArtist.qml index 359b353f7..60bb5b4b6 100644 --- a/data/qml/stations/CreateByArtist.qml +++ b/data/qml/stations/CreateByArtist.qml @@ -23,7 +23,7 @@ Item { HeaderLabel { id: headerText - text: "Create station by artist..." + text: "Enter or pick an artist" } Row { diff --git a/data/qml/stations/CreateByGenre.qml b/data/qml/stations/CreateByGenre.qml index 1d8964183..017c0cf02 100644 --- a/data/qml/stations/CreateByGenre.qml +++ b/data/qml/stations/CreateByGenre.qml @@ -46,7 +46,7 @@ Item { HeaderLabel { id: headerText anchors.horizontalCenter: parent.horizontalCenter - text: "Create station by genre..." + text: "Enter or pick a genre" } Row { diff --git a/data/qml/stations/CreateByYear.qml b/data/qml/stations/CreateByYear.qml index ae9f15a69..ebd0a8c3a 100644 --- a/data/qml/stations/CreateByYear.qml +++ b/data/qml/stations/CreateByYear.qml @@ -28,7 +28,7 @@ Item { HeaderLabel { id: headerText - text: "Create station by year..." + text: "Enter a year or pick a range" } Row { diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp index 07965385d..8a703458f 100644 --- a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp +++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp @@ -315,7 +315,7 @@ EchonestGenerator::startFromGenre( const QString& genre ) controlsMap[ "selectedType" ] = "echonest"; controlsMap[ "match" ] = QString::number( data.first ); controlsMap[ "input" ] = data.second; - controlsMap[ "summary" ] = data.second; + controlsMap[ "summary" ] = tr("Songs of genre %1").arg(data.second.toString()); controlsList << controlsMap; params.append( Echonest::DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Type, Echonest::DynamicPlaylist::ArtistDescriptionType ) ); diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicQmlWidget.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicQmlWidget.cpp index 8fede25e5..fc60eb447 100644 --- a/src/libtomahawk/playlist/dynamic/widgets/DynamicQmlWidget.cpp +++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicQmlWidget.cpp @@ -83,7 +83,7 @@ DynamicQmlWidget::title() const if ( !m_playlist->title().isEmpty() ) { return m_playlist->title(); } - return "Listen to radio..."; + return "Listen to radio"; }