From 3b86c195c81b9c5b866c1004e3d3b9573e9e74c3 Mon Sep 17 00:00:00 2001
From: Hector Sanjuan <hsanjuan@opennebula.org>
Date: Tue, 18 Sep 2012 13:28:06 +0200
Subject: [PATCH] Web UIs translations: bump source files.

Rename russian language file for sunstone, update strings for languages in configuration plugins.
(cherry picked from commit d4ad07855e476c26d980510293ed0638ffe2dcb8)
---
 install.sh                                    |    8 +-
 src/cloud/occi/lib/ui/locale/messages.pot     |  424 +++--
 .../lib/ui/public/js/plugins/configuration.js |   12 +-
 src/sunstone/locale/languages/SConstruct      |    2 +-
 .../locale/languages/{ru.po => ru_RU.po}      |    0
 src/sunstone/locale/messages.pot              | 1572 ++++++++---------
 src/sunstone/public/js/plugins/config-tab.js  |   12 +-
 7 files changed, 1057 insertions(+), 973 deletions(-)
 rename src/sunstone/locale/languages/{ru.po => ru_RU.po} (100%)

diff --git a/install.sh b/install.sh
index f11df71bff..a64bddbed5 100755
--- a/install.sh
+++ b/install.sh
@@ -262,7 +262,7 @@ SUNSTONE_DIRS="$SUNSTONE_LOCATION/routes \
                $SUNSTONE_LOCATION/public/locale/fr_FR \
                $SUNSTONE_LOCATION/public/locale/it_IT \
                $SUNSTONE_LOCATION/public/locale/pt_PT \
-               $SUNSTONE_LOCATION/public/locale/ru \
+               $SUNSTONE_LOCATION/public/locale/ru_RU \
                $SUNSTONE_LOCATION/public/locale/sk_SK \
                $SUNSTONE_LOCATION/public/locale/zh_TW \
                $SUNSTONE_LOCATION/public/vendor \
@@ -507,7 +507,7 @@ INSTALL_SUNSTONE_FILES=(
     SUNSTONE_PUBLIC_LOCALE_FR_FR:$SUNSTONE_LOCATION/public/locale/fr_FR
     SUNSTONE_PUBLIC_LOCALE_IT_IT:$SUNSTONE_LOCATION/public/locale/it_IT
     SUNSTONE_PUBLIC_LOCALE_PT_PT:$SUNSTONE_LOCATION/public/locale/pt_PT
-    SUNSTONE_PUBLIC_LOCALE_RU:$SUNSTONE_LOCATION/public/locale/ru
+    SUNSTONE_PUBLIC_LOCALE_RU_RU:$SUNSTONE_LOCATION/public/locale/ru_RU
     SUNSTONE_PUBLIC_LOCALE_SK_SK:$SUNSTONE_LOCATION/public/locale/sk_SK
     SUNSTONE_PUBLIC_LOCALE_ZH_TW:$SUNSTONE_LOCATION/public/locale/zh_TW
 )
@@ -1461,8 +1461,8 @@ SUNSTONE_PUBLIC_LOCALE_PT_PT="\
 src/sunstone/locale/languages/pt_PT.js \
 src/sunstone/locale/languages/pt_datatable.txt"
 
-SUNSTONE_PUBLIC_LOCALE_RU="\
-src/sunstone/locale/languages/ru.js \
+SUNSTONE_PUBLIC_LOCALE_RU_RU="\
+src/sunstone/locale/languages/ru_RU.js \
 src/sunstone/locale/languages/ru_datatable.txt"
 
 SUNSTONE_PUBLIC_LOCALE_SK_SK="\
diff --git a/src/cloud/occi/lib/ui/locale/messages.pot b/src/cloud/occi/lib/ui/locale/messages.pot
index 0271ebefd5..b3fed505b9 100644
--- a/src/cloud/occi/lib/ui/locale/messages.pot
+++ b/src/cloud/occi/lib/ui/locale/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenNebula\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-06 12:23+0200\n"
+"POT-Creation-Date: 2012-09-18 13:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -50,18 +50,18 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: ../public/js/plugins/storage.js:27 ../public/js/plugins/storage.js:345
+#: ../public/js/plugins/storage.js:27 ../public/js/plugins/storage.js:382
 #: ../public/js/plugins/network.js:27 ../public/js/plugins/network.js:278
-#: ../public/js/plugins/compute.js:64 ../public/js/plugins/compute.js:538
-#: ../public/js/plugins/compute.js:583 ../public/js/plugins/compute.js:628
+#: ../public/js/plugins/compute.js:64 ../public/js/plugins/compute.js:585
+#: ../public/js/plugins/compute.js:637
 msgid "ID"
 msgstr ""
 
 #: ../public/js/plugins/storage.js:28 ../public/js/plugins/storage.js:45
-#: ../public/js/plugins/storage.js:349 ../public/js/plugins/network.js:28
-#: ../public/js/plugins/network.js:41 ../public/js/plugins/network.js:282
-#: ../public/js/plugins/compute.js:65 ../public/js/plugins/compute.js:542
-#: ../public/js/plugins/compute.js:587 ../public/js/plugins/compute.js:632
+#: ../public/js/plugins/storage.js:107 ../public/js/plugins/storage.js:386
+#: ../public/js/plugins/network.js:28 ../public/js/plugins/network.js:41
+#: ../public/js/plugins/network.js:282 ../public/js/plugins/compute.js:65
+#: ../public/js/plugins/compute.js:589 ../public/js/plugins/compute.js:641
 msgid "Name"
 msgstr ""
 
@@ -77,7 +77,7 @@ msgstr ""
 msgid "Name that the Image will get."
 msgstr ""
 
-#: ../public/js/plugins/storage.js:50 ../public/js/plugins/storage.js:353
+#: ../public/js/plugins/storage.js:50 ../public/js/plugins/storage.js:390
 msgid "Description"
 msgstr ""
 
@@ -85,8 +85,7 @@ msgstr ""
 msgid "Human readable description of the image."
 msgstr ""
 
-#: ../public/js/plugins/storage.js:57 ../public/js/plugins/storage.js:357
-#: ../public/js/plugins/compute.js:595
+#: ../public/js/plugins/storage.js:57 ../public/js/plugins/storage.js:394
 msgid "Type"
 msgstr ""
 
@@ -134,7 +133,7 @@ msgstr ""
 msgid "Public scope of the image"
 msgstr ""
 
-#: ../public/js/plugins/storage.js:88 ../public/js/plugins/storage.js:361
+#: ../public/js/plugins/storage.js:88 ../public/js/plugins/storage.js:398
 msgid "Persistent"
 msgstr ""
 
@@ -142,8 +141,8 @@ msgstr ""
 msgid "Persistence of the image"
 msgstr ""
 
-#: ../public/js/plugins/storage.js:95 ../public/js/plugins/network.js:56
-#: ../public/js/plugins/compute.js:103
+#: ../public/js/plugins/storage.js:95 ../public/js/plugins/storage.js:112
+#: ../public/js/plugins/network.js:56 ../public/js/plugins/compute.js:103
 msgid "Close"
 msgstr ""
 
@@ -152,75 +151,89 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: ../public/js/plugins/storage.js:214 ../public/js/plugins/network.js:158
-#: ../public/js/plugins/compute.js:323
-msgid "Refresh list"
+#: ../public/js/plugins/storage.js:104
+msgid "Choose a new name for the image"
 msgstr ""
 
-#: ../public/js/plugins/storage.js:219 ../public/js/plugins/network.js:164
-#: ../public/js/plugins/compute.js:329
+#: ../public/js/plugins/storage.js:105
+msgid "Several image are selected, please choose prefix to name the new copies"
+msgstr ""
+
+#: ../public/js/plugins/storage.js:108
+msgid "Prefix"
+msgstr ""
+
+#: ../public/js/plugins/storage.js:114 ../public/js/plugins/storage.js:270
+msgid "Clone"
+msgstr ""
+
+#: ../public/js/plugins/storage.js:245 ../public/js/plugins/network.js:164
+#: ../public/js/plugins/compute.js:355
 msgid "+ New"
 msgstr ""
 
-#: ../public/js/plugins/storage.js:223
+#: ../public/js/plugins/storage.js:249
 msgid "Make persistent"
 msgstr ""
 
-#: ../public/js/plugins/storage.js:227
+#: ../public/js/plugins/storage.js:253
 msgid "Make non persistent"
 msgstr ""
 
-#: ../public/js/plugins/storage.js:234 ../public/js/plugins/network.js:169
+#: ../public/js/plugins/storage.js:260 ../public/js/plugins/network.js:169
 msgid "Publish"
 msgstr ""
 
-#: ../public/js/plugins/storage.js:238 ../public/js/plugins/network.js:174
+#: ../public/js/plugins/storage.js:264 ../public/js/plugins/network.js:174
 msgid "Unpublish"
 msgstr ""
 
-#: ../public/js/plugins/storage.js:244 ../public/js/plugins/network.js:179
-#: ../public/js/plugins/compute.js:381
+#: ../public/js/plugins/storage.js:274 ../public/js/plugins/network.js:179
+#: ../public/js/plugins/compute.js:422
 msgid "Delete"
 msgstr ""
 
-#: ../public/js/plugins/storage.js:250 ../public/js/plugins/storage.js:337
+#: ../public/js/plugins/storage.js:280 ../public/js/plugins/storage.js:374
 msgid "Image information"
 msgstr ""
 
-#: ../public/js/plugins/storage.js:258
+#: ../public/js/plugins/storage.js:287
 msgid "Add storage"
 msgstr ""
 
-#: ../public/js/plugins/storage.js:264 ../public/js/plugins/dashboard.js:46
-#: ../public/customize/custom.js:68
+#: ../public/js/plugins/storage.js:294
+msgid "Clone image"
+msgstr ""
+
+#: ../public/js/plugins/storage.js:300 ../public/customize/custom.js:68
 msgid "Storage"
 msgstr ""
 
-#: ../public/js/plugins/storage.js:341
+#: ../public/js/plugins/storage.js:378
 msgid "Image"
 msgstr ""
 
-#: ../public/js/plugins/storage.js:342 ../public/js/plugins/network.js:275
+#: ../public/js/plugins/storage.js:379 ../public/js/plugins/network.js:275
 msgid "information"
 msgstr ""
 
-#: ../public/js/plugins/storage.js:365
+#: ../public/js/plugins/storage.js:402
 msgid "Filesystem type"
 msgstr ""
 
-#: ../public/js/plugins/storage.js:369
+#: ../public/js/plugins/storage.js:406
 msgid "Size (Mb)"
 msgstr ""
 
-#: ../public/js/plugins/storage.js:503
+#: ../public/js/plugins/storage.js:537
 msgid "You must specify a name"
 msgstr ""
 
-#: ../public/js/plugins/storage.js:521
+#: ../public/js/plugins/storage.js:555
 msgid "You must specify size and FS type"
 msgstr ""
 
-#: ../public/js/plugins/storage.js:528
+#: ../public/js/plugins/storage.js:562
 msgid "You must select a file to upload"
 msgstr ""
 
@@ -240,8 +253,9 @@ msgstr ""
 msgid "Create network"
 msgstr ""
 
-#: ../public/js/plugins/network.js:199 ../public/js/plugins/compute.js:91
-#: ../public/js/plugins/compute.js:396 ../public/js/plugins/compute.js:655
+#: ../public/js/plugins/network.js:199 ../public/js/plugins/dashboard.js:62
+#: ../public/js/plugins/compute.js:91 ../public/js/plugins/compute.js:437
+#: ../public/js/plugins/compute.js:664
 msgid "Networks"
 msgstr ""
 
@@ -269,50 +283,105 @@ msgstr ""
 msgid "Please provide a network address"
 msgstr ""
 
-#: ../public/js/plugins/dashboard.js:37
-msgid "Current resources"
+#: ../public/js/plugins/dashboard.js:18 ../public/js/plugins/dashboard.js:262
+#: ../public/js/plugins/compute.js:32
+msgid "CPU"
 msgstr ""
 
-#: ../public/js/plugins/dashboard.js:42 ../public/js/plugins/compute.js:409
+#: ../public/js/plugins/dashboard.js:22 ../public/js/plugins/dashboard.js:249
+#: ../public/js/plugins/compute.js:37
+msgid "Memory"
+msgstr ""
+
+#: ../public/js/plugins/dashboard.js:26
+msgid "Net transfer rates"
+msgstr ""
+
+#: ../public/js/plugins/dashboard.js:52
+msgid "Resources and quotas"
+msgstr ""
+
+#: ../public/js/plugins/dashboard.js:56 ../public/js/plugins/compute.js:450
 #: ../public/customize/custom.js:64
 msgid "Compute"
 msgstr ""
 
-#: ../public/js/plugins/dashboard.js:50 ../public/customize/custom.js:72
-msgid "Network"
+#: ../public/js/plugins/dashboard.js:58
+msgid "Storage quotas"
 msgstr ""
 
-#: ../public/js/plugins/dashboard.js:62
-msgid "Useful links"
+#: ../public/js/plugins/dashboard.js:60 ../public/js/plugins/compute.js:86
+msgid "Images"
 msgstr ""
 
-#: ../public/js/plugins/dashboard.js:81
+#: ../public/js/plugins/dashboard.js:73
+msgid "Usages"
+msgstr ""
+
+#: ../public/js/plugins/dashboard.js:77
+msgid "From"
+msgstr ""
+
+#: ../public/js/plugins/dashboard.js:78
+msgid "To"
+msgstr ""
+
+#: ../public/js/plugins/dashboard.js:79
+#: ../../../../../sunstone/public/js/sunstone-util.js:746
+msgid "Update"
+msgstr ""
+
+#: ../public/js/plugins/dashboard.js:126
 msgid "Create new compute resource"
 msgstr ""
 
-#: ../public/js/plugins/dashboard.js:82 ../public/js/plugins/dashboard.js:96
-#: ../public/js/plugins/dashboard.js:110
+#: ../public/js/plugins/dashboard.js:127 ../public/js/plugins/dashboard.js:141
+#: ../public/js/plugins/dashboard.js:155
 msgid "See more"
 msgstr ""
 
-#: ../public/js/plugins/dashboard.js:95
+#: ../public/js/plugins/dashboard.js:140
 msgid "Create new storage resource"
 msgstr ""
 
-#: ../public/js/plugins/dashboard.js:109
+#: ../public/js/plugins/dashboard.js:154
 msgid "Create new network resource"
 msgstr ""
 
-#: ../public/js/plugins/dashboard.js:120
+#: ../public/js/plugins/dashboard.js:163
+msgid "Useful links"
+msgstr ""
+
+#: ../public/js/plugins/dashboard.js:175
 msgid "Dashboard"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:32 ../public/js/plugins/compute.js:554
-msgid "CPU"
+#: ../public/js/plugins/dashboard.js:238
+msgid "Virtual Machines quotas"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:37 ../public/js/plugins/compute.js:558
-msgid "Memory"
+#: ../public/js/plugins/dashboard.js:274
+msgid "Storage size"
+msgstr ""
+
+#: ../public/js/plugins/dashboard.js:287
+msgid "Number of images"
+msgstr ""
+
+#: ../public/js/plugins/dashboard.js:296
+msgid "Image quota"
+msgstr ""
+
+#: ../public/js/plugins/dashboard.js:302
+msgid "RVMs"
+msgstr ""
+
+#: ../public/js/plugins/dashboard.js:311
+msgid "Network quota"
+msgstr ""
+
+#: ../public/js/plugins/dashboard.js:317
+msgid "Leases"
 msgstr ""
 
 #: ../public/js/plugins/compute.js:42
@@ -323,11 +392,11 @@ msgstr ""
 msgid "Network reception"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:65 ../public/js/plugins/compute.js:550
+#: ../public/js/plugins/compute.js:65 ../public/js/plugins/compute.js:597
 msgid "State"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:66 ../public/js/plugins/compute.js:636
+#: ../public/js/plugins/compute.js:66 ../public/js/plugins/compute.js:645
 msgid "IP"
 msgstr ""
 
@@ -335,306 +404,329 @@ msgstr ""
 msgid "VM Name"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:80 ../public/js/plugins/compute.js:546
+#: ../public/js/plugins/compute.js:80 ../public/js/plugins/compute.js:593
 msgid "Instance type"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:82 ../public/js/plugins/compute.js:1010
+#: ../public/js/plugins/compute.js:82 ../public/js/plugins/compute.js:1038
 msgid "Loading"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:86
-msgid "Images"
-msgstr ""
-
 #: ../public/js/plugins/compute.js:97
 msgid "Create # VMs"
 msgstr ""
 
 #: ../public/js/plugins/compute.js:99
-msgid "You can use the wildcard &#37;. When creating several VMs, &#37; will be replaced with a different number starting from 0 in each of them"
+msgid "You can use the wildcard &#37;i. When creating several VMs, &#37;i will be replaced with a different number starting from 0 in each of them"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:335
+#: ../public/js/plugins/compute.js:361
 msgid "Shutdown"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:336
+#: ../public/js/plugins/compute.js:362
 msgid "This will shutdown the selected VMs"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:344
+#: ../public/js/plugins/compute.js:370
 msgid "Suspend"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:345
+#: ../public/js/plugins/compute.js:371
 msgid "This will suspend the selected VMs"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:349
+#: ../public/js/plugins/compute.js:375
 msgid "Resume"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:350
+#: ../public/js/plugins/compute.js:376
 msgid "This will resume the selected VMs in stopped or suspended states"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:354
+#: ../public/js/plugins/compute.js:380
 msgid "Stop"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:359
+#: ../public/js/plugins/compute.js:385
 msgid "Reboot"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:364
+#: ../public/js/plugins/compute.js:390
 msgid "Reset"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:369 ../public/js/plugins/compute.js:837
