qml/delegates/FavoriteStations.qml

@@ -171,7 +171,7 @@ ListItem {
             anchors.rightMargin: Theme.paddingMedium
             elide: Text.ElideRight
             width: parent.width - (favIcon.width + (Theme.paddingLarge * 2))
-            text: lastcheckok == "1" ? name : " ["+qsTr("DOWN")+"] "+name
+            text: lastcheckok == "1" ? name : " [DOWN] "+name
             color: lastcheckok == "1" ? Theme.primaryColor : Theme.secondaryColor
             font.strikeout: lastcheckok == "1" ? false : true
             font.pixelSize: Theme.fontSizeSmall

qml/delegates/RadioImage.qml

@@ -75,7 +75,7 @@ Column {
             elide: Text.ElideRight
             width: parent.width - (parent.border.width * 2)
             height: width
-            text: stationLabel ? stationLabel : "AllRadio2"//lastcheckok == "1" ? name : " [DOWN] "+name
+            text: stationLabel ? stationLabel : "AllRadio"//lastcheckok == "1" ? name : " [DOWN] "+name
             color: Theme.primaryColor//stationlabel === "1" ? Theme.lightPrimaryColor : Theme.secondaryColor
             wrapMode: Text.WordWrap
             maximumLineCount: 4

qml/delegates/SmallStationsDelegate.qml

@@ -23,7 +23,7 @@ ListItem {
             elide: Text.ElideRight
             width: stationimage.width
             height: Theme.itemSizeExtraSmall
-            text: lastcheckok === "1" ? name : " "+qsTr([DOWN])+" "+name
+            text: lastcheckok === "1" ? name : " [DOWN] "+name
             color: lastcheckok === "1" ? Theme.primaryColor : Theme.secondaryColor
             wrapMode: Text.WordWrap
             maximumLineCount: 2

qml/delegates/SmallTagsDelegate.qml

@@ -23,7 +23,7 @@ ListItem {
             elide: Text.ElideRight
             width: stationimage.width
             height: Theme.itemSizeExtraSmall
-            text: tag ? tag : qsTr("No Tag")
+            text: tag ? tag : "No Tag"
             color: Theme.primaryColor
             wrapMode: Text.WordWrap
             maximumLineCount: 2

qml/delegates/StationsDelegate.qml

@@ -84,7 +84,7 @@ ListItem {
             anchors.rightMargin: Theme.paddingMedium
             elide: Text.ElideRight
             width: parent.width - (favIcon.width + (Theme.paddingLarge * 2))
-            text: lastcheckok == "1" ? name : " "+qsTr([DOWN])+" "+name
+            text: lastcheckok == "1" ? name : " [DOWN] "+name
             color: lastcheckok == "1" ? Theme.primaryColor : Theme.secondaryColor
             font.strikeout: lastcheckok == "1" ? false : true
             font.pixelSize: Theme.fontSizeSmall
@@ -107,7 +107,7 @@ ListItem {
             anchors.leftMargin: Theme.paddingMedium
 
             font.pixelSize: Theme.fontSizeExtraSmall
-            text: countrycode ? radioBrowser.getCountryName(countrycode) : qsTr("No country")//"Country name"//getAll(hls,codec,bitrate)
+            text: countrycode ? radioBrowser.getCountryName(countrycode) : "No country"//"Country name"//getAll(hls,codec,bitrate)
             color: delegate.highlighted ? Theme.highlightColor : Theme.secondaryColor
         }
         Label {
@@ -117,7 +117,7 @@ ListItem {
             anchors.leftMargin: Theme.paddingLarge
             anchors.rightMargin: Theme.paddingSmall
             font.pixelSize: Theme.fontSizeExtraSmall
-            text: lastcheckok ? JSfunctions.getAll(hls,codec,bitrate) : qsTr("[OFFLINE]")
+            text: lastcheckok ? JSfunctions.getAll(hls,codec,bitrate) : "[OFFLINES]"
             color: delegate.highlighted ? Theme.highlightColor : Theme.secondaryColor
         }
         Label {

qml/delegates/TabDelegate.qml

@@ -16,7 +16,7 @@ Item {
             down: tab === 0
             width: parent.width / 3
          //   icon: "image://theme/icon-m-home" //"image://theme/icon-m-video"
-            text: qsTr("Favorites")
+            text: "Favorites"
             onButtonClick: {showP=0.0;tab = 0}
         }
         TabButton {
@@ -24,7 +24,7 @@ Item {
             down: tab === 1
             width: parent.width / 3
         //    icon: "image://theme/icon-m-search"
-            text: qsTr("History")
+            text: "History"
             onButtonClick: {showP=0.0;tab = 1}
         }
         TabButton {
@@ -32,7 +32,7 @@ Item {
             down: tab === 2
             width: parent.width / 3
          //   icon: "image://theme/icon-m-favorite"
-            text: qsTr("Search")
+            text: "Search"
             onButtonClick: {showP=0.0;tab = 2;console.log("CLICK")}
         }
     }

qml/delegates/TagImage.qml

@@ -69,7 +69,7 @@ Column {
             elide: Text.ElideRight
             width: parent.width - (parent.border.width * 2)
             height: width
-            text: stationLabel ? stationLabel : qsTr("No Tag")//lastcheckok == "1" ? name : " [DOWN] "+name
+            text: stationLabel ? stationLabel : "No Tag"//lastcheckok == "1" ? name : " [DOWN] "+name
             color: stationlabel === "1" ? Theme.lightPrimaryColor : Theme.secondaryColor
             wrapMode: Text.WordWrap
             maximumLineCount: 4

qml/harbour-allradio.qml

@@ -15,11 +15,11 @@ import "helpers"
 ApplicationWindow
 {
     id: allRadio
-    property string _version: "2.0.16"
+    property string _version: "2.0.15"
     property string _language: Qt.locale().name.slice(0,2)
     property string _country: Qt.locale().name.slice(-2)
-    //property int currentListIndex: -1
+    property int currentListIndex: -1
-    //property int currentListCount: -1
+    property int currentListCount: -1
     property int sleepTime: 0
     //property alias settings: allradioSettings
     property alias mediaPlayerPanel: mediaPlayerPanel

qml/helpers/jsFunctions.js

@@ -5,13 +5,13 @@ function getGreeting() {
     datetoday.setTime(timenow);
     var thehour = datetoday.getHours();
 
-    if (thehour >= 2 && thehour < 12) display = qsTr("morning");
+    if (thehour >= 2 && thehour < 12) display = "morning";
-    else if (thehour >= 12 && thehour <=17) display = qsTr("afternoon");
+    else if (thehour >= 12 && thehour <=17) display = "afternoon";
-    else display = qsTr("evening")
+    else display = "evening"
 
 
 
-    var greeting = (qsTr("Good")+" " + display + "!");
+    var greeting = ("Good " + display + "!");
     return greeting//document.write(greeting);
 }
 

qml/items/RadioPlayer.qml

@@ -44,9 +44,9 @@ MediaPlayer {
     property bool isPaused: false
     property int stationOk: 3
     property int maxTagClicks: 0
-    property int playlistCount: playlist.count -1
+    property int playlistCount: playlist.count - 1
-    property int playlistIndex: Favorites.getSetting("playlistIndex",-1)
+    //property int playlistIndex: Favorites.getSetting("playlistIndex",-1)
-    //property int playlistIndex: playlistCount = Favorites.getSetting("playlistIndex",-1)
+    property int playlistIndex: -1
     property QDtimer timer: QDtimer {
         id: qdTimer
         interval: 200; running: false; repeat: false
@@ -155,12 +155,12 @@ MediaPlayer {
 
 
     function playNext() {
-        if (playlistIndex < playlistCount) playlistIndex = playlistIndex + 1
+        if (playlistIndex < playlistCount && playlistIndex < playlist.count) playlistIndex = playlistIndex + 1
         loadPlaylistSelected()
     }
 
     function playPrev() {
-        if (playlistIndex <= playlistCount) playlistIndex = playlistIndex - 1 //: playlistIndex = 0
+        if (playlistIndex <= playlistCount && playlistIndex > -1) playlistIndex = playlistIndex - 1 //: playlistIndex = 0
         loadPlaylistSelected()
     }
 
@@ -196,7 +196,7 @@ MediaPlayer {
         isPlaying = true
         isPaused = false
         qdTimer.start()
-        if (_favorite) Favorites.setSetting("playlistIndex",playlistIndex)
+        //Favorites.setSetting("playlistIndex",playlistIndex)
     }
 
     onError: {
@@ -383,7 +383,6 @@ MediaPlayer {
             _favorite = playHistory.get(0).favorite
             isPlaying = false
             isPaused = true
-            ///if (_favorite) playlistCount = Favorites.getSetting("playlistIndex",-1)
             //playlistIndex = allradioSettings.value("currentFavorite",-1)
         //    pageStack.push("RadioPlayerPage.qml")
         }
@@ -435,6 +434,6 @@ MediaPlayer {
 
 
 
-    Component.onCompleted: {reloadDbData();_favorite ? loadPlaylistSelected() : loadRecentPlay()}
+    Component.onCompleted: {reloadDbData();loadRecentPlay()}
 }
 

qml/items/Splash.qml

@@ -29,12 +29,12 @@ Column {
     }
 
     Label {
-        text: radioBrowser.serversModel.count > 0 ? qsTr("Found")+": "+radioBrowser.serversModel.count + " "+qsTr("servers") : qsTr("Searching for servers...")
+        text: radioBrowser.serversModel.count > 0 ? "Found: "+radioBrowser.serversModel.count + " servers" : "Searching for servers..."
         anchors.horizontalCenter: parent.horizontalCenter
     }
     Label {
         visible: radioBrowser.serversModel.count > 0
-        text: qsTr("Connecting to:")
+        text: "Connecting to:"
         anchors.horizontalCenter: parent.horizontalCenter
     }
     Label {

qml/pages/AboutPage.qml

@@ -16,13 +16,13 @@ Page {
             Label {
                 font.pixelSize: Theme.fontSizeExtraLarge
                 font.bold: true
-                text: "AllRadio2 v"+ _version
+                text: "AllRadio v"+ _version
                 anchors.horizontalCenter: parent.horizontalCenter
 
             }
 
             Label {
-                text: qsTr("License: GPLv2")
+                text: "License: GPL"
                 anchors.horizontalCenter: parent.horizontalCenter
             }
 

qml/pages/AllRadio.qml

@@ -324,7 +324,7 @@ Page {
             HeaderButton {
                 visible: playedCountries.count > 1
 //                headerText: playedCountries.count > 0 ? "Trending in " + radioBrowser.getCountryName(playedCountries.get(1).alpha_2) : "Trending in " + radioBrowser.getCountryName(_country)
-                headerText: playedCountries.count > 1 ? qsTr("Trending in")+" " + radioBrowser.getCountryName(playedCountries.get(1).alpha_2) : qsTr("Trending in")+" " + radioBrowser.getCountryName(_country)
+                headerText: playedCountries.count > 1 ? "Trending in " + radioBrowser.getCountryName(playedCountries.get(1).alpha_2) : "Trending in " + radioBrowser.getCountryName(_country)
                 onClicked: pageStack.push("CountryStationsPage.qml",{searchby:"clicktrend",_countrycode: playedCountries.get(1).alpha_2})
             }
 
@@ -364,7 +364,7 @@ Page {
             Item {height: Theme.paddingLarge;width: parent.width}
 
             HeaderButton {
-                headerText: qsTr("Trending in the world")//playedCountries.count > 0 ? "Trending in " + radioBrowser.getCountryName(playedCountries.get(0).alpha_2) : "Trending in " + radioBrowser.getCountryName(_country)
+                headerText: "Trending in the world"//playedCountries.count > 0 ? "Trending in " + radioBrowser.getCountryName(playedCountries.get(0).alpha_2) : "Trending in " + radioBrowser.getCountryName(_country)
                 onClicked: pageStack.push("CountryStationsPage.qml",{searchby:"clicktrend",_countrycode: ""})
             }
 

rpm/harbour-allradio.spec

@@ -1,7 +1,7 @@
 Name:       harbour-allradio
 
 Summary:    AllRadio
-Version:    2.0.16
+Version:    2.0.15
 Release:    1
 Group:      Qt/Qt
 License:    GPL2

translations/harbour-allradio-de.ts

@@ -7,10 +7,6 @@
         <source>AllRadio is an internet radio station player</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>License: GPLv2</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AllRadio</name>
@@ -50,10 +46,6 @@
         <source>Trending in</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Trending in the world</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>CountryNameModel</name>
@@ -1076,10 +1068,6 @@
         <source>Add to favorites</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>DOWN</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SecondPage</name>
@@ -1126,86 +1114,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>SmallTagsDelegate</name>
-    <message>
-        <source>No Tag</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Splash</name>
-    <message>
-        <source>Found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Searching for servers...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connecting to:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>StationsDelegate</name>
     <message>
         <source>Vote on Community Radio Browser</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>No country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>[OFFLINE]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TabDelegate</name>
-    <message>
-        <source>Favorites</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>History</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TagImage</name>
-    <message>
-        <source>No Tag</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>jsFunctions</name>
-    <message>
-        <source>morning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>afternoon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>evening</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Good</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>

translations/harbour-allradio.ts

@@ -7,10 +7,6 @@
         <source>AllRadio is an internet radio station player</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>License: GPLv2</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AllRadio</name>
@@ -50,10 +46,6 @@
         <source>Trending in</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Trending in the world</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>CountryNameModel</name>
@@ -1076,10 +1068,6 @@
         <source>Add to favorites</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>DOWN</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SecondPage</name>
@@ -1126,86 +1114,11 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>SmallTagsDelegate</name>
-    <message>
-        <source>No Tag</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Splash</name>
-    <message>
-        <source>Found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Searching for servers...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connecting to:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>StationsDelegate</name>
     <message>
         <source>Vote on Community Radio Browser</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>No country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>[OFFLINE]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TabDelegate</name>
-    <message>
-        <source>Favorites</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>History</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TagImage</name>
-    <message>
-        <source>No Tag</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>jsFunctions</name>
-    <message>
-        <source>morning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>afternoon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>evening</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Good</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>