Merge pull request #1555 from MediaBrowser/dev

Dev

MediaBrowser.Api/LiveTv/LiveTvService.cs

@@ -478,6 +478,13 @@ namespace MediaBrowser.Api.LiveTv
         public string Feature { get; set; }
     }
 
+    [Route("/LiveTv/TunerHosts/Satip/IniMappings", "GET", Summary = "Gets available mappings")]
+    [Authenticated(AllowBeforeStartupWizard = true)]
+    public class GetSatIniMappings : IReturn<List<NameValuePair>>
+    {
+        
+    }
+
     public class LiveTvService : BaseApiService
     {
         private readonly ILiveTvManager _liveTvManager;
@@ -500,6 +507,11 @@ namespace MediaBrowser.Api.LiveTv
             return ToOptimizedResult(result);
         }
 
+        public object Get(GetSatIniMappings request)
+        {
+            return ToOptimizedResult(_liveTvManager.GetSatIniMappings());
+        }
+
         public async Task<object> Get(GetSchedulesDirectCountries request)
         {
             // https://json.schedulesdirect.org/20141201/available/countries

MediaBrowser.Controller/LiveTv/ILiveTvManager.cs

@@ -397,5 +397,11 @@ namespace MediaBrowser.Controller.LiveTv
         /// <param name="recording">The recording.</param>
         /// <returns>Task.</returns>
         Task OnRecordingFileDeleted(ILiveTvRecording recording);
+
+        /// <summary>
+        /// Gets the sat ini mappings.
+        /// </summary>
+        /// <returns>List&lt;NameValuePair&gt;.</returns>
+        List<NameValuePair> GetSatIniMappings();
     }
 }

MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs

@@ -30,6 +30,8 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using CommonIO;
+using IniParser;
+using IniParser.Model;
 
 namespace MediaBrowser.Server.Implementations.LiveTv
 {
@@ -2488,5 +2490,38 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 IsRegistered = true
             });
         }
+
+        public List<NameValuePair> GetSatIniMappings()
+        {
+            var names = GetType().Assembly.GetManifestResourceNames().Where(i => i.IndexOf("SatIp.ini.satellite", StringComparison.OrdinalIgnoreCase) != -1).ToList();
+
+            return names.Select(GetSatIniMappings).Where(i => i != null).DistinctBy(i => i.Value.Split('|')[0]).ToList();
+        }
+
+        public NameValuePair GetSatIniMappings(string resource)
+        {
+            using (var stream = GetType().Assembly.GetManifestResourceStream(resource))
+            {
+                using (var reader = new StreamReader(stream))
+                {
+                    var parser = new StreamIniDataParser();
+                    IniData data = parser.ReadData(reader);
+
+                    var satType1 = data["SATTYPE"]["1"];
+                    var satType2 = data["SATTYPE"]["2"];
+
+                    if (string.IsNullOrWhiteSpace(satType2))
+                    {
+                        return null;
+                    }
+
+                    return new NameValuePair
+                    {
+                        Name = satType1 + " " + satType2,
+                        Value = satType2 + "|" + Path.GetFileName(resource)
+                    };
+                }
+            }
+        }
     }
 }

MediaBrowser.Server.Implementations/Localization/Core/cs.json

