Translated using Weblate (English)

Currently translated at 100.0% (699 of 699 strings) Translation: Airsonic/Translations Translate-URL: https://hosted.weblate.org/projects/airsonic/develop/en/
7 years ago · f43aef4c37
parent b03f0f52e5
commit f43aef4c37
1 changed files with 699 additions and 840 deletions
--- 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
@ -24,7 +24,6 @@ common.confirm = Please confirm
 common.unknown=(Unknown)
 common.default=(Default)
 common.settingssaved=Settings were saved.
 # login.jsp
 login.username=Username
 login.password=Password
@ -34,7 +33,6 @@ login.logout = You are now logged out.
 login.error=Wrong username or password.
 login.insecure={0} is not secured. Please log in with username and<br>password "admin". Then change password immediately.
 login.recover=Forgotten your password?
 # recover.jsp
 recover.title=Forgotten your password?
 recover.text=To reset your password, please enter your <b>username</b> or <b>email address</b> below.
@ -45,18 +43,14 @@ recover.error.usernotfound = Sorry, user not found.
 recover.error.noemail=Sorry, no email address is registered for this user.
 recover.error.sendfailed=Failed to send email, please try again later.
 recover.error.invalidcaptcha=Sorry, wrong CAPTCHA words 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 = <p>Sorry, we could not find what you were looking for.</p><p>Try reloading the web page. If that doesn't help, \
+notFound.text=<p>Sorry, we could not find what you were looking for.</p><p>Try reloading the web page. If that doesn't help, try scanning the media folders again.</p>
  try scanning the media folders again.</p>
 notFound.reload=Reload page
 notFound.scan=Media folders settings
 # top.jsp
 top.home=Home
 top.now_playing=Playing
@ -67,18 +61,12 @@ top.podcast = Podcasts
 top.more=More
 top.help=About
 top.search=Search
-top.upgrade = A new version is available. Download {0} {1} \
+top.upgrade=A new version is available. Download {0} {1} <a href="#" onclick="window.open(''https://airsonic.github.io/download/'')">here</a>.
          <a href="#" onclick="window.open(''https://airsonic.github.io/'')">here</a>.
 top.missing=No media folders found. Please change the settings.
 top.logout=Log out {0}
 # left.jsp
 left.scanning=Scanning media folders...
-left.statistics = {0}&nbsp;artists<br>\
+left.statistics={0}&nbsp;artists<br>{1}&nbsp;albums<br>{2}&nbsp;songs<br>{3}<br>{4}&nbsp;hours
                  {1}&nbsp;albums<br>\
                  {2}&nbsp;songs<br>\
                  {3}<br>\
                  {4}&nbsp;hours
 left.shortcut=Shortcuts
 left.playlists=Playlists
 left.radio=Internet TV/radio
@ -86,7 +74,6 @@ left.allfolders = All folders
 left.showallplaylists=Show all
 left.createplaylist=Create new playlist
 left.importplaylist=Import playlist
 # playQueue.jsp
 playlist.stop=Stop
 playlist.start=Play
@ -119,7 +106,6 @@ playlist.toast.appendtoplaylist = Playlist updated.
 playlist.toast.saveasplaylist=Playlist saved.
 playlist.toast.saveplayqueue=Play queue saved.
 playlist.missing=Missing
 # playlist.jsp
 playlist2.noplaylists=You haven't created any playlists yet.
 playlist2.created=Created by {0} on {1}
@ -132,16 +118,13 @@ playlist2.public = Make this playlist visible to other users.
 playlist2.confirmdelete=Are you sure you want to delete this playlist?
 playlist2.empty=Playlist is empty
 playlist2.export=Export
 # importPlaylist.jsp
 importPlaylist.title=Import playlist
 importPlaylist.text=Select playlist to import (m3u, pls, xspf)
 importPlaylist.success=Successfully imported playlist "{0}".
-importPlaylist.error = Failed to import playlist. {0}
+importPlaylist.error=Failed to import playlist "{0}".
 # videoPlayer.jsp
 videoPlayer.getflash=Please install Flash Player
 # status.jsp
 status.title=Status
 status.type=Type
@ -153,11 +136,9 @@ status.user = User
 status.current=Current file
 status.transmitted=Transmitted
 status.bitrate=Bitrate (Kbps)
 # starred.jsp
 starred.title=My starred items
 starred.empty=Click the star icons to mark your favorite artist, albums and songs.
 # search.jsp
 search.title=Search results
 search.query=Artist, album or song title
@ -169,26 +150,18 @@ search.hits.artists = Artists
 search.hits.albums=Albums
 search.hits.songs=Songs
 search.hits.videos=Videos
 # gettingStarted.jsp
 gettingStarted.title=Getting started