-#: ../../../../../sunstone/public/js/sunstone.js:663
-#: ../../../../../sunstone/public/js/sunstone.js:695
+#: ../public/js/plugins/compute.js:395
+msgid "Restart"
+msgstr ""
+
+#: ../public/js/plugins/compute.js:396
+msgid "This will redeploy selected VMs"
+msgstr ""
+
+#: ../public/js/plugins/compute.js:400
+msgid "Resubmit"
+msgstr ""
+
+#: ../public/js/plugins/compute.js:401
+msgid "This will resubmits VMs to PENDING state"
+msgstr ""
+
+#: ../public/js/plugins/compute.js:405
+msgid "Power Off"
+msgstr ""
+
+#: ../public/js/plugins/compute.js:406
+msgid "This will send a power off signal to running VMs. They can be restarted later."
+msgstr ""
+
+#: ../public/js/plugins/compute.js:410
+#: ../../../../../sunstone/public/js/sunstone.js:664
+#: ../../../../../sunstone/public/js/sunstone.js:696
 msgid "Cancel"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:370
+#: ../public/js/plugins/compute.js:411
 msgid "This will cancel selected VMs"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:374 ../public/js/plugins/compute.js:826
+#: ../public/js/plugins/compute.js:415
 msgid "Take snapshot"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:382
+#: ../public/js/plugins/compute.js:423
 msgid "This will delete the selected VMs from the database"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:388
+#: ../public/js/plugins/compute.js:429
 msgid "Compute resource"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:392 ../public/js/plugins/compute.js:610
-msgid "Disks"
+#: ../public/js/plugins/compute.js:433 ../public/js/plugins/compute.js:619
+msgid "Disks & Hotplugging"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:403
+#: ../public/js/plugins/compute.js:444
 msgid "Create Virtual Machine"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:530
+#: ../public/js/plugins/compute.js:577
 msgid "VM information"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:534
+#: ../public/js/plugins/compute.js:581
 msgid "Virtual Machine information"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:562
+#: ../public/js/plugins/compute.js:601
+msgid "Used CPU"
+msgstr ""
+
+#: ../public/js/plugins/compute.js:605
+msgid "Used Memory"
+msgstr ""
+
+#: ../public/js/plugins/compute.js:609
 msgid "Launch VNC session"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:573
-msgid "Disks information"
-msgstr ""
-
-#: ../public/js/plugins/compute.js:591
-msgid "Target"
-msgstr ""
-
-#: ../public/js/plugins/compute.js:602 ../public/js/plugins/compute.js:933
-msgid "No disks defined"
-msgstr ""
-
-#: ../public/js/plugins/compute.js:616
+#: ../public/js/plugins/compute.js:625
 msgid "Networks information"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:640
+#: ../public/js/plugins/compute.js:649
 msgid "MAC"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:647
+#: ../public/js/plugins/compute.js:656
 msgid "No networks defined"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:661
+#: ../public/js/plugins/compute.js:670
 msgid "Monitoring information"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:836
-#: ../../../../../sunstone/public/js/sunstone.js:662
-#: ../../../../../sunstone/public/js/sunstone.js:694
-msgid "OK"
+#: ../public/js/plugins/compute.js:708
+msgid "Disks information - Save As and Detach"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:859
-msgid "Skipping VM "
+#: ../public/js/plugins/compute.js:722
+msgid "No disks to show"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:860
-msgid "No disk id or image name specified"
+#: ../public/js/plugins/compute.js:733
+msgid "Detach"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:896
-msgid "Saveas for VM with ID"
+#: ../public/js/plugins/compute.js:735
+msgid "Save"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:899
-msgid "Select disk"
+#: ../public/js/plugins/compute.js:737
+msgid "Save_as name"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:901
-msgid "Retrieving"
+#: ../public/js/plugins/compute.js:755
+msgid "Attach disk to running VM"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:905
-msgid "Image name"
+#: ../public/js/plugins/compute.js:758
+msgid "Select image"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:925 ../public/js/plugins/compute.js:928
-msgid "disk id"
+#: ../public/js/plugins/compute.js:765
+msgid "Target"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:1003
+#: ../public/js/plugins/compute.js:772
+msgid "Attach"
+msgstr ""
+
+#: ../public/js/plugins/compute.js:821
+msgid "Please select an image to attach"
+msgstr ""
+
+#: ../public/js/plugins/compute.js:1031
 msgid "VNC connection"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:1018
+#: ../public/js/plugins/compute.js:1046
 msgid "Canvas not supported."
 msgstr ""
 
-#: ../public/js/plugins/compute.js:1079 ../public/js/plugins/compute.js:1095
+#: ../public/js/plugins/compute.js:1098 ../public/js/plugins/compute.js:1114
 msgid "Open VNC Session"
 msgstr ""
 
-#: ../public/js/plugins/compute.js:1082 ../public/js/plugins/compute.js:1098
+#: ../public/js/plugins/compute.js:1101 ../public/js/plugins/compute.js:1117
 msgid "VNC Disabled"
 msgstr ""
 
-#: ../public/js/plugins/configuration.js:23
+#: ../public/js/plugins/configuration.js:24
 msgid "Self-Service UI Configuration"
 msgstr ""
 
-#: ../public/js/plugins/configuration.js:28
+#: ../public/js/plugins/configuration.js:29
 msgid "Language"
 msgstr ""
 
-#: ../public/js/plugins/configuration.js:31
-msgid "English"
-msgstr ""
-
 #: ../public/js/plugins/configuration.js:32
-msgid "Chinese"
+msgid "English (US)"
 msgstr ""
 
 #: ../public/js/plugins/configuration.js:33
-msgid "French (CA)"
+msgid "Chinese (TW)"
 msgstr ""
 
 #: ../public/js/plugins/configuration.js:34
-msgid "French (FR)"
+msgid "French (CA)"
 msgstr ""
 
 #: ../public/js/plugins/configuration.js:35
-msgid "German"
+msgid "French (FR)"
 msgstr ""
 
 #: ../public/js/plugins/configuration.js:36
-msgid "Italian"
+msgid "German (DE)"
 msgstr ""
 
 #: ../public/js/plugins/configuration.js:37
-msgid "Persian (IR)"
+msgid "Italian (IT)"
 msgstr ""
 
 #: ../public/js/plugins/configuration.js:38
-msgid "Portuguese (BR)"
+msgid "Persian (IR)"
 msgstr ""
 
 #: ../public/js/plugins/configuration.js:39
-msgid "Portuguese (PT)"
+msgid "Portuguese (BR)"
 msgstr ""
 
 #: ../public/js/plugins/configuration.js:40
-msgid "Slovak"
+msgid "Portuguese (PT)"
 msgstr ""
 
 #: ../public/js/plugins/configuration.js:41
-msgid "Spanish"
+msgid "Slovak (SK)"
 msgstr ""
 
-#: ../public/js/plugins/configuration.js:63
+#: ../public/js/plugins/configuration.js:42
+msgid "Spanish (ES)"
+msgstr ""
+
+#: ../public/js/plugins/configuration.js:64
 msgid "Configuration"
 msgstr ""
 
-#: ../../../../../sunstone/public/js/sunstone.js:588
+#: ../../../../../sunstone/public/js/sunstone.js:589
 msgid "Previous action"
 msgstr ""
 
-#: ../../../../../sunstone/public/js/sunstone.js:651
-#: ../../../../../sunstone/public/js/sunstone.js:685
+#: ../../../../../sunstone/public/js/sunstone.js:652
+#: ../../../../../sunstone/public/js/sunstone.js:686
 msgid "Confirmation of action"
 msgstr ""
 
-#: ../../../../../sunstone/public/js/sunstone.js:657
+#: ../../../../../sunstone/public/js/sunstone.js:658
 msgid "You have to confirm this action."
 msgstr ""
 
-#: ../../../../../sunstone/public/js/sunstone.js:659
+#: ../../../../../sunstone/public/js/sunstone.js:660
 msgid "Do you want to proceed?"
 msgstr ""
 
-#: ../../../../../sunstone/public/js/sunstone.js:690
+#: ../../../../../sunstone/public/js/sunstone.js:663
+#: ../../../../../sunstone/public/js/sunstone.js:695
+msgid "OK"
+msgstr ""
+
+#: ../../../../../sunstone/public/js/sunstone.js:691
 msgid "You need to select something."
 msgstr ""
 
-#: ../../../../../sunstone/public/js/sunstone-util.js:206
+#: ../../../../../sunstone/public/js/sunstone-util.js:210
 msgid "Submitted"
 msgstr ""
 
-#: ../../../../../sunstone/public/js/sunstone-util.js:223
+#: ../../../../../sunstone/public/js/sunstone-util.js:227
 msgid "Error"
 msgstr ""
 
-#: ../../../../../sunstone/public/js/sunstone-util.js:229
+#: ../../../../../sunstone/public/js/sunstone-util.js:233
 msgid "Info"
 msgstr ""
 
-#: ../../../../../sunstone/public/js/sunstone-util.js:361
+#: ../../../../../sunstone/public/js/sunstone-util.js:365
 msgid "Cannot contact server: is it running and reachable?"
 msgstr ""
 
-#: ../../../../../sunstone/public/js/sunstone-util.js:369
+#: ../../../../../sunstone/public/js/sunstone-util.js:373
 msgid "Network is unreachable: is OpenNebula running?"
 msgstr ""
 
-#: ../../../../../sunstone/public/js/sunstone-util.js:390
+#: ../../../../../sunstone/public/js/sunstone-util.js:394
 msgid "Unauthorized"
 msgstr ""
 
-#: ../../../../../sunstone/public/js/sunstone-util.js:581
-#: ../../../../../sunstone/public/js/sunstone-util.js:801
+#: ../../../../../sunstone/public/js/sunstone-util.js:585
+#: ../../../../../sunstone/public/js/sunstone-util.js:807
 msgid "Please select"
 msgstr ""
 
-#: ../../../../../sunstone/public/js/sunstone-util.js:724
+#: ../../../../../sunstone/public/js/sunstone-util.js:730
 msgid "Update template"
 msgstr ""
 
-#: ../../../../../sunstone/public/js/sunstone-util.js:730
+#: ../../../../../sunstone/public/js/sunstone-util.js:736
 msgid "Please, choose and modify the template you want to update"
 msgstr ""
 
-#: ../../../../../sunstone/public/js/sunstone-util.js:732
-#: ../../../../../sunstone/public/js/sunstone-util.js:735
+#: ../../../../../sunstone/public/js/sunstone-util.js:738
+#: ../../../../../sunstone/public/js/sunstone-util.js:741
 msgid "Select a template"
 msgstr ""
 
-#: ../../../../../sunstone/public/js/sunstone-util.js:740
-msgid "Update"
-msgstr ""
-
-#: ../../../../../sunstone/public/js/sunstone-util.js:1020
+#: ../../../../../sunstone/public/js/sunstone-util.js:1026
 msgid "Please select an element"
 msgstr ""
 
@@ -666,6 +758,10 @@ msgstr ""
 msgid "Storage pool is formed by several images. These images can contain from full operating systems to be used as base for compute resources, to simple data. OpenNebula Self-Service offers you the possibility to create or upload your own images."
 msgstr ""
 
+#: ../public/customize/custom.js:72
+msgid "Network"
+msgstr ""
+
 #: ../public/customize/custom.js:74
 msgid "Your compute resources connectivity is performed using pre-defined virtual networks. You can create and manage these networks using OpenNebula Self-Service."
 msgstr ""
diff --git a/src/cloud/occi/lib/ui/public/js/plugins/configuration.js b/src/cloud/occi/lib/ui/public/js/plugins/configuration.js
index 4c6d15cbf1..f4340bb6e0 100644
--- a/src/cloud/occi/lib/ui/public/js/plugins/configuration.js
+++ b/src/cloud/occi/lib/ui/public/js/plugins/configuration.js
@@ -29,17 +29,17 @@ var config_tab_content =
               <td class="key_td">' + tr("Language") + '</td>\
               <td class="value_td">\
                    <select id="lang_sel" style="width:20em;">\
-                       <option value="en_US">'+tr("English")+'</option>\
-                       <option value="zh_TW">'+tr("Chinese")+' (TW)</option>\
+                       <option value="en_US">'+tr("English (US)")+'</option>\
+                       <option value="zh_TW">'+tr("Chinese (TW)")+'</option>\
                        <option value="fr_CA">'+tr("French (CA)")+'</option>\
                        <option value="fr_FR">'+tr("French (FR)")+'</option>\
-                       <option value="de">'+tr("German")+'</option>\
-                       <option value="it_IT">'+tr("Italian")+'</option>\
+                       <option value="de">'+tr("German (DE)")+'</option>\
+                       <option value="it_IT">'+tr("Italian (IT)")+'</option>\
                        <option value="fa_IR">'+tr("Persian (IR)")+'</option>\
                        <option value="pt_BR">'+tr("Portuguese (BR)")+'</option>\
                        <option value="pt_PT">'+tr("Portuguese (PT)")+'</option>\
-                       <option value="sk_SK">'+tr("Slovak")+'</option>\
-                       <option value="es_ES">'+tr("Spanish")+'</option>\
+                       <option value="sk_SK">'+tr("Slovak (SK)")+'</option>\
+                       <option value="es_ES">'+tr("Spanish (ES)")+'</option>\
                    </select>\
               </td>\
             </tr>\
diff --git a/src/sunstone/locale/languages/SConstruct b/src/sunstone/locale/languages/SConstruct
index 563785ae16..b0f4e5bccb 100644
--- a/src/sunstone/locale/languages/SConstruct
+++ b/src/sunstone/locale/languages/SConstruct
@@ -29,6 +29,6 @@ env.Po('fa_IR.po')
 env.Po('fr_FR.po')
 env.Po('it_IT.po')
 env.Po('pt_PT.po')
-env.Po('ru.po')
+env.Po('ru_RU.po')
 env.Po('sk_SK.po')
 env.Po('zh_TW.po')
diff --git a/src/sunstone/locale/languages/ru.po b/src/sunstone/locale/languages/ru_RU.po
similarity index 100%
rename from src/sunstone/locale/languages/ru.po
rename to src/sunstone/locale/languages/ru_RU.po
diff --git a/src/sunstone/locale/messages.pot b/src/sunstone/locale/messages.pot
index ae48d6e9b5..2586c6406f 100644
--- a/src/sunstone/locale/messages.pot
+++ b/src/sunstone/locale/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenNebula 3.6.0\n"
+"Project-Id-Version: OpenNebula\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-06 12:08+0200\n"
+"POT-Creation-Date: 2012-09-18 13:25+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,32 +17,32 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../public/js/sunstone.js:588
+#: ../public/js/sunstone.js:589
 msgid "Previous action"
 msgstr ""
 
-#: ../public/js/sunstone.js:651 ../public/js/sunstone.js:685
+#: ../public/js/sunstone.js:652 ../public/js/sunstone.js:686
 msgid "Confirmation of action"
 msgstr ""
 
-#: ../public/js/sunstone.js:657
+#: ../public/js/sunstone.js:658
 msgid "You have to confirm this action."
 msgstr ""
 
-#: ../public/js/sunstone.js:659
+#: ../public/js/sunstone.js:660
 msgid "Do you want to proceed?"
 msgstr ""
 
-#: ../public/js/sunstone.js:662 ../public/js/sunstone.js:694
+#: ../public/js/sunstone.js:663 ../public/js/sunstone.js:695
 msgid "OK"
 msgstr ""
 
-#: ../public/js/sunstone.js:663 ../public/js/sunstone.js:695
-#: ../public/js/plugins/vms-tab.js:604
+#: ../public/js/sunstone.js:664 ../public/js/sunstone.js:696
+#: ../public/js/plugins/vms-tab.js:611
 msgid "Cancel"
 msgstr ""
 
-#: ../public/js/sunstone.js:690
+#: ../public/js/sunstone.js:691
 msgid "You need to select something."
 msgstr ""
 
@@ -74,58 +74,61 @@ msgstr ""
 msgid "Sign out"
 msgstr ""
 
-#: ../public/js/sunstone-util.js:206
+#: ../public/js/sunstone-util.js:210
 msgid "Submitted"
 msgstr ""
 
-#: ../public/js/sunstone-util.js:223
+#: ../public/js/sunstone-util.js:227
 msgid "Error"
 msgstr ""
 
-#: ../public/js/sunstone-util.js:229
+#: ../public/js/sunstone-util.js:233
 msgid "Info"
 msgstr ""
 
-#: ../public/js/sunstone-util.js:361
+#: ../public/js/sunstone-util.js:365
 msgid "Cannot contact server: is it running and reachable?"
 msgstr ""
 
-#: ../public/js/sunstone-util.js:369
+#: ../public/js/sunstone-util.js:373
 msgid "Network is unreachable: is OpenNebula running?"
 msgstr ""
 
-#: ../public/js/sunstone-util.js:390
+#: ../public/js/sunstone-util.js:394
 msgid "Unauthorized"
 msgstr ""
 
-#: ../public/js/sunstone-util.js:581 ../public/js/sunstone-util.js:801
-#: ../public/js/plugins/templates-tab.js:444
-#: ../public/js/plugins/images-tab.js:1095
+#: ../public/js/sunstone-util.js:585 ../public/js/sunstone-util.js:807
+#: ../public/js/plugins/templates-tab.js:200
+#: ../public/js/plugins/templates-tab.js:412
+#: ../public/js/plugins/images-tab.js:1070
 msgid "Please select"
 msgstr ""
 
-#: ../public/js/sunstone-util.js:724
+#: ../public/js/sunstone-util.js:730
 msgid "Update template"
 msgstr ""
 
-#: ../public/js/sunstone-util.js:730 ../public/js/plugins/templates-tab.js:597
+#: ../public/js/sunstone-util.js:736 ../public/js/plugins/templates-tab.js:566
 msgid "Please, choose and modify the template you want to update"
 msgstr ""
 
-#: ../public/js/sunstone-util.js:732 ../public/js/sunstone-util.js:735
-#: ../public/js/plugins/templates-tab.js:599
+#: ../public/js/sunstone-util.js:738 ../public/js/sunstone-util.js:741
+#: ../public/js/plugins/templates-tab.js:568
 msgid "Select a template"
 msgstr ""
 