@@ -1,5 +1,5 @@
 {
-    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+    "DbUpgradeMessage": "Po\u010dkejte pros\u00edm, datab\u00e1ze Emby Serveru je aktualizov\u00e1na na novou verzi. Hotovo {0}%.",
     "AppDeviceValues": "Aplikace: {0}, Za\u0159\u00edzen\u00ed: {1}",
     "UserDownloadingItemWithValues": "{0} pr\u00e1v\u011b stahuje {1}",
     "FolderTypeMixed": "Sm\u00ed\u0161en\u00fd obsah",

MediaBrowser.Server.Implementations/Localization/Core/fr-CA.json

@@ -0,0 +1,178 @@
+{
+    "DbUpgradeMessage": "Veuillez patienter pendant que la base de donn\u00e9e de votre Serveur Emby se met \u00e0 jour. Termin\u00e9e \u00e0 {0}%.",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "FolderTypeMixed": "Mixed content",
+    "FolderTypeMovies": "Movies",
+    "FolderTypeMusic": "Music",
+    "FolderTypeAdultVideos": "Adult videos",
+    "FolderTypePhotos": "Photos",
+    "FolderTypeMusicVideos": "Music videos",
+    "FolderTypeHomeVideos": "Home videos",
+    "FolderTypeGames": "Games",
+    "FolderTypeBooks": "Books",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "Inherit",
+    "HeaderCastCrew": "Cast & Crew",
+    "HeaderPeople": "People",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "LabelChapterName": "Chapter {0}",
+    "NameSeasonNumber": "Season {0}",
+    "LabelExit": "Quitter",
+    "LabelVisitCommunity": "Visiter la Communaut\u00e9",
+    "LabelGithub": "Github",
+    "LabelApiDocumentation": "Documentation de l'API",
+    "LabelDeveloperResources": "Ressources pour d\u00e9veloppeurs",
+    "LabelBrowseLibrary": "Parcourir la biblioth\u00e8que",
+    "LabelConfigureServer": "Configurer Emby",
+    "LabelRestartServer": "Red\u00e9marrer le Serveur",
+    "CategorySync": "Sync",
+    "CategoryUser": "User",
+    "CategorySystem": "System",
+    "CategoryApplication": "Application",
+    "CategoryPlugin": "Plugin",
+    "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",
+    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "ViewTypePlaylists": "Playlists",
+    "ViewTypeMovies": "Movies",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Games",
+    "ViewTypeMusic": "Music",
+    "ViewTypeMusicGenres": "Genres",
+    "ViewTypeMusicArtists": "Artists",
+    "ViewTypeBoxSets": "Collections",
+    "ViewTypeChannels": "Channels",
+    "ViewTypeLiveTV": "Live TV",
+    "ViewTypeLiveTvNowPlaying": "Now Airing",
+    "ViewTypeLatestGames": "Latest Games",
+    "ViewTypeRecentlyPlayedGames": "Recently Played",
+    "ViewTypeGameFavorites": "Favorites",
+    "ViewTypeGameSystems": "Game Systems",
+    "ViewTypeGameGenres": "Genres",
+    "ViewTypeTvResume": "Resume",
+    "ViewTypeTvNextUp": "Next Up",
+    "ViewTypeTvLatest": "Latest",
+    "ViewTypeTvShowSeries": "Series",
+    "ViewTypeTvGenres": "Genres",
+    "ViewTypeTvFavoriteSeries": "Favorite Series",
+    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
+    "ViewTypeMovieResume": "Resume",
+    "ViewTypeMovieLatest": "Latest",
+    "ViewTypeMovieMovies": "Movies",
+    "ViewTypeMovieCollections": "Collections",
+    "ViewTypeMovieFavorites": "Favorites",
+    "ViewTypeMovieGenres": "Genres",
+    "ViewTypeMusicLatest": "Latest",
+    "ViewTypeMusicPlaylists": "Playlists",
+    "ViewTypeMusicAlbums": "Albums",
+    "ViewTypeMusicAlbumArtists": "Album Artists",
+    "HeaderOtherDisplaySettings": "Display Settings",
+    "ViewTypeMusicSongs": "Songs",
+    "ViewTypeMusicFavorites": "Favorites",
+    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
+    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
+    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
+    "ViewTypeFolders": "Folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "VersionNumber": "Version {0}",
+    "PluginInstalledWithName": "{0} was installed",
+    "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}",
+    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "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",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "HeaderUnidentified": "Unidentified",
+    "HeaderImagePrimary": "Primary",
+    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageLogo": "Logo",
+    "HeaderUserPrimaryImage": "User Image",
+    "HeaderOverview": "Overview",
+    "HeaderShortOverview": "Short Overview",
+    "HeaderType": "Type",
+    "HeaderSeverity": "Severity",
+    "HeaderUser": "User",
+    "HeaderName": "Name",
+    "HeaderDate": "Date",
+    "HeaderPremiereDate": "Premiere Date",
+    "HeaderDateAdded": "Date Added",
+    "HeaderReleaseDate": "Release date",
+    "HeaderRuntime": "Runtime",
+    "HeaderPlayCount": "Play Count",
+    "HeaderSeason": "Season",
+    "HeaderSeasonNumber": "Season number",
+    "HeaderSeries": "Series:",
+    "HeaderNetwork": "Network",
+    "HeaderYear": "Year:",
+    "HeaderYears": "Years:",
+    "HeaderParentalRating": "Parental Rating",
+    "HeaderCommunityRating": "Community rating",
+    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Specials",
+    "HeaderGameSystems": "Game Systems",
+    "HeaderPlayers": "Players:",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbums": "Albums",
+    "HeaderDisc": "Disc",
+    "HeaderTrack": "Track",
+    "HeaderAudio": "Audio",
+    "HeaderVideo": "Video",
+    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderResolution": "Resolution",
+    "HeaderSubtitles": "Subtitles",
+    "HeaderGenres": "Genres",
+    "HeaderCountries": "Countries",
+    "HeaderStatus": "Status",
+    "HeaderTracks": "Tracks",
+    "HeaderMusicArtist": "Music artist",
+    "HeaderLocked": "Locked",
+    "HeaderStudios": "Studios",
+    "HeaderActor": "Actors",
+    "HeaderComposer": "Composers",
+    "HeaderDirector": "Directors",
+    "HeaderGuestStar": "Guest star",
+    "HeaderProducer": "Producers",
+    "HeaderWriter": "Writers",
+    "HeaderParentalRatings": "Parental Ratings",
+    "HeaderCommunityRatings": "Community ratings",
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+}

MediaBrowser.Server.Implementations/Localization/Core/hu.json

@@ -1,23 +1,23 @@
 {
-    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+    "DbUpgradeMessage": "K\u00e9rlek v\u00e1rj, m\u00edg az Emby Szerver adatb\u00e1zis friss\u00fcl. {0}% k\u00e9sz.",
     "AppDeviceValues": "App: {0}, Device: {1}",
     "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "FolderTypeMixed": "Mixed content",
+    "FolderTypeMixed": "Vegyes tartalom",
-    "FolderTypeMovies": "Movies",
+    "FolderTypeMovies": "Filmek",
-    "FolderTypeMusic": "Music",
+    "FolderTypeMusic": "Zen\u00e9k",
-    "FolderTypeAdultVideos": "Adult videos",
+    "FolderTypeAdultVideos": "Feln\u0151tt vide\u00f3k",
-    "FolderTypePhotos": "Photos",
+    "FolderTypePhotos": "F\u00e9nyk\u00e9pek",
-    "FolderTypeMusicVideos": "Music videos",
+    "FolderTypeMusicVideos": "Zenei vide\u00f3k",
-    "FolderTypeHomeVideos": "Home videos",
+    "FolderTypeHomeVideos": "H\u00e1zi vide\u00f3k",
-    "FolderTypeGames": "Games",
+    "FolderTypeGames": "J\u00e1t\u00e9kok",
-    "FolderTypeBooks": "Books",
+    "FolderTypeBooks": "K\u00f6nyvek",
     "FolderTypeTvShows": "TV",
     "FolderTypeInherit": "Inherit",
-    "HeaderCastCrew": "Cast & Crew",
+    "HeaderCastCrew": "Szerepl\u0151k & R\u00e9sztvev\u0151k",
-    "HeaderPeople": "People",
+    "HeaderPeople": "Emberek",
-    "ValueSpecialEpisodeName": "Special - {0}",
+    "ValueSpecialEpisodeName": "K\u00fcl\u00f6nleges - {0}",
     "LabelChapterName": "Fejezet {0}",
-    "NameSeasonNumber": "Season {0}",
+    "NameSeasonNumber": "\u00c9vad {0}",
     "LabelExit": "Kil\u00e9p\u00e9s",
     "LabelVisitCommunity": "K\u00f6z\u00f6ss\u00e9g",
     "LabelGithub": "Github",
@@ -27,28 +27,28 @@
     "LabelConfigureServer": "Emby konfigur\u00e1l\u00e1sa",
     "LabelRestartServer": "Szerver \u00fajraindit\u00e1sa",
     "CategorySync": "Sync",
-    "CategoryUser": "User",
+    "CategoryUser": "Felhaszn\u00e1l\u00f3",
     "CategorySystem": "Rendszer",
     "CategoryApplication": "Alkalmaz\u00e1s",
-    "CategoryPlugin": "Be\u00e9p\u00fcl\u0151",
+    "CategoryPlugin": "B\u0151v\u00edtm\u00e9ny",
-    "NotificationOptionPluginError": "Be\u00e9p\u00fcl\u0151 hiba",
+    "NotificationOptionPluginError": "B\u0151v\u00edtm\u00e9ny hiba",
-    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateAvailable": "Friss\u00edt\u00e9s el\u00e9rhet\u0151",
-    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionApplicationUpdateInstalled": "Friss\u00edt\u00e9s telep\u00edtve",
-    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionPluginUpdateInstalled": "B\u0151v\u00edtm\u00e9ny friss\u00edtve",
-    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginInstalled": "B\u0151v\u00edtm\u00e9ny telep\u00edtve",
-    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionPluginUninstalled": "B\u0151v\u00edtm\u00e9ny t\u00f6r\u00f6lve",
-    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionVideoPlayback": "Vide\u00f3 elind\u00edtva",
-    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionAudioPlayback": "Zene elind\u00edtva",
-    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionGamePlayback": "J\u00e1t\u00e9k elind\u00edtva",
-    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "NotificationOptionVideoPlaybackStopped": "Vide\u00f3 meg\u00e1ll\u00edtva",
-    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionAudioPlaybackStopped": "Zene meg\u00e1ll\u00edtva",
-    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionGamePlaybackStopped": "J\u00e1t\u00e9k meg\u00e1ll\u00edtva",
     "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionInstallationFailed": "Telep\u00edt\u00e9si hiba",
-    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionNewLibraryContent": "\u00daj tartalom hozz\u00e1adva",
-    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
+    "NotificationOptionNewLibraryContentMultiple": "\u00daj tartalom hozz\u00e1adva (t\u00f6bbsz\u00f6r\u00f6s)",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionCameraImageUploaded": "Kamera k\u00e9p felt\u00f6ltve",
-    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionUserLockedOut": "Felhaszn\u00e1l\u00f3 tiltva",
     "NotificationOptionServerRestartRequired": "\u00dajraind\u00edt\u00e1s sz\u00fcks\u00e9ges",
     "ViewTypePlaylists": "Lej\u00e1tsz\u00e1si list\u00e1k",
     "ViewTypeMovies": "Filmek",
@@ -64,7 +64,7 @@
     "ViewTypeLatestGames": "Leg\u00fajabb J\u00e1t\u00e9kok",
     "ViewTypeRecentlyPlayedGames": "Legut\u00f3bb J\u00e1tszott",
     "ViewTypeGameFavorites": "Kedvencek",
-    "ViewTypeGameSystems": "Game Systems",
+    "ViewTypeGameSystems": "J\u00e1t\u00e9k Rendszer",
     "ViewTypeGameGenres": "M\u0171fajok",
     "ViewTypeTvResume": "Folytat\u00e1s",
     "ViewTypeTvNextUp": "K\u00f6vetkez\u0151",
@@ -80,7 +80,7 @@
     "ViewTypeMovieFavorites": "Kedvencek",
     "ViewTypeMovieGenres": "M\u0171fajok",
     "ViewTypeMusicLatest": "Leg\u00fajabb",
-    "ViewTypeMusicPlaylists": "Playlists",
+    "ViewTypeMusicPlaylists": "Lej\u00e1tsz\u00e1si list\u00e1k",
     "ViewTypeMusicAlbums": "Albumok",
     "ViewTypeMusicAlbumArtists": "Album El\u0151ad\u00f3k",
     "HeaderOtherDisplaySettings": "Megjelen\u00edt\u00e9si Be\u00e1ll\u00edt\u00e1sok",
@@ -89,90 +89,90 @@
     "ViewTypeMusicFavoriteAlbums": "Kedvenc Albumok",
     "ViewTypeMusicFavoriteArtists": "Kedvenc M\u0171v\u00e9szek",
     "ViewTypeMusicFavoriteSongs": "Kedvenc Dalok",
-    "ViewTypeFolders": "Folders",
+    "ViewTypeFolders": "K\u00f6nyvt\u00e1rak",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvRecordingGroups": "Felv\u00e9telek",
-    "ViewTypeLiveTvChannels": "Channels",
+    "ViewTypeLiveTvChannels": "Csatorn\u00e1k",
-    "ScheduledTaskFailedWithName": "{0} failed",
+    "ScheduledTaskFailedWithName": "{0} hiba",
-    "LabelRunningTimeValue": "Running time: {0}",
+    "LabelRunningTimeValue": "Fut\u00e1si id\u0151: {0}",
     "ScheduledTaskStartedWithName": "{0} elkezdve",
     "VersionNumber": "Verzi\u00f3 {0}",
     "PluginInstalledWithName": "{0} telep\u00edtve",
     "PluginUpdatedWithName": "{0} friss\u00edtve",
-    "PluginUninstalledWithName": "{0} was uninstalled",
+    "PluginUninstalledWithName": "{0} elt\u00e1vol\u00edtva",
     "ItemAddedWithName": "{0} k\u00f6nyvt\u00e1rhoz adva",
     "ItemRemovedWithName": "{0} t\u00f6r\u00f6lve a k\u00f6nyvt\u00e1rb\u00f3l",
-    "LabelIpAddressValue": "Ip address: {0}",
+    "LabelIpAddressValue": "Ip c\u00edm: {0}",
     "DeviceOnlineWithName": "{0} kapcsol\u00f3dva",
-    "UserOnlineFromDevice": "{0} is online from {1}",
+    "UserOnlineFromDevice": "{0} akt\u00edv err\u0151l {1}",
     "ProviderValue": "Provider: {0}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "SubtitlesDownloadedForItem": "Felirat let\u00f6lt\u00e9se ehhez {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+    "UserConfigurationUpdatedWithName": "A k\u00f6vetkez\u0151 felhaszn\u00e1l\u00f3 be\u00e1ll\u00edt\u00e1sai friss\u00edtve {0}",
-    "UserCreatedWithName": "User {0} has been created",
+    "UserCreatedWithName": "Felhaszn\u00e1l\u00f3 {0} l\u00e9trehozva",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserPasswordChangedWithName": "Jelsz\u00f3 m\u00f3dos\u00edtva ennek a felhaszn\u00e1l\u00f3nak {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
+    "UserDeletedWithName": "Felhaszn\u00e1l\u00f3 {0} t\u00f6r\u00f6lve",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MessageServerConfigurationUpdated": "Szerver be\u00e1ll\u00edt\u00e1sok friss\u00edtve",
     "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Emby Server has been updated",
+    "MessageApplicationUpdated": "Emby Server friss\u00edtve",
     "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
     "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
     "DeviceOfflineWithName": "{0} sz\u00e9tkapcsolt",
-    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserLockedOutWithName": "A k\u00f6vetkez\u0151 felhaszn\u00e1l\u00f3 tiltva {0}",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserOfflineFromDevice": "{0} kil\u00e9pett innen {1}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+    "UserStartedPlayingItemWithValues": "{0} megkezdte j\u00e1tszani a(z) {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+    "UserStoppedPlayingItemWithValues": "{0} befejezte a(z) {1}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "SubtitleDownloadFailureForItem": "Nem siker\u00fcl a felirat let\u00f6lt\u00e9s ehhez {0}",
-    "HeaderUnidentified": "Unidentified",
+    "HeaderUnidentified": "Azonos\u00edtatlan",
-    "HeaderImagePrimary": "Primary",
+    "HeaderImagePrimary": "Els\u0151dleges",
-    "HeaderImageBackdrop": "Backdrop",
+    "HeaderImageBackdrop": "H\u00e1tt\u00e9r",
     "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
+    "HeaderUserPrimaryImage": "Felhaszn\u00e1l\u00f3 K\u00e9p",
-    "HeaderOverview": "Overview",
+    "HeaderOverview": "\u00c1ttekint\u00e9s",
-    "HeaderShortOverview": "Short Overview",
+    "HeaderShortOverview": "R\u00f6vid \u00c1ttekint\u00e9s",
-    "HeaderType": "Type",
+    "HeaderType": "T\u00edpus",
     "HeaderSeverity": "Severity",
-    "HeaderUser": "User",
+    "HeaderUser": "Felhaszn\u00e1l\u00f3",
-    "HeaderName": "Name",
+    "HeaderName": "N\u00e9v",
     "HeaderDate": "D\u00e1tum",
-    "HeaderPremiereDate": "Premiere Date",
+    "HeaderPremiereDate": "Megjelen\u00e9s D\u00e1tuma",
-    "HeaderDateAdded": "Date Added",
+    "HeaderDateAdded": "Hozz\u00e1adva",
-    "HeaderReleaseDate": "Release date",
+    "HeaderReleaseDate": "Megjelen\u00e9s d\u00e1tuma",
-    "HeaderRuntime": "Runtime",
+    "HeaderRuntime": "J\u00e1t\u00e9kid\u0151",
     "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "Season",
+    "HeaderSeason": "\u00c9vad",
-    "HeaderSeasonNumber": "Season number",
+    "HeaderSeasonNumber": "\u00c9vad sz\u00e1ma",
-    "HeaderSeries": "Series:",
+    "HeaderSeries": "Sorozatok:",
-    "HeaderNetwork": "Network",
+    "HeaderNetwork": "H\u00e1l\u00f3zat",
-    "HeaderYear": "Year:",
+    "HeaderYear": "\u00c9v:",
-    "HeaderYears": "Years:",
+    "HeaderYears": "\u00c9v:",
-    "HeaderParentalRating": "Parental Rating",
+    "HeaderParentalRating": "Korhat\u00e1r besorol\u00e1s",
-    "HeaderCommunityRating": "Community rating",
+    "HeaderCommunityRating": "K\u00f6z\u00f6ss\u00e9gi \u00e9rt\u00e9kel\u00e9s",
-    "HeaderTrailers": "Trailers",
+    "HeaderTrailers": "El\u0151zetesek",
-    "HeaderSpecials": "Specials",
+    "HeaderSpecials": "Speci\u00e1lis",
-    "HeaderGameSystems": "Game Systems",
+    "HeaderGameSystems": "J\u00e1t\u00e9k Rendszer",
     "HeaderPlayers": "Players:",
     "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albums",
+    "HeaderAlbums": "Albumok",
-    "HeaderDisc": "Disc",
+    "HeaderDisc": "Lemez",
-    "HeaderTrack": "Track",
+    "HeaderTrack": "S\u00e1v",
-    "HeaderAudio": "Audio",
+    "HeaderAudio": "Audi\u00f3",
-    "HeaderVideo": "Video",
+    "HeaderVideo": "Vide\u00f3",
-    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderEmbeddedImage": "Be\u00e1gyazott k\u00e9p",
-    "HeaderResolution": "Resolution",
+    "HeaderResolution": "Felbont\u00e1s",
-    "HeaderSubtitles": "Subtitles",
+    "HeaderSubtitles": "Feliratok",
-    "HeaderGenres": "Genres",
+    "HeaderGenres": "M\u0171fajok",
-    "HeaderCountries": "Countries",
+    "HeaderCountries": "Orsz\u00e1gok",
     "HeaderStatus": "\u00c1llapot",
-    "HeaderTracks": "Tracks",
+    "HeaderTracks": "S\u00e1vok",
     "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Locked",
+    "HeaderLocked": "Z\u00e1rt",
-    "HeaderStudios": "Studios",
+    "HeaderStudios": "St\u00fadi\u00f3k",
-    "HeaderActor": "Actors",
+    "HeaderActor": "Sz\u00edn\u00e9szek",
-    "HeaderComposer": "Composers",
+    "HeaderComposer": "Zeneszerz\u0151k",
-    "HeaderDirector": "Directors",
+    "HeaderDirector": "Rendez\u0151k",
     "HeaderGuestStar": "Guest star",
     "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
+    "HeaderWriter": "\u00cdr\u00f3k",
-    "HeaderParentalRatings": "Parental Ratings",
+    "HeaderParentalRatings": "Korhat\u00e1r besorol\u00e1s",
-    "HeaderCommunityRatings": "Community ratings",
+    "HeaderCommunityRatings": "K\u00f6z\u00f6ss\u00e9gi \u00e9rt\u00e9kel\u00e9sek",
     "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
 }

MediaBrowser.Server.Implementations/Localization/Core/pl.json

@@ -1,5 +1,5 @@
 {
-    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+    "DbUpgradeMessage": "Prosz\u0119 czeka\u0107 na koniec aktualizacji biblioteki. Post\u0119p: {0}%",
     "AppDeviceValues": "Aplikacja: {0}, Urz\u0105dzenie: {1}",
     "UserDownloadingItemWithValues": "{0} pobiera {1}",
     "FolderTypeMixed": "Zawarto\u015b\u0107 mieszana",

MediaBrowser.Server.Implementations/Localization/Core/pt-BR.json

@@ -1,5 +1,5 @@
 {
-    "DbUpgradeMessage": "Por favor, aguarde enquanto a base de dados do Servidor Emby \u00e9 atualizada. {0}% completado.",
+    "DbUpgradeMessage": "Por favor, aguarde enquanto a base de dados do Servidor Emby \u00e9 atualizada. {0}% completo.",
     "AppDeviceValues": "App: {0}, Dispositivo: {1}",
     "UserDownloadingItemWithValues": "{0} est\u00e1 fazendo download de {1}",
     "FolderTypeMixed": "Conte\u00fado misto",

MediaBrowser.Server.Implementations/Localization/Core/ru.json

@@ -23,7 +23,7 @@
     "LabelGithub": "GitHub",
     "LabelApiDocumentation": "\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u0438\u044f \u043f\u043e API",
     "LabelDeveloperResources": "\u0420\u0435\u0441\u0443\u0440\u0441\u044b \u0434\u043b\u044f \u0440\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u043e\u0432",
-    "LabelBrowseLibrary": "\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u041c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438",
+    "LabelBrowseLibrary": "\u041d\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044f \u043f\u043e \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0435",
     "LabelConfigureServer": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 Emby",
     "LabelRestartServer": "\u041f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u043a \u0441\u0435\u0440\u0432\u0435\u0440\u0430",
     "CategorySync": "\u0421\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0430\u0446\u0438\u044f",

MediaBrowser.Server.Implementations/Localization/Core/sl-SI.json

@@ -1,5 +1,5 @@
 {
-    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+    "DbUpgradeMessage": "Prosimo pocakajte podatkovna baza Emby Streznika se posodablja. {0}% koncano.",
     "AppDeviceValues": "App: {0}, Device: {1}",
     "UserDownloadingItemWithValues": "{0} is downloading {1}",
     "FolderTypeMixed": "Mixed content",
@@ -18,84 +18,84 @@
     "ValueSpecialEpisodeName": "Special - {0}",
     "LabelChapterName": "Chapter {0}",
     "NameSeasonNumber": "Season {0}",
-    "LabelExit": "Exit",
+    "LabelExit": "Izhod",
-    "LabelVisitCommunity": "Visit Community",
+    "LabelVisitCommunity": "Obiscite Skupnost",
     "LabelGithub": "Github",
-    "LabelApiDocumentation": "Api Documentation",
+    "LabelApiDocumentation": "Api Dokumentacija",
-    "LabelDeveloperResources": "Developer Resources",
+    "LabelDeveloperResources": "Vsebine za razvijalce",
-    "LabelBrowseLibrary": "Browse Library",
+    "LabelBrowseLibrary": "Brskanje po knjiznici",
-    "LabelConfigureServer": "Configure Emby",
+    "LabelConfigureServer": "Emby Nastavitve",
-    "LabelRestartServer": "Restart Server",
+    "LabelRestartServer": "Ponovni Zagon Streznika",
     "CategorySync": "Sync",
-    "CategoryUser": "User",
+    "CategoryUser": "Uporabnik",
-    "CategorySystem": "System",
+    "CategorySystem": "Sistem",
-    "CategoryApplication": "Application",
+    "CategoryApplication": "Aplikacija",
-    "CategoryPlugin": "Plugin",
+    "CategoryPlugin": "Vticnik",
-    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionPluginError": "Napaka v vticniku",
-    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateAvailable": "Na voljo je posodobitev",
-    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionApplicationUpdateInstalled": "Posodobitev je bila namescena",
     "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginInstalled": "Vticnik namescen",
-    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionPluginUninstalled": "Vticnik odstranjen",
     "NotificationOptionVideoPlayback": "Video playback started",
     "NotificationOptionAudioPlayback": "Audio playback started",
     "NotificationOptionGamePlayback": "Game playback started",
-    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "NotificationOptionVideoPlaybackStopped": "Predvajanje videa koncano",
-    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionAudioPlaybackStopped": "Predvajanje audia koncano",
     "NotificationOptionGamePlaybackStopped": "Game playback stopped",
     "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionInstallationFailed": "Napaka v namestitvi",
-    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionNewLibraryContent": "Dodana nova vsebina",
-    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
+    "NotificationOptionNewLibraryContentMultiple": "Dodane nove vsebine",
     "NotificationOptionCameraImageUploaded": "Camera image uploaded",
     "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionServerRestartRequired": "Server restart required",
+    "NotificationOptionServerRestartRequired": "Zahtevan je ponovni zagon",
-    "ViewTypePlaylists": "Playlists",
+    "ViewTypePlaylists": "Playliste",
-    "ViewTypeMovies": "Movies",
+    "ViewTypeMovies": "Filmi",
     "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Games",
+    "ViewTypeGames": "Igre",
-    "ViewTypeMusic": "Music",
+    "ViewTypeMusic": "Glasba",
-    "ViewTypeMusicGenres": "Genres",
+    "ViewTypeMusicGenres": "Zvrsti",
-    "ViewTypeMusicArtists": "Artists",
+    "ViewTypeMusicArtists": "Izvajalci",
-    "ViewTypeBoxSets": "Collections",
+    "ViewTypeBoxSets": "Zbirke",
-    "ViewTypeChannels": "Channels",
+    "ViewTypeChannels": "Kanali",
-    "ViewTypeLiveTV": "Live TV",
+    "ViewTypeLiveTV": "TV v Zivo",
     "ViewTypeLiveTvNowPlaying": "Now Airing",
-    "ViewTypeLatestGames": "Latest Games",
+    "ViewTypeLatestGames": "Zadnje Igre",
     "ViewTypeRecentlyPlayedGames": "Recently Played",
-    "ViewTypeGameFavorites": "Favorites",
+    "ViewTypeGameFavorites": "Priljubljeno",
     "ViewTypeGameSystems": "Game Systems",
-    "ViewTypeGameGenres": "Genres",
+    "ViewTypeGameGenres": "Zvrsti",
-    "ViewTypeTvResume": "Resume",
+    "ViewTypeTvResume": "Nadaljuj",
     "ViewTypeTvNextUp": "Next Up",
     "ViewTypeTvLatest": "Latest",
-    "ViewTypeTvShowSeries": "Series",
+    "ViewTypeTvShowSeries": "Serije",
-    "ViewTypeTvGenres": "Genres",
+    "ViewTypeTvGenres": "Zvrsti",
-    "ViewTypeTvFavoriteSeries": "Favorite Series",
+    "ViewTypeTvFavoriteSeries": "Priljubljene Serije",
-    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
+    "ViewTypeTvFavoriteEpisodes": "Priljubljene Epizode",
-    "ViewTypeMovieResume": "Resume",
+    "ViewTypeMovieResume": "Nadaljuj",
     "ViewTypeMovieLatest": "Latest",
-    "ViewTypeMovieMovies": "Movies",
+    "ViewTypeMovieMovies": "Filmi",
-    "ViewTypeMovieCollections": "Collections",
+    "ViewTypeMovieCollections": "Zbirke",
-    "ViewTypeMovieFavorites": "Favorites",
+    "ViewTypeMovieFavorites": "Priljubljeno",
     "ViewTypeMovieGenres": "Genres",
     "ViewTypeMusicLatest": "Latest",
     "ViewTypeMusicPlaylists": "Playlists",
-    "ViewTypeMusicAlbums": "Albums",
+    "ViewTypeMusicAlbums": "Albumi",
     "ViewTypeMusicAlbumArtists": "Album Artists",
     "HeaderOtherDisplaySettings": "Display Settings",
     "ViewTypeMusicSongs": "Songs",
     "ViewTypeMusicFavorites": "Favorites",
-    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
+    "ViewTypeMusicFavoriteAlbums": "Priljubljeni Albumi",
-    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
+    "ViewTypeMusicFavoriteArtists": "Priljubljeni Izvajalci",
-    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
+    "ViewTypeMusicFavoriteSongs": "Priljubljene skladbe",
     "ViewTypeFolders": "Folders",
     "ViewTypeLiveTvRecordingGroups": "Recordings",
     "ViewTypeLiveTvChannels": "Channels",
     "ScheduledTaskFailedWithName": "{0} failed",
     "LabelRunningTimeValue": "Running time: {0}",
     "ScheduledTaskStartedWithName": "{0} started",
-    "VersionNumber": "Version {0}",
+    "VersionNumber": "Verzija {0}",
     "PluginInstalledWithName": "{0} was installed",
     "PluginUpdatedWithName": "{0} was updated",
     "PluginUninstalledWithName": "{0} was uninstalled",
@@ -130,9 +130,9 @@
     "HeaderShortOverview": "Short Overview",
     "HeaderType": "Type",
     "HeaderSeverity": "Severity",
-    "HeaderUser": "User",
+    "HeaderUser": "Uporabnik",
     "HeaderName": "Name",
-    "HeaderDate": "Date",
+    "HeaderDate": "Datum",
     "HeaderPremiereDate": "Premiere Date",
     "HeaderDateAdded": "Date Added",
     "HeaderReleaseDate": "Release date",

MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs

@@ -374,6 +374,7 @@ namespace MediaBrowser.Server.Implementations.Localization
                 new LocalizatonOption{ Name="English (United States)", Value="en-us"},
                 new LocalizatonOption{ Name="Finnish", Value="fi"},
                 new LocalizatonOption{ Name="French", Value="fr"},
+                new LocalizatonOption{ Name="French (Canada)", Value="fr-CA"},
                 new LocalizatonOption{ Name="German", Value="de"},
                 new LocalizatonOption{ Name="Greek", Value="el"},
                 new LocalizatonOption{ Name="Hebrew", Value="he"},

MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj

@@ -49,6 +49,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Emby.XmlTv.1.0.0.48\lib\net45\Emby.XmlTv.dll</HintPath>
     </Reference>
+    <Reference Include="INIFileParser">
+      <HintPath>..\packages\ini-parser.2.2.4\lib\net20\INIFileParser.dll</HintPath>
+    </Reference>
     <Reference Include="Interfaces.IO">
       <HintPath>..\packages\Interfaces.IO.1.0.0.5\lib\portable-net45+sl4+wp71+win8+wpa81\Interfaces.IO.dll</HintPath>
     </Reference>
@@ -588,6 +591,7 @@
     <EmbeddedResource Include="LiveTv\TunerHosts\SatIp\ini\satellite\3560.ini" />
     <EmbeddedResource Include="LiveTv\TunerHosts\SatIp\ini\satellite\3592.ini" />
     <EmbeddedResource Include="LiveTv\TunerHosts\SatIp\ini\satellite\3594.ini" />
+    <EmbeddedResource Include="Localization\Core\fr-CA.json" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

MediaBrowser.Server.Implementations/packages.config

@@ -2,6 +2,7 @@
 <packages>
   <package id="CommonIO" version="1.0.0.8" targetFramework="net45" />
   <package id="Emby.XmlTv" version="1.0.0.48" targetFramework="net45" />
+  <package id="ini-parser" version="2.2.4" targetFramework="net45" />
   <package id="Interfaces.IO" version="1.0.0.5" targetFramework="net45" />
   <package id="MediaBrowser.Naming" version="1.0.0.49" targetFramework="net45" />
   <package id="Mono.Nat" version="1.2.24.0" targetFramework="net45" />

MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj

@@ -1735,6 +1735,9 @@
     <None Include="dashboard-ui\manifest.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="dashboard-ui\strings\fr-CA.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="dashboard-ui\strings\hu.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>