-gettingStarted.text = <p>Welcome to Airsonic! We'll set you up in no time, just follow the basic steps below.<br> \
+gettingStarted.text=<p>Welcome to Airsonic! We'll set you up in no time, just follow the basic steps below.<br> Click the "Home" button in the toolbar above to return to this screen.</p> <p>For more information, please consult the <a href="https://airsonic.github.io/docs/first-start/" target="_blank"><b>first start</b></a> guide.</p>
-                      Click the "Home" button in the toolbar above to return to this screen.</p> \
+gettingStarted.root=Warning! The Airsonic process is running as the root user. Please consider to <a href="https://airsonic.github.io/docs/first-start/" target="_blank">change this.</a>
                      <p>For more information, please consult the <a href="https://airsonic.github.io/docs/" target="_blank"><b>Getting started</b></a> guide.</p>
 gettingStarted.root = Warning! The Airsonic process is running as the root user. Please consider to \
                      <a href="https://airsonic.github.io/docs/" target="_blank">change this.</a>
 gettingStarted.step1.title=Change administrator password.
-gettingStarted.step1.text = Secure your server by changing the default password for the administrator account. \
+gettingStarted.step1.text=Secure your server by changing the default password for the administrator account. You can also create new user accounts with different privileges.
                            You can also create new user accounts with different privileges.
 gettingStarted.step2.title=Set up media folders.
 gettingStarted.step2.text=Tell Airsonic where you keep your music and videos.
-gettingStarted.step3.title = External Documentation
+gettingStarted.step3.title=Find our external documentation.
-gettingStarted.step3.text = In the case that you want to enjoy Airsonic remotely, you may want to checkout the \
+gettingStarted.step3.text=In the case that you want to enhance Airsonic, you may want to checkout our <a href="https://airsonic.github.io/docs/>documentation</a> which provides guidance for setting up SSL, URL rewriting, LDAP, and external database.
  <a href="https://github.com/airsonic/airsonic/blob/develop/documentation/PROXY.md>proxy documentation</a> \
  which provides guidance for setting up SSL, URL rewriting, and custom addresses. Additionally,
 gettingStarted.hide=Don't show this again
-gettingStarted.hidealert = To show this screen again, go to Settings > General.
+gettingStarted.hidealert=To show this screen again, go to Settings > General > Show getting started on startup.
 # home.jsp
 home.random.title=Random
 home.alphabetical.title=All
@ -220,7 +193,6 @@ home.chart.total = Total (MB)
 home.chart.stream=Streamed (MB)
 home.chart.download=Downloaded (MB)
 home.chart.upload=Uploaded (MB)
 # more.jsp
 more.title=More
 more.random.title=Shuffle play
@ -253,9 +225,7 @@ more.random.3months = 3 months ago
 more.random.6months=6 months ago
 more.random.1year=1 year ago
 more.apps.title=Airsonic Apps
-more.apps.text = <p>Check out the steadily growing list of <a href="https://airsonic.github.io/docs/apps" target="_blank">Airsonic apps</a>. \
+more.apps.text=<p>Check out the steadily growing list of <a href="https://airsonic.github.io/docs/apps" target="_blank">Airsonic apps</a>. These provide fun and alternative ways to enjoy your media collection - no matter where you are.</p>
                 These provide fun and alternative ways to enjoy your media collection - no matter where you are. \
                 Apps are available for Android, iPhone, Windows Phone, BlackBerry, Roku and many more.</p>
 more.status.title=Network Status
 more.status.text=<a href="status.view">Monitor</a> the real-time status of all network media streams.
 more.keyboard.title=Keyboard Shortcuts
@ -281,13 +251,9 @@ more.keyboard.playqueue = Toggle play queue
 more.keyboard.shortcuts=Show keyboard shortcuts
 more.keyboard.then=then
 more.mobile.title=Mobile phone
-more.mobile.text = <p>You can control {0} from any WAP-enabled mobile phone or PDA.<br> \
+more.mobile.text=<p>You can control {0} from any WAP-enabled mobile phone or PDA.<br> Simply visit the following URL from your phone: <b>http://yourhostname/wap</b></p> <p>This requires that your server can be reached from the Internet.</p>
                   Simply visit the following URL from your phone: <b>http://yourhostname/wap</b></p> \
                   <p>This requires that your server can be reached from the Internet.</p>
 more.podcast.title=Podcast
-more.podcast.text = <p>Saved playlists are available as Podcasts.<br>\
+more.podcast.text=<p>Saved playlists are available as Podcasts.<br>Use the following URL in your Podcast receiver: <b>http://yourhostname/podcast</b>, or <b><a href="podcast.view?suffix=.rss" target="_blank">click here</a>.</b></p>
                    Use the following URL in your Podcast receiver: <b>http://yourhostname/podcast</b>, \
                    or <b><a href="podcast.view?suffix=.rss" target="_blank">click here</a>.</b></p>
 more.upload.title=Upload File
 more.upload.source=Select file
 more.upload.target=Upload to
@ -295,23 +261,20 @@ more.upload.browse = Choose
 more.upload.ok=Upload
 more.upload.unzip=Automatically unpack zip-file.
 more.upload.progress=% complete. Please wait...
 # upload.jsp
 upload.title=Uploading file
 upload.success=Successfully uploaded <b>{0}</b>
 upload.empty=No files to upload.
 upload.failed=Uploading failed with the following error:<br><b>"{0}"</b>
 upload.unzipped=Unzipped {0}
 # help.jsp
 help.title=About {0}
