Merge remote-tracking branch 'origin/pr/1002'

airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp

@@ -399,24 +399,6 @@
                 </c:import>
             </div>
         </td>
-        <c:if test="${model.showAd}">
-            <td style="vertical-align:top;width:160px" rowspan="3">
-                <h2 style="padding-bottom: 1em">Subsonic Premium</h2>
-                <p style="font-size: 90%">
-                    Upgrade to Subsonic Premium and get:
-                </p>
-                <div style="font-size: 90%;padding-bottom: 1em">
-                    <p><a href="https://airsonic.github.io/docs/apps/" target="_blank">Apps</a> for Android, iPhone, Windows Phone ++.</p>
-                    <p>Video streaming.</p>
-                    <p>Chromecast and Sonos support.</p>
-                    <p>DLNA/UPnP support</p>
-                    <p>Share on Facebook, Twitter, Google+</p>
-                    <p>No ads.</p>
-                    <p>Your personal server address: <em>you</em>.airsonic.org</p>
-                    <p>Podcast receiver.</p>
-                </div>
-            </td>
-        </c:if>
     </tr>
 
     <tr>

airsonic-main/src/main/webapp/sonos/strings.xml

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <stringtables xmlns="http://sonos.com/sonosapi">
 
-    <stringtable rev="5" xml:lang="en-US">
-        <string stringId="ServicePromo">Stream music from your own Airsonic server. Please log on with an existing Airsonic account. Requires Subsonic Premium.</string>
+    <stringtable rev="6" xml:lang="en-US">
         <string stringId="Error0Message">Sorry, wrong Airsonic username or password.</string>
-        <string stringId="Error1Message">Please upgrade to Subsonic Premium to continue to use this service.</string>
     </stringtable>
 
 </stringtables>