Upgrade umbraco to 7.5.4

2016-12-13 14:01:21 -05:00
parent c6731f8ef5
commit 0086743882
47 changed files with 3032 additions and 1639 deletions
@@ -0,0 +1 @@
+C:\Users\poprhythm\AppData\Local\Temp\Temporary ASP.NET Files\vs\f80e29bb\faae20bf\App_Web_all.generated.cs.8f9494c4.rnwtj1wz.dll
@@ -77,7 +77,7 @@ namespace LeafWeb.WebCms.App_Start
 				HostingEnvironment.RegisterObject(this);

 				// TODO: use Umbraco Connection string?
-				var cs = Umbraco.Core.ApplicationContext.Current.DatabaseContext.ConnectionString;
+				// var cs = Umbraco.Core.ApplicationContext.Current.DatabaseContext.ConnectionString;

 				GlobalConfiguration
 					.Configuration
@@ -9,6 +9,9 @@ namespace LeafWeb.WebCms.App_Start
 {
 	public class RegisterServices : ApplicationEventHandler
 	{
+		// TODO: after upgrading Umbraco, this might be helpful
+		// protected override bool ExecuteWhenApplicationNotConfigured => true;
+
 		protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
 		{
 			DataService.RegisterInitializer();
@@ -10,7 +10,7 @@ NOTES:
 * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
 * A new version will invalidate both client and server cache and create new persisted files
 -->
-<clientDependency version="1" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
+<clientDependency version="1978073806" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">

  <!-- 
    This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.
@@ -44,22 +44,12 @@ NOTES:
  -->
  <compositeFiles defaultProvider="defaultFileProcessingProvider" compositeFileHandlerPath="~/DependencyHandler.axd">
    <fileProcessingProviders>
-      <add name="CompositeFileProcessor"
-           type="ClientDependency.Core.CompositeFiles.Providers.CompositeFileProcessingProvider, ClientDependency.Core"
-           enableCssMinify="true"
-           enableJsMinify="true"
-           persistFiles="true"
-           compositeFilePath="~/App_Data/TEMP/ClientDependency"
-           bundleDomains="localhost:123456"
-           urlType="Base64QueryStrings"
-           pathUrlFormat="{dependencyId}/{version}/{type}"/>
+      <add name="CompositeFileProcessor" type="ClientDependency.Core.CompositeFiles.Providers.CompositeFileProcessingProvider, ClientDependency.Core" enableCssMinify="true" enableJsMinify="true" persistFiles="true" compositeFilePath="~/App_Data/TEMP/ClientDependency" bundleDomains="localhost:123456" urlType="Base64QueryStrings" pathUrlFormat="{dependencyId}/{version}/{type}" />
    </fileProcessingProviders>

    <!-- A file map provider stores references to dependency files by an id to be used in the handler URL when using the MappedId Url type -->
    <fileMapProviders>
-      <add name="XmlFileMap"
-           type="ClientDependency.Core.CompositeFiles.Providers.XmlFileMapper, ClientDependency.Core"
-           mapPath="~/App_Data/TEMP/ClientDependency" />
+      <add name="XmlFileMap" type="ClientDependency.Core.CompositeFiles.Providers.XmlFileMapper, ClientDependency.Core" mapPath="~/App_Data/TEMP/ClientDependency" />
    </fileMapProviders>

  </compositeFiles>
@@ -30,6 +30,9 @@
    <key alias="refreshNode">Genindlæs elementer</key>
    <key alias="republish">Genudgiv hele sitet</key>
    <key alias="restore" version="7.3.0">Gendan</key>
+    <key alias="SetPermissionsForThePage">Sæt rettigheder for siden %0%</key>
+     <key alias="chooseWhereToMove">Hvor vil du flytte</key>
+    <key alias="toInTheTreeStructureBelow">hen til i træstrukturen?</key>
    <key alias="rights">Rettigheder</key>
    <key alias="rollback">Fortryd ændringer</key>
    <key alias="sendtopublish">Send til udgivelse</key>
@@ -202,12 +205,12 @@
  </area>
  <area alias="bulk">
    <key alias="done">Færdig</key>
-    
+
    <key alias="deletedItem">Slettede %0% element</key>
    <key alias="deletedItems">Slettede %0% elementer</key>
    <key alias="deletedItemOfItem">Slettede %0% ud af %1% element</key>
    <key alias="deletedItemOfItems">Slettede %0% ud af %1% elementer</key>
-    
+
    <key alias="publishedItem">Udgav %0% element</key>
    <key alias="publishedItems">Udgav %0% elementer</key>
    <key alias="publishedItemOfItem">Udgav %0% ud af %1% element</key>
@@ -274,17 +277,11 @@
    <key alias="treepicker">Vælg</key>
    <key alias="viewCacheItem">Se cache element</key>
    <key alias="createFolder">Opret mappe...</key>
-
    <key alias="relateToOriginalLabel">Relatér til original</key>
-
+    <key alias="includeDescendants">Inkludér undersider</key>
    <key alias="linkToPage">Link til side</key>
-
-    <key alias="openInNewWindow">Åbner det linket dokument i et nyt vindue eller fane</key>
-    <key alias="openInFullBody">Åbner det linket dokument i fuld visning af vinduet</key>
-    <key alias="openInParentFrame">Åbner det linket dokument i "parent frame"</key>
-
+    <key alias="openInNewWindow">Åben linket i et nyt vindue eller fane</key>
    <key alias="linkToMedia">Link til medie</key>
-
    <key alias="selectMedia">Vælg medie</key>
    <key alias="selectIcon">Vælg ikon</key>
    <key alias="selectItem">Vælg item</key>
@@ -293,19 +290,25 @@
    <key alias="selectContent">Vælg indhold</key>
    <key alias="selectMember">Vælg medlem</key>
    <key alias="selectMemberGroup">Vælg medlemsgruppe</key>
-    
    <key alias="noMacroParams">Der er ingen parametre for denne makro</key>
-
    <key alias="linkYour">Link dit</key>
-    <key alias="unLinkYour">Fjern link fra dit</key>    
-    
+    <key alias="unLinkYour">Fjern link fra dit</key>
    <key alias="account">konto</key>
-    
    <key alias="selectEditor">Vælg editor</key>
  </area>
  <area alias="dictionaryItem">
-    <key alias="description">Rediger de forskellige sprogversioner for ordbogselementet '%0%' herunder. Du tilføjer flere sprog under 'sprog' i menuen til venstre </key>
+    <key alias="description">
+      <![CDATA[
+      Rediger de forskellige sprogversioner for ordbogselementet '%0%' herunder.<br />Du tilføjer flere sprog under 'sprog' i menuen til venstre </key>
+      ]]>
+    </key>
    <key alias="displayName">Kulturnavn</key>
+    <key alias="changeKey">Rediger navnet på ordbogselementet.</key>
+    <key alias="changeKeyError">
+      <![CDATA[
+      Navnet '%0%' eksisterer allerede.
+   ]]>
+    </key>
  </area>
  <area alias="placeholders">
    <key alias="username">Indtast dit brugernavn</key>
@@ -319,17 +322,17 @@
    <key alias="enterTags">Indtast nøgleord (tryk på Enter efter hvert nøgleord)...</key>
  </area>
  <area alias="editcontenttype">
-	<key alias="allowAtRoot" version="7.2">Tillad på rodniveau</key>
+    <key alias="allowAtRoot" version="7.2">Tillad på rodniveau</key>
    <key alias="allowAtRootDesc" version="7.2">Kun dokumenttyper med denne indstilling aktiveret oprettes i rodniveau under Inhold og Mediearkiv</key>
    <key alias="allowedchildnodetypes">Tilladte typer</key>
-	<key alias="contenttypecompositions">Sammensætning af dokumenttyper</key>
+    <key alias="contenttypecompositions">Sammensætning af dokumenttyper</key>
    <key alias="create">Opret</key>
    <key alias="deletetab">Slet fane</key>
    <key alias="description">Beskrivelse</key>
    <key alias="newtab">Ny fane</key>
    <key alias="tab">Fane</key>
    <key alias="thumbnail">Thumbnail</key>
-	<key alias="hasListView">Aktiver listevisning</key>
+    <key alias="hasListView">Aktiver listevisning</key>
    <key alias="hasListViewDesc" version="7.2">Viser undersider i en søgbar liste, undersider vises ikke i indholdstræet</key>
    <key alias="currentListView" version="7.2">Nuværende listevisning</key>
    <key alias="currentListViewDesc" version="7.2">Den aktive listevisningsdatatype</key>
@@ -364,7 +367,7 @@
  </area>
  <area alias="errors">
    <key alias="receivedErrorFromServer">Der skete en fejl på severen</key>
-	  <key alias="dissallowedMediaType">Denne filttype er blevet deaktiveret af administratoren</key>
+    <key alias="dissallowedMediaType">Denne filttype er blevet deaktiveret af administratoren</key>
    <key alias="codemirroriewarning">OBS! Selvom CodeMirror er slået til i konfigurationen, så er den deaktiveret i Internet Explorer fordi den ikke er stabil nok.</key>
    <key alias="contentTypeAliasAndNameNotNull">Du skal udfylde både Alias &amp; Navn på den nye egenskabstype!</key>
    <key alias="filePermissionsError">Der mangler læse/skrive rettigheder til bestemte filer og mapper</key>
@@ -380,7 +383,7 @@
    <key alias="tableSplitNotSplittable">Du kan ikke opdele en celle, som ikke allerede er delt.</key>
    <key alias="xsltErrorHeader">Fejl i XSLT kode</key>
    <key alias="xsltErrorText">Din XSLT er ikke opdateret, da det indeholdt en fejl</key>
-	<key alias="missingPropertyEditorErrorMessage">Der er et problem med den datatype, der bruges til denn egenskab. Kontroller konfigurationen og prøv igen.</key>
+    <key alias="missingPropertyEditorErrorMessage">Der er et problem med den datatype, der bruges til denn egenskab. Kontroller konfigurationen og prøv igen.</key>
  </area>
  <area alias="general">
    <key alias="about">Om</key>
@@ -466,7 +469,8 @@
    <key alias="showPageOnSend">Hvilken side skal vises efter at formularen er sendt</key>
    <key alias="size">Størrelse</key>
    <key alias="sort">Sortér</key>
-    <key alias="submit">Indsend</key> <!-- TODO: Translate this -->
+    <key alias="submit">Indsend</key>
+    <!-- TODO: Translate this -->
    <key alias="type">Type</key>
    <key alias="typeToSearch">Skriv for at søge...</key>
    <key alias="up">Op</key>
@@ -505,22 +509,22 @@
  </area>

  <area alias="shortcuts">
-      <key alias="addTab">Tilføj fane</key>
-      <key alias="addProperty">Tilføj egenskab</key>
-      <key alias="addEditor">Tilføj editor</key>
-      <key alias="addTemplate">Tilføj skabelon</key>
-      <key alias="addChildNode">Tilføj child node</key>
-      <key alias="addChild">Tilføj child</key>
+    <key alias="addTab">Tilføj fane</key>
+    <key alias="addProperty">Tilføj egenskab</key>
+    <key alias="addEditor">Tilføj editor</key>
+    <key alias="addTemplate">Tilføj skabelon</key>
+    <key alias="addChildNode">Tilføj child node</key>
+    <key alias="addChild">Tilføj child</key>

-      <key alias="editDataType">Rediger datatype</key>
+    <key alias="editDataType">Rediger datatype</key>

-      <key alias="navigateSections">Naviger sektioner</key>
+    <key alias="navigateSections">Naviger sektioner</key>

-      <key alias="shortcut">Genveje</key>
-      <key alias="showShortcuts">Vis genveje</key>
+    <key alias="shortcut">Genveje</key>
+    <key alias="showShortcuts">Vis genveje</key>

-      <key alias="toggleListView">Brug listevisning</key>
-      <key alias="toggleAllowAsRoot">Tillad på rodniveau</key>
+    <key alias="toggleListView">Brug listevisning</key>
+    <key alias="toggleAllowAsRoot">Tillad på rodniveau</key>
  </area>

  <area alias="graphicheadline">
@@ -538,13 +542,17 @@
    <key alias="databaseErrorWebConfig">Kunne ikke gemme web.config filen. Du bedes venligst manuelt ændre database forbindelses strengen.</key>
    <key alias="databaseFound">Din database er blevet fundet og identificeret som</key>
    <key alias="databaseHeader">Database konfiguration</key>
-    <key alias="databaseInstall"><![CDATA[
+    <key alias="databaseInstall">
+      <![CDATA[
      Klik på <strong>installér</strong> knappen for at installere Umbraco %0% databasen
-    ]]></key>
+    ]]>
+    </key>
    <key alias="databaseInstall"><![CDATA[Tryk på <strong>installér</strong> knappen for at installere Umbraco %0% databasen]]></key>
    <key alias="databaseInstallDone"><![CDATA[Umbraco %0% er nu blevet kopieret til din database. Tryk på <string>Næste</strong> for at fortsætte.]]></key>
-    <key alias="databaseNotFound"><![CDATA[<p>Databasen er ikke fundet. Kontrollér venligst at informationen i database forbindelsesstrengen i "web.config" filen er korrekt.</p>
-<p>For at fortsætte bedes du venligst rette "web.config" filen (ved at bruge Visual Studio eller dit favoritprogram), scroll til bunden, tilføj forbindelsesstrengen til din database i feltet som hedder "umbracoDbDSN" og gem filen.</p><p>Klik på <strong>Forsøg igen</strong> knappen når du er færdig.<br/><a href="http://our.umbraco.org/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">Mere information om at redigere web.config her.</a></p>]]></key>
+    <key alias="databaseNotFound">
+      <![CDATA[<p>Databasen er ikke fundet. Kontrollér venligst at informationen i database forbindelsesstrengen i "web.config" filen er korrekt.</p>
+<p>For at fortsætte bedes du venligst rette "web.config" filen (ved at bruge Visual Studio eller dit favoritprogram), scroll til bunden, tilføj forbindelsesstrengen til din database i feltet som hedder "umbracoDbDSN" og gem filen.</p><p>Klik på <strong>Forsøg igen</strong> knappen når du er færdig.<br/><a href="http://our.umbraco.org/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">Mere information om at redigere web.config her.</a></p>]]>
+    </key>
    <key alias="databaseText"><![CDATA[For at afslutte dette skridt er du nødt til at have nogle informationer om din database parat ("database forbindelsesstrengen").<br/>Kontakt venligst din ISP hvis det er nødvendigt. Hvis du installerer på en lokal maskine eller server kan du muligvis få informationerne fra din systemadministrator.]]></key>
    <key alias="databaseUpgrade"><![CDATA[<p>Tryk på <strong>Opgradér</strong> knappen for at opgradere din database til Umbraco %0%</p><p>Bare rolig - intet indhold vil blive slettet og alt vil stadig fungere bagefter!</p>]]></key>
    <key alias="databaseUpgradeDone"><![CDATA[Din database er blevet opgraderet til den endelige version %0%.<br/>Tryk på <strong>Næste</strong> for at fortsætte.]]></key>
@@ -590,8 +598,10 @@
    <key alias="theEndFurtherHelp"><![CDATA[<h3>Yderligere hjælpe og informationer</h3> Få hjælp fra vores prisvindende fællesskab, gennemse dokumentationen eller se nogle gratis videoer om hvordan du opsætter et simpelt site, hvordan du bruger pakker og en 'quick guide' til Umbraco terminologier]]></key>
    <key alias="theEndHeader">Umbraco %0% er installeret og klar til brug</key>
    <key alias="theEndInstallFailed"><![CDATA[For at afslutte installationen er du nødt til manuelt at rette <strong>/web.config filen</strong> og opdatére 'AppSetting' feltet <strong>UmbracoConfigurationStatus</strong> i bunden til <strong>'%0%'</strong>.]]></key>
-    <key alias="theEndInstallSuccess"><![CDATA[Du kan <strong>komme igang med det samme</strong> ved at klikke på "Start Umbraco" knappen nedenfor.<br/>Hvis du er <strong>ny med Umbraco</strong>, kan du finde masser af ressourcer på vores 'getting started' sider.
-]]></key>
+    <key alias="theEndInstallSuccess">
+      <![CDATA[Du kan <strong>komme igang med det samme</strong> ved at klikke på "Start Umbraco" knappen nedenfor.<br/>Hvis du er <strong>ny med Umbraco</strong>, kan du finde masser af ressourcer på vores 'getting started' sider.
+]]>
+    </key>
    <key alias="theEndOpenUmbraco"><![CDATA[<h3>Start Umbraco</h3>For at administrere dit website skal du blot åbne Umbraco administrationen og begynde at tilføje indhold, opdatere skabelonerne og stylesheets'ene eller tilføje ny funktionalitet.]]></key>
    <key alias="Unavailable">Forbindelse til databasen fejlede.</key>
    <key alias="Version3">Umbraco Version 3</key>
@@ -666,12 +676,15 @@ Gå til http://%4%/#/content/content/edit/%5% for at redigere.
 Ha' en dejlig dag!

 Mange hilsner fra Umbraco robotten
-		]]></key>
-    <key alias="mailBodyHtml"><![CDATA[<p>Hej %0%</p>
+		]]>
+    </key>
+    <key alias="mailBodyHtml">
+      <![CDATA[<p>Hej %0%</p>
    <p>Dette er en automatisk mail for at informere dig om at opgaven <strong>'%1%'</strong>
    er blevet udførtpå siden <a href="http://%4%/#/content/content/edit/%5%"><strong>'%2%'</strong></a> af brugeren <strong>'%3%'</strong> </p>
    <div style="margin: 8px 0; padding: 8px; display: block;"> <br />
-    <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;RET&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; <br /> </div> <p> <h3>Opdateringssammendrag:</h3> <table style="width: 100%;"> %6% </table> </p> <div style="margin: 8px 0; padding: 8px; display: block;"> <br /> <a style="color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;" href="http://%4%/actions/publish.aspx?id=%5%">&nbsp;&nbsp;PUBLISÉR&nbsp;&nbsp;</a> &nbsp; <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;RET&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; <a style="color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;" href="http://%4%/actions/delete.aspx?id=%5%">&nbsp;&nbsp;&nbsp;&nbsp;SLET&nbsp;&nbsp;&nbsp;&nbsp;</a> <br /> </div> <p>Hav en fortsat god dag!<br /><br /> De bedste hilsner fra umbraco robotten </p>]]></key>
+    <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;RET&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; <br /> </div> <p> <h3>Opdateringssammendrag:</h3> <table style="width: 100%;"> %6% </table> </p> <div style="margin: 8px 0; padding: 8px; display: block;"> <br /> <a style="color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;" href="http://%4%/actions/publish.aspx?id=%5%">&nbsp;&nbsp;PUBLISÉR&nbsp;&nbsp;</a> &nbsp; <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/#/content/content/edit/%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;RET&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; <a style="color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;" href="http://%4%/actions/delete.aspx?id=%5%">&nbsp;&nbsp;&nbsp;&nbsp;SLET&nbsp;&nbsp;&nbsp;&nbsp;</a> <br /> </div> <p>Hav en fortsat god dag!<br /><br /> De bedste hilsner fra umbraco robotten </p>]]>
+    </key>
    <key alias="mailSubject">[%0%] Notificering om %1% udført på %2%</key>
    <key alias="notifications">Notificeringer</key>
  </area>
@@ -692,8 +705,10 @@ Mange hilsner fra Umbraco robotten
    <key alias="packageUninstalledHeader">Pakken blev fjernet</key>
    <key alias="packageUninstalledText">Pakken er på succefuld vis blevet fjernet</key>
    <key alias="packageUninstallHeader">Afinstallér pakke</key>
-    <key alias="packageUninstallText"><![CDATA[Du kan fjerne markeringen på elementer du ikke ønsker at fjerne, på dette tidspunkt, nedenfor. Når du klikker 'bekræft' vil alle afkrydsede elemenet blive fjernet <br/>
-<span style="color: Red; font-weight: bold;">Bemærk:</span> at dokumenter og medier som afhænger af denne pakke vil muligvis holde op med at virke, så vær forsigtig. Hvis i tvivl, kontakt personen som har udviklet pakken.]]></key>
+    <key alias="packageUninstallText">
+      <![CDATA[Du kan fjerne markeringen på elementer du ikke ønsker at fjerne, på dette tidspunkt, nedenfor. Når du klikker 'bekræft' vil alle afkrydsede elemenet blive fjernet <br/>
+<span style="color: Red; font-weight: bold;">Bemærk:</span> at dokumenter og medier som afhænger af denne pakke vil muligvis holde op med at virke, så vær forsigtig. Hvis i tvivl, kontakt personen som har udviklet pakken.]]>
+    </key>
    <key alias="packageUpgradeDownload">Download opdatering fra opbevaringsbasen</key>
    <key alias="packageUpgradeHeader">Opdatér pakke</key>
    <key alias="packageUpgradeInstructions">Opdateringsinstrukser</key>
@@ -726,6 +741,19 @@ Mange hilsner fra Umbraco robotten
    <key alias="paSimpleHelp">Hvis du blot ønsker at opsætte simpel beskyttelse ved hjælp af et enkelt login og kodeord</key>
  </area>
  <area alias="publish">
+    <key alias="contentPublishedFailedAwaitingRelease">Udgivelsen kunne ikke udgives da publiceringsdato er sat</key>
+    <key alias="contentPublishedFailedExpired">
+      <![CDATA[
+      %0% Udgivelsen kunne ikke blive publiceret da publiceringsdatoen er overskredet
+     ]]>
+    </key>
+    <key alias="contentPublishedFailedInvalid">
+      <![CDATA[
+    %0% kunne ikke publiceres da følgende egenskaber :  %1%  ikke overholdte valderingsreglerne.
+    ]]>
+    </key>
+    <key alias="editContentPublishedFailedByParent">Udgivelsen fejlede fordi en overordnet side ikke er publiceret</key>
+
    <key alias="contentPublishedFailedByEvent">%0% kunne ikke udgives, fordi et 3. parts modul annullerede handlingen</key>
    <key alias="includeUnpublished">Medtag ikke-udgivede undersider</key>
    <key alias="inProgress">Publicerer - vent venligst...</key>
@@ -799,58 +827,58 @@ Mange hilsner fra Umbraco robotten

  <area alias="contentTypeEditor">

-      <key alias="compositions">Kompositioner</key>
-      <key alias="noTabs">Du har ikke tilføjet nogle faner</key>
-      <key alias="addNewTab">Tilføj ny fane</key>
-      <key alias="addAnotherTab">Tilføj endnu en fane</key>
-      <key alias="inheritedFrom">Nedarvet fra</key>
-      <key alias="addProperty">Tilføj property</key>
-      <key alias="requiredLabel">Påkrævet label</key>
+    <key alias="compositions">Kompositioner</key>
+    <key alias="noTabs">Du har ikke tilføjet nogle faner</key>
+    <key alias="addNewTab">Tilføj ny fane</key>
+    <key alias="addAnotherTab">Tilføj endnu en fane</key>
+    <key alias="inheritedFrom">Nedarvet fra</key>
+    <key alias="addProperty">Tilføj property</key>
+    <key alias="requiredLabel">Påkrævet label</key>

-      <key alias="enableListViewHeading">Aktiver listevisning</key>
-      <key alias="enableListViewDescription">Konfigurer indholdet til at blive vist i en sorterbar og søgbar liste, dens børn vil ikke blive vist i træet</key>
+    <key alias="enableListViewHeading">Aktiver listevisning</key>
+    <key alias="enableListViewDescription">Konfigurer indholdet til at blive vist i en sorterbar og søgbar liste, dens børn vil ikke blive vist i træet</key>

-      <key alias="allowedTemplatesHeading">Tilladte skabeloner</key>
-      <key alias="allowedTemplatesDescription">Vælg hvilke skabeloner der er tilladt at bruge på dette indhold</key>
+    <key alias="allowedTemplatesHeading">Tilladte skabeloner</key>
+    <key alias="allowedTemplatesDescription">Vælg hvilke skabeloner der er tilladt at bruge på dette indhold</key>

-      <key alias="allowAsRootHeading">Tillad på rodniveau</key>
-      <key alias="allowAsRootDescription">Kun dokumenttyper med denne indstilling aktiveret oprettes i rodniveau under inhold og mediearkiv</key>
-      <key alias="allowAsRootCheckbox">Ja – indhold af denne type er tilladt i roden</key>
+    <key alias="allowAsRootHeading">Tillad på rodniveau</key>
+    <key alias="allowAsRootDescription">Kun dokumenttyper med denne indstilling aktiveret oprettes i rodniveau under inhold og mediearkiv</key>
+    <key alias="allowAsRootCheckbox">Ja – indhold af denne type er tilladt i roden</key>

-      <key alias="childNodesHeading">Tilladte typer</key>
-      <key alias="childNodesDescription">Tillad at oprette indhold af en specifik type under denne</key>
+    <key alias="childNodesHeading">Tilladte typer</key>
+    <key alias="childNodesDescription">Tillad at oprette indhold af en specifik type under denne</key>

-      <key alias="chooseChildNode">Vælg child node</key>
+    <key alias="chooseChildNode">Vælg child node</key>

-      <key alias="compositionsDescription">Nedarv faner og egenskaber fra en anden dokumenttype. Nye faner vil blive tilføjet den nuværende dokumenttype eller sammenflettet hvis fanenavnene er ens.</key>
-      <key alias="compositionInUse">Indholdstypen bliver brugt i en komposition og kan derfor ikke blive anvendt som komposition</key>
-      <key alias="noAvailableCompositions">Der er ingen indholdstyper tilgængelige at bruge som komposition</key>
+    <key alias="compositionsDescription">Nedarv faner og egenskaber fra en anden dokumenttype. Nye faner vil blive tilføjet den nuværende dokumenttype eller sammenflettet hvis fanenavnene er ens.</key>
+    <key alias="compositionInUse">Indholdstypen bliver brugt i en komposition og kan derfor ikke blive anvendt som komposition</key>
+    <key alias="noAvailableCompositions">Der er ingen indholdstyper tilgængelige at bruge som komposition</key>

-      <key alias="availableEditors">Tilgængelige editors</key>
-      <key alias="reuse">Genbrug</key>
-      <key alias="editorSettings">Editor indstillinger</key>
+    <key alias="availableEditors">Tilgængelige editors</key>
+    <key alias="reuse">Genbrug</key>
+    <key alias="editorSettings">Editor indstillinger</key>

-      <key alias="configuration">Konfiguration</key>
+    <key alias="configuration">Konfiguration</key>

-      <key alias="yesDelete">Ja, slet</key>
+    <key alias="yesDelete">Ja, slet</key>

-      <key alias="movedUnderneath">blev flyttet til</key>
-      <key alias="folderToMove">Vælg hvor</key>
-      <key alias="structureBelow">skal flyttes til</key>
+    <key alias="movedUnderneath">blev flyttet til</key>
+    <key alias="folderToMove">Vælg hvor</key>
+    <key alias="structureBelow">skal flyttes til</key>

-      <key alias="allDocumentTypes">Alle dokumenttyper</key>
-      <key alias="allDocuments">Alle dokumenter</key>
-      <key alias="allMediaItems">Alle medier</key>
+    <key alias="allDocumentTypes">Alle dokumenttyper</key>
+    <key alias="allDocuments">Alle dokumenter</key>
+    <key alias="allMediaItems">Alle medier</key>

-      <key alias="usingThisDocument">som benytter denne dokumenttype vil blive slettet permanent. Bekræft at du også vil slette dem.</key>
-      <key alias="usingThisMedia">som benytter denne medietype vil blive slettet permanent. Bekræft at du også vil slette dem.</key>
-      <key alias="usingThisMember">som benytter denne medlemstype vil blive slettet permanent. Bekræft at du også vil slette dem.</key>
+    <key alias="usingThisDocument">som benytter denne dokumenttype vil blive slettet permanent. Bekræft at du også vil slette dem.</key>
+    <key alias="usingThisMedia">som benytter denne medietype vil blive slettet permanent. Bekræft at du også vil slette dem.</key>
+    <key alias="usingThisMember">som benytter denne medlemstype vil blive slettet permanent. Bekræft at du også vil slette dem.</key>

-      <key alias="andAllDocuments">og alle dokumenter, som benytter denne type</key>
-      <key alias="andAllMediaItems">og alle medier, som benytter denne type</key>
-      <key alias="andAllMembers">og alle medlemmer, som benytter denne type</key>
+    <key alias="andAllDocuments">og alle dokumenter, som benytter denne type</key>
+    <key alias="andAllMediaItems">og alle medier, som benytter denne type</key>
+    <key alias="andAllMembers">og alle medlemmer, som benytter denne type</key>

-      <key alias="thisEditorUpdateSettings">der bruger denne editor vil blive opdateret med de nye indstillinger</key>
+    <key alias="thisEditorUpdateSettings">der bruger denne editor vil blive opdateret med de nye indstillinger</key>
  </area>

  <area alias="rollback">
@@ -914,8 +942,6 @@ Mange hilsner fra Umbraco robotten
  <area alias="speechBubbles">
    <key alias="operationCancelledHeader">Annulleret</key>
    <key alias="operationCancelledText">Handlingen blev annulleret af et 3. part tilføjelsesprogram</key>
-    <key alias="contentPublishedFailedByEvent">Udgivelsen blev standset af et 3. parts modul</key>
-    <key alias="contentPublishedFailedAwaitingRelease">Udgivelsen kunne ikke udgives da publiceringsdato er sat</key>
    <key alias="contentTypeDublicatePropertyType">Property type eksisterer allerede</key>
    <key alias="contentTypePropertyTypeCreated">Egenskabstype oprettet</key>
    <key alias="contentTypePropertyTypeCreatedText"><![CDATA[Navn: %0% <br /> DataType: %1%]]></key>
@@ -929,7 +955,6 @@ Mange hilsner fra Umbraco robotten
    <key alias="cssSavedText">Stylesheet gemt uden fejl</key>
    <key alias="dataTypeSaved">Datatype gemt</key>
    <key alias="dictionaryItemSaved">Ordbogsnøgle gemt</key>
-    <key alias="editContentPublishedFailedByParent">Udgivelsen fejlede fordi en overordnet side ikke er publiceret</key>
    <key alias="editContentPublishedHeader">Indhold publiceret</key>
    <key alias="editContentPublishedText">og nu synligt for besøgende</key>
    <key alias="editContentSavedHeader">Indhold gemt</key>
@@ -1131,11 +1156,28 @@ Mange hilsner fra Umbraco robotten
    <key alias="sessionExpires">Session udløber</key>
  </area>
  <area alias="validation">
-      <key alias="validation">Validation</key>
-      <key alias="validateAsEmail">Valider som email</key>
-      <key alias="validateAsNumber">Valider som tal</key>
-      <key alias="validateAsUrl">Valider som Url</key>
-      <key alias="enterCustomValidation">...eller indtast din egen validering</key>
-      <key alias="fieldIsMandatory">Feltet er påkrævet</key>
+    <key alias="validation">Validation</key>
+    <key alias="validateAsEmail">Valider som email</key>
+    <key alias="validateAsNumber">Valider som tal</key>
+    <key alias="validateAsUrl">Valider som Url</key>
+    <key alias="enterCustomValidation">...eller indtast din egen validering</key>
+    <key alias="fieldIsMandatory">Feltet er påkrævet</key>
+  </area>
+  <area alias="redirectUrls">
+    <key alias="disableUrlTracker">Slå URL tracker fra</key>
+    <key alias="enableUrlTracker">Slå URL tracker til</key>
+    <key alias="originalUrl">Original URL</key>
+    <key alias="redirectedTo">Viderestillet til</key>
+    <key alias="noRedirects">Der er ikke lavet nogen viderestillinger</key>
+    <key alias="noRedirectsDescription">Når en udgivet side bliver omdøbt eller flyttet, vil en viderestilling automatisk blive lavet til den nye side.</key>
+    <key alias="removeButton">Fjern</key>
+    <key alias="confirmRemove">Er du sikker på at du vil fjerne viderestillingen fra '%0%' til '%1%'?</key>
+    <key alias="redirectRemoved">Viderestillings URL fjernet.</key>
+    <key alias="redirectRemoveError">Fejl under fjernelse af viderestillings URL.</key>
+    <key alias="confirmDisable">Er du sikker på at du vil slå URL trackeren fra?</key>
+    <key alias="disabledConfirm">URL tracker er nu slået fra.</key>
+    <key alias="disableError">Der opstod en fejl under forsøget på at slå URL trackeren fra, der findes mere information i logfilen.</key>
+    <key alias="enabledConfirm">URL tracker er nu slået fra.</key>
+    <key alias="enableError">Der opstod en fejl under forsøget på at slå URL trackeren til, der findes mere information i logfilen.</key>
  </area>
 </language>
@@ -28,6 +28,9 @@
    <key alias="refreshNode">Reload</key>
    <key alias="republish">Republish entire site</key>
    <key alias="restore" version="7.3.0">Restore</key>
+    <key alias="SetPermissionsForThePage">Set permissions for the page %0%</key>
+    <key alias="chooseWhereToMove">Choose where to move</key>
+    <key alias="toInTheTreeStructureBelow">to in the tree structure below</key>
    <key alias="rights">Permissions</key>
    <key alias="rollback">Rollback</key>
    <key alias="sendtopublish">Send To Publish</key>
@@ -144,7 +147,7 @@
    <key alias="memberrole">Role</key>
    <key alias="membertype">Member Type</key>
    <key alias="noDate">No date chosen</key>
-    <key alias="nodeName">Page Title</key>
+    <key alias="nodeName">Link title</key>
    <key alias="otherElements">Properties</key>
    <key alias="parentNotPublished">This document is published but is not visible because the parent '%0%' is unpublished</key>
    <key alias="parentNotPublishedAnomaly">This document is published but is not in the cache</key>
@@ -286,18 +289,12 @@
    <key alias="treepicker">Pick item</key>
    <key alias="viewCacheItem">View Cache Item</key>
    <key alias="createFolder">Create folder...</key>
-
    <key alias="relateToOriginalLabel">Relate to original</key>
+    <key alias="includeDescendants">Include descendants</key>
    <key alias="theFriendliestCommunity">The friendliest community</key>
-
    <key alias="linkToPage">Link to page</key>
-
    <key alias="openInNewWindow">Opens the linked document in a new window or tab</key>
-    <key alias="openInFullBody">Opens the linked document in the full body of the window</key>
-    <key alias="openInParentFrame">Opens the linked document in the parent frame</key>
-
    <key alias="linkToMedia">Link to media</key>
-
    <key alias="selectMedia">Select media</key>
    <key alias="selectIcon">Select icon</key>
    <key alias="selectItem">Select item</key>
@@ -307,19 +304,14 @@
    <key alias="selectMember">Select member</key>
    <key alias="selectMemberGroup">Select member group</key>
    <key alias="noIconsFound">No icons were found</key>
-
    <key alias="noMacroParams">There are no parameters for this macro</key>
-
    <key alias="externalLoginProviders">External login providers</key>
    <key alias="exceptionDetail">Exception Details</key>
    <key alias="stacktrace">Stacktrace</key>
    <key alias="innerException">Inner Exception</key>
-
    <key alias="linkYour">Link your</key>
    <key alias="unLinkYour">Un-Link your</key>
-
    <key alias="account">account</key>
-
    <key alias="selectEditor">Select editor</key>
  </area>
  <area alias="dictionaryItem">
@@ -327,6 +319,12 @@
      Edit the different language versions for the dictionary item '<em>%0%</em>' below<br/>You can add additional languages under the 'languages' in the menu on the left
   ]]></key>
    <key alias="displayName">Culture Name</key>
+    <key alias="changeKey">Edit the key of the dictionary item.</key>
+    <key alias="changeKeyError">
+      <![CDATA[
+      The key '%0%' already exists.
+   ]]>
+    </key>
  </area>
  <area alias="placeholders">
    <key alias="username">Enter your username</key>
@@ -819,7 +817,7 @@ To manage your website, simply open the Umbraco back office and start adding con
    <key alias="installStateInstalling">Installing...</key>
    <key alias="installStateRestarting">Restarting, please wait...</key>
    <key alias="installStateComplete">All done, your browser will now refresh, please wait...</key>
-
+    <key alias="installStateCompleted">Please click finish to complete installation and reload page.</key>
  </area>
  <area alias="paste">
    <key alias="doNothing">Paste with full formatting (Not recommended)</key>
@@ -1335,7 +1333,7 @@ To manage your website, simply open the Umbraco back office and start adding con
 	  <key alias="customErrorsCheckRectifySuccessMessage">Custom errors successfully set to '%0%'.</key>

 	  <key alias="macroErrorModeCheckSuccessMessage">MacroErrors are set to '%0%'.</key>
-	  <key alias="macroErrorModeCheckErrorMessage">MacroErrors are set to '%0%' which will prevent some or all pages in your site from loading completely when there's any errors in macros. Rectifying this will set the value to '%1%'.</key>
+	  <key alias="macroErrorModeCheckErrorMessage">MacroErrors are set to '%0%' which will prevent some or all pages in your site from loading completely if there are any errors in macros. Rectifying this will set the value to '%1%'.</key>
 	  <key alias="macroErrorModeCheckRectifySuccessMessage">MacroErrors are now set to '%0%'.</key>

 	  <!-- The following keys get these tokens passed in:
@@ -1353,8 +1351,8 @@ To manage your website, simply open the Umbraco back office and start adding con
 	  <key alias="configurationServiceError">There was an error, check log for full error: %0%.</key>

 	  <key alias="xmlDataIntegrityCheckMembers">Members - Total XML: %0%, Total: %1%, Total invalid: %2%</key>
-	  <key alias="xmlDataIntegrityCheckMedia">Media - Total XML: %0%, Total: %1%, Total invalid %2%</key>
-	  <key alias="xmlDataIntegrityCheckContent">Content - Total XML: %0%, Total published: %1%, Total invalid %2%</key>
+	  <key alias="xmlDataIntegrityCheckMedia">Media - Total XML: %0%, Total: %1%, Total invalid: %2%</key>
+	  <key alias="xmlDataIntegrityCheckContent">Content - Total XML: %0%, Total published: %1%, Total invalid: %2%</key>

 	  <key alias="httpsCheckValidCertificate">Your site certificate was marked as valid.</key>
 	  <key alias="httpsCheckInvalidCertificate">Certificate validation error: '%0%'</key>
@@ -27,6 +27,9 @@
    <key alias="unpublish">Unpublish</key>
    <key alias="refreshNode">Reload</key>
    <key alias="republish">Republish entire site</key>
+    <key alias="SetPermissionsForThePage">Set permissions for the page %0%</key>
+    <key alias="chooseWhereToMove">Choose where to move</key>
+    <key alias="toInTheTreeStructureBelow">to in the tree structure below</key>
    <key alias="restore" version="7.3.0">Restore</key>
    <key alias="rights">Permissions</key>
    <key alias="rollback">Rollback</key>
@@ -145,7 +148,7 @@
    <key alias="memberrole">Role</key>
    <key alias="membertype">Member Type</key>
    <key alias="noDate">No date chosen</key>
-    <key alias="nodeName">Page Title</key>
+    <key alias="nodeName">Link title</key>
    <key alias="otherElements">Properties</key>
    <key alias="parentNotPublished">This document is published but is not visible because the parent '%0%' is unpublished</key>
    <key alias="parentNotPublishedAnomaly">This document is published but is not in the cache</key>
@@ -288,18 +291,12 @@
    <key alias="treepicker">Pick item</key>
    <key alias="viewCacheItem">View Cache Item</key>
    <key alias="createFolder">Create folder...</key>
-
    <key alias="relateToOriginalLabel">Relate to original</key>
+    <key alias="includeDescendants">Include descendants</key>
    <key alias="theFriendliestCommunity">The friendliest community</key>
-
    <key alias="linkToPage">Link to page</key>
-
    <key alias="openInNewWindow">Opens the linked document in a new window or tab</key>
-    <key alias="openInFullBody">Opens the linked document in the full body of the window</key>
-    <key alias="openInParentFrame">Opens the linked document in the parent frame</key>
-
    <key alias="linkToMedia">Link to media</key>
-
    <key alias="selectMedia">Select media</key>
    <key alias="selectIcon">Select icon</key>
    <key alias="selectItem">Select item</key>
@@ -308,19 +305,14 @@
    <key alias="selectContent">Select content</key>
    <key alias="selectMember">Select member</key>
    <key alias="selectMemberGroup">Select member group</key>
-
    <key alias="noMacroParams">There are no parameters for this macro</key>
-
    <key alias="externalLoginProviders">External login providers</key>
    <key alias="exceptionDetail">Exception Details</key>
    <key alias="stacktrace">Stacktrace</key>
    <key alias="innerException">Inner Exception</key>
-
    <key alias="linkYour">Link your</key>
    <key alias="unLinkYour">Un-Link your</key>
-
    <key alias="account">account</key>
-
    <key alias="selectEditor">Select editor</key>
  </area>
  <area alias="dictionaryItem">
@@ -328,6 +320,12 @@
      Edit the different language versions for the dictionary item '<em>%0%</em>' below<br/>You can add additional languages under the 'languages' in the menu on the left
   ]]></key>
    <key alias="displayName">Culture Name</key>