-help.upgrade = <b>Note!</b> A new version is available. Download {0} {1} \
+help.upgrade=<b>Note!</b> A new version is available. Download {0} {1} <a href="#" onclick="window.open(''https://airsonic.github.io/download/'')">here</a>.
               <a href="#" onclick="window.open(''https://airsonic.github.io/'')">here</a>.
 help.version.title=Version
 help.builddate.title=Build date
 help.server.title=Server
 help.license.title=Terms&nbsp;of&nbsp;use
-help.license.text = {0} is free software distributed under the <a href="http://www.gnu.org/copyleft/gpl.html" target="_blank">GPL</a> open-source license.
+help.license.text={0} is free software distributed under the <a href="https://www.gnu.org/licenses/gpl-3.0-standalone.html" target="_blank">GPLv3</a> open-source license.
 help.homepage.title=Homepage
 help.forum.title=Forum
 help.shop.title=Merchandise
@ -319,7 +282,6 @@ help.contact.title = Contact
 help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues">Issue Tracker on Github</a>.
 help.log=Log
 help.logfile=The complete log is saved in {0}.
 # settingsHeader.jsp
 settingsheader.title=Settings
 settingsheader.general=General
@ -338,7 +300,6 @@ 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
@ -355,7 +316,6 @@ 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
@ -368,7 +328,7 @@ advancedsettings.ldapsearchfilter = LDAP search filter
 advancedsettings.ldapmanagerdn=LDAP manager DN<br><div class="detail">(Optional)</div>
 advancedsettings.ldapmanagerpassword=Password
 advancedsettings.ldapautoshadowing=Automatically create users in {0}
-advancedsettings.ldapRequiresRestart = LDAP settings require a restart to take effect
+advancedsettings.ldapRequiresRestart=LDAP settings require a restart to take effect.
 advancedsettings.smtpPort=SMTP port
 advancedsettings.smtpServer=SMTP server
 advancedsettings.smtpEncryption=SMTP encryption
@ -378,7 +338,6 @@ advancedsettings.smtpEncryption.none = None
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=Mail sender
 # personalSettings.jsp
 personalsettings.title=Personal settings for {0}
 personalsettings.language=Language
@ -408,7 +367,7 @@ personalsettings.betaversionnotification = Notify me about new beta versions
 personalsettings.songnotification=Notify me when new songs are played (not supported by all browsers)
 personalsettings.listreloaddelay=Album list reload delay (in seconds, 0 disables)
 personalsettings.paginationsize=Number of initial related albums/directories to display (0 disables album pagination)
-personalsettings.lastfmenabled = Register what I'm playing at <a href="http://last.fm/" target="_blank">Last.fm</a>
+personalsettings.lastfmenabled=Register what I'm playing at <a href="https://www.last.fm/" target="_blank">Last.fm</a>
 personalsettings.lastfmusername=Last.fm username
 personalsettings.lastfmpassword=Last.fm password
 personalsettings.avatar.title=Personal image
@ -416,19 +375,13 @@ personalsettings.avatar.none = No image
 personalsettings.avatar.custom=Custom image
 personalsettings.avatar.changecustom=Change custom image
 personalsettings.avatar.upload=Upload
-personalsettings.avatar.courtesy = Icons courtesy of <a href="http://www.afterglow.ie/" target="_blank">Afterglow</a>, \
+personalsettings.avatar.courtesy=Icons courtesy of <a href="http://www.afterglow.ie/" target="_blank">Afterglow</a>, <a href="http://www.aha-soft.com/" target="_blank">Aha-Soft</a>, <a href="http://www.icons-land.com/" target="_blank">Icons-Land</a>, and <a href="http://www.iconshock.com/" target="_blank">Iconshock</a>
                                   <a href="http://www.aha-soft.com/" target="_blank">Aha-Soft</a>, \
                                   <a href="http://www.icons-land.com/" target="_blank">Icons-Land</a>, and \
                                   <a href="http://www.iconshock.com/" target="_blank">Iconshock</a>
 # avatarUploadResult.jsp
 avataruploadresult.title=Change personal image
 avataruploadresult.success=Successfully uploaded personal image "{0}".
 avataruploadresult.failure=Failed to upload personal image. See <a href="help.view?">log</a> for details.
 # passwordSettings.jsp
 passwordsettings.title=Change password for {0}
 # musicFolderSettings.jsp
 musicfoldersettings.path=Folder
 musicfoldersettings.name=Name
@ -441,20 +394,16 @@ musicfoldersettings.interval.never = Never
 musicfoldersettings.interval.one=Every day
 musicfoldersettings.interval.many=Every {0} days
 musicfoldersettings.hour=at {0}:00