-#: ../public/js/sunstone-util.js:740 ../public/js/plugins/vnets-tab.js:210
+#: ../public/js/sunstone-util.js:746 ../public/js/plugins/vnets-tab.js:210
 #: ../public/js/plugins/vms-tab.js:169
 #: ../public/js/plugins/datastores-tab.js:132
-#: ../public/js/plugins/templates-tab.js:636
-#: ../public/js/plugins/images-tab.js:243
+#: ../public/js/plugins/templates-tab.js:605
+#: ../public/js/plugins/users-tab.js:685
+#: ../public/js/plugins/groups-tab.js:479
+#: ../public/js/plugins/images-tab.js:235
 msgid "Update"
 msgstr ""
 
-#: ../public/js/sunstone-util.js:1020
+#: ../public/js/sunstone-util.js:1026
 msgid "Please select an element"
 msgstr ""
 
@@ -140,121 +143,120 @@ msgstr ""
 msgid "No monitoring information available"
 msgstr ""
 
-#: ../public/js/plugins/marketplace-tab.js:87
+#: ../public/js/plugins/marketplace-tab.js:90
 msgid "Import to local infrastructure"
 msgstr ""
 
-#: ../public/js/plugins/marketplace-tab.js:92
+#: ../public/js/plugins/marketplace-tab.js:95
 msgid "OpenNebula Marketplace"
 msgstr ""
 
-#: ../public/js/plugins/marketplace-tab.js:100
-#: ../public/js/plugins/marketplace-tab.js:152
-#: ../public/js/plugins/acls-tab.js:30 ../public/js/plugins/acls-tab.js:237
-#: ../public/js/plugins/vnets-tab.js:28 ../public/js/plugins/vnets-tab.js:574
+#: ../public/js/plugins/marketplace-tab.js:103
+#: ../public/js/plugins/marketplace-tab.js:155
+#: ../public/js/plugins/acls-tab.js:30 ../public/js/plugins/acls-tab.js:236
+#: ../public/js/plugins/vnets-tab.js:28 ../public/js/plugins/vnets-tab.js:573
 #: ../public/js/plugins/clusters-tab.js:29
 #: ../public/js/plugins/clusters-tab.js:543
 #: ../public/js/plugins/clusters-tab.js:649 ../public/js/plugins/vms-tab.js:69
-#: ../public/js/plugins/vms-tab.js:961
+#: ../public/js/plugins/vms-tab.js:972
 #: ../public/js/plugins/datastores-tab.js:29
-#: ../public/js/plugins/datastores-tab.js:462
+#: ../public/js/plugins/datastores-tab.js:461
 #: ../public/js/plugins/hosts-tab.js:46
 #: ../public/js/plugins/templates-tab.js:28
-#: ../public/js/plugins/templates-tab.js:949
-#: ../public/js/plugins/users-tab.js:33 ../public/js/plugins/users-tab.js:598
-#: ../public/js/plugins/groups-tab.js:31
-#: ../public/js/plugins/groups-tab.js:399
+#: ../public/js/plugins/templates-tab.js:918
+#: ../public/js/plugins/users-tab.js:53 ../public/js/plugins/users-tab.js:631
+#: ../public/js/plugins/groups-tab.js:50
+#: ../public/js/plugins/groups-tab.js:433
 #: ../public/js/plugins/images-tab.js:28
-#: ../public/js/plugins/images-tab.js:621
+#: ../public/js/plugins/images-tab.js:613
 msgid "ID"
 msgstr ""
 
-#: ../public/js/plugins/marketplace-tab.js:101
+#: ../public/js/plugins/marketplace-tab.js:104
 #: ../public/js/plugins/vnets-tab.js:31 ../public/js/plugins/vnets-tab.js:58
-#: ../public/js/plugins/vnets-tab.js:128 ../public/js/plugins/vnets-tab.js:578
+#: ../public/js/plugins/vnets-tab.js:128 ../public/js/plugins/vnets-tab.js:577
 #: ../public/js/plugins/clusters-tab.js:30
 #: ../public/js/plugins/clusters-tab.js:44
 #: ../public/js/plugins/clusters-tab.js:547
 #: ../public/js/plugins/clusters-tab.js:653 ../public/js/plugins/vms-tab.js:72
-#: ../public/js/plugins/vms-tab.js:965
+#: ../public/js/plugins/vms-tab.js:976
 #: ../public/js/plugins/datastores-tab.js:32
 #: ../public/js/plugins/datastores-tab.js:54
-#: ../public/js/plugins/datastores-tab.js:466
+#: ../public/js/plugins/datastores-tab.js:465
 #: ../public/js/plugins/hosts-tab.js:47 ../public/js/plugins/hosts-tab.js:79
-#: ../public/js/plugins/hosts-tab.js:677
+#: ../public/js/plugins/hosts-tab.js:666
 #: ../public/js/plugins/templates-tab.js:31
 #: ../public/js/plugins/templates-tab.js:79
-#: ../public/js/plugins/templates-tab.js:481
-#: ../public/js/plugins/templates-tab.js:546
-#: ../public/js/plugins/templates-tab.js:953
-#: ../public/js/plugins/templates-tab.js:2134
-#: ../public/js/plugins/users-tab.js:34 ../public/js/plugins/groups-tab.js:32
+#: ../public/js/plugins/templates-tab.js:450
+#: ../public/js/plugins/templates-tab.js:515
+#: ../public/js/plugins/templates-tab.js:922
+#: ../public/js/plugins/templates-tab.js:2057
+#: ../public/js/plugins/users-tab.js:54 ../public/js/plugins/groups-tab.js:51
 #: ../public/js/plugins/images-tab.js:31 ../public/js/plugins/images-tab.js:65
-#: ../public/js/plugins/images-tab.js:158
-#: ../public/js/plugins/images-tab.js:625
-#: ../public/js/plugins/images-tab.js:1163
+#: ../public/js/plugins/images-tab.js:150
+#: ../public/js/plugins/images-tab.js:617
+#: ../public/js/plugins/images-tab.js:1138
 msgid "Name"
 msgstr ""
 
-#: ../public/js/plugins/marketplace-tab.js:102
-#: ../public/js/plugins/marketplace-tab.js:160
+#: ../public/js/plugins/marketplace-tab.js:105
+#: ../public/js/plugins/marketplace-tab.js:163
 msgid "Publisher"
 msgstr ""
 
-#: ../public/js/plugins/marketplace-tab.js:103
-#: ../public/js/plugins/marketplace-tab.js:180
+#: ../public/js/plugins/marketplace-tab.js:106
+#: ../public/js/plugins/marketplace-tab.js:183
 msgid "Hypervisor"
 msgstr ""
 
-#: ../public/js/plugins/marketplace-tab.js:104
-#: ../public/js/plugins/marketplace-tab.js:172
+#: ../public/js/plugins/marketplace-tab.js:107
+#: ../public/js/plugins/marketplace-tab.js:175
 msgid "Arch"
 msgstr ""
 
-#: ../public/js/plugins/marketplace-tab.js:105
-#: ../public/js/plugins/vms-tab.js:1174
-#: ../public/js/plugins/templates-tab.js:248
+#: ../public/js/plugins/marketplace-tab.js:108
+#: ../public/js/plugins/vms-tab.js:1185
+#: ../public/js/plugins/templates-tab.js:230
 msgid "Format"
 msgstr ""
 
-#: ../public/js/plugins/marketplace-tab.js:106
+#: ../public/js/plugins/marketplace-tab.js:109
 msgid "Tags"
 msgstr ""
 
-#: ../public/js/plugins/marketplace-tab.js:116
+#: ../public/js/plugins/marketplace-tab.js:119
 msgid "Marketplace"
 msgstr ""
 
-#: ../public/js/plugins/marketplace-tab.js:131
-#: ../public/js/plugins/marketplace-tab.js:144
-#: ../public/js/plugins/marketplace-tab.js:148
+#: ../public/js/plugins/marketplace-tab.js:134
+#: ../public/js/plugins/marketplace-tab.js:147
+#: ../public/js/plugins/marketplace-tab.js:151
 msgid "Appliance information"
 msgstr ""
 
-#: ../public/js/plugins/marketplace-tab.js:156
+#: ../public/js/plugins/marketplace-tab.js:159
 msgid "URL"
 msgstr ""
 
-#: ../public/js/plugins/marketplace-tab.js:164
+#: ../public/js/plugins/marketplace-tab.js:167
 msgid "Downloads"
 msgstr ""
 
-#: ../public/js/plugins/marketplace-tab.js:168
+#: ../public/js/plugins/marketplace-tab.js:171
 #: ../public/js/plugins/images-tab.js:85
-#: ../public/js/plugins/images-tab.js:552
+#: ../public/js/plugins/images-tab.js:544
 msgid "OS"
 msgstr ""
 
-#: ../public/js/plugins/marketplace-tab.js:176
-#: ../public/js/plugins/dashboard-users-tab.js:111
-#: ../public/js/plugins/vms-tab.js:1169
-#: ../public/js/plugins/templates-tab.js:242
+#: ../public/js/plugins/marketplace-tab.js:179
+#: ../public/js/plugins/vms-tab.js:1180
+#: ../public/js/plugins/templates-tab.js:224
 #: ../public/js/plugins/images-tab.js:33
-#: ../public/js/plugins/images-tab.js:141
+#: ../public/js/plugins/images-tab.js:133
 msgid "Size"
 msgstr ""
 
-#: ../public/js/plugins/marketplace-tab.js:187
+#: ../public/js/plugins/marketplace-tab.js:190
 #: ../public/js/plugins/images-tab.js:70
 msgid "Description"
 msgstr ""
@@ -264,13 +266,13 @@ msgid "Access Control Lists"
 msgstr ""
 
 #: ../public/js/plugins/acls-tab.js:29 ../public/js/plugins/acls-tab.js:68
-#: ../public/js/plugins/acls-tab.js:216 ../public/js/plugins/acls-tab.js:234
-#: ../public/js/plugins/acls-tab.js:497 ../public/js/plugins/vnets-tab.js:27
+#: ../public/js/plugins/acls-tab.js:215 ../public/js/plugins/acls-tab.js:233
+#: ../public/js/plugins/acls-tab.js:496 ../public/js/plugins/vnets-tab.js:27
 #: ../public/js/plugins/clusters-tab.js:28 ../public/js/plugins/vms-tab.js:68
 #: ../public/js/plugins/datastores-tab.js:28
 #: ../public/js/plugins/hosts-tab.js:45
 #: ../public/js/plugins/templates-tab.js:27
-#: ../public/js/plugins/users-tab.js:32 ../public/js/plugins/groups-tab.js:30
+#: ../public/js/plugins/users-tab.js:52 ../public/js/plugins/groups-tab.js:49
 #: ../public/js/plugins/images-tab.js:27
 msgid "All"
 msgstr ""
@@ -303,18 +305,18 @@ msgstr ""
 msgid "This rule applies to"
 msgstr ""
 
-#: ../public/js/plugins/acls-tab.js:57 ../public/js/plugins/acls-tab.js:269
+#: ../public/js/plugins/acls-tab.js:57 ../public/js/plugins/acls-tab.js:268
 #: ../public/js/plugins/clusters-tab.js:31
 #: ../public/js/plugins/clusters-tab.js:591
 #: ../public/js/plugins/clusters-tab.js:698
 #: ../public/js/plugins/clusters-tab.js:807
-#: ../public/js/plugins/hosts-tab.js:38 ../public/js/plugins/hosts-tab.js:370
+#: ../public/js/plugins/hosts-tab.js:38 ../public/js/plugins/hosts-tab.js:371
 #: ../public/js/plugins/infra-tab.js:34
 #: ../public/js/plugins/dashboard-tab.js:25
 msgid "Hosts"
 msgstr ""
 
-#: ../public/js/plugins/acls-tab.js:58 ../public/js/plugins/acls-tab.js:290
+#: ../public/js/plugins/acls-tab.js:58 ../public/js/plugins/acls-tab.js:289
 #: ../public/js/plugins/clusters-tab.js:21
 #: ../public/js/plugins/clusters-tab.js:253
 #: ../public/js/plugins/infra-tab.js:30
@@ -322,26 +324,27 @@ msgstr ""
 msgid "Clusters"
 msgstr ""
 
-#: ../public/js/plugins/acls-tab.js:59 ../public/js/plugins/acls-tab.js:293
+#: ../public/js/plugins/acls-tab.js:59 ../public/js/plugins/acls-tab.js:292
 #: ../public/js/plugins/clusters-tab.js:33
 #: ../public/js/plugins/clusters-tab.js:604
 #: ../public/js/plugins/clusters-tab.js:712
 #: ../public/js/plugins/clusters-tab.js:814
 #: ../public/js/plugins/datastores-tab.js:21
-#: ../public/js/plugins/datastores-tab.js:363
+#: ../public/js/plugins/datastores-tab.js:362
 #: ../public/js/plugins/infra-tab.js:38
 msgid "Datastores"
 msgstr ""
 
-#: ../public/js/plugins/acls-tab.js:60 ../public/js/plugins/acls-tab.js:272
+#: ../public/js/plugins/acls-tab.js:60 ../public/js/plugins/acls-tab.js:271
 #: ../public/js/plugins/dashboard-users-tab.js:43
-#: ../public/js/plugins/vms-tab.js:61 ../public/js/plugins/vms-tab.js:647
+#: ../public/js/plugins/dashboard-users-tab.js:111
+#: ../public/js/plugins/vms-tab.js:61 ../public/js/plugins/vms-tab.js:658
 #: ../public/js/plugins/dashboard-tab.js:109
 msgid "Virtual Machines"
 msgstr ""
 
-#: ../public/js/plugins/acls-tab.js:61 ../public/js/plugins/acls-tab.js:275
-#: ../public/js/plugins/vnets-tab.js:20 ../public/js/plugins/vnets-tab.js:490
+#: ../public/js/plugins/acls-tab.js:61 ../public/js/plugins/acls-tab.js:274
+#: ../public/js/plugins/vnets-tab.js:20 ../public/js/plugins/vnets-tab.js:489
 #: ../public/js/plugins/clusters-tab.js:32
 #: ../public/js/plugins/clusters-tab.js:617
 #: ../public/js/plugins/clusters-tab.js:728
@@ -351,31 +354,30 @@ msgstr ""
 msgid "Virtual Networks"
 msgstr ""
 
-#: ../public/js/plugins/acls-tab.js:62 ../public/js/plugins/acls-tab.js:278
-#: ../public/js/plugins/dashboard-users-tab.js:114
-#: ../public/js/plugins/datastores-tab.js:494
+#: ../public/js/plugins/acls-tab.js:62 ../public/js/plugins/acls-tab.js:277
+#: ../public/js/plugins/datastores-tab.js:493
 #: ../public/js/plugins/vresources-tab.js:47
 #: ../public/js/plugins/images-tab.js:20
-#: ../public/js/plugins/images-tab.js:529
+#: ../public/js/plugins/images-tab.js:521
 msgid "Images"
 msgstr ""
 
 #: ../public/js/plugins/acls-tab.js:63
 #: ../public/js/plugins/templates-tab.js:20
-#: ../public/js/plugins/templates-tab.js:854
+#: ../public/js/plugins/templates-tab.js:823
 msgid "Templates"
 msgstr ""
 
-#: ../public/js/plugins/acls-tab.js:64 ../public/js/plugins/acls-tab.js:284
-#: ../public/js/plugins/acls-tab.js:489 ../public/js/plugins/users-tab.js:25
-#: ../public/js/plugins/users-tab.js:444 ../public/js/plugins/groups-tab.js:33
+#: ../public/js/plugins/acls-tab.js:64 ../public/js/plugins/acls-tab.js:283
+#: ../public/js/plugins/acls-tab.js:488 ../public/js/plugins/users-tab.js:45
+#: ../public/js/plugins/users-tab.js:477 ../public/js/plugins/groups-tab.js:52
 #: ../public/js/plugins/system-tab.js:34
 msgid "Users"
 msgstr ""
 
-#: ../public/js/plugins/acls-tab.js:65 ../public/js/plugins/acls-tab.js:287
-#: ../public/js/plugins/acls-tab.js:494 ../public/js/plugins/groups-tab.js:23
-#: ../public/js/plugins/groups-tab.js:272
+#: ../public/js/plugins/acls-tab.js:65 ../public/js/plugins/acls-tab.js:286
+#: ../public/js/plugins/acls-tab.js:493 ../public/js/plugins/groups-tab.js:42
+#: ../public/js/plugins/groups-tab.js:306
 #: ../public/js/plugins/system-tab.js:30
 msgid "Groups"
 msgstr ""
@@ -396,40 +398,40 @@ msgstr ""
 msgid "Resource ID"
 msgstr ""
 
-#: ../public/js/plugins/acls-tab.js:75 ../public/js/plugins/acls-tab.js:241
+#: ../public/js/plugins/acls-tab.js:75 ../public/js/plugins/acls-tab.js:240
 #: ../public/js/plugins/vnets-tab.js:30 ../public/js/plugins/vnets-tab.js:190
-#: ../public/js/plugins/vnets-tab.js:590 ../public/js/plugins/vnets-tab.js:615
+#: ../public/js/plugins/vnets-tab.js:589 ../public/js/plugins/vnets-tab.js:614
 #: ../public/js/plugins/vms-tab.js:71 ../public/js/plugins/vms-tab.js:148
-#: ../public/js/plugins/vms-tab.js:973 ../public/js/plugins/vms-tab.js:1002
+#: ../public/js/plugins/vms-tab.js:984 ../public/js/plugins/vms-tab.js:1013
 #: ../public/js/plugins/datastores-tab.js:31
 #: ../public/js/plugins/datastores-tab.js:112
-#: ../public/js/plugins/datastores-tab.js:474
-#: ../public/js/plugins/datastores-tab.js:503
+#: ../public/js/plugins/datastores-tab.js:473
+#: ../public/js/plugins/datastores-tab.js:502
 #: ../public/js/plugins/templates-tab.js:30
