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 8ca7b80b..093d5f45 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
@@ -266,7 +266,7 @@ internalhelp.title=About {0} Internals
internalhelp.details=Internal details
internalhelp.statistics=Statistics
internalhelp.database=Database
-internalhalp.databaseconsistency=Database Consistency
+internalhelp.databaseconsistency=Database Consistency
internalhelp.index=Search Index
internalhelp.filesystem=Filesystem
internalhelp.transcoding=Transcoding
@@ -274,11 +274,67 @@ internalhelp.musicfolders=Music Folders
internalhelp.locale=Locale
internalhelp.defaultlocale=Default locale
internalhelp.defaultcharset=Default charset encoding
+internalhelp.defaultcharset.ok=Java default charset appears to have UTF-8 support.
+internalhelp.defaultcharset.warn=Java default charset appears to have no UTF-8 support. International characters may be partially supported.
+internalhelp.folderisreadable.ok=Airsonic appears to have the correct permissions for music folder "{0}".
+internalhelp.folderisreadable.warn=Airsonic does not have the correct permissions for music folder "{0}".
internalhelp.folderisreadable=Folder "{0}": Read access
internalhelp.folderiswritable=Folder "{0}": Write access
internalhelp.folderfsusage=Folder "{0}": Free space on filesystem
internalhelp.fsusage=Airsonic Home: Free space on filesystem
internalhelp.fshomesize=Airsonic Home: Directory size
+internalhelp.lastscandate=Last scan date
+internalhelp.totaldurationseconds=Total duration (s)
+internalhelp.totalsizebytes=Total size (bytes)
+internalhelp.luceneversion=Lucene version
+internalhelp.albumcount=Album count
+internalhelp.artistcount=Artist count
+internalhelp.songcount=Song count
+internalhelp.musiccount=Music file count
+internalhelp.podcastcount=Podcast count
+internalhelp.directorycount=Directory count
+internalhelp.artistid3count=Artist (ID3) count
+internalhelp.albumid3count=Album (ID3) count
+internalhelp.songdeletedcount=Deleted song count
+internalhelp.musicdeletedcount=Deleted music file count
+internalhelp.podcastdeletedcount=Deleted podcast count
+internalhelp.directorydeletedcount=Deleted directory count
+internalhelp.albumdeletedcount=Deleted album count
+internalhelp.artistdeletedcount=Deleted artist count
+internalhelp.artistid3deletedcount=Deleted artist (ID3) count
+internalhelp.albumid3deletedcount=Deleted album (ID3) count
+internalhelp.distinctalbumcount=Distinct album count
+internalhelp.distinctartistcount=Distinct artist count
+internalhelp.distinctalbumartistcount=Distinct album artist count
+internalhelp.dbnonpresent.ok=The database does not contain non-present items.
+internalhelp.dbnonpresent.warn=The database contains non-present items. Run "clean-up database" to clean them up.
+internalhelp.dbdrivername=Database driver name
+internalhelp.dbdriverversion=Database driver version
+internalhelp.dbdirectorysize=Size of the internal database directory
+internalhelp.dblogsize=Size of the internal database log
+internalhelp.dblogsize.ok=The size of the database log file (db/airsonic.log) appears healthy.
+internalhelp.dblogsize.warn=The size of the database log file (db/airsonic.log) is large (greater than 256M). Run a scan to clean it up.
+internalhelp.tablecount={0} row count
+internalhelp.mediafilesinnonpresentmusicfoldercount=Nubmer of media files in non-present music folders
+internalhelp.mediafilesinnonpresentmusicfoldercount.ok=All media files in the database have a valid music folder.
+internalhelp.mediafilesinnonpresentmusicfoldercount.warn=The media file database contains files whose music folder is no longer present. Examples are below.
+internalhelp.mediafileswithmusicfoldermismatchcount=Number of media files with music folder mismatch
+internalhelp.mediafileswithmusicfoldermismatchcount.ok=All media files in the database match their music folder.
+internalhelp.mediafileswithmusicfoldermismatchcount.warn=The media file database contains files whose path does not match their music folder path. Examples are below.
+internalhelp.tool.path={0} path
+internalhelp.tool.isreadable={0} is readable?
+internalhelp.tool.isexecutable={0} is executable?
+internalhelp.tool.ok={0} appears configured correctly.
+internalhelp.tool.warn={0} is either missing or not executable. Transcoding may not work properly.
+internalhelp.user.language=user.language property
+internalhelp.user.country=user.country property
+internalhelp.file.encoding=file.encoding property
+internalhelp.file.encoding.ok=Java file encoding appears to have UTF-8 support.
+internalhelp.file.encoding.warn=Java file encoding appears to have no UTF-8 support. International characters may be partially supported.
+internalhelp.sun.jnu.encoding=sun.jnu.encoding property
+internalhelp.sun.io.unicode.encoding=sun.io.unicode.encoding property
+internalhelp.langvar=LANG environment variable
+internalhelp.lcallvar=LC_ALL environment variable
help.title=About {0}
help.upgrade=New version available. Download {0} {1} here.
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/internalhelp.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/internalhelp.jsp
index e0327a6c..36929506 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/internalhelp.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/internalhelp.jsp
@@ -54,12 +54,12 @@
- ${model.statAlbumCount} |
- ${model.statArtistCount} |
- ${model.statSongCount} |
- ${model.statLastScanDate} |
- ${model.statTotalDurationSeconds} |
- ${model.statTotalLengthBytes} |
+ ${model.statAlbumCount} |
+ ${model.statArtistCount} |
+ ${model.statSongCount} |
+ ${model.statLastScanDate} |
+ ${model.statTotalDurationSeconds} |
+ ${model.statTotalLengthBytes} |
@@ -70,20 +70,17 @@
- ${model.indexLuceneVersion} |
-
-
- ${model.indexSongDeletedCount} |
- ${model.indexAlbumDeletedCount} |
- ${model.indexArtistDeletedCount} |
- ${model.indexAlbumId3DeletedCount} |
- ${model.indexArtistId3DeletedCount} |
-
- ${model.indexSongCount} |
- ${model.indexAlbumCount} |
- ${model.indexArtistCount} |
- ${model.indexAlbumId3Count} |
- ${model.indexArtistId3Count} |
+ ${model.indexLuceneVersion} |
+ ${model.indexSongDeletedCount} |
+ ${model.indexAlbumDeletedCount} |
+ ${model.indexArtistDeletedCount} |
+ ${model.indexAlbumId3DeletedCount} |
+ ${model.indexArtistId3DeletedCount} |
+ ${model.indexSongCount} |
+ ${model.indexAlbumCount} |
+ ${model.indexArtistCount} |
+ ${model.indexAlbumId3Count} |
+ ${model.indexArtistId3Count} |
@@ -100,52 +97,50 @@
- The database log file (db/airsonic.log) appears healthy.
+
- The database log file (db/airsonic.log) is large (greater than 256M). Run a scan to clean it up.
+
- ${model.dbDriverName} |
- ${model.dbDriverVersion} |
- ${model.dbDirectorySize} |
- ${model.dbLogSize} |
+ ${model.dbDriverName} |
+ ${model.dbDriverVersion} |
+ ${model.dbDirectorySize} |
+ ${model.dbLogSize} |
- The database does not contain non-present items.
+
- The database contains non-present items. Run "clean-up database" to clean them up.
+
|
- ${model.dbMediaFileMusicNonPresentCount} |
- ${model.dbMediaFilePodcastNonPresentCount} |
- ${model.dbMediaFileDirectoryNonPresentCount} |
- ${model.dbMediaFileAlbumNonPresentCount} |
-
- ${model.dbMediaFileMusicPresentCount} |
- ${model.dbMediaFilePodcastPresentCount} |
- ${model.dbMediaFileDirectoryPresentCount} |
- ${model.dbMediaFileAlbumPresentCount} |
-
- ${model.dbMediaFileDistinctAlbumCount} |
- ${model.dbMediaFileDistinctArtistCount} |
- ${model.dbMediaFileDistinctAlbumArtistCount} |
+ ${model.dbMediaFileMusicNonPresentCount} |
+ ${model.dbMediaFilePodcastNonPresentCount} |
+ ${model.dbMediaFileDirectoryNonPresentCount} |
+ ${model.dbMediaFileAlbumNonPresentCount} |
+ ${model.dbMediaFileMusicPresentCount} |
+ ${model.dbMediaFilePodcastPresentCount} |
+ ${model.dbMediaFileDirectoryPresentCount} |
+ ${model.dbMediaFileAlbumPresentCount} |
+ ${model.dbMediaFileDistinctAlbumCount} |
+ ${model.dbMediaFileDistinctArtistCount} |
+ ${model.dbMediaFileDistinctAlbumArtistCount} |
- ${tableCount.value} |
+ ${tableCount.value} |
@@ -153,7 +148,7 @@
-
+
@@ -162,17 +157,17 @@
- All media files in the database have a valid music folder.
+
- The media file database contains files whose music folder is no longer present. Examples are below.
+
- ${model.dbMediaFilesInNonPresentMusicFoldersCount} |
+ ${model.dbMediaFilesInNonPresentMusicFoldersCount} |
@@ -189,17 +184,17 @@
- All media files in the database match their music folder.
+
- The media file database contains files whose path does not match their music folder path. Examples are below.
+
- ${model.dbMediaFilesWithMusicFolderMismatchCount} |
+ ${model.dbMediaFilesWithMusicFolderMismatchCount} |
@@ -224,11 +219,11 @@
- Airsonic appears to have the correct permissions for music folder "${musicFolderStatistics.key}".
+
- Airsonic does not have the correct permissions for music folder "${musicFolderStatistics.key}".
+
@@ -252,35 +247,35 @@
- Ffprobe appears configured correctly.
+
- Ffprobe is either missing or not executable. Transcoding may not work properly.
+
- ${model.fsFfprobeInfo.path} |
- ${model.fsFfprobeInfo.readable} |
- ${model.fsFfprobeInfo.executable} |
+ ${model.fsFfprobeInfo.path} |
+ ${model.fsFfprobeInfo.readable} |
+ ${model.fsFfprobeInfo.executable} |
- Ffmpeg appears configured correctly.
+
- Ffmpeg is either missing or not executable. Transcoding may not work properly.
+
|
- ${model.fsFfmpegInfo.path} |
- ${model.fsFfmpegInfo.readable} |
- ${model.fsFfmpegInfo.executable} |
+ ${model.fsFfmpegInfo.path} |
+ ${model.fsFfmpegInfo.readable} |
+ ${model.fsFfmpegInfo.executable} |
@@ -307,25 +302,25 @@
${model.localeDefaultCharset} |
${model.localeDefault} |
- ${model.localeUserLanguage} |
- ${model.localeUserCountry} |
+ ${model.localeUserLanguage} |
+ ${model.localeUserCountry} |
- Java file encoding appears to have UTF-8 support.
+
- Java file encoding appears to have no UTF-8 support. International characters may be partially supported.
+
|
- ${model.localeFileEncoding} |
- ${model.localeSunJnuEncoding} |
- ${model.localeSunIoUnicodeEncoding} |
+ ${model.localeFileEncoding} |
+ ${model.localeSunJnuEncoding} |
+ ${model.localeSunIoUnicodeEncoding} |
@@ -335,7 +330,7 @@
- ${model.localeLang} |
+ ${model.localeLang} |
@@ -345,7 +340,7 @@
- ${model.localeLcAll} |
+ ${model.localeLcAll} |