-musicfoldersettings.nowscanning = The media folders are now being scanned. This operation may take several minutes, depending on \
+musicfoldersettings.nowscanning=The media folders are now being scanned. This operation may take several minutes, depending on the size of your media library.
                      the size of your media library.
 musicfoldersettings.scannow=Scan media folders now
 musicfoldersettings.access=Manage user access
 musicfoldersettings.access.description=Configure which folders each user is allowed to access.
 musicfoldersettings.fastcache=Fast access mode
-musicfoldersettings.fastcache.description = Use this option to minimize disk access, for instance if your media files are located on a network disk. \
+musicfoldersettings.fastcache.description=Use this option to minimize disk access, for instance if your media files are located on a network disk. Note: Changed or added files will only be visible after your media folders are scanned.
                                       Note: Changed or added files will only be visible after your media folders are scanned.
 musicfoldersettings.expunge=Clean-up database
-musicfoldersettings.expunge.description = Airsonic stores information about all media files ever encountered. By cleaning up the database, information about \
+musicfoldersettings.expunge.description=Airsonic stores information about all media files ever encountered. By cleaning up the database, information about files that are no longer in your media collection is permanently removed.
                                          files that are no longer in your media collection is permanently removed.
 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.
 # transcodingSettings.jsp
 transcodingsettings.name=Name
 transcodingsettings.sourceformat=Convert from
@ -469,20 +418,7 @@ transcodingsettings.noname = Please specify a name.
 transcodingsettings.nosourceformat=Please specify the format from which to convert.
 transcodingsettings.notargetformat=Please specify the format to which to convert.
 transcodingsettings.nostep1=Please specify at least one transcoding step.
-transcodingsettings.info = <p class="detail">(%s = The file to be transcoded, %b = Max bitrate of the player, %t = Title, %a = Artist, %l = Album)</p> \
+transcodingsettings.info=<p class="detail">(%s = The file to be transcoded, %b = Max bitrate of the player, %t = Title, %a = Artist, %l = Album)</p> <p>Transcoding is the process of converting from one media format to another. {1}''s transcoding engine allows for the streaming of media that would not otherwise be streamable. The transcoding is performed on-the-fly and doesn''t require any disk usage.<p/> <p>The actual transcoding is done by third-party command line programs which must be installed in {0}. You may add your own custom transcoder given that it fulfills the following requirements: <ul> <li>It must have a command line interface.</li> <li>It must be able to send output to stdout.</li> <li>If used in step 2 it must be able to read input from stdin.</li> </ul> </p> <p> Note that transcodings are activated on a per-player basis from <b>Settings &gt; Players</b>.</p>
  <p>Transcoding is the process of converting from one media format to another. {1}''s transcoding \
  engine allows for the streaming of media that would not otherwise be streamable. The transcoding is performed on-the-fly and doesn''t \
  require any disk usage.<p/> \
  <p>The actual transcoding is done by third-party command line programs which must be installed in {0}. \
  You may add your own custom transcoder given that it fulfills the following requirements: \
  <ul> \
  <li>It must have a command line interface.</li> \
  <li>It must be able to send output to stdout.</li> \
  <li>If used in step 2 it must be able to read input from stdin.</li> \
  </ul> \
  </p> \
  <p> Note that transcodings are activated on a per-player basis from <b>Settings &gt; Players</b>.</p>
 # internetRadioSettings.jsp
 internetradiosettings.streamurl=Stream URL
 internetradiosettings.homepageurl=Homepage
@ -491,7 +427,6 @@ 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
@ -508,7 +443,6 @@ 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
@ -520,8 +454,7 @@ playersettings.technology.external_with_playlist.title = External player with pl
 playersettings.technology.jukebox.title=Jukebox
 playersettings.technology.web.text=Play music directly in the web browser using the integrated Flash player.
 playersettings.technology.external.text=Play music in your favorite player, such as WinAmp or Windows Media Player.
-playersettings.technology.external_with_playlist.text = Same as above, but the playlist is managed by the player, rather \
+playersettings.technology.external_with_playlist.text=Same as above, but the playlist is managed by the player, rather than the Airsonic server.  In this mode, skipping within songs is possible.
                                                   than the Airsonic server.  In this mode, skipping within songs is possible.
 playersettings.technology.jukebox.text=Play music directly on the audio device of the Airsonic server. (Authorized users only).
 playersettings.name=Player name
 playersettings.maxbitrate=Max bitrate
@ -533,25 +466,16 @@ playersettings.transcodings = Active transcodings
 playersettings.ok=Save
 playersettings.forget=Delete player
 playersettings.clone=Clone player
 dlnasettings.enabled=Enable DLNA server
-dlnasettings.description = Use this option to turn on the DLNA/UPnP Media Server in Airsonic, \
+dlnasettings.description=Use this option to turn on the DLNA/UPnP Media Server in Airsonic, and stream your media to compatible DLNA players. Requires restart.
                           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. \
+dlnasettings.lanurl.description=The base LAN address to be used for DLNA resources. An example is http://192.168.0.2/airsonic/
                                  An example is http://192.168.0.2/airsonic/
 sonossettings.enabled=Enable Sonos music service