-#: ../public/js/plugins/templates-tab.js:616
-#: ../public/js/plugins/templates-tab.js:961
-#: ../public/js/plugins/templates-tab.js:974
-#: ../public/js/plugins/users-tab.js:35 ../public/js/plugins/users-tab.js:602
+#: ../public/js/plugins/templates-tab.js:585
+#: ../public/js/plugins/templates-tab.js:930
+#: ../public/js/plugins/templates-tab.js:943
+#: ../public/js/plugins/users-tab.js:55 ../public/js/plugins/users-tab.js:635
 #: ../public/js/plugins/images-tab.js:30
-#: ../public/js/plugins/images-tab.js:224
-#: ../public/js/plugins/images-tab.js:637
-#: ../public/js/plugins/images-tab.js:682
+#: ../public/js/plugins/images-tab.js:216
+#: ../public/js/plugins/images-tab.js:629
+#: ../public/js/plugins/images-tab.js:674
 msgid "Group"
 msgstr ""
 
 #: ../public/js/plugins/acls-tab.js:79 ../public/js/plugins/vnets-tab.js:180
 #: ../public/js/plugins/vms-tab.js:138
 #: ../public/js/plugins/datastores-tab.js:102
-#: ../public/js/plugins/templates-tab.js:606
-#: ../public/js/plugins/images-tab.js:214
+#: ../public/js/plugins/templates-tab.js:575
+#: ../public/js/plugins/images-tab.js:206
 msgid "Use"
 msgstr ""
 
 #: ../public/js/plugins/acls-tab.js:80 ../public/js/plugins/vnets-tab.js:181
 #: ../public/js/plugins/vms-tab.js:139
 #: ../public/js/plugins/datastores-tab.js:103
-#: ../public/js/plugins/templates-tab.js:607
-#: ../public/js/plugins/images-tab.js:215
+#: ../public/js/plugins/templates-tab.js:576
+#: ../public/js/plugins/images-tab.js:207
 msgid "Manage"
 msgstr ""
 
@@ -441,12 +443,12 @@ msgstr ""
 #: ../public/js/plugins/vnets-tab.js:143 ../public/js/plugins/vnets-tab.js:160
 #: ../public/js/plugins/clusters-tab.js:48 ../public/js/plugins/vms-tab.js:121
 #: ../public/js/plugins/datastores-tab.js:85
-#: ../public/js/plugins/hosts-tab.js:136
-#: ../public/js/plugins/templates-tab.js:569
-#: ../public/js/plugins/templates-tab.js:586
-#: ../public/js/plugins/users-tab.js:85 ../public/js/plugins/groups-tab.js:60
-#: ../public/js/plugins/images-tab.js:172
-#: ../public/js/plugins/images-tab.js:190
+#: ../public/js/plugins/hosts-tab.js:137
+#: ../public/js/plugins/templates-tab.js:538
+#: ../public/js/plugins/templates-tab.js:555
+#: ../public/js/plugins/users-tab.js:105 ../public/js/plugins/groups-tab.js:79
+#: ../public/js/plugins/images-tab.js:164
+#: ../public/js/plugins/images-tab.js:182
 msgid "Create"
 msgstr ""
 
@@ -457,77 +459,77 @@ msgstr ""
 #: ../public/js/plugins/acls-tab.js:91 ../public/js/plugins/vnets-tab.js:145
 #: ../public/js/plugins/vnets-tab.js:162
 #: ../public/js/plugins/clusters-tab.js:49 ../public/js/plugins/vms-tab.js:122
-#: ../public/js/plugins/vms-tab.js:599
+#: ../public/js/plugins/vms-tab.js:606
 #: ../public/js/plugins/datastores-tab.js:86
-#: ../public/js/plugins/hosts-tab.js:137
-#: ../public/js/plugins/templates-tab.js:571
-#: ../public/js/plugins/templates-tab.js:588
-#: ../public/js/plugins/users-tab.js:86 ../public/js/plugins/users-tab.js:102
-#: ../public/js/plugins/groups-tab.js:61
-#: ../public/js/plugins/images-tab.js:173
-#: ../public/js/plugins/images-tab.js:192
+#: ../public/js/plugins/hosts-tab.js:138
+#: ../public/js/plugins/templates-tab.js:540
+#: ../public/js/plugins/templates-tab.js:557
+#: ../public/js/plugins/users-tab.js:106 ../public/js/plugins/users-tab.js:122
+#: ../public/js/plugins/groups-tab.js:80
+#: ../public/js/plugins/images-tab.js:165
+#: ../public/js/plugins/images-tab.js:184
 msgid "Reset"
 msgstr ""
 
-#: ../public/js/plugins/acls-tab.js:164 ../public/js/plugins/vnets-tab.js:435
+#: ../public/js/plugins/acls-tab.js:164 ../public/js/plugins/vnets-tab.js:434
 #: ../public/js/plugins/clusters-tab.js:220
-#: ../public/js/plugins/vms-tab.js:500
-#: ../public/js/plugins/datastores-tab.js:308
-#: ../public/js/plugins/hosts-tab.js:314
-#: ../public/js/plugins/templates-tab.js:805
-#: ../public/js/plugins/users-tab.js:368
-#: ../public/js/plugins/images-tab.js:458
+#: ../public/js/plugins/vms-tab.js:502
+#: ../public/js/plugins/datastores-tab.js:307
+#: ../public/js/plugins/hosts-tab.js:315
+#: ../public/js/plugins/templates-tab.js:774
+#: ../public/js/plugins/users-tab.js:397
+#: ../public/js/plugins/images-tab.js:450
 msgid "+ New"
 msgstr ""
 
-#: ../public/js/plugins/acls-tab.js:168 ../public/js/plugins/vnets-tab.js:468
+#: ../public/js/plugins/acls-tab.js:168 ../public/js/plugins/vnets-tab.js:467
 #: ../public/js/plugins/clusters-tab.js:229
-#: ../public/js/plugins/vms-tab.js:612
-#: ../public/js/plugins/datastores-tab.js:340
-#: ../public/js/plugins/templates-tab.js:836
-#: ../public/js/plugins/users-tab.js:421
-#: ../public/js/plugins/groups-tab.js:254
-#: ../public/js/plugins/images-tab.js:506
+#: ../public/js/plugins/vms-tab.js:619
+#: ../public/js/plugins/datastores-tab.js:339
+#: ../public/js/plugins/templates-tab.js:805
+#: ../public/js/plugins/users-tab.js:450
+#: ../public/js/plugins/groups-tab.js:284
+#: ../public/js/plugins/images-tab.js:498
 msgid "Delete"
 msgstr ""
 
-#: ../public/js/plugins/acls-tab.js:179
+#: ../public/js/plugins/acls-tab.js:178
 msgid "ACLs"
 msgstr ""
 
-#: ../public/js/plugins/acls-tab.js:219
+#: ../public/js/plugins/acls-tab.js:218
 msgid "User"
 msgstr ""
 
-#: ../public/js/plugins/acls-tab.js:223
+#: ../public/js/plugins/acls-tab.js:222
 msgid "Group "
 msgstr ""
 
-#: ../public/js/plugins/acls-tab.js:281
+#: ../public/js/plugins/acls-tab.js:280
 #: ../public/js/plugins/vresources-tab.js:30
 msgid "VM Templates"
 msgstr ""
 
-#: ../public/js/plugins/acls-tab.js:348
+#: ../public/js/plugins/acls-tab.js:347
 msgid "Create ACL"
 msgstr ""
 
-#: ../public/js/plugins/acls-tab.js:439
+#: ../public/js/plugins/acls-tab.js:438
 msgid "Please specify to who this ACL applies"
 msgstr ""
 
-#: ../public/js/plugins/acls-tab.js:445
+#: ../public/js/plugins/acls-tab.js:444
 msgid "Please select at least one resource"
 msgstr ""
 
-#: ../public/js/plugins/acls-tab.js:454
+#: ../public/js/plugins/acls-tab.js:453
 msgid "Please provide a resource ID for the resource(s) in this rule"
 msgstr ""
 
 #: ../public/js/plugins/dashboard-users-tab.js:25
-#: ../public/js/plugins/users-tab.js:434 ../public/js/plugins/users-tab.js:590
-#: ../public/js/plugins/users-tab.js:594
-msgid "User information"
+#: ../public/js/plugins/users-tab.js:467 ../public/js/plugins/users-tab.js:673
+#: ../public/js/plugins/users-tab.js:844
+msgid "User quotas"
 msgstr ""
 
 #: ../public/js/plugins/dashboard-users-tab.js:48
@@ -536,8 +538,8 @@ msgid "Total VMs"
 msgstr ""
 
 #: ../public/js/plugins/dashboard-users-tab.js:49
-#: ../public/js/plugins/vms-tab.js:977 ../public/js/plugins/hosts-tab.js:685
-#: ../public/js/plugins/images-tab.js:669
+#: ../public/js/plugins/vms-tab.js:988 ../public/js/plugins/hosts-tab.js:674
+#: ../public/js/plugins/images-tab.js:661
 #: ../public/js/plugins/dashboard-tab.js:31
 #: ../public/js/plugins/dashboard-tab.js:115
 msgid "State"
@@ -563,132 +565,129 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
-#: ../public/js/plugins/dashboard-users-tab.js:101
-msgid "VMS"
-msgstr ""
-
-#: ../public/js/plugins/dashboard-users-tab.js:103
-#: ../public/js/plugins/vms-tab.js:33 ../public/js/plugins/vms-tab.js:75
-#: ../public/js/plugins/templates-tab.js:84
+#: ../public/js/plugins/dashboard-users-tab.js:127
+#: ../public/js/plugins/vms-tab.js:33 ../public/js/plugins/templates-tab.js:84
+#: ../public/js/plugins/users-tab.js:29 ../public/js/plugins/groups-tab.js:27
 msgid "Memory"
 msgstr ""
 
-#: ../public/js/plugins/dashboard-users-tab.js:105
-#: ../public/js/plugins/vms-tab.js:28 ../public/js/plugins/vms-tab.js:74
-#: ../public/js/plugins/templates-tab.js:89
+#: ../public/js/plugins/dashboard-users-tab.js:140
+#: ../public/js/plugins/vms-tab.js:28 ../public/js/plugins/templates-tab.js:89
+#: ../public/js/plugins/users-tab.js:25 ../public/js/plugins/groups-tab.js:23
 msgid "CPU"
 msgstr ""
 
-#: ../public/js/plugins/dashboard-users-tab.js:109
+#: ../public/js/plugins/dashboard-users-tab.js:149
 #: ../public/js/plugins/datastores-tab.js:125
-#: ../public/js/plugins/users-tab.js:114 ../public/js/plugins/users-tab.js:127
-#: ../public/js/plugins/groups-tab.js:73 ../public/js/plugins/groups-tab.js:86
+#: ../public/js/plugins/users-tab.js:134 ../public/js/plugins/users-tab.js:147
+#: ../public/js/plugins/groups-tab.js:92
+#: ../public/js/plugins/groups-tab.js:105
 #: ../public/js/plugins/images-tab.js:32 ../public/js/plugins/images-tab.js:75
-#: ../public/js/plugins/images-tab.js:182
-#: ../public/js/plugins/images-tab.js:629
+#: ../public/js/plugins/images-tab.js:174
+#: ../public/js/plugins/images-tab.js:621
 msgid "Datastore"
 msgstr ""
 
-#: ../public/js/plugins/dashboard-users-tab.js:118
+#: ../public/js/plugins/dashboard-users-tab.js:154
+msgid "Storage size"
+msgstr ""
+
+#: ../public/js/plugins/dashboard-users-tab.js:167
+msgid "Number of images"
+msgstr ""
+
+#: ../public/js/plugins/dashboard-users-tab.js:178
 #: ../public/js/plugins/templates-tab.js:203
 #: ../public/js/plugins/templates-tab.js:208
-#: ../public/js/plugins/users-tab.js:115 ../public/js/plugins/users-tab.js:135
-#: ../public/js/plugins/groups-tab.js:74 ../public/js/plugins/groups-tab.js:94
-#: ../public/js/plugins/images-tab.js:617
+#: ../public/js/plugins/users-tab.js:135 ../public/js/plugins/users-tab.js:155
+#: ../public/js/plugins/groups-tab.js:93
+#: ../public/js/plugins/groups-tab.js:113
+#: ../public/js/plugins/images-tab.js:609
 msgid "Image"
 msgstr ""
 
-#: ../public/js/plugins/dashboard-users-tab.js:120
+#: ../public/js/plugins/dashboard-users-tab.js:184
 msgid "RVMs"
 msgstr ""
 
-#: ../public/js/plugins/dashboard-users-tab.js:124
-#: ../public/js/plugins/templates-tab.js:294
-#: ../public/js/plugins/templates-tab.js:305
-#: ../public/js/plugins/users-tab.js:116 ../public/js/plugins/users-tab.js:141
-#: ../public/js/plugins/groups-tab.js:75
-#: ../public/js/plugins/groups-tab.js:100
+#: ../public/js/plugins/dashboard-users-tab.js:193
+#: ../public/js/plugins/templates-tab.js:262
+#: ../public/js/plugins/templates-tab.js:273
+#: ../public/js/plugins/users-tab.js:136 ../public/js/plugins/users-tab.js:161
+#: ../public/js/plugins/groups-tab.js:94
+#: ../public/js/plugins/groups-tab.js:119
 msgid "Network"
 msgstr ""
 
-#: ../public/js/plugins/dashboard-users-tab.js:126
+#: ../public/js/plugins/dashboard-users-tab.js:199
 msgid "Leases"
 msgstr ""
 
-#: ../public/js/plugins/dashboard-users-tab.js:135
-msgid "Resource quotas"
-msgstr ""
-
-#: ../public/js/plugins/dashboard-users-tab.js:136
-msgid "Used&nbsp;/&nbsp;Allowed"
-msgstr ""
-
-#: ../public/js/plugins/dashboard-users-tab.js:144
+#: ../public/js/plugins/dashboard-users-tab.js:217
 msgid "VM quota"
 msgstr ""
 
-#: ../public/js/plugins/dashboard-users-tab.js:146
-#: ../public/js/plugins/dashboard-users-tab.js:156
-#: ../public/js/plugins/dashboard-users-tab.js:166
-#: ../public/js/plugins/dashboard-users-tab.js:176
-#: ../public/js/plugins/templates-tab.js:1083
+#: ../public/js/plugins/dashboard-users-tab.js:219
+#: ../public/js/plugins/dashboard-users-tab.js:229
+#: ../public/js/plugins/dashboard-users-tab.js:239
+#: ../public/js/plugins/dashboard-users-tab.js:249
 msgid "None"
 msgstr ""
 
-#: ../public/js/plugins/dashboard-users-tab.js:154
+#: ../public/js/plugins/dashboard-users-tab.js:227
 msgid "Datastore quotas"
 msgstr ""
 
-#: ../public/js/plugins/dashboard-users-tab.js:164
+#: ../public/js/plugins/dashboard-users-tab.js:237
 msgid "Image quotas"
 msgstr ""
 
-#: ../public/js/plugins/dashboard-users-tab.js:174
+#: ../public/js/plugins/dashboard-users-tab.js:247
 msgid "Network quotas"
 msgstr ""
 
 #: ../public/js/plugins/vnets-tab.js:29 ../public/js/plugins/vnets-tab.js:184
-#: ../public/js/plugins/vnets-tab.js:586 ../public/js/plugins/vnets-tab.js:611
+#: ../public/js/plugins/vnets-tab.js:585 ../public/js/plugins/vnets-tab.js:610
 #: ../public/js/plugins/vms-tab.js:70 ../public/js/plugins/vms-tab.js:142
-#: ../public/js/plugins/vms-tab.js:969 ../public/js/plugins/vms-tab.js:998
+#: ../public/js/plugins/vms-tab.js:980 ../public/js/plugins/vms-tab.js:1009
 #: ../public/js/plugins/datastores-tab.js:30
 #: ../public/js/plugins/datastores-tab.js:106
-#: ../public/js/plugins/datastores-tab.js:470
-#: ../public/js/plugins/datastores-tab.js:499
+#: ../public/js/plugins/datastores-tab.js:469
+#: ../public/js/plugins/datastores-tab.js:498
 #: ../public/js/plugins/templates-tab.js:29
-#: ../public/js/plugins/templates-tab.js:610
-#: ../public/js/plugins/templates-tab.js:957
-#: ../public/js/plugins/templates-tab.js:970
+#: ../public/js/plugins/templates-tab.js:579
+#: ../public/js/plugins/templates-tab.js:926
+#: ../public/js/plugins/templates-tab.js:939
 #: ../public/js/plugins/images-tab.js:29
-#: ../public/js/plugins/images-tab.js:218
-#: ../public/js/plugins/images-tab.js:633
-#: ../public/js/plugins/images-tab.js:678
+#: ../public/js/plugins/images-tab.js:210
+#: ../public/js/plugins/images-tab.js:625
+#: ../public/js/plugins/images-tab.js:670
 msgid "Owner"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:32 ../public/js/plugins/vnets-tab.js:582
+#: ../public/js/plugins/vnets-tab.js:32 ../public/js/plugins/vnets-tab.js:581
 #: ../public/js/plugins/datastores-tab.js:33
 #: ../public/js/plugins/datastores-tab.js:60
-#: ../public/js/plugins/datastores-tab.js:478
-#: ../public/js/plugins/hosts-tab.js:48 ../public/js/plugins/hosts-tab.js:129
-#: ../public/js/plugins/hosts-tab.js:681
+#: ../public/js/plugins/datastores-tab.js:477
+#: ../public/js/plugins/hosts-tab.js:48 ../public/js/plugins/hosts-tab.js:130
+#: ../public/js/plugins/hosts-tab.js:670
 msgid "Cluster"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:33 ../public/js/plugins/vms-tab.js:1154
-#: ../public/js/plugins/vms-tab.js:1179
-#: ../public/js/plugins/templates-tab.js:225
-#: ../public/js/plugins/templates-tab.js:407
-#: ../public/js/plugins/users-tab.js:152
-#: ../public/js/plugins/groups-tab.js:111
+#: ../public/js/plugins/vnets-tab.js:33 ../public/js/plugins/vms-tab.js:1165
+#: ../public/js/plugins/vms-tab.js:1190
+#: ../public/js/plugins/templates-tab.js:215
+#: ../public/js/plugins/templates-tab.js:375
+#: ../public/js/plugins/users-tab.js:172
+#: ../public/js/plugins/groups-tab.js:130
 #: ../public/js/plugins/images-tab.js:34 ../public/js/plugins/images-tab.js:83