+    <key alias="changeKey">Edit the key of the dictionary item.</key>
+    <key alias="changeKeyError">
+      <![CDATA[
+      The key '%0%' already exists.
+   ]]>
+    </key>
  </area>
  <area alias="placeholders">
    <key alias="username">Enter your username</key>
@@ -819,6 +817,7 @@ To manage your website, simply open the Umbraco back office and start adding con
    <key alias="installStateInstalling">Installing...</key>
    <key alias="installStateRestarting">Restarting, please wait...</key>
    <key alias="installStateComplete">All done, your browser will now refresh, please wait...</key>
+    <key alias="installStateCompleted">Please click finish to complete installation and reload page.</key>
  </area>
  <area alias="paste">
    <key alias="doNothing">Paste with full formatting (Not recommended)</key>
@@ -1340,7 +1339,7 @@ To manage your website, simply open the Umbraco back office and start adding con
    <key alias="customErrorsCheckRectifySuccessMessage">Custom errors successfully set to '%0%'.</key>

    <key alias="macroErrorModeCheckSuccessMessage">MacroErrors are set to '%0%'.</key>
-    <key alias="macroErrorModeCheckErrorMessage">MacroErrors are set to '%0%' which will prevent some or all pages in your site from loading completely when there's any errors in macros. Rectifying this will set the value to '%1%'.</key>
+    <key alias="macroErrorModeCheckErrorMessage">MacroErrors are set to '%0%' which will prevent some or all pages in your site from loading completely if there are any errors in macros. Rectifying this will set the value to '%1%'.</key>
    <key alias="macroErrorModeCheckRectifySuccessMessage">MacroErrors are now set to '%0%'.</key>

    <!-- The following keys get these tokens passed in:
@@ -275,19 +275,12 @@
    <key alias="thumbnailimageclickfororiginal">クリックすると画像がフルサイズで表示されます</key>
    <key alias="treepicker">項目の選択</key>
    <key alias="viewCacheItem">キャッシュされている項目の表示</key>
-	<key alias="createFolder">フォルダーの作成...</key>
-
+    <key alias="createFolder">フォルダーの作成...</key>
    <key alias="relateToOriginalLabel">オリジナルに関連付ける</key>
    <key alias="theFriendliestCommunity">フレンドリーなコミュニティ</key>
-
    <key alias="linkToPage">ページへリンク</key>
-
    <key alias="openInNewWindow">リンク ドキュメントを新しいウィンドウまたはタブで開く</key>
-    <key alias="openInFullBody">リンク ドキュメントをウィンドウ全文表示で開く</key>
-    <key alias="openInParentFrame">親フレームでリンク ドキュメントを開く</key>
-
    <key alias="linkToMedia">メディアへリンク</key>
-
    <key alias="selectMedia">メディアの選択</key>
    <key alias="selectIcon">アイコンの選択</key>
    <key alias="selectItem">アイテムの選択</key>
@@ -296,19 +289,14 @@
    <key alias="selectContent">コンテンツの選択</key>
    <key alias="selectMember">メンバーの選択</key>
    <key alias="selectMemberGroup">メンバー グループの選択</key>
-
    <key alias="noMacroParams">このマクロのパラメーターはありません</key>
-
    <key alias="externalLoginProviders">外部ログイン プロバイダー</key>
    <key alias="exceptionDetail">例外の詳細</key>
    <key alias="stacktrace">スタックトレース</key>
    <key alias="innerException">Inner Exception</key>
-
    <key alias="linkYour">次をリンク:</key>
    <key alias="unLinkYour">次をリンク解除:</key>
-
    <key alias="account">アカウント</key>
-
    <key alias="selectEditor">エディターの選択</key>
  </area>
  <area alias="dictionaryItem">
@@ -15,8 +15,8 @@
    <key alias="disable">Deaktywuj</key>
    <key alias="emptyTrashcan">Opróżnij kosz</key>
    <key alias="exportDocumentType">Eksportuj typ dokumentu</key>
-    <key alias="exportDocumentTypeAsCode">TRANSLATE ME: 'Export to .NET'</key>
-    <key alias="exportDocumentTypeAsCode-Full">TRANSLATE ME: 'Export to .NET'</key>
+    <key alias="exportDocumentTypeAsCode">Ekspo .NET'</key>
+    <key alias="exportDocumentTypeAsCode-Full">Eksportuj do .NET'</key>
    <key alias="importDocumentType">Importuj typ dokumentu</key>
    <key alias="importPackage">Importuj zbiór</key>
    <key alias="liveEdit">Edytuj na stronie</key>
@@ -118,7 +118,7 @@
  </area>
  <area alias="dashboard">
    <key alias="browser">Przeglądaj swoją stronę</key>
-    <key alias="dontShowAgain">TRANSLATE ME: '- Hide'</key>
+    <key alias="dontShowAgain">- Ukryj</key>
    <key alias="nothinghappens">Jeśli Umbraco się nie otwiera, prawdopodbnie musisz zezwolić tej stronie na otwieranie wyskakujących okienek</key>
    <key alias="openinnew">zostało otwarte w nowym oknie</key>
    <key alias="restart">Restartuj</key>
@@ -168,7 +168,7 @@
    <key alias="confirmEmptyTrashcan">Proszę zaznaczyć, aby potwierdzić usunięcie %0% elementów.</key>
    <key alias="confirmlogout">Jesteś pewny?</key>
    <key alias="confirmSure">Jesteś pewny?</key>
-    <key alias="cut">TRANSLATE ME: 'Cut'</key>
+    <key alias="cut">Wytnij</key>
    <key alias="editdictionary">Edytuj element słownika</key>
    <key alias="editlanguage">Edytuj język</key>
    <key alias="insertAnchor">Wstaw link wewnętrzny</key>
@@ -183,7 +183,7 @@
    <key alias="linkinternal">Link wewnętrzny:</key>
    <key alias="linklocaltip">Kiedy używasz odnośników lokalnych, wstaw znak "#" na początku linku</key>
    <key alias="linknewwindow">Otworzyć w nowym oknie?</key>
-    <key alias="macroContainerSettings">TRANSLATE ME: 'Macro Settings'</key>
+    <key alias="macroContainerSettings">Ustawienia Makra</key>
    <key alias="macroDoesNotHaveProperties">To makro nie posiada żadnych właściwości, które można edytować</key>
    <key alias="paste">Wklej</key>
    <key alias="permissionsEdit">Edytuj Uprawnienia dla</key>
@@ -192,7 +192,7 @@
    <key alias="recycleBinWarning">Usunięcie elementów z kosza powoduje ich trwałe i nieodwracalne skasowanie</key>
    <key alias="regexSearchError"><![CDATA[Serwis <a target='_blank' href='http://regexlib.com'>regexlib.com</a> aktulanie nie jest dostępny, na co nie mamy wpływu. Bardzo przepraszamy za te utrudnienia.]]></key>
    <key alias="regexSearchHelp">Przeszukaj dla wyrażeń regularnych aby dodać regułę sprawdzającą do formularza. Np. 'email' 'url'</key>
-    <key alias="removeMacro">TRANSLATE ME: 'Remove Macro'</key>
+    <key alias="removeMacro">Usuń Makro</key>
    <key alias="requiredField">Pole wymagane</key>
    <key alias="sitereindexed">Strona została przeindeksowana</key>
    <key alias="siterepublished">Cache strony zostało odświeżone. Cała opublikowana zawartość jest teraz aktualna. Natomiast cała nieopublikowana zawartość ciągle nie jest widoczna</key>
@@ -222,7 +222,7 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]></key>
  <area alias="editdatatype">
    <key alias="addPrevalue">Dodaj wartość</key>
    <key alias="dataBaseDatatype">Typ bazydanych</key>
-    <key alias="guid">TRANSLATE ME: 'Data Editor GUID'</key>
+    <key alias="guid">Edytor GUID</key>
    <key alias="renderControl">Renderuj kontrolkę</key>
    <key alias="rteButtons">Przyciski</key>
    <key alias="rteEnableAdvancedSettings">Włącz ustawienia zaawansowane dla</key>
@@ -235,7 +235,7 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]></key>
  <area alias="errorHandling">
    <key alias="errorButDataWasSaved">Dane zostały zapisane, lecz wystąpiły błędy które musisz poprawić przed publikacją strony:</key>
    <key alias="errorChangingProviderPassword">Bieżący dostawca Membership nie obsługuje zmiany hasła (EnablePasswordRetrieval musi mieć wartość true)</key>
-    <key alias="errorExistsWithoutTab">TRANSLATE ME: '%0% already exists'</key>
+    <key alias="errorExistsWithoutTab">%0% już istnieje</key>
    <key alias="errorHeader">Wystąpiły błędy:</key>
    <key alias="errorHeaderWithoutTab">Wystąpiły błędy:</key>
    <key alias="errorInPasswordFormat">Hasło powinno mieć minimum %0% znaków, i zawierać co najmniej %1% niealfanumeryczny znak</key>
@@ -308,7 +308,7 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]></key>
    <key alias="language">Język</key>
    <key alias="layout">układ</key>
    <key alias="loading">Ładowanie</key>
-    <key alias="locked">TRANSLATE ME: 'Locked'</key>
+    <key alias="locked">Zablokowany</key>
    <key alias="login">Zaloguj</key>
    <key alias="logoff">Wyloguj</key>
    <key alias="logout">Wyloguj</key>
@@ -332,7 +332,7 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]></key>
    <key alias="recycleBin">Kosz</key>
    <key alias="remaining">Pozostało</key>
    <key alias="rename">Zmień nazwę</key>
-    <key alias="renew">TRANSLATE ME: 'Renew'</key>
+    <key alias="renew">Odnów</key>
    <key alias="retry">Ponów próbę</key>
    <key alias="rights">Uprawnienia</key>
    <key alias="search">Szukaj</key>
@@ -341,7 +341,7 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]></key>
    <key alias="showPageOnSend">Pokaż stronę "wyślij"</key>
    <key alias="size">Rozmiar</key>
    <key alias="sort">Sortuj</key>
-    <key alias="submit">Submit</key> <!-- TODO: Translate this -->
+    <key alias="submit">Zatwierdź</key>
    <key alias="type">Typ</key>
    <key alias="typeToSearch">Szukaj</key>
    <key alias="up">W górę</key>
@@ -356,8 +356,8 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]></key>
    <key alias="welcome">Witaj...</key>
    <key alias="width">Szerokość</key>
    <key alias="yes">Tak</key>
