Merge pull request #1085 from tidusjar/dev

Dev

Ombi.Api/SonarrApi.cs

@@ -52,9 +52,9 @@ namespace Ombi.Api
 
             request.AddHeader("X-Api-Key", apiKey);
             var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling GetProfiles for Sonarr, Retrying {0}", timespan), new TimeSpan[] {
-                TimeSpan.FromSeconds (2),
-                TimeSpan.FromSeconds(5),
-                TimeSpan.FromSeconds(10)
+                TimeSpan.FromSeconds (1),
+                TimeSpan.FromSeconds(2),
+                TimeSpan.FromSeconds(5)
             });
 
             var obj = policy.Execute(() => Api.ExecuteJson<List<SonarrProfile>>(request, baseUrl));
@@ -68,9 +68,9 @@ namespace Ombi.Api
 
             request.AddHeader("X-Api-Key", apiKey);
             var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling GetRootFolders for Sonarr, Retrying {0}", timespan), new TimeSpan[] {
-                  TimeSpan.FromSeconds (2),
-                  TimeSpan.FromSeconds(5),
-                  TimeSpan.FromSeconds(10)
+                  TimeSpan.FromSeconds (1),
+                  TimeSpan.FromSeconds(2),
+                  TimeSpan.FromSeconds(5)
               });
 
             var obj = policy.Execute(() => Api.ExecuteJson<List<SonarrRootFolder>>(request, baseUrl));

Ombi.Core/CacheKeys.cs

@@ -45,6 +45,8 @@ namespace Ombi.Core
         public const string CouchPotatoQualityProfiles = nameof(CouchPotatoQualityProfiles);
         public const string CouchPotatoQueued = nameof(CouchPotatoQueued);
         public const string WatcherQueued = nameof(WatcherQueued);
+        public const string GetCustomizationSettings = nameof(GetCustomizationSettings);
+        public const string GetEmbySettings = nameof(GetEmbySettings);
         public const string GetPlexRequestSettings = nameof(GetPlexRequestSettings);
         public const string LastestProductVersion = nameof(LastestProductVersion);
         public const string SonarrRootFolders = nameof(SonarrRootFolders);

Ombi.Core/SettingModels/SickRageSettings.cs