-#: ../public/js/plugins/images-tab.js:641
+#: ../public/js/plugins/images-tab.js:633
 msgid "Type"
 msgstr ""
 
 #: ../public/js/plugins/vnets-tab.js:34 ../public/js/plugins/vnets-tab.js:71
-#: ../public/js/plugins/vnets-tab.js:594
-#: ../public/js/plugins/templates-tab.js:322
+#: ../public/js/plugins/vnets-tab.js:593
+#: ../public/js/plugins/templates-tab.js:290
 msgid "Bridge"
 msgstr ""
 
@@ -720,50 +719,44 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:66 ../public/js/plugins/hosts-tab.js:117
+#: ../public/js/plugins/vnets-tab.js:66 ../public/js/plugins/hosts-tab.js:118
 msgid "802.1Q"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:67 ../public/js/plugins/hosts-tab.js:118
+#: ../public/js/plugins/vnets-tab.js:67 ../public/js/plugins/hosts-tab.js:119
 msgid "ebtables"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:68 ../public/js/plugins/hosts-tab.js:119
+#: ../public/js/plugins/vnets-tab.js:68 ../public/js/plugins/hosts-tab.js:120
 msgid "Open vSwitch"
 msgstr ""
 
 #: ../public/js/plugins/vnets-tab.js:69
 #: ../public/js/plugins/datastores-tab.js:66
 #: ../public/js/plugins/hosts-tab.js:88 ../public/js/plugins/hosts-tab.js:102
-#: ../public/js/plugins/hosts-tab.js:120
+#: ../public/js/plugins/hosts-tab.js:121
 msgid "VMware"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:73 ../public/js/plugins/vnets-tab.js:602
+#: ../public/js/plugins/vnets-tab.js:73 ../public/js/plugins/vnets-tab.js:601
 msgid "Physical device"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:75 ../public/js/plugins/vnets-tab.js:598
+#: ../public/js/plugins/vnets-tab.js:75 ../public/js/plugins/vnets-tab.js:597
 msgid "VLAN"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:77 ../public/js/plugins/vms-tab.js:1197
-#: ../public/js/plugins/vms-tab.js:1205
-#: ../public/js/plugins/templates-tab.js:255
-#: ../public/js/plugins/templates-tab.js:264
-#: ../public/js/plugins/templates-tab.js:272
+#: ../public/js/plugins/vnets-tab.js:77 ../public/js/plugins/vms-tab.js:1208
+#: ../public/js/plugins/vms-tab.js:1216
 msgid "Yes"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:78 ../public/js/plugins/vms-tab.js:1196
-#: ../public/js/plugins/vms-tab.js:1204
-#: ../public/js/plugins/templates-tab.js:256
-#: ../public/js/plugins/templates-tab.js:263
-#: ../public/js/plugins/templates-tab.js:271
+#: ../public/js/plugins/vnets-tab.js:78 ../public/js/plugins/vms-tab.js:1207
+#: ../public/js/plugins/vms-tab.js:1215
 msgid "No"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:80 ../public/js/plugins/vnets-tab.js:606
+#: ../public/js/plugins/vnets-tab.js:80 ../public/js/plugins/vnets-tab.js:605
 msgid "VLAN ID"
 msgstr ""
 
@@ -788,23 +781,23 @@ msgid "Lease MAC (opt):"
 msgstr ""
 
 #: ../public/js/plugins/vnets-tab.js:98 ../public/js/plugins/vnets-tab.js:132
-#: ../public/js/plugins/vnets-tab.js:677
-#: ../public/js/plugins/templates-tab.js:277
-#: ../public/js/plugins/templates-tab.js:389
-#: ../public/js/plugins/templates-tab.js:424
-#: ../public/js/plugins/templates-tab.js:491
-#: ../public/js/plugins/templates-tab.js:556
-#: ../public/js/plugins/images-tab.js:162
+#: ../public/js/plugins/vnets-tab.js:676
+#: ../public/js/plugins/templates-tab.js:245
+#: ../public/js/plugins/templates-tab.js:357
+#: ../public/js/plugins/templates-tab.js:392
+#: ../public/js/plugins/templates-tab.js:460
+#: ../public/js/plugins/templates-tab.js:525
+#: ../public/js/plugins/images-tab.js:154
 msgid "Add"
 msgstr ""
 
 #: ../public/js/plugins/vnets-tab.js:101 ../public/js/plugins/vnets-tab.js:133
-#: ../public/js/plugins/templates-tab.js:278
-#: ../public/js/plugins/templates-tab.js:390
-#: ../public/js/plugins/templates-tab.js:425
-#: ../public/js/plugins/templates-tab.js:492
-#: ../public/js/plugins/templates-tab.js:557
-#: ../public/js/plugins/images-tab.js:163
+#: ../public/js/plugins/templates-tab.js:246
+#: ../public/js/plugins/templates-tab.js:358
+#: ../public/js/plugins/templates-tab.js:393
+#: ../public/js/plugins/templates-tab.js:461
+#: ../public/js/plugins/templates-tab.js:526
+#: ../public/js/plugins/images-tab.js:155
 msgid "Remove selected"
 msgstr ""
 
@@ -824,23 +817,23 @@ msgstr ""
 msgid "Define a subnet by IP range"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:117 ../public/js/plugins/vnets-tab.js:659
+#: ../public/js/plugins/vnets-tab.js:117 ../public/js/plugins/vnets-tab.js:658
 msgid "IP Start"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:119 ../public/js/plugins/vnets-tab.js:663
+#: ../public/js/plugins/vnets-tab.js:119 ../public/js/plugins/vnets-tab.js:662
 msgid "IP End"
 msgstr ""
 
 #: ../public/js/plugins/vnets-tab.js:130
-#: ../public/js/plugins/templates-tab.js:486
-#: ../public/js/plugins/templates-tab.js:551
-#: ../public/js/plugins/images-tab.js:160
+#: ../public/js/plugins/templates-tab.js:455
+#: ../public/js/plugins/templates-tab.js:520
+#: ../public/js/plugins/images-tab.js:152
 msgid "Value"
 msgstr ""
 
 #: ../public/js/plugins/vnets-tab.js:135
-#: ../public/js/plugins/images-tab.js:165
+#: ../public/js/plugins/images-tab.js:157
 msgid "Custom attributes"
 msgstr ""
 
@@ -856,210 +849,211 @@ msgstr ""
 msgid "Select a network"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:179 ../public/js/plugins/vnets-tab.js:609
+#: ../public/js/plugins/vnets-tab.js:179 ../public/js/plugins/vnets-tab.js:608
 #: ../public/js/plugins/vms-tab.js:137
 #: ../public/js/plugins/datastores-tab.js:101
-#: ../public/js/plugins/datastores-tab.js:497
-#: ../public/js/plugins/templates-tab.js:605
-#: ../public/js/plugins/templates-tab.js:968
-#: ../public/js/plugins/images-tab.js:213
-#: ../public/js/plugins/images-tab.js:676
+#: ../public/js/plugins/datastores-tab.js:496
+#: ../public/js/plugins/templates-tab.js:574
+#: ../public/js/plugins/templates-tab.js:937
+#: ../public/js/plugins/images-tab.js:205
+#: ../public/js/plugins/images-tab.js:668
 msgid "Permissions"
 msgstr ""
 
 #: ../public/js/plugins/vnets-tab.js:182 ../public/js/plugins/vms-tab.js:140
 #: ../public/js/plugins/datastores-tab.js:104
-#: ../public/js/plugins/templates-tab.js:608
-#: ../public/js/plugins/images-tab.js:216
+#: ../public/js/plugins/templates-tab.js:577
+#: ../public/js/plugins/images-tab.js:208
 msgid "Admin"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:196 ../public/js/plugins/vnets-tab.js:619
-#: ../public/js/plugins/vms-tab.js:154 ../public/js/plugins/vms-tab.js:1006
+#: ../public/js/plugins/vnets-tab.js:196 ../public/js/plugins/vnets-tab.js:618
+#: ../public/js/plugins/vms-tab.js:154 ../public/js/plugins/vms-tab.js:1017
 #: ../public/js/plugins/datastores-tab.js:118
-#: ../public/js/plugins/datastores-tab.js:507
-#: ../public/js/plugins/templates-tab.js:622
-#: ../public/js/plugins/templates-tab.js:978
-#: ../public/js/plugins/images-tab.js:230
-#: ../public/js/plugins/images-tab.js:686
+#: ../public/js/plugins/datastores-tab.js:506
+#: ../public/js/plugins/templates-tab.js:591
+#: ../public/js/plugins/templates-tab.js:947
+#: ../public/js/plugins/images-tab.js:222
+#: ../public/js/plugins/images-tab.js:678
 msgid "Other"
 msgstr ""
 
 #: ../public/js/plugins/vnets-tab.js:203 ../public/js/plugins/vms-tab.js:161
-#: ../public/js/plugins/templates-tab.js:629
-#: ../public/js/plugins/templates-tab.js:945
-#: ../public/js/plugins/templates-tab.js:984
-#: ../public/js/plugins/templates-tab.js:986
-#: ../public/js/plugins/images-tab.js:237
+#: ../public/js/plugins/templates-tab.js:598
+#: ../public/js/plugins/templates-tab.js:914
+#: ../public/js/plugins/templates-tab.js:953
+#: ../public/js/plugins/templates-tab.js:955
+#: ../public/js/plugins/images-tab.js:229
 msgid "Template"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:440
+#: ../public/js/plugins/vnets-tab.js:439
 #: ../public/js/plugins/clusters-tab.js:224
-#: ../public/js/plugins/vms-tab.js:506
-#: ../public/js/plugins/datastores-tab.js:313
-#: ../public/js/plugins/templates-tab.js:809
-#: ../public/js/plugins/users-tab.js:373
-#: ../public/js/plugins/images-tab.js:462
+#: ../public/js/plugins/vms-tab.js:508
+#: ../public/js/plugins/datastores-tab.js:312
+#: ../public/js/plugins/templates-tab.js:778
+#: ../public/js/plugins/users-tab.js:402
+#: ../public/js/plugins/images-tab.js:454
 msgid "Update properties"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:445
-#: ../public/js/plugins/datastores-tab.js:319
-#: ../public/js/plugins/hosts-tab.js:325
+#: ../public/js/plugins/vnets-tab.js:444
+#: ../public/js/plugins/datastores-tab.js:318
+#: ../public/js/plugins/hosts-tab.js:326
 msgid "Select cluster"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:447
-#: ../public/js/plugins/datastores-tab.js:321
-#: ../public/js/plugins/hosts-tab.js:327
+#: ../public/js/plugins/vnets-tab.js:446
+#: ../public/js/plugins/datastores-tab.js:320
+#: ../public/js/plugins/hosts-tab.js:328
 msgid "Select the destination cluster:"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:452 ../public/js/plugins/vms-tab.js:512
-#: ../public/js/plugins/datastores-tab.js:326
-#: ../public/js/plugins/templates-tab.js:818
-#: ../public/js/plugins/images-tab.js:467
+#: ../public/js/plugins/vnets-tab.js:451 ../public/js/plugins/vms-tab.js:514
+#: ../public/js/plugins/datastores-tab.js:325
+#: ../public/js/plugins/templates-tab.js:787
+#: ../public/js/plugins/images-tab.js:459
 msgid "Change owner"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:454 ../public/js/plugins/vms-tab.js:514
-#: ../public/js/plugins/datastores-tab.js:328
-#: ../public/js/plugins/templates-tab.js:820
-#: ../public/js/plugins/images-tab.js:469
+#: ../public/js/plugins/vnets-tab.js:453 ../public/js/plugins/vms-tab.js:516
+#: ../public/js/plugins/datastores-tab.js:327
+#: ../public/js/plugins/templates-tab.js:789
+#: ../public/js/plugins/images-tab.js:461
 msgid "Select the new owner"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:460 ../public/js/plugins/vms-tab.js:520
-#: ../public/js/plugins/datastores-tab.js:333
-#: ../public/js/plugins/templates-tab.js:825
-#: ../public/js/plugins/users-tab.js:387
-#: ../public/js/plugins/images-tab.js:474
+#: ../public/js/plugins/vnets-tab.js:459 ../public/js/plugins/vms-tab.js:522
+#: ../public/js/plugins/datastores-tab.js:332
+#: ../public/js/plugins/templates-tab.js:794
+#: ../public/js/plugins/users-tab.js:416
+#: ../public/js/plugins/images-tab.js:466
 msgid "Change group"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:462 ../public/js/plugins/vms-tab.js:522
-#: ../public/js/plugins/datastores-tab.js:335
-#: ../public/js/plugins/templates-tab.js:827
-#: ../public/js/plugins/images-tab.js:476
+#: ../public/js/plugins/vnets-tab.js:461 ../public/js/plugins/vms-tab.js:524
+#: ../public/js/plugins/datastores-tab.js:334
+#: ../public/js/plugins/templates-tab.js:796
+#: ../public/js/plugins/images-tab.js:468
 msgid "Select the new group"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:480
+#: ../public/js/plugins/vnets-tab.js:479
 msgid "Virtual network information"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:484
+#: ../public/js/plugins/vnets-tab.js:483 ../public/js/plugins/vnets-tab.js:636
 msgid "Lease management"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:570
+#: ../public/js/plugins/vnets-tab.js:569
 msgid "Virtual Network"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:571
-#: ../public/js/plugins/templates-tab.js:946
-#: ../public/js/plugins/images-tab.js:618
+#: ../public/js/plugins/vnets-tab.js:570
+#: ../public/js/plugins/templates-tab.js:915
+#: ../public/js/plugins/images-tab.js:610
 msgid "information"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:626
+#: ../public/js/plugins/vnets-tab.js:625
 msgid "Virtual Network template (attributes)"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:632
+#: ../public/js/plugins/vnets-tab.js:631
 msgid "Virtual Network information"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:654
+#: ../public/js/plugins/vnets-tab.js:653
 msgid "Leases information"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:667
+#: ../public/js/plugins/vnets-tab.js:666
 msgid "Network mask"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:671
+#: ../public/js/plugins/vnets-tab.js:670
 msgid "Hold lease"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:672 ../public/js/plugins/vms-tab.js:559
+#: ../public/js/plugins/vnets-tab.js:671 ../public/js/plugins/vms-tab.js:561
 msgid "Hold"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:676
+#: ../public/js/plugins/vnets-tab.js:675
 msgid "Add lease"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:686
+#: ../public/js/plugins/vnets-tab.js:685
 msgid "No leases to show"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:732
+#: ../public/js/plugins/vnets-tab.js:731
 msgid "hold"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:732
+#: ../public/js/plugins/vnets-tab.js:731
 msgid "delete"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:735
+#: ../public/js/plugins/vnets-tab.js:734
 msgid "Used by VM"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:738
+#: ../public/js/plugins/vnets-tab.js:737
 msgid "release"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:751
+#: ../public/js/plugins/vnets-tab.js:750
 msgid "Create Virtual Network"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:820
+#: ../public/js/plugins/vnets-tab.js:823
 msgid "Please provide a lease IP"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:886
+#: ../public/js/plugins/vnets-tab.js:889
 msgid "Virtual Network name missing!"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:972
+#: ../public/js/plugins/vnets-tab.js:976
 msgid "There are missing network parameters"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:1024
+#: ../public/js/plugins/vnets-tab.js:1028
 msgid "Update network properties"
 msgstr ""
 
-#: ../public/js/plugins/vnets-tab.js:1049 ../public/js/plugins/vms-tab.js:1514
-#: ../public/js/plugins/datastores-tab.js:622
-#: ../public/js/plugins/templates-tab.js:2048
-#: ../public/js/plugins/images-tab.js:1022
+#: ../public/js/plugins/vnets-tab.js:1053 ../public/js/plugins/vms-tab.js:1524
+#: ../public/js/plugins/datastores-tab.js:621
+#: ../public/js/plugins/templates-tab.js:1971
+#: ../public/js/plugins/images-tab.js:997
 msgid "Loading"
 msgstr ""
 
 #: ../public/js/plugins/clusters-tab.js:184
-#: ../public/js/plugins/hosts-tab.js:268
-#: ../public/js/plugins/templates-tab.js:705
-#: ../public/js/plugins/users-tab.js:314
+#: ../public/js/plugins/hosts-tab.js:269
+#: ../public/js/plugins/templates-tab.js:674
+#: ../public/js/plugins/users-tab.js:334
 msgid "Template updated correctly"
 msgstr ""
 
 #: ../public/js/plugins/clusters-tab.js:236
-#: ../public/js/plugins/hosts-tab.js:354 ../public/js/plugins/hosts-tab.js:665
-#: ../public/js/plugins/hosts-tab.js:669
+#: ../public/js/plugins/hosts-tab.js:355 ../public/js/plugins/hosts-tab.js:654
+#: ../public/js/plugins/hosts-tab.js:658
 msgid "Host information"
 msgstr ""
 
 #: ../public/js/plugins/clusters-tab.js:241
-#: ../public/js/plugins/hosts-tab.js:359 ../public/js/plugins/hosts-tab.js:741
-#: ../public/js/plugins/hosts-tab.js:744
+#: ../public/js/plugins/hosts-tab.js:360 ../public/js/plugins/hosts-tab.js:730
+#: ../public/js/plugins/hosts-tab.js:733
 msgid "Host template"
 msgstr ""
 
 #: ../public/js/plugins/clusters-tab.js:245
-#: ../public/js/plugins/vms-tab.js:1013 ../public/js/plugins/vms-tab.js:1060
-#: ../public/js/plugins/hosts-tab.js:363 ../public/js/plugins/hosts-tab.js:750
+#: ../public/js/plugins/vms-tab.js:652 ../public/js/plugins/vms-tab.js:1024
+#: ../public/js/plugins/vms-tab.js:1071 ../public/js/plugins/hosts-tab.js:364
+#: ../public/js/plugins/hosts-tab.js:739
 msgid "Monitoring information"
 msgstr ""
 
