diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en.properties
index c54a3d18..6002dddd 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en.properties
@@ -1,8 +1,3 @@
-#
-# English localization.
-# Author: Sindre Mehus
-#
-
common.home=Home
common.back=Back
common.help=Help
@@ -24,7 +19,7 @@ common.confirm=Please confirm
common.unknown=(Unknown)
common.default=(Default)
common.settingssaved=Settings saved.
-# login.jsp
+
login.username=Username
login.password=Password
login.login=Log in
@@ -33,7 +28,7 @@ login.logout=You are now logged out.
login.error=Incorrect username or password.
login.insecure={0} is not secured. Please log in with username and
password "admin". Then change the password immediately.
login.recover=Forgotten your password?
-# recover.jsp
+
recover.title=Forgotten your password?
recover.text=To reset your password, please enter your username or e-mail address below.
recover.username=Username or e-mail address
@@ -43,15 +38,15 @@ recover.error.usernotfound=Sorry, user not found.
recover.error.noemail=Sorry, no e-mail address is registered for this user.
recover.error.sendfailed=Failed to send e-mail, please try again later.
recover.error.invalidcaptcha=Sorry, incorrect CAPTCHA entered, please try again.
-# accessDenied.jsp
+
accessDenied.title=Access denied
accessDenied.text=Sorry, you are not authorized to perform the requested operation.
-# notFound.jsp
+
notFound.title=Not found
notFound.text=
Sorry, could not find what you were looking for.
Try reloading the web page. If that doesn't help, try scanning the media folders again.
notFound.reload=Reload page notFound.scan=Media folder settings -# top.jsp + top.home=Home top.now_playing=Playing top.starred=Starred @@ -64,7 +59,7 @@ top.search=Search top.upgrade=New version available. Download {0} {1} here. top.missing=No media folders found. Please change the settings. top.logout=Log out {0} -# left.jsp + left.scanning=Scanning media folders\u2026 left.statistics={0} artistsWelcome to Airsonic. Follow the basic steps below.
Click the Home button in the toolbar above to return here.
More information to be found in the first start guide.
gettingStarted.root=Warning! The Airsonic process is running as the root user. Please consider changing this. @@ -162,7 +157,7 @@ gettingStarted.step3.title=Find our external documentation. gettingStarted.step3.text=In case that you want to enhance Airsonic, you may want to check out our upload.unzipped=Unzipped {0} -# help.jsp + help.title=About {0} help.upgrade=New version available. Download {0} {1} here. help.version.title=Version @@ -282,7 +277,7 @@ help.contact.title=Contact help.contact.text=Airsonic is a community project. You can find us in #airsonic on Freenode. Technical issues can be submitted to the issue tracker on GitHub. help.log=Log help.logfile=The complete log is saved in {0}. -# settingsHeader.jsp + settingsheader.title=Settings settingsheader.general=General settingsheader.advanced=Advanced @@ -300,7 +295,7 @@ settingsheader.search=Search/caching settingsheader.coverArt=Cover art settingsheader.password=Password settingsheader.database=Database -# generalSettings.jsp + generalsettings.playlistfolder=Import playlists from generalsettings.musicmask=Music files generalsettings.videomask=Video files @@ -316,7 +311,7 @@ generalsettings.welcomemessage=Welcome message generalsettings.loginmessage=Login message generalsettings.language=Default language generalsettings.theme=Default theme -# advancedSettings.jsp + advancedsettings.downsamplecommand=Downsample command advancedsettings.hlscommand=HTTP Live Streaming command advancedsettings.downloadlimit=Download limit (Kbps)(%s = The file to be transcoded, %b = Max bitrate of the player, %t = Title, %a = Artist, %l = Album)
Transcoding is the process of converting from one media format to another. {1}''s transcoding engine allows streaming media that would not otherwise be streamable. It is performed on-the-fly and doesn''t require any extra storage space.
The transcoding is done by third-party command line program, which must be installed in {0}. You may add your own custom transcoder given it fulfills the following requirements:
Note that transcoding is activated on a per-player basis from Settings \u2192 Players.
-# internetRadioSettings.jsp + internetradiosettings.streamurl=Stream URL internetradiosettings.homepageurl=Homepage internetradiosettings.name=Name @@ -433,7 +428,7 @@ internetradiosettings.enabled=Enabled internetradiosettings.add=Add Internet TV & radio internetradiosettings.nourl=Please specify a URL. internetradiosettings.noname=Please specify a name. -# podcastSettings.jsp + podcastsettings.update=Check for new episodes podcastsettings.keep=Keep podcastsettings.keep.all=All episodes @@ -449,7 +444,7 @@ podcastsettings.interval.hourly=Every hour podcastsettings.interval.daily=Every day podcastsettings.interval.weekly=Every week podcastsettings.folder=Save podcasts in -# playerSettings.jsp + playersettings.noplayers=No players found. playersettings.type=Type playersettings.lastseen=Last seen @@ -485,7 +480,7 @@ sonossettings.enabled=Enable Sonos music service sonossettings.description=Turns on the Sonos music service in Airsonic, to stream your media to Sonos devices on your local network. Remember to add Airsonic as a music service from your Sonos controller. sonossettings.servicename=Music service name sonossettings.servicename.description=The name of the music service, as shown on Sonos controllers. -# shareSettings.jsp + sharesettings.name=Name sharesettings.owner=Shared by sharesettings.description=Description @@ -499,7 +494,7 @@ sharesettings.expirein.month=1m sharesettings.expirein.year=1y sharesettings.expirein.never=never sharesettings.deleteexpired=Delete all expired -# userSettings.jsp + usersettings.title=Select user usersettings.newuser=New user usersettings.admin=Administrative user @@ -529,7 +524,7 @@ usersettings.wrongpassword=Supplied passwords did not match. usersettings.ldapdisabled=LDAP authentication is not enabled. See advanced settings. usersettings.passwordnotsupportedforldap=Can't set or change password for LDAP-authenticated users. usersettings.ok=Password changed for user {0}. -# databaseSettings.jsp + databasesettings.moreinfo=Additional info about database settings, to be found in the database documentation. databasesettings.configtype=Database Connection Source databasesettings.mysqlvarcharmaxlength=MySQL Varchar Maximum Length @@ -541,7 +536,7 @@ databasesettings.embedurl=JDBC URL databasesettings.embedusername=JDBC Username databasesettings.embedpassword=JDBC Password databasettings.restartRequired=Changes to database settings require a restart to take effect. -# main.jsp + main.up=Up main.playall=Play all main.playrandom=Play random @@ -551,7 +546,7 @@ main.tags=Edit tags main.playcount=Played {0} times. main.lastplayed=Last played {0}. main.comment=Comment -main.wiki=__text__ | Bold text | \\\\ | Line break |
~~text~~ | Italic text | (empty line) | New paragraph |
* text | List item | http://foo.com/ | Link |
1. text | Enumerated list item | {link:Foo|http://foo.com} | Named link |
__text__ | Bold text | \\\\ | Line break |
~~text~~ | Italic text | (empty line) | New paragraph |
* text | List item | http://foo.com/ | Link |
1. text | Enumerated list item | {link:Foo|http://foo.com} | Named link |
Do not copy the floppy. Don't share copyrighted material in any manner that violates the law where you are.
share.facebook=Share on Facebook @@ -623,7 +618,7 @@ share.googleplus=Share on Google+ share.link=Or share this with someone by sending them this link: {0} share.disabled=To share your music with someone you must first register your own airsonic.org address.If you have constrained bandwidth, you may set an upper limit for the bitrate of the music streams. For instance, if your original MP3 files are encoded using 256 Kbps (kilobits per second), setting max bitrate to 128 will make {0} automatically resample the music from 256 to 128 Kbps.
@@ -742,29 +737,24 @@ helppopup.recaptchaSecretKey.title=reCAPTCHA secret key helppopup.recaptchaSecretKey.text=A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.
helppopup.scanMediaFolders.title=Media folders scanning rules helppopup.scanMediaFolders.text=Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.
-# wap/index.jsp + wap.index.missing=No music found wap.index.playlist=Playlist wap.index.search=Search wap.index.settings=Settings -# wap/browse.jsp wap.browse.playone=Play song wap.browse.playall=Play all wap.browse.addone=Add song wap.browse.addall=Add all wap.browse.downloadone=Download song wap.browse.downloadall=Download all -# wap/playlist.jsp wap.playlist.title=Playlist wap.playlist.noplayer=No player connected wap.playlist.clear=Clear wap.playlist.load=Load wap.playlist.random=Random wap.playlist.play=Play on phone -# wap/search.jsp wap.search.title=Search -# wap/searchResult.jsp wap.searchresult.index=The search index is being created. Please try again later. -# wap/settings.jsp wap.settings.selectplayer=Select player wap.settings.allplayers=All