Merge release branch 4.7 to master

* 4.7:
  CLOUDSTACK-9267: String is not localized on create instance wizards.

Author: rafaelweingartner

ui/scripts/network.js

@@ -6051,7 +6051,7 @@
                                             var items = [];
                                             items.push({
                                                 id: '',
-                                                description: 'label.none'
+                                                description: _l('label.none')
                                             });
                                             items.push({
                                                 id: 'modp1024',
@@ -6119,7 +6119,7 @@
                                             var items = [];
                                             items.push({
                                                 id: '',
-                                                description: 'label.none'
+                                                description: _l('label.none')
                                             });
                                             items.push({
                                                 id: 'modp1024',
@@ -6400,7 +6400,7 @@
                                             var items = [];
                                             items.push({
                                                 id: '',
-                                                description: 'label.none'
+                                                description: _l('label.none')
                                             });
                                             items.push({
                                                 id: 'modp1024',
@@ -6468,7 +6468,7 @@
                                             var items = [];
                                             items.push({
                                                 id: '',
-                                                description: 'label.none'
+                                                description: _l('label.none')
                                             });
                                             items.push({
                                                 id: 'modp1024',

ui/scripts/ui-custom/instanceWizard.js

@@ -372,7 +372,7 @@
 
                                                 $select.addClass('selected').append(
                                                     $('<div>').addClass('hypervisor')
-                                                    .append($('<label>').html('Hypervisor:'))
+                                                    .append($('<label>').html(_l('label.hypervisor') + ':'))
                                                     .append($('<select>').attr({
                                                         name: 'hypervisorid'
                                                     }))

ui/scripts/ui-custom/projects.js

@@ -706,7 +706,7 @@
      */
     var addProject = function() {
         pageElems.newProjectForm().dialog({
-            title: 'label.new.project',
+            title: _l('label.new.project'),
             closeOnEscape: false,
             width: 760
         }).closest('.ui-dialog').overlay();