@@ -1175,9 +1169,18 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:76 ../public/js/plugins/vms-tab.js:880
-#: ../public/js/plugins/vms-tab.js:985
-msgid "Hostname"
+#: ../public/js/plugins/vms-tab.js:74 ../public/js/plugins/vms-tab.js:1040
+#: ../public/js/plugins/users-tab.js:59 ../public/js/plugins/groups-tab.js:55
+msgid "Used CPU"
+msgstr ""
+
+#: ../public/js/plugins/vms-tab.js:75 ../public/js/plugins/vms-tab.js:1036
+msgid "Used Memory"
+msgstr ""
+
+#: ../public/js/plugins/vms-tab.js:76 ../public/js/plugins/vms-tab.js:891
+#: ../public/js/plugins/vms-tab.js:996
+msgid "Host"
 msgstr ""
 
 #: ../public/js/plugins/vms-tab.js:77
@@ -1221,8 +1224,7 @@ msgid "Deploy # VMs"
 msgstr ""
 
 #: ../public/js/plugins/vms-tab.js:115
-#, python-format
-msgid "You can use the wildcard &#37;. When creating several VMs, %i will be replaced with a different number starting from 0 in each of them"
+msgid "You can use the wildcard &#37;i. When creating several VMs, &#37;i will be replaced with a different number starting from 0 in each of them"
 msgstr ""
 
 #: ../public/js/plugins/vms-tab.js:129
@@ -1233,297 +1235,303 @@ msgstr ""
 msgid "Select a VM"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:528
+#: ../public/js/plugins/vms-tab.js:530
 msgid "Shutdown"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:529
+#: ../public/js/plugins/vms-tab.js:531
 msgid "This will initiate the shutdown process in the selected VMs"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:537
+#: ../public/js/plugins/vms-tab.js:539
 msgid "Deploy"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:538
+#: ../public/js/plugins/vms-tab.js:540
 msgid "This will deploy the selected VMs on the chosen host"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:544
+#: ../public/js/plugins/vms-tab.js:546
 msgid "Migrate"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:545
+#: ../public/js/plugins/vms-tab.js:547
 msgid "This will migrate the selected VMs to the chosen host"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:552
+#: ../public/js/plugins/vms-tab.js:554
 msgid "Live migrate"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:553
+#: ../public/js/plugins/vms-tab.js:555
 msgid "This will live-migrate the selected VMs to the chosen host"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:560
+#: ../public/js/plugins/vms-tab.js:562
 msgid "This will hold selected pending VMs from being deployed"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:564
+#: ../public/js/plugins/vms-tab.js:566
 msgid "Release"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:565
+#: ../public/js/plugins/vms-tab.js:567
 msgid "This will release held machines"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:569
+#: ../public/js/plugins/vms-tab.js:571
 msgid "Suspend"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:570
+#: ../public/js/plugins/vms-tab.js:572
 msgid "This will suspend selected machines"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:574
+#: ../public/js/plugins/vms-tab.js:576
 msgid "Resume"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:575
+#: ../public/js/plugins/vms-tab.js:577
 msgid "This will resume selected stopped or suspended VMs"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:579
+#: ../public/js/plugins/vms-tab.js:581
 msgid "Stop"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:584
+#: ../public/js/plugins/vms-tab.js:582
+msgid "This will stop selected VMs"
+msgstr ""
+
+#: ../public/js/plugins/vms-tab.js:586
 msgid "Restart"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:585
+#: ../public/js/plugins/vms-tab.js:587
 msgid "This will redeploy selected VMs (in UNKNOWN or BOOT state)"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:589
+#: ../public/js/plugins/vms-tab.js:591
 msgid "Resubmit"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:590
+#: ../public/js/plugins/vms-tab.js:592
 msgid "This will resubmits VMs to PENDING state"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:594
+#: ../public/js/plugins/vms-tab.js:596
+msgid "Power Off"
+msgstr ""
+
+#: ../public/js/plugins/vms-tab.js:597
+msgid "This will send a power off signal to running VMs. They can be restarted later."
+msgstr ""
+
+#: ../public/js/plugins/vms-tab.js:601
 msgid "Reboot"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:595
+#: ../public/js/plugins/vms-tab.js:602
 msgid "This will send a reboot action to running VMs"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:600
+#: ../public/js/plugins/vms-tab.js:607
 msgid "This will perform a hard reboot on selected VMs"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:605
+#: ../public/js/plugins/vms-tab.js:612
 msgid "This will cancel selected VMs"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:613
+#: ../public/js/plugins/vms-tab.js:620
 msgid "This will delete the selected VMs from the database"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:625 ../public/js/plugins/vms-tab.js:957
+#: ../public/js/plugins/vms-tab.js:632 ../public/js/plugins/vms-tab.js:968
 msgid "Virtual Machine information"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:629 ../public/js/plugins/vms-tab.js:1041
+#: ../public/js/plugins/vms-tab.js:636 ../public/js/plugins/vms-tab.js:1052
 msgid "Disks & Hotplugging"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:633 ../public/js/plugins/vms-tab.js:1049
+#: ../public/js/plugins/vms-tab.js:640 ../public/js/plugins/vms-tab.js:1060
 msgid "VM template"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:637 ../public/js/plugins/vms-tab.js:1055
+#: ../public/js/plugins/vms-tab.js:644 ../public/js/plugins/vms-tab.js:1066
 msgid "VM log"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:641 ../public/js/plugins/vms-tab.js:1065
+#: ../public/js/plugins/vms-tab.js:648 ../public/js/plugins/vms-tab.js:1076
 msgid "History information"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:804 ../public/js/plugins/vms-tab.js:812
-#: ../public/js/plugins/vms-tab.js:944
+#: ../public/js/plugins/vms-tab.js:815 ../public/js/plugins/vms-tab.js:823
+#: ../public/js/plugins/vms-tab.js:955
 msgid "ACTIVE"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:804 ../public/js/plugins/vms-tab.js:944
+#: ../public/js/plugins/vms-tab.js:815 ../public/js/plugins/vms-tab.js:955
 msgid "SUSPENDED"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:879
+#: ../public/js/plugins/vms-tab.js:890
 msgid "Sequence"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:881
+#: ../public/js/plugins/vms-tab.js:892
 msgid "Reason"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:882
+#: ../public/js/plugins/vms-tab.js:893
 msgid "State change time"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:883
+#: ../public/js/plugins/vms-tab.js:894
 msgid "Total time"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:884
+#: ../public/js/plugins/vms-tab.js:895
 msgid "Prolog time"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:953
+#: ../public/js/plugins/vms-tab.js:964
 msgid "VM information"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:981
+#: ../public/js/plugins/vms-tab.js:992
 msgid "LCM State"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:989
+#: ../public/js/plugins/vms-tab.js:1000
 msgid "Start time"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:993
+#: ../public/js/plugins/vms-tab.js:1004
 msgid "Deploy ID"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1017
+#: ../public/js/plugins/vms-tab.js:1028
 msgid "Net_TX"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1021
+#: ../public/js/plugins/vms-tab.js:1032
 msgid "Net_RX"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1025
-msgid "Used Memory"
-msgstr ""
-
-#: ../public/js/plugins/vms-tab.js:1029 ../public/js/plugins/users-tab.js:39
-#: ../public/js/plugins/groups-tab.js:36
-msgid "Used CPU"
-msgstr ""
-
-#: ../public/js/plugins/vms-tab.js:1033
+#: ../public/js/plugins/vms-tab.js:1044
 msgid "VNC Session"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1046
+#: ../public/js/plugins/vms-tab.js:1057
 msgid "VM Template"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1097
-#: ../public/js/plugins/templates-tab.js:2006
+#: ../public/js/plugins/vms-tab.js:1108
+#: ../public/js/plugins/templates-tab.js:1929
 msgid "DISABLED"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1097
-#: ../public/js/plugins/templates-tab.js:2006
+#: ../public/js/plugins/vms-tab.js:1108
+#: ../public/js/plugins/templates-tab.js:1929
 msgid "LOCKED"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1097 ../public/js/plugins/hosts-tab.js:612
-#: ../public/js/plugins/templates-tab.js:2006
+#: ../public/js/plugins/vms-tab.js:1108 ../public/js/plugins/hosts-tab.js:601
+#: ../public/js/plugins/templates-tab.js:1929
 msgid "ERROR"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1103
+#: ../public/js/plugins/vms-tab.js:1114
 msgid "Disks information - Save As and Detach"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1117
+#: ../public/js/plugins/vms-tab.js:1128
 msgid "No disks to show"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1129
+#: ../public/js/plugins/vms-tab.js:1140
 msgid "Detach"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1131 ../public/js/plugins/vms-tab.js:1201
-#: ../public/js/plugins/templates-tab.js:261
+#: ../public/js/plugins/vms-tab.js:1142 ../public/js/plugins/vms-tab.js:1212
 msgid "Save"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1133
+#: ../public/js/plugins/vms-tab.js:1144
 msgid "Save_as name"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1151
+#: ../public/js/plugins/vms-tab.js:1162
 msgid "Attach disk to running VM"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1157
+#: ../public/js/plugins/vms-tab.js:1168
 msgid "Existing image"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1158
+#: ../public/js/plugins/vms-tab.js:1169
 msgid "Volatile disk"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1162
+#: ../public/js/plugins/vms-tab.js:1173
 msgid "Select image"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1182
+#: ../public/js/plugins/vms-tab.js:1193
 msgid "swap"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1183
+#: ../public/js/plugins/vms-tab.js:1194
 msgid "fs"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1187 ../public/js/plugins/images-tab.js:97
+#: ../public/js/plugins/vms-tab.js:1198 ../public/js/plugins/images-tab.js:97
 msgid "Device prefix"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1193
+#: ../public/js/plugins/vms-tab.js:1204
 msgid "Readonly"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1279
+#: ../public/js/plugins/vms-tab.js:1223
+msgid "Attach"
+msgstr ""
+
+#: ../public/js/plugins/vms-tab.js:1289
 msgid "Please select an image to attach"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1305
+#: ../public/js/plugins/vms-tab.js:1315
 msgid "Create Virtual Machine"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1328
+#: ../public/js/plugins/vms-tab.js:1338
 msgid "You have not selected a template"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1367
+#: ../public/js/plugins/vms-tab.js:1377
 msgid "Update VM properties"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1507
+#: ../public/js/plugins/vms-tab.js:1517
 msgid "VNC connection"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1522
+#: ../public/js/plugins/vms-tab.js:1532
 msgid "Canvas not supported."
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1583
+#: ../public/js/plugins/vms-tab.js:1584
 msgid "RUNNING"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1585
+#: ../public/js/plugins/vms-tab.js:1586
 msgid "Open VNC Session"
 msgstr ""
 
-#: ../public/js/plugins/vms-tab.js:1588
+#: ../public/js/plugins/vms-tab.js:1589
 msgid "VNC Disabled"
 msgstr ""
 
@@ -1578,29 +1586,25 @@ msgid "Shared"
 msgstr ""
 
 #: ../public/js/plugins/datastores-tab.js:73
-#: ../public/js/plugins/users-tab.js:72 ../public/js/plugins/users-tab.js:398
+#: ../public/js/plugins/users-tab.js:92 ../public/js/plugins/users-tab.js:427
 msgid "SSH"
 msgstr ""
 
 #: ../public/js/plugins/datastores-tab.js:75
-#: ../public/js/plugins/hosts-tab.js:90 ../public/js/plugins/hosts-tab.js:104
+#: ../public/js/plugins/hosts-tab.js:90 ../public/js/plugins/hosts-tab.js:105
 msgid "Dummy"
 msgstr ""
 
 #: ../public/js/plugins/datastores-tab.js:77
-#: ../public/js/plugins/templates-tab.js:228
+#: ../public/js/plugins/templates-tab.js:220
 msgid "Disk type"
 msgstr ""
 
 #: ../public/js/plugins/datastores-tab.js:79
-#: ../public/js/plugins/templates-tab.js:1149
 msgid "File"
 msgstr ""
 
 #: ../public/js/plugins/datastores-tab.js:80
-#: ../public/js/plugins/templates-tab.js:1089
-#: ../public/js/plugins/templates-tab.js:1127
-#: ../public/js/plugins/templates-tab.js:1151
 msgid "Block"
 msgstr ""
 
@@ -1616,38 +1620,38 @@ msgstr ""
 msgid "Datastore updated correctly"
 msgstr ""
 
-#: ../public/js/plugins/datastores-tab.js:353
-#: ../public/js/plugins/datastores-tab.js:454
-#: ../public/js/plugins/datastores-tab.js:458
+#: ../public/js/plugins/datastores-tab.js:352
+#: ../public/js/plugins/datastores-tab.js:453
+#: ../public/js/plugins/datastores-tab.js:457
 msgid "Datastore information"
 msgstr ""
 
-#: ../public/js/plugins/datastores-tab.js:357
-#: ../public/js/plugins/datastores-tab.js:518
+#: ../public/js/plugins/datastores-tab.js:356
+#: ../public/js/plugins/datastores-tab.js:517
 msgid "Datastore template"
 msgstr ""
 
-#: ../public/js/plugins/datastores-tab.js:482
+#: ../public/js/plugins/datastores-tab.js:481
 msgid "DS Mad"
 msgstr ""
 
-#: ../public/js/plugins/datastores-tab.js:486
+#: ../public/js/plugins/datastores-tab.js:485
 msgid "TM Mad"
 msgstr ""
 
-#: ../public/js/plugins/datastores-tab.js:490
+#: ../public/js/plugins/datastores-tab.js:489
 msgid "Base path"
 msgstr ""
 
-#: ../public/js/plugins/datastores-tab.js:515
+#: ../public/js/plugins/datastores-tab.js:514
 msgid "Datastore Template"
 msgstr ""
 
-#: ../public/js/plugins/datastores-tab.js:531
+#: ../public/js/plugins/datastores-tab.js:530
 msgid "Create Datastore"
 msgstr ""
 
-#: ../public/js/plugins/datastores-tab.js:597
+#: ../public/js/plugins/datastores-tab.js:596
 msgid "Update Datastore properties"
 msgstr ""
 
@@ -1659,7 +1663,7 @@ msgstr ""
 msgid "Memory monitoring information"
 msgstr ""
 
-#: ../public/js/plugins/hosts-tab.js:49 ../public/js/plugins/hosts-tab.js:732
+#: ../public/js/plugins/hosts-tab.js:49 ../public/js/plugins/hosts-tab.js:721
 msgid "Running VMs"
 msgstr ""
 
@@ -1671,11 +1675,11 @@ msgstr ""
 msgid "Memory use"
 msgstr ""
 
-#: ../public/js/plugins/hosts-tab.js:53 ../public/js/plugins/hosts-tab.js:689
+#: ../public/js/plugins/hosts-tab.js:53 ../public/js/plugins/hosts-tab.js:678
 msgid "IM MAD"
 msgstr ""
 
-#: ../public/js/plugins/hosts-tab.js:54 ../public/js/plugins/hosts-tab.js:693
+#: ../public/js/plugins/hosts-tab.js:54 ../public/js/plugins/hosts-tab.js:682
 msgid "VM MAD"
 msgstr ""
 
@@ -1712,7 +1716,7 @@ msgid "KVM"
 msgstr ""
 
 #: ../public/js/plugins/hosts-tab.js:87 ../public/js/plugins/hosts-tab.js:101
-#: ../public/js/plugins/templates-tab.js:419
+#: ../public/js/plugins/templates-tab.js:387
 msgid "XEN"
 msgstr ""
 
@@ -1720,8 +1724,8 @@ msgstr ""
 msgid "EC2"
 msgstr ""
 
-#: ../public/js/plugins/hosts-tab.js:91 ../public/js/plugins/hosts-tab.js:105
-#: ../public/js/plugins/hosts-tab.js:121 ../public/js/plugins/users-tab.js:75
+#: ../public/js/plugins/hosts-tab.js:91 ../public/js/plugins/hosts-tab.js:106
+#: ../public/js/plugins/hosts-tab.js:122 ../public/js/plugins/users-tab.js:95
 msgid "Custom"
 msgstr ""
 
@@ -1733,94 +1737,97 @@ msgstr ""
 msgid "Information Manager"
 msgstr ""
 
-#: ../public/js/plugins/hosts-tab.js:108
+#: ../public/js/plugins/hosts-tab.js:104
+msgid "Ganglia"
+msgstr ""
+
+#: ../public/js/plugins/hosts-tab.js:109
 msgid "Custom IM_MAD"
 msgstr ""
 
-#: ../public/js/plugins/hosts-tab.js:115
+#: ../public/js/plugins/hosts-tab.js:116
 msgid "Default (dummy)"
 msgstr ""
 
-#: ../public/js/plugins/hosts-tab.js:116
+#: ../public/js/plugins/hosts-tab.js:117
 msgid "Firewall"
 msgstr ""
 
-#: ../public/js/plugins/hosts-tab.js:124
+#: ../public/js/plugins/hosts-tab.js:125
 msgid "Custom VNM_MAD"
 msgstr ""
 
-#: ../public/js/plugins/hosts-tab.js:319
+#: ../public/js/plugins/hosts-tab.js:320
 msgid "Update a template"
 msgstr ""
 
-#: ../public/js/plugins/hosts-tab.js:332
+#: ../public/js/plugins/hosts-tab.js:333
 #: ../public/js/plugins/templates-tab.js:172
 #: ../public/js/plugins/templates-tab.js:181
-#: ../public/js/plugins/images-tab.js:484
+#: ../public/js/plugins/images-tab.js:476
 msgid "Enable"
 msgstr ""
 
-#: ../public/js/plugins/hosts-tab.js:337
+#: ../public/js/plugins/hosts-tab.js:338
 #: ../public/js/plugins/templates-tab.js:173
 #: ../public/js/plugins/templates-tab.js:182
