- Add upnp specific base url
- Use http request base url for areas used by url redirection
- Fix sharing
- Removed Network Settings tab
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
@ -140,9 +140,6 @@ gettingStarted.step1.text = Per tal de fer m\u00E9s segur el seu servidor es rec
Tamb\u00E9 pot crear comptes d'usuari nous amb diferents privilegis associats.
gettingStarted.step2.title = Configuri els directoris multim\u00E8dia.
gettingStarted.step2.text = Indiqui a Libresonic a on guarda els arxius de m\u00FAsica i de v\u00EDdeo.
gettingStarted.step3.title = Configuri els par\u00E0metres de xarxa.
gettingStarted.step3.text = Par\u00E0metres \u00FAtil per tal de gaudir de Libresonic remotament a trav\u00E9s de Internet, \
o compartir-ho amb la fam\u00EDlia i amics. Aconsegueixi la seva adre\u00E7a personal <b><em>el_seu_nom</em>.libresonic.org</b>.
gettingStarted.hide = No mostrar aquest missatge de nou
gettingStarted.hidealert = Per tal de tornar a mostrar aquest missatge, accedeixi a Configuraci\u00F3 > General.
@ -241,7 +238,6 @@ settingsheader.internetRadio = Internet TV/radio
settingsheader.podcast = Podcast
settingsheader.player = Oients
settingsheader.share = Shared media
settingsheader.network = Xarxa
settingsheader.transcoding = Canviar format
settingsheader.user = Usuaris
settingsheader.search = Buscar
@ -342,12 +338,6 @@ musicfoldersettings.fastcache.description = Usi aquesta opci\u00F3 per tal de mi
musicfoldersettings.organizebyfolderstructure = Organitzar segons l'estructura dels directoris
musicfoldersettings.organizebyfolderstructure.description = Usi aquesta opci\u00F3 per tal de navegar per la seva biblioteca multim\u00E8dia usant l'estructura dels directoris enlloc dels ID3 tags artista/\u00E0lbum.
# networkSettings.jsp
networksettings.text = Usi els seg\u00FCents par\u00E0metres per a controlar com s'accedeix al seu servidor Libresonic a trav\u00E9s de Internet.<br> \
Si experimenta algun tipus de contratemps, visiti la guia de <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>Primers passos</b></a>.
networksettings.urlredirectionenabled = Accedeixi al seu servidor a trav\u00E9s de Internet usant una direcci\u00F3 f\u00E0cil de recordar.
settingsheader.search = Vyhled\u00E1v\u00E1n\u00ED a mezipam\u011B\u0165
@ -397,12 +392,6 @@ musicfoldersettings.expunge.description = Libresonic ukl\u00E1d\u00E1 informace
musicfoldersettings.organizebyfolderstructure = Organizovat podle structury slo\u017Eek
musicfoldersettings.organizebyfolderstructure.description = Tuto volbu pou\u017Eijte pro proch\u00E1zen\u00ED knihovny m\u00E9di\u00ED pomoc\u00ED adres\u00E1\u0159ov\u00E9 struktury ne\u017E pomoc\u00ED informac\u00ED o interpretech nebo albech v ID3 taz\u00EDch.
# networkSettings.jsp
networksettings.text = Pomoc\u00ED n\u00ED\u017Ee uveden\u00FDch nastaven\u00ED ur\u010Dete, jak p\u0159istupovat k va\u0161emu serveru Libresonic z internetu.<br> \
Pokud naraz\u00EDte na pot\u00ED\u017Ee, p\u0159e\u010Dt\u011Bte si p\u0159\u00EDru\u010Dku <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>Za\u010D\u00EDn\u00E1me</b></a>.
networksettings.urlredirectionenabled = P\u0159istupovat k serveru z internetu pomoc\u00ED snadno zapamatovateln\u00E9 adresy.
networksettings.status = Stav:
# transcodingSettings.jsp
transcodingsettings.name = N\u00E1zev
transcodingsettings.sourceformat = P\u0159ev\u00E9st z
@ -396,12 +392,6 @@ musicfoldersettings.expunge.description = Libresonic speichert alle aufgefundene
musicfoldersettings.organizebyfolderstructure = Organisieren nach Ordnerstruktur
musicfoldersettings.organizebyfolderstructure.description = Verwende diese Funktion um die Medienbibliothek nach Verzeichnisstruktur zu durchsuchen anstatt nach Artist / oder Album Info in den ID3-Tags.
# networkSettings.jsp
networksettings.text = Verwenden sie die folgenden Einstellungen um den Zugang zu ihrem Libresonic-Server \u00FCber das Internet einzurichten.
@ -457,16 +456,6 @@ musicfoldersettings.expunge.description = Libresonic stores information about al
musicfoldersettings.organizebyfolderstructure = Organize by folder structure
musicfoldersettings.organizebyfolderstructure.description = Use this option to browse through your media library using the directory structure rather than using artist/album info in ID3 tags.
# networkSettings.jsp
networksettings.text = Use the settings below to control how to access your Libresonic server over the Internet.<br> \
If you experience difficulties, please consult the <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>Getting started</b></a> guide.
networksettings.urlredirectionenabled = Access your server over the Internet using an easy-to-remember address.
networksettings.status = Status:
networksettings.normalurl = Use
networksettings.customurl = Use custom URL (advanced)
networksettings.urlRedirectDisabled = Feature not currently available
# transcodingSettings.jsp
transcodingsettings.name = Name
transcodingsettings.sourceformat = Convert from
@ -548,9 +537,12 @@ playersettings.clone = Clone player
dlnasettings.enabled = Enable DLNA server
dlnasettings.description = Use this option to turn on the DLNA/UPnP Media Server in Libresonic, \
and stream your media to compatible DLNA players.
and stream your media to compatible DLNA players. Requires restart.
dlnasettings.servername = Media Server name
dlnasettings.servername.description = The name of the Media Server as it will appear in DLNA players.
dlnasettings.baselanurl = LAN Server address
dlnasettings.lanurl.description = The base LAN address to be used for DLNA resources. \
An example is http://192.168.0.2/libresonic/
sonossettings.enabled = Enable Sonos music service
sonossettings.description = Use this option to turn on the Sonos music service in Libresonic, \
gettingStarted.step3.text = Kui soovite nautide muusikat Interneti abil või tahate jagada seda koos oma pere ja sõpradega, siis vajalikud seadistused leiate siit, \
Hangi endale oma <b><em>sinunimi</em>.libresonic.org</b> \
aadress.
gettingStarted.hide = Ära enam kuva seda
gettingStarted.hidealert = Kui soovite seda teadet hiljem uuesti kuvada, siis leiate selle valiku alt Seaded > Põhiline.
@ -395,12 +391,6 @@ musicfoldersettings.expunge.description = Libresonic kogub kõikide siia laetud
musicfoldersettings.organizebyfolderstructure = Organiseeri kausta ülesehituse järgi
musicfoldersettings.organizebyfolderstructure.description = Kasuta seda valikut, et sirvida oma meediakogu sihtkoha ülesehituse järgi. Selle asemel, et kasutada ID3 teekide esitaja/albumi andmeid.
# networkSettings.jsp
networksettings.text = Kasuta seda seadet, et hallata ligipääsu Libresonicu serverisse Interneti kaudu.<br> \
Kui ilmneb raskusi siis tutvuge <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>Sissejuhatuse</b></a> peatükiga.
networksettings.urlredirectionenabled = Hangi hästi meeldejääv aadress, et ligipääs oma serverile Interneti kaudu oleks lihtsustatud.
musicfoldersettings.nopath = Veuillez indiquer un dossier.
# networkSettings.jsp
networksettings.text = Compl\u00E9tez les options ci-dessous afin de d\u00E9finir comment acc\u00E9der \u00E0 votre serveur Libresonic depuis Internet.<br> \
Si vous rencontrez des probl\u00E8mes, consultez le guide de <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>D\u00E9marrage rapide</b></a>.
networksettings.urlredirectionenabled = Acc\u00E9dez \u00E0 votre serveur depuis Internet en utilisant une adresse facile \u00E0 retenir.
musicfoldersettings.add = Aggiungi cartella per la musica
musicfoldersettings.nopath = Specifica una cartella.
# networkSettings.jsp
networksettings.text = Utilizza le impostazioni qui sotto per regolare l'accesso a Libresonic da internet.<br> \
Se hai problemi, per favore consulta la guida di <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>Introduzione a Libresonic</b></a>.
networksettings.urlredirectionenabled = Accedi al tuo server attraverso internet utilizzando un indirizzo facile da ricordare.
musicfoldersettings.organizebyfolderstructure.description = Use this option to browse through your media library using the directory structure rather than using artist/album info in ID3 tags.
@ -403,12 +399,6 @@ musicfoldersettings.expunge.description = Libresonic bewaart de informatie over
musicfoldersettings.organizebyfolderstructure = Organiseer via mappenstructuur.
musicfoldersettings.organizebyfolderstructure.description = Gebruik deze optie om door jouw mediabibliotheek te bladeren via de mappenstructuur in plaats van artiest/album info in ID3 tags.
# networkSettings.jsp
networksettings.text = Gebruik de instellingen hieronder om te bepalen hoe jouw Libresonic-server over het Internet bereikbaar is .<br> \
Als er problemen zijn, raadpleeg dan de <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>Beginnersgids</b></a>.
networksettings.urlredirectionenabled = Krijg toegang tot je server over het Internet met een gemakkelijk te onthouden adres.
@ -118,8 +118,6 @@ gettingStarted.step1.text = Proteja o seu servidor, alterando a senha padr\u00E3
gettingStarted.step2.title = Criar pastas de m\u00FAsica.
gettingStarted.step2.text = Mostrar ao Libresonic onde tem a sua m\u00FAsica.
gettingStarted.step3.title = Configura\u00E7\u00F5es de rede.
gettingStarted.step3.text = Algumas defini\u00E7\u00F5es \u00FAteis se voc\u00EA quiser desfrutar da sua m\u00FAsica remotamente atrav\u00E9s da Internet, \
ou compartilh\u00E1-la com a fam\u00EDlia e amigos. Obtenha o seu endere\u00E7o com nome de<b><em>utilizador</em>.libresonic.org</b>.
gettingStarted.hide = N\u00E3o mostrar mais
gettingStarted.hidealert = Para mostar este ecran outra vez, v\u00E1 a Configura\u00E7\u00F5es > Geral.
@ -217,7 +215,6 @@ settingsheader.musicFolder = Pastas de m\u00FAsica
musicfoldersettings.add = Adicionar pasta de m\u00FAsica
musicfoldersettings.nopath = Por favor especifique a pasta.
# networkSettings.jsp
networksettings.text = Use as configura\u00E7\u00F5es abaixo para controlar a forma de aceder ao servidor do Libresonic atrav\u00E9s da Internet .<br> \
Se tiver problemas, consulte o guia dos <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>primeiros passos</b></a>. (em ingl\u00EAs)
networksettings.urlredirectionenabled = Aceda ao seu servidor na Internet usando um endere\u00E7o f\u00E1cil de lembrar.
@ -377,12 +373,6 @@ musicfoldersettings.fastcache.description = Uporabite to mo\u017Enost za zmanj\u
musicfoldersettings.organizebyfolderstructure = Organiziraj po imeni\u0161ki strukuri
musicfoldersettings.organizebyfolderstructure.description = Uporabite to mo\u017Enost za brskanje po va\u0161ih medijskih datotekah s pomo\u010Djo imeni\u0161ke strukture, namesto uporabe podatkov o izvajalcih/albumih iz ID3 zna\u010Dk.
# networkSettings.jsp
networksettings.text = Uporabi spodnje nastavitve za nadzor dostopa do va\u0161ega Libresonic stre\u017Enika na Internetu.<br> \
\u010Ce naletite na te\u017Eave, si prosimo oglejte <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>Uvod</b></a> k programu.
networksettings.urlredirectionenabled = Dostopajte do svojega stre\u017Enika preko interneta z uporabo naslova, ki si ga je lahko zapomniti.
musicfoldersettings.nopath = V\u00E4nligen specificera en s\u00F6kv\u00E4g.
# networkSettings.jsp
networksettings.text = Anv\u00E4nd inst\u00E4llningarna nedan f\u00F6r att f\u00E5 tillg\u00E5ng till Libresonicserver via internet.<br> \
Om du f\u00E5r problem, v\u00E4nligen konsultera <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>Att komma ig\u00E5ng</b></a> guiden.
networksettings.urlredirectionenabled = F\u00E5 tillg\u00E5ng till din server via internet genom att anv\u00E4nda en adress som \u00E4r l\u00E4tt att komma ih\u00E5g.
<c:set var="categories" value="${param.restricted ? 'personal password player share' : 'musicFolder general advanced personal user player network share dlna sonos transcoding internetRadio podcast'}"/>
<c:set var="categories" value="${param.restricted ? 'personal password player share' : 'musicFolder general advanced personal user player share dlna sonos transcoding internetRadio podcast'}"/>
@ -182,22 +180,6 @@ public class StringUtilTestCase extends TestCase {
assertEquals("Error in fileSystemSafe().","foo-bar",StringUtil.fileSystemSafe("foo:bar"));
}
publicvoidtestRewriteUrl(){
assertEquals("Error in rewriteUrl().","http://foo/",StringUtil.rewriteUrl("http://foo/","http://foo/"));
assertEquals("Error in rewriteUrl().","http://foo:81/",StringUtil.rewriteUrl("http://foo/","http://foo:81/"));
assertEquals("Error in rewriteUrl().","http://bar/",StringUtil.rewriteUrl("http://foo/","http://bar/"));
assertEquals("Error in rewriteUrl().","http://bar.com/",StringUtil.rewriteUrl("http://foo.com/","http://bar.com/"));
assertEquals("Error in rewriteUrl().","http://bar.com/",StringUtil.rewriteUrl("http://foo.com/","http://bar.com/"));
assertEquals("Error in rewriteUrl().","http://bar.com/a",StringUtil.rewriteUrl("http://foo.com/a","http://bar.com/"));
assertEquals("Error in rewriteUrl().","http://bar.com/a/b",StringUtil.rewriteUrl("http://foo.com/a/b","http://bar.com/c"));
assertEquals("Error in rewriteUrl().","http://bar.com:8080/a?b=1&c=2",StringUtil.rewriteUrl("http://foo.com/a?b=1&c=2","http://bar.com:8080/e?f=3"));
assertEquals("Error in rewriteUrl().","http://foo.com:8080/a?b=1&c=2",StringUtil.rewriteUrl("http://foo.com/a?b=1&c=2","http://foo.com:8080/e?f=3"));
assertEquals("Error in rewriteUrl().","https://foo.com:8080/a?b=1&c=2",StringUtil.rewriteUrl("http://foo.com/a?b=1&c=2","https://foo.com:8080/e?f=3"));
assertEquals("Error in rewriteUrl().","http://foo/",StringUtil.rewriteUrl("http://foo/","not:a:url"));
assertEquals("Error in rewriteUrl().","http://foo/",StringUtil.rewriteUrl("http://foo/",""));
assertEquals("Error in rewriteUrl().","http://foo/",StringUtil.rewriteUrl("http://foo/",null));
}
publicvoidtestRemoveMarkup(){
assertEquals("Error in removeMarkup()","foo",StringUtil.removeMarkup("<b>foo</b>"));
assertEquals("Error in removeMarkup()","foobar",StringUtil.removeMarkup("<b>foo</b>bar"));
@ -206,26 +188,4 @@ public class StringUtilTestCase extends TestCase {
assertEquals("Error in removeMarkup()",null,StringUtil.removeMarkup(null));
Andrew DeMaria
8 years ago