-sonossettings.description = Use this option to turn on the Sonos music service in Airsonic, \
+sonossettings.description=Use this option to turn on the Sonos music service in Airsonic, and stream your media to Sonos devices on your local network. Remember to add Airsonic as a music service from your Sonos controller. Visit <a href="http://sonos.airsonic.org" target="_blank">sonos.airsonic.org</a> for more info. For trouble-shooting, please see the <a href="help.view">log</a>.
                           and stream your media to Sonos devices on your local network. Remember to add Airsonic \
                           as a music service from your Sonos controller. Visit \
                           <a href="http://sonos.airsonic.org" target="_blank">sonos.airsonic.org</a> for more info. \
                           For trouble-shooting, please see the <a href="help.view">log</a>.
 sonossettings.servicename=Music service name
 sonossettings.servicename.description=The name of the music service as it will appear in the Sonos controller.
 # shareSettings.jsp
 sharesettings.name=Name
 sharesettings.owner=Shared by
@ -566,7 +490,6 @@ 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
@ -597,23 +520,18 @@ usersettings.wrongpassword = 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 successfully changed for user {0}.
 # databaseSettings.jsp
-databasesettings.moreinfo = Additional information on database settings can be read at \
+databasesettings.moreinfo=Additional information on database settings can be read on the <a href="https://airsonic.github.io/docs/database/">database documentation</a>.
  <a href="https://github.com/airsonic/airsonic/blob/develop/documentation/DATABASE.md">DATABASE.md</a> on the \
  Airsonic github page.
 databasesettings.configtype=Database Connection Source
 databasesettings.mysqlvarcharmaxlength=MySQL Varchar Maximum Length
 databasesettings.usertablequote=User table Quote
 databasesettings.jndiname=Data Source JNDI Lookup Name
-databasesettings.jdbclibrary = Please ensure that you have your database driver on your \
+databasesettings.jdbclibrary=Please ensure that you have your database driver on your <a href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/classpath.html">Java Classpath</a>
  <a href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/classpath.html">Java Classpath</a>
 databasesettings.embeddriver=JDBC Driver Java classname
 databasesettings.embedurl=JDBC URL
 databasesettings.embedusername=JDBC Username
 databasesettings.embedpassword=JDBC Password
 databasettings.restartRequired=Database settings require a restart to take affect.
 # main.jsp
 main.up=Up
 main.playall=Play all
@ -624,12 +542,7 @@ main.tags = Edit tags
 main.playcount=Played {0} times.
 main.lastplayed=Last played {0}.
 main.comment=Comment
-main.wiki = <table class="detail">\
+main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text           </td><td style="padding-left:3em;padding-right:1em">\\\\                     </td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text         </td><td style="padding-left:3em;padding-right:1em">(empty line)             </td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text  </td><td>List item           </td><td style="padding-left:3em;padding-right:1em">http://foo.com/          </td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
            <tr><td style="padding-right:1em">__text__</td><td>Bold text           </td><td style="padding-left:3em;padding-right:1em">\\\\                     </td><td>Line break</td></tr>\
            <tr><td style="padding-right:1em">~~text~~</td><td>Italic text         </td><td style="padding-left:3em;padding-right:1em">(empty line)             </td><td>New paragraph</td></tr>\
            <tr><td style="padding-right:1em">* text  </td><td>List item           </td><td style="padding-left:3em;padding-right:1em">http://foo.com/          </td><td>Link</td></tr>\
            <tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr>\
            </table>
 main.sharealbum=Share
 main.more=More actions...
 main.more.selection=Selected songs...
@ -652,18 +565,14 @@ main.startradio = Start radio
 main.playtopsongs=Play top songs
 main.showall=Show all albums
 main.topsongs=Top songs
 # rating.jsp
 rating.rating=Rating
 rating.clearrating=Clear rating
 # coverArt.jsp
 coverart.change=Change
 coverart.zoom=Zoom
 # allmusic.jsp
 allmusic.text=Searching for album <em>{0}</em> at allmusic.com - Please wait.
 # changeCoverArt.jsp
 changecoverart.title=Change cover art
 changecoverart.address=Or enter image address
@ -675,10 +584,8 @@ changecoverart.success = Image was successfully downloaded.
 changecoverart.error=Failed to download image.
 changecoverart.noimagesfound=No images found.
 changecoverart.courtesy=Images courtesy of Last.fm
 # changeCoverArtConfirm.jsp
 changeCoverArtConfirm.failed=Failed to change cover art:<br><b>"{0}"</b>
 # editTags.jsp
 edittags.title=Edit tags
 edittags.file=File
@ -698,7 +605,6 @@ edittags.working = Working
 edittags.updated=Updated
 edittags.skipped=Skipped
 edittags.error=Error
 # share.jsp
 share.title=Share
 share.warning=<h2>IMPORTANT NOTICE!</h2><p>Play fair &ndash; Don't share copyrighted material in any manner that violates the law.</p>