-#: ../public/js/plugins/images-tab.js:488
+#: ../public/js/plugins/images-tab.js:480
 msgid "Disable"
 msgstr ""
 
-#: ../public/js/plugins/hosts-tab.js:342
+#: ../public/js/plugins/hosts-tab.js:343
 msgid "Delete host"
 msgstr ""
 
-#: ../public/js/plugins/hosts-tab.js:612
+#: ../public/js/plugins/hosts-tab.js:601
 msgid "OFF"
 msgstr ""
 
-#: ../public/js/plugins/hosts-tab.js:612
+#: ../public/js/plugins/hosts-tab.js:601
 msgid "RETRY"
 msgstr ""
 
-#: ../public/js/plugins/hosts-tab.js:673
+#: ../public/js/plugins/hosts-tab.js:662
 msgid "id"
 msgstr ""
 
-#: ../public/js/plugins/hosts-tab.js:697
+#: ../public/js/plugins/hosts-tab.js:686
 msgid "VN MAD"
 msgstr ""
 
-#: ../public/js/plugins/hosts-tab.js:704
+#: ../public/js/plugins/hosts-tab.js:693
 msgid "Host shares"
 msgstr ""
 
-#: ../public/js/plugins/hosts-tab.js:708
-msgid "Max Mem"
+#: ../public/js/plugins/hosts-tab.js:697
+msgid "Total Mem"
 msgstr ""
 
-#: ../public/js/plugins/hosts-tab.js:712
+#: ../public/js/plugins/hosts-tab.js:701
 msgid "Used Mem (real)"
 msgstr ""
 
-#: ../public/js/plugins/hosts-tab.js:716
+#: ../public/js/plugins/hosts-tab.js:705
 msgid "Used Mem (allocated)"
 msgstr ""
 
-#: ../public/js/plugins/hosts-tab.js:720 ../public/js/plugins/users-tab.js:123
-#: ../public/js/plugins/groups-tab.js:82
-msgid "Max CPU"
+#: ../public/js/plugins/hosts-tab.js:709
+msgid "Total CPU"
 msgstr ""
 
-#: ../public/js/plugins/hosts-tab.js:724
+#: ../public/js/plugins/hosts-tab.js:713
 msgid "Used CPU (real)"
 msgstr ""
 
-#: ../public/js/plugins/hosts-tab.js:728
+#: ../public/js/plugins/hosts-tab.js:717
 msgid "Used CPU (allocated)"
 msgstr ""
 
-#: ../public/js/plugins/hosts-tab.js:770
+#: ../public/js/plugins/hosts-tab.js:759
 msgid "Create host"
 msgstr ""
 
-#: ../public/js/plugins/hosts-tab.js:814
+#: ../public/js/plugins/hosts-tab.js:803
 msgid "Host name missing!"
 msgstr ""
 
@@ -1833,7 +1840,7 @@ msgid "Language"
 msgstr ""
 
 #: ../public/js/plugins/config-tab.js:32
-msgid "English"
+msgid "English (US)"
 msgstr ""
 
 #: ../public/js/plugins/config-tab.js:33
@@ -1841,11 +1848,11 @@ msgid "Chinese (TW)"
 msgstr ""
 
 #: ../public/js/plugins/config-tab.js:34
-msgid "French"
+msgid "French (FR)"
 msgstr ""
 
 #: ../public/js/plugins/config-tab.js:35
-msgid "Italian"
+msgid "Italian (IT)"
 msgstr ""
 
 #: ../public/js/plugins/config-tab.js:36
@@ -1853,15 +1860,15 @@ msgid "Persian (IR)"
 msgstr ""
 
 #: ../public/js/plugins/config-tab.js:37
-msgid "Portuguese"
+msgid "Portuguese (PT)"
 msgstr ""
 
 #: ../public/js/plugins/config-tab.js:38
-msgid "Russian"
+msgid "Russian (RU)"
 msgstr ""
 
 #: ../public/js/plugins/config-tab.js:39
-msgid "Slovak"
+msgid "Slovak (SK)"
 msgstr ""
 
 #: ../public/js/plugins/config-tab.js:44
@@ -2050,509 +2057,457 @@ msgstr ""
 msgid "Disks"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:200
-msgid "Add disk/image"
-msgstr ""
-
 #: ../public/js/plugins/templates-tab.js:201
-#: ../public/js/plugins/templates-tab.js:1084
-#: ../public/js/plugins/templates-tab.js:1122
-msgid "Disk"
+msgid "Volatile Disk"
 msgstr ""
 
 #: ../public/js/plugins/templates-tab.js:211
 msgid "Name of the image to use"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:215
-#: ../public/js/plugins/templates-tab.js:327
+#: ../public/js/plugins/templates-tab.js:217
+msgid "FS"
+msgstr ""
+
+#: ../public/js/plugins/templates-tab.js:218
+msgid "Swap"
+msgstr ""
+
+#: ../public/js/plugins/templates-tab.js:226
+msgid "Size in MB"
+msgstr ""
+
+#: ../public/js/plugins/templates-tab.js:232
+msgid "Filesystem type for the fs images"
+msgstr ""
+
+#: ../public/js/plugins/templates-tab.js:235
+#: ../public/js/plugins/templates-tab.js:295
 #: ../public/js/plugins/images-tab.js:39
 #: ../public/js/plugins/images-tab.js:107
 msgid "Target"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:217
+#: ../public/js/plugins/templates-tab.js:237
 msgid "Device to map image disk. If set, it will overwrite the default device mapping"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:220
+#: ../public/js/plugins/templates-tab.js:240
 #: ../public/js/plugins/images-tab.js:102
 msgid "Driver"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:222
+#: ../public/js/plugins/templates-tab.js:242
 msgid "Specific image mapping driver. KVM: raw, qcow2. Xen:tap:aio:, file:. VMware unsupported"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:231
-#: ../public/js/plugins/images-tab.js:136
-#: ../public/js/plugins/images-tab.js:653
-msgid "Source"
-msgstr ""
-
-#: ../public/js/plugins/templates-tab.js:233
-msgid "Disk file location path or URL"
-msgstr ""
-
-#: ../public/js/plugins/templates-tab.js:236
-msgid "Transfer Manager"
-msgstr ""
-
-#: ../public/js/plugins/templates-tab.js:238
-msgid "shared,ssh,iscsi,dummy"
-msgstr ""
-
-#: ../public/js/plugins/templates-tab.js:244
-msgid "Size in MB"
-msgstr ""
-
-#: ../public/js/plugins/templates-tab.js:250
-msgid "Filesystem type for the fs images"
-msgstr ""
-
-#: ../public/js/plugins/templates-tab.js:253
-#: ../public/js/plugins/templates-tab.js:832
-#: ../public/js/plugins/templates-tab.js:2139
-#: ../public/js/plugins/images-tab.js:502
-#: ../public/js/plugins/images-tab.js:1168
-msgid "Clone"
-msgstr ""
-
-#: ../public/js/plugins/templates-tab.js:258
-msgid "Clone this image"
-msgstr ""
-
-#: ../public/js/plugins/templates-tab.js:266
-msgid "Save this image after shutting down the VM"
-msgstr ""
-
-#: ../public/js/plugins/templates-tab.js:269
-msgid "Read only"
-msgstr ""
-
-#: ../public/js/plugins/templates-tab.js:274
-msgid "Mount image as read-only"
-msgstr ""
-
-#: ../public/js/plugins/templates-tab.js:280
+#: ../public/js/plugins/templates-tab.js:248
 msgid "Current disks"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:292
+#: ../public/js/plugins/templates-tab.js:260
 msgid "Setup Networks"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:296
+#: ../public/js/plugins/templates-tab.js:264
 msgid "Add network"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:297
+#: ../public/js/plugins/templates-tab.js:265
 msgid "Predefined"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:299
+#: ../public/js/plugins/templates-tab.js:267
 msgid "Manual"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:308
+#: ../public/js/plugins/templates-tab.js:276
 msgid "Name of the network to attach this device"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:312
+#: ../public/js/plugins/templates-tab.js:280
 msgid "IP"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:314
+#: ../public/js/plugins/templates-tab.js:282
 msgid "Request an specific IP from the Network"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:317
+#: ../public/js/plugins/templates-tab.js:285
 msgid "MAC"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:319
+#: ../public/js/plugins/templates-tab.js:287
 msgid "HW address associated with the network interface"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:324
+#: ../public/js/plugins/templates-tab.js:292
 msgid "Name of the bridge the network device is going to be attached to"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:329
+#: ../public/js/plugins/templates-tab.js:297
 msgid "Name for the tun device created for the VM"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:332
+#: ../public/js/plugins/templates-tab.js:300
 msgid "Script"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:334
+#: ../public/js/plugins/templates-tab.js:302
 msgid "Name of a shell script to be executed after creating the tun device for the VM"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:337
+#: ../public/js/plugins/templates-tab.js:305
 msgid "Model"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:339
+#: ../public/js/plugins/templates-tab.js:307
 msgid "Hardware that will emulate this network interface. With Xen this is the type attribute of the vif."
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:342
+#: ../public/js/plugins/templates-tab.js:310
 msgid "TCP firewall mode"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:344
-#: ../public/js/plugins/templates-tab.js:363
+#: ../public/js/plugins/templates-tab.js:312
+#: ../public/js/plugins/templates-tab.js:331
 msgid "Optional, please select"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:345
-#: ../public/js/plugins/templates-tab.js:364
+#: ../public/js/plugins/templates-tab.js:313
+#: ../public/js/plugins/templates-tab.js:332
 msgid "Port whitelist"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:346
-#: ../public/js/plugins/templates-tab.js:365
+#: ../public/js/plugins/templates-tab.js:314
+#: ../public/js/plugins/templates-tab.js:333
 msgid "Port blacklist"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:351
+#: ../public/js/plugins/templates-tab.js:319
 msgid "TCP white ports"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:353
+#: ../public/js/plugins/templates-tab.js:321
 msgid "Permits access to the VM only through the specified ports in the TCP protocol"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:356
+#: ../public/js/plugins/templates-tab.js:324
 msgid "TCP black ports"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:358
+#: ../public/js/plugins/templates-tab.js:326
 msgid "Disallow access to the VM through the specified ports in the TCP protocol"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:361
+#: ../public/js/plugins/templates-tab.js:329
 msgid "UDP firewall mode"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:370
+#: ../public/js/plugins/templates-tab.js:338
 msgid "UDP white ports"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:372
+#: ../public/js/plugins/templates-tab.js:340
 msgid "Permits access to the VM only through the specified ports in the UDP protocol"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:375
+#: ../public/js/plugins/templates-tab.js:343
 msgid "UDP black ports"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:377
+#: ../public/js/plugins/templates-tab.js:345
 msgid "Disallow access to the VM through the specified ports in the UDP protocol"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:380
+#: ../public/js/plugins/templates-tab.js:348
 msgid "ICMP"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:382
+#: ../public/js/plugins/templates-tab.js:350
 msgid "Accept (default)"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:383
+#: ../public/js/plugins/templates-tab.js:351
 msgid "Drop"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:385
+#: ../public/js/plugins/templates-tab.js:353
 msgid "ICMP policy"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:392
+#: ../public/js/plugins/templates-tab.js:360
 msgid "Current NICs"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:403
+#: ../public/js/plugins/templates-tab.js:371
 msgid "Add inputs"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:405
+#: ../public/js/plugins/templates-tab.js:373
 msgid "Inputs"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:409
+#: ../public/js/plugins/templates-tab.js:377
 msgid "Mouse"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:410
+#: ../public/js/plugins/templates-tab.js:378
 msgid "Tablet"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:415
+#: ../public/js/plugins/templates-tab.js:383
 msgid "Bus"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:417
+#: ../public/js/plugins/templates-tab.js:385
 msgid "USB"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:418
+#: ../public/js/plugins/templates-tab.js:386
 msgid "PS2"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:427
+#: ../public/js/plugins/templates-tab.js:395
 msgid "Current inputs"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:438
+#: ../public/js/plugins/templates-tab.js:406
 msgid "Add Graphics"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:440
+#: ../public/js/plugins/templates-tab.js:408
 msgid "Graphics"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:442
+#: ../public/js/plugins/templates-tab.js:410
 msgid "Graphics type"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:445
+#: ../public/js/plugins/templates-tab.js:413
 msgid "VNC"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:446
+#: ../public/js/plugins/templates-tab.js:414
 msgid "SDL"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:448
-msgid "VMware supports VNC only"
+#: ../public/js/plugins/templates-tab.js:415
+msgid "SPICE"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:451
+#: ../public/js/plugins/templates-tab.js:417
+msgid "VMware supports VNC only. SPICE is supported by KVM"
+msgstr ""
+
+#: ../public/js/plugins/templates-tab.js:420
 msgid "Listen IP"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:453
+#: ../public/js/plugins/templates-tab.js:422
 msgid "IP to listen on"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:456
+#: ../public/js/plugins/templates-tab.js:425
 msgid "Port"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:458
-msgid "Port for the VNC server"
+#: ../public/js/plugins/templates-tab.js:427
+msgid "Port for the VNC/SPICE server"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:461
-#: ../public/js/plugins/users-tab.js:67
+#: ../public/js/plugins/templates-tab.js:430
+#: ../public/js/plugins/users-tab.js:87
 msgid "Password"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:463
-msgid "Password for the VNC server"
+#: ../public/js/plugins/templates-tab.js:432
+msgid "Password for the VNC/SPICE server"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:466
+#: ../public/js/plugins/templates-tab.js:435
 msgid "Keymap"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:468
-msgid "Keyboard configuration locale to use in the VNC display"
+#: ../public/js/plugins/templates-tab.js:437
+msgid "Keyboard configuration locale to use in the VNC/SPICE display"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:477
+#: ../public/js/plugins/templates-tab.js:446
 msgid "Add context variables"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:479
+#: ../public/js/plugins/templates-tab.js:448
 msgid "Context"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:483
+#: ../public/js/plugins/templates-tab.js:452
 msgid "Name for the context variable"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:488
+#: ../public/js/plugins/templates-tab.js:457
 msgid "Value of the context variable"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:494
-#: ../public/js/plugins/templates-tab.js:559
+#: ../public/js/plugins/templates-tab.js:463
+#: ../public/js/plugins/templates-tab.js:528
 msgid "Current variables"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:505
+#: ../public/js/plugins/templates-tab.js:474
 msgid "Add placement options"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:507
+#: ../public/js/plugins/templates-tab.js:476
 msgid "Placement"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:509
+#: ../public/js/plugins/templates-tab.js:478
 msgid "Requirements"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:511
+#: ../public/js/plugins/templates-tab.js:480
 msgid "Boolean expression that rules out provisioning hosts from list of machines suitable to run this VM"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:514
+#: ../public/js/plugins/templates-tab.js:483
 msgid "Rank"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:516
+#: ../public/js/plugins/templates-tab.js:485
 msgid "This field sets which attribute will be used to sort the suitable hosts for this VM. Basically, it defines which hosts are more suitable than others"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:525
+#: ../public/js/plugins/templates-tab.js:494
 msgid "Add Hypervisor raw options"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:527
+#: ../public/js/plugins/templates-tab.js:496
 msgid "Raw"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:530
+#: ../public/js/plugins/templates-tab.js:499
 msgid "Data"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:533
+#: ../public/js/plugins/templates-tab.js:502
 msgid "Raw data to be passed directly to the hypervisor"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:542
+#: ../public/js/plugins/templates-tab.js:511
 msgid "Add custom variables"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:544
+#: ../public/js/plugins/templates-tab.js:513
 msgid "Custom variables"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:548
+#: ../public/js/plugins/templates-tab.js:517
 msgid "Name for the custom variable"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:553
+#: ../public/js/plugins/templates-tab.js:522
 msgid "Value of the custom variable"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:578
+#: ../public/js/plugins/templates-tab.js:547
 msgid "Write the Virtual Machine template here"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:814
+#: ../public/js/plugins/templates-tab.js:783
 msgid "Instantiate"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:848
+#: ../public/js/plugins/templates-tab.js:801
+#: ../public/js/plugins/templates-tab.js:2062
+#: ../public/js/plugins/images-tab.js:494
+#: ../public/js/plugins/images-tab.js:1143
+msgid "Clone"
+msgstr ""
+
+#: ../public/js/plugins/templates-tab.js:817
 msgid "Template information"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:941
+#: ../public/js/plugins/templates-tab.js:910
 msgid "Information"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:965
-#: ../public/js/plugins/images-tab.js:645
+#: ../public/js/plugins/templates-tab.js:934
+#: ../public/js/plugins/images-tab.js:637
 msgid "Register time"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:1085
-#: ../public/js/plugins/templates-tab.js:1123
-msgid "Floppy"
-msgstr ""
-
-#: ../public/js/plugins/templates-tab.js:1086
-#: ../public/js/plugins/templates-tab.js:1124
-#: ../public/js/plugins/templates-tab.js:1150
-#: ../public/js/plugins/images-tab.js:86
-#: ../public/js/plugins/images-tab.js:553
-msgid "CD-ROM"
-msgstr ""
-
-#: ../public/js/plugins/templates-tab.js:1087
-#: ../public/js/plugins/templates-tab.js:1125
-msgid "Swap"
-msgstr ""
-
-#: ../public/js/plugins/templates-tab.js:1088
-#: ../public/js/plugins/templates-tab.js:1126
-msgid "FS"
-msgstr ""
-
-#: ../public/js/plugins/templates-tab.js:1094
+#: ../public/js/plugins/templates-tab.js:1050
 msgid "hd"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:1095
+#: ../public/js/plugins/templates-tab.js:1051
 msgid "fd"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:1096
+#: ../public/js/plugins/templates-tab.js:1052
 msgid "cdrom"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:1097
+#: ../public/js/plugins/templates-tab.js:1053
 msgid "network"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:1101
+#: ../public/js/plugins/templates-tab.js:1057
 msgid "Driver default"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:1131
+#: ../public/js/plugins/templates-tab.js:1076
 msgid "Please choose"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:1193
