aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Emby.Server.Implementations/Library/UserViewManager.cs2
-rw-r--r--Emby.Server.Implementations/Localization/Core/ar.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/bg-BG.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/ca.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/cs.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/da.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/de.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/en-GB.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/en-US.json187
-rw-r--r--Emby.Server.Implementations/Localization/Core/es-AR.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/es-MX.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/es.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/fr-CA.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/fr.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/he.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/hr.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/hu.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/it.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/kk.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/ko.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/lt-LT.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/ms.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/nb.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/nl.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/pl.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/pt-BR.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/pt-PT.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/ru.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/sk.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/sl-SI.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/sv.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/tr.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/zh-CN.json1
-rw-r--r--Emby.Server.Implementations/Localization/Core/zh-HK.json1
-rw-r--r--SocketHttpListener/Net/HttpConnection.cs8
35 files changed, 134 insertions, 95 deletions
diff --git a/Emby.Server.Implementations/Library/UserViewManager.cs b/Emby.Server.Implementations/Library/UserViewManager.cs
index dd478dee0..e97bf11c3 100644
--- a/Emby.Server.Implementations/Library/UserViewManager.cs
+++ b/Emby.Server.Implementations/Library/UserViewManager.cs
@@ -96,7 +96,7 @@ namespace Emby.Server.Implementations.Library
if (parents.Count > 0)
{
var localizationKey = string.Equals(viewType, CollectionType.TvShows, StringComparison.OrdinalIgnoreCase) ?
- "Shows" :
+ "TvShows" :
"Movies";
list.Add(GetUserView(parents, viewType, localizationKey, string.Empty, user, query.PresetViews, cancellationToken));
diff --git a/Emby.Server.Implementations/Localization/Core/ar.json b/Emby.Server.Implementations/Localization/Core/ar.json
index 0bc7490d3..0c2ab1f6d 100644
--- a/Emby.Server.Implementations/Localization/Core/ar.json
+++ b/Emby.Server.Implementations/Localization/Core/ar.json
@@ -27,6 +27,7 @@
"Artists": "\u0627\u0644\u0641\u0646\u0627\u0646\u0648\u0646",
"Folders": "\u0627\u0644\u0645\u062c\u0644\u062f\u0627\u062a",
"Songs": "\u0627\u0644\u0623\u063a\u0627\u0646\u064a",
+ "TvShows": "TV Shows",
"Shows": "Shows",
"Genres": "\u0623\u0646\u0648\u0627\u0639 \u0627\u0644\u0623\u0641\u0644\u0627\u0645",
"NameSeasonNumber": "\u0627\u0644\u0645\u0648\u0633\u0645 {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/bg-BG.json b/Emby.Server.Implementations/Localization/Core/bg-BG.json
index 91870578b..40899caab 100644
--- a/Emby.Server.Implementations/Localization/Core/bg-BG.json
+++ b/Emby.Server.Implementations/Localization/Core/bg-BG.json
@@ -27,6 +27,7 @@
"Artists": "\u0418\u0437\u043f\u044a\u043b\u043d\u0438\u0442\u0435\u043b\u0438",
"Folders": "\u041f\u0430\u043f\u043a\u0438",
"Songs": "\u041f\u0435\u0441\u043d\u0438",
+ "TvShows": "TV Shows",
"Shows": "\u0421\u0435\u0440\u0438\u0430\u043b\u0438",
"Genres": "\u0416\u0430\u043d\u0440\u043e\u0432\u0435",
"NameSeasonNumber": "\u0421\u0435\u0437\u043e\u043d {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/ca.json b/Emby.Server.Implementations/Localization/Core/ca.json
index 829369df5..cc2c00234 100644
--- a/Emby.Server.Implementations/Localization/Core/ca.json
+++ b/Emby.Server.Implementations/Localization/Core/ca.json
@@ -27,6 +27,7 @@
"Artists": "Artists",
"Folders": "Folders",
"Songs": "Songs",
+ "TvShows": "TV Shows",
"Shows": "Shows",
"Genres": "G\u00e8neres",
"NameSeasonNumber": "Season {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/cs.json b/Emby.Server.Implementations/Localization/Core/cs.json
index 68dad0e46..abbfde380 100644
--- a/Emby.Server.Implementations/Localization/Core/cs.json
+++ b/Emby.Server.Implementations/Localization/Core/cs.json
@@ -27,6 +27,7 @@
"Artists": "Um\u011blci",
"Folders": "Slo\u017eky",
"Songs": "Skladby",
+ "TvShows": "TV Shows",
"Shows": "Seri\u00e1ly",
"Genres": "\u017d\u00e1nry",
"NameSeasonNumber": "Sez\u00f3na {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/da.json b/Emby.Server.Implementations/Localization/Core/da.json
index f7a727d1a..ed9652c33 100644
--- a/Emby.Server.Implementations/Localization/Core/da.json
+++ b/Emby.Server.Implementations/Localization/Core/da.json
@@ -27,6 +27,7 @@
"Artists": "Kunstner",
"Folders": "Mapper",
"Songs": "Sange",
+ "TvShows": "TV Shows",
"Shows": "Shows",
"Genres": "Genre",
"NameSeasonNumber": "S\u00e6son {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/de.json b/Emby.Server.Implementations/Localization/Core/de.json
index dad7dc622..183b4aaf8 100644
--- a/Emby.Server.Implementations/Localization/Core/de.json
+++ b/Emby.Server.Implementations/Localization/Core/de.json
@@ -27,6 +27,7 @@
"Artists": "Interpreten",
"Folders": "Verzeichnisse",
"Songs": "Songs",
+ "TvShows": "TV Shows",
"Shows": "Serien",
"Genres": "Genres",
"NameSeasonNumber": "Staffel {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/en-GB.json b/Emby.Server.Implementations/Localization/Core/en-GB.json
index ebd240e35..8dc9abf01 100644
--- a/Emby.Server.Implementations/Localization/Core/en-GB.json
+++ b/Emby.Server.Implementations/Localization/Core/en-GB.json
@@ -27,6 +27,7 @@
"Artists": "Artists",
"Folders": "Folders",
"Songs": "Songs",
+ "TvShows": "TV Shows",
"Shows": "Shows",
"Genres": "Genres",
"NameSeasonNumber": "Season {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/en-US.json b/Emby.Server.Implementations/Localization/Core/en-US.json
index d24e244df..51bbf341f 100644
--- a/Emby.Server.Implementations/Localization/Core/en-US.json
+++ b/Emby.Server.Implementations/Localization/Core/en-US.json
@@ -1,95 +1,96 @@
{
- "Latest": "Latest",
- "ValueSpecialEpisodeName": "Special - {0}",
- "Inherit": "Inherit",
- "Books": "Books",
- "Music": "Music",
- "Games": "Games",
- "Photos": "Photos",
- "MixedContent": "Mixed content",
- "MusicVideos": "Music videos",
- "HomeVideos": "Home videos",
- "Playlists": "Playlists",
- "HeaderRecordingGroups": "Recording Groups",
- "HeaderContinueWatching": "Continue Watching",
- "HeaderFavoriteArtists": "Favorite Artists",
- "HeaderFavoriteSongs": "Favorite Songs",
- "HeaderAlbumArtists": "Album Artists",
- "HeaderFavoriteAlbums": "Favorite Albums",
- "HeaderFavoriteEpisodes": "Favorite Episodes",
- "HeaderFavoriteShows": "Favorite Shows",
- "HeaderNextUp": "Next Up",
- "Favorites": "Favorites",
- "Collections": "Collections",
- "Channels": "Channels",
- "Movies": "Movies",
- "Albums": "Albums",
- "Artists": "Artists",
- "Folders": "Folders",
- "Songs": "Songs",
- "Shows": "Shows",
- "Genres": "Genres",
- "NameSeasonNumber": "Season {0}",
- "AppDeviceValues": "App: {0}, Device: {1}",
- "UserDownloadingItemWithValues": "{0} is downloading {1}",
- "HeaderLiveTV": "Live TV",
- "ChapterNameValue": "Chapter {0}",
- "ScheduledTaskFailedWithName": "{0} failed",
- "LabelRunningTimeValue": "Running time: {0}",
- "ScheduledTaskStartedWithName": "{0} started",
- "VersionNumber": "Version {0}",
- "PluginInstalledWithName": "{0} was installed",
- "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly.",
- "PluginUpdatedWithName": "{0} was updated",
- "PluginUninstalledWithName": "{0} was uninstalled",
- "ItemAddedWithName": "{0} was added to the library",
- "ItemRemovedWithName": "{0} was removed from the library",
- "LabelIpAddressValue": "Ip address: {0}",
- "DeviceOnlineWithName": "{0} is connected",
- "UserOnlineFromDevice": "{0} is online from {1}",
- "ProviderValue": "Provider: {0}",
- "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
- "UserCreatedWithName": "User {0} has been created",
- "UserPasswordChangedWithName": "Password has been changed for user {0}",
- "UserDeletedWithName": "User {0} has been deleted",
- "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
- "MessageServerConfigurationUpdated": "Server configuration has been updated",
- "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
- "MessageApplicationUpdated": "Emby Server has been updated",
- "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
- "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
- "UserOfflineFromDevice": "{0} has disconnected from {1}",
- "DeviceOfflineWithName": "{0} has disconnected",
- "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
- "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
- "NotificationOptionPluginError": "Plugin failure",
- "NotificationOptionApplicationUpdateAvailable": "Application update available",
- "NotificationOptionApplicationUpdateInstalled": "Application update installed",
- "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
- "NotificationOptionPluginInstalled": "Plugin installed",
- "NotificationOptionPluginUninstalled": "Plugin uninstalled",
- "NotificationOptionVideoPlayback": "Video playback started",
- "NotificationOptionAudioPlayback": "Audio playback started",
- "NotificationOptionGamePlayback": "Game playback started",
- "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
- "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
- "NotificationOptionGamePlaybackStopped": "Game playback stopped",
- "NotificationOptionTaskFailed": "Scheduled task failure",
- "NotificationOptionInstallationFailed": "Installation failure",
- "NotificationOptionNewLibraryContent": "New content added",
- "NotificationOptionCameraImageUploaded": "Camera image uploaded",
- "NotificationOptionUserLockedOut": "User locked out",
- "NotificationOptionServerRestartRequired": "Server restart required",
- "UserLockedOutWithName": "User {0} has been locked out",
- "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
- "Sync": "Sync",
- "User": "User",
- "System": "System",
- "Application": "Application",
- "Plugin": "Plugin",
- "LabelExit": "Exit",
- "LabelVisitCommunity": "Visit Community",
- "LabelBrowseLibrary": "Browse Library",
- "LabelConfigureServer": "Configure Emby",
- "LabelRestartServer": "Restart Server"
+ "Latest": "Latest",
+ "ValueSpecialEpisodeName": "Special - {0}",
+ "Inherit": "Inherit",
+ "Books": "Books",
+ "Music": "Music",
+ "Games": "Games",
+ "Photos": "Photos",
+ "MixedContent": "Mixed content",
+ "MusicVideos": "Music videos",
+ "HomeVideos": "Home videos",
+ "Playlists": "Playlists",
+ "HeaderRecordingGroups": "Recording Groups",
+ "HeaderContinueWatching": "Continue Watching",
+ "HeaderFavoriteArtists": "Favorite Artists",
+ "HeaderFavoriteSongs": "Favorite Songs",
+ "HeaderAlbumArtists": "Album Artists",
+ "HeaderFavoriteAlbums": "Favorite Albums",
+ "HeaderFavoriteEpisodes": "Favorite Episodes",
+ "HeaderFavoriteShows": "Favorite Shows",
+ "HeaderNextUp": "Next Up",
+ "Favorites": "Favorites",
+ "Collections": "Collections",
+ "Channels": "Channels",
+ "Movies": "Movies",
+ "Albums": "Albums",
+ "Artists": "Artists",
+ "Folders": "Folders",
+ "Songs": "Songs",
+ "TvShows": "TV Shows",
+ "Shows": "Shows",
+ "Genres": "Genres",
+ "NameSeasonNumber": "Season {0}",
+ "AppDeviceValues": "App: {0}, Device: {1}",
+ "UserDownloadingItemWithValues": "{0} is downloading {1}",
+ "HeaderLiveTV": "Live TV",
+ "ChapterNameValue": "Chapter {0}",
+ "ScheduledTaskFailedWithName": "{0} failed",
+ "LabelRunningTimeValue": "Running time: {0}",
+ "ScheduledTaskStartedWithName": "{0} started",
+ "VersionNumber": "Version {0}",
+ "PluginInstalledWithName": "{0} was installed",
+ "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly.",
+ "PluginUpdatedWithName": "{0} was updated",
+ "PluginUninstalledWithName": "{0} was uninstalled",
+ "ItemAddedWithName": "{0} was added to the library",
+ "ItemRemovedWithName": "{0} was removed from the library",
+ "LabelIpAddressValue": "Ip address: {0}",
+ "DeviceOnlineWithName": "{0} is connected",
+ "UserOnlineFromDevice": "{0} is online from {1}",
+ "ProviderValue": "Provider: {0}",
+ "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+ "UserCreatedWithName": "User {0} has been created",
+ "UserPasswordChangedWithName": "Password has been changed for user {0}",
+ "UserDeletedWithName": "User {0} has been deleted",
+ "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+ "MessageServerConfigurationUpdated": "Server configuration has been updated",
+ "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+ "MessageApplicationUpdated": "Emby Server has been updated",
+ "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+ "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+ "UserOfflineFromDevice": "{0} has disconnected from {1}",
+ "DeviceOfflineWithName": "{0} has disconnected",
+ "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+ "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+ "NotificationOptionPluginError": "Plugin failure",
+ "NotificationOptionApplicationUpdateAvailable": "Application update available",
+ "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+ "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+ "NotificationOptionPluginInstalled": "Plugin installed",
+ "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+ "NotificationOptionVideoPlayback": "Video playback started",
+ "NotificationOptionAudioPlayback": "Audio playback started",
+ "NotificationOptionGamePlayback": "Game playback started",
+ "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+ "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+ "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+ "NotificationOptionTaskFailed": "Scheduled task failure",
+ "NotificationOptionInstallationFailed": "Installation failure",
+ "NotificationOptionNewLibraryContent": "New content added",
+ "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+ "NotificationOptionUserLockedOut": "User locked out",
+ "NotificationOptionServerRestartRequired": "Server restart required",
+ "UserLockedOutWithName": "User {0} has been locked out",
+ "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+ "Sync": "Sync",
+ "User": "User",
+ "System": "System",
+ "Application": "Application",
+ "Plugin": "Plugin",
+ "LabelExit": "Exit",
+ "LabelVisitCommunity": "Visit Community",
+ "LabelBrowseLibrary": "Browse Library",
+ "LabelConfigureServer": "Configure Emby",
+ "LabelRestartServer": "Restart Server"
} \ No newline at end of file
diff --git a/Emby.Server.Implementations/Localization/Core/es-AR.json b/Emby.Server.Implementations/Localization/Core/es-AR.json
index 426e292d6..e4a49abf6 100644
--- a/Emby.Server.Implementations/Localization/Core/es-AR.json
+++ b/Emby.Server.Implementations/Localization/Core/es-AR.json
@@ -27,6 +27,7 @@
"Artists": "Artists",
"Folders": "Folders",
"Songs": "Songs",
+ "TvShows": "TV Shows",
"Shows": "Series",
"Genres": "Genres",
"NameSeasonNumber": "Season {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/es-MX.json b/Emby.Server.Implementations/Localization/Core/es-MX.json
index a31b55f67..45cc2c69b 100644
--- a/Emby.Server.Implementations/Localization/Core/es-MX.json
+++ b/Emby.Server.Implementations/Localization/Core/es-MX.json
@@ -27,6 +27,7 @@
"Artists": "Artistas",
"Folders": "Carpetas",
"Songs": "Canciones",
+ "TvShows": "TV Shows",
"Shows": "Programas",
"Genres": "G\u00e9neros",
"NameSeasonNumber": "Temporada {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/es.json b/Emby.Server.Implementations/Localization/Core/es.json
index dd2569ddb..68975d632 100644
--- a/Emby.Server.Implementations/Localization/Core/es.json
+++ b/Emby.Server.Implementations/Localization/Core/es.json
@@ -27,6 +27,7 @@
"Artists": "Artistas",
"Folders": "Carpetas",
"Songs": "Canciones",
+ "TvShows": "TV Shows",
"Shows": "Series",
"Genres": "G\u00e9neros",
"NameSeasonNumber": "Temporada {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/fr-CA.json b/Emby.Server.Implementations/Localization/Core/fr-CA.json
index c63948e31..795bc98cc 100644
--- a/Emby.Server.Implementations/Localization/Core/fr-CA.json
+++ b/Emby.Server.Implementations/Localization/Core/fr-CA.json
@@ -27,6 +27,7 @@
"Artists": "Artists",
"Folders": "Folders",
"Songs": "Songs",
+ "TvShows": "TV Shows",
"Shows": "Series",
"Genres": "Genres",
"NameSeasonNumber": "Season {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/fr.json b/Emby.Server.Implementations/Localization/Core/fr.json
index 79fa8e1f8..5ea01fcdb 100644
--- a/Emby.Server.Implementations/Localization/Core/fr.json
+++ b/Emby.Server.Implementations/Localization/Core/fr.json
@@ -27,6 +27,7 @@
"Artists": "Artistes",
"Folders": "Dossiers",
"Songs": "Chansons",
+ "TvShows": "TV Shows",
"Shows": "\u00c9missions",
"Genres": "Genres",
"NameSeasonNumber": "Saison {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/he.json b/Emby.Server.Implementations/Localization/Core/he.json
index c934af48f..f287dc422 100644
--- a/Emby.Server.Implementations/Localization/Core/he.json
+++ b/Emby.Server.Implementations/Localization/Core/he.json
@@ -27,6 +27,7 @@
"Artists": "Artists",
"Folders": "Folders",
"Songs": "Songs",
+ "TvShows": "TV Shows",
"Shows": "Shows",
"Genres": "\u05d6'\u05d0\u05e0\u05e8\u05d9\u05dd",
"NameSeasonNumber": "Season {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/hr.json b/Emby.Server.Implementations/Localization/Core/hr.json
index 8d6d95fd8..143e3ab82 100644
--- a/Emby.Server.Implementations/Localization/Core/hr.json
+++ b/Emby.Server.Implementations/Localization/Core/hr.json
@@ -27,6 +27,7 @@
"Artists": "Izvo\u0111a\u010di",
"Folders": "Mape",
"Songs": "Pjesme",
+ "TvShows": "TV Shows",
"Shows": "Shows",
"Genres": "\u017danrovi",
"NameSeasonNumber": "Sezona {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/hu.json b/Emby.Server.Implementations/Localization/Core/hu.json
index 3dd9b4347..80160966f 100644
--- a/Emby.Server.Implementations/Localization/Core/hu.json
+++ b/Emby.Server.Implementations/Localization/Core/hu.json
@@ -27,6 +27,7 @@
"Artists": "Artists",
"Folders": "Folders",
"Songs": "Songs",
+ "TvShows": "TV Shows",
"Shows": "Shows",
"Genres": "M\u0171fajok",
"NameSeasonNumber": "Season {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/it.json b/Emby.Server.Implementations/Localization/Core/it.json
index 7c21d2713..4ff0d98d8 100644
--- a/Emby.Server.Implementations/Localization/Core/it.json
+++ b/Emby.Server.Implementations/Localization/Core/it.json
@@ -27,6 +27,7 @@
"Artists": "Artisti",
"Folders": "Cartelle",
"Songs": "Canzoni",
+ "TvShows": "TV Shows",
"Shows": "Programmi",
"Genres": "Generi",
"NameSeasonNumber": "Stagione {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/kk.json b/Emby.Server.Implementations/Localization/Core/kk.json
index 73647ea12..e99623557 100644
--- a/Emby.Server.Implementations/Localization/Core/kk.json
+++ b/Emby.Server.Implementations/Localization/Core/kk.json
@@ -27,6 +27,7 @@
"Artists": "\u041e\u0440\u044b\u043d\u0434\u0430\u0443\u0448\u044b\u043b\u0430\u0440",
"Folders": "\u049a\u0430\u043b\u0442\u0430\u043b\u0430\u0440",
"Songs": "\u04d8\u0443\u0435\u043d\u0434\u0435\u0440",
+ "TvShows": "TV Shows",
"Shows": "\u041a\u04e9\u0440\u0441\u0435\u0442\u0456\u043c\u0434\u0435\u0440",
"Genres": "\u0416\u0430\u043d\u0440\u043b\u0430\u0440",
"NameSeasonNumber": "{0}-\u043c\u0430\u0443\u0441\u044b\u043c",
diff --git a/Emby.Server.Implementations/Localization/Core/ko.json b/Emby.Server.Implementations/Localization/Core/ko.json
index bd2909efb..6c5ed0260 100644
--- a/Emby.Server.Implementations/Localization/Core/ko.json
+++ b/Emby.Server.Implementations/Localization/Core/ko.json
@@ -27,6 +27,7 @@
"Artists": "Artists",
"Folders": "Folders",
"Songs": "Songs",
+ "TvShows": "TV Shows",
"Shows": "Shows",
"Genres": "Genres",
"NameSeasonNumber": "Season {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/lt-LT.json b/Emby.Server.Implementations/Localization/Core/lt-LT.json
index 51b962c65..21ed36d7c 100644
--- a/Emby.Server.Implementations/Localization/Core/lt-LT.json
+++ b/Emby.Server.Implementations/Localization/Core/lt-LT.json
@@ -27,6 +27,7 @@
"Artists": "Artists",
"Folders": "Folders",
"Songs": "Songs",
+ "TvShows": "TV Shows",
"Shows": "Shows",
"Genres": "\u017danrai",
"NameSeasonNumber": "Season {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/ms.json b/Emby.Server.Implementations/Localization/Core/ms.json
index 426e292d6..e4a49abf6 100644
--- a/Emby.Server.Implementations/Localization/Core/ms.json
+++ b/Emby.Server.Implementations/Localization/Core/ms.json
@@ -27,6 +27,7 @@
"Artists": "Artists",
"Folders": "Folders",
"Songs": "Songs",
+ "TvShows": "TV Shows",
"Shows": "Series",
"Genres": "Genres",
"NameSeasonNumber": "Season {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/nb.json b/Emby.Server.Implementations/Localization/Core/nb.json
index c422d2177..d0482315d 100644
--- a/Emby.Server.Implementations/Localization/Core/nb.json
+++ b/Emby.Server.Implementations/Localization/Core/nb.json
@@ -27,6 +27,7 @@
"Artists": "Artister",
"Folders": "Mapper",
"Songs": "Sanger",
+ "TvShows": "TV Shows",
"Shows": "Programmer",
"Genres": "Sjanger",
"NameSeasonNumber": "Sesong {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/nl.json b/Emby.Server.Implementations/Localization/Core/nl.json
index 37120f08c..daba9bed5 100644
--- a/Emby.Server.Implementations/Localization/Core/nl.json
+++ b/Emby.Server.Implementations/Localization/Core/nl.json
@@ -27,6 +27,7 @@
"Artists": "Artiesten",
"Folders": "Mappen",
"Songs": "Titels",
+ "TvShows": "TV Shows",
"Shows": "Series",
"Genres": "Genres",
"NameSeasonNumber": "Seizoen {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/pl.json b/Emby.Server.Implementations/Localization/Core/pl.json
index 363d0e792..24ac0d973 100644
--- a/Emby.Server.Implementations/Localization/Core/pl.json
+++ b/Emby.Server.Implementations/Localization/Core/pl.json
@@ -27,6 +27,7 @@
"Artists": "Wykonawcy",
"Folders": "Foldery",
"Songs": "Utwory",
+ "TvShows": "TV Shows",
"Shows": "Seriale",
"Genres": "Gatunki",
"NameSeasonNumber": "Sezon {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/pt-BR.json b/Emby.Server.Implementations/Localization/Core/pt-BR.json
index ffbc693c3..196a6b78b 100644
--- a/Emby.Server.Implementations/Localization/Core/pt-BR.json
+++ b/Emby.Server.Implementations/Localization/Core/pt-BR.json
@@ -27,6 +27,7 @@
"Artists": "Artistas",
"Folders": "Pastas",
"Songs": "M\u00fasicas",
+ "TvShows": "TV Shows",
"Shows": "S\u00e9ries",
"Genres": "G\u00eaneros",
"NameSeasonNumber": "Temporada {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/pt-PT.json b/Emby.Server.Implementations/Localization/Core/pt-PT.json
index bb221e643..7a6b8f419 100644
--- a/Emby.Server.Implementations/Localization/Core/pt-PT.json
+++ b/Emby.Server.Implementations/Localization/Core/pt-PT.json
@@ -27,6 +27,7 @@
"Artists": "Artists",
"Folders": "Folders",
"Songs": "Songs",
+ "TvShows": "TV Shows",
"Shows": "Shows",
"Genres": "Genres",
"NameSeasonNumber": "Season {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/ru.json b/Emby.Server.Implementations/Localization/Core/ru.json
index d9cd74273..f3a1cfb7b 100644
--- a/Emby.Server.Implementations/Localization/Core/ru.json
+++ b/Emby.Server.Implementations/Localization/Core/ru.json
@@ -27,6 +27,7 @@
"Artists": "\u0418\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u0438",
"Folders": "\u041f\u0430\u043f\u043a\u0438",
"Songs": "\u041a\u043e\u043c\u043f\u043e\u0437\u0438\u0446\u0438\u0438",
+ "TvShows": "TV Shows",
"Shows": "\u041f\u0435\u0440\u0435\u0434\u0430\u0447\u0438",
"Genres": "\u0416\u0430\u043d\u0440\u044b",
"NameSeasonNumber": "\u0421\u0435\u0437\u043e\u043d {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/sk.json b/Emby.Server.Implementations/Localization/Core/sk.json
index f69b7a436..98f60e5e1 100644
--- a/Emby.Server.Implementations/Localization/Core/sk.json
+++ b/Emby.Server.Implementations/Localization/Core/sk.json
@@ -27,6 +27,7 @@
"Artists": "Artists",
"Folders": "Folders",
"Songs": "Songs",
+ "TvShows": "TV Shows",
"Shows": "Series",
"Genres": "Genres",
"NameSeasonNumber": "Season {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/sl-SI.json b/Emby.Server.Implementations/Localization/Core/sl-SI.json
index d063cccc0..cb8e080e4 100644
--- a/Emby.Server.Implementations/Localization/Core/sl-SI.json
+++ b/Emby.Server.Implementations/Localization/Core/sl-SI.json
@@ -27,6 +27,7 @@
"Artists": "Artists",
"Folders": "Folders",
"Songs": "Songs",
+ "TvShows": "TV Shows",
"Shows": "Serije",
"Genres": "Genres",
"NameSeasonNumber": "Season {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/sv.json b/Emby.Server.Implementations/Localization/Core/sv.json
index e3ec363ce..a03881183 100644
--- a/Emby.Server.Implementations/Localization/Core/sv.json
+++ b/Emby.Server.Implementations/Localization/Core/sv.json
@@ -27,6 +27,7 @@
"Artists": "Artister",
"Folders": "Mappar",
"Songs": "L\u00e5tar",
+ "TvShows": "TV Shows",
"Shows": "Serier",
"Genres": "Genrer",
"NameSeasonNumber": "S\u00e4song {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/tr.json b/Emby.Server.Implementations/Localization/Core/tr.json
index 3a5f84e09..a0a515170 100644
--- a/Emby.Server.Implementations/Localization/Core/tr.json
+++ b/Emby.Server.Implementations/Localization/Core/tr.json
@@ -27,6 +27,7 @@
"Artists": "Artists",
"Folders": "Folders",
"Songs": "Songs",
+ "TvShows": "TV Shows",
"Shows": "Shows",
"Genres": "Genres",
"NameSeasonNumber": "Season {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/zh-CN.json b/Emby.Server.Implementations/Localization/Core/zh-CN.json
index 2eb6d89e8..42126ca1b 100644
--- a/Emby.Server.Implementations/Localization/Core/zh-CN.json
+++ b/Emby.Server.Implementations/Localization/Core/zh-CN.json
@@ -27,6 +27,7 @@
"Artists": "\u827a\u672f\u5bb6",
"Folders": "\u6587\u4ef6\u5939",
"Songs": "\u6b4c\u66f2",
+ "TvShows": "TV Shows",
"Shows": "\u8282\u76ee",
"Genres": "\u98ce\u683c",
"NameSeasonNumber": "\u5b63 {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/zh-HK.json b/Emby.Server.Implementations/Localization/Core/zh-HK.json
index 4cd926862..37afc47e6 100644
--- a/Emby.Server.Implementations/Localization/Core/zh-HK.json
+++ b/Emby.Server.Implementations/Localization/Core/zh-HK.json
@@ -27,6 +27,7 @@
"Artists": "Artists",
"Folders": "Folders",
"Songs": "Songs",
+ "TvShows": "TV Shows",
"Shows": "Shows",
"Genres": "Genres",
"NameSeasonNumber": "Season {0}",
diff --git a/SocketHttpListener/Net/HttpConnection.cs b/SocketHttpListener/Net/HttpConnection.cs
index 4e8158964..05576ea1e 100644
--- a/SocketHttpListener/Net/HttpConnection.cs
+++ b/SocketHttpListener/Net/HttpConnection.cs
@@ -528,7 +528,13 @@ namespace SocketHttpListener.Net
finally
{
if (s != null)
- s.Close();
+ {
+ try
+ {
+ s.Close();
+ }
+ catch { }
+ }
}
Unbind();
RemoveConnection();