@ -706,10 +612,8 @@ share.facebook = Share on Facebook
 share.twitter=Share on Twitter
 share.googleplus=Share on Google+
 share.link=Or share this with someone by sending them this link: <a href="{0}" target="_blank">{0}</a>
-share.disabled = To share your music with someone you must first register your own <em>airsonic.org</em> address.<br> \
+share.disabled=To share your music with someone you must first register your own <em>airsonic.org</em> address.<br> Please go to <a href="networkSettings.view"><b>Settings &gt; Network</b></a> (administrative rights required).
                 Please go to <a href="networkSettings.view"><b>Settings &gt; Network</b></a> (administrative rights required).
 share.manage=Manage my shared media
 # podcastReceiver.jsp
 podcastreceiver.title=Podcasts
 podcastreceiver.empty=You haven't subscribed to any podcasts yet.
@ -730,7 +634,6 @@ podcastreceiver.refresh = Refresh page
 podcastreceiver.settings=Podcast settings
 podcastreceiver.subscribe=Subscribe to podcast
 podcastreceiver.newestepisodes=Newest episodes
 # lyrics.jsp
 lyrics.title=Lyrics
 lyrics.artist=Artist
@ -740,29 +643,20 @@ lyrics.wait = Searching for lyrics, please wait...
 lyrics.courtesy=(Lyrics by <a href="http://www.chartlyrics.com/" target="_blank">chartlyrics.com</a>)
 lyrics.nolyricsfound=No lyrics found.
 lyrics.trylater=Sorry, the lyrics search engine allows just one search every 20 seconds. Try again later.
 # helpPopup.jsp
 helppopup.title={0} Help
 helppopup.transcode.title=Max bitrate
-helppopup.transcode.text = <p>If you have constrained bandwidth, you may set an upper limit for the bitrate of the music streams. \
+helppopup.transcode.text=<p>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.</p>
                           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.</p>
 helppopup.databaseConfigType.title=Data Source Config Type
-helppopup.databaseConfigType.text = <p>Legacy will default to an embed H2 database which is the backwards compatible \
+helppopup.databaseConfigType.text=<p>Legacy will default to an embed H2 database which is the backwards compatible option. Embedded JDBC will connect to a JDBC database with the provided settings. JNDI will lookup a DataSource connection already setup in your application container.</p>
  option. Embedded JDBC will connect to a JDBC database with the provided settings. JNDI will lookup \
  a DataSource connection already setup in your application container.</p>
 helppopup.mysqlvarcharmaxlength.title=MySQL Varchar Max Length
-helppopup.mysqlvarcharmaxlength.text = <p>MySQL has a maximum row length and as such needs varchar columns to be \
+helppopup.mysqlvarcharmaxlength.text=<p>MySQL has a maximum row length and as such needs varchar columns to be bounded. This value entered here will be the maximum column size.</p>
  bounded. This value entered here will be the maximum column size.</p>
 helppopup.usertablequote.title=User Table Quote
