Merge Pull Request #137 into develop

Conflicts:
	libresonic-main/src/main/webapp/WEB-INF/jsp/more.jsp

libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties

@@ -233,12 +233,29 @@ more.random.text = Shuffle play
 more.random.songs = {0} songs
 more.random.auto = Play more random songs when end of play queue is reached.
 more.random.ok = OK
-more.random.genre = from genre
+more.random.addtoplaylist = Add to current playlist
+more.random.any = Any
+more.random.format = Format
+more.random.genre = Genre
 more.random.anygenre = Any
-more.random.year = and year
+more.random.year = Year
 more.random.anyyear = Any
-more.random.folder = in folder
+more.random.folder = Folder
 more.random.anyfolder = Any
+more.random.star = star
+more.random.stars = stars
+more.random.starred = Starred
+more.random.unstarred = Unstarred
+more.random.songrating = Song rating
+more.random.albumrating = Album rating
+more.random.lastplayed = Last played
+more.random.playcount = Play count
+more.random.1day = 1 day ago
+more.random.1week = 1 week ago
+more.random.1month = 1 month ago
+more.random.3months = 3 months ago
+more.random.6months = 6 months ago
+more.random.1year = 1 year ago
 more.apps.title = Libresonic Apps
 more.apps.text = <p>Check out the steadily growing list of <a href="http://libresonic.org/pages/apps.jsp" target="_blank">Libresonic apps</a>. \
                  These provide fun and alternative ways to enjoy your media collection - no matter where you are. \