-    <key alias="reorder">Reorder</key>
-    <key alias="reorderDone">I am done reordering</key>
+    <key alias="reorder">Zmień kolejność</key>
+    <key alias="reorderDone">Kolejność została zmieniona</key>
  </area>
  <area alias="graphicheadline">
    <key alias="backgroundcolor">Kolor tła</key>
@@ -786,7 +786,7 @@ Miłego dnia!]]></key>
  <area alias="user">
    <key alias="administrators">Administrator</key>
    <key alias="categoryField">Pole kategorii</key>
-    <key alias="changePassword">TRANSLATE ME: 'Change Your Password'</key>
+    <key alias="changePassword">Zmień hasło!</key>
    <key alias="changePasswordDescription">TRANSLATE ME: 'You can change your password for accessing the Umbraco Back Office by filling out the form below and click the 'Change Password' button'</key>
    <key alias="contentChannel">Zawartość</key>
    <key alias="descriptionField">Opis</key>
@@ -800,10 +800,10 @@ Miłego dnia!]]></key>
    <key alias="modules">Sekcje</key>
    <key alias="noConsole">Wyłącz dostęp do Umbraco</key>
    <key alias="password">Hasło</key>
-    <key alias="passwordChanged">TRANSLATE ME: 'Your password has been changed!'</key>
-    <key alias="passwordConfirm">TRANSLATE ME: 'Please confirm the new password'</key>
-    <key alias="passwordEnterNew">TRANSLATE ME: 'Enter your new password'</key>
-    <key alias="passwordIsBlank">TRANSLATE ME: 'Your new password cannot be blank!'</key>
+    <key alias="passwordChanged">Twoje hasło zostało zmienione!</key>
+    <key alias="passwordConfirm">Proszę potwierdź nowe hasło!</key>
+    <key alias="passwordEnterNew">Wprowadź nowe hasło</key>
+    <key alias="passwordIsBlank">Nowe hasło nie może byc puste!</key>
    <key alias="passwordIsDifferent">TRANSLATE ME: 'There was a difference between the new password and the confirmed password. Please try again!'</key>
    <key alias="passwordMismatch">TRANSLATE ME: 'The confirmed password doesn't match the new password!'</key>
    <key alias="permissionReplaceChildren">Zastąp prawa dostępu dla węzłów potomnych</key>
@@ -340,18 +340,11 @@
    <key alias="treepicker">Выберите элемент</key>
    <key alias="viewCacheItem">Просмотр элемента кэша</key>
    <key alias="createFolder">Создать папку...</key>
-
    <key alias="relateToOriginalLabel">Связать с оригиналом</key>
    <key alias="theFriendliestCommunity">Самое дружелюбное сообщество</key>
-
    <key alias="linkToPage">Ссылка на страницу</key>
-
    <key alias="openInNewWindow">Открывает документ по ссылке в новом окне или вкладке браузера</key>
-    <key alias="openInFullBody">Открывает документ по ссылке в полноэкранном режиме</key>
-    <key alias="openInParentFrame">Открывает документ по ссылке в родительском фрейме</key>
-
    <key alias="linkToMedia">Ссылка на медиа-файл</key>
-
    <key alias="selectMedia">Выбрать медиа</key>
    <key alias="selectIcon">Выбрать значок</key>
    <key alias="selectItem">Выбрать элемент</key>
@@ -360,19 +353,14 @@
    <key alias="selectContent">Выбрать содержимое</key>
    <key alias="selectMember">Выбрать участника</key>
    <key alias="selectMemberGroup">Выбрать группу участников</key>
-
    <key alias="noMacroParams">Это макрос без параметров</key>
-
    <key alias="externalLoginProviders">Провайдеры аутентификации</key>
    <key alias="exceptionDetail">Подробное сообщение об ошибке</key>
    <key alias="stacktrace">Трассировка стека</key>
    <key alias="innerException">Внутренняя ошибка</key>
-
    <key alias="linkYour">Связать</key>
    <key alias="unLinkYour">Разорвать связь</key>
-
    <key alias="account">учетную запись</key>
-
    <key alias="selectEditor">Выбрать редактор</key>
  </area>
  <area alias="dictionaryItem">
@@ -380,6 +368,12 @@
 		Ниже Вы можете указать различные переводы данной статьи словаря '<em>%0%</em>'<br/>Добавить другие языки можно, воспользовавшись пунктом 'Языки' в меню слева
 		]]></key>
    <key alias="displayName">Название языка (культуры)</key>
+    <key alias="changeKey">Редактировать элемент (ключ) словаря</key>
+    <key alias="changeKeyError">
+      <![CDATA[
+      Ключ '%0%' уже существует в словаре.
+   ]]>
+    </key>
  </area>
  <area alias="editcontenttype">
    <key alias="allowAtRoot" version="7.2">Допустим как корневой</key>
@@ -655,7 +649,7 @@
    <key alias="xmlDataIntegrityCheckMedia">Медиа - всего в XML: %0%, всего: %1%Б с ошибками: %2%</key>
    <key alias="xmlDataIntegrityCheckContent">Содержимое - всего в XML: %0%, всего опубликовано: %1%, с ошибками: %2%</key>

-    <key alias="httpsCheckValidCertificate">Сертификат Вашего сайта отмечен как проверенный.</key>
+    <key alias="httpsCheckValidCertificate">Сертификат Вашего веб-сайта отмечен как проверенный.</key>
    <key alias="httpsCheckInvalidCertificate">Ошибка проверки сертификата: '%0%'</key>
    <key alias="httpsCheckInvalidUrl">Ошибка проверки адреса URL %0% - '%1%'</key>
    <key alias="httpsCheckIsCurrentSchemeHttps">Сейчас Вы %0% просматриваете сайт, используя протокол HTTPS.</key>
@@ -22,7 +22,7 @@
        ControlToValidate="Email" ValidateEmptyText="false" OnServerValidate="EmailExistsCheck"></asp:CustomValidator>
    <asp:CustomValidator runat="server" ID="EmailValidator" OnServerValidate="EmailValidator_OnServerValidate"
        ControlToValidate="Email"
-        ErrorMessage="Invalid email address"
+        ErrorMessage='<%#ui.Text("errorHandling", "errorRegExpWithoutTab", "E-mail", CurrentUser) %>'
        Display="None" />
    <br />
    <asp:TextBox ID="Email" runat="server" Width="350px" CssClass="bigInput"></asp:TextBox>
