aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-07-09 23:48:08 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-07-09 23:48:08 -0400
commit3cfd765cb4a875ff65acf74826533ba1a804b34a (patch)
treeb702c463a4b3af9c70626a5a90600aa58c2cad66 /MediaBrowser.Server.Implementations
parent9b8c0d68ce3e816c86a66702a7f5036760a42413 (diff)
update dependencies
Diffstat (limited to 'MediaBrowser.Server.Implementations')
-rw-r--r--MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json17
-rw-r--r--MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj4
-rw-r--r--MediaBrowser.Server.Implementations/packages.config2
3 files changed, 19 insertions, 4 deletions
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
index 8474aa250..85cc51f53 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
@@ -218,5 +218,20 @@
"HeaderAlbum": "Album",
"HeaderAlbumArtist": "Album Artist",
"HeaderArtist": "Artist",
- "LabelAddedOnDate": "Added {0}"
+ "LabelAddedOnDate": "Added {0}",
+ "ButtonStart": "Start",
+ "ButtonStop": "Stop",
+ "HeaderChannels": "Channels",
+ "HeaderMediaFolders": "Media Folders",
+ "HeaderBlockItemsWithNoRating": "Block items with no rating information:",
+ "OptionBlockOthers": "Others",
+ "OptionBlockTvShows": "TV Shows",
+ "OptionBlockTrailers": "Trailers",
+ "OptionBlockMusic": "Music",
+ "OptionBlockMovies": "Movies",
+ "OptionBlockBooks": "Books",
+ "OptionBlockGames": "Games",
+ "OptionBlockLiveTvPrograms": "Live TV Programs",
+ "OptionBlockLiveTvChannels": "Live TV Channels",
+ "OptionBlockChannelContent": "Internet Channel Content"
} \ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index a3dea9e47..376a95e04 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -48,9 +48,9 @@
<Reference Include="Alchemy">
<HintPath>..\packages\Alchemy.2.2.1\lib\net40\Alchemy.dll</HintPath>
</Reference>
- <Reference Include="Mono.Nat, Version=1.2.13.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Mono.Nat, Version=1.2.20.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\Mono.Nat.1.2.13.0\lib\net40\Mono.Nat.dll</HintPath>
+ <HintPath>..\packages\Mono.Nat.1.2.20.0\lib\net40\Mono.Nat.dll</HintPath>
</Reference>
<Reference Include="Nowin">
<HintPath>..\ThirdParty\Nowin\Nowin.dll</HintPath>
diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config
index fb04de92f..c22d3bec3 100644
--- a/MediaBrowser.Server.Implementations/packages.config
+++ b/MediaBrowser.Server.Implementations/packages.config
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Alchemy" version="2.2.1" targetFramework="net45" />
- <package id="Mono.Nat" version="1.2.13.0" targetFramework="net45" />
+ <package id="Mono.Nat" version="1.2.20.0" targetFramework="net45" />
<package id="morelinq" version="1.0.16006" targetFramework="net45" />
<package id="System.Data.SQLite.Core" version="1.0.91.3" targetFramework="net45" />
</packages> \ No newline at end of file