Fixes merge issues, ensures "Content root" and "Media root" are localized

src/Umbraco.Web.UI/umbraco/config/lang/en.xml

@@ -216,6 +216,7 @@
     <key alias="createdBlueprintHeading">Blueprint created</key>
     <key alias="createdBlueprintMessage">Blueprint was created from %0%</key>
     <key alias="duplicateBlueprintMessage">Another Blueprint with the same name already exists.</key>
+    <key alias="contentRoot">Content root</key>
   </area>
   <area alias="media">
     <key alias="clickToUpload">Click to upload</key>
@@ -224,6 +225,7 @@
     <key alias="orClickHereToUpload">or click here to choose files</key>
     <key alias="onlyAllowedFiles">Only allowed file types are</key>
     <key alias="maxFileSize">Max file size is</key>
+    <key alias="mediaRoot">Media root</key>
   </area>
   <area alias="member">
     <key alias="createNewMember">Create a new member</key>

src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml

@@ -205,6 +205,7 @@
     <key alias="scheduledPublishDocumentation"><![CDATA[<a href="https://our.umbraco.org/documentation/Getting-Started/Data/Scheduled-Publishing/#timezones" target="_blank">What does this mean?</a>]]></key>
     <key alias="addTextBox">Add another text box</key>
     <key alias="removeTextBox">Remove this text box</key>
+    <key alias="contentRoot">Content root</key>
   </area>
   <area alias="media">
     <key alias="clickToUpload">Click to upload</key>
@@ -214,6 +215,7 @@
     <key alias="onlyAllowedFiles">Only allowed file types are</key>
     <key alias="disallowedFileType">Cannot upload this file, it does not have an approved file type</key>
     <key alias="maxFileSize">Max file size is</key>
+    <key alias="mediaRoot">Media root</key>
   </area>
   <area alias="member">
     <key alias="createNewMember">Create a new member</key>