Merge branch 'dev' into master

This commit is contained in:
Shaun McPeck 2017-02-23 17:44:46 -06:00 committed by GitHub
commit f817953ba3
209 changed files with 7250 additions and 993 deletions

View file

@ -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 {
@ -745,7 +745,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 {
@ -799,7 +799,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 {
@ -825,15 +825,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>
@ -925,7 +916,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 {
@ -1150,8 +1141,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 {
@ -1196,7 +1187,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 {