@@ -1285,7 +1285,7 @@ angular.module("umbraco").controller("Umbraco.Dialogs.MacroPickerController", fu
 //used for the media picker dialog
 angular.module("umbraco")
    .controller("Umbraco.Dialogs.MediaPickerController",
-        function ($scope, mediaResource, umbRequestHelper, entityResource, $log, mediaHelper, eventsService, treeService, $cookies, $element, $timeout) {
+        function($scope, mediaResource, umbRequestHelper, entityResource, $log, mediaHelper, mediaTypeHelper, eventsService, treeService) {

            var dialogOptions = $scope.dialogOptions;

@@ -1295,29 +1295,34 @@ angular.module("umbraco")
            $scope.startNodeId = dialogOptions.startNodeId ? dialogOptions.startNodeId : -1;
            $scope.cropSize = dialogOptions.cropSize;

-
            //preload selected item
            $scope.target = undefined;
-            if(dialogOptions.currentTarget){
+            if (dialogOptions.currentTarget) {
                $scope.target = dialogOptions.currentTarget;
            }

-            $scope.upload = function(v){
-               angular.element(".umb-file-dropzone-directive .file-select").click();
+            $scope.acceptedMediatypes = [];
+            mediaTypeHelper.getAllowedImagetypes($scope.startNodeId)
+                .then(function(types) {
+                    $scope.acceptedMediatypes = types;
+                });
+
+            $scope.upload = function(v) {
+                angular.element(".umb-file-dropzone-directive .file-select").click();
            };

-            $scope.dragLeave = function(el, event){
+            $scope.dragLeave = function(el, event) {
                $scope.activeDrag = false;
            };

-            $scope.dragEnter = function(el, event){
+            $scope.dragEnter = function(el, event) {
                $scope.activeDrag = true;
            };

            $scope.submitFolder = function(e) {
                if (e.keyCode === 13) {
                    e.preventDefault();
-                    
+
                    mediaResource
                        .addFolder($scope.newFolderName, $scope.currentFolder.id)
                        .then(function(data) {
@@ -1336,21 +1341,25 @@ angular.module("umbraco")
            };

            $scope.gotoFolder = function(folder) {
-
-                if(!folder){
-                    folder = {id: -1, name: "Media", icon: "icon-folder"};
+                if (!folder) {
+                    folder = { id: -1, name: "Media", icon: "icon-folder" };
                }

                if (folder.id > 0) {
                    entityResource.getAncestors(folder.id, "media")
                        .then(function(anc) {
                            // anc.splice(0,1);  
-                            $scope.path = _.filter(anc, function (f) {
-                                return f.path.indexOf($scope.startNodeId) !== -1;
-                            });
+                            $scope.path = _.filter(anc,
+                                function(f) {
+                                    return f.path.indexOf($scope.startNodeId) !== -1;
+                                });
                        });
-                }
-                else {
+
+                    mediaTypeHelper.getAllowedImagetypes(folder.id)
+                        .then(function(types) {
+                            $scope.acceptedMediatypes = types;
+                        });
+                } else {
                    $scope.path = [];
                }

@@ -1361,50 +1370,50 @@ angular.module("umbraco")
                        $scope.images = data.items ? data.items : [];
                    });

-                $scope.currentFolder = folder;      
+                $scope.currentFolder = folder;
            };
-            
-          
+
+
            $scope.clickHandler = function(image, ev, select) {
                ev.preventDefault();
-                
+
                if (image.isFolder && !select) {
                    $scope.gotoFolder(image);
-                }else{
+                } else {
                    eventsService.emit("dialogs.mediaPicker.select", image);
-                    
+
                    //we have 3 options add to collection (if multi) show details, or submit it right back to the callback
                    if ($scope.multiPicker) {
                        $scope.select(image);
                        image.cssclass = ($scope.dialogData.selection.indexOf(image) > -1) ? "selected" : "";
-                    }else if($scope.showDetails) {
-                        $scope.target= image;
+                    } else if ($scope.showDetails) {
+                        $scope.target = image;
                        $scope.target.url = mediaHelper.resolveFile(image);
-                    }else{
+                    } else {
                        $scope.submit(image);
                    }
                }
            };

-            $scope.exitDetails = function(){
-                if(!$scope.currentFolder){
+            $scope.exitDetails = function() {
+                if (!$scope.currentFolder) {
                    $scope.gotoFolder();
                }

                $scope.target = undefined;
            };

-            $scope.onUploadComplete = function () {
+            $scope.onUploadComplete = function() {
                $scope.gotoFolder($scope.currentFolder);
            };

-            $scope.onFilesQueue = function(){
+            $scope.onFilesQueue = function() {
                $scope.activeDrag = false;
            };

            //default root item
-            if(!$scope.target){
-                $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });  
+            if (!$scope.target) {
+                $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
            }
        });
 //used for the member picker dialog
@@ -1895,7 +1904,7 @@ angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController",
 	                }
 	            });
 	        } else {
-	            var a = dialogOptions.filter.toLowerCase().split(',');
+	            var a = dialogOptions.filter.toLowerCase().replace(/\s/g, '').split(',');
 	            angular.forEach(nodes, function (value, key) {

 	                var found = a.indexOf(value.metaData.contentType.toLowerCase()) >= 0;
@@ -3386,9 +3395,9 @@ angular.module("umbraco").controller("Umbraco.Overlays.MacroPickerController", M
 //used for the media picker dialog
 angular.module("umbraco")
    .controller("Umbraco.Overlays.MediaPickerController",
-        function ($scope, mediaResource, umbRequestHelper, entityResource, $log, mediaHelper, eventsService, treeService, $element, $timeout, $cookies, $cookieStore, localizationService) {
+        function($scope, mediaResource, umbRequestHelper, entityResource, $log, mediaHelper, mediaTypeHelper, eventsService, treeService, $element, $timeout, $cookies, $cookieStore, localizationService) {

-            if(!$scope.model.title) {
+            if (!$scope.model.title) {
                $scope.model.title = localizationService.localize("defaultdialogs_selectMedia");
            }

@@ -3401,60 +3410,59 @@ angular.module("umbraco")
            $scope.startNodeId = dialogOptions.startNodeId ? dialogOptions.startNodeId : -1;
            $scope.cropSize = dialogOptions.cropSize;
            $scope.lastOpenedNode = $cookieStore.get("umbLastOpenedMediaNodeId");
-            if($scope.onlyImages){
-                $scope.acceptedFileTypes = mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes);
-            }
-            else {
-                $scope.acceptedFileTypes = !mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.disallowedUploadFiles);
+            if ($scope.onlyImages) {
+                $scope.acceptedFileTypes = mediaHelper
+                    .formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes);
+            } else {
+                $scope.acceptedFileTypes = !mediaHelper
+                    .formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.disallowedUploadFiles);
            }
            $scope.maxFileSize = Umbraco.Sys.ServerVariables.umbracoSettings.maxFileSize + "KB";

            $scope.model.selectedImages = [];

+            $scope.acceptedMediatypes = [];
+            mediaTypeHelper.getAllowedImagetypes($scope.startNodeId)
+                .then(function(types) {
+                    $scope.acceptedMediatypes = types;
+                });
+
            //preload selected item
            $scope.target = undefined;
-            if(dialogOptions.currentTarget){
+            if (dialogOptions.currentTarget) {
                $scope.target = dialogOptions.currentTarget;
            }

-            $scope.upload = function(v){
-               angular.element(".umb-file-dropzone-directive .file-select").click();
+            $scope.upload = function(v) {
+                angular.element(".umb-file-dropzone-directive .file-select").click();
            };

-            $scope.dragLeave = function(el, event){
+            $scope.dragLeave = function(el, event) {
                $scope.activeDrag = false;
            };

-            $scope.dragEnter = function(el, event){
+            $scope.dragEnter = function(el, event) {
                $scope.activeDrag = true;
            };

            $scope.submitFolder = function() {
+                if ($scope.newFolderName) {
+                    mediaResource
+                        .addFolder($scope.newFolderName, $scope.currentFolder.id)
+                        .then(function(data) {
+                            //we've added a new folder so lets clear the tree cache for that specific item
+                            treeService.clearCache({
+                                cacheKey: "__media", //this is the main media tree cache key
+                                childrenOf: data.parentId //clear the children of the parent
+                            });

-               if ($scope.newFolderName) {
-
-                  mediaResource
-                     .addFolder($scope.newFolderName, $scope.currentFolder.id)
-                     .then(function(data) {
-
-                        //we've added a new folder so lets clear the tree cache for that specific item
-                        treeService.clearCache({
-                           cacheKey: "__media", //this is the main media tree cache key
-                           childrenOf: data.parentId //clear the children of the parent
+                            $scope.gotoFolder(data);
+                            $scope.showFolderInput = false;
+                            $scope.newFolderName = "";
                        });
-
-                        $scope.gotoFolder(data);
-
-                        $scope.showFolderInput = false;
-
-                        $scope.newFolderName = "";
-
-                     });
-
-               } else {
-                  $scope.showFolderInput = false;
-               }
-
+                } else {
+                    $scope.showFolderInput = false;
+                }
            };

            $scope.enterSubmitFolder = function(event) {
@@ -3466,58 +3474,61 @@ angular.module("umbraco")

            $scope.gotoFolder = function(folder) {

-                if(!$scope.multiPicker) {
+                if (!$scope.multiPicker) {
                    deselectAllImages($scope.model.selectedImages);
                }

-                if(!folder){
-                    folder = {id: -1, name: "Media", icon: "icon-folder"};
+                if (!folder) {
+                    folder = { id: -1, name: "Media", icon: "icon-folder" };
                }

                if (folder.id > 0) {
                    entityResource.getAncestors(folder.id, "media")
                        .then(function(anc) {
                            // anc.splice(0,1);
-                            $scope.path = _.filter(anc, function (f) {
-                                return f.path.indexOf($scope.startNodeId) !== -1;
-                            });
+                            $scope.path = _.filter(anc,
+                                function(f) {
+                                    return f.path.indexOf($scope.startNodeId) !== -1;
+                                });
                        });
-                }
-                else {
+
+                    mediaTypeHelper.getAllowedImagetypes(folder.id)
+                        .then(function(types) {
+                            $scope.acceptedMediatypes = types;
+                        });
+                } else {
                    $scope.path = [];
                }

                //mediaResource.rootMedia()
                mediaResource.getChildren(folder.id)
-                   .then(function(data) {
-                      $scope.searchTerm = "";
-                      $scope.images = data.items ? data.items : [];
+                    .then(function(data) {
+                        $scope.searchTerm = "";
+                        $scope.images = data.items ? data.items : [];

-                      // set already selected images to selected
-                      for (var folderImageIndex = 0; folderImageIndex < $scope.images.length; folderImageIndex++) {
+                        // set already selected images to selected
+                        for (var folderImageIndex = 0; folderImageIndex < $scope.images.length; folderImageIndex++) {
+                            var folderImage = $scope.images[folderImageIndex];
+                            var imageIsSelected = false;

-                         var folderImage = $scope.images[folderImageIndex];
-                         var imageIsSelected = false;
+                            for (var selectedImageIndex = 0;
+                                selectedImageIndex < $scope.model.selectedImages.length;
+                                selectedImageIndex++) {
+                                var selectedImage = $scope.model.selectedImages[selectedImageIndex];

-                         for (var selectedImageIndex = 0; selectedImageIndex < $scope.model.selectedImages.length; selectedImageIndex++) {
-                            var selectedImage = $scope.model.selectedImages[selectedImageIndex];
-
-                            if(folderImage.key === selectedImage.key) {
-                               imageIsSelected = true;
+                                if (folderImage.key === selectedImage.key) {
+                                    imageIsSelected = true;
+                                }
                            }
-                         }
-
-                         if(imageIsSelected) {
-                            folderImage.selected = true;
-                         }
-                      }
-
-                   });
-
+                            if (imageIsSelected) {
+                                folderImage.selected = true;
+                            }
+                        }
+                    });
                $scope.currentFolder = folder;

                // for some reason i cannot set cookies with cookieStore
-                document.cookie="umbLastOpenedMediaNodeId=" + folder.id;
+                document.cookie = "umbLastOpenedMediaNodeId=" + folder.id;

            };

@@ -3529,52 +3540,40 @@ angular.module("umbraco")
                        eventsService.emit("dialogs.mediaPicker.select", image);
                        selectImage(image);
                    }
-
                } else {
-
                    eventsService.emit("dialogs.mediaPicker.select", image);
-
-                    if($scope.showDetails) {
+                    if ($scope.showDetails) {
                        $scope.target = image;
                        $scope.target.url = mediaHelper.resolveFile(image);
                        $scope.openDetailsDialog();
                    } else {
                        selectImage(image);
                    }
-
                }
-
            };

            $scope.clickItemName = function(item) {
-                if(item.isFolder) {
+                if (item.isFolder) {
                    $scope.gotoFolder(item);
                }
            };

            function selectImage(image) {
-
-                if(image.selected) {
-
-                    for(var i = 0; $scope.model.selectedImages.length > i; i++) {
-
+                if (image.selected) {
+                    for (var i = 0; $scope.model.selectedImages.length > i; i++) {
                        var imageInSelection = $scope.model.selectedImages[i];
-                        if(image.key === imageInSelection.key) {
+                        if (image.key === imageInSelection.key) {
                            image.selected = false;
                            $scope.model.selectedImages.splice(i, 1);
                        }
                    }
-
                } else {
-
-                    if(!$scope.multiPicker) {
+                    if (!$scope.multiPicker) {
                        deselectAllImages($scope.model.selectedImages);
                    }
-
                    image.selected = true;
                    $scope.model.selectedImages.push(image);
                }
-
            }

            function deselectAllImages(images) {
@@ -3585,68 +3584,68 @@ angular.module("umbraco")
                images.length = 0;
            }

-            $scope.onUploadComplete = function () {
+            $scope.onUploadComplete = function() {
                $scope.gotoFolder($scope.currentFolder);
            };

-            $scope.onFilesQueue = function(){
+            $scope.onFilesQueue = function() {
                $scope.activeDrag = false;
            };

            //default root item
            if (!$scope.target) {
+                if ($scope.lastOpenedNode && $scope.lastOpenedNode !== -1) {
+                    entityResource.getById($scope.lastOpenedNode, "media")
+                        .then(function(node) {
+                                // make sure that las opened node is on the same path as start node
+                                var nodePath = node.path.split(",");

-               if($scope.lastOpenedNode && $scope.lastOpenedNode !== -1) {
-
-                  entityResource.getById($scope.lastOpenedNode, "media")
-                     .then(function(node){
-
-                        // make sure that las opened node is on the same path as start node
-                        var nodePath = node.path.split(",");
-
-                        if(nodePath.indexOf($scope.startNodeId.toString()) !== -1) {
-                           $scope.gotoFolder({id: $scope.lastOpenedNode, name: "Media", icon: "icon-folder"});
-                        } else {
-                           $scope.gotoFolder({id: $scope.startNodeId, name: "Media", icon: "icon-folder"});
-                        }
-
-                    }, function (err) {
-                        $scope.gotoFolder({id: $scope.startNodeId, name: "Media", icon: "icon-folder"});
-                    });
-
-               } else {
-
-                  $scope.gotoFolder({id: $scope.startNodeId, name: "Media", icon: "icon-folder"});
-
-               }
-
+                                if (nodePath.indexOf($scope.startNodeId.toString()) !== -1) {
+                                    $scope
+                                        .gotoFolder({ id: $scope.lastOpenedNode, name: "Media", icon: "icon-folder" });
+                                } else {
+                                    $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
+                                }
+                            },
+                            function(err) {
+                                $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
+                            });
+                } else {
+                    $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
+                }
            }

            $scope.openDetailsDialog = function() {

-               $scope.mediaPickerDetailsOverlay = {};
-               $scope.mediaPickerDetailsOverlay.show = true;
+                $scope.mediaPickerDetailsOverlay = {};
+                $scope.mediaPickerDetailsOverlay.show = true;

-               $scope.mediaPickerDetailsOverlay.submit = function(model) {
+                $scope.mediaPickerDetailsOverlay.submit = function(model) {
+                    $scope.model.selectedImages.push($scope.target);
+                    $scope.model.submit($scope.model);

-                  $scope.model.selectedImages.push($scope.target);
-                  $scope.model.submit($scope.model);
-
-                  $scope.mediaPickerDetailsOverlay.show = false;
-                  $scope.mediaPickerDetailsOverlay = null;
-
-               };
-
-               $scope.mediaPickerDetailsOverlay.close = function(oldModel) {
-                  $scope.mediaPickerDetailsOverlay.show = false;
-                  $scope.mediaPickerDetailsOverlay = null;
-               };
+                    $scope.mediaPickerDetailsOverlay.show = false;
+                    $scope.mediaPickerDetailsOverlay = null;
+                };

+                $scope.mediaPickerDetailsOverlay.close = function(oldModel) {
+                    $scope.mediaPickerDetailsOverlay.show = false;
+                    $scope.mediaPickerDetailsOverlay = null;
+                };
            };
-
-
        });

+angular.module("umbraco").controller("Umbraco.Overlays.MediaTypePickerController",
+	function ($scope) {
+
+		$scope.select = function(mediatype){
+			$scope.model.selectedType = mediatype;
+			$scope.model.submit($scope.model);
+			$scope.model.show = false;
+		}
+	    
+	});
+
 //used for the member picker dialog
 angular.module("umbraco").controller("Umbraco.Overlays.MemberGroupPickerController",
    function($scope, eventsService, entityResource, searchService, $log, localizationService) {
@@ -4159,7 +4158,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController",
 	                }
 	            });
 	        } else {
-	            var a = dialogOptions.filter.toLowerCase().split(',');
+	            var a = dialogOptions.filter.toLowerCase().replace(/\s/g, '').split(',');
 	            angular.forEach(nodes, function (value, key) {

 	                var found = a.indexOf(value.metaData.contentType.toLowerCase()) >= 0;
@@ -9065,6 +9064,7 @@ angular.module("umbraco").controller("Umbraco.Editors.Packages.DeleteController"
            status: "",
            progress:0
        };
+        vm.installCompleted = false;
        vm.zipFile = {
            uploadStatus: "idle",
            uploadProgress: 0,
@@ -9087,6 +9087,9 @@ angular.module("umbraco").controller("Umbraco.Editors.Packages.DeleteController"
                file: file
            }).progress(function (evt) {

+                // set view state to uploading
+                vm.state = 'uploading';
+
                // calculate progress in percentage
                var progressPercentage = parseInt(100.0 * evt.loaded / evt.total, 10);

@@ -9187,10 +9190,10 @@ angular.module("umbraco").controller("Umbraco.Editors.Packages.DeleteController"
                            localStorageService.set("packageInstallUri", "installed");
                        }

-                        //reload on next digest (after cookie)
-                        $timeout(function () {
-                            $window.location.reload(true);
-                        });
+                        vm.installState.status = localizationService.localize("packager_installStateCompleted");
+                        vm.installCompleted = true;
+                        
+                        

                    },
                    installError);
@@ -9200,6 +9203,13 @@ angular.module("umbraco").controller("Umbraco.Editors.Packages.DeleteController"
            //This will return a rejection meaning that the promise change above will stop
            return $q.reject();
        }
+
+        vm.reloadPage = function() {
+            //reload on next digest (after cookie)
+            $timeout(function () {
+                $window.location.reload(true);
+            });
+        }
    }

    angular.module("umbraco").controller("Umbraco.Editors.Packages.InstallLocalController", PackagesInstallLocalController);
@@ -9301,6 +9311,7 @@ angular.module("umbraco").controller("Umbraco.Editors.Packages.DeleteController"
        vm.openLightbox = openLightbox;
        vm.closeLightbox = closeLightbox;
        vm.search = search;
+        vm.installCompleted = false;

        var currSort = "Latest";
        //used to cancel any request in progress if another one needs to take it's place
@@ -9486,10 +9497,8 @@ angular.module("umbraco").controller("Umbraco.Editors.Packages.DeleteController"
                            localStorageService.set("packageInstallUri", result.postInstallationPath);
                        }

-                        //reload on next digest (after cookie)
-                        $timeout(function() {
-                            window.location.reload(true);
-                        });
+                        vm.installState.status = localizationService.localize("packager_installStateCompleted");
+                        vm.installCompleted = true;

                    },
                    error);
@@ -9548,6 +9557,13 @@ angular.module("umbraco").controller("Umbraco.Editors.Packages.DeleteController"
            searchDebounced();
        }

+        vm.reloadPage = function () {
+            //reload on next digest (after cookie)
+            $timeout(function () {
+                window.location.reload(true);
+            });
+        }
+
        init();

    }
@@ -13232,7 +13248,7 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.IncludePropertiesL
 (function() {
   "use strict";

-   function ListViewGridLayoutController($scope, $routeParams, mediaHelper, mediaResource, $location, listViewHelper) {
+   function ListViewGridLayoutController($scope, $routeParams, mediaHelper, mediaResource, $location, listViewHelper, mediaTypeHelper) {

      var vm = this;

@@ -13244,6 +13260,7 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.IncludePropertiesL
      vm.mediaDetailsTooltip = {};
      vm.itemsWithoutFolders = [];
      vm.isRecycleBin = $scope.contentId === '-21' || $scope.contentId === '-20';
+      vm.acceptedMediatypes = [];

      vm.dragEnter = dragEnter;
      vm.dragLeave = dragLeave;
@@ -13258,6 +13275,13 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.IncludePropertiesL

      function activate() {
          vm.itemsWithoutFolders = filterOutFolders($scope.items);
+
+          if($scope.entityType === 'media') {
+            mediaTypeHelper.getAllowedImagetypes(vm.nodeId).then(function (types) {
+                vm.acceptedMediatypes = types;
+            });
+          }
+
      }

      function filterOutFolders(items) {
@@ -13339,7 +13363,7 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.IncludePropertiesL
 (function () {
   "use strict";

-   function ListViewListLayoutController($scope, listViewHelper, $location, mediaHelper) {
+   function ListViewListLayoutController($scope, listViewHelper, $location, mediaHelper, mediaTypeHelper) {

      var vm = this;

@@ -13349,6 +13373,7 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.IncludePropertiesL
      vm.maxFileSize = Umbraco.Sys.ServerVariables.umbracoSettings.maxFileSize + "KB";
      vm.activeDrag = false;
      vm.isRecycleBin = $scope.contentId === '-21' || $scope.contentId === '-20';
+      vm.acceptedMediatypes = [];

      vm.selectItem = selectItem;
      vm.clickItem = clickItem;
@@ -13361,39 +13386,49 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.IncludePropertiesL
      vm.onFilesQueue = onFilesQueue;
      vm.onUploadComplete = onUploadComplete;

+      function activate() {
+
+        if ($scope.entityType === 'media') {
+          mediaTypeHelper.getAllowedImagetypes(vm.nodeId).then(function (types) {
+            vm.acceptedMediatypes = types;
+          });
+        }
+
+      }
+
      function selectAll($event) {
         listViewHelper.selectAllItems($scope.items, $scope.selection, $event);
-         }
+      }

      function isSelectedAll() {
         return listViewHelper.isSelectedAll($scope.items, $scope.selection);
-         }
+      }

      function selectItem(selectedItem, $index, $event) {
         listViewHelper.selectHandler(selectedItem, $index, $scope.items, $scope.selection, $event);
-         }
+      }

      function clickItem(item) {
         // if item.id is 2147483647 (int.MaxValue) use item.key
         $location.path($scope.entityType + '/' +$scope.entityType + '/edit/' + (item.id === 2147483647 ? item.key : item.id));
-         }
+      }

      function isSortDirection(col, direction) {
         return listViewHelper.setSortingDirection(col, direction, $scope.options);
-         }
+      }

      function sort(field, allow, isSystem) {
         if (allow) {
            $scope.options.orderBySystemField = isSystem;
            listViewHelper.setSorting(field, allow, $scope.options);
            $scope.getContent($scope.contentId);
-            }
-            }
+          }
+      }

-               // Dropzone upload functions
+      // Dropzone upload functions
      function dragEnter(el, event) {
         vm.activeDrag = true;
-   }
+      }

      function dragLeave(el, event) {
         vm.activeDrag = false;
@@ -13401,11 +13436,13 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.IncludePropertiesL

      function onFilesQueue() {
         vm.activeDrag = false;
-         }
+      }

      function onUploadComplete() { 
         $scope.getContent($scope.contentId);
-   }
+      }
+
+      activate();

   }

@@ -15786,7 +15823,7 @@ function sliderController($scope, $log, $element, assetsService, angularHelper)
 angular.module("umbraco").controller("Umbraco.PropertyEditors.SliderController", sliderController);
 angular.module("umbraco")
 .controller("Umbraco.PropertyEditors.TagsController",
-    function ($rootScope, $scope, $log, assetsService, umbRequestHelper, angularHelper, $timeout, $element) {
+    function ($rootScope, $scope, $log, assetsService, umbRequestHelper, angularHelper, $timeout, $element, $sanitize) {

        var $typeahead;

@@ -15827,6 +15864,7 @@ angular.module("umbraco")

            //Helper method to add a tag on enter or on typeahead select
            function addTag(tagToAdd) {
+                tagToAdd = String(tagToAdd).htmlEncode();
                if (tagToAdd != null && tagToAdd.length > 0) {
                    if ($scope.model.value.indexOf(tagToAdd) < 0) {
                        $scope.model.value.push(tagToAdd);
@@ -9725,215 +9725,226 @@ Use this directive to render a tooltip.
 /*
 TODO
 .directive("umbFileDrop", function ($timeout, $upload, localizationService, umbRequestHelper){
-
-	return{
-		restrict: "A",
-		link: function(scope, element, attrs){
-
-			//load in the options model
-
-
-		}
-	}
+    return{
+        restrict: "A",
+        link: function(scope, element, attrs){
+            //load in the options model
+        }
+    }
 })
 */

 angular.module("umbraco.directives")
+    .directive('umbFileDropzone',
+        function($timeout, Upload, localizationService, umbRequestHelper) {
+            return {
+                restrict: 'E',
+                replace: true,
+                templateUrl: 'views/components/upload/umb-file-dropzone.html',
+                scope: {
+                    parentId: '@',
+                    contentTypeAlias: '@',
+                    propertyAlias: '@',
+                    accept: '@',
+                    maxFileSize: '@',

-.directive('umbFileDropzone', function ($timeout, Upload, localizationService, umbRequestHelper) {
-	return {
+                    compact: '@',
+                    hideDropzone: '@',
+                    acceptedMediatypes: '=',

-		restrict: 'E',
-		replace: true,
+                    filesQueued: '=',
+                    handleFile: '=',
+                    filesUploaded: '='
+                },
+                link: function(scope, element, attrs) {
+                    scope.queue = [];
+                    scope.done = [];
+                    scope.rejected = [];
+                    scope.currentFile = undefined;

-		templateUrl: 'views/components/upload/umb-file-dropzone.html',
+                    function _filterFile(file) {
+                        var ignoreFileNames = ['Thumbs.db'];
+                        var ignoreFileTypes = ['directory'];

-		scope: {
-			parentId: '@',
-			contentTypeAlias: '@',
-			propertyAlias: '@',
-			accept: '@',
-			maxFileSize: '@',
+                        // ignore files with names from the list
+                        // ignore files with types from the list
+                        // ignore files which starts with "."
+                        if (ignoreFileNames.indexOf(file.name) === -1 &&
+                            ignoreFileTypes.indexOf(file.type) === -1 &&
+                            file.name.indexOf(".") !== 0) {
+                            return true;
+                        } else {
+                            return false;
+                        }
+                    }

-			compact: '@',
-			hideDropzone: '@',
+                    function _filesQueued(files, event) {
+                        //Push into the queue
+                        angular.forEach(files,
+                            function(file) {

-			filesQueued: '=',
-			handleFile: '=',
-			filesUploaded: '='
-		},
+                                if (_filterFile(file) === true) {

-		link: function(scope, element, attrs) {
+                                    if (file.$error) {
+                                        scope.rejected.push(file);
+                                    } else {
+                                        scope.queue.push(file);
+                                    }
+                                }
+                            });

-			scope.queue = [];
-			scope.done = [];
-			scope.rejected = [];
-			scope.currentFile = undefined;
+                        //when queue is done, kick the uploader
+                        if (!scope.working) {
+                            // Upload not allowed
+                            if (!scope.acceptedMediatypes || !scope.acceptedMediatypes.length) {
+                                files.map(function(file) {
+                                    file.uploadStatus = "error";
+                                    file.serverErrorMessage = "File type is not allowed here";
+                                    scope.rejected.push(file);
+                                });
+                                scope.queue = [];
+                            }
+                            // One allowed type
+                            if (scope.acceptedMediatypes && scope.acceptedMediatypes.length === 1) {
+                                // Standard setup - set alias to auto select to let the server best decide which media type to use
+                                if (scope.acceptedMediatypes[0].alias === 'Image') {
+                                    scope.contentTypeAlias = "umbracoAutoSelect";
+                                } else {
+                                    scope.contentTypeAlias = scope.acceptedMediatypes[0].alias;
+                                }

-			function _filterFile(file) {
+                                _processQueueItem();
+                            }
+                            // More than one, open dialog
+                            if (scope.acceptedMediatypes && scope.acceptedMediatypes.length > 1) {
+                                _chooseMediaType();
+                            }
+                        }
+                    }

-				var ignoreFileNames = ['Thumbs.db'];
-				var ignoreFileTypes = ['directory'];
+                    function _processQueueItem() {
+                        if (scope.queue.length > 0) {
+                            scope.currentFile = scope.queue.shift();
+                            _upload(scope.currentFile);
+                        } else if (scope.done.length > 0) {
+                            if (scope.filesUploaded) {
+                                //queue is empty, trigger the done action
+                                scope.filesUploaded(scope.done);
+                            }

-				// ignore files with names from the list
-				// ignore files with types from the list
-				// ignore files which starts with "."
-				if(ignoreFileNames.indexOf(file.name) === -1 &&
-					ignoreFileTypes.indexOf(file.type) === -1 &&
-					file.name.indexOf(".") !== 0) {
-					return true;
-				} else {
-					return false;
-				}
+                            //auto-clear the done queue after 3 secs
+                            var currentLength = scope.done.length;
+                            $timeout(function() {
+                                    scope.done.splice(0, currentLength);
+                                },
+                                3000);
+                        }
+                    }

-			}
+                    function _upload(file) {

-			function _filesQueued(files, event){
+                        scope.propertyAlias = scope.propertyAlias ? scope.propertyAlias : "umbracoFile";
+                        scope.contentTypeAlias = scope.contentTypeAlias ? scope.contentTypeAlias : "Image";

-				//Push into the queue
-				angular.forEach(files, function(file){
+                        Upload.upload({
+                                url: umbRequestHelper.getApiUrl("mediaApiBaseUrl", "PostAddFile"),
+                                fields: {
+                                    'currentFolder': scope.parentId,
+                                    'contentTypeAlias': scope.contentTypeAlias,
+                                    'propertyAlias': scope.propertyAlias,
+                                    'path': file.path
+                                },
+                                file: file
+                            })
+                            .progress(function(evt) {
+                                // calculate progress in percentage
+                                var progressPercentage = parseInt(100.0 * evt.loaded / evt.total, 10);
+                                // set percentage property on file
+                                file.uploadProgress = progressPercentage;
+                                // set uploading status on file
+                                file.uploadStatus = "uploading";
+                            })
+                            .success(function(data, status, headers, config) {
+                                if (data.notifications && data.notifications.length > 0) {
+                                    // set error status on file
+                                    file.uploadStatus = "error";
+                                    // Throw message back to user with the cause of the error
+                                    file.serverErrorMessage = data.notifications[0].message;
+                                    // Put the file in the rejected pool
+                                    scope.rejected.push(file);
+                                } else {
+                                    // set done status on file
+                                    file.uploadStatus = "done";
+                                    // set date/time for when done - used for sorting
+                                    file.doneDate = new Date();
+                                    // Put the file in the done pool
+                                    scope.done.push(file);
+                                }
+                                scope.currentFile = undefined;
+                                //after processing, test if everthing is done
+                                _processQueueItem();
+                            })
+                            .error(function(evt, status, headers, config) {
+                                // set status done
+                                file.uploadStatus = "error";
+                                //if the service returns a detailed error
+                                if (evt.InnerException) {
+                                    file.serverErrorMessage = evt.InnerException.ExceptionMessage;
+                                    //Check if its the common "too large file" exception
+                                    if (evt.InnerException.StackTrace &&
+                                        evt.InnerException.StackTrace.indexOf("ValidateRequestEntityLength") > 0) {
+                                        file.serverErrorMessage = "File too large to upload";
+                                    }
+                                } else if (evt.Message) {
+                                    file.serverErrorMessage = evt.Message;
+                                }
+                                // If file not found, server will return a 404 and display this message
+                                if (status === 404) {
+                                    file.serverErrorMessage = "File not found";
+                                }
+                                //after processing, test if everthing is done
+                                scope.rejected.push(file);
+                                scope.currentFile = undefined;
+                                _processQueueItem();
+                            });
+                    }

-					if(_filterFile(file) === true) {
+                    function _chooseMediaType() {
+                        scope.mediatypepickerOverlay = {
+                            view: "mediatypepicker",
+                            title: "Choose media type",
+                            acceptedMediatypes: scope.acceptedMediatypes,
+                            hideSubmitButton: true,
+                            show: true,
+                            submit: function(model) {
+                                scope.contentTypeAlias = model.selectedType.alias;
+                                scope.mediatypepickerOverlay.show = false;
+                                scope.mediatypepickerOverlay = null;
+                                _processQueueItem();
+                            },
+                            close: function(oldModel) {

-						if(file.$error) {
-							scope.rejected.push(file);
-						} else {
-							scope.queue.push(file);
-						}
+                                scope.queue.map(function(file) {
+                                    file.uploadStatus = "error";
+                                    file.serverErrorMessage = "Cannot upload this file, no mediatype selected";
+                                    scope.rejected.push(file);
+                                });
+                                scope.queue = [];
+                                scope.mediatypepickerOverlay.show = false;
+                                scope.mediatypepickerOverlay = null;
+                            }
+                        };
+                    }

-					}
-
-				});
-
-				//when queue is done, kick the uploader
-				if(!scope.working){
-					_processQueueItem();
-				}
-			}
-
-
-			function _processQueueItem(){
-
-				if(scope.queue.length > 0){
-					scope.currentFile = scope.queue.shift();
-					_upload(scope.currentFile);
-				}else if(scope.done.length > 0){
-
-					if(scope.filesUploaded){
-						//queue is empty, trigger the done action
-						scope.filesUploaded(scope.done);
-					}
-
-					//auto-clear the done queue after 3 secs
-					var currentLength = scope.done.length;
-					$timeout(function(){
-						scope.done.splice(0, currentLength);
-					}, 3000);
-				}
-			}
-
-			function _upload(file) {
-
-				scope.propertyAlias = scope.propertyAlias ? scope.propertyAlias : "umbracoFile";
-				scope.contentTypeAlias = scope.contentTypeAlias ? scope.contentTypeAlias : "Image";
-
-				Upload.upload({
-					url: umbRequestHelper.getApiUrl("mediaApiBaseUrl", "PostAddFile"),
-					fields: {
-						'currentFolder': scope.parentId,
-						'contentTypeAlias': scope.contentTypeAlias,
-						'propertyAlias': scope.propertyAlias,
-						'path': file.path
-					},
-					file: file
-				}).progress(function (evt) {
-
-					// calculate progress in percentage
-					var progressPercentage = parseInt(100.0 * evt.loaded / evt.total, 10);
-
-					// set percentage property on file
-					file.uploadProgress = progressPercentage;
-
-					// set uploading status on file
-					file.uploadStatus = "uploading";
-
-				}).success(function (data, status, headers, config) {
-
-					if(data.notifications && data.notifications.length > 0) {
-
-						// set error status on file
-						file.uploadStatus = "error";
-
-						// Throw message back to user with the cause of the error
-						file.serverErrorMessage = data.notifications[0].message;
-
-						// Put the file in the rejected pool
-						scope.rejected.push(file);
-
-					} else {
-
-						// set done status on file
-						file.uploadStatus = "done";
-
-						// set date/time for when done - used for sorting
-						file.doneDate = new Date();
-
-						// Put the file in the done pool
-						scope.done.push(file);
-
-					}
-
-					scope.currentFile = undefined;
-
-					//after processing, test if everthing is done
-					_processQueueItem();
-
-				}).error( function (evt, status, headers, config) {
-
-					// set status done
-					file.uploadStatus = "error";
-
-					//if the service returns a detailed error
-					if (evt.InnerException) {
-					    file.serverErrorMessage = evt.InnerException.ExceptionMessage;
-
-					    //Check if its the common "too large file" exception
-					    if (evt.InnerException.StackTrace && evt.InnerException.StackTrace.indexOf("ValidateRequestEntityLength") > 0) {
-					        file.serverErrorMessage = "File too large to upload";
-					    }
-
-					} else if (evt.Message) {
-					    file.serverErrorMessage = evt.Message;
-					}
-
-					// If file not found, server will return a 404 and display this message
-					if(status === 404 ) {
-						file.serverErrorMessage = "File not found";
-					}
-
-					//after processing, test if everthing is done
-					scope.rejected.push(file);
-					scope.currentFile = undefined;
-
-					_processQueueItem();
-				});
-			}
-
-
-			scope.handleFiles = function(files, event){
-				if(scope.filesQueued){
-					scope.filesQueued(files, event);
-				}
-
-				_filesQueued(files, event);
-
-			};
-
-			}
-
-
-		};
-	});
+                    scope.handleFiles = function(files, event) {
+                        if (scope.filesQueued) {
+                            scope.filesQueued(files, event);
+                        }
+                        _filesQueued(files, event);
+                    };
+                }
+            };
+        });

 /**
 * @ngdoc directive
@@ -4880,6 +4880,65 @@ function mediaHelper(umbRequestHelper) {
    };
 }angular.module('umbraco.services').factory('mediaHelper', mediaHelper);

+/**
+ * @ngdoc service
+ * @name umbraco.services.mediaTypeHelper
+ * @description A helper service for the media types
+ **/
+function mediaTypeHelper(mediaTypeResource, $q) {
+
+    var mediaTypeHelperService = {
+
+        getAllowedImagetypes: function (mediaId){
+				
+            // Get All allowedTypes
+            return mediaTypeResource.getAllowedTypes(mediaId)
+                .then(function(types){
+                    
+                    var allowedQ = types.map(function(type){
+                        return mediaTypeResource.getById(type.id);
+                    });
+
+                    // Get full list
+                    return $q.all(allowedQ).then(function(fullTypes){
+
+                        // Find all the media types with an Image Cropper property editor
+                        var filteredTypes = mediaTypeHelperService.getTypeWithEditor(fullTypes, ['Umbraco.ImageCropper']);
+
+                        // If there is only one media type with an Image Cropper we will return this one
+                        if(filteredTypes.length === 1) {
+                            return filteredTypes;
+                        // If there is more than one Image cropper, custom media types have been added, and we return all media types with and Image cropper or UploadField
+                        } else {
+                            return mediaTypeHelperService.getTypeWithEditor(fullTypes, ['Umbraco.ImageCropper', 'Umbraco.UploadField']);
+                        }
+
+                    });
+            });
+		},
+
+        getTypeWithEditor: function (types, editors) {
+
+            return types.filter(function (mediatype) {
+                for (var i = 0; i < mediatype.groups.length; i++) {
+                    var group = mediatype.groups[i];
+                    for (var j = 0; j < group.properties.length; j++) {
+                        var property = group.properties[j];
+                        if( editors.indexOf(property.editor) !== -1 ) {
+                            return mediatype;
+                        }
+                    }
+                }
+            });
+
+        }
+
+    };
+
+    return mediaTypeHelperService;
+}
+angular.module('umbraco.services').factory('mediaTypeHelper', mediaTypeHelper);
+
 /**
 * @ngdoc service
 * @name umbraco.services.umbracoMenuActions
@@ -116,8 +116,10 @@
  

        <div class="umb-panel-body with-footer">
-            
+                       
            <umb-file-dropzone 
+                ng-if="acceptedMediatypes.length > 0"
+                accepted-mediatypes="acceptedMediatypes"
                hide-dropzone="{{!activeDrag && images.length > 0}}" 
                parent-id="{{currentFolder.id}}"
                files-uploaded="onUploadComplete"
@@ -18,18 +18,9 @@
    </umb-control-group>

    <umb-control-group label="@content_target">
-        <select class="umb-editor umb-dropdown" ng-model="model.target.target">
-            <option value=""></option>
-            <option value="_blank">
-                <localize key="defaultdialogs_openInNewWindow">Opens the linked document in a new window or tab</localize>
-            </option>
-            <option value="_top">
-                <localize key="defaultdialogs_openInFullBody">Opens the linked document in the full body of the window</localize>
-            </option>
-            <option value="_parent">
-                <localize key="defaultdialogs_openInParentFrame">Opens the linked document in the parent frame</localize>
-            </option>
-        </select>
+        <label class="checkbox no-indent">
+            <input type="checkbox" ng-model="model.target.target" ng-true-value="_blank" ng-false-value="" /> <localize key="defaultdialogs_openInNewWindow">Opens the linked document in a new window or tab</localize>
+        </label>
    </umb-control-group>

    <div class="umb-control-group">
@@ -63,6 +63,8 @@
      </div>

      <umb-file-dropzone
+         ng-if="acceptedMediatypes.length > 0"
+         accepted-mediatypes="acceptedMediatypes"
         parent-id="{{currentFolder.id}}"
         files-uploaded="onUploadComplete"
         files-queued="onFilesQueue"
@@ -0,0 +1,15 @@
+<div ng-controller="Umbraco.Overlays.MediaTypePickerController">
+
+  	<ul class="umb-card-grid">
+      <li
+	  	ng-repeat="mediatype in model.acceptedMediatypes | orderBy:'name'"
+        ng-click="select(mediatype)"
+        class="-three-in-row">
+        <a class="umb-card-grid-item" href="" title="{{mediatype.name}}">
+            <i class="{{ mediatype.icon }}"></i>
+            {{ mediatype.name }}
+        </a>
+      </li>
+    </ul>
+
+</div>
@@ -98,4 +98,11 @@

 </ng-form>

+<umb-overlay
+		ng-if="mediatypepickerOverlay.show"
+		model="mediatypepickerOverlay"
+        view="mediatypepickerOverlay.view"
+		position="right">        
+</umb-overlay>
+
 </div>
@@ -51,13 +51,14 @@
                </div>

                <umb-pane>
-                    <umb-control-group label="Relate to original">
-                        <input type="checkbox" ng-model="$parent.$parent.relateToOriginal" />
+                    <umb-control-group  localize="label" label="@defaultdialogs_relateToOriginalLabel">
+                        <input type="checkbox" ng-model="$parent.$parent.relateToOriginal"/>
                    </umb-control-group>
+               
                </umb-pane>

                <umb-pane>
-                    <umb-control-group label="Include descendants">
+                    <umb-control-group localize="label" label="@defaultdialogs_includeDescendants"> 
                        <input type="checkbox" ng-model="$parent.$parent.recursive" />
                    </umb-control-group>
                </umb-pane>
@@ -3,9 +3,11 @@
        <div class="umb-pane">

            <p class="abstract" ng-hide="success">
-                Choose where to move <strong>{{currentNode.name}}</strong>&nbsp;to in the tree structure below
+                <localize key="actions_chooseWhereToMove">Choose where to move</localize>
+                <strong>{{currentNode.name}}</strong>
+                <localize key="actions_toInTheTreeStructureBelow">to in the tree structure below</localize>                
            </p>
-            
+
            <div class="umb-loader-wrapper" ng-show="busy">
                <div class="umb-loader"></div>
            </div>
@@ -54,12 +54,12 @@

        <div class="row">
            <div class="span4">
-                <a href="http://umbraco.tv/?utm_source=core&utm_medium=dashboard&utm_content=image&utm_campaign=tv" target="_blank" class="nounderline">
+                <a href="https://umbraco.tv/?utm_source=core&utm_medium=dashboard&utm_content=image&utm_campaign=tv" target="_blank" class="nounderline">
                    <img src="views/dashboard/default/umbracotv.png" alt="Umbraco.TV - Hours of Umbraco Video Tutorials" style="margin: 10px 0 10px 0" />
                </a>


-                <a href="http://umbraco.tv/?utm_source=core&utm_medium=dashboard&utm_content=header&utm_campaign=tv" target="_blank" class="btn-link -underline">
+                <a href="https://umbraco.tv/?utm_source=core&utm_medium=dashboard&utm_content=header&utm_campaign=tv" target="_blank" class="btn-link -underline">
                    <h4> <strong>Umbraco.TV - Learn from the source!</strong> </h4>
                </a>

@@ -73,11 +73,11 @@

            <div class="span4 offset1">

-                <a href="http://our.umbraco.org/?utm_source=core&utm_medium=dashboard&utm_content=image&utm_campaign=our" target="_blank" class="nounderline">
+                <a href="https://our.umbraco.org/?utm_source=core&utm_medium=dashboard&utm_content=image&utm_campaign=our" target="_blank" class="nounderline">
                    <img src="views/dashboard/default/ourumbraco.png" alt="Our Umbraco" style="margin: 10px 0 10px 0" />
                </a>

-                <a href="http://our.umbraco.org/?utm_source=core&utm_medium=dashboard&utm_content=header&utm_campaign=our" target="_blank" class="btn-link -underline">
+                <a href="https://our.umbraco.org/?utm_source=core&utm_medium=dashboard&utm_content=header&utm_campaign=our" target="_blank" class="btn-link -underline">
                    <h4><strong>Our Umbraco - The Friendliest Community</strong></h4>
                </a>

@@ -3,8 +3,10 @@
 	<div class="umb-pane">

 		<p class="abstract" ng-hide="success">
-			Choose where to move <strong>{{currentNode.name}}</strong> to in the tree structure below
-		</p>
+            <localize key="actions_chooseWhereToMove">Choose where to move</localize>
+            <strong>{{currentNode.name}}</strong>
+            <localize key="actions_toInTheTreeStructureBelow">to in the tree structure below</localize>
+        </p>

 		<div class="alert alert-error" ng-show="error" ng-cloak>
 			<h4>{{error.errorMsg}}</h4>
@@ -37,10 +37,8 @@
                            - <localize key="media_orClickHereToUpload">or click here to choose files</localize>
                        </div>
                        
-                        <div class="umb-info-local-item text-error" ng-if="vm.zipFile.uploadStatus === 'error'">
-                            {{vm.zipFile.serverErrorMessage}}
-                        </div>
                    </div>
+                    
                </div>


@@ -53,6 +51,41 @@
        </div>
    </div>

+    <div ng-if="vm.state === 'uploading'">
+
+        <umb-editor-sub-header>
+            <umb-editor-sub-header-content-left>
+                <a class="umb-package-details__back-link" href="" ng-click="vm.state = 'upload'">&larr; Upload another package</a>
+            </umb-editor-sub-header-content-left>
+        </umb-editor-sub-header>
+
+        <div class="umb-packages-view-wrapper">
+
+            <div class="flex items-center justify-center">
+                <div class="umb-info-local-items">
+                    <div class="umb-package-icon">
+                        <i ng-if="!vm.localPackage.iconUrl" class="icon-box"></i>
+                    </div>
+                    <div class="umb-package-info">
+
+                        <h4 class="umb-info-local-item"><strong>Uploading package</strong></h4>
+
+                        <umb-progress-bar
+                            percentage="{{vm.zipFile.uploadProgress}}">
+                        </umb-progress-bar>
+
+                        <div class="umb-info-local-item text-error mt3" ng-if="vm.zipFile.uploadStatus === 'error'">
+                            {{ vm.zipFile.serverErrorMessage }}
+                        </div>
+                        
+                    </div>
+                </div>
+            </div>
+
+        </div>
+
+    </div>
+
    <div ng-if="vm.state === 'packageDetails'">

        <umb-editor-sub-header>
@@ -126,6 +159,19 @@
                                <p>{{vm.installState.status}}</p>
                            </div>

+
+
+                            <div class="umb-info-local-item text-info"
+                                 ng-show="vm.installCompleted">
+                              
+                                <button type="button"
+                                       
+                                        class="btn btn-success flex-inline mt3"
+                                        ng-click="vm.reloadPage()">
+                                    Finish
+                                </button>
+                            </div>
+
                        </div>
                    </form>

@@ -340,6 +340,16 @@
                                <p>{{vm.installState.status}}</p>
                            </div>

+                            <div class="umb-info-local-item text-info"
+                                 ng-show="vm.installCompleted">
+
+                                <button type="button"
+                                        class="btn btn-success flex-inline mt3"
+                                        ng-click="vm.reloadPage()">
+                                    Finish
+                                </button>
+                            </div>
+
                        </div>
                    </form>

@@ -39,7 +39,8 @@
   on-drag-enter="vm.dragEnter()">

      <umb-file-dropzone
-         ng-if="!vm.isRecycleBin"
+         ng-if="!vm.isRecycleBin && vm.acceptedMediatypes.length > 0"
+         accepted-mediatypes="vm.acceptedMediatypes"
         parent-id="{{vm.nodeId}}"
         files-uploaded="vm.onUploadComplete"
         accept="{{vm.acceptedFileTypes}}"
@@ -9,7 +9,8 @@
        on-drag-enter="vm.dragEnter()">

        <umb-file-dropzone
-           ng-if="!vm.isRecycleBin"
+           ng-if="!vm.isRecycleBin && vm.acceptedMediatypes.length > 0"
+           accepted-mediatypes="vm.acceptedMediatypes"
           parent-id="{{vm.nodeId}}"
           files-uploaded="vm.onUploadComplete"
           accept="{{vm.acceptedFileTypes}}"
@@ -11,7 +11,7 @@
 			<img ng-if="image.extension === 'svg'" ng-src="{{image.file}}" alt="" />

 			<!-- FILE -->
-			<span class="icon-holder" ng-hide="image.thumbnail || image.metaData.umbracoExtension.Value === 'svg' || image.extension === 'svg'">
+			<span class="umb-icon-holder" ng-hide="image.thumbnail || image.metaData.umbracoExtension.Value === 'svg' || image.extension === 'svg'">
 				<i class="icon {{image.icon}} large"></i>
 				<small>{{image.name}}</small>
 			</span>
@@ -69,6 +69,22 @@
        };
    }

+    if (!String.prototype.htmlEncode) {
+        /** htmlEncode extension method for string */
+        String.prototype.htmlEncode = function () {
+            //create a in-memory div, set it's inner text(which jQuery automatically encodes)
+            //then grab the encoded contents back out.  The div never exists on the page.
+            return $('<div/>').text(this).html();
+        };
+    }
+
+    if (!String.prototype.htmlDecode) {
+        /** htmlDecode extension method for string */
+        String.prototype.htmlDecode = function () {
+            return $('<div/>').html(this).text();
+        };
+    }
+
    if (!String.prototype.startsWith) {
        /** startsWith extension method for string */
        String.prototype.startsWith = function (str) {            
@@ -281,7 +281,7 @@ Umbraco.Application.Actions = function() {
        actionRePublish: function() {
            /// <summary></summary>

-            UmbClientMgr.openModalWindow('dialogs/republish.aspx?rnd=' + this._utils.generateRandom(), 'Republishing entire site', true, 450, 210);
+            UmbClientMgr.openModalWindow('dialogs/republish.aspx?rnd=' + this._utils.generateRandom(), uiKeys['actions_republish'], true, 450, 210);
        },

        actionAssignDomain: function() {
@@ -0,0 +1,92 @@
+@inherits UmbracoViewPage<dynamic>
+@using Umbraco.Web.Templates
+@using Newtonsoft.Json.Linq
+
+@* 
+    Razor helpers located at the bottom of this file
+*@
+
+@if (Model != null && Model.sections != null)
+{
+    var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1;
+    
+    <div class="umb-grid">
+        @if (oneColumn)
+        {
+            foreach (var section in Model.sections) {
+                <div class="grid-section">
+                    @foreach (var row in section.rows) {
+                        @renderRow(row, true);
+                    }
+                </div>
+            }   
+        }else { 
+            <div class="container-fluid">
+                <div class="row-fluid clearfix">
+                    @foreach (var s in Model.sections) {
+                        <div class="grid-section">
+                            <div class="@("span" + s.grid) column">
+                                @foreach (var row in s.rows) {
+                                    @renderRow(row, false);
+                                }
+                            </div>
+                        </div>
+                    }
+                </div>
+            </div>   
+        }
+    </div>
+}
+
+@helper renderRow(dynamic row, bool singleColumn){
+    <div @RenderElementAttributes(row)>
+        @Umbraco.If(singleColumn, "<div class='container-fluid'>")
+        <div class="row-fluid clearfix">
+            @foreach ( var area in row.areas ) {
+            <div class="@("span" + area.grid) column">
+                <div @RenderElementAttributes(area)>
+                    @foreach (var control in area.controls) {
+                        if (control !=null && control.editor != null && control.editor.view != null ) {
+                            <text>@Html.Partial("grid/editors/base", (object)control)</text>
+                        }
+                    }
+                </div>
+            </div>}
+        </div>
+        @Umbraco.If(singleColumn, "</div>")
+    </div>
+}
+
+@functions {
+    public static MvcHtmlString RenderElementAttributes(dynamic contentItem)
+    {
+        var attrs = new List<string>();
+        JObject cfg = contentItem.config;
+
+        if(cfg != null)
+            foreach (JProperty property in cfg.Properties())
+            {
+                var propertyValue = TemplateUtilities.CleanForXss(property.Value.ToString());
+                attrs.Add(property.Name + "=\"" + propertyValue + "\"");
+            }
+
+        JObject style = contentItem.styles;
+
+        if (style != null) {
+            var cssVals = new List<string>();
+            foreach (JProperty property in style.Properties())
+            {
+                var propertyValue = TemplateUtilities.CleanForXss(property.Value.ToString());
+                if (string.IsNullOrWhiteSpace(propertyValue) == false)
+                {
+                    cssVals.Add(property.Name + ":" + propertyValue + ";");
+                }
+            }
+
+            if (cssVals.Any())
+                attrs.Add("style='" + string.Join(" ", cssVals) + "'");
+        }
+
+        return new MvcHtmlString(string.Join(" ", attrs));
+    }
+}
@@ -2,6 +2,10 @@
@using Umbraco.Web.Templates
@using Newtonsoft.Json.Linq

+@* 
+    Razor helpers located at the bottom of this file
+*@
+
@if (Model != null && Model.sections != null)
 {
    var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1;
@@ -60,21 +64,29 @@
        JObject cfg = contentItem.config;

        if(cfg != null)
-            foreach (JProperty property in cfg.Properties()) {
-                attrs.Add(property.Name + "='" + property.Value.ToString() + "'");
+            foreach (JProperty property in cfg.Properties())
+            {
+                var propertyValue = TemplateUtilities.CleanForXss(property.Value.ToString());
+                attrs.Add(property.Name + "=\"" + propertyValue + "\"");
            }
-                
+
        JObject style = contentItem.styles;

-        if (style != null) { 
-        var cssVals = new List<string>();
-        foreach (JProperty property in style.Properties())
-            cssVals.Add(property.Name + ":" + property.Value.ToString() + ";");
+        if (style != null) {
+            var cssVals = new List<string>();
+            foreach (JProperty property in style.Properties())
+            {
+                var propertyValue = TemplateUtilities.CleanForXss(property.Value.ToString());
+                if (string.IsNullOrWhiteSpace(propertyValue) == false)
+                {
+                    cssVals.Add(property.Name + ":" + propertyValue + ";");
+                }
+            }

-        if (cssVals.Any())
-            attrs.Add("style='" + string.Join(" ", cssVals) + "'");
+            if (cssVals.Any())
+                attrs.Add("style=\"" + string.Join(" ", cssVals) + "\"");
        }
-            
+
        return new MvcHtmlString(string.Join(" ", attrs));
    }
 }
@@ -0,0 +1,88 @@
+@inherits UmbracoViewPage<dynamic>
+@using Umbraco.Web.Templates
+@using Newtonsoft.Json.Linq
+
+@* 
+    Razor helpers located at the bottom of this file
+*@
+
+@if (Model != null && Model.sections != null)
+{
+    var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1;
+    
+    <div class="umb-grid">
+        @if (oneColumn)
+        {
+            foreach (var section in Model.sections) {
+                <div class="grid-section">
+                    @foreach (var row in section.rows) {
+                        @renderRow(row);
+                    }
+                </div>
+            }   
+        }else { 
+            <div class="row clearfix">
+                @foreach (var s in Model.sections) {
+                    <div class="grid-section">
+                        <div class="col-md-@s.grid column">
+                            @foreach (var row in s.rows) {
+                                @renderRow(row);
+                            }
+                        </div>
+                    </div>
+                }
+            </div>
+        }
+    </div>
+}
+
+@helper renderRow(dynamic row){
+    <div @RenderElementAttributes(row)>
+        <div class="row clearfix">
+            @foreach ( var area in row.areas ) {
+            <div class="col-md-@area.grid column">
+                <div @RenderElementAttributes(area)>
+                    @foreach (var control in area.controls) {
+                        if (control !=null && control.editor != null && control.editor.view != null ) {
+                            <text>@Html.Partial("grid/editors/base", (object)control)</text>
+                        }
+                    }
+                </div>
+            </div>}
+        </div>
+    </div>
+}
+
+@functions {
+    public static MvcHtmlString RenderElementAttributes(dynamic contentItem)
+    {
+        var attrs = new List<string>();
+        JObject cfg = contentItem.config;
+
+        if(cfg != null)
+            foreach (JProperty property in cfg.Properties())
+            {
+                var propertyValue = TemplateUtilities.CleanForXss(property.Value.ToString());
+                attrs.Add(property.Name + "=\"" + propertyValue + "\"");
+            }
+
+        JObject style = contentItem.styles;
+
+        if (style != null) {
+            var cssVals = new List<string>();
+            foreach (JProperty property in style.Properties())
+            {
+                var propertyValue = TemplateUtilities.CleanForXss(property.Value.ToString());
+                if (string.IsNullOrWhiteSpace(propertyValue) == false)
+                {
+                    cssVals.Add(property.Name + ":" + propertyValue + ";");
+                }
+            }
+
+            if (cssVals.Any())
+                attrs.Add("style='" + string.Join(" ", cssVals) + "'");
+        }
+
+        return new MvcHtmlString(string.Join(" ", attrs));
+    }
+}
@@ -2,6 +2,10 @@
@using Umbraco.Web.Templates
@using Newtonsoft.Json.Linq

+@* 
+    Razor helpers located at the bottom of this file
+*@
+
@if (Model != null && Model.sections != null)
 {
    var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1;
@@ -60,21 +64,29 @@
        JObject cfg = contentItem.config;

        if(cfg != null)
-            foreach (JProperty property in cfg.Properties()) {
-                attrs.Add(property.Name + "='" + property.Value.ToString() + "'");
+            foreach (JProperty property in cfg.Properties())
+            {
+                var propertyValue = TemplateUtilities.CleanForXss(property.Value.ToString());
+                attrs.Add(property.Name + "=\"" + propertyValue + "\"");
            }
-                
+
        JObject style = contentItem.styles;

-        if (style != null) { 
-        var cssVals = new List<string>();
-        foreach (JProperty property in style.Properties())
-            cssVals.Add(property.Name + ":" + property.Value.ToString() + ";");
+        if (style != null) {
+            var cssVals = new List<string>();
+            foreach (JProperty property in style.Properties())
+            {
+                var propertyValue = TemplateUtilities.CleanForXss(property.Value.ToString());
+                if (string.IsNullOrWhiteSpace(propertyValue) == false)
+                {
+                    cssVals.Add(property.Name + ":" + propertyValue + ";");
+                }
+            }

-        if (cssVals.Any())
-            attrs.Add("style='" + string.Join(" ", cssVals) + "'");
+            if (cssVals.Any())
+                attrs.Add("style=\"" + string.Join(" ", cssVals) + "\"");
        }
-            
+
        return new MvcHtmlString(string.Join(" ", attrs));
    }
 }
@@ -1,5 +1,4 @@
@model dynamic
-@using Umbraco.Web.Templates

@functions {
    public static string EditorView(dynamic contentItem)
@@ -1,7 +1,2 @@
@model dynamic
-@using Umbraco.Web.Templates
-
-
-<div class="video-wrapper">
-	@Html.Raw(Model.value)
-</div>
+@Html.Raw(Model.value)
@@ -1,6 +1,4 @@
@inherits UmbracoViewPage<dynamic>
-@using Umbraco.Web.Templates
-

@if (Model.value != null)
 {
@@ -1,5 +1,4 @@
@model dynamic
-@using Umbraco.Web.Templates

@if (Model.value != null)
 {   
@@ -14,7 +13,7 @@
        }
    }
    
-    <img src="@url" alt="@Model.value.caption">
+    <img src="@url" alt="@Model.value.altText">
    
    if (Model.value.caption != null)
    {
@@ -4,8 +4,9 @@
@if (Model.editor.config.markup != null)
 {
    string markup = Model.editor.config.markup.ToString();
-
-    markup = markup.Replace("#value#", Model.value.ToString());
+    var UmbracoHelper = new UmbracoHelper(UmbracoContext.Current);
+    
+    markup = markup.Replace("#value#", UmbracoHelper.ReplaceLineBreaksForHtml(TemplateUtilities.CleanForXss(Model.value.ToString())));
    markup = markup.Replace("#style#", Model.editor.config.style.ToString());

    <text>
@@ -39,7 +39,7 @@
      Umbraco web.config configuration documentation can be found here:
      http://our.umbraco.org/documentation/using-umbraco/config-files/#webconfig
      -->
-    <add key="umbracoConfigurationStatus" value="7.5.4" />
+    <add key="umbracoConfigurationStatus" value="7.5.6" />
    <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
    <add key="umbracoReservedPaths" value="~/umbraco,~/install/,~/hangfire/,~/hangfire,~/backload/,~/backload" />
    <add key="umbracoPath" value="~/umbraco" />
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\UmbracoCms.7.5.4\build\UmbracoCms.props" Condition="Exists('..\packages\UmbracoCms.7.5.4\build\UmbracoCms.props')" />
+  <Import Project="..\packages\UmbracoCms.7.5.6\build\UmbracoCms.props" Condition="Exists('..\packages\UmbracoCms.7.5.6\build\UmbracoCms.props')" />
  <Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
  <Import Project="..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -64,24 +64,24 @@
      <HintPath>..\packages\Backload.Core.2.2.2.5\lib\net45\Backload.Contracts.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="businesslogic, Version=1.0.6136.27244, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.5.4\lib\businesslogic.dll</HintPath>
+    <Reference Include="businesslogic, Version=1.0.6185.24085, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Core.7.5.6\lib\businesslogic.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="ClientDependency.Core, Version=1.9.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.1\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.2\lib\net45\ClientDependency.Core.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="ClientDependency.Core.Mvc, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="cms, Version=1.0.6136.27244, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.5.4\lib\cms.dll</HintPath>
+    <Reference Include="cms, Version=1.0.6185.24086, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Core.7.5.6\lib\cms.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="controls, Version=1.0.6136.27246, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.5.4\lib\controls.dll</HintPath>
+    <Reference Include="controls, Version=1.0.6185.24087, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Core.7.5.6\lib\controls.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="CookComputing.XmlRpcV2, Version=2.5.0.0, Culture=neutral, PublicKeyToken=a7d6e17aa302004d, processorArchitecture=MSIL">
@@ -124,12 +124,12 @@
      <HintPath>..\packages\ImageProcessor.Web.4.6.6.0\lib\net45\ImageProcessor.Web.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="interfaces, Version=1.0.6136.27240, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.5.4\lib\interfaces.dll</HintPath>
+    <Reference Include="interfaces, Version=1.0.6185.24081, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Core.7.5.6\lib\interfaces.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.5.4\lib\log4net.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.7.5.6\lib\log4net.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="Lucene.Net, Version=2.9.4.1, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
@@ -141,7 +141,7 @@
      <Private>True</Private>
    </Reference>
    <Reference Include="Microsoft.ApplicationBlocks.Data, Version=1.0.1559.20655, Culture=neutral">
-      <HintPath>..\packages\UmbracoCms.Core.7.5.4\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.7.5.6\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -225,8 +225,8 @@
      <HintPath>..\packages\semver.1.1.2\lib\net451\Semver.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="SQLCE4Umbraco, Version=1.0.6136.27245, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.5.4\lib\SQLCE4Umbraco.dll</HintPath>
+    <Reference Include="SQLCE4Umbraco, Version=1.0.6185.24087, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Core.7.5.6\lib\SQLCE4Umbraco.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="System.Collections.Immutable, Version=1.1.36.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -234,11 +234,11 @@
      <Private>True</Private>
    </Reference>
    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.5.4\lib\System.Data.SqlServerCe.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.7.5.6\lib\System.Data.SqlServerCe.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.5.4\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.7.5.6\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="System.Net" />
@@ -305,43 +305,43 @@
    <Reference Include="System.Web.Services" />
    <Reference Include="System.EnterpriseServices" />
    <Reference Include="TidyNet, Version=1.0.0.0, Culture=neutral">
-      <HintPath>..\packages\UmbracoCms.Core.7.5.4\lib\TidyNet.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.7.5.6\lib\TidyNet.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="umbraco, Version=1.0.6136.27248, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.5.4\lib\umbraco.dll</HintPath>
+    <Reference Include="umbraco, Version=1.0.6185.24089, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Core.7.5.6\lib\umbraco.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="Umbraco.Core, Version=1.0.6136.27241, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.5.4\lib\Umbraco.Core.dll</HintPath>
+    <Reference Include="Umbraco.Core, Version=1.0.6185.24083, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Core.7.5.6\lib\Umbraco.Core.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="umbraco.DataLayer, Version=1.0.6136.27243, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.5.4\lib\umbraco.DataLayer.dll</HintPath>
+    <Reference Include="umbraco.DataLayer, Version=1.0.6185.24085, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Core.7.5.6\lib\umbraco.DataLayer.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="umbraco.editorControls, Version=1.0.6136.27251, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.5.4\lib\umbraco.editorControls.dll</HintPath>
+    <Reference Include="umbraco.editorControls, Version=1.0.6185.24091, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Core.7.5.6\lib\umbraco.editorControls.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="umbraco.MacroEngines, Version=1.0.6136.27252, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.5.4\lib\umbraco.MacroEngines.dll</HintPath>
+    <Reference Include="umbraco.MacroEngines, Version=1.0.6185.24092, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Core.7.5.6\lib\umbraco.MacroEngines.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="Umbraco.ModelsBuilder, Version=3.0.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Umbraco.ModelsBuilder.3.0.4\lib\Umbraco.ModelsBuilder.dll</HintPath>
+    <Reference Include="Umbraco.ModelsBuilder, Version=3.0.5.96, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Umbraco.ModelsBuilder.3.0.5\lib\Umbraco.ModelsBuilder.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="umbraco.providers, Version=1.0.6136.27246, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.5.4\lib\umbraco.providers.dll</HintPath>
+    <Reference Include="umbraco.providers, Version=1.0.6185.24088, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Core.7.5.6\lib\umbraco.providers.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="Umbraco.Web.UI, Version=1.0.6136.27253, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.5.4\lib\Umbraco.Web.UI.dll</HintPath>
+    <Reference Include="Umbraco.Web.UI, Version=1.0.6185.24092, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Core.7.5.6\lib\Umbraco.Web.UI.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="UmbracoExamine, Version=0.7.0.27245, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.5.4\lib\UmbracoExamine.dll</HintPath>
+    <Reference Include="UmbracoExamine, Version=0.7.0.24086, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Core.7.5.6\lib\UmbracoExamine.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL">
@@ -354,6 +354,9 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
+    <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.controller.js" />
+    <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.htm" />
+    <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.resource.js" />
    <Content Include="Backload\Client\blueimp\blob\js\canvas-to-blob.js" />
    <Content Include="Backload\Client\blueimp\blob\js\canvas-to-blob.min.js" />
    <Content Include="Backload\Client\blueimp\blob\package.json" />
@@ -601,7 +604,26 @@
    <Content Include="Backload\Imaging\readme.txt" />
    <Content Include="Backload\License.txt" />
    <Content Include="Backload\Release.txt" />
+    <Content Include="App_Plugins\ModelsBuilder\package.manifest" />
    <None Include="compilerconfig.json" />
+    <Content Include="Config\Lang\cs-CZ.user.xml" />
+    <Content Include="Config\Lang\da-DK.user.xml" />
+    <Content Include="Config\Lang\de-DE.user.xml" />
+    <Content Include="Config\Lang\en-GB.user.xml" />
+    <Content Include="Config\Lang\en-US.user.xml" />
+    <Content Include="Config\Lang\es-ES.user.xml" />
+    <Content Include="Config\Lang\fr-FR.user.xml" />
+    <Content Include="Config\Lang\he-IL.user.xml" />
+    <Content Include="Config\Lang\it-IT.user.xml" />
+    <Content Include="Config\Lang\ja-JP.user.xml" />
+    <Content Include="Config\Lang\ko-KR.user.xml" />
+    <Content Include="Config\Lang\nb-NO.user.xml" />
+    <Content Include="Config\Lang\nl-NL.user.xml" />
+    <Content Include="Config\Lang\pl-PL.user.xml" />
+    <Content Include="Config\Lang\pt-BR.user.xml" />
+    <Content Include="Config\Lang\ru-RU.user.xml" />
+    <Content Include="Config\Lang\sv-SE.user.xml" />
+    <Content Include="Config\Lang\zh-CN.user.xml" />
    <Content Include="Content\bootstrap_leafweb.css">
      <DependentUpon>bootstrap_leafweb.scss</DependentUpon>
    </Content>
@@ -616,7 +638,9 @@
      <DependentUpon>style.css</DependentUpon>
    </Content>
    <Content Include="css\rte.css" />
+    <Content Include="default.aspx" />
    <Content Include="fonts\glyphicons-halflings-regular.svg" />
+    <Content Include="Global.asax" />
    <Content Include="Media\1042\leafweb-logo-grad.png" />
    <Content Include="Media\1052\autumn-leaf-litter-free-stock-photo-public-domain-pictures.jpg" />
    <Content Include="Media\1052\autumn-leaf-litter-free-stock-photo-public-domain-pictures_big-thumb.jpg" />
@@ -641,7 +665,6 @@
    <Content Include="Media\1059\leafweb-logo-grad-large-nobkgnd_thumb.jpg" />
    <Content Include="Media\1059\leafweb-logo-grad-large-nobkgnd_thumb.png" />
    <Content Include="packages.config" />
-    <Content Include="App_Plugins\ModelsBuilder\package.manifest" />
    <Content Include="fonts\glyphicons-halflings-regular.woff2" />
    <Content Include="fonts\glyphicons-halflings-regular.woff" />
    <Content Include="fonts\glyphicons-halflings-regular.ttf" />
@@ -656,6 +679,21 @@
    <Content Include="Content\style.scss" />
    <Content Include="Content\bootstrap_leafweb.scss" />
    <Content Include="Media\1050\aci_pce_final-1.pdf" />
+    <Content Include="Media\Web.config" />
+    <Content Include="Config\UrlRewriting.config" />
+    <Content Include="Config\trees.config" />
+    <Content Include="Config\tinyMceConfig.config" />
+    <Content Include="Config\scripting.config" />
+    <Content Include="Config\metablogConfig.config" />
+    <Content Include="Config\FileSystemProviders.config" />
+    <Content Include="Config\feedProxy.config" />
+    <Content Include="Config\ExamineSettings.config" />
+    <Content Include="Config\ExamineIndex.config" />
+    <Content Include="Config\EmbeddedMedia.config" />
+    <Content Include="Config\ClientDependency.config" />
+    <Content Include="Config\BaseRestExtensions.config" />
+    <Content Include="Config\applications.config" />
+    <Content Include="Config\404handlers.config" />
    <None Include="Properties\PublishProfiles\LeafWebUmbraco - Web Deploy.pubxml" />
    <None Include="scripts\jquery-1.11.1.intellisense.js" />
    <Content Include="scripts\Chart.js" />
@@ -673,31 +711,13 @@
    <Content Include="scripts\LeafInputCreate.js" />
    <Content Include="Views\Web.config" />
    <Content Include="Views\Partials\Grid\Editors\Textstring.cshtml" />
-    <Content Include="Views\Partials\Grid\Editors\Rte.cshtml" />
    <Content Include="Views\Partials\Grid\Editors\Media.cshtml" />
-    <Content Include="Views\Partials\Grid\Editors\Macro.cshtml" />
    <Content Include="Views\Partials\Grid\Editors\Embed.cshtml" />
-    <Content Include="Views\Partials\Grid\Editors\Base.cshtml" />
    <Content Include="Views\Partials\Grid\Bootstrap3.cshtml" />
    <Content Include="Views\Partials\Grid\Bootstrap2.cshtml" />
-    <Content Include="Media\Web.config" />
-    <Content Include="Config\UrlRewriting.config" />
    <Content Include="Config\umbracoSettings.config" />
-    <Content Include="Config\trees.config" />
-    <Content Include="Config\tinyMceConfig.config" />
-    <Content Include="Config\scripting.config" />
-    <Content Include="Config\metablogConfig.config" />
    <Content Include="Config\log4net.config" />
-    <Content Include="Config\FileSystemProviders.config" />
-    <Content Include="Config\feedProxy.config" />
-    <Content Include="Config\ExamineSettings.config" />
-    <Content Include="Config\ExamineIndex.config" />
-    <Content Include="Config\EmbeddedMedia.config" />
    <Content Include="Config\Dashboard.config" />
-    <Content Include="Config\ClientDependency.config" />
-    <Content Include="Config\BaseRestExtensions.config" />
-    <Content Include="Config\applications.config" />
-    <Content Include="Config\404handlers.config" />
    <Content Include="Views\BlogOverview.cshtml" />
    <Content Include="Views\BlogPost.cshtml" />
    <Content Include="Views\Home.cshtml" />
@@ -749,6 +769,11 @@
    <Content Include="Views\MacroPartials\Queue.cshtml" />
    <Content Include="Views\Partials\LoginStatus.cshtml" />
    <Content Include="scripts\jquery.validate.unobtrusive.bootstrap.min.js.map" />
+    <Content Include="Views\Partials\Grid\Editors\Rte.cshtml" />
+    <Content Include="Views\Partials\Grid\Editors\Macro.cshtml" />
+    <Content Include="Views\Partials\Grid\Editors\Base.cshtml" />
+    <Content Include="Views\Partials\Grid\Bootstrap3-Fluid.cshtml" />
+    <Content Include="Views\Partials\Grid\Bootstrap2-Fluid.cshtml" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -757,32 +782,9 @@
    </None>
  </ItemGroup>
  <ItemGroup>
-    <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.controller.js" />
-    <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.htm" />
-    <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.resource.js" />
    <Content Include="Config\grid.editors.config.js" />
-    <Content Include="Config\Lang\cs-CZ.user.xml" />
-    <Content Include="Config\Lang\da-DK.user.xml" />
-    <Content Include="Config\Lang\de-DE.user.xml" />
-    <Content Include="Config\Lang\en-GB.user.xml" />
-    <Content Include="Config\Lang\en-US.user.xml" />
-    <Content Include="Config\Lang\es-ES.user.xml" />
-    <Content Include="Config\Lang\fr-FR.user.xml" />
-    <Content Include="Config\Lang\he-IL.user.xml" />
-    <Content Include="Config\Lang\it-IT.user.xml" />
-    <Content Include="Config\Lang\ja-JP.user.xml" />
-    <Content Include="Config\Lang\ko-KR.user.xml" />
-    <Content Include="Config\Lang\nb-NO.user.xml" />
-    <Content Include="Config\Lang\nl-NL.user.xml" />
-    <Content Include="Config\Lang\pl-PL.user.xml" />
-    <Content Include="Config\Lang\pt-BR.user.xml" />
-    <Content Include="Config\Lang\ru-RU.user.xml" />
-    <Content Include="Config\Lang\sv-SE.user.xml" />
-    <Content Include="Config\Lang\zh-CN.user.xml" />
    <Content Include="Content\site.css" />
    <Content Include="Content\rte.css" />
-    <Content Include="default.aspx" />
-    <Content Include="Global.asax" />
    <Content Include="scripts\site.js" />
    <Content Include="Web.config" />
  </ItemGroup>
@@ -863,13 +865,13 @@
    </PropertyGroup>
    <Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props'))" />
    <Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
-    <Error Condition="!Exists('..\packages\UmbracoCms.7.5.4\build\UmbracoCms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\UmbracoCms.7.5.4\build\UmbracoCms.props'))" />
-    <Error Condition="!Exists('..\packages\UmbracoCms.7.5.4\build\UmbracoCms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\UmbracoCms.7.5.4\build\UmbracoCms.targets'))" />
    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
+    <Error Condition="!Exists('..\packages\UmbracoCms.7.5.6\build\UmbracoCms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\UmbracoCms.7.5.6\build\UmbracoCms.props'))" />
+    <Error Condition="!Exists('..\packages\UmbracoCms.7.5.6\build\UmbracoCms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\UmbracoCms.7.5.6\build\UmbracoCms.targets'))" />
  </Target>
  <Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets')" />
-  <Import Project="..\packages\UmbracoCms.7.5.4\build\UmbracoCms.targets" Condition="Exists('..\packages\UmbracoCms.7.5.4\build\UmbracoCms.targets')" />
  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
+  <Import Project="..\packages\UmbracoCms.7.5.6\build\UmbracoCms.targets" Condition="Exists('..\packages\UmbracoCms.7.5.6\build\UmbracoCms.targets')" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
@@ -5,7 +5,7 @@
  <package id="Backload" version="2.2.2.5" targetFramework="net452" />
  <package id="Backload.Core" version="2.2.2.5" targetFramework="net452" />
  <package id="bootstrap" version="3.3.7" targetFramework="net452" />
-  <package id="ClientDependency" version="1.9.1" targetFramework="net452" />
+  <package id="ClientDependency" version="1.9.2" targetFramework="net452" />
  <package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net452" />
  <package id="EntityFramework" version="6.1.3" targetFramework="net452" />
  <package id="Examine" version="0.1.70.0" targetFramework="net452" />
@@ -54,9 +54,9 @@
  <package id="SharpZipLib" version="0.86.0" targetFramework="net452" />
  <package id="System.Collections.Immutable" version="1.1.36" targetFramework="net452" />
  <package id="System.Reflection.Metadata" version="1.0.21" targetFramework="net452" />
-  <package id="Umbraco.ModelsBuilder" version="3.0.4" targetFramework="net452" />
-  <package id="UmbracoCms" version="7.5.4" targetFramework="net452" />
-  <package id="UmbracoCms.Core" version="7.5.4" targetFramework="net452" />
+  <package id="Umbraco.ModelsBuilder" version="3.0.5" targetFramework="net452" />
+  <package id="UmbracoCms" version="7.5.6" targetFramework="net452" />
+  <package id="UmbracoCms.Core" version="7.5.6" targetFramework="net452" />
  <package id="UrlRewritingNet" version="2.0.7" targetFramework="net452" />
  <package id="WebGrease" version="1.6.0" targetFramework="net452" />
  <package id="xmlrpcnet" version="2.5.0" targetFramework="net452" />
				`@@ -0,0 +1 @@`
				`C:\Users\poprhythm\AppData\Local\Temp\Temporary ASP.NET Files\vs\f80e29bb\faae20bf\App_Web_all.generated.cs.8f9494c4.rnwtj1wz.dll`