@@ -37,7 +37,7 @@ namespace Ombi.Core.SettingModels
 
         public Dictionary<string, string> Qualities => new Dictionary<string, string>
         {
-            { "default", "Use Deafult" },
+            { "default", "Use Default" },
             { "sdtv", "SD TV" },
             { "sddvd", "SD DVD" },
             { "hdtv", "HD TV" },

Ombi.Core/Setup.cs

@@ -46,7 +46,7 @@ namespace Ombi.Core
         {
             Db = new DbConfiguration(new SqliteFactory());
             var created = Db.CheckDb();
-            TableCreation.CreateTables(Db.DbConnection());
+            Db.DbConnection().CreateTables();
 
             if (created)
             {
@@ -55,7 +55,7 @@ namespace Ombi.Core
             else
             {
                 // Shrink DB
-                TableCreation.Vacuum(Db.DbConnection());
+                Db.DbConnection().Vacuum();
             }
 
             // Add the new 'running' item into the scheduled jobs so we can check if the cachers are running
@@ -113,6 +113,7 @@ namespace Ombi.Core
             try
             {
                 Task.Run(() => { CacheSonarrQualityProfiles(mc); });
+                Task.Run(() => { CacheRadarrQualityProfiles(mc); });
                 Task.Run(() => { CacheCouchPotatoQualityProfiles(mc); });
                 // we don't need to cache sickrage profiles, those are static
             }
@@ -126,7 +127,6 @@ namespace Ombi.Core
         {
             try
             {
-                Log.Info("Executing GetSettings call to Sonarr for quality profiles");
                 var sonarrSettingsService = new SettingsServiceV2<SonarrSettings>(new SettingsJsonRepository(new DbConfiguration(new SqliteFactory()), cacheProvider));
                 var sonarrSettings = sonarrSettingsService.GetSettings();
                 if (sonarrSettings.Enabled)
@@ -144,11 +144,31 @@ namespace Ombi.Core
             }
         }
 
+        private void CacheRadarrQualityProfiles(ICacheProvider cacheProvider)
+        {
+            try
+            {
+                var radarrService = new SettingsServiceV2<RadarrSettings>(new SettingsJsonRepository(new DbConfiguration(new SqliteFactory()), cacheProvider));
+                var radarrSettings = radarrService.GetSettings();
+                if (radarrSettings.Enabled)
+                {
+                    Log.Info("Begin executing GetProfiles call to Radarr for quality profiles");
+                    RadarrApi radarrApi = new RadarrApi();
+                    var profiles = radarrApi.GetProfiles(radarrSettings.ApiKey, radarrSettings.FullUri);
+                    cacheProvider.Set(CacheKeys.RadarrQualityProfiles, profiles);
+                    Log.Info("Finished executing GetProfiles call to Radarr for quality profiles");
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, "Failed to cache Sonarr quality profiles!");
+            }
+        }
+
         private void CacheCouchPotatoQualityProfiles(ICacheProvider cacheProvider)
         {
             try
             {
-                Log.Info("Executing GetSettings call to CouchPotato for quality profiles");
                 var cpSettingsService = new SettingsServiceV2<CouchPotatoSettings>(new SettingsJsonRepository(new DbConfiguration(new SqliteFactory()), cacheProvider));
                 var cpSettings = cpSettingsService.GetSettings();
                 if (cpSettings.Enabled)

Ombi.Services/Jobs/RecentlyAddedNewsletter/RecentlyAddedNewsletter.cs

@@ -140,7 +140,7 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
 
                 var escapedHtml = new string(html.Where(c => !char.IsControl(c)).ToArray());
                 Log.Debug(escapedHtml);
-                SendNewsletter(newletterSettings, escapedHtml, testEmail);
+                SendNewsletter(newletterSettings, escapedHtml, testEmail, "New Content On Emby!");
             }
             else
             {

Ombi.Services/Jobs/Templates/RecentlyAddedTemplate.html

@@ -151,7 +151,7 @@
                                         <td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top">
                                             <br />
                                             <br />
-                                            <p style="font-family: sans-serif; font-size: 20px; font-weight: normal; margin: 0; Margin-bottom: 15px;">Here is a list of Movies and TV Shows that have recently been added to Plex!</p>
+                                            <p style="font-family: sans-serif; font-size: 20px; font-weight: normal; margin: 0; Margin-bottom: 15px;">Here is a list of Movies and TV Shows that have recently been added!</p>
 
                                         </td>
                                     </tr>

Ombi.UI/Content/favicon/browserconfig.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>

Ombi.UI/Content/favicon/manifest.json

@@ -0,0 +1,41 @@
+{
+ "name": "App",
+ "icons": [
+  {
+   "src": "\/android-icon-36x36.png",
+   "sizes": "36x36",
+   "type": "image\/png",
+   "density": "0.75"
+  },
+  {
+   "src": "\/android-icon-48x48.png",
+   "sizes": "48x48",
+   "type": "image\/png",
+   "density": "1.0"
+  },
+  {
+   "src": "\/android-icon-72x72.png",
+   "sizes": "72x72",
+   "type": "image\/png",
+   "density": "1.5"
+  },
+  {
+   "src": "\/android-icon-96x96.png",
+   "sizes": "96x96",
+   "type": "image\/png",
+   "density": "2.0"
+  },
+  {
+   "src": "\/android-icon-144x144.png",
+   "sizes": "144x144",
+   "type": "image\/png",
+   "density": "3.0"
+  },
+  {
+   "src": "\/android-icon-192x192.png",
+   "sizes": "192x192",
+   "type": "image\/png",
+   "density": "4.0"
+  }
+ ]
+}

Ombi.UI/Content/wizard.js

@@ -25,6 +25,12 @@
 
     $('#contentBody').on('click', '#embyApiKeySave', function (e) {
         e.preventDefault();
+
+        var port = $('#portNumber').val();
+        if (!port) {
+            generateNotify("Please provide a port number", "warning");
+        }
+
         $('#spinner').attr("class", "fa fa-spinner fa-spin");
 
         var $form = $("#embyAuthForm");

Ombi.UI/Helpers/BaseUrlHelper.cs

@@ -283,11 +283,30 @@ namespace Ombi.UI.Helpers
 
             var assetLocation = GetBaseUrl();
             var content = GetContentUrl(assetLocation);
+            var sb = new StringBuilder();
 
-            var asset = $"<link rel=\"SHORTCUT ICON\" href=\"{content}/Content/favicon.ico\" />";
-            asset += $"<link rel=\"icon\" href=\"{content}/Content/favicon.ico\" type=\"image/ico\" />";
+            sb.Append($"<link rel=\"SHORTCUT ICON\" href=\"{content}/Content/favicon/favicon.ico\" />");
+            sb.Append($"<link rel=\"icon\" href=\"{content}/Content/favicon/favicon.ico?v2\" type=\"image/ico\" />");
+
+            sb.Append($"<link rel=\"apple-touch-icon\" sizes=\"57x57\" href=\"{content}/Content/favicon/apple-icon-57x57.png?v2\">");
+            sb.Append($"<link rel=\"apple-touch-icon\" sizes=\"60x60\" href=\"{content}/Content/favicon/apple-icon-60x60.png?v2\">");
+            sb.Append($"<link rel=\"apple-touch-icon\" sizes=\"72x72\" href=\"{content}/Content/favicon/apple-icon-72x72.png?v2\">");
+            sb.Append($"<link rel=\"apple-touch-icon\" sizes=\"76x76\" href=\"{content}/Content/favicon/apple-icon-76x76.png?v2\">");
+            sb.Append($"<link rel=\"apple-touch-icon\" sizes=\"114x114\" href=\"{content}/Content/favicon/apple-icon-114x114.png?v2\">");
+            sb.Append($"<link rel=\"apple-touch-icon\" sizes=\"120x120\" href=\"{content}/Content/favicon/apple-icon-120x120.png?v2\">");
+            sb.Append($"<link rel=\"apple-touch-icon\" sizes=\"144x144\" href=\"{content}/Content/favicon/apple-icon-144x144.png?v2\">");
+            sb.Append($"<link rel=\"apple-touch-icon\" sizes=\"152x152\" href=\"{content}/Content/favicon/apple-icon-152x152.png?v2\">");
+            sb.Append($"<link rel=\"apple-touch-icon\" sizes=\"180x180\" href=\"{content}/Content/favicon/apple-icon-180x180.png?v2\">");
+            sb.Append($"<link rel=\"icon\" type=\"image/png\" sizes=\"192x192\"  href=\"{content}/Content/favicon/android-icon-192x192.png?v2\">");
+            sb.Append($"<link rel=\"icon\" type=\"image/png\" sizes=\"32x32\" href=\"{content}/Content/favicon/favicon-32x32.png?v2\">");
+            sb.Append($"<link rel=\"icon\" type=\"image/png\" sizes=\"96x96\" href=\"{content}/Content/favicon/favicon-96x96.png?v2\">");
+            sb.Append($"<link rel=\"icon\" type=\"image/png\" sizes=\"16x16\" href=\"{content}/Content/favicon/favicon-16x16.png?v2\">");
+            sb.Append($"<link rel=\"manifest\" href=\"{content}/Content/favicon/manifest.json?v2\">");
+            sb.Append($"<meta name=\"msapplication-TileColor\" content=\"#ffffff\">");
+            sb.Append($"<meta name=\"msapplication-TileImage\" content=\"{content}/Content/favicon/ms-icon-144x144.png?v2\">");
+            sb.Append($"<meta name=\"theme-color\" content=\"#ffffff\">");
 
-            return helper.Raw(asset);
+            return helper.Raw(sb.ToString());
         }
 
         public static IHtmlString GetSidebarUrl(this HtmlHelpers helper, NancyContext context, string url, string title, string icon = null)
@@ -354,6 +373,12 @@ namespace Ombi.UI.Helpers
             return helper.Raw(GetCustomizationSettings().ApplicationName);
         }
 
+        public static IHtmlString GetMediaServerName(this HtmlHelpers helper)
+        {
+            var s = GetEmbySettings();
+            return helper.Raw(s.Enable ? "Emby" : "Plex");
+        }
+
         private static string GetBaseUrl()
         {
             return GetSettings().BaseUrl;
@@ -371,7 +396,7 @@ namespace Ombi.UI.Helpers
 
         private static CustomizationSettings GetCustomizationSettings()
         {
-            var returnValue = Cache.GetOrSet(CacheKeys.GetPlexRequestSettings, () =>
+            var returnValue = Cache.GetOrSet(CacheKeys.GetCustomizationSettings, () =>
             {
                 var settings = Locator.Resolve<ISettingsService<CustomizationSettings>>().GetSettings();
                 return settings;
@@ -379,6 +404,16 @@ namespace Ombi.UI.Helpers
             return returnValue;
         }
 
+        private static EmbySettings GetEmbySettings()
+        {
+            var returnValue = Cache.GetOrSet(CacheKeys.GetEmbySettings, () =>
+            {
+                var settings = Locator.Resolve<ISettingsService<EmbySettings>>().GetSettings();
+                return settings;
+            });
+            return returnValue;
+        }
+
         private static string GetLinkUrl(string assetLocation)
         {
             return string.IsNullOrEmpty(assetLocation) ? string.Empty : $"{assetLocation}";

Ombi.UI/Models/SearchLoadViewModel.cs

@@ -32,6 +32,8 @@ namespace Ombi.UI.Models
     public class SearchLoadViewModel
     {
         public PlexRequestSettings Settings { get; set; }
+        public bool Plex { get; set; }
+        public bool Emby { get; set; }
         public CustomizationSettings CustomizationSettings { get; set; }
     }
 }

Ombi.UI/Modules/ApprovalModule.cs

@@ -193,7 +193,7 @@ namespace Ombi.UI.Modules
             {
                 // Approve it
                 request.Approved = true;
-                Log.Warn("We approved movie: {0} but could not add it to CouchPotato/Watcher because it has not been setup", request.Title);
+                Log.Warn("We approved movie: {0} but could not add it to CouchPotato/Watcher/Radarr because it has not been setup", request.Title);
 
                 // Update the record
                 var inserted = await Service.UpdateRequestAsync(request);

Ombi.UI/Ombi.UI.csproj

@@ -390,6 +390,84 @@
       <DependentUpon>datepicker.css</DependentUpon>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\favicon\android-icon-144x144.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\android-icon-192x192.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\android-icon-36x36.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\android-icon-48x48.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\android-icon-72x72.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\android-icon-96x96.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\apple-icon-114x114.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\apple-icon-120x120.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\apple-icon-144x144.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\apple-icon-152x152.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\apple-icon-180x180.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\apple-icon-57x57.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\apple-icon-60x60.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\apple-icon-72x72.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\apple-icon-76x76.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\apple-icon-precomposed.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\apple-icon.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\browserconfig.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\favicon-16x16.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\favicon-32x32.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\favicon-96x96.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\favicon.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\ms-icon-144x144.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\ms-icon-150x150.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\ms-icon-310x310.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\ms-icon-70x70.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\helpers\bootbox.min.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -639,6 +717,9 @@
     </None>
     <None Include="Content\base.scss" />
     <None Include="Content\bootstrap-datetimepicker-build.less" />
+    <None Include="Content\favicon\manifest.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Content\Themes\original.scss" />
     <None Include="Content\Themes\plex.scss" />
     <Content Include="Content\pace.min.js">

Ombi.UI/Resources/UI.da.resx

@@ -121,13 +121,13 @@
     <value>Log ind</value>
   </data>
   <data name="UserLogin_Paragraph" xml:space="preserve">
-    <value>Ønsker du at se en film eller tv-show, men det er i øjeblikket ikke på Plex? Log nedenfor med dit Plex.tv brugernavn og password !!</value>
+    <value>Ønsker du at se en film eller tv-show, men det er i øjeblikket ikke på {0}? Log nedenfor med dit brugernavn og password !!</value>
   </data>
   <data name="UserLogin_Paragraph_SpanHover" xml:space="preserve">
     <value>Dine login-oplysninger bruges kun til at godkende din Plex konto.</value>
   </data>
   <data name="UserLogin_Username" xml:space="preserve">
-    <value>Plex.tv Brugernavn</value>
+    <value>Brugernavn</value>
   </data>
   <data name="UserLogin_Username_Placeholder" xml:space="preserve">
     <value>Brugernavn</value>
@@ -211,7 +211,7 @@
     <value>Album</value>
   </data>
   <data name="Search_Paragraph" xml:space="preserve">
-    <value>Ønsker at se noget, der ikke i øjeblikket på Plex ?! Intet problem! Bare søge efter det nedenfor og anmode den !</value>
+    <value>Ønsker at se noget, der ikke i øjeblikket på {0}?! Intet problem! Bare søge efter det nedenfor og anmode den !</value>
   </data>
   <data name="Search_Title" xml:space="preserve">
     <value>Søg</value>
@@ -409,7 +409,7 @@
     <value>allerede er blevet anmodet !!</value>
   </data>
   <data name="Search_CouldNotCheckPlex" xml:space="preserve">
-    <value>Vi kunne ikke kontrollere, om {0} er i Plex, er du sikker på det er korrekt setup ?!</value>
+    <value>Vi kunne ikke kontrollere, om {0} er i {1}, er du sikker på det er korrekt setup ?!</value>
   </data>
   <data name="Search_CouchPotatoError" xml:space="preserve">
     <value>Noget gik galt tilføjer filmen til CouchPotato! Tjek venligst din opsætning.!</value>
@@ -418,7 +418,7 @@
     <value>Du har nået din ugentlige anmodning grænse for film! Kontakt din administrator.!</value>
   </data>
   <data name="Search_AlreadyInPlex" xml:space="preserve">
-    <value>er allerede i Plex !!</value>
+    <value>er allerede i {0}!!</value>
   </data>
   <data name="Search_SickrageError" xml:space="preserve">
     <value>Noget gik galt tilføjer filmen til SickRage! Tjek venligst din opsætning.!</value>
@@ -435,9 +435,6 @@
   <data name="Search_WeeklyRequestLimitTVShow" xml:space="preserve">
     <value>Du har nået din ugentlige anmodning grænse for tv-shows! Kontakt din administrator.!</value>
   </data>
-  <data name="Search_ErrorPlexAccountOnly" xml:space="preserve">
-    <value>Beklager, men denne funktionalitet er i øjeblikket kun for brugere med Plex konti!</value>
-  </data>
   <data name="Search_ErrorNotEnabled" xml:space="preserve">
     <value>Beklager, men din administrator har endnu ikke gjort det muligt denne funktionalitet.!</value>
   </data>

Ombi.UI/Resources/UI.de.resx

@@ -121,13 +121,13 @@
     <value>Anmelden</value>
   </data>
   <data name="UserLogin_Paragraph" xml:space="preserve">
-    <value>Möchten Sie einen Film oder eine Serie schauen, die momentan noch nicht auf Plex ist? Dann loggen Sie sich unten ein und fordern Sie das Material an!</value>
+    <value>Möchten Sie einen Film oder eine Serie schauen, die momentan noch nicht auf {0}ist? Dann loggen Sie sich unten ein und fordern Sie das Material an!</value>
   </data>
   <data name="UserLogin_Paragraph_SpanHover" xml:space="preserve">
     <value>Ihre Login-Daten werden nur zur Authorisierung Ihres Plex-Konto verwendet.</value>
   </data>
   <data name="UserLogin_Username" xml:space="preserve">
-    <value>Plex.tv Benutzername</value>
+    <value>Benutzername</value>
   </data>
   <data name="UserLogin_Username_Placeholder" xml:space="preserve">
     <value>Benutzername</value>
@@ -211,7 +211,7 @@
     <value>Alben</value>
   </data>
   <data name="Search_Paragraph" xml:space="preserve">
-    <value>Möchten Sie etwas schauen, das derzeit nicht auf Plex ist?! Kein Problem! Suchen Sie unten einfach danach und fragen Sie es an!</value>
+    <value>Möchten Sie etwas schauen, das derzeit nicht auf {0} ist?! Kein Problem! Suchen Sie unten einfach danach und fragen Sie es an!</value>
   </data>
   <data name="Search_Title" xml:space="preserve">
     <value>Suche</value>
@@ -409,7 +409,7 @@
     <value>wurde bereits angefragt!</value>
   </data>
   <data name="Search_CouldNotCheckPlex" xml:space="preserve">
-    <value>Wir konnten nicht prüfen ob {0} bereits auf Plex ist. Bist du sicher dass alles richtig installiert ist?</value>
+    <value>Wir konnten nicht prüfen ob {0} bereits auf {1}ist. Bist du sicher dass alles richtig installiert ist?</value>
   </data>
   <data name="Search_CouchPotatoError" xml:space="preserve">
     <value>Etwas ging etwas schief beim hinzufügen des Filmes zu CouchPotato! Bitte überprüfe deine Einstellungen.</value>
@@ -418,7 +418,7 @@
     <value>Du hast deine wöchentliche Maximalanfragen für neue Filme erreicht. Bitte kontaktiere den Administrator.</value>
   </data>
   <data name="Search_AlreadyInPlex" xml:space="preserve">
-    <value>ist bereits auf Plex!</value>
+    <value>ist bereits auf {0}!</value>
   </data>
   <data name="Search_SickrageError" xml:space="preserve">
     <value>Etwas ging etwas schief beim hinzufügen des Filmes zu SickRage! Bitte überprüfe deine Einstellungen.</value>
@@ -435,9 +435,6 @@
   <data name="Search_WeeklyRequestLimitTVShow" xml:space="preserve">
     <value>Du hast deine wöchentliche Maximalanfragen für neue Serien erreicht. Bitte kontaktiere den Administrator.</value>
   </data>
-  <data name="Search_ErrorPlexAccountOnly" xml:space="preserve">
-    <value>Entschuldige, aber diese Funktion ist momentan nur für Benutzer mit Plex-Accounts freigeschaltet.</value>
-  </data>
   <data name="Search_ErrorNotEnabled" xml:space="preserve">
     <value>Entschuldige, aber dein Administrator hat diese Funktion noch nicht freigeschaltet.</value>
   </data>

Ombi.UI/Resources/UI.es.resx

@@ -121,13 +121,13 @@
     <value>INICIAR SESIÓN</value>
   </data>
   <data name="UserLogin_Paragraph" xml:space="preserve">
-    <value>¿Quieres ver una película o programa de televisión, pero no es actualmente en Plex? Ingresa abajo con su nombre de usuario y contraseña Plex.tv !</value>
+    <value>¿Quieres ver una película o programa de televisión, pero no es actualmente en {0}? Ingresa abajo con su nombre de usuario y contraseña !</value>
   </data>
   <data name="UserLogin_Paragraph_SpanHover" xml:space="preserve">
     <value>Sus datos de acceso sólo se utilizan para autenticar su cuenta Plex.</value>
   </data>
   <data name="UserLogin_Username" xml:space="preserve">
-    <value>Plex.tv nombre de usuario</value>
+    <value>nombre de usuario</value>
   </data>
   <data name="UserLogin_Username_Placeholder" xml:space="preserve">
     <value>Username</value>
@@ -211,7 +211,7 @@
     <value>Álbumes</value>
   </data>
   <data name="Search_Paragraph" xml:space="preserve">
-    <value>¿Quieres ver algo que no se encuentra actualmente en Plex ?! ¡No hay problema! Sólo la búsqueda de abajo y que solicitarlo !</value>
+    <value>¿Quieres ver algo que no se encuentra actualmente en {0}?! ¡No hay problema! Sólo la búsqueda de abajo y que solicitarlo !</value>
   </data>
   <data name="Search_Title" xml:space="preserve">
     <value>Buscar</value>
@@ -409,7 +409,7 @@
     <value>ya ha sido solicitada !!</value>
   </data>
   <data name="Search_CouldNotCheckPlex" xml:space="preserve">
-    <value>No hemos podido comprobar si {0} está en Plex, ¿estás seguro de que es correcta la configuración ?!</value>
+    <value>No hemos podido comprobar si {0} está en {1}, ¿estás seguro de que es correcta la configuración ?!</value>
   </data>
   <data name="Search_CouchPotatoError" xml:space="preserve">
     <value>Algo salió mal la adición de la película para CouchPotato! Por favor verifica la configuracion.!</value>
@@ -418,7 +418,7 @@
     <value>Ha llegado a su límite de solicitudes semanales de películas! Por favor, póngase en contacto con su administrador.!</value>
   </data>
   <data name="Search_AlreadyInPlex" xml:space="preserve">
-    <value>ya está en Plex !!</value>
+    <value>ya está en {0}!!</value>
   </data>
   <data name="Search_SickrageError" xml:space="preserve">
     <value>Algo salió mal la adición de la película para SickRage! Por favor verifica la configuracion.!</value>
@@ -435,9 +435,6 @@
   <data name="Search_WeeklyRequestLimitTVShow" xml:space="preserve">
     <value>Ha llegado a su límite de solicitudes semanales de programas de televisión! Por favor, póngase en contacto con su administrador.!</value>
   </data>
-  <data name="Search_ErrorPlexAccountOnly" xml:space="preserve">
-    <value>Lo sentimos, pero esta funcionalidad es actualmente sólo para los usuarios con cuentas Plex!</value>
-  </data>
   <data name="Search_ErrorNotEnabled" xml:space="preserve">
     <value>Lo sentimos, pero el administrador aún no ha habilitado esta funcionalidad.!</value>
   </data>

Ombi.UI/Resources/UI.fr.resx

@@ -121,13 +121,13 @@
     <value>Connexion</value>
   </data>
   <data name="UserLogin_Paragraph" xml:space="preserve">
-    <value>Vous souhaitez avoir accès à un contenu qui n'est pas encore disponible dans Plex ? Demandez-le ici !</value>
+    <value>Vous souhaitez avoir accès à un contenu qui n'est pas encore disponible dans {0}? Demandez-le ici !</value>
   </data>
   <data name="UserLogin_Paragraph_SpanHover" xml:space="preserve">
     <value>Vos informations de connexion sont uniquement utilisées pour authentifier votre compte Plex.</value>
   </data>
   <data name="UserLogin_Username" xml:space="preserve">
-    <value>Nom d'utilisateur Plex.tv</value>
+    <value>Nom d'utilisateur</value>
   </data>
   <data name="UserLogin_Username_Placeholder" xml:space="preserve">
     <value>Nom d’utilisateur</value>
@@ -211,7 +211,7 @@
     <value>Albums</value>
   </data>
   <data name="Search_Paragraph" xml:space="preserve">
-    <value>Vous souhaitez avoir accès à un contenu qui n'est pas encore disponible dans Plex ?! Aucun problème ! Il suffit d'effectuer une recherche ci-dessous et d'en faire la demande!</value>
+    <value>Vous souhaitez avoir accès à un contenu qui n'est pas encore disponible dans {0} ?! Aucun problème ! Il suffit d'effectuer une recherche ci-dessous et d'en faire la demande!</value>
   </data>
   <data name="Search_Title" xml:space="preserve">
     <value>Rechercher</value>
@@ -409,7 +409,7 @@
     <value>a déjà été demandé!</value>
   </data>
   <data name="Search_CouldNotCheckPlex" xml:space="preserve">
-    <value>Nous ne pouvons pas vérifier que {0} est présent dans Plex, êtes-vous sûr que la configuration est correcte?</value>
+    <value>Nous ne pouvons pas vérifier que {0} est présent dans {1}, êtes-vous sûr que la configuration est correcte?</value>
   </data>
   <data name="Search_CouchPotatoError" xml:space="preserve">
     <value>Une erreur s'est produite lors de l'ajout du film dans CouchPotato! Merci de bien vouloir vérifier vos paramètres.</value>
@@ -418,7 +418,7 @@
     <value>Vous avez atteint votre quota hebdomadaire de demandes pour les films! Merci de bien vouloir contacter l'administrateur.</value>
   </data>
   <data name="Search_AlreadyInPlex" xml:space="preserve">
-    <value>est déjà présent dans Plex!</value>
+    <value>est déjà présent dans {0}!</value>
   </data>
   <data name="Search_SickrageError" xml:space="preserve">
     <value>Une erreur s'est produite lors de l'ajout de la série TV dans SickRage! Merci de bien vouloir vérifier vos paramètres.</value>
@@ -435,9 +435,6 @@
   <data name="Search_WeeklyRequestLimitTVShow" xml:space="preserve">
     <value>Vous avez atteint votre quota hebdomadaire de demandes pour les séries TV! Merci de bien vouloir contacter l'administrateur.</value>
   </data>
-  <data name="Search_ErrorPlexAccountOnly" xml:space="preserve">
-    <value>Désolé mais cette fonctionnalité est réservée aux utilisateurs possédant un compte Plex.</value>
-  </data>
   <data name="Search_ErrorNotEnabled" xml:space="preserve">
     <value>Désolé mais l'administrateur n'a pas encore activé cette fonctionnalité.</value>
   </data>

Ombi.UI/Resources/UI.it.resx

@@ -121,13 +121,13 @@
     <value>Accesso</value>
   </data>
   <data name="UserLogin_Paragraph" xml:space="preserve">
-    <value>Vuoi guardare un film o una serie tv ma non è attualmente in Plex? Effettua il login con il tuo username e la password Plex.tv !</value>
+    <value>Vuoi guardare un film o una serie tv ma non è attualmente in {0}? Effettua il login con il tuo username e la password !</value>
   </data>
   <data name="UserLogin_Paragraph_SpanHover" xml:space="preserve">
     <value>I dati di accesso vengono utilizzati solo per autenticare l'account Plex.</value>
   </data>
   <data name="UserLogin_Username" xml:space="preserve">
-    <value>Plex.tv Nome utente</value>
+    <value>Nome utente</value>
   </data>
   <data name="UserLogin_Username_Placeholder" xml:space="preserve">
     <value>Nome utente</value>
@@ -214,7 +214,7 @@
     <value>Msuica</value>
   </data>
   <data name="Search_Paragraph" xml:space="preserve">
-    <value>Vuoi guardare qualcosa che non è attualmente in Plex?! Non c'è problema! Basta cercarla qui sotto e richiederla!</value>
+    <value>Vuoi guardare qualcosa che non è attualmente in {0}?! Non c'è problema! Basta cercarla qui sotto e richiederla!</value>
   </data>
   <data name="Search_Suggestions" xml:space="preserve">
     <value>Suggerimenti</value>
@@ -409,7 +409,7 @@
     <value>è già stato richiesto!</value>
   </data>
   <data name="Search_CouldNotCheckPlex" xml:space="preserve">
-    <value>Non siamo riusciti a controllare se {0} è in Plex, sei sicuro che sia configurato correttamente?</value>
+    <value>Non siamo riusciti a controllare se {0} è in {1}, sei sicuro che sia configurato correttamente?</value>
   </data>
   <data name="Search_CouchPotatoError" xml:space="preserve">
     <value>Qualcosa è andato storto aggiungendo il film a CouchPotato! Controlla le impostazioni</value>
@@ -418,7 +418,7 @@
     <value>Hai raggiunto il numero massimo di richieste settimanali per i Film! Contatta l'amministratore</value>
   </data>
   <data name="Search_AlreadyInPlex" xml:space="preserve">
-    <value>è già disponibile in Plex!</value>
+    <value>è già disponibile in {0}!</value>
   </data>
   <data name="Search_SickrageError" xml:space="preserve">
     <value>Qualcosa è andato storto aggiungendo il film a SickRage! Controlla le impostazioni</value>
@@ -435,9 +435,6 @@
   <data name="Search_WeeklyRequestLimitTVShow" xml:space="preserve">
     <value>Hai raggiunto il numero massimo di richieste settimanali per le Serie TV! Contatta l'amministratore</value>
   </data>
-  <data name="Search_ErrorPlexAccountOnly" xml:space="preserve">
-    <value>Spiacente, ma questa funzione è disponibile solo per gli utenti con un account Plex.</value>
-  </data>
   <data name="Search_ErrorNotEnabled" xml:space="preserve">
     <value>Spiacente, ma l'amministratore non ha ancora abilitato questa funzionalità.</value>
   </data>

Ombi.UI/Resources/UI.nl.resx

@@ -121,13 +121,13 @@
     <value>Inloggen</value>
   </data>
   <data name="UserLogin_Paragraph" xml:space="preserve">
-    <value>Wilt u een film of een tv serie kijken, maar staat deze niet op Plex? Log hieronder in met uw gebruikersnaam en wachtwoord van Plex.tv</value>
+    <value>Wilt u een film of een tv serie kijken, maar staat deze niet op {0}? Log hieronder in met uw gebruikersnaam en wachtwoord van</value>
   </data>
   <data name="UserLogin_Paragraph_SpanHover" xml:space="preserve">
     <value>Uw login gegevens worden alleen gebruikt om uw account te verifiëren bij Plex.</value>
   </data>
   <data name="UserLogin_Username" xml:space="preserve">
-    <value>Plex.tv Gebruikersnaam</value>
+    <value> Gebruikersnaam</value>
   </data>
   <data name="UserLogin_Username_Placeholder" xml:space="preserve">
     <value>Gebruikersnaam</value>
@@ -217,7 +217,7 @@
     <value>Albums</value>
   </data>
   <data name="Search_Paragraph" xml:space="preserve">
-    <value>Wilt u kijken naar iets dat dat momenteel niet op Plex is?! Geen probleem! zoek hieronder en vraag het aan!</value>
+    <value>Wilt u kijken naar iets dat dat momenteel niet op {0} is?! Geen probleem! zoek hieronder en vraag het aan!</value>
   </data>
   <data name="Search_Suggestions" xml:space="preserve">
     <value>Suggesties</value>
@@ -409,10 +409,7 @@
     <value>Is al aangevraagd!</value>
   </data>
   <data name="Search_AlreadyInPlex" xml:space="preserve">
-    <value>Staat al op Plex!</value>
-  </data>
-  <data name="Search_ErrorPlexAccountOnly" xml:space="preserve">
-    <value>Sorry, deze functie is momenteel alleen voor gebruikers met een Plex account.</value>
+    <value>Staat al op {0}!</value>
   </data>
   <data name="Search_ErrorNotEnabled" xml:space="preserve">
     <value>Sorry, uw administrator heeft deze functie nog niet geactiveerd.</value>
@@ -424,7 +421,7 @@
     <value>Kon niet opslaan, probeer het later nog eens.</value>
   </data>
   <data name="Search_CouldNotCheckPlex" xml:space="preserve">
-    <value>We konden niet controleren of {0} al in plex bestaat, weet je zeker dat het correct is ingesteld?</value>
+    <value>We konden niet controleren of {0} al in {1} bestaat, weet je zeker dat het correct is ingesteld?</value>
   </data>
   <data name="Search_CouchPotatoError" xml:space="preserve">
     <value>Er is iets foutgegaan tijdens het toevoegen van de film aan CouchPotato! Controleer je instellingen</value>

Ombi.UI/Resources/UI.pt.resx

@@ -121,13 +121,13 @@
     <value>Entrar</value>
   </data>
   <data name="UserLogin_Paragraph" xml:space="preserve">
-    <value>Quer assistir a um filme ou programa de TV, mas não está atualmente em Plex? Entre abaixo com seu nome de usuário e senha Plex.tv !!</value>
+    <value>Quer assistir a um filme ou programa de TV, mas não está atualmente em {0}? Entre abaixo com seu nome de usuário e senha !</value>
   </data>
   <data name="UserLogin_Paragraph_SpanHover" xml:space="preserve">
     <value>Seus dados de login são apenas usados ​​para autenticar sua conta Plex.!</value>
   </data>
   <data name="UserLogin_Username" xml:space="preserve">
-    <value>Plex.tv usuário</value>
+    <value>usuário</value>
   </data>
   <data name="UserLogin_Username_Placeholder" xml:space="preserve">
     <value>Nome de usuário</value>
@@ -211,7 +211,7 @@
     <value>Álbuns</value>
   </data>
   <data name="Search_Paragraph" xml:space="preserve">
-    <value>Quer assistir algo que não está atualmente em Plex ?! Sem problemas! Basta procurá-lo abaixo e solicitá-lo !!</value>
+    <value>Quer assistir algo que não está atualmente em {0}?! Sem problemas! Basta procurá-lo abaixo e solicitá-lo !!</value>
   </data>
   <data name="Search_Title" xml:space="preserve">
     <value>Buscar</value>
@@ -409,7 +409,7 @@
     <value>já foi solicitado !!</value>
   </data>
   <data name="Search_CouldNotCheckPlex" xml:space="preserve">
-    <value>Nós não poderia verificar se {0} está em Plex, você tem certeza que é configurada corretamente ?!</value>
+    <value>Nós não poderia verificar se {0} está em {1}, você tem certeza que é configurada corretamente ?!</value>
   </data>
   <data name="Search_CouchPotatoError" xml:space="preserve">
     <value>Algo deu errado adicionando o filme para CouchPotato! Verifique as suas opções.!</value>
@@ -418,7 +418,7 @@
     <value>Atingiu seu limite semanal de solicitação para filmes! Entre em contato com seu administrador.</value>
   </data>
   <data name="Search_AlreadyInPlex" xml:space="preserve">
-    <value>Já está no Plex!</value>
+    <value>Já está no {0}!</value>
   </data>
   <data name="Search_SickrageError" xml:space="preserve">
     <value>Algo deu errado adicionar o filme para SickRage! Por favor, verifique suas configurações.</value>
@@ -435,9 +435,6 @@
   <data name="Search_WeeklyRequestLimitTVShow" xml:space="preserve">
     <value>Atingiu seu limite semanal de solicitação para programas de TV! Entre em contato com seu administrador.</value>
   </data>
-  <data name="Search_ErrorPlexAccountOnly" xml:space="preserve">
-    <value>Desculpe, mas essa funcionalidade é atualmente somente para os usuários com contas de Plex</value>
-  </data>
   <data name="Search_ErrorNotEnabled" xml:space="preserve">
     <value>Desculpe, mas o administrador não permitiu ainda esta funcionalidade.</value>
   </data>

Ombi.UI/Resources/UI.resx

@@ -101,14 +101,14 @@
     <value>Login</value>
   </data>
   <data name="UserLogin_Paragraph" xml:space="preserve">
-    <value>Want to watch a movie or tv show but it's not currently on Plex?
-            Login below with your Plex.tv username and password!</value>
+    <value>Want to watch a movie or tv show but it's not currently on {0}?
+            Login below with your username and password!</value>
   </data>
   <data name="UserLogin_Paragraph_SpanHover" xml:space="preserve">
     <value>Your login details are only used to authenticate your Plex account.</value>
   </data>
   <data name="UserLogin_Username" xml:space="preserve">
-    <value>Plex.tv Username </value>
+    <value>Username </value>
   </data>
   <data name="UserLogin_Username_Placeholder" xml:space="preserve">
     <value>Username</value>
@@ -192,7 +192,7 @@
     <value>Albums</value>
   </data>
   <data name="Search_Paragraph" xml:space="preserve">
-    <value>Want to watch something that is not currently on Plex?! No problem! Just search for it below and request it!</value>
+    <value>Want to watch something that is not currently on {0}?! No problem! Just search for it below and request it!</value>
   </data>
   <data name="Search_Title" xml:space="preserve">
     <value>Search</value>
@@ -390,7 +390,7 @@
     <value>has already been requested!</value>
   </data>
   <data name="Search_CouldNotCheckPlex" xml:space="preserve">
-    <value>We could not check if {0} is in Plex, are you sure it's correctly setup?</value>
+    <value>We could not check if {0} is in {1}, are you sure it's correctly setup?</value>
   </data>
   <data name="Search_CouchPotatoError" xml:space="preserve">
     <value>Something went wrong adding the movie to CouchPotato! Please check your settings.</value>
@@ -399,7 +399,7 @@
     <value>You have reached your weekly request limit for Movies! Please contact your admin.</value>
   </data>
   <data name="Search_AlreadyInPlex" xml:space="preserve">
-    <value>is already in Plex!</value>
+    <value>is already in {0}!</value>
   </data>
   <data name="Search_SickrageError" xml:space="preserve">
     <value>Something went wrong adding the movie to SickRage! Please check your settings.</value>
@@ -416,9 +416,6 @@
   <data name="Search_WeeklyRequestLimitTVShow" xml:space="preserve">
     <value>You have reached your weekly request limit for TV Shows! Please contact your admin.</value>
   </data>
-  <data name="Search_ErrorPlexAccountOnly" xml:space="preserve">
-    <value>Sorry, but this functionality is currently only for users with Plex accounts</value>
-  </data>
   <data name="Search_ErrorNotEnabled" xml:space="preserve">
     <value>Sorry, but your administrator has not yet enabled this functionality.</value>
   </data>
@@ -468,7 +465,7 @@
     <value>TV show status</value>
   </data>
   <data name="Layout_CacherRunning" xml:space="preserve">
-    <value>Currently we are indexing all of the available tv shows and movies on the Plex server, so there might be some unexpected behavior. This shouldn't take too long.</value>
+    <value>Currently we are indexing all of the available tv shows and movies on the media server, so there might be some unexpected behavior. This shouldn't take too long.</value>
   </data>
   <data name="Layout_Usermanagement" xml:space="preserve">
     <value>User Management</value>

Ombi.UI/Resources/UI.sv.resx

@@ -121,13 +121,13 @@
     <value>Logga in</value>
   </data>
   <data name="UserLogin_Paragraph" xml:space="preserve">
-    <value>Vill du titta på en film eller TV-show, men det är inte närvarande på Plex? Logga in nedan med Plex.tv användarnamn och lösenord !!</value>
+    <value>Vill du titta på en film eller TV-show, men det är inte närvarande på {0}? Logga in nedan med användarnamn och lösenord !!</value>
   </data>
   <data name="UserLogin_Paragraph_SpanHover" xml:space="preserve">
     <value>Dina inloggningsuppgifter används endast för att autentisera ditt Plex-konto.</value>
   </data>
   <data name="UserLogin_Username" xml:space="preserve">
-    <value>Plex.tv användarnamn</value>
+    <value>Användarnamn</value>
   </data>
   <data name="UserLogin_Username_Placeholder" xml:space="preserve">
     <value>Användarnamn</value>
@@ -214,7 +214,7 @@
     <value>Album</value>
   </data>
   <data name="Search_Paragraph" xml:space="preserve">
-    <value>Vill titta på något som inte är närvarande på Plex ?! Inga problem! Bara söka efter den nedan och begär det !</value>
+    <value>Vill titta på något som inte är närvarande på {0}?! Inga problem! Bara söka efter den nedan och begär det !</value>
   </data>
   <data name="Search_Title" xml:space="preserve">
     <value>Sök</value>
@@ -409,7 +409,7 @@
     <value>har redan begärts</value>
   </data>
   <data name="Search_CouldNotCheckPlex" xml:space="preserve">
-    <value>Vi kunde inte kontrollera om {0} är i Plex, är du säker det är korrekt installation?</value>
+    <value>Vi kunde inte kontrollera om {0} är i {1}, är du säker det är korrekt installation?</value>
   </data>
   <data name="Search_CouchPotatoError" xml:space="preserve">
     <value>Något gick fel att lägga till filmen i CouchPotato! Kontrollera inställningarna.</value>
@@ -418,7 +418,7 @@
     <value>Du har nått din weekly begäran gräns för filmer! Kontakta din admin.</value>
   </data>
   <data name="Search_AlreadyInPlex" xml:space="preserve">
-    <value>är redan i Plex</value>
+    <value>är redan i {0}</value>
   </data>
   <data name="Search_SickrageError" xml:space="preserve">
     <value>Något gick fel att lägga till filmen i SickRage! Kontrollera inställningarna.</value>
@@ -435,9 +435,6 @@
   <data name="Search_WeeklyRequestLimitTVShow" xml:space="preserve">
     <value>Du har nått din weekly begäran gräns för TV-program! Kontakta din admin.</value>
   </data>
-  <data name="Search_ErrorPlexAccountOnly" xml:space="preserve">
-    <value>Ledsen, men denna funktion är för närvarande endast för användare med Plex konton</value>
-  </data>
   <data name="Search_ErrorNotEnabled" xml:space="preserve">
     <value>Ledsen, men administratören har ännu inte aktiverat denna funktion.</value>
   </data>

Ombi.UI/Resources/UI1.Designer.cs

@@ -223,7 +223,7 @@ namespace Ombi.UI.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Currently we are indexing all of the available tv shows and movies on the Plex server, so there might be some unexpected behavior. This shouldn&apos;t take too long..
+        ///   Looks up a localized string similar to Currently we are indexing all of the available tv shows and movies on the media server, so there might be some unexpected behavior. This shouldn&apos;t take too long..
         /// </summary>
         public static string Layout_CacherRunning {
             get {
@@ -736,7 +736,7 @@ namespace Ombi.UI.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to is already in Plex!.
+        ///   Looks up a localized string similar to is already in {0}!.
         /// </summary>
         public static string Search_AlreadyInPlex {
             get {
@@ -790,7 +790,7 @@ namespace Ombi.UI.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to We could not check if {0} is in Plex, are you sure it&apos;s correctly setup?.
+        ///   Looks up a localized string similar to We could not check if {0} is in {1}, are you sure it&apos;s correctly setup?.
         /// </summary>
         public static string Search_CouldNotCheckPlex {
             get {
@@ -816,15 +816,6 @@ namespace Ombi.UI.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Sorry, but this functionality is currently only for users with Plex accounts.
-        /// </summary>
-        public static string Search_ErrorPlexAccountOnly {
-            get {
-                return ResourceManager.GetString("Search_ErrorPlexAccountOnly", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to First Season.
         /// </summary>
@@ -907,7 +898,7 @@ namespace Ombi.UI.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Want to watch something that is not currently on Plex?! No problem! Just search for it below and request it!.
+        ///   Looks up a localized string similar to Want to watch something that is not currently on {0}?! No problem! Just search for it below and request it!.
         /// </summary>
         public static string Search_Paragraph {
             get {
@@ -1132,8 +1123,8 @@ namespace Ombi.UI.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Want to watch a movie or tv show but it&apos;s not currently on Plex?
-        ///            Login below with your Plex.tv username and password!.
+        ///   Looks up a localized string similar to Want to watch a movie or tv show but it&apos;s not currently on {0}?
+        ///            Login below with your username and password!.
         /// </summary>
         public static string UserLogin_Paragraph {
             get {
@@ -1178,7 +1169,7 @@ namespace Ombi.UI.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Plex.tv Username .
+        ///   Looks up a localized string similar to Username .
         /// </summary>
         public static string UserLogin_Username {
             get {

Ombi.UI/Views/Admin/LandingPage.cshtml

@@ -54,7 +54,7 @@
             <p class="form-group">Notice Message</p>
             <div class="form-group">
                 <div>
-                    <textarea rows="4" type="text" class="form-control-custom form-control " id="NoticeMessage" name="NoticeMessage" placeholder="e.g. Plex will be down for maintaince (HTML is allowed)" value="@Model.NoticeMessage">@Model.NoticeMessage</textarea>
+                    <textarea rows="4" type="text" class="form-control-custom form-control " id="NoticeMessage" name="NoticeMessage" placeholder="e.g. The server will be down for maintaince (HTML is allowed)" value="@Model.NoticeMessage">@Model.NoticeMessage</textarea>
                 </div>
             </div>
 

Ombi.UI/Views/Admin/NewsletterSettings.cshtml

@@ -66,7 +66,7 @@
                 <div class="form-group">
                     <label for="massEmailSubject" class="control-label">Subject</label>
                     <div>
-                        <input type="text" class="form-control form-control-custom " placeholder="A Message from Plex Admin" id="massEmailSubject" name="massEmailSubject" value="">
+                        <input type="text" class="form-control form-control-custom " placeholder="A Message from the Admin" id="massEmailSubject" name="massEmailSubject" value="">
                     </div>
                 </div>
                 <div class="form-group">

Ombi.UI/Views/Admin/Sonarr.cshtml

@@ -10,6 +10,13 @@
     {
         port = Model.Port;
     }
+
+    var rootFolder = string.Empty;
+    if (!string.IsNullOrEmpty(Model.RootPath))
+
+    {
+        rootFolder = Model.RootPath.Replace("/", "//");
+    }
 }
 <div class="col-sm-8 col-sm-push-1">
     <form class="form-horizontal" method="POST" id="mainForm">
@@ -184,7 +191,7 @@
 
         console.log('Hit root folders..');
 
-        var rootFolderSelected = '@Model.RootPath';
+        var rootFolderSelected = '@rootFolder';
         if (!rootFolderSelected) {
             return;
         }

Ombi.UI/Views/Customization/Customization.cshtml

@@ -34,7 +34,7 @@
                 <label for="select" class="control-label">Theme</label>
                 <div id="themes">
                     <select class="form-control form-control-custom" id="select">
-                        <option @plexTheme class="form-control form-control-custom" value="@Themes.PlexTheme">Plex</option>
+                        <option @plexTheme class="form-control form-control-custom" value="@Themes.PlexTheme">Dark</option>
                         <option @originalTheme class="form-control form-control-custom" value="@Themes.OriginalTheme">Original Blue</option>
                     </select>
                 </div>

Ombi.UI/Views/Landing/Index.cshtml

@@ -33,7 +33,7 @@
         </div>
         <div class="media-body">
             <h4 class="media-heading landing-title" id="statusTitle">Checking...</h4>
-            The Plex server is <strong><span id="statusText">Loading...</span></strong> (check this page for continuous status updates)
+            The Media server is <strong><span id="statusText">Loading...</span></strong> (check this page for continuous status updates)
         </div>
     </div>
 </div>

Ombi.UI/Views/Requests/Index.cshtml

@@ -191,18 +191,36 @@
                     </a>
                 </div>
                 <br />
-                {{#if_eq type "tv"}}
-                <span>@UI.Search_TV_Show_Status: </span>
-                {{else}}
-                <span>@UI.Search_Movie_Status: </span>
-                {{/if_eq}}
-                <span class="label label-success">{{status}}</span>
-                {{#if denied}}
                 <div>
-                    Denied: <i style="color:red;" class="fa fa-check"></i>
+                    {{#if_eq type "tv"}}
+                    <span>@UI.Search_TV_Show_Status: </span>
+                    {{else}}
+                    <span>@UI.Search_Movie_Status: </span>
+                    {{/if_eq}}
+                    <span class="label label-success">{{status}}</span>
+                </div>
+
+                <div>
+                    <span>Request status: </span>
+                    {{#if available}}
+                    <span class="label label-success">@UI.Requests_Available</span>
+                    {{else}}
+                    {{#if approved}}
+                    <span class="label label-info">@UI.Search_Processing_Request</span>
+                    {{else if denied}}
+                    <span class="label label-danger">@UI.Search_Request_denied</span>
                     {{#if deniedReason}}
                     <span class="customTooltip" title="{{deniedReason}}"><i class="fa fa-info-circle"></i></span>
                     {{/if}}
+                    {{else}}
+                    <span class="label label-warning">@UI.Search_Pending_approval</span>
+                    {{/if}}
+                    {{/if}}
+                </div>
+                {{#if denied}}
+                <div>
+                    Denied: <i style="color:red;" class="fa fa-check"></i>
+                 
                 </div>
 
                 {{/if}}
@@ -211,26 +229,7 @@
                 {{else}}
                 <div>@UI.Requests_ReleaseDate: {{releaseDate}}</div>
                 {{/if_eq}}
-                {{#unless denied}}
-                <div>
-                    @UI.Common_Approved:
-                    {{#if_eq approved false}}
-                    <i id="{{requestId}}notapproved" class="fa fa-times"></i>
-                    {{/if_eq}}
-                    {{#if_eq approved true}}
-                    <i class="fa fa-check"></i>
-                    {{/if_eq}}
-                </div>
-                {{/unless}}
-                <div>
-                    @UI.Requests_Available
-                    {{#if_eq available false}}
-                    <i id="availableIcon{{requestId}}" class="fa fa-times"></i>
-                    {{/if_eq}}
-                    {{#if_eq available true}}
-                    <i id="availableIcon{{requestId}}" class="fa fa-check"></i>
-                    {{/if_eq}}
-                </div>
+<br/>
 
                 {{#if_eq type "tv"}}
                 {{#if episodes}}

Ombi.UI/Views/Search/Index.cshtml

@@ -8,12 +8,14 @@
     {
         url = "/" + baseUrl.ToHtmlString();
     }
+
+
 }
 <div>
 
     <div hidden="hidden" id="useNewSearch">@Model.CustomizationSettings.NewSearch</div>
     <h1 id="searchTitle">@UI.Search_Title</h1>
-    <h4>@UI.Search_Paragraph</h4>
+    <h4>@string.Format(UI.Search_Paragraph, Model.Emby ? "Emby" : "Plex")</h4>
     <br />
     <!-- Nav tabs -->
 
@@ -315,9 +317,7 @@
                             </a>{{#if status}}<span class="label label-primary" style="font-size:60%" target="_blank">{{status}}</span>{{/if}}
                         </h4>
                         {{/if_eq}}
-                        {{#if status}}
-                        <span class="label label-info" target="_blank">{{status}}</span>
-                        {{/if}}
+   
 
                         {{#if firstAired}}
                         <span class="label label-info" target="_blank">Air Date: {{firstAired}}</span>
@@ -583,3 +583,4 @@
         </script>
 
         @Html.LoadSearchAssets()
+

Ombi.UI/Views/UserLogin/Username.cshtml

@@ -6,7 +6,7 @@
     <h1>@UI.UserLogin_Title</h1>
     <div>
         <p>
-            @UI.UserLogin_Paragraph <span title="@UI.UserLogin_Paragraph_SpanHover"><i class="fa fa-question-circle"></i></span>
+            @string.Format(UI.UserLogin_Paragraph, Html.GetMediaServerName().ToHtmlString()).ToString()
         </p>
     </div>
     <div id="contentBody">

Ombi.UI/Views/UserManagementSettings/UserManagementSettings.cshtml

@@ -9,7 +9,7 @@
 
             <span>Here you can manage the default permissions and features that your users get</span>
             <small>
-                Note: This will not update your users that are currently there, this is to set the default settings to any users added outside of Ombi e.g. You share your Plex Server with a new user, they will be added into Ombi
+                Note: This will not update your users that are currently there, this is to set the default settings to any users added outside of Ombi e.g. You share your Server with a new user, they will be added into Ombi
                  automatically and will take the permissions and features you have selected below.
             </small>
 

Ombi.UI/Views/UserWizard/Index.cshtml

@@ -192,7 +192,7 @@
 <script id="adminArea" type="text/html">
     <form method="post" action="@formAction/wizard/createuser" id="adminForm">
         <h4 class="media-heading landing-title">Create the Admin account</h4>
-        <small>This account will be used to configure your settings and also manage all of the requests. Note: this should not be the same as your Plex.Tv account (you can change this later in the User Management Settings)</small>
+        <small>This account will be used to configure your settings and also manage all of the requests. Note: this should not be the same as your Plex/Emby account (you can change this later in the User Management Settings)</small>
         <div class="form-group">
             <div>
                 <label for="adminUsername">Username</label><input type="text" class="form-control form-control-custom" id="adminUsername" name="Username" placeholder="Username">