-helppopup.usertablequote.text = <p>The Airsonic users table is named user. This may be a keyword conflict in some \
+helppopup.usertablequote.text=<p>The Airsonic users table is named user. This may be a keyword conflict in some databases such as Postgres. So for postgres, you will want to use the double quote character (") here</p>
  databases such as Postgres. So for postgres, you will want to use the double quote character (") here</p>
 helppopup.jndiname.title=Data Source JNDI Lookup Name
-helppopup.jndiname.text = A JNDI name to lookup a Data Source of type javax.sql.DataSource. This is something that is\
+helppopup.jndiname.text=A JNDI name to lookup a Data Source of type javax.sql.DataSource. This is something that iscreated in your application container (i.e. tomcat).
   created in your application container (i.e. tomcat).
 helppopup.embeddriver.title=JDBC Driver Class
-helppopup.embeddriver.text = JDBC Driver dependent class name that implments java.sql.Driver. I.E. for postgres one \
+helppopup.embeddriver.text=JDBC Driver dependent class name that implments java.sql.Driver. I.E. for postgres one would use org.postgresql.Driver. This class must be present on the classpath.
  would use org.postgresql.Driver. This class must be present on the classpath.
 helppopup.playlistfolder.title=Import playlist from
 helppopup.playlistfolder.text=<p>Airsonic will regularly import playlists stored in this folder.</p>
 helppopup.musicmask.title=Music files
@ -772,33 +666,21 @@ helppopup.videomask.text = <p>Allows you to specify the type of files that shoul
 helppopup.coverartmask.title=Cover art files
 helppopup.coverartmask.text=<p>Allows you to specify the type of files that should be recognized as cover art when browsing through the media folder.</p>
 helppopup.downsamplecommand.title=Downsample command
-helppopup.downsamplecommand.text = <p>Allows you to specify the command to execute when downsampling to lower bitrates.</p>\
+helppopup.downsamplecommand.text=<p>Allows you to specify the command to execute when downsampling to lower bitrates.</p><p>(%s = The file to be downsampled, %b = Max bitrate of the player, %t = Title, %a = Artist, %l = Album)</p>
                                   <p>(%s = The file to be downsampled, %b = Max bitrate of the player, %t = Title, %a = Artist, %l = Album)</p>
 helppopup.hlscommand.title=HTTP Live Streaming command
 helppopup.hlscommand.text=<p>The command used to create video segments for Apple''s HLS (HTTP Live Streaming) protocol.</p>
 helppopup.index.title=Index
-helppopup.index.text = <p>Allows you to specify how the index (located on the left side of the screen) should appear. Files and directories \
+helppopup.index.text=<p>Allows you to specify how the index (located on the left side of the screen) should appear. Files and directories directly in the root media folder can be easily accessed using this index.</p> <p>The specification is a space-separated list of index entries. Typically, each entry is simply a single character, but you may also specify multiple characters.  For instance, the entry <em>The</em> will link to all files and  folders starting with "The".</p> <p>You may also create an entry using a group of index characters in parentheses. For instance, the entry <em>A-E(ABCDE)</em> will display as <em>A-E</em> and link to all files and folders starting with either A, B, C, D or E.  This may be useful for grouping less-frequently used characters (such and X, Y and Z), or for grouping accented characters (such as A, \u00C0 and \u00C1)</p> <p>Files and folders that are not covered by an index entry will be placed under the index entry "#".</p>
                       directly in the root media folder can be easily accessed using this index.</p> \
                       <p>The specification is a space-separated list of index entries. Typically, each entry is simply a single character, \
                       but you may also specify multiple characters.  For instance, the entry <em>The</em> will link to all files and  \
                       folders starting with "The".</p> \
                       <p>You may also create an entry using a group of index characters in parentheses. For instance, the entry \
                       <em>A-E(ABCDE)</em> will display as <em>A-E</em> and link to all files and folders starting with either \
                       A, B, C, D or E.  This may be useful for grouping less-frequently used characters (such and X, Y and Z), or \
                       for grouping accented characters (such as A, \u00C0 and \u00C1)</p> \
                       <p>Files and folders that are not covered by an index entry will be placed under the index entry "#".</p>
 helppopup.ignoredarticles.title=Articles to ignore
 helppopup.ignoredarticles.text=<p>Allows you to specify a list of articles (such as "The") that will be ignored when creating the index.</p>
 helppopup.shortcuts.title=Shortcuts
-helppopup.shortcuts.text = <p>A space-separated list of top-level folders to which to create shortcuts. Use quotes to group words, for instance:</p> \
+helppopup.shortcuts.text=<p>A space-separated list of top-level folders to which to create shortcuts. Use quotes to group words, for instance:</p> <p><em>New Incoming "Sound tracks"</em></p>
                           <p><em>New Incoming "Sound tracks"</em></p>
 helppopup.language.title=Language
 helppopup.language.text=<p>Allows you to select the language to use.</p>
 helppopup.visibility.title=Visibility
 helppopup.visibility.text=<p>Select which details should be displayed for each song.</p>
 helppopup.partymode.title=Party mode
-helppopup.partymode.text = <p>When party mode is enabled, the user interface is simplified and easier to operate for non-experienced users. \
+helppopup.partymode.text=<p>When party mode is enabled, the user interface is simplified and easier to operate for non-experienced users. In particular, accidental botching of playlists is avoided.</p>
                           In particular, accidental botching of playlists is avoided.</p>
 helppopup.theme.title=Theme
 helppopup.theme.text=<p>Allows you to select the theme to use. A theme defines the look and feel of {0} in terms of colors, fonts, images etc.</p>
 helppopup.welcomemessage.title=Welcome message
@ -812,43 +694,27 @@ helppopup.downloadlimit.text = <p>An upper limit for how much bandwidth will be
 helppopup.uploadlimit.title=Upload limit
 helppopup.uploadlimit.text=<p>An upper limit for how much bandwidth will be used for uploading files.</p>
 helppopup.streamport.title=Non-SSL stream port
-helppopup.streamport.text = <p>This option is relevant only if you use {0} on a server with SSL (HTTPS).</p><p>Some players \
+helppopup.streamport.text=<p>This option is relevant only if you use {0} on a server with SSL (HTTPS).</p><p>Some players (such as Winamp) don''t support streaming over SSL. Specify the port number for regular http (usually 80 or 4040) if you don''t want the streams to be transmitted over SSL. Note that the streams will not be encrypted.</p>
                            (such as Winamp) don''t support streaming over SSL. Specify the port number for regular http (usually 80 \
                             or 4040) if you don''t want the streams to be transmitted over SSL. Note that the streams will not be encrypted.</p>
 helppopup.ldap.title=LDAP authentication
-helppopup.ldap.text = <p>Users can be authenticated by an external LDAP server (including Windows Active Directory). \
+helppopup.ldap.text=<p>Users can be authenticated by an external LDAP server (including Windows Active Directory). When LDAP-enabled users log on to {0}, the username and password are checked by the external server, not by {0} itself.</p>
                      When LDAP-enabled users log on to {0}, the username and password are checked by the external server, not by {0} itself.</p>
 helppopup.ldapurl.title=LDAP URL
-helppopup.ldapurl.text = <p>The URL of the LDAP server. The protocol must be either <em>ldap://</em> or <em>ldaps://</em> \
+helppopup.ldapurl.text=<p>The URL of the LDAP server. The protocol must be either <em>ldap://</em> or <em>ldaps://</em> (for LDAP over SSL). See <a href="http://java.sun.com/products/jndi/tutorial/ldap/misc/url.html" target="_blank">here</a> for a more detailed description.</p>
                         (for LDAP over SSL). See <a href="http://java.sun.com/products/jndi/tutorial/ldap/misc/url.html" target="_blank">here</a> \
                         for a more detailed description.</p>
 helppopup.ldapsearchfilter.title=LDAP search filter
-helppopup.ldapsearchfilter.text = <p>The filter expression used in the user search. This is an LDAP search filter \
+helppopup.ldapsearchfilter.text=<p>The filter expression used in the user search. This is an LDAP search filter (as defined in <a href="http://www.ietf.org/rfc/rfc2254.txt" target="_blank">RFC 2254</a>). The pattern "'{0'}" is replaced by the username, for instance: <ul><li>(uid='{0'}) - this would search for a username match on the uid attribute.</li> <li>(sAMAccountName='{0'}) - typically used for authentication in Microsoft Active Directory.</li> </ul></p>
                                  (as defined in <a href="http://www.ietf.org/rfc/rfc2254.txt" target="_blank">RFC 2254</a>). \
                                  The pattern "'{0'}" is replaced by the username, for instance: \
                                  <ul>\
                                    <li>(uid='{0'}) - this would search for a username match on the uid attribute.</li> \
                                    <li>(sAMAccountName='{0'}) - typically used for authentication in Microsoft Active Directory.</li> \
                                  </ul></p>
 helppopup.ldapmanagerdn.title=LDAP manager DN