+#: ../public/js/plugins/templates-tab.js:1130
 msgid "There are mandatory parameters missing in this section"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:1731
+#: ../public/js/plugins/templates-tab.js:1654
 msgid "Context variable name and value must be filled in"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:1782
+#: ../public/js/plugins/templates-tab.js:1705
 msgid "Custom variable name and value must be filled in"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:1801
+#: ../public/js/plugins/templates-tab.js:1724
 msgid "Create VM Template"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:1889
+#: ../public/js/plugins/templates-tab.js:1812
 msgid "There are mandatory fields missing in the capacity section"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:1900
+#: ../public/js/plugins/templates-tab.js:1823
 msgid "Xen templates must specify a boot method"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:1905
+#: ../public/js/plugins/templates-tab.js:1828
 msgid "There are mandatory fields missing in the OS Boot options section"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:2023
+#: ../public/js/plugins/templates-tab.js:1946
 msgid "Update template properties"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:2125
+#: ../public/js/plugins/templates-tab.js:2048
 msgid "Clone a template"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:2131
+#: ../public/js/plugins/templates-tab.js:2054
 msgid "Choose a new name for the template"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:2132
+#: ../public/js/plugins/templates-tab.js:2055
 msgid "Several templates are selected, please choose prefix to name the new copies"
 msgstr ""
 
-#: ../public/js/plugins/templates-tab.js:2135
-#: ../public/js/plugins/images-tab.js:1164
+#: ../public/js/plugins/templates-tab.js:2058
+#: ../public/js/plugins/images-tab.js:1139
 msgid "Prefix"
 msgstr ""
 
@@ -2600,179 +2555,211 @@ msgstr ""
 msgid "Infrastructure"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:36 ../public/js/plugins/users-tab.js:606
+#: ../public/js/plugins/users-tab.js:33 ../public/js/plugins/groups-tab.js:31
+msgid "Net TX"
+msgstr ""
+
+#: ../public/js/plugins/users-tab.js:37 ../public/js/plugins/groups-tab.js:35
+msgid "Net RX"
+msgstr ""
+
+#: ../public/js/plugins/users-tab.js:56 ../public/js/plugins/users-tab.js:639
 msgid "Authentication driver"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:37 ../public/js/plugins/groups-tab.js:34
+#: ../public/js/plugins/users-tab.js:57 ../public/js/plugins/groups-tab.js:53
 msgid "VMs"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:38 ../public/js/plugins/groups-tab.js:35
+#: ../public/js/plugins/users-tab.js:58 ../public/js/plugins/groups-tab.js:54
 msgid "Used memory"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:40
+#: ../public/js/plugins/users-tab.js:60
 msgid "Group ID"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:50
+#: ../public/js/plugins/users-tab.js:70
 msgid "Tip: You can save any information in the user template, in the form of VAR=VAL."
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:55
+#: ../public/js/plugins/users-tab.js:75
 msgid "Tip: SSH authentication method is not available for web UI access."
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:65
+#: ../public/js/plugins/users-tab.js:85
 msgid "Username"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:69
+#: ../public/js/plugins/users-tab.js:89
 msgid "Authentication"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:71 ../public/js/plugins/users-tab.js:397
+#: ../public/js/plugins/users-tab.js:91 ../public/js/plugins/users-tab.js:426
 msgid "Core"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:73 ../public/js/plugins/users-tab.js:399
+#: ../public/js/plugins/users-tab.js:93 ../public/js/plugins/users-tab.js:428
 msgid "x509"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:74 ../public/js/plugins/users-tab.js:400
+#: ../public/js/plugins/users-tab.js:94 ../public/js/plugins/users-tab.js:429
 msgid "Public"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:78
+#: ../public/js/plugins/users-tab.js:98
 msgid "Custom auth driver"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:94
+#: ../public/js/plugins/users-tab.js:114
 msgid "This will change the password for the selected users"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:95
+#: ../public/js/plugins/users-tab.js:115
 msgid "New password"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:101
+#: ../public/js/plugins/users-tab.js:121
 msgid "Change"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:109 ../public/js/plugins/groups-tab.js:68
+#: ../public/js/plugins/users-tab.js:129 ../public/js/plugins/groups-tab.js:87
 msgid "Please add/edit/remove quotas and click on the apply changes button. Note that if several items are selected, changes will be applied to each of them"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:110 ../public/js/plugins/groups-tab.js:69
+#: ../public/js/plugins/users-tab.js:130 ../public/js/plugins/groups-tab.js:88
 msgid "Add quota"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:112 ../public/js/plugins/groups-tab.js:71
+#: ../public/js/plugins/users-tab.js:132 ../public/js/plugins/groups-tab.js:90
 msgid "Quota type"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:113 ../public/js/plugins/groups-tab.js:72
+#: ../public/js/plugins/users-tab.js:133 ../public/js/plugins/groups-tab.js:91
 msgid "Virtual Machine"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:119 ../public/js/plugins/groups-tab.js:78
+#: ../public/js/plugins/users-tab.js:139 ../public/js/plugins/groups-tab.js:97
 msgid "Max VMs"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:121 ../public/js/plugins/groups-tab.js:80
+#: ../public/js/plugins/users-tab.js:141 ../public/js/plugins/groups-tab.js:99
 msgid "Max Memory (MB)"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:129 ../public/js/plugins/groups-tab.js:88
+#: ../public/js/plugins/users-tab.js:143
+#: ../public/js/plugins/groups-tab.js:101
+msgid "Max CPU"
+msgstr ""
+
+#: ../public/js/plugins/users-tab.js:149
+#: ../public/js/plugins/groups-tab.js:107
 msgid "Max size (MB)"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:131 ../public/js/plugins/groups-tab.js:90
+#: ../public/js/plugins/users-tab.js:151
+#: ../public/js/plugins/groups-tab.js:109
 msgid "Max images"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:137 ../public/js/plugins/groups-tab.js:96
+#: ../public/js/plugins/users-tab.js:157
+#: ../public/js/plugins/groups-tab.js:115
 msgid "Max RVMs"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:143
-#: ../public/js/plugins/groups-tab.js:102
+#: ../public/js/plugins/users-tab.js:163
+#: ../public/js/plugins/groups-tab.js:121
 msgid "Max leases"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:146
-#: ../public/js/plugins/groups-tab.js:105
+#: ../public/js/plugins/users-tab.js:166
+#: ../public/js/plugins/groups-tab.js:124
 msgid "Add/edit quota"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:153
-#: ../public/js/plugins/groups-tab.js:112
+#: ../public/js/plugins/users-tab.js:173
+#: ../public/js/plugins/groups-tab.js:131
 msgid "Quota"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:154
-#: ../public/js/plugins/groups-tab.js:113
+#: ../public/js/plugins/users-tab.js:174
+#: ../public/js/plugins/groups-tab.js:132
 msgid "Edit"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:160
-#: ../public/js/plugins/groups-tab.js:118
+#: ../public/js/plugins/users-tab.js:180
+#: ../public/js/plugins/groups-tab.js:137
 msgid "Apply changes"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:215
+#: ../public/js/plugins/users-tab.js:235
 msgid "Change password successful"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:345
-#: ../public/js/plugins/groups-tab.js:216
+#: ../public/js/plugins/users-tab.js:365
+#: ../public/js/plugins/groups-tab.js:235
 msgid "Quotas updated correctly"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:378 ../public/js/plugins/users-tab.js:699
+#: ../public/js/plugins/users-tab.js:407 ../public/js/plugins/users-tab.js:813
 msgid "Change password"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:382
-#: ../public/js/plugins/groups-tab.js:249
+#: ../public/js/plugins/users-tab.js:411
+#: ../public/js/plugins/groups-tab.js:279
 msgid "Update quotas"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:389
+#: ../public/js/plugins/users-tab.js:418
 msgid "This will change the main group of the selected users. Select the new group"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:394
+#: ../public/js/plugins/users-tab.js:423
 msgid "Change authentication"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:402
+#: ../public/js/plugins/users-tab.js:431
 msgid "Please choose the new type of authentication for the selected users"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:438 ../public/js/plugins/users-tab.js:640
-#: ../public/js/plugins/users-tab.js:730
-msgid "User quotas"
+#: ../public/js/plugins/users-tab.js:463 ../public/js/plugins/users-tab.js:623
+#: ../public/js/plugins/users-tab.js:627
+msgid "User information"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:453
+#: ../public/js/plugins/users-tab.js:471 ../public/js/plugins/users-tab.js:678
+#: ../public/js/plugins/groups-tab.js:300
+#: ../public/js/plugins/groups-tab.js:472
+msgid "Historical usages"
+msgstr ""
+
+#: ../public/js/plugins/users-tab.js:486
 msgid "User info"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:612
+#: ../public/js/plugins/users-tab.js:645
 msgid "User template"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:651
+#: ../public/js/plugins/users-tab.js:681
+#: ../public/js/plugins/groups-tab.js:475
+msgid "From / to"
+msgstr ""
+
+#: ../public/js/plugins/users-tab.js:690
+#: ../public/js/plugins/groups-tab.js:484
+msgid "Meters"
+msgstr ""
+
+#: ../public/js/plugins/users-tab.js:765
 msgid "Create user"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:682
+#: ../public/js/plugins/users-tab.js:796
 msgid "User name and password must be filled in"
 msgstr ""
 
-#: ../public/js/plugins/users-tab.js:717
+#: ../public/js/plugins/users-tab.js:831
 msgid "Fill in a new password"
 msgstr ""
 
@@ -2821,43 +2808,43 @@ msgstr ""
 msgid "Virtual Machine templates can be instantiated as many times as you want. You can do it from the Templates tab or by creating a new VM in the VM tab. The second method allows you to customize the name and the number of VMs you want to launch."
 msgstr ""
 
-#: ../public/js/plugins/groups-tab.js:45
+#: ../public/js/plugins/groups-tab.js:64
 msgid "Tip: Refresh the list if it only shows user ids in the Users column."
 msgstr ""
 
-#: ../public/js/plugins/groups-tab.js:54
+#: ../public/js/plugins/groups-tab.js:73
 msgid "Group name"
 msgstr ""
 
-#: ../public/js/plugins/groups-tab.js:237
+#: ../public/js/plugins/groups-tab.js:267
 msgid "+ New Group"
 msgstr ""
 
-#: ../public/js/plugins/groups-tab.js:266
-#: ../public/js/plugins/groups-tab.js:395
-#: ../public/js/plugins/groups-tab.js:432
+#: ../public/js/plugins/groups-tab.js:296
+#: ../public/js/plugins/groups-tab.js:429
+#: ../public/js/plugins/groups-tab.js:466
 msgid "Group information"
 msgstr ""
 
-#: ../public/js/plugins/groups-tab.js:281
+#: ../public/js/plugins/groups-tab.js:315
 msgid "Group info"
 msgstr ""
 
-#: ../public/js/plugins/groups-tab.js:406
+#: ../public/js/plugins/groups-tab.js:440
 msgid "Quota information"
 msgstr ""
 
-#: ../public/js/plugins/groups-tab.js:444
+#: ../public/js/plugins/groups-tab.js:562
 msgid "Create group"
 msgstr ""
 
-#: ../public/js/plugins/groups-tab.js:473
+#: ../public/js/plugins/groups-tab.js:591
 msgid "Group quotas"
 msgstr ""
 
 #: ../public/js/plugins/images-tab.js:36 ../public/js/plugins/images-tab.js:92
-#: ../public/js/plugins/images-tab.js:207
-#: ../public/js/plugins/images-tab.js:649
+#: ../public/js/plugins/images-tab.js:199
+#: ../public/js/plugins/images-tab.js:641
 msgid "Persistent"
 msgstr ""
 
@@ -2881,8 +2868,13 @@ msgstr ""
 msgid "Select the datastore for this image"
 msgstr ""
 
+#: ../public/js/plugins/images-tab.js:86
+#: ../public/js/plugins/images-tab.js:545
+msgid "CD-ROM"
+msgstr ""
+
 #: ../public/js/plugins/images-tab.js:87
-#: ../public/js/plugins/images-tab.js:554
+#: ../public/js/plugins/images-tab.js:546
 msgid "Datablock"
 msgstr ""
 
@@ -2915,139 +2907,135 @@ msgid "Provide a path"
 msgstr ""
 
 #: ../public/js/plugins/images-tab.js:120
-msgid "Provide a source"
-msgstr ""
-
-#: ../public/js/plugins/images-tab.js:123
 msgid "Upload"
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:126
+#: ../public/js/plugins/images-tab.js:123
 msgid "Create an empty datablock"
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:127
-msgid "Please choose path if you have a file-based image. Choose source otherwise or create an empty datablock disk."
+#: ../public/js/plugins/images-tab.js:124
+msgid "Please choose path if you have a file-based image. Otherwise upload or create an empty datablock disk."
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:131
-#: ../public/js/plugins/images-tab.js:657
+#: ../public/js/plugins/images-tab.js:128
+#: ../public/js/plugins/images-tab.js:649
 msgid "Path"
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:133
+#: ../public/js/plugins/images-tab.js:130
 msgid "Path to the original file that will be copied to the image repository. If not specified for a DATABLOCK type image, an empty image will be created."
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:138
-msgid "Source to be used in the DISK attribute. Useful for not file-based images."
-msgstr ""
-
-#: ../public/js/plugins/images-tab.js:143
+#: ../public/js/plugins/images-tab.js:135
 msgid "Size of the datablock in MB."
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:146
+#: ../public/js/plugins/images-tab.js:138
 msgid "FS type"
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:148
+#: ../public/js/plugins/images-tab.js:140
 msgid "Type of file system to be built. This can be any value understood by mkfs unix command."
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:151
+#: ../public/js/plugins/images-tab.js:143
 msgid "Upload file"
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:181
+#: ../public/js/plugins/images-tab.js:173
 msgid "Write the image template here"
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:201
+#: ../public/js/plugins/images-tab.js:193
 msgid "Please, choose and modify the image you want to update"
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:203
+#: ../public/js/plugins/images-tab.js:195
 msgid "Select an image"
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:332
+#: ../public/js/plugins/images-tab.js:324
 msgid "Image updated correctly"
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:492
+#: ../public/js/plugins/images-tab.js:484
 msgid "Make persistent"
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:496
+#: ../public/js/plugins/images-tab.js:488
 msgid "Make non persistent"
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:517
-#: ../public/js/plugins/images-tab.js:613
+#: ../public/js/plugins/images-tab.js:509
+#: ../public/js/plugins/images-tab.js:605
 msgid "Image information"
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:522
-#: ../public/js/plugins/images-tab.js:693
-#: ../public/js/plugins/images-tab.js:695
+#: ../public/js/plugins/images-tab.js:514
+#: ../public/js/plugins/images-tab.js:685
+#: ../public/js/plugins/images-tab.js:687
 msgid "Image template"
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:650
+#: ../public/js/plugins/images-tab.js:642
 msgid "yes"
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:650
+#: ../public/js/plugins/images-tab.js:642
 msgid "no"
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:661
+#: ../public/js/plugins/images-tab.js:645
+msgid "Source"
+msgstr ""
+
+#: ../public/js/plugins/images-tab.js:653
 msgid "Filesystem type"
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:665
+#: ../public/js/plugins/images-tab.js:657
 msgid "Size (Mb)"
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:673
+#: ../public/js/plugins/images-tab.js:665
 msgid "Running #VMS"
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:709
+#: ../public/js/plugins/images-tab.js:701
 msgid "Create Image"
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:786
+#: ../public/js/plugins/images-tab.js:765
 msgid "Custom attribute name and value must be filled in"
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:839
+#: ../public/js/plugins/images-tab.js:818
 msgid "Uploading..."
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:878
+#: ../public/js/plugins/images-tab.js:857
 msgid "There are mandatory parameters missing"
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:887
-#: ../public/js/plugins/images-tab.js:967
+#: ../public/js/plugins/images-tab.js:866
+#: ../public/js/plugins/images-tab.js:942
 msgid "Please select a datastore for this image"
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:998
+#: ../public/js/plugins/images-tab.js:973
 msgid "Update image properties"
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:1154
+#: ../public/js/plugins/images-tab.js:1129
 msgid "Clone an image"
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:1160
+#: ../public/js/plugins/images-tab.js:1135
 msgid "Choose a new name for the image"
 msgstr ""
 
-#: ../public/js/plugins/images-tab.js:1161
+#: ../public/js/plugins/images-tab.js:1136
 msgid "Several image are selected, please choose prefix to name the new copies"
 msgstr ""
 
diff --git a/src/sunstone/public/js/plugins/config-tab.js b/src/sunstone/public/js/plugins/config-tab.js
index 8b1e4564ab..f7c941e8fe 100644
--- a/src/sunstone/public/js/plugins/config-tab.js
+++ b/src/sunstone/public/js/plugins/config-tab.js
@@ -29,14 +29,14 @@ var config_tab_content =
               <td class="key_td">' + tr("Language") + '</td>\
               <td class="value_td">\
                    <select id="lang_sel" style="width:20em;">\
-                       <option value="en_US">'+tr("English")+'</option>\
+                       <option value="en_US">'+tr("English (US)")+'</option>\
                        <option value="zh_TW">'+tr("Chinese (TW)")+'</option>\
-                       <option value="fr_FR">'+tr("French")+'</option>\
-                       <option value="it_IT">'+tr("Italian")+'</option>\
+                       <option value="fr_FR">'+tr("French (FR)")+'</option>\
+                       <option value="it_IT">'+tr("Italian (IT)")+'</option>\
                        <option value="fa_IR">'+tr("Persian (IR)")+'</option>\
-                       <option value="pt_PT">'+tr("Portuguese")+'</option>\
-                       <option value="ru">'+tr("Russian")+'</option>\
-                       <option value="sk_SK">'+tr("Slovak")+'</option>\
+                       <option value="pt_PT">'+tr("Portuguese (PT)")+'</option>\
+                       <option value="ru_RU">'+tr("Russian (RU)")+'</option>\
+                       <option value="sk_SK">'+tr("Slovak (SK)")+'</option>\
                    </select>\
               </td>\
             </tr>\