From 1f4ceaa75cf3863bfe1c5f83187ef71896b381ff Mon Sep 17 00:00:00 2001
From: sebastiaan <unknown@kiln.example.com>
Date: Thu, 20 Sep 2012 06:27:09 -0200
Subject: [PATCH] Included the tinyMCE language files in the project so they'll
 actually be in the build #U4-277 Fixed

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 43 ++++++++++++++++++++++++
 src/Umbraco.Web/Umbraco.Web.csproj       |  4 ++-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 50209bba48..260c5c4a00 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -537,9 +537,52 @@
     <Content Include="umbraco_client\tags\js\jquery.tagsinput.min.js">
       <DependentUpon>jquery.tagsinput.js</DependentUpon>
     </Content>
+    <Content Include="umbraco_client\tinymce3\langs\ca.js" />
+    <Content Include="umbraco_client\tinymce3\langs\cs.js" />
+    <Content Include="umbraco_client\tinymce3\langs\cy.js" />
+    <Content Include="umbraco_client\tinymce3\langs\da.js" />
+    <Content Include="umbraco_client\tinymce3\langs\de.js" />
+    <Content Include="umbraco_client\tinymce3\langs\el.js" />
     <Content Include="umbraco_client\tinymce3\langs\en.js" />
+    <Content Include="umbraco_client\tinymce3\langs\es.js" />
+    <Content Include="umbraco_client\tinymce3\langs\fa.js" />
+    <Content Include="umbraco_client\tinymce3\langs\fi.js" />
+    <Content Include="umbraco_client\tinymce3\langs\fr.js" />
+    <Content Include="umbraco_client\tinymce3\langs\fr_ca.js" />
     <Content Include="umbraco_client\tinymce3\langs\he.js" />
+    <Content Include="umbraco_client\tinymce3\langs\hu.js" />
+    <Content Include="umbraco_client\tinymce3\langs\is.js" />
+    <Content Include="umbraco_client\tinymce3\langs\it.js" />
     <Content Include="umbraco_client\tinymce3\langs\ja.js" />
+    <Content Include="umbraco_client\tinymce3\langs\ja_euc-jp.js" />
+    <Content Include="umbraco_client\tinymce3\langs\ja_shift_jis.js" />
+    <Content Include="umbraco_client\tinymce3\langs\ja_utf-8.js" />
+    <Content Include="umbraco_client\tinymce3\langs\ko.js" />
+    <Content Include="umbraco_client\tinymce3\langs\nb.js" />
+    <Content Include="umbraco_client\tinymce3\langs\nl.js" />
+    <Content Include="umbraco_client\tinymce3\langs\nn.js" />
+    <Content Include="umbraco_client\tinymce3\langs\pl.js" />
+    <Content Include="umbraco_client\tinymce3\langs\pt_br.js" />
+    <Content Include="umbraco_client\tinymce3\langs\readme.txt" />
+    <Content Include="umbraco_client\tinymce3\langs\ro.js" />
+    <Content Include="umbraco_client\tinymce3\langs\ru.js" />
+    <Content Include="umbraco_client\tinymce3\langs\ru_CP1251.js" />
+    <Content Include="umbraco_client\tinymce3\langs\ru_KOI8-R.js" />
+    <Content Include="umbraco_client\tinymce3\langs\si.js" />
+    <Content Include="umbraco_client\tinymce3\langs\sk.js" />
+    <Content Include="umbraco_client\tinymce3\langs\sq.js" />
+    <Content Include="umbraco_client\tinymce3\langs\sr.js" />
+    <Content Include="umbraco_client\tinymce3\langs\sv.js" />
+    <Content Include="umbraco_client\tinymce3\langs\sv_utf8.js" />
+    <Content Include="umbraco_client\tinymce3\langs\tr.js" />
+    <Content Include="umbraco_client\tinymce3\langs\uk.js" />
+    <Content Include="umbraco_client\tinymce3\langs\uk_CP1251.js" />
+    <Content Include="umbraco_client\tinymce3\langs\uk_KOI8-U.js" />
+    <Content Include="umbraco_client\tinymce3\langs\vi.js" />
+    <Content Include="umbraco_client\tinymce3\langs\zh_cn.js" />
+    <Content Include="umbraco_client\tinymce3\langs\zh_cn_utf8.js" />
+    <Content Include="umbraco_client\tinymce3\langs\zh_tw.js" />
+    <Content Include="umbraco_client\tinymce3\langs\zh_tw_utf8.js" />
     <Content Include="umbraco_client\tinymce3\license.txt" />
     <Content Include="umbraco_client\tinymce3\plugins\advhr\css\advhr.css" />
     <Content Include="umbraco_client\tinymce3\plugins\advhr\editor_plugin.js" />
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 5b9357b022..9f9411fed2 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -2007,7 +2007,9 @@
     <Content Include="umbraco.presentation\umbraco\editContent.aspx">
       <SubType>ASPXCodeBehind</SubType>
     </Content>
-    <Content Include="umbraco.presentation\umbraco\editMedia.aspx" />
+    <Content Include="umbraco.presentation\umbraco\editMedia.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
     <Content Include="umbraco.presentation\umbraco\js\language.aspx" />
     <Content Include="umbraco.presentation\umbraco\login.aspx">
       <SubType>ASPXCodeBehind</SubType>