-helppopup.ldapmanagerdn.text = <p>If the LDAP server doesn''t support anonymous binding you must specify the DN \
+helppopup.ldapmanagerdn.text=<p>If the LDAP server doesn''t support anonymous binding you must specify the DN (<em>Distinguished Name</em>) and password of the LDAP user to use when binding.</p>
                                  (<em>Distinguished Name</em>) and password of the LDAP user to use when binding.</p>
 helppopup.ldapautoshadowing.title=Automatically create LDAP users in {0}
-helppopup.ldapautoshadowing.text = <p>With this option selected, LDAP users don''t have to be manually created in {0} before logging on.</p> \
+helppopup.ldapautoshadowing.text=<p>With this option selected, LDAP users don''t have to be manually created in {0} before logging on.</p> <p>NOTE! This means that any user with a valid LDAP username and password can log on to {0}, which may not be what you want.</p>
                                   <p>NOTE! This means that any user with a valid LDAP username and password can log on to {0}, \
                                   which may not be what you want.</p>
 helppopup.playername.title=Player name
 helppopup.playername.text=<p>Allows you to specify an easy-to-remember name for a player, such as "Work" or "Living room".</p>
 helppopup.autocontrol.title=Control player automatically
-helppopup.autocontrol.text = <p>With this option selected, {0} will automatically start the player when you click "Play" \
+helppopup.autocontrol.text=<p>With this option selected, {0} will automatically start the player when you click "Play" in the playlist. Otherwise, you must start and connect the player yourself.</p>
                             in the playlist. Otherwise, you must start and connect the player yourself.</p>
 helppopup.m3ubom.title=Apply BOM in M3U file
 helppopup.m3ubom.text=<p>Apply a BOM mark in generated M3U playlists for Unicode compatibility.</p>
 helppopup.dynamicip.title=Dynamic IP address
 helppopup.dynamicip.text=<p>Turn off this option if the player uses a static IP address.</p>
 helppopup.smtpServer.title=SMTP Server
-helppopup.smtpServer.text = <p>The hostname of the SMTP server. This server will be used to send e-mails to users \
+helppopup.smtpServer.text=<p>The hostname of the SMTP server. This server will be used to send e-mails to users who have requested a password reset.</p>
                            who have requested a password reset.</p>
 helppopup.smtpPort.title=SMTP Port
 helppopup.smtpPort.text=<p>The server's port that should be connected to for SMTP traffic.</p>
 helppopup.smtpCredentials.title=SMTP Credentials
@ -857,16 +723,13 @@ helppopup.smtpEncryption.title = SMTP Encryption
 helppopup.smtpEncryption.text=<p>The encryption method to be used to connect to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for mails originating from the Airsonic server. Must be a valid e-mail address.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that any subfolder whose name starts with a dot (.) or @eaDir is ignored. Also all Thumbs.db files are.</p>
 # 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
@ -874,7 +737,6 @@ 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
@ -882,13 +744,10 @@ 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 now being created. Please try again later.
 # wap/settings.jsp
 wap.settings.selectplayer=Select player
 wap.settings.allplayers=All