Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5

src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js

@@ -94,7 +94,7 @@ function tinyMceService(dialogService, $log, imageHelper, $http, $timeout, macro
                     if(selectedElm.nodeName === 'IMG'){
                         var img = $(selectedElm);
                         currentTarget = {
-                            name: img.attr("alt"),
+                            altText: img.attr("alt"),
                             url: img.attr("src"),
                             id: img.attr("rel")
                         };
@@ -109,7 +109,7 @@ function tinyMceService(dialogService, $log, imageHelper, $http, $timeout, macro
                             if (img) {
                                 
                                 var data = {
-                                    alt: img.name,
+                                    alt: img.altText,
                                     src: (img.url) ? img.url : "nothing.jpg",
                                     rel: img.id,
                                     id: '__mcenew'

src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html

@@ -19,14 +19,10 @@ data-file-upload="options" data-file-upload-progress="" data-ng-class="{'fileupl
  						ng-disabled="target.id"/>	
  				</umb-control-group>
 
- 				<umb-control-group label="@content_titleOptional">
- 					
+ 				<umb-control-group label="@content_altTextOptional">
  					<input type="text"
- 						localize="placeholder" 
- 						placeholder="@placeholders_entername" 
  						class="umb-editor umb-textstring" 
- 						ng-model="target.name" />
-
+ 						ng-model="target.altText" />
  				</umb-control-group>
  			</umb-pane>
  		</div>