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 d24cae72..ab9ebfa9 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
@@ -23,34 +23,34 @@ common.edit=Edit
common.confirm=Please confirm
common.unknown=(Unknown)
common.default=(Default)
-common.settingssaved=Settings were saved.
+common.settingssaved=Settings saved.
# login.jsp
login.username=Username
login.password=Password
login.login=Log in
login.remember=Remember me
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
password "admin". Then change password immediately.
+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 email address below.
-recover.username=Username or email address
+recover.text=To reset your password, please enter your username or e-mail address below.
+recover.username=Username or e-mail address
recover.send=Reset the password and send it to me
-recover.success=Your password was reset and sent to {0}.
+recover.success=New password sent to {0}.
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.
+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, we 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.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 folders settings +notFound.scan=Media folder settings # top.jsp top.home=Home top.now_playing=Playing @@ -61,15 +61,15 @@ top.podcast=Podcasts top.more=More top.help=About top.search=Search -top.upgrade=A new version is available. Download {0} {1} here. +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... +left.scanning=Scanning media folders… left.statistics={0} artistsWelcome to Airsonic! We'll set you up in no time, just follow the basic steps below.
Click the "Home" button in the toolbar above to return to this screen.
For more information, please consult the first start guide.
-gettingStarted.root=Warning! The Airsonic process is running as the root user. Please consider to change this. +gettingStarted.text=Welcome 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. gettingStarted.step1.title=Change administrator password. 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. gettingStarted.step2.title=Set up media folders. gettingStarted.step2.text=Tell Airsonic where you keep your music and videos. gettingStarted.step3.title=Find our external documentation. -gettingStarted.step3.text=In the case that you want to enhance Airsonic, you may want to checkout our documentation, which provides guidance for setting up SSL, URL rewriting, LDAP, and an external database. gettingStarted.hide=Don't show this again -gettingStarted.hidealert=To show this screen again, go to Settings > General > Show getting started on startup. +gettingStarted.hidealert=To give the guide another glance, go to Settings → General → Show "Getting started" on startup. # home.jsp home.random.title=Random home.alphabetical.title=All @@ -183,7 +183,7 @@ home.recent.text=Recently played albums home.decade.text=Decade home.genre.text=Genre home.users.text=User statistics -home.scan=The media folder is now being scanned. Some features are not available. +home.scan=The media folder is being scanned. Features related to it are not available. home.albums=Albums {0}–{1} home.playcount=Played {0} songs home.lastplayed=Played {0} @@ -198,7 +198,7 @@ more.title=More more.random.title=Shuffle play 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.auto=Play more random songs when a play queue reaches its end. more.random.ok=OK more.random.add=Add to queue more.random.radio=Shuffle radio @@ -229,22 +229,22 @@ more.apps.text=Check out the steadily growing list of Monitor the real-time status of all network media streams. more.keyboard.title=Keyboard Shortcuts -more.keyboard.text=Keyboard shortcuts can be enabled in the user preferences page. Supported shortcuts are below. +more.keyboard.text=Keyboard shortcuts can be enabled in the user preferences. Supported shortcuts are listed below. more.keyboard.playback=Playback more.keyboard.navigation=Navigation more.keyboard.general=General more.keyboard.playpause=Play or pause music -more.keyboard.previous=Go to the previous song -more.keyboard.next=Go to the next song -more.keyboard.volumedown=Decrease the player volume -more.keyboard.volumeup=Increase the player volume +more.keyboard.previous=Go to previous song +more.keyboard.next=Go to next song +more.keyboard.volumedown=Decrease player volume +more.keyboard.volumeup=Increase player volume more.keyboard.home=Go to Home -more.keyboard.playlists=Go to Playlists -more.keyboard.podcasts=Go to Podcasts -more.keyboard.settings=Go to Settings -more.keyboard.starred=Go to Starred -more.keyboard.more=Go to More -more.keyboard.about=Go to About +more.keyboard.playlists=Go to playlists +more.keyboard.podcasts=Go to podcasts +more.keyboard.settings=Go to settings +more.keyboard.starred=Go to starred +more.keyboard.more=Go to more +more.keyboard.about=Go to about more.keyboard.search=Search more.keyboard.sidebar=Toggle left sidebar more.keyboard.playqueue=Toggle play queue @@ -253,33 +253,33 @@ more.keyboard.then=then more.mobile.title=Mobile phone more.mobile.text=
You can control {0} from any WAP-enabled mobile phone or PDA.
Simply visit the following URL from your phone: http://yourhostname/wap
This requires that your server can be reached from the Internet.
more.podcast.title=Podcast -more.podcast.text=Saved playlists are available as Podcasts.
Use the following URL in your Podcast receiver: http://yourhostname/podcast, or click here.
Saved playlists are available as Podcasts.
Enter this URL on your podcast receiver: http://yourhostname/podcast, or click here.
(%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 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.
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:
Note that transcodings are activated on a per-player basis from Settings > Players.
+transcodingsettings.info=(%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 → Players.
# internetRadioSettings.jsp internetradiosettings.streamurl=Stream URL internetradiosettings.homepageurl=Homepage internetradiosettings.name=Name internetradiosettings.enabled=Enabled -internetradiosettings.add=Add Internet TV/radio +internetradiosettings.add=Add Internet TV & radio internetradiosettings.nourl=Please specify a URL. internetradiosettings.noname=Please specify a name. # podcastSettings.jsp @@ -438,13 +438,13 @@ podcastsettings.keep.many=Last {0} episodes podcastsettings.download=When new episodes are available podcastsettings.download.all=Download all podcastsettings.download.one=Download the most recent one -podcastsettings.download.many=Download last {0} episodes +podcastsettings.download.many=Download the last {0} episodes podcastsettings.download.none=Do nothing podcastsettings.interval.manually=Manually podcastsettings.interval.hourly=Every hour podcastsettings.interval.daily=Every day podcastsettings.interval.weekly=Every week -podcastsettings.folder=Save Podcasts in +podcastsettings.folder=Save podcasts in # playerSettings.jsp playersettings.noplayers=No players found. playersettings.type=Type @@ -456,31 +456,31 @@ playersettings.technology.external_with_playlist.title=External player with play playersettings.technology.jukebox.title=Jukebox playersettings.technology.java_jukebox.title=Java 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 than the Airsonic server. In this mode, skipping within songs is possible. +playersettings.technology.external.text=Play music in your favorite player, such as VLC or mpv. +playersettings.technology.external_with_playlist.text=Same as above, but with the playlist managed by the player, rather 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.technology.java_jukebox.text=Jukebox player that uses the Java Sound API. (Authorized users only). playersettings.name=Player name playersettings.javaJukeboxMixer=Audio device playersettings.maxbitrate=Max bitrate -playersettings.notranscoder=Notice: Transcoders does not appear to be installed.__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 |
Play fair – Don't share copyrighted material in any manner that violates the law.
+share.warning=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 share.twitter=Share on Twitter share.googleplus=Share on Google+ @@ -644,28 +644,28 @@ lyrics.title=Lyrics lyrics.artist=Artist lyrics.song=Song lyrics.search=Search -lyrics.wait=Searching for lyrics, please wait... +lyrics.wait=Searching for lyrics, please wait… lyrics.courtesy=(Lyrics by chartlyrics.com) 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=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.
+helppopup.transcode.text=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.
helppopup.databaseConfigType.title=Data Source Config Type -helppopup.databaseConfigType.text=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.
+helppopup.databaseConfigType.text="Legacy" will default to an embedded H2 database, which is the backwards compatible option. "Embedded JDBC" will connect to a JDBC database with the provided settings. "JNDI" will look up a DataSource connection already set up in your application container.
helppopup.mysqlvarcharmaxlength.title=MySQL Varchar Max Length -helppopup.mysqlvarcharmaxlength.text=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.
+helppopup.mysqlvarcharmaxlength.text=MySQL has a maximum row length, and as such needs varchar columns to be bound. The value entered here will be the maximum column size.
helppopup.usertablequote.title=User Table Quote -helppopup.usertablequote.text=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
-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 iscreated in your application container (i.e. tomcat). +helppopup.usertablequote.text=The Airsonic user table is named "user", without quotes. This may result in a keyword conflict with some database systems. Encasing it in one set of quotes ""user"", works for PostgreSQL
+helppopup.jndiname.title=Lookup Name for JNDI Data Source +helppopup.jndiname.text=A JNDI name to look up a data source of type javax.sql.DataSource. It is 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 would use org.postgresql.Driver. This class must be present on the classpath. +helppopup.embeddriver.text=JDBC Driver dependent class name that implments java.sql.Driver. I.e. for PostgreSQL one would use org.postgresql.Driver. This class must be present in the classpath. helppopup.excludepattern.title=Exclude Pattern -helppopup.excludepattern.text=Airsonic will not import any files which match this regular expression pattern.
+helppopup.excludepattern.text=Airsonic will not import any files matching this regular expression pattern.
helppopup.playlistfolder.title=Import playlist from -helppopup.playlistfolder.text=Airsonic will regularly import playlists stored in this folder.
+helppopup.playlistfolder.text=Playlists in this folder will be imported reqularly.
helppopup.musicmask.title=Music files helppopup.musicmask.text=Allows you to specify the type of files that should be recognized as music.
helppopup.videomask.title=Video files @@ -673,17 +673,17 @@ helppopup.videomask.text=Allows you to specify the type of files that should helppopup.coverartmask.title=Cover art files helppopup.coverartmask.text=
Allows you to specify the type of files that should be recognized as cover art when browsing through the media folder.
helppopup.downsamplecommand.title=Downsample command -helppopup.downsamplecommand.text=Allows you to specify the command to execute when downsampling to lower bitrates.
(%s = The file to be downsampled, %b = Max bitrate of the player, %t = Title, %a = Artist, %l = Album)
+helppopup.downsamplecommand.text=Allows you to specify the command for downsampling to lower bitrates.
(%s = The file to be downsampled, %b = Max bitrate of the player, %t = Title, %a = Artist, %l = Album)
helppopup.hlscommand.title=HTTP Live Streaming command -helppopup.hlscommand.text=The command used to create video segments for Apple''s HLS (HTTP Live Streaming) protocol.
+helppopup.hlscommand.text=The command used to create video segments for Apple's HTTP Live Streaming (HLS) protocol.
helppopup.index.title=Index -helppopup.index.text=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.
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 The will link to all files and folders starting with "The".
You may also create an entry using a group of index characters in parentheses. For instance, the entry A-E(ABCDE) will display as A-E 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)
Files and folders that are not covered by an index entry will be placed under the index entry "#".
+helppopup.index.text=Allows you to specify index (located on the left side of the screen) appearance. Files and directories directly in the root media folder can be easily accessed using this index.
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 The will link to all files and folders starting with "The".
You may also create an entry using a group of index characters in parentheses. For instance, the entry A-E(ABCDE) will display as A-E 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)
Files and folders that are not covered by an index entry will be placed under the index entry "#".
helppopup.ignoredarticles.title=Articles to ignore helppopup.ignoredarticles.text=Allows you to specify a list of articles (such as "The") that will be ignored when creating the index.
helppopup.shortcuts.title=Shortcuts -helppopup.shortcuts.text=A space-separated list of top-level folders to which to create shortcuts. Use quotes to group words, for instance:
New Incoming "Sound tracks"
+helppopup.shortcuts.text=A space-separated list of top-level folders to create shortcuts to. Use quotes to group words, for instance:
New Incoming "Sound tracks"
helppopup.language.title=Language -helppopup.language.text=Allows you to select the language to use.
+helppopup.language.text=Language used in Airsonic.
helppopup.visibility.title=Visibility helppopup.visibility.text=Select which details should be displayed for each song.
helppopup.partymode.title=Party mode @@ -693,25 +693,25 @@ helppopup.theme.text=Allows you to select the theme to use. A theme defines t helppopup.welcomemessage.title=Welcome message helppopup.welcomemessage.text=
The message that is displayed on the home page.
helppopup.loginmessage.title=Login message -helppopup.loginmessage.text=The message that is displayed on the login page.
+helppopup.loginmessage.text=The message displayed on the login page.
helppopup.coverartlimit.title=Cover art limit helppopup.coverartlimit.text=The maximum number of cover art images to display on a single page.
helppopup.downloadlimit.title=Download limit -helppopup.downloadlimit.text=An upper limit for how much bandwidth will be used for downloading files.
+helppopup.downloadlimit.text=An upper limit for how much bandwidth can be used for downloading files.
helppopup.uploadlimit.title=Upload limit -helppopup.uploadlimit.text=An upper limit for how much bandwidth will be used for uploading files.
+helppopup.uploadlimit.text=An upper limit for how much bandwidth can be used for uploading files.
helppopup.streamport.title=Non-SSL stream port -helppopup.streamport.text=This option is relevant only if you use {0} on a server with SSL (HTTPS).
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.
+helppopup.streamport.text=This option is relevant only if you use {0} on a server with SSL (HTTPS).
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.
helppopup.ldap.title=LDAP authentication helppopup.ldap.text=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.
helppopup.ldapurl.title=LDAP URL -helppopup.ldapurl.text=The URL of the LDAP server. The protocol must be either ldap:// or ldaps:// (for LDAP over SSL). See here for a more detailed description.
+helppopup.ldapurl.text=The URL of the LDAP server. The protocol must be either ldap:// or ldaps:// (for LDAP over SSL). See here for a detailed description.
helppopup.ldapsearchfilter.title=LDAP search filter -helppopup.ldapsearchfilter.text=The filter expression used in the user search. This is an LDAP search filter (as defined in RFC 2254). The pattern "'{0'}" is replaced by the username, for instance:
The filter expression used for user searches. This is an LDAP search filter (as defined in RFC 2254). The pattern "'{0'}" is replaced by the username, for instance:
If the LDAP server doesn''t support anonymous binding you must specify the DN (Distinguished Name) and password of the LDAP user to use when binding.
+helppopup.ldapmanagerdn.text=If the LDAP server doesn't support anonymous binding, you must specify the DN (Distinguished Name) and password of the LDAP user to use when binding.
helppopup.ldapautoshadowing.title=Automatically create LDAP users in {0} -helppopup.ldapautoshadowing.text=With this option selected, LDAP users don''t have to be manually created in {0} before logging on.
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.
+helppopup.ldapautoshadowing.text=With this option selected, LDAP users don't have to be manually created in {0} before logging in.
Note! This means any user with a valid LDAP username and password can log onto {0}, which may not be what you want.
helppopup.playername.title=Player name helppopup.playername.text=Allows you to specify an easy-to-remember name for a player, such as "Work" or "Living room".
helppopup.autocontrol.title=Control player automatically @@ -719,19 +719,19 @@ helppopup.autocontrol.text=With this option selected, {0} will automatically helppopup.m3ubom.title=Apply BOM in M3U file helppopup.m3ubom.text=
Apply a BOM mark in generated M3U playlists for Unicode compatibility.
helppopup.dynamicip.title=Dynamic IP address -helppopup.dynamicip.text=Turn off this option if the player uses a static IP address.
+helppopup.dynamicip.text=If the player uses a static IP address this should be turned off.
helppopup.smtpServer.title=SMTP Server helppopup.smtpServer.text=The hostname of the SMTP server. This server will be used to send e-mails to users who have requested a password reset.
helppopup.smtpPort.title=SMTP Port -helppopup.smtpPort.text=The server's port that should be connected to for SMTP traffic.
+helppopup.smtpPort.text=Server port to connect to for outgoing e-mail traffic.
helppopup.smtpCredentials.title=SMTP Credentials -helppopup.smtpCredentials.text=The credentials to be used to connect to the SMTP server. Leave empty to connect without authentication.
+helppopup.smtpCredentials.text=The credentials for connecting to the SMTP server. Leave empty to connect without authentication.
helppopup.smtpEncryption.title=SMTP Encryption -helppopup.smtpEncryption.text=The encryption method to be used to connect to the SMTP server. Choose "None" for no encryption.
+helppopup.smtpEncryption.text=Encryption method used for connections to the SMTP server. Choose "None" for no encryption.
helppopup.smtpFrom.title=From address -helppopup.smtpFrom.text=The sender address for mails originating from the Airsonic server. Must be a valid e-mail address.
+helppopup.smtpFrom.text=The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.
helppopup.scanMediaFolders.title=Media folders scanning rules -helppopup.scanMediaFolders.text=Note that any subfolder whose name starts with a dot (.) or @eaDir is ignored. Also all Thumbs.db files are.
+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 @@ -754,7 +754,7 @@ 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.searchresult.index=The search index is being created. Please try again later. # wap/settings.jsp wap.settings.selectplayer=Select player wap.settings.allplayers=All