diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-06-20 15:39:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-20 15:39:10 -0400 |
| commit | 0c381071ea91c9898495e37951c6b32721caa7b8 (patch) | |
| tree | 65baf61c1c7de480264d6132545c18cc31e512a4 /Emby.Common.Implementations | |
| parent | 720da21fe003cfc9388657946db1c94452cf703d (diff) | |
| parent | 905f02e6d9dc9785c9a39904a30b5933898e66dd (diff) | |
Merge pull request #2715 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Common.Implementations')
| -rw-r--r-- | Emby.Common.Implementations/Emby.Common.Implementations.csproj | 3 | ||||
| -rw-r--r-- | Emby.Common.Implementations/TextEncoding/TextEncoding.cs | 3 | ||||
| -rw-r--r-- | Emby.Common.Implementations/packages.config | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Emby.Common.Implementations/Emby.Common.Implementations.csproj b/Emby.Common.Implementations/Emby.Common.Implementations.csproj index 6efc37603..00c90d16e 100644 --- a/Emby.Common.Implementations/Emby.Common.Implementations.csproj +++ b/Emby.Common.Implementations/Emby.Common.Implementations.csproj @@ -32,7 +32,8 @@ </PropertyGroup> <ItemGroup> <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL"> - <HintPath>..\packages\NLog.4.4.10\lib\net45\NLog.dll</HintPath> + <HintPath>..\packages\NLog.4.4.11\lib\net45\NLog.dll</HintPath> + <Private>True</Private> </Reference> <Reference Include="ServiceStack.Text, Version=4.5.8.0, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\packages\ServiceStack.Text.4.5.8\lib\net45\ServiceStack.Text.dll</HintPath> diff --git a/Emby.Common.Implementations/TextEncoding/TextEncoding.cs b/Emby.Common.Implementations/TextEncoding/TextEncoding.cs index 021caec75..54c47d62c 100644 --- a/Emby.Common.Implementations/TextEncoding/TextEncoding.cs +++ b/Emby.Common.Implementations/TextEncoding/TextEncoding.cs @@ -214,7 +214,10 @@ namespace Emby.Common.Implementations.TextEncoding case "ota": case "tur": return "windows-1254"; + // bulgarian + case "bul": case "bgr": + return "windows-1251"; case "rus": return "windows-1251"; case "vie": diff --git a/Emby.Common.Implementations/packages.config b/Emby.Common.Implementations/packages.config index 1e6b10c01..a255465cc 100644 --- a/Emby.Common.Implementations/packages.config +++ b/Emby.Common.Implementations/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="NLog" version="4.4.10" targetFramework="net46" /> + <package id="NLog" version="4.4.11" targetFramework="net46" /> <package id="ServiceStack.Text" version="4.5.8" targetFramework="net462" /> <package id="SharpCompress" version="0.14.0" targetFramework="net462" /> <package id="SimpleInjector" version="4.0.8" targetFramework="net46" /> |