Small fixes mostly submitted by VIVOSS & OI

As a result, update default translation templates.
(cherry picked from commit 96b80be337dd4809faa1bfc070cec6dad56c8f1e)

Conflicts:

	src/sunstone/public/js/plugins/vnets-tab.js

src/cloud/occi/lib/ui/public/js/locale.js

@@ -30,16 +30,18 @@ function tr(str){
 //Pops up loading new language dialog. Retrieves the user template, updates the LANG variable.
 //Updates template and session configuration and reloads the view.
 function setLang(lang_str){
-    var dialog = $('<div title="'+tr("Changing language")+'">'+tr("Loading new language... please wait")+' '+spinner+'</div>').dialog({
-        draggable:false,
-        modal:true,
-        resizable:false,
-        buttons:{},
-        width: 460,
-        minHeight: 50
+    var dialog = $('<div title="'+
+                   tr("Changing language")+'">'+
+                   tr("Loading new language... please wait")+
+                   ' '+spinner+'</div>').dialog({
+                       draggable:false,
+                       modal:true,
+                       resizable:false,
+                       buttons:{},
+                       width: 460,
+                       minHeight: 50
+                   });
 
-    });
-    
     if (('localStorage' in window) && (window['localStorage'] !== null)){
         localStorage['lang']=lang_str;
     };

src/cloud/occi/lib/ui/public/locale/en_US/en_US.js

@@ -5,6 +5,7 @@ locale={
     "Additionally, OpenNebula Self-Service allows easy customization of the interface (e.g. this text) and brings multi-language support.":"",
     "Additionally, you can run several operations on defined storages, such as defining their persistance. Persistent images can only be used by 1 virtual machine, and the changes made by it have effect on the base image. Non-persistent images are cloned before being used in a Virtual Machine, therefore changes are lost unless a snapshot is taken prior to Virtual Machine shutdown.":"",
     "Additionally, you can take a \'snapshot\' of the storage attached to these resources. They will be saved as new resources, visible from the Storage view and re-usable.":"",
+    "Address":"",
     "Add storage":"",
     "All":"",
     "are mandatory":"",
@@ -59,6 +60,7 @@ locale={
     "IP":"",
     "Language":"",
     "Loading":"",
+    "Loading new language... please wait":"",
     "MAC":"",
     "Make non persistent":"",
     "Make persistent":"",
@@ -135,6 +137,7 @@ locale={
     "Unpublish":"",
     "Update":"",
     "Update template":"",
+    "Used leases":"",
     "Useful links":"",
     "Virtual Machine information":"",
     "virtual machines":"",

src/sunstone/public/js/locale.js

@@ -31,15 +31,17 @@ function tr(str){
 //Updates template and session configuration and reloads the view.
 function setLang(lang_str){
     var lang_tmp="";
-    var dialog = $('<div title="'+tr("Changing language")+'">'+tr("Loading new language... please wait")+' '+spinner+'</div>').dialog({
-        draggable:false,
-        modal:true,
-        resizable:false,
-        buttons:{},
-        width: 460,
-        minHeight: 50
-
-    });
+    var dialog = $('<div title="'+
+                   tr("Changing language")+'">'+
+                   tr("Loading new language... please wait")+
+                   ' '+spinner+'</div>').dialog({
+                       draggable:false,
+                       modal:true,
+                       resizable:false,
+                       buttons:{},
+                       width: 460,
+                       minHeight: 50
+                   });
 
     var updateUserTemplate = function(request,user_json){
         var template = user_json.USER.TEMPLATE;

src/sunstone/public/js/plugins/users-tab.js

@@ -60,8 +60,8 @@ var create_user_tmpl =
         </fieldset>\
         <fieldset>\
         <div class="form_buttons">\
-                <button class="button" id="create_user_submit" value="user/create">Create</button>\
-                <button class="button" type="reset" value="reset">Reset</button>\
+                <button class="button" id="create_user_submit" value="user/create">'+tr("Create")+'</button>\
+                <button class="button" type="reset" value="reset">'+tr("Reset")+'</button>\
         </div>\
 </fieldset>\
 </form>';
@@ -283,7 +283,7 @@ var user_buttons = {
     // },
     "User.delete" : {
         type: "action",
-        text: "Delete"
+        text: tr("Delete")
     }
 }
 

src/sunstone/public/js/plugins/vms-tab.js

@@ -971,7 +971,7 @@ function popUpSaveasDialog(elems){
                     <option value="">'+tr("Default (current image type)")+'</option>\
                     <option value="os">'+tr("OS")+'</option>\
                     <option value="datablock">'+tr("Datablock")+'</option>\
-                    <option value="cdrom">'+tr("CD-ROM")+'</oqption>\
+                    <option value="cdrom">'+tr("CD-ROM")+'</option>\
                 </select>\
             </div>\
             </fieldset>\

src/sunstone/public/js/plugins/vnets-tab.js

@@ -394,7 +394,7 @@ var vnet_buttons = {
 
     "Network.chgrp" : {
         type: "confirm_with_select",
-        text: "Change group",
+        text: tr("Change group"),
         select: groups_sel,
         tip: tr("Select the new group")+":",
         condition: mustBeAdmin,

src/sunstone/public/locale/en_US/en_US.js

@@ -197,6 +197,7 @@ locale={
     "Listen IP":"",
     "Live migrate":"",
     "Loading":"",
+    "Loading new language... please wait":"",
     "MAC":"",
     "Make non persistent":"",
     "Make persistent":"",