diff --git a/locale/cz/LC_MESSAGES/django.mo b/locale/cz/LC_MESSAGES/django.mo
new file mode 100644
index 0000000..195f680
Binary files /dev/null and b/locale/cz/LC_MESSAGES/django.mo differ
diff --git a/locale/cz/LC_MESSAGES/django.po b/locale/cz/LC_MESSAGES/django.po
new file mode 100644
index 0000000..1b327d9
--- /dev/null
+++ b/locale/cz/LC_MESSAGES/django.po
@@ -0,0 +1,5828 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-12-20 07:58+0000\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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: accounts/forms.py:25
+msgid "Instance owned by another user"
+msgstr ""
+
+#: accounts/forms.py:49
+msgid "Key name already exist"
+msgstr ""
+
+#: accounts/forms.py:56
+msgid "Public key already exist"
+msgstr ""
+
+#: accounts/forms.py:59
+msgid "Invalid key"
+msgstr ""
+
+#: accounts/forms.py:75
+msgid "Email"
+msgstr ""
+
+#: accounts/models.py:23
+#, python-format
+msgid "Instance \"%(inst)s\" of user %(user)s"
+msgstr ""
+
+#: accounts/models.py:31
+msgid "key name"
+msgstr ""
+
+#: accounts/models.py:32
+msgid "public key"
+msgstr ""
+
+#: accounts/models.py:41
+msgid "max instances"
+msgstr ""
+
+#: accounts/models.py:43 accounts/models.py:50 accounts/models.py:56
+#: accounts/models.py:62
+msgid "-1 for unlimited. Any integer value"
+msgstr ""
+
+#: accounts/models.py:48
+msgid "max CPUs"
+msgstr ""
+
+#: accounts/models.py:54
+msgid "max memory"
+msgstr ""
+
+#: accounts/models.py:60
+msgid "max disk size"
+msgstr ""
+
+#: accounts/models.py:76
+msgid "Can change password"
+msgstr ""
+
+#: accounts/templates/account.html:7 accounts/templates/account.html:8
+msgid "User Profile"
+msgstr ""
+
+#: accounts/templates/account.html:12
+msgid "Email OTP QR code"
+msgstr ""
+
+#: accounts/templates/account.html:16
+msgid "Edit user"
+msgstr ""
+
+#: accounts/templates/account.html:19
+msgid "Create user instance"
+msgstr ""
+
+#: accounts/templates/account.html:28
+#: computes/templates/computes/instances.html:5
+#: computes/templates/computes/instances.html:9
+#: computes/templates/computes/instances.html:30
+#: computes/templates/overview.html:18 instances/templates/allinstances.html:5
+#: instances/templates/allinstances.html:9
+#: instances/templates/bottom_bar.html:17
+#: interfaces/templates/interface.html:16
+#: interfaces/templates/interfaces.html:22 networks/templates/network.html:17
+#: networks/templates/networks.html:19 nwfilters/templates/nwfilter.html:17
+#: nwfilters/templates/nwfilters.html:23 storages/templates/storage.html:23
+#: storages/templates/storages.html:19 templates/navbar.html:14
+#: virtsecrets/templates/secrets.html:25
+msgid "Instances"
+msgstr ""
+
+#: accounts/templates/account.html:33
+msgid "Public Keys"
+msgstr ""
+
+#: accounts/templates/account.html:44 admin/templates/admin/logs.html:27
+#: instances/templates/instance.html:5
+msgid "Instance"
+msgstr ""
+
+#: accounts/templates/account.html:45
+msgid "VNC"
+msgstr ""
+
+#: accounts/templates/account.html:46 instances/templates/instance.html:93
+#: instances/templates/instances/resize_tab.html:55
+#: instances/templates/instances/resize_tab.html:57
+#: instances/templates/instances/resize_tab.html:84
+#: instances/templates/instances/resize_tab.html:121
+#: instances/templates/instances/resize_tab.html:125
+#: instances/templates/instances/resize_tab.html:151
+#: instances/templates/instances/resize_tab.html:153
+#: instances/templates/instances/resize_tab.html:158
+msgid "Resize"
+msgstr ""
+
+#: accounts/templates/account.html:47 accounts/templates/account.html:65
+#: accounts/templates/profile.html:55 admin/templates/admin/group_list.html:43
+#: admin/templates/admin/user_list.html:65
+#: computes/templates/computes/list.html:53
+#: instances/templates/instances/settings_tab.html:325
+#: instances/templates/instances/settings_tab.html:329
+#: interfaces/templates/interface.html:60 networks/templates/network.html:50
+#: nwfilters/templates/nwfilter.html:103 nwfilters/templates/nwfilter.html:143
+#: nwfilters/templates/nwfilters.html:118 storages/templates/storage.html:63
+#: storages/templates/storage.html:175 templates/common/confirm_delete.html:21
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:417
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:394
+#: virtsecrets/templates/secrets.html:78
+msgid "Delete"
+msgstr ""
+
+#: accounts/templates/account.html:48
+#: instances/templates/create_instance_w2.html:80
+#: instances/templates/instances/settings_tab.html:254
+#: instances/templates/instances/snapshots_tab.html:41
+#: nwfilters/templates/nwfilter.html:93 nwfilters/templates/nwfilter.html:127
+#: nwfilters/templates/nwfilters.html:55 storages/templates/storage.html:101
+#: virtsecrets/templates/secrets.html:63
+msgid "Action"
+msgstr ""
+
+#: accounts/templates/account.html:60
+msgid "edit"
+msgstr ""
+
+#: accounts/templates/account.html:78
+msgid "Key name"
+msgstr ""
+
+#: accounts/templates/account.html:79
+msgid "Public key"
+msgstr ""
+
+#: accounts/templates/accounts/change_password_form.html:7
+#: accounts/templates/accounts/change_password_form.html:14
+#: accounts/templates/profile.html:33
+msgid "Change Password"
+msgstr ""
+
+#: accounts/templates/accounts/change_password_form.html:25
+#: accounts/templates/accounts/email_otp_form.html:25
+#: admin/templates/admin/user_form.html:19
+#: computes/templates/computes/form.html:21
+#: templates/common/confirm_delete.html:19 templates/common/form.html:20
+msgid "Cancel"
+msgstr ""
+
+#: accounts/templates/accounts/change_password_form.html:27
+#: instances/templates/instances/settings_tab.html:672
+#: instances/templates/instances/settings_tab.html:676
+#: instances/templates/instances/settings_tab.html:853
+#: instances/templates/instances/settings_tab.html:855
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:405
+#: venv2/lib/python2.7/site-packages/django/forms/widgets.py:379
+msgid "Change"
+msgstr ""
+
+#: accounts/templates/accounts/email/otp.html:3
+#, python-format
+msgid ""
+"\n"
+"Scan this QR code to get OTP for account '%(user)s'\n"
+msgstr ""
+
+#: accounts/templates/accounts/email_otp_form.html:12
+msgid ""
+"\n"
+"    Enter email address OTP QR code will be sent to.\n"
+"    "
+msgstr ""
+
+#: accounts/templates/accounts/email_otp_form.html:27
+msgid "Send"
+msgstr ""
+
+#: accounts/templates/accounts/otp_login.html:23
+msgid "I do not have/lost my OTP!"
+msgstr ""
+
+#: accounts/templates/accounts/otp_login.html:24
+#: accounts/templates/login.html:5 accounts/templates/login.html:23
+#: accounts/templates/login.html:28
+msgid "Sign In"
+msgstr ""
+
+#: accounts/templates/login.html:5 accounts/templates/logout.html:4
+msgid "WebVirtCloud"
+msgstr ""
+
+#: accounts/templates/login.html:19
+msgid "Incorrect username or password."
+msgstr ""
+
+#: accounts/templates/login.html:24 admin/templates/admin/logs.html:25
+#: computes/templates/computes/instances.html:64
+#: instances/templates/add_instance_owner_block.html:18
+#: instances/templates/allinstances_index_grouped.html:8
+#: instances/templates/allinstances_index_nongrouped.html:7
+#: instances/templates/instances/stats_tab.html:87
+msgid "User"
+msgstr ""
+
+#: accounts/templates/login.html:25 admin/forms.py:78
+#: console/templates/console-spice-full.html:206
+#: console/templates/console-spice-lite.html:58
+#: console/templates/console-spice-lite.html:99
+msgid "Password"
+msgstr ""
+
+#: accounts/templates/logout.html:4
+msgid "Sign Out"
+msgstr ""
+
+#: accounts/templates/logout.html:13
+msgid "Successful log out"
+msgstr ""
+
+#: accounts/templates/profile.html:7 accounts/templates/profile.html:9
+#: templates/navbar.html:45
+msgid "Profile"
+msgstr ""
+
+#: accounts/templates/profile.html:15
+msgid "Edit Profile"
+msgstr ""
+
+#: accounts/templates/profile.html:20
+#: instances/templates/instances/access_tab.html:20
+msgid "SSH Keys"
+msgstr ""
+
+#: accounts/templates/profile.html:38
+#: instances/templates/instances/settings_tab.html:720
+#: instances/templates/instances/settings_tab.html:722
+msgid "Update"
+msgstr ""
+
+#: accounts/templates/profile.html:68
+msgid "Add SSH Key"
+msgstr ""
+
+#: accounts/templates/profile.html:76
+#: instances/templates/add_instance_network_block.html:50
+#: instances/templates/add_instance_owner_block.html:31
+#: instances/templates/create_flav_block.html:28
+#: nwfilters/templates/add_nwf_rule.html:26
+msgid "Add"
+msgstr ""
+
+#: accounts/utils.py:50
+msgid "OTP QR Code"
+msgstr ""
+
+#: accounts/utils.py:51
+msgid "Please view HTML version of this message."
+msgstr ""
+
+#: accounts/views.py:26
+msgid "Profile updated"
+msgstr ""
+
+#: accounts/views.py:44
+msgid "SSH key added"
+msgstr ""
+
+#: accounts/views.py:52
+msgid "Add SSH key"
+msgstr ""
+
+#: accounts/views.py:61
+msgid "SSH key deleted"
+msgstr ""
+
+#: accounts/views.py:69
+msgid "Delete SSH key"
+msgstr ""
+
+#: accounts/views.py:101
+msgid "Password Changed"
+msgstr ""
+
+#: accounts/views.py:121
+msgid "Create User Instance"
+msgstr ""
+
+#: accounts/views.py:139
+msgid "Update User Instance"
+msgstr ""
+
+#: accounts/views.py:175
+#, python-format
+msgid "OTP Sent to %(email)s"
+msgstr ""
+
+#: accounts/views.py:183
+msgid "Email OTP"
+msgstr ""
+
+#: accounts/views.py:194
+#, python-format
+msgid "OTP QR code was emailed to user %(user)s"
+msgstr ""
+
+#: accounts/views.py:196
+msgid "User email not set, failed to send QR code"
+msgstr ""
+
+#: admin/forms.py:49
+msgid "Permissions"
+msgstr ""
+
+#: admin/forms.py:56 admin/templates/admin/group_list.html:13
+#: templates/navbar.html:30
+msgid "Groups"
+msgstr ""
+
+#: admin/forms.py:81
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, \n"
+"                    but you can change the password using <a href='{}'>this "
+"form</a>."
+msgstr ""
+
+#: admin/templates/admin/group_list.html:5 admin/views.py:87
+#: instances/templates/instances/settings_tab.html:69 templates/navbar.html:29
+msgid "Users"
+msgstr ""
+
+#: admin/templates/admin/group_list.html:20 admin/templates/admin/logs.html:15
+#: admin/templates/admin/user_list.html:23
+#: computes/templates/computes/instances.html:55
+#: computes/templates/computes/list.html:19
+#: instances/templates/create_instance_w2.html:67
+#: interfaces/templates/interfaces.html:48 networks/templates/networks.html:45
+#: nwfilters/templates/nwfilters.html:132 storages/templates/storage.html:187
+#: storages/templates/storages.html:45 virtsecrets/templates/secrets.html:51
+msgid "Warning"
+msgstr ""
+
+#: admin/templates/admin/group_list.html:20
+msgid "You don't have any groups"
+msgstr ""
+
+#: admin/templates/admin/group_list.html:28
+msgid "Group Name"
+msgstr ""
+
+#: admin/templates/admin/group_list.html:29
+#: admin/templates/admin/user_list.html:36
+#: computes/templates/computes/instances.html:68
+#: computes/templates/computes/list.html:30
+#: instances/templates/allinstances_index_grouped.html:12
+#: instances/templates/allinstances_index_nongrouped.html:12
+#: instances/templates/instances/settings_tab.html:355
+#: instances/templates/instances/settings_tab.html:525
+#: networks/templates/network.html:175 networks/templates/network.html:284
+#: networks/templates/network.html:332
+msgid "Actions"
+msgstr ""
+
+#: admin/templates/admin/group_list.html:40
+#: admin/templates/admin/user_list.html:59
+#: computes/templates/computes/list.html:52 networks/templates/network.html:82
+#: nwfilters/templates/nwfilter.html:59 virtsecrets/templates/secrets.html:75
+msgid "Edit"
+msgstr ""
+
+#: admin/templates/admin/logs.html:5 admin/templates/admin/logs.html:7
+#: instances/templates/instances/stats_tab.html:12 templates/navbar.html:31
+msgid "Logs"
+msgstr ""
+
+#: admin/templates/admin/logs.html:15
+msgid "You don't have any Logs"
+msgstr ""
+
+#: admin/templates/admin/logs.html:24
+#: instances/templates/instances/snapshots_tab.html:40
+#: instances/templates/instances/stats_tab.html:86
+msgid "Date"
+msgstr ""
+
+#: admin/templates/admin/logs.html:26
+#: console/templates/console-spice-full.html:202
+#: instances/templates/allinstances_index_nongrouped.html:7
+msgid "Host"
+msgstr ""
+
+#: admin/templates/admin/logs.html:28
+#: instances/templates/instances/stats_tab.html:88
+msgid "Message"
+msgstr ""
+
+#: admin/templates/admin/user_form.html:21
+#: computes/templates/computes/form.html:23
+#: instances/templates/instances/edit_instance_volume.html:111
+#: networks/templates/add_network_qos.html:51 templates/common/form.html:22
+msgid "Save"
+msgstr ""
+
+#: admin/templates/admin/user_list.html:23
+msgid "You don't have any user"
+msgstr ""
+
+#: admin/templates/admin/user_list.html:31
+msgid "Username"
+msgstr ""
+
+#: admin/templates/admin/user_list.html:32
+#: computes/templates/computes/instances.html:65
+#: computes/templates/computes/list.html:28
+#: instances/templates/allinstances_index_grouped.html:9
+#: instances/templates/allinstances_index_nongrouped.html:9
+msgid "Status"
+msgstr ""
+
+#: admin/templates/admin/user_list.html:33
+msgid "Staff"
+msgstr ""
+
+#: admin/templates/admin/user_list.html:34
+msgid "Superuser"
+msgstr ""
+
+#: admin/templates/admin/user_list.html:35
+msgid "Can Clone"
+msgstr ""
+
+#: admin/templates/admin/user_list.html:48
+#: computes/templates/computes/instances.html:91
+#: instances/templates/allinstances_index_grouped.html:59
+#: instances/templates/allinstances_index_nongrouped.html:41
+#: instances/templates/instance.html:19
+msgid "Active"
+msgstr ""
+
+#: admin/templates/admin/user_list.html:50
+msgid "Blocked"
+msgstr ""
+
+#: admin/templates/admin/user_list.html:58
+msgid "View Profile"
+msgstr ""
+
+#: admin/templates/admin/user_list.html:61
+msgid "Block"
+msgstr ""
+
+#: admin/templates/admin/user_list.html:63
+msgid "Unblock"
+msgstr ""
+
+#: admin/views.py:42
+msgid "Create Group"
+msgstr ""
+
+#: admin/views.py:60
+msgid "Update Group"
+msgstr ""
+
+#: admin/views.py:110
+msgid "Create User"
+msgstr ""
+
+#: admin/views.py:129
+msgid "Update User"
+msgstr ""
+
+#: admin/views.py:141
+#, python-format
+msgid "Password changed for %(user)s"
+msgstr ""
+
+#: admin/views.py:144
+msgid "Wrong Data Provided"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:11
+msgid "Theme"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:11
+msgid "Bootstrap CSS & Bootswatch Theme"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:12
+msgid "Theme SASS Path"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:12
+msgid "Bootstrap SASS & Bootswatch SASS Directory"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:13
+msgid "All Instances View Style"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:13
+msgid "All instances list style"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:14
+msgid "Logs per Page"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:14
+msgid "Pagination for logs"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:15
+msgid "Multiple Owner for VM"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:15
+msgid "Allow to have multiple owner for instance"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:16
+msgid "Quota Debug"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:16
+msgid "Debug for user quotas"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:17
+msgid "Disk Format"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:17
+msgid "Instance disk format"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:18
+msgid "Disk Bus"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:18
+msgid "Instance disk bus type"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:19
+msgid "Disk SCSI Controller"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:19
+msgid "SCSI controller type"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:20
+msgid "Disk Cache"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:20
+msgid "Disk volume cache type"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:21
+msgid "Disk IO Type"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:21
+msgid "Volume io modes"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:22
+msgid "Disk Detect Zeroes"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:22
+msgid "Volume detect zeroes mode"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:23
+msgid "Disk Discard"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:23
+msgid "Volume discard mode"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:24
+msgid "Disk Owner UID"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:24
+msgid "Owner UID: up to os, 0=root, 107=qemu or libvirt-bin(for ubuntu)"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:25
+msgid "Disk Owner GID"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:25
+msgid "Owner GID: up to os, 0=root, 107=qemu or libvirt-bin(for ubuntu)"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:26
+msgid "VM CPU Mode"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:26
+msgid "Cpu modes"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:27
+msgid "VM Machine Type"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:27
+msgid "Chipset/Machine type"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:28
+msgid "VM Firmware Type"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:28
+msgid "Firmware type for x86_64"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:29
+msgid "VM Architecture Type"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:29
+msgid "Architecture type: x86_64, i686, etc"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:30
+msgid "VM Console Type"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:30
+msgid "Default console type"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:31
+msgid "VM Clone Name Prefix"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:31
+msgid "Prefix for cloned instance name"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:32
+msgid "VM Clone Auto Name"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:32
+msgid "Generated name for cloned instance"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:33
+msgid "VM Clone Auto Migrate"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:33
+msgid "Auto migrate instance after clone"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:34
+msgid "VM Bottom Bar"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:34
+msgid "Bottom navbar for instance details"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:35
+msgid "Show Access Root Pass"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:35
+msgid "Show access root password"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:36
+msgid "Show Access SSH Keys"
+msgstr ""
+
+#: appsettings/migrations/0002_auto_20200527_1603.py:36
+msgid "Show access ssh keys"
+msgstr ""
+
+#: appsettings/migrations/0004_auto_20200716_0637.py:11
+msgid "Console Scale"
+msgstr ""
+
+#: appsettings/migrations/0004_auto_20200716_0637.py:11
+msgid "Allow console to scaling view"
+msgstr ""
+
+#: appsettings/migrations/0004_auto_20200716_0637.py:12
+msgid "Console View-Only"
+msgstr ""
+
+#: appsettings/migrations/0004_auto_20200716_0637.py:12
+msgid "Allow only view not modify"
+msgstr ""
+
+#: appsettings/migrations/0004_auto_20200716_0637.py:13
+msgid "Console Resize Session"
+msgstr ""
+
+#: appsettings/migrations/0004_auto_20200716_0637.py:13
+msgid "Allow to resize session for console"
+msgstr ""
+
+#: appsettings/migrations/0004_auto_20200716_0637.py:14
+msgid "Console Clip Viewport"
+msgstr ""
+
+#: appsettings/migrations/0004_auto_20200716_0637.py:14
+msgid "Clip console viewport"
+msgstr ""
+
+#: appsettings/models.py:10 computes/models.py:11 instances/models.py:27
+msgid "name"
+msgstr ""
+
+#: appsettings/models.py:11
+msgid "key"
+msgstr ""
+
+#: appsettings/models.py:12
+msgid "value"
+msgstr ""
+
+#: appsettings/models.py:13
+msgid "choices"
+msgstr ""
+
+#: appsettings/models.py:14
+msgid "description"
+msgstr ""
+
+#: appsettings/templates/appsettings.html:4
+#: appsettings/templates/appsettings.html:6
+msgid "Edit Settings"
+msgstr ""
+
+#: appsettings/templates/appsettings.html:11
+msgid "App Settings"
+msgstr ""
+
+#: appsettings/templates/appsettings.html:15 templates/navbar.html:43
+msgid "Language"
+msgstr ""
+
+#: appsettings/templates/appsettings.html:48
+msgid "After change please full refresh page with 'Ctrl + F5' "
+msgstr ""
+
+#: appsettings/templates/appsettings.html:53
+msgid "Other Settings"
+msgstr ""
+
+#: appsettings/views.py:38
+#, python-format
+msgid "SASS directory path is changed. Now: %(dir)s"
+msgstr ""
+
+#: appsettings/views.py:70
+#, python-format
+msgid "Theme is changed. Now: %(theme)s"
+msgstr ""
+
+#: appsettings/views.py:85
+#, python-format
+msgid "%(setting)s is changed. Now: %(value)s"
+msgstr ""
+
+#: computes/forms.py:21
+msgid "FQDN/IP"
+msgstr ""
+
+#: computes/models.py:12
+msgid "hostname"
+msgstr ""
+
+#: computes/models.py:13
+msgid "login"
+msgstr ""
+
+#: computes/models.py:14
+msgid "password"
+msgstr ""
+
+#: computes/models.py:15
+msgid "details"
+msgstr ""
+
+#: computes/templates/computes/form.html:6
+msgid "Add Compute"
+msgstr ""
+
+#: computes/templates/computes/form.html:11
+msgid "Create Compute"
+msgstr ""
+
+#: computes/templates/computes/instances.html:27
+#: computes/templates/computes/list.html:48
+#: computes/templates/computes/list.html:50 computes/templates/overview.html:6
+#: computes/templates/overview.html:15 interfaces/templates/interface.html:13
+#: interfaces/templates/interfaces.html:19 networks/templates/network.html:14
+#: networks/templates/networks.html:16 nwfilters/templates/nwfilter.html:14
+#: nwfilters/templates/nwfilters.html:20 storages/templates/storage.html:20
+#: storages/templates/storages.html:16 virtsecrets/templates/secrets.html:22
+msgid "Overview"
+msgstr ""
+
+#: computes/templates/computes/instances.html:33
+#: computes/templates/overview.html:21 interfaces/templates/interface.html:19
+#: interfaces/templates/interfaces.html:25 networks/templates/network.html:20
+#: networks/templates/networks.html:22 nwfilters/templates/nwfilter.html:20
+#: nwfilters/templates/nwfilters.html:26 storages/templates/storage.html:26
+#: storages/templates/storages.html:4 storages/templates/storages.html:6
+#: storages/templates/storages.html:22 virtsecrets/templates/secrets.html:28
+msgid "Storages"
+msgstr ""
+
+#: computes/templates/computes/instances.html:36
+#: computes/templates/overview.html:24 interfaces/templates/interface.html:22
+#: interfaces/templates/interfaces.html:28 networks/templates/network.html:23
+#: networks/templates/networks.html:4 networks/templates/networks.html:6
+#: networks/templates/networks.html:25 nwfilters/templates/nwfilter.html:23
+#: nwfilters/templates/nwfilters.html:29 storages/templates/storage.html:29
+#: storages/templates/storages.html:25 virtsecrets/templates/secrets.html:31
+msgid "Networks"
+msgstr ""
+
+#: computes/templates/computes/instances.html:39
+#: computes/templates/overview.html:27 interfaces/templates/interface.html:25
+#: interfaces/templates/interfaces.html:5
+#: interfaces/templates/interfaces.html:7
+#: interfaces/templates/interfaces.html:31 networks/templates/network.html:26
+#: networks/templates/networks.html:28 nwfilters/templates/nwfilter.html:26
+#: nwfilters/templates/nwfilters.html:32 storages/templates/storage.html:32
+#: storages/templates/storages.html:28 virtsecrets/templates/secrets.html:34
+msgid "Interfaces"
+msgstr ""
+
+#: computes/templates/computes/instances.html:42
+#: computes/templates/overview.html:30 interfaces/templates/interface.html:28
+#: interfaces/templates/interfaces.html:34 networks/templates/network.html:29
+#: networks/templates/networks.html:31 nwfilters/templates/nwfilter.html:29
+#: nwfilters/templates/nwfilters.html:5 nwfilters/templates/nwfilters.html:7
+#: nwfilters/templates/nwfilters.html:35 storages/templates/storage.html:35
+#: storages/templates/storages.html:31 virtsecrets/templates/secrets.html:37
+msgid "NWFilters"
+msgstr ""
+
+#: computes/templates/computes/instances.html:45
+#: computes/templates/overview.html:33 interfaces/templates/interface.html:31
+#: interfaces/templates/interfaces.html:37 networks/templates/network.html:32
+#: networks/templates/networks.html:34 nwfilters/templates/nwfilter.html:32
+#: nwfilters/templates/nwfilters.html:38
+#: storages/templates/create_stg_block.html:138
+#: storages/templates/storage.html:38 storages/templates/storages.html:34
+#: virtsecrets/templates/secrets.html:4 virtsecrets/templates/secrets.html:10
+#: virtsecrets/templates/secrets.html:40
+msgid "Secrets"
+msgstr ""
+
+#: computes/templates/computes/instances.html:56
+msgid "Hypervisor doesn't have any Instances"
+msgstr ""
+
+#: computes/templates/computes/instances.html:63
+#: computes/templates/computes/list.html:27
+#: instances/templates/add_instance_volume.html:44
+#: instances/templates/add_instance_volume.html:46
+#: instances/templates/allinstances_index_grouped.html:7
+#: instances/templates/allinstances_index_nongrouped.html:5
+#: instances/templates/create_instance_w2.html:76
+#: instances/templates/create_instance_w2.html:102
+#: instances/templates/create_instance_w2.html:105
+#: instances/templates/create_instance_w2.html:304
+#: instances/templates/create_instance_w2.html:306
+#: instances/templates/create_instance_w2.html:518
+#: instances/templates/create_instance_w2.html:520
+#: instances/templates/instances/settings_tab.html:353
+#: instances/templates/instances/snapshots_tab.html:39
+#: interfaces/templates/create_iface_block.html:18
+#: interfaces/templates/interface.html:75
+#: networks/templates/create_net_block.html:18
+#: networks/templates/modify_ipv4_fixed_address.html:30
+#: networks/templates/modify_ipv6_fixed_address.html:30
+#: networks/templates/network.html:174 networks/templates/network.html:283
+#: nwfilters/templates/nwfilter.html:41 nwfilters/templates/nwfilters.html:54
+#: nwfilters/templates/nwfilters.html:98 nwfilters/templates/nwfilters.html:100
+#: storages/templates/create_stg_block.html:56
+#: storages/templates/create_stg_block.html:85
+#: storages/templates/create_stg_block.html:114
+#: storages/templates/create_stg_block.html:179
+#: storages/templates/create_stg_block.html:228
+#: storages/templates/create_stg_vol_block.html:21
+#: storages/templates/storage.html:97 storages/templates/storage.html:125
+#: storages/templates/storage.html:127
+msgid "Name"
+msgstr ""
+
+#: computes/templates/computes/instances.html:63
+#: instances/templates/allinstances_index_grouped.html:7
+#: instances/templates/allinstances_index_nongrouped.html:5
+#: instances/templates/instances/settings_tab.html:811
+#: instances/templates/instances/settings_tab.html:834
+msgid "Description"
+msgstr ""
+
+#: computes/templates/computes/instances.html:66
+#: instances/templates/allinstances_index_grouped.html:10
+#: instances/templates/allinstances_index_nongrouped.html:10
+#: instances/templates/create_instance_w2.html:77
+#: instances/templates/create_instance_w2.html:322
+#: instances/templates/create_instance_w2.html:536
+#: instances/templates/instance.html:43 instances/templates/instance.html:45
+msgid "VCPU"
+msgstr ""
+
+#: computes/templates/computes/instances.html:67
+#: computes/templates/overview.html:80
+#: instances/templates/allinstances_index_grouped.html:11
+#: instances/templates/allinstances_index_nongrouped.html:11
+#: instances/templates/instances/resize_tab.html:12
+msgid "Memory"
+msgstr ""
+
+#: computes/templates/computes/instances.html:93
+#: instances/templates/allinstances_index_grouped.html:60
+#: instances/templates/allinstances_index_nongrouped.html:43
+#: instances/templates/instance.html:16
+msgid "Off"
+msgstr ""
+
+#: computes/templates/computes/instances.html:95
+#: instances/templates/allinstances_index_grouped.html:62
+#: instances/templates/allinstances_index_nongrouped.html:45
+msgid "Suspended"
+msgstr ""
+
+#: computes/templates/computes/list.html:6
+#: computes/templates/computes/list.html:12 templates/navbar.html:18
+msgid "Computes"
+msgstr ""
+
+#: computes/templates/computes/list.html:19
+msgid "You don't have any computes"
+msgstr ""
+
+#: computes/templates/computes/list.html:29 computes/templates/overview.html:90
+#: instances/templates/instances/settings_tab.html:176
+#: instances/templates/instances/settings_tab.html:215
+#: instances/templates/instances/settings_tab.html:263
+msgid "Details"
+msgstr ""
+
+#: computes/templates/computes/list.html:40
+#: instances/templates/allinstances_index_grouped.html:28
+#: instances/templates/instances/settings_tab.html:906
+msgid "Connected"
+msgstr ""
+
+#: computes/templates/computes/list.html:40
+msgid "Not Connected"
+msgstr ""
+
+#: computes/templates/create_comp_block.html:5
+msgid "TCP"
+msgstr ""
+
+#: computes/templates/create_comp_block.html:6
+msgid "SSH"
+msgstr ""
+
+#: computes/templates/create_comp_block.html:7
+msgid "TLS"
+msgstr ""
+
+#: computes/templates/create_comp_block.html:8
+msgid "Local"
+msgstr ""
+
+#: computes/templates/create_comp_block.html:9
+msgid "Add new host"
+msgstr ""
+
+#: computes/templates/overview.html:40
+msgid "Basic details"
+msgstr ""
+
+#: computes/templates/overview.html:42
+#: instances/templates/instances/info_tab.html:5
+#: storages/templates/create_stg_block.html:185
+msgid "Hostname"
+msgstr ""
+
+#: computes/templates/overview.html:44
+msgid "Hypervisors"
+msgstr ""
+
+#: computes/templates/overview.html:61
+msgid "more"
+msgstr ""
+
+#: computes/templates/overview.html:71
+msgid "Emulator"
+msgstr ""
+
+#: computes/templates/overview.html:73
+#: instances/templates/instances/info_tab.html:11
+msgid "Version"
+msgstr ""
+
+#: computes/templates/overview.html:75
+msgid "Qemu"
+msgstr ""
+
+#: computes/templates/overview.html:77
+msgid "Libvirt"
+msgstr ""
+
+#: computes/templates/overview.html:82
+#: instances/templates/create_instance_w1.html:36
+#: instances/templates/create_instance_w1.html:50
+msgid "Architecture"
+msgstr ""
+
+#: computes/templates/overview.html:84
+msgid "Logical CPUs"
+msgstr ""
+
+#: computes/templates/overview.html:86
+msgid "Processor"
+msgstr ""
+
+#: computes/templates/overview.html:88
+msgid "Connection"
+msgstr ""
+
+#: computes/templates/overview.html:94
+#: instances/templates/instances/edit_instance_volume.html:25
+msgid "Performance"
+msgstr ""
+
+#: computes/templates/overview.html:100
+msgid "CPU Utilization"
+msgstr ""
+
+#: computes/templates/overview.html:109
+msgid "RAM Utilization"
+msgstr ""
+
+#: computes/validators.py:16
+msgid ""
+"Hostname must contain only numbers, or the domain name separated by \".\""
+msgstr ""
+
+#: computes/validators.py:18
+msgid "Wrong IP address"
+msgstr ""
+
+#: computes/validators.py:24
+msgid "The hostname must not contain any special characters"
+msgstr ""
+
+#: console/templates/console-base.html:51
+msgid "Send key(s)"
+msgstr ""
+
+#: console/templates/console-base.html:71
+msgid "Fullscreen"
+msgstr ""
+
+#: console/templates/console-spice-full.html:56
+msgid "must set host and port"
+msgstr ""
+
+#: console/templates/console-spice-full.html:83
+#: console/templates/console-spice-full.html:97
+#: console/templates/console-spice-lite.html:138
+#: console/templates/console-spice-lite.html:150
+msgid "disconnect"
+msgstr ""
+
+#: console/templates/console-spice-full.html:114
+#: console/templates/console-spice-lite.html:167
+msgid "File API is not supported"
+msgstr ""
+
+#: console/templates/console-spice-full.html:204
+msgid "Port"
+msgstr ""
+
+#: console/templates/console-spice-full.html:212
+msgid "Show console"
+msgstr ""
+
+#: console/templates/console-spice-full.html:214
+#: interfaces/templates/interface.html:59 networks/templates/network.html:49
+#: networks/templates/network.html:119 networks/templates/network.html:125
+#: networks/templates/network.html:231 networks/templates/network.html:237
+#: storages/templates/storage.html:62
+msgid "Start"
+msgstr ""
+
+#: console/templates/console-spice-lite.html:109
+msgid "must specify host and port in URL"
+msgstr ""
+
+#: console/templates/console-vnc-full.html:78
+msgid "noVNC encountered an error"
+msgstr ""
+
+#: console/templates/console-vnc-lite.html:221
+msgid "Loading"
+msgstr ""
+
+#: console/views.py:52
+msgid ""
+"User does not have permission to access console or host/instance not exist"
+msgstr ""
+
+#: console/views.py:84
+msgid "Fail to get console. Please check the console configuration of your VM."
+msgstr ""
+
+#: console/views.py:86
+#, python-format
+msgid "Console type '%(type)s' has not support"
+msgstr ""
+
+#: instances/forms.py:37
+msgid "No Virtual Machine name has been entered"
+msgstr ""
+
+#: instances/forms.py:39
+msgid "No VCPU has been entered"
+msgstr ""
+
+#: instances/forms.py:42
+msgid "No RAM size has been entered"
+msgstr ""
+
+#: instances/forms.py:43
+msgid "No Network pool has been choosen"
+msgstr ""
+
+#: instances/forms.py:48
+msgid "Please select HDD cache mode"
+msgstr ""
+
+#: instances/forms.py:55
+msgid "Please select a graphics type"
+msgstr ""
+
+#: instances/forms.py:56
+msgid "Please select a video driver"
+msgstr ""
+
+#: instances/forms.py:63
+msgid "The name of the virtual machine must not contain any special characters"
+msgstr ""
+
+#: instances/models.py:11
+msgid "label"
+msgstr ""
+
+#: instances/models.py:12
+msgid "memory"
+msgstr ""
+
+#: instances/models.py:13
+msgid "vcpu"
+msgstr ""
+
+#: instances/models.py:14
+msgid "disk"
+msgstr ""
+
+#: instances/models.py:28
+msgid "uuid"
+msgstr ""
+
+#: instances/models.py:29
+msgid "is template"
+msgstr ""
+
+#: instances/models.py:30
+msgid "created"
+msgstr ""
+
+#: instances/models.py:216
+msgid "Can access console without password"
+msgstr ""
+
+#: instances/templates/add_instance_network_block.html:12
+msgid "Add Instance Network"
+msgstr ""
+
+#: instances/templates/add_instance_network_block.html:18
+#: instances/templates/create_instance_w2.html:182
+#: instances/templates/instances/settings_tab.html:373
+#: instances/templates/instances/settings_tab.html:409
+#: instances/templates/instances/settings_tab.html:521
+#: interfaces/templates/interface.html:45
+#: interfaces/templates/interface.html:74
+#: interfaces/templates/interfaces.html:64
+#: networks/templates/modify_ipv4_fixed_address.html:24
+#: networks/templates/network.html:172
+msgid "MAC"
+msgstr ""
+
+#: instances/templates/add_instance_network_block.html:24
+#: instances/templates/create_instance_w2.html:163
+#: instances/templates/create_instance_w2.html:387
+#: instances/templates/instances/settings_tab.html:36
+#: instances/templates/instances/settings_tab.html:421
+#: networks/templates/network.html:5 networks/templates/network.html:7
+#: networks/templates/network.html:107 networks/templates/network.html:218
+msgid "Network"
+msgstr ""
+
+#: instances/templates/add_instance_network_block.html:37
+#: instances/templates/create_instance_w2.html:188
+#: instances/templates/create_instance_w2.html:429
+#: instances/templates/create_instance_w2.html:645
+#: instances/templates/instances/settings_tab.html:430
+#: nwfilters/templates/nwfilter.html:5 nwfilters/templates/nwfilter.html:7
+msgid "NWFilter"
+msgstr ""
+
+#: instances/templates/add_instance_network_block.html:40
+#: instances/templates/add_instance_volume.html:121
+#: instances/templates/create_inst_block.html:25
+#: instances/templates/create_instance_w2.html:157
+#: instances/templates/create_instance_w2.html:191
+#: instances/templates/create_instance_w2.html:376
+#: instances/templates/create_instance_w2.html:432
+#: instances/templates/create_instance_w2.html:580
+#: instances/templates/create_instance_w2.html:599
+#: instances/templates/create_instance_w2.html:648
+#: instances/templates/instances/access_tab.html:123
+#: instances/templates/instances/settings_tab.html:191
+#: instances/templates/instances/settings_tab.html:434
+#: instances/templates/instances/stats_tab.html:93
+#: interfaces/templates/interface.html:41
+#: interfaces/templates/interface.html:43 nwfilters/templates/nwfilter.html:73
+#: storages/templates/create_stg_block.html:146
+#: storages/templates/storage.html:49 storages/templates/storage.html:51
+#: storages/templates/storage.html:53
+msgid "None"
+msgstr ""
+
+#: instances/templates/add_instance_network_block.html:49
+#: instances/templates/add_instance_owner_block.html:30
+#: instances/templates/add_instance_volume.html:93
+#: instances/templates/add_instance_volume.html:148
+#: instances/templates/create_flav_block.html:25
+#: instances/templates/create_inst_block.html:34
+#: instances/templates/create_instance_w2.html:268
+#: instances/templates/instances/edit_instance_volume.html:110
+#: instances/templates/instances/settings_tab.html:455
+#: interfaces/templates/create_iface_block.html:139
+#: networks/templates/add_network_qos.html:50
+#: networks/templates/create_net_block.html:85
+#: networks/templates/modify_ipv4_fixed_address.html:44
+#: networks/templates/modify_ipv6_fixed_address.html:44
+#: nwfilters/templates/add_nwf_rule.html:25
+#: nwfilters/templates/create_nwfilter_block.html:25
+#: nwfilters/templates/nwfilters.html:78 nwfilters/templates/nwfilters.html:106
+#: storages/templates/create_stg_block.html:69
+#: storages/templates/create_stg_block.html:98
+#: storages/templates/create_stg_block.html:154
+#: storages/templates/create_stg_block.html:216
+#: storages/templates/create_stg_block.html:244
+#: storages/templates/create_stg_vol_block.html:28
+#: storages/templates/create_stg_vol_block.html:56
+#: storages/templates/storage.html:155
+#: virtsecrets/templates/create_secret_block.html:54
+#: virtsecrets/templates/secrets.html:103
+msgid "Close"
+msgstr ""
+
+#: instances/templates/add_instance_owner_block.html:12
+msgid "Add Instance Owner"
+msgstr ""
+
+#: instances/templates/add_instance_volume.html:3
+#: instances/templates/add_instance_volume.html:94
+#: instances/templates/add_instance_volume.html:149
+msgid "Add Volume"
+msgstr ""
+
+#: instances/templates/add_instance_volume.html:12
+msgid "Add Instance Volume"
+msgstr ""
+
+#: instances/templates/add_instance_volume.html:19
+msgid "New Disk"
+msgstr ""
+
+#: instances/templates/add_instance_volume.html:24
+msgid "Existing Disk"
+msgstr ""
+
+#: instances/templates/add_instance_volume.html:32
+#: instances/templates/add_instance_volume.html:102
+msgid "Volume parameters"
+msgstr ""
+
+#: instances/templates/add_instance_volume.html:34
+#: instances/templates/add_instance_volume.html:104
+#: instances/templates/create_instance_w2.html:148
+#: instances/templates/create_instance_w2.html:591
+#: instances/templates/instances/settings_tab.html:252
+#: storages/templates/storage.html:4 storages/templates/storage.html:9
+msgid "Storage"
+msgstr ""
+
+#: instances/templates/add_instance_volume.html:50
+#: storages/templates/create_stg_block.html:197
+#: storages/templates/storage.html:100 storages/templates/storage.html:138
+msgid "Format"
+msgstr ""
+
+#: instances/templates/add_instance_volume.html:60
+#: storages/templates/storage.html:54 storages/templates/storage.html:99
+#: storages/templates/storages.html:61
+msgid "Size"
+msgstr ""
+
+#: instances/templates/add_instance_volume.html:64
+#: instances/templates/create_instance_w2.html:90
+msgid "GB"
+msgstr ""
+
+#: instances/templates/add_instance_volume.html:67
+#: instances/templates/add_instance_volume.html:127
+#: instances/templates/instances/edit_instance_volume.html:89
+#: instances/templates/instances/settings_tab.html:181
+#: instances/templates/instances/settings_tab.html:220
+msgid "Bus"
+msgstr ""
+
+#: instances/templates/add_instance_volume.html:77
+#: instances/templates/add_instance_volume.html:137
+msgid "Cache"
+msgstr ""
+
+#: instances/templates/add_instance_volume.html:87
+#: instances/templates/instances/settings_tab.html:789
+#: storages/templates/storage.html:148
+msgid "Metadata"
+msgstr ""
+
+#: instances/templates/add_instance_volume.html:107
+msgid "Select Pool"
+msgstr ""
+
+#: instances/templates/add_instance_volume.html:118
+msgid "Volume"
+msgstr ""
+
+#: instances/templates/allinstances.html:22
+msgid "Problem occurred with host"
+msgstr ""
+
+#: instances/templates/allinstances_index_grouped.html:12
+msgid "Mem Usage"
+msgstr ""
+
+#: instances/templates/bottom_bar.html:4
+msgid "HOST"
+msgstr ""
+
+#: instances/templates/create_flav_block.html:14
+msgid "Add New Flavor"
+msgstr ""
+
+#: instances/templates/create_inst_block.html:11
+msgid "Choose a compute for new instance"
+msgstr ""
+
+#: instances/templates/create_inst_block.html:18
+msgid "Compute"
+msgstr ""
+
+#: instances/templates/create_inst_block.html:21
+msgid "Please select"
+msgstr ""
+
+#: instances/templates/create_inst_block.html:38
+#: instances/templates/create_inst_block.html:42
+msgid "Choose"
+msgstr ""
+
+#: instances/templates/create_instance_w1.html:5
+#: instances/templates/create_instance_w2.html:5
+msgid "Create new instance"
+msgstr ""
+
+#: instances/templates/create_instance_w1.html:5
+msgid "Select Type"
+msgstr ""
+
+#: instances/templates/create_instance_w1.html:8
+#: instances/templates/create_instance_w2.html:12
+#, python-format
+msgid "New instance on %(host)s "
+msgstr ""
+
+#: instances/templates/create_instance_w1.html:41
+#: instances/templates/instances/settings_tab.html:55
+#: networks/templates/network.html:72 nwfilters/templates/nwfilter.html:49
+msgid "XML"
+msgstr ""
+
+#: instances/templates/create_instance_w1.html:60
+msgid "Chipset"
+msgstr ""
+
+#: instances/templates/create_instance_w1.html:70
+msgid "Next"
+msgstr ""
+
+#: instances/templates/create_instance_w1.html:85
+#: instances/templates/create_instance_w2.html:270
+#: instances/templates/create_instance_w2.html:272
+#: instances/templates/create_instance_w2.html:500
+#: instances/templates/create_instance_w2.html:504
+#: instances/templates/create_instance_w2.html:716
+#: instances/templates/create_instance_w2.html:720
+#: interfaces/templates/create_iface_block.html:142
+#: networks/templates/create_net_block.html:86
+#: networks/templates/modify_ipv4_fixed_address.html:45
+#: networks/templates/modify_ipv6_fixed_address.html:45
+#: nwfilters/templates/create_nwfilter_block.html:26
+#: storages/templates/create_stg_block.html:70
+#: storages/templates/create_stg_block.html:99
+#: storages/templates/create_stg_block.html:158
+#: storages/templates/create_stg_block.html:162
+#: storages/templates/create_stg_block.html:219
+#: storages/templates/create_stg_block.html:247
+#: storages/templates/create_stg_vol_block.html:57
+#: virtsecrets/templates/create_secret_block.html:55
+msgid "Create"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:45
+msgid "Flavor"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:50
+msgid "Custom"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:55
+msgid "Template"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:63
+msgid "Create from flavor"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:67
+msgid "Hypervisor doesn't have any Flavors"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:78
+#: instances/templates/create_instance_w2.html:351
+#: instances/templates/create_instance_w2.html:563
+#: instances/templates/instance.html:48
+msgid "RAM"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:79
+#: instances/templates/create_instance_w2.html:366
+msgid "HDD"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:89
+#: instances/templates/create_instance_w2.html:355
+#: instances/templates/create_instance_w2.html:567
+#: instances/templates/instance.html:48
+#: instances/templates/instances/resize_tab.html:95
+#: instances/templates/instances/resize_tab.html:109
+msgid "MB"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:96
+msgid "Create Virtual Machine"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:114
+#: instances/templates/create_instance_w2.html:311
+#: instances/templates/create_instance_w2.html:525
+msgid "Firmware"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:126
+#: instances/templates/create_instance_w2.html:329
+#: instances/templates/create_instance_w2.html:542
+msgid "VCPU Config"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:129
+#: instances/templates/create_instance_w2.html:332
+#: instances/templates/create_instance_w2.html:545
+msgid "no-mode"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:173
+#: instances/templates/create_instance_w2.html:402
+#: instances/templates/create_instance_w2.html:618
+#: instances/templates/instances/edit_instance_volume.html:30
+msgid "Advanced"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:199
+#: instances/templates/create_instance_w2.html:634
+msgid "HDD cache mode"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:211
+#: instances/templates/create_instance_w2.html:441
+#: instances/templates/create_instance_w2.html:657
+msgid "Graphics"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:222
+#: instances/templates/create_instance_w2.html:452
+#: instances/templates/create_instance_w2.html:668
+msgid "Video"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:236
+#: instances/templates/create_instance_w2.html:466
+#: instances/templates/create_instance_w2.html:682
+msgid "Console Access"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:246
+#: instances/templates/create_instance_w2.html:248
+#: instances/templates/create_instance_w2.html:476
+#: instances/templates/create_instance_w2.html:478
+#: instances/templates/create_instance_w2.html:692
+#: instances/templates/create_instance_w2.html:694
+msgid "Console Password"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:252
+#: instances/templates/create_instance_w2.html:482
+#: instances/templates/create_instance_w2.html:698
+msgid "Guest Agent"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:259
+#: instances/templates/create_instance_w2.html:489
+#: instances/templates/create_instance_w2.html:705
+msgid "VirtIO"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:286
+#: instances/templates/instances/settings_tab.html:473
+#: instances/templates/instances/settings_tab.html:549
+#: instances/templates/instances/settings_tab.html:559
+#: instances/templates/instances/snapshots_tab.html:67
+#: interfaces/templates/interface.html:60
+#: interfaces/templates/interface.html:62 networks/templates/network.html:50
+#: networks/templates/network.html:52 networks/templates/network.html:62
+#: networks/templates/network.html:136 networks/templates/network.html:189
+#: networks/templates/network.html:194 networks/templates/network.html:249
+#: networks/templates/network.html:298 networks/templates/network.html:303
+#: networks/templates/network.html:353 networks/templates/network.html:358
+#: nwfilters/templates/nwfilter.html:103 nwfilters/templates/nwfilter.html:143
+#: nwfilters/templates/nwfilters.html:118 storages/templates/storage.html:64
+#: storages/templates/storage.html:67 storages/templates/storage.html:79
+#: storages/templates/storage.html:175 virtsecrets/templates/secrets.html:78
+msgid "Are you sure?"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:358
+msgid "Added Disks"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:371
+#: instances/templates/create_instance_w2.html:575
+msgid "Select pool"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:411
+#: instances/templates/create_instance_w2.html:627
+msgid "Disk Metadata"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:413
+#: instances/templates/create_instance_w2.html:629
+msgid "Metadata preallocation"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:415
+#: instances/templates/create_instance_w2.html:631
+#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:375
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/files.py:391
+msgid "Image"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:418
+msgid "HDD Cache Mode"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:570
+msgid "Template Disk"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:605
+msgid "Network/MAC"
+msgstr ""
+
+#: instances/templates/instance.html:22
+#: instances/templates/instance_actions.html:14
+#: instances/templates/instance_actions.html:25
+#: instances/templates/instance_actions.html:37
+#: instances/templates/instances/power_tab.html:24
+#: instances/templates/instances/power_tab.html:81 instances/views.py:277
+msgid "Suspend"
+msgstr ""
+
+#: instances/templates/instance.html:28
+msgid "Guest Agent Enabled & Connected"
+msgstr ""
+
+#: instances/templates/instance.html:31
+msgid "Guest Agent Enabled but not Connected"
+msgstr ""
+
+#: instances/templates/instance.html:35
+msgid "Guest Agent Not Enabled & Not Connected"
+msgstr ""
+
+#: instances/templates/instance.html:51
+#: instances/templates/instances/resize_tab.html:17
+#: instances/templates/instances/settings_tab.html:22
+msgid "Disk"
+msgstr ""
+
+#: instances/templates/instance.html:59
+msgid "Show Instance OS details"
+msgstr ""
+
+#: instances/templates/instance.html:63
+msgid "Refresh instance info"
+msgstr ""
+
+#: instances/templates/instance.html:69
+msgid "quota reached"
+msgstr ""
+
+#: instances/templates/instance.html:81
+msgid "Power"
+msgstr ""
+
+#: instances/templates/instance.html:87
+msgid "Access"
+msgstr ""
+
+#: instances/templates/instance.html:100
+msgid "Snapshot"
+msgstr ""
+
+#: instances/templates/instance.html:107 templates/navbar.html:32
+msgid "Settings"
+msgstr ""
+
+#: instances/templates/instance.html:113
+msgid "Stats"
+msgstr ""
+
+#: instances/templates/instance.html:119
+#: instances/templates/instances/destroy_instance_form.html:35
+#: instances/templates/instances/destroy_tab.html:17
+#: instances/templates/instances/destroy_tab.html:19
+#: instances/templates/instances/destroy_tab.html:22 instances/views.py:319
+msgid "Destroy"
+msgstr ""
+
+#: instances/templates/instance_actions.html:6
+#: instances/templates/instances/settings_tab.html:43
+#: instances/templates/instances/settings_tab.html:817
+#: instances/templates/instances/settings_tab.html:819
+#: nwfilters/templates/nwfilters.html:107
+#: nwfilters/templates/nwfilters.html:113 storages/templates/storage.html:156
+#: storages/templates/storage.html:163
+msgid "Clone"
+msgstr ""
+
+#: instances/templates/instance_actions.html:10
+#: instances/templates/instance_actions.html:35
+#: instances/templates/instances/power_tab.html:46
+#: instances/templates/instances/power_tab.html:120
+#: instances/templates/instances/power_tab.html:122 instances/views.py:252
+msgid "Power On"
+msgstr ""
+
+#: instances/templates/instance_actions.html:15
+#: instances/templates/instances/power_tab.html:8
+#: instances/templates/instances/power_tab.html:58 instances/views.py:268
+msgid "Power Off"
+msgstr ""
+
+#: instances/templates/instance_actions.html:16
+#: instances/templates/instance_actions.html:29
+#: instances/templates/instances/power_tab.html:13
+#: instances/templates/instances/power_tab.html:65 instances/views.py:261
+msgid "Power Cycle"
+msgstr ""
+
+#: instances/templates/instance_actions.html:17
+#: instances/templates/instance_actions.html:30
+msgid "VNC Console"
+msgstr ""
+
+#: instances/templates/instance_actions.html:22
+#: instances/templates/instances/power_tab.html:33
+#: instances/templates/instances/power_tab.html:92
+#: instances/templates/instances/power_tab.html:107 instances/views.py:285
+msgid "Resume"
+msgstr ""
+
+#: instances/templates/instance_actions.html:26
+#: instances/templates/instances/power_tab.html:18
+#: instances/templates/instances/power_tab.html:38
+#: instances/templates/instances/power_tab.html:73
+#: instances/templates/instances/power_tab.html:99 instances/views.py:292
+msgid "Force Off"
+msgstr ""
+
+#: instances/templates/instance_actions.html:41
+#: instances/templates/instances/access_tab.html:7
+#: instances/templates/instances/access_tab.html:67
+#: instances/templates/instances/access_tab.html:75
+#: instances/templates/instances/access_tab.html:78
+#: instances/templates/instances/access_tab.html:82
+#: instances/templates/instances/settings_tab.html:29
+msgid "Console"
+msgstr ""
+
+#: instances/templates/instances/access_tab.html:13
+msgid "Root Password"
+msgstr ""
+
+#: instances/templates/instances/access_tab.html:27
+#: instances/templates/instances/access_tab.html:143
+msgid "VDI"
+msgstr ""
+
+#: instances/templates/instances/access_tab.html:35
+#, python-format
+msgid ""
+" This action opens a new window with a %(type)s connection to the console of "
+"the instance."
+msgstr ""
+
+#: instances/templates/instances/access_tab.html:42
+msgid "Scale"
+msgstr ""
+
+#: instances/templates/instances/access_tab.html:48
+msgid "View Only"
+msgstr ""
+
+#: instances/templates/instances/access_tab.html:54
+msgid "Resize Session"
+msgstr ""
+
+#: instances/templates/instances/access_tab.html:60
+msgid "View Clipboard"
+msgstr ""
+
+#: instances/templates/instances/access_tab.html:70
+msgid "Toggle Dropdown"
+msgstr ""
+
+#: instances/templates/instances/access_tab.html:74
+#: instances/templates/instances/access_tab.html:77
+msgid "Console port"
+msgstr ""
+
+#: instances/templates/instances/access_tab.html:75
+msgid "Lite"
+msgstr ""
+
+#: instances/templates/instances/access_tab.html:78
+msgid "Full"
+msgstr ""
+
+#: instances/templates/instances/access_tab.html:88
+msgid "You need shut down your instance and enter a new root password."
+msgstr ""
+
+#: instances/templates/instances/access_tab.html:95
+msgid "Enter Password"
+msgstr ""
+
+#: instances/templates/instances/access_tab.html:100
+#: instances/templates/instances/access_tab.html:103
+msgid "Reset Root Password"
+msgstr ""
+
+#: instances/templates/instances/access_tab.html:111
+msgid "You need shut down your instance and choose your public key."
+msgstr ""
+
+#: instances/templates/instances/access_tab.html:130
+#: instances/templates/instances/access_tab.html:132
+msgid "Add Public Key"
+msgstr ""
+
+#: instances/templates/instances/access_tab.html:140
+msgid ""
+"This action opens a remote viewer with a connection to the console of the "
+"instance."
+msgstr ""
+
+#: instances/templates/instances/access_tab.html:145
+msgid "To download console.vv file for virt-viewer."
+msgstr ""
+
+#: instances/templates/instances/access_tab.html:146
+msgid "Get console.vv"
+msgstr ""
+
+#: instances/templates/instances/destroy_instance_form.html:4
+msgid "Confirm Destroy"
+msgstr ""
+
+#: instances/templates/instances/destroy_instance_form.html:8
+msgid "Destroy instance"
+msgstr ""
+
+#: instances/templates/instances/destroy_instance_form.html:15
+msgid "Instance is suspended, cannot destroy!"
+msgstr ""
+
+#: instances/templates/instances/destroy_instance_form.html:19
+msgid "This action is irreversible!"
+msgstr ""
+
+#: instances/templates/instances/destroy_instance_form.html:24
+msgid "Remove Instance's data"
+msgstr ""
+
+#: instances/templates/instances/destroy_instance_form.html:30
+msgid "Remove Instance's NVRAM"
+msgstr ""
+
+#: instances/templates/instances/destroy_instance_form.html:41
+msgid "You cannot destroy instance!"
+msgstr ""
+
+#: instances/templates/instances/destroy_tab.html:7
+msgid "Destroy Instance"
+msgstr ""
+
+#: instances/templates/instances/destroy_tab.html:14
+msgid "This action starts remove instance process"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:3
+msgid "Edit Volume"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:12
+msgid "Edit Instance Volume"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:20
+msgid "Virtual Disk"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:38
+msgid "Volume Path"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:42
+msgid "Readonly"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:46
+msgid "Shareable"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:53
+msgid "Cache mode"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:61
+msgid "IO mode"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:69
+msgid "Discard mode"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:77
+msgid "Detect zeroes"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:97
+msgid "Serial Number"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:101
+msgid "Storage Format"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:111
+msgid "Are you sure to change volume properties?"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:3
+msgid "Guest Info"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:7
+msgid "OS Name"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:9
+msgid "OS Pretty-Name"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:13
+msgid "Kernel Release"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:15
+msgid "Kernel Version"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:17
+msgid "Timezone / Offset"
+msgstr ""
+
+#: instances/templates/instances/power_tab.html:55
+msgid "This action sends an ACPI shutdown signal to the instance."
+msgstr ""
+
+#: instances/templates/instances/power_tab.html:63
+msgid ""
+"This action forcibly powers off and start the instance and may cause data "
+"corruption."
+msgstr ""
+
+#: instances/templates/instances/power_tab.html:70
+#: instances/templates/instances/power_tab.html:97
+msgid ""
+"This action forcibly powers off the instance and may cause data corruption."
+msgstr ""
+
+#: instances/templates/instances/power_tab.html:79
+msgid "This action suspends the instance."
+msgstr ""
+
+#: instances/templates/instances/power_tab.html:90
+msgid "This action restore the instance after suspend."
+msgstr ""
+
+#: instances/templates/instances/power_tab.html:105
+msgid "Administrator blocked your instance."
+msgstr ""
+
+#: instances/templates/instances/power_tab.html:115
+msgid "Click on Power On button to start this instance."
+msgstr ""
+
+#: instances/templates/instances/power_tab.html:119
+msgid "Template instance cannot be started."
+msgstr ""
+
+#: instances/templates/instances/resize_tab.html:7
+msgid "CPU"
+msgstr ""
+
+#: instances/templates/instances/resize_tab.html:28
+msgid "Logical host CPUs"
+msgstr ""
+
+#: instances/templates/instances/resize_tab.html:30
+#: instances/templates/instances/resize_tab.html:95
+#: instances/templates/instances/resize_tab.html:136
+msgid "Current Allocation"
+msgstr ""
+
+#: instances/templates/instances/resize_tab.html:44
+#: instances/templates/instances/resize_tab.html:109
+msgid "Maximum Allocation"
+msgstr ""
+
+#: instances/templates/instances/resize_tab.html:62
+msgid "Logical Instance Active/Maximum CPUs"
+msgstr ""
+
+#: instances/templates/instances/resize_tab.html:70
+#: instances/templates/instances/settings_tab.html:86
+#: instances/templates/instances/settings_tab.html:102
+#: networks/templates/network.html:62 storages/templates/storage.html:79
+msgid "Disable"
+msgstr ""
+
+#: instances/templates/instances/resize_tab.html:72
+msgid "Constant"
+msgstr ""
+
+#: instances/templates/instances/resize_tab.html:74
+#: instances/templates/instances/settings_tab.html:84
+#: instances/templates/instances/settings_tab.html:98
+#: networks/templates/network.html:60 storages/templates/storage.html:76
+msgid "Enable"
+msgstr ""
+
+#: instances/templates/instances/resize_tab.html:83
+#: instances/templates/instances/resize_tab.html:124
+#: instances/templates/instances/resize_tab.html:157
+msgid "You don't have permission for resizing instance"
+msgstr ""
+
+#: instances/templates/instances/resize_tab.html:92
+msgid "Total host memory"
+msgstr ""
+
+#: instances/templates/instances/resize_tab.html:104
+#: instances/templates/instances/resize_tab.html:118
+msgid "Custom value"
+msgstr ""
+
+#: instances/templates/instances/resize_tab.html:133
+msgid "Disk allocation (GB)"
+msgstr ""
+
+#: instances/templates/instances/resize_tab.html:140
+#: instances/templates/instances/settings_tab.html:284
+msgid "Error getting disk info"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:17
+msgid "Boot"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:50
+#: instances/templates/instances/settings_tab.html:655
+#: instances/templates/instances/settings_tab.html:657
+msgid "Migrate"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:62
+#: venv/lib/python3.6/site-packages/click/core.py:1351
+msgid "Options"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:79
+#: networks/templates/network.html:56 storages/templates/storage.html:71
+msgid "Autostart"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:82
+msgid "Autostart your instance when host server is power on "
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:91
+msgid "Boot Order"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:95
+msgid "Enable Boot Menu for your instance when it starts up "
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:98
+msgid "Show boot menu"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:102
+msgid "Hide boot menu"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:107
+msgid "Please shutdown instance to modify boot menu"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:137
+msgid "up: move selected devices"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:140
+msgid "down: move selected devices"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:146
+#: instances/templates/instances/settings_tab.html:456
+msgid "Apply"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:156
+msgid "Instance Media"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:159
+msgid "Add CD-ROM"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:182
+#: instances/templates/instances/settings_tab.html:221
+#: instances/templates/instances/settings_tab.html:249
+#: interfaces/templates/create_iface_block.html:34
+#: networks/templates/network.html:43 networks/templates/networks.html:58
+#: storages/templates/create_stg_block.html:91
+msgid "Device"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:183
+#: instances/templates/instances/settings_tab.html:222
+msgid "CD-ROM"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:196
+#: instances/templates/instances/settings_tab.html:198
+msgid "Mount"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:201
+msgid "Detach CD-ROM (remove device)"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:227
+#: instances/templates/instances/settings_tab.html:229
+msgid "Unmount"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:238
+msgid "There is not any CD-ROM device."
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:243
+msgid "Instance Volume"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:250
+msgid "Used"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:251
+msgid "Capacity"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:253
+#: instances/templates/instances/settings_tab.html:385
+msgid "Source"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:309
+#: instances/templates/instances/settings_tab.html:313
+msgid "Detach"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:309
+msgid "Are you sure to detach volume?"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:313
+#: instances/templates/instances/settings_tab.html:329
+msgid "Are you sure? This may lead data corruption!"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:325
+msgid "Are you sure to delete volume?"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:343
+msgid "Add a network device"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:349
+msgid "Network Devices"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:354
+msgid "Info"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:367
+msgid "active"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:379
+#: nwfilters/templates/nwfilter.html:71
+msgid "Filter"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:393
+msgid "Edit NIC"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:403
+msgid "Edit Instance Network"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:416
+msgid "Net Source"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:424
+#: interfaces/templates/interface.html:4 interfaces/templates/interface.html:6
+#: interfaces/templates/interface.html:39
+msgid "Interface"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:442
+#: instances/templates/instances/settings_tab.html:494
+msgid "Model"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:456
+msgid "Apply network changes"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:472
+msgid "Delete Device"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:482
+#: interfaces/templates/create_iface_block.html:72
+#: interfaces/templates/interface.html:41
+msgid "IPv4"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:488
+#: interfaces/templates/create_iface_block.html:77
+#: interfaces/templates/interface.html:43
+msgid "IPv6"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:502
+msgid ""
+"In most configurations, macvtap does not work for host to guest network "
+"communication"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:515
+#: networks/templates/network.html:322
+msgid "QoS Configuration"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:521
+#: networks/templates/add_network_qos.html:18
+#: networks/templates/network.html:328 nwfilters/templates/nwfilter.html:123
+msgid "Direction"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:522
+#: networks/templates/add_network_qos.html:27
+#: networks/templates/network.html:329
+msgid "Average"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:523
+#: networks/templates/add_network_qos.html:34
+#: networks/templates/network.html:330
+msgid "Peak"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:524
+#: networks/templates/add_network_qos.html:41
+#: networks/templates/network.html:331
+msgid "Burst"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:549
+#: networks/templates/network.html:353
+msgid "Edit QoS"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:559
+#: networks/templates/network.html:358
+msgid "Delete QoS"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:575
+msgid "For migration both host servers must have equal settings and OS type"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:579
+msgid "Original host"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:585
+msgid "Host migration"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:602
+msgid "Live migration"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:610
+msgid "Unsafe migration"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:618
+msgid "Delete original"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:626
+msgid "Offline migration"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:634
+msgid "Post copy"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:642
+msgid "Forces CPU convergence during live migration"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:642
+msgid "Auto converge"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:650
+msgid "Compress instance memory for fast migration"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:650
+msgid "Compressed"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:663
+msgid "If you need to edit XML please Power Off the instance"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:685
+msgid "Instance owners"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:714
+msgid "To change console settings, shutdown the instance."
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:731
+msgid "Create a clone"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:734
+msgid "Clone Name"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:740
+#: instances/templates/instances/settings_tab.html:769
+msgid "Guess"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:758
+msgid "Network devices"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:767
+msgid "Random"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:781
+msgid "Storage devices"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:805
+#: instances/templates/instances/settings_tab.html:828
+msgid "Title"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:825
+msgid "To set instance template name description, shutdown the instance."
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:840
+msgid "Is template"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:861
+msgid "To set instance video model, shutdown the instance."
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:864
+msgid "Primary Video Model"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:868
+msgid "please choose"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:874
+#: instances/templates/instances/settings_tab.html:876
+#: instances/templates/instances/settings_tab.html:894
+#: instances/templates/instances/settings_tab.html:896
+#: instances/templates/instances/settings_tab.html:922
+#: virtsecrets/templates/secrets.html:104
+msgid "Set"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:883
+msgid "To set instance vCPUs hotpluggable"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:886
+msgid "vCPU Hot Plug"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:890
+#: instances/templates/instances/settings_tab.html:919
+msgid "Enabled"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:891
+#: instances/templates/instances/settings_tab.html:920
+msgid "Disabled"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:903
+msgid "To Enable/Disable Qemu Guest Agent. Status"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:908
+msgid "Disconnected"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:911
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:714
+#: venv2/lib/python2.7/site-packages/django/forms/widgets.py:703
+msgid "Unknown"
+msgstr ""
+
+#: instances/templates/instances/settings_tab.html:915
+msgid "Qemu Guest Agent"
+msgstr ""
+
+#: instances/templates/instances/snapshots_tab.html:8
+#: instances/templates/instances/snapshots_tab.html:26
+msgid "Take Snapshot"
+msgstr ""
+
+#: instances/templates/instances/snapshots_tab.html:13
+msgid "Manage Snapshots"
+msgstr ""
+
+#: instances/templates/instances/snapshots_tab.html:20
+msgid ""
+"This may take more than an hour, depending on how much content is on your "
+"instance and how large the disk is. It could cause web server timeout.."
+msgstr ""
+
+#: instances/templates/instances/snapshots_tab.html:25
+msgid "Enter Snapshot Name"
+msgstr ""
+
+#: instances/templates/instances/snapshots_tab.html:35
+msgid "Choose a snapshot for restore/delete"
+msgstr ""
+
+#: instances/templates/instances/snapshots_tab.html:53
+msgid "Revert to this Snapshot"
+msgstr ""
+
+#: instances/templates/instances/snapshots_tab.html:58
+msgid "To restore snapshots you need Power Off the instance."
+msgstr ""
+
+#: instances/templates/instances/snapshots_tab.html:67
+msgid "Delete Snapshot"
+msgstr ""
+
+#: instances/templates/instances/snapshots_tab.html:78
+msgid "You do not have any snapshots"
+msgstr ""
+
+#: instances/templates/instances/stats_tab.html:7
+msgid "Real Time"
+msgstr ""
+
+#: instances/templates/instances/stats_tab.html:22
+msgid "CPU Usage"
+msgstr ""
+
+#: instances/templates/instances/stats_tab.html:36
+msgid "Memory Usage"
+msgstr ""
+
+#: instances/templates/instances/stats_tab.html:51
+msgid "Bandwidth Device"
+msgstr ""
+
+#: instances/templates/instances/stats_tab.html:67
+msgid "Disk I/O device"
+msgstr ""
+
+#: instances/utils.py:99
+msgid "None available device name"
+msgstr ""
+
+#: instances/views.py:249
+msgid "Templates cannot be started."
+msgstr ""
+
+#: instances/views.py:352
+#, python-format
+msgid "Instance is migrated to %(hostname)s"
+msgstr ""
+
+#: instances/views.py:375
+msgid "Reset root password"
+msgstr ""
+
+#: instances/views.py:381 instances/views.py:410
+msgid "Please shutdown down your instance and then try again"
+msgstr ""
+
+#: instances/views.py:402
+#, python-format
+msgid "Installed new SSH public key %(keyname)s"
+msgstr ""
+
+#: instances/views.py:429
+#, python-format
+msgid ""
+"User %(quota_msg)s quota reached, cannot resize CPU of '%(instance_name)s'!"
+msgstr ""
+
+#: instances/views.py:438
+#, python-format
+msgid "CPU is resized:  %(old)s to %(new)s"
+msgstr ""
+
+#: instances/views.py:466
+#, python-format
+msgid ""
+"User %(quota_msg)s quota reached, cannot resize memory of "
+"'%(instance_name)s'!"
+msgstr ""
+
+#: instances/views.py:473
+#, python-format
+msgid ""
+"Memory is resized: current/max: %(old_cur)s/%(old_max)s to %(new_cur)s/"
+"%(new_max)s"
+msgstr ""
+
+#: instances/views.py:507
+#, python-format
+msgid ""
+"User %(quota_msg)s quota reached, cannot resize disks of '%(instance_name)s'!"
+msgstr ""
+
+#: instances/views.py:514
+#, python-format
+msgid "Disk is resized: %(dev)s"
+msgstr ""
+
+#: instances/views.py:570
+#, python-format
+msgid "Attach new disk: %(name)s (%(format)s)"
+msgstr ""
+
+#: instances/views.py:609
+#, python-format
+msgid "Attach Existing disk: %(target_dev)s"
+msgstr ""
+
+#: instances/views.py:667
+msgid "Volume changes are applied. But it will be activated after shutdown"
+msgstr ""
+
+#: instances/views.py:670
+msgid "Volume is changed successfully."
+msgstr ""
+
+#: instances/views.py:671
+#, python-format
+msgid "Edit disk: %(target_dev)s"
+msgstr ""
+
+#: instances/views.py:693
+#, python-format
+msgid "Delete disk: %(dev)s"
+msgstr ""
+
+#: instances/views.py:709
+#, python-format
+msgid "Detach disk: %(dev)s"
+msgstr ""
+
+#: instances/views.py:722
+#, python-format
+msgid "Add CD-ROM: %(target)s"
+msgstr ""
+
+#: instances/views.py:735
+#, python-format
+msgid "Detach CD-ROM: %(dev)s"
+msgstr ""
+
+#: instances/views.py:748
+#, python-format
+msgid "Mount media: %(dev)s"
+msgstr ""
+
+#: instances/views.py:761
+#, python-format
+msgid "Unmount media: %(dev)s"
+msgstr ""
+
+#: instances/views.py:774
+#, python-format
+msgid "Create snapshot: %(snap)s"
+msgstr ""
+
+#: instances/views.py:785
+#, python-format
+msgid "Delete snapshot: %(snap)s"
+msgstr ""
+
+#: instances/views.py:796
+msgid "Successful revert snapshot: "
+msgstr ""
+
+#: instances/views.py:799
+#, python-format
+msgid "Revert snapshot: %(snap)s"
+msgstr ""
+
+#: instances/views.py:813
+#, python-format
+msgid "VCPU %(id)s is enabled=%(enabled)s"
+msgstr ""
+
+#: instances/views.py:822
+#, python-format
+msgid "VCPU Hot-plug is enabled=%(status)s"
+msgstr ""
+
+#: instances/views.py:832
+msgid "Set autostart"
+msgstr ""
+
+#: instances/views.py:841
+msgid "Unset autostart"
+msgstr ""
+
+#: instances/views.py:850
+msgid "Enable boot menu"
+msgstr ""
+
+#: instances/views.py:859
+msgid "Disable boot menu"
+msgstr ""
+
+#: instances/views.py:874
+msgid "Set boot order"
+msgstr ""
+
+#: instances/views.py:879
+msgid "Boot menu changes applied. But it will be activated after shutdown"
+msgstr ""
+
+#: instances/views.py:882
+msgid "Boot order changed successfully."
+msgstr ""
+
+#: instances/views.py:893
+msgid "Change instance XML"
+msgstr ""
+
+#: instances/views.py:907
+#, python-format
+msgid "Set Guest Agent: %(status)s"
+msgstr ""
+
+#: instances/views.py:917
+#, python-format
+msgid "Set Video Model: %(model)s"
+msgstr ""
+
+#: instances/views.py:926
+msgid "Change network"
+msgstr ""
+
+#: instances/views.py:949
+msgid "Network Device Config is changed. Please shutdown instance to activate."
+msgstr ""
+
+#: instances/views.py:974
+#, python-format
+msgid "Add network: %(mac)s"
+msgstr ""
+
+#: instances/views.py:985
+#, python-format
+msgid "Delete Network: %(mac)s"
+msgstr ""
+
+#: instances/views.py:998
+#, python-format
+msgid "Set Link State: %(state)s"
+msgstr ""
+
+#: instances/views.py:1018 networks/views.py:231
+#, python-format
+msgid "%(qos_dir)s QoS is set"
+msgstr ""
+
+#: instances/views.py:1023
+#, python-format
+msgid ""
+"%(qos_dir)s QoS is set. Network XML is changed.                 Stop and "
+"start network to activate new config."
+msgstr ""
+
+#: instances/views.py:1040 networks/views.py:246
+#, python-format
+msgid "%(qos_dir)s QoS is deleted"
+msgstr ""
+
+#: instances/views.py:1045
+#, python-format
+msgid ""
+"%(qos_dir)s QoS is deleted. Network XML is changed.                 Stop and "
+"start network to activate new config."
+msgstr ""
+
+#: instances/views.py:1064
+msgid "Only one owner is allowed and the one already added"
+msgstr ""
+
+#: instances/views.py:1069
+#, python-format
+msgid "Add owner: %(user)s"
+msgstr ""
+
+#: instances/views.py:1080
+#, python-format
+msgid "Delete owner: %(userinstance_id)s "
+msgstr ""
+
+#: instances/views.py:1112
+#, python-format
+msgid "User '%(quota_msg)s' quota reached, cannot create '%(clone_name)s'!"
+msgstr ""
+
+#: instances/views.py:1118
+#, python-format
+msgid "Instance '%(clone_name)s' already exists!"
+msgstr ""
+
+#: instances/views.py:1121
+#, python-format
+msgid "Instance name '%(clone_name)s' contains invalid characters!"
+msgstr ""
+
+#: instances/views.py:1124
+#, python-format
+msgid "Instance MAC '%(clone_mac)s' invalid format!"
+msgstr ""
+
+#: instances/views.py:1134
+#, python-format
+msgid "Create a clone of '%(instance_name)s'"
+msgstr ""
+
+#: instances/views.py:1173
+msgid ""
+"Error setting console password. You should check that your instance have an "
+"graphic device."
+msgstr ""
+
+#: instances/views.py:1178
+msgid "Set VNC password"
+msgstr ""
+
+#: instances/views.py:1187
+msgid "Set VNC keymap"
+msgstr ""
+
+#: instances/views.py:1192
+msgid "Set VNC type"
+msgstr ""
+
+#: instances/views.py:1197
+msgid "Set VNC listen address"
+msgstr ""
+
+#: instances/views.py:1220
+msgid "Edit options"
+msgstr ""
+
+#: instances/views.py:1234
+msgid "Send console.vv file"
+msgstr ""
+
+#: instances/views.py:1295 instances/views.py:1389
+msgid "A virtual machine with this name already exists"
+msgstr ""
+
+#: instances/views.py:1372
+msgid "You haven't defined any storage pools"
+msgstr ""
+
+#: instances/views.py:1374
+msgid "You haven't defined any network pools"
+msgstr ""
+
+#: instances/views.py:1391
+msgid "There is an instance with same name. Remove it and try again!"
+msgstr ""
+
+#: instances/views.py:1395
+msgid "No Virtual Machine MAC has been entered"
+msgstr ""
+
+#: instances/views.py:1426
+msgid "Image has already exist. Please check volumes or change instance name"
+msgstr ""
+
+#: instances/views.py:1453
+msgid "First you need to create or select an image"
+msgstr ""
+
+#: instances/views.py:1471
+msgid "Invalid cache mode"
+msgstr ""
+
+#: instances/views.py:1512
+msgid "Instance is created"
+msgstr ""
+
+#: instances/views.py:1533
+msgid "Flavor Created"
+msgstr ""
+
+#: instances/views.py:1539
+msgid "Create Flavor"
+msgstr ""
+
+#: instances/views.py:1549
+msgid "Flavor Updated"
+msgstr ""
+
+#: instances/views.py:1555
+msgid "Update Flavor"
+msgstr ""
+
+#: instances/views.py:1564
+msgid "Flavor Deleted"
+msgstr ""
+
+#: interfaces/forms.py:26
+msgid "The IPv4 address must not contain any special characters"
+msgstr ""
+
+#: interfaces/forms.py:28
+msgid "The IPv4 address must not exceed 20 characters"
+msgstr ""
+
+#: interfaces/forms.py:35
+msgid "The IPv4 gateway must not contain any special characters"
+msgstr ""
+
+#: interfaces/forms.py:37
+msgid "The IPv4 gateway must not exceed 20 characters"
+msgstr ""
+
+#: interfaces/forms.py:44
+msgid "The IPv6 address must not contain any special characters"
+msgstr ""
+
+#: interfaces/forms.py:46
+msgid "The IPv6 address must not exceed 100 characters"
+msgstr ""
+
+#: interfaces/forms.py:53
+msgid "The IPv6 gateway must not contain any special characters"
+msgstr ""
+
+#: interfaces/forms.py:55
+msgid "The IPv6 gateway must not exceed 100 characters"
+msgstr ""
+
+#: interfaces/forms.py:62 interfaces/forms.py:71
+msgid "The interface must not contain any special characters"
+msgstr ""
+
+#: interfaces/forms.py:64 interfaces/forms.py:73
+msgid "The interface must not exceed 10 characters"
+msgstr ""
+
+#: interfaces/templates/create_iface_block.html:12
+msgid "Create New Interface"
+msgstr ""
+
+#: interfaces/templates/create_iface_block.html:24
+msgid "Start mode"
+msgstr ""
+
+#: interfaces/templates/create_iface_block.html:27
+msgid "none"
+msgstr ""
+
+#: interfaces/templates/create_iface_block.html:28
+msgid "onboot"
+msgstr ""
+
+#: interfaces/templates/create_iface_block.html:29
+msgid "hotplug"
+msgstr ""
+
+#: interfaces/templates/create_iface_block.html:44
+#: interfaces/templates/interface.html:76
+#: interfaces/templates/interfaces.html:63
+#: storages/templates/create_stg_block.html:49
+#: storages/templates/create_stg_block.html:78
+#: storages/templates/create_stg_block.html:107
+#: storages/templates/create_stg_block.html:172
+#: storages/templates/storages.html:59
+msgid "Type"
+msgstr ""
+
+#: interfaces/templates/create_iface_block.html:47
+msgid "bridge"
+msgstr ""
+
+#: interfaces/templates/create_iface_block.html:48
+msgid "ethernet"
+msgstr ""
+
+#: interfaces/templates/create_iface_block.html:53
+msgid "STP"
+msgstr ""
+
+#: interfaces/templates/create_iface_block.html:57
+msgid "on"
+msgstr ""
+
+#: interfaces/templates/create_iface_block.html:58
+msgid "off"
+msgstr ""
+
+#: interfaces/templates/create_iface_block.html:63
+msgid "Delay"
+msgstr ""
+
+#: interfaces/templates/create_iface_block.html:86
+msgid "IPv4 Mode"
+msgstr ""
+
+#: interfaces/templates/create_iface_block.html:89
+#: interfaces/templates/create_iface_block.html:116
+#: networks/templates/network.html:109 networks/templates/network.html:220
+msgid "DHCP"
+msgstr ""
+
+#: interfaces/templates/create_iface_block.html:90
+#: interfaces/templates/create_iface_block.html:117
+msgid "Static"
+msgstr ""
+
+#: interfaces/templates/create_iface_block.html:91
+#: interfaces/templates/create_iface_block.html:115
+msgid "No configuration"
+msgstr ""
+
+#: interfaces/templates/create_iface_block.html:96
+msgid "IPv4 Address"
+msgstr ""
+
+#: interfaces/templates/create_iface_block.html:102
+msgid "IPv4 Gateway"
+msgstr ""
+
+#: interfaces/templates/create_iface_block.html:112
+msgid "IPv6 Mode"
+msgstr ""
+
+#: interfaces/templates/create_iface_block.html:122
+msgid "IPv6 Address"
+msgstr ""
+
+#: interfaces/templates/create_iface_block.html:128
+msgid "IPv6 Gateway"
+msgstr ""
+
+#: interfaces/templates/interface.html:47
+msgid "Interface Type"
+msgstr ""
+
+#: interfaces/templates/interface.html:50
+msgid "Bridge Device"
+msgstr ""
+
+#: interfaces/templates/interface.html:53
+msgid "Boot Mode"
+msgstr ""
+
+#: interfaces/templates/interface.html:55
+#: interfaces/templates/interface.html:78 networks/templates/network.html:45
+#: storages/templates/storage.html:58
+msgid "State"
+msgstr ""
+
+#: interfaces/templates/interface.html:62 networks/templates/network.html:52
+#: storages/templates/storage.html:66
+msgid "Stop"
+msgstr ""
+
+#: interfaces/templates/interface.html:69
+msgid "Slaves"
+msgstr ""
+
+#: interfaces/templates/interface.html:77
+msgid "Speed"
+msgstr ""
+
+#: interfaces/templates/interfaces.html:48
+msgid "Hypervisor doesn't have any Interfaces"
+msgstr ""
+
+#: logs/models.py:5
+msgid "user"
+msgstr ""
+
+#: logs/models.py:6
+msgid "host"
+msgstr ""
+
+#: logs/models.py:7
+msgid "instance"
+msgstr ""
+
+#: logs/models.py:8
+msgid "message"
+msgstr ""
+
+#: logs/models.py:9
+msgid "date"
+msgstr ""
+
+#: networks/forms.py:8 storages/forms.py:8
+msgid "No pool name has been entered"
+msgstr ""
+
+#: networks/forms.py:10
+msgid "No IPv4 subnet has been entered"
+msgstr ""
+
+#: networks/forms.py:15
+msgid "No IPv6 subnet has been entered"
+msgstr ""
+
+#: networks/forms.py:30 storages/forms.py:23
+msgid "The pool name must not contain any special characters"
+msgstr ""
+
+#: networks/forms.py:32 storages/forms.py:25
+msgid "The pool name must not exceed 20 characters"
+msgstr ""
+
+#: networks/forms.py:39
+msgid "The IPv4 subnet must not contain any special characters"
+msgstr ""
+
+#: networks/forms.py:41
+msgid "The IPv4 subnet must not exceed 20 characters"
+msgstr ""
+
+#: networks/forms.py:48
+msgid "The IPv6 subnet must not contain any special characters"
+msgstr ""
+
+#: networks/forms.py:50
+msgid "The IPv6 subnet must not exceed 42 characters"
+msgstr ""
+
+#: networks/forms.py:58
+msgid "The pool bridge name must not contain any special characters"
+msgstr ""
+
+#: networks/forms.py:60
+msgid "The pool bridge name must not exceed 20 characters"
+msgstr ""
+
+#: networks/templates/add_network_qos.html:13
+msgid "Add QoS for Network"
+msgstr ""
+
+#: networks/templates/add_network_qos.html:21
+msgid "Inbound"
+msgstr ""
+
+#: networks/templates/add_network_qos.html:22
+msgid "Outbound"
+msgstr ""
+
+#: networks/templates/add_network_qos.html:29
+#: networks/templates/add_network_qos.html:36
+#: networks/templates/add_network_qos.html:43
+msgid "kilobytes"
+msgstr ""
+
+#: networks/templates/create_net_block.html:12
+msgid "Add New Network"
+msgstr ""
+
+#: networks/templates/create_net_block.html:20
+#: storages/templates/create_stg_block.html:58
+#: storages/templates/create_stg_block.html:87
+msgid "default"
+msgstr ""
+
+#: networks/templates/create_net_block.html:24
+msgid "Type forwarding"
+msgstr ""
+
+#: networks/templates/create_net_block.html:27
+#: networks/templates/network.html:95
+msgid "NAT"
+msgstr ""
+
+#: networks/templates/create_net_block.html:28
+#: networks/templates/network.html:98 networks/templates/network.html:215
+msgid "ROUTE"
+msgstr ""
+
+#: networks/templates/create_net_block.html:29
+#: networks/templates/network.html:104 networks/templates/network.html:213
+msgid "ISOLATE"
+msgstr ""
+
+#: networks/templates/create_net_block.html:30
+#: networks/templates/network.html:101
+msgid "BRIDGE"
+msgstr ""
+
+#: networks/templates/create_net_block.html:31
+msgid "MACVTAP"
+msgstr ""
+
+#: networks/templates/create_net_block.html:36
+msgid "IPv4 Subnet pool"
+msgstr ""
+
+#: networks/templates/create_net_block.html:42
+msgid "DHCPv4"
+msgstr ""
+
+#: networks/templates/create_net_block.html:48
+msgid "Fixed Addresses"
+msgstr ""
+
+#: networks/templates/create_net_block.html:54
+msgid "Enable IPv6"
+msgstr ""
+
+#: networks/templates/create_net_block.html:60
+msgid "IPv6 Subnet pool"
+msgstr ""
+
+#: networks/templates/create_net_block.html:66
+msgid "DHCPv6"
+msgstr ""
+
+#: networks/templates/create_net_block.html:72
+msgid "Bridge Name"
+msgstr ""
+
+#: networks/templates/create_net_block.html:78
+msgid "Open vSwitch"
+msgstr ""
+
+#: networks/templates/modify_ipv4_fixed_address.html:12
+msgid "Add IPv4 Fixed Address"
+msgstr ""
+
+#: networks/templates/modify_ipv4_fixed_address.html:18
+#: networks/templates/modify_ipv6_fixed_address.html:18
+msgid "Subnet Pool"
+msgstr ""
+
+#: networks/templates/modify_ipv4_fixed_address.html:36
+#: networks/templates/modify_ipv6_fixed_address.html:36
+#: networks/templates/network.html:173 networks/templates/network.html:282
+msgid "Address"
+msgstr ""
+
+#: networks/templates/modify_ipv6_fixed_address.html:12
+msgid "Add IPV6 Fixed Address"
+msgstr ""
+
+#: networks/templates/modify_ipv6_fixed_address.html:24
+#: networks/templates/network.html:281
+msgid "ID"
+msgstr ""
+
+#: networks/templates/network.html:41
+msgid "Network name"
+msgstr ""
+
+#: networks/templates/network.html:89
+msgid "IPv4 Configuration"
+msgstr ""
+
+#: networks/templates/network.html:92
+msgid "IPv4 Forwarding"
+msgstr ""
+
+#: networks/templates/network.html:112 networks/templates/network.html:224
+msgid "ON"
+msgstr ""
+
+#: networks/templates/network.html:114 networks/templates/network.html:226
+msgid "OFF"
+msgstr ""
+
+#: networks/templates/network.html:121 networks/templates/network.html:127
+#: networks/templates/network.html:233 networks/templates/network.html:239
+msgid "End"
+msgstr ""
+
+#: networks/templates/network.html:135 networks/templates/network.html:248
+msgid "Edit DHCP Range"
+msgstr ""
+
+#: networks/templates/network.html:149
+msgid "IPv4 Fixed Addresses"
+msgstr ""
+
+#: networks/templates/network.html:158 networks/templates/network.html:268
+#: nwfilters/templates/nwfilters.html:83
+msgid "Show"
+msgstr ""
+
+#: networks/templates/network.html:165 networks/templates/network.html:275
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:403
+#: venv2/lib/python2.7/site-packages/django/forms/widgets.py:377
+msgid "Clear"
+msgstr ""
+
+#: networks/templates/network.html:189 networks/templates/network.html:298
+msgid "Edit entry"
+msgstr ""
+
+#: networks/templates/network.html:194 networks/templates/network.html:303
+msgid "Delete entry"
+msgstr ""
+
+#: networks/templates/network.html:207
+msgid "IPv6 Configuration"
+msgstr ""
+
+#: networks/templates/network.html:210
+msgid "IPv6 Forwarding"
+msgstr ""
+
+#: networks/templates/network.html:261
+msgid "IPv6 Fixed Addresses"
+msgstr ""
+
+#: networks/templates/networks.html:45
+msgid "Hypervisor doesn't have any Network"
+msgstr ""
+
+#: networks/templates/networks.html:60
+msgid "Forward"
+msgstr ""
+
+#: networks/views.py:43
+msgid "Network pool name already in use"
+msgstr ""
+
+#: networks/views.py:47
+msgid "Please enter bridge/dev name"
+msgstr ""
+
+#: networks/views.py:57
+msgid "For libvirt, the IPv6 network prefix must be /64"
+msgstr ""
+
+#: networks/views.py:130
+msgid "Unknown Network Family"
+msgstr ""
+
+#: networks/views.py:180
+#, python-format
+msgid "Fixed address operation completed for %(family)s"
+msgstr ""
+
+#: networks/views.py:190
+#, python-format
+msgid "%(family)s Fixed Address is Deleted."
+msgstr ""
+
+#: networks/views.py:198
+#, python-format
+msgid "%(family)s DHCP Range is Changed."
+msgstr ""
+
+#: networks/views.py:210
+msgid ""
+"Network XML is changed. \\Stop and start network to activate new config."
+msgstr ""
+
+#: networks/views.py:215
+msgid "Network XML is changed."
+msgstr ""
+
+#: networks/views.py:228
+#, python-format
+msgid ""
+"%(qos_dir)s QoS is updated. Network XML is changed. Stop and start network "
+"to activate new config"
+msgstr ""
+
+#: networks/views.py:242
+#, python-format
+msgid ""
+"%(qos_dir)s QoS is deleted. Network XML is changed.                         "
+"Stop and start network to activate new config"
+msgstr ""
+
+#: nwfilters/templates/add_nwf_rule.html:12
+msgid "Add New NWFilter Rule"
+msgstr ""
+
+#: nwfilters/templates/add_nwf_rule.html:22
+msgid "If there is a rule which has same attributes it replaces that rule"
+msgstr ""
+
+#: nwfilters/templates/create_nwfilter_block.html:12
+msgid "Create New NWFilter"
+msgstr ""
+
+#: nwfilters/templates/nwfilter.html:39 nwfilters/templates/nwfilters.html:53
+#: virtsecrets/templates/secrets.html:60
+msgid "UUID"
+msgstr ""
+
+#: nwfilters/templates/nwfilter.html:68
+msgid "Filter References"
+msgstr ""
+
+#: nwfilters/templates/nwfilter.html:92
+msgid "Reference"
+msgstr ""
+
+#: nwfilters/templates/nwfilter.html:117
+msgid "Rules"
+msgstr ""
+
+#: nwfilters/templates/nwfilter.html:121
+msgid "Rule"
+msgstr ""
+
+#: nwfilters/templates/nwfilter.html:122
+msgid "Action Type"
+msgstr ""
+
+#: nwfilters/templates/nwfilter.html:124
+msgid "Priority"
+msgstr ""
+
+#: nwfilters/templates/nwfilter.html:125
+msgid "Statematch"
+msgstr ""
+
+#: nwfilters/templates/nwfilter.html:126
+msgid "Directives"
+msgstr ""
+
+#: nwfilters/templates/nwfilters.html:69
+msgid "Details of NWFilter"
+msgstr ""
+
+#: nwfilters/templates/nwfilters.html:92
+msgid "Clone NWFilter"
+msgstr ""
+
+#: nwfilters/templates/nwfilters.html:132
+msgid "Hypervisor doesn't have any NWFilters"
+msgstr ""
+
+#: nwfilters/views.py:44
+msgid "A network filter with this name already exists"
+msgstr ""
+
+#: nwfilters/views.py:47
+msgid "A network filter with this UUID already exists"
+msgstr ""
+
+#: nwfilters/views.py:51
+#, python-format
+msgid "%(filter)s network filter is created"
+msgstr ""
+
+#: nwfilters/views.py:60
+#, python-format
+msgid "%(filter)s network filter is deleted"
+msgstr ""
+
+#: nwfilters/views.py:77
+#, python-format
+msgid "NWFilter is in use by %(instance)s. Cannot be deleted."
+msgstr ""
+
+#: nwfilters/views.py:96
+#, python-format
+msgid "Cloning NWFilter %(name)s as %(clone)s"
+msgstr ""
+
+#: storages/forms.py:10 storages/forms.py:37
+msgid "No path has been entered"
+msgstr ""
+
+#: storages/forms.py:34
+msgid "The target must not contain any special characters"
+msgstr ""
+
+#: storages/forms.py:46
+msgid "No device or path has been entered"
+msgstr ""
+
+#: storages/forms.py:48
+msgid "The disk source must not contain any special characters"
+msgstr ""
+
+#: storages/forms.py:62 storages/forms.py:77
+msgid "The image name must not contain any special characters"
+msgstr ""
+
+#: storages/forms.py:79
+msgid "The image name must not exceed 120 characters"
+msgstr ""
+
+#: storages/templates/create_stg_block.html:12
+msgid "Create Storage Pool"
+msgstr ""
+
+#: storages/templates/create_stg_block.html:19
+msgid "DIR"
+msgstr ""
+
+#: storages/templates/create_stg_block.html:24
+msgid "LVM"
+msgstr ""
+
+#: storages/templates/create_stg_block.html:29
+msgid "CEPH"
+msgstr ""
+
+#: storages/templates/create_stg_block.html:34
+msgid "NETFS"
+msgstr ""
+
+#: storages/templates/create_stg_block.html:39
+msgid "ISO"
+msgstr ""
+
+#: storages/templates/create_stg_block.html:62
+#: storages/templates/create_stg_block.html:236
+msgid "Path"
+msgstr ""
+
+#: storages/templates/create_stg_block.html:120
+msgid "Ceph User"
+msgstr ""
+
+#: storages/templates/create_stg_block.html:126
+msgid "Ceph Pool"
+msgstr ""
+
+#: storages/templates/create_stg_block.html:132
+msgid "Ceph Host"
+msgstr ""
+
+#: storages/templates/create_stg_block.html:191
+msgid "Remote Path"
+msgstr ""
+
+#: storages/templates/create_stg_block.html:200
+msgid "auto"
+msgstr ""
+
+#: storages/templates/create_stg_block.html:201
+msgid "nfs"
+msgstr ""
+
+#: storages/templates/create_stg_block.html:202
+msgid "glusterfs"
+msgstr ""
+
+#: storages/templates/create_stg_block.html:203
+msgid "cifs"
+msgstr ""
+
+#: storages/templates/create_stg_block.html:208
+msgid "Local Path"
+msgstr ""
+
+#: storages/templates/create_stg_vol_block.html:15
+msgid "Upload ISO Image"
+msgstr ""
+
+#: storages/templates/create_stg_vol_block.html:29
+msgid "Upload"
+msgstr ""
+
+#: storages/templates/create_stg_vol_block.html:46
+msgid "Add New Volume"
+msgstr ""
+
+#: storages/templates/storage.html:46
+msgid "Pool name"
+msgstr ""
+
+#: storages/templates/storage.html:48
+msgid "Pool type"
+msgstr ""
+
+#: storages/templates/storage.html:50
+msgid "Pool path"
+msgstr ""
+
+#: storages/templates/storage.html:52
+msgid "Pool status"
+msgstr ""
+
+#: storages/templates/storage.html:56
+#: virtsecrets/templates/create_secret_block.html:36
+msgid "Usage"
+msgstr ""
+
+#: storages/templates/storage.html:90 storages/templates/storages.html:63
+msgid "Volumes"
+msgstr ""
+
+#: storages/templates/storage.html:98
+msgid "Allocated"
+msgstr ""
+
+#: storages/templates/storage.html:119
+msgid "Clone image"
+msgstr ""
+
+#: storages/templates/storage.html:132
+msgid "Convert"
+msgstr ""
+
+#: storages/templates/storage.html:141
+msgid "raw"
+msgstr ""
+
+#: storages/templates/storage.html:142
+msgid "qcow"
+msgstr ""
+
+#: storages/templates/storage.html:143
+msgid "qcow2"
+msgstr ""
+
+#: storages/templates/storage.html:187
+msgid "Hypervisor doesn't have any Volumes"
+msgstr ""
+
+#: storages/templates/storages.html:45
+msgid "Hypervisor doesn't have any Storages"
+msgstr ""
+
+#: storages/views.py:40
+msgid "Pool name already use"
+msgstr ""
+
+#: storages/views.py:45
+msgid "You need create secret for pool"
+msgstr ""
+
+#: storages/views.py:49
+msgid "You need input all fields for creating ceph pool"
+msgstr ""
+
+#: storages/views.py:96
+msgid "Security Issues with file uploading"
+msgstr ""
+
+#: storages/views.py:103
+msgid "File not found. Check the path variable and filename"
+msgstr ""
+
+#: storages/views.py:150
+#, python-format
+msgid "Volume: %(vol)s is deleted."
+msgstr ""
+
+#: storages/views.py:155
+msgid "ISO image already exist"
+msgstr ""
+
+#: storages/views.py:159
+#, python-format
+msgid "ISO: %(file)s is uploaded."
+msgstr ""
+
+#: storages/views.py:168
+msgid "Name of volume already in use"
+msgstr ""
+
+#: storages/views.py:180
+#, python-format
+msgid "%(image)s image cloned as %(name)s successfully"
+msgstr ""
+
+#: storages/views.py:226
+#, python-format
+msgid "Image file %(name)s is created successfully"
+msgstr ""
+
+#: templates/403.html:3
+msgid "403"
+msgstr ""
+
+#: templates/403.html:7 templates/404.html:7 templates/500.html:7
+msgid "Oops!"
+msgstr ""
+
+#: templates/403.html:9
+msgid "403 Forbidden"
+msgstr ""
+
+#: templates/403.html:11
+msgid "You do not have permission to access this page."
+msgstr ""
+
+#: templates/403.html:12 templates/404.html:12 templates/500.html:12
+msgid "Back"
+msgstr ""
+
+#: templates/404.html:3
+msgid "404"
+msgstr ""
+
+#: templates/404.html:9
+msgid "404 Not Found"
+msgstr ""
+
+#: templates/404.html:11
+msgid "The requested page was not found on this server."
+msgstr ""
+
+#: templates/500.html:3
+msgid "500"
+msgstr ""
+
+#: templates/500.html:9
+msgid "500 Internal Server Error"
+msgstr ""
+
+#: templates/500.html:11
+msgid ""
+"The server encountered an internal error or misconfiguration and was unable "
+"to complete you request."
+msgstr ""
+
+#: templates/common/confirm_delete.html:16
+msgid "Are you sure you want to delete"
+msgstr ""
+
+#: templates/navbar.html:47
+msgid "Log Out"
+msgstr ""
+
+#: templates/pleasewaitdialog.html:7
+msgid "Processing"
+msgstr ""
+
+#: templates/search_block.html:3
+msgid "Search"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_termui_impl.py:496
+#, python-brace-format
+msgid "{editor}: Editing failed"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_termui_impl.py:500
+#, python-brace-format
+msgid "{editor}: Editing failed: {e}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:20
+msgid ""
+"Click will abort further execution because Python was configured to use "
+"ASCII as encoding for the environment. Consult https://click.palletsprojects."
+"com/unicode-support/ for mitigation steps."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:56
+msgid ""
+"Additional information: on this system no suitable UTF-8 locales were "
+"discovered. This most likely requires resolving by reconfiguring the locale "
+"system."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:65
+msgid ""
+"This system supports the C.UTF-8 locale which is recommended. You might be "
+"able to resolve your issue by exporting the following environment variables:"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:75
+#, python-brace-format
+msgid ""
+"This system lists some UTF-8 supporting locales that you can pick from. The "
+"following suitable locales were discovered: {locales}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:93
+msgid ""
+"Click discovered that you exported a UTF-8 locale but the locale system "
+"could not pick up from it because it does not exist. The exported locale is "
+"{locale!r} but it is not supported."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1095
+msgid "Aborted!"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1279
+#: venv/lib/python3.6/site-packages/click/decorators.py:434
+msgid "Show this message and exit."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1308
+#: venv/lib/python3.6/site-packages/click/core.py:1334
+#, python-brace-format
+msgid "(Deprecated) {text}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1375
+#, python-brace-format
+msgid "Got unexpected extra argument ({args})"
+msgid_plural "Got unexpected extra arguments ({args})"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1390
+msgid "DeprecationWarning: The command {name!r} is deprecated."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1607
+msgid "Commands"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1639
+msgid "Missing command."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1717
+msgid "No such command {name!r}."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2258
+msgid "Value must be an iterable."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2278
+#, python-brace-format
+msgid "Takes {nargs} values but 1 was given."
+msgid_plural "Takes {nargs} values but {len} were given."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2701
+#, python-brace-format
+msgid "env var: {var}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2724
+msgid "(dynamic)"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2735
+#, python-brace-format
+msgid "default: {default}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2748
+msgid "required"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/decorators.py:339
+#, python-format
+msgid "%(prog)s, version %(version)s"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/decorators.py:403
+msgid "Show the version and exit."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:43
+#: venv/lib/python3.6/site-packages/click/exceptions.py:79
+#, python-brace-format
+msgid "Error: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:71
+#, python-brace-format
+msgid "Try '{command} {option}' for help."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:120
+#, python-brace-format
+msgid "Invalid value: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:122
+#, python-brace-format
+msgid "Invalid value for {param_hint}: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:178
+msgid "Missing argument"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:180
+msgid "Missing option"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:182
+msgid "Missing parameter"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:184
+#, python-brace-format
+msgid "Missing {param_type}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:191
+#, python-brace-format
+msgid "Missing parameter: {param_name}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:211
+#, python-brace-format
+msgid "No such option: {name}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:223
+#, python-brace-format
+msgid "Did you mean {possibility}?"
+msgid_plural "(Possible options: {possibilities})"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:261
+msgid "unknown error"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:268
+msgid "Could not open file {filename!r}: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:231
+msgid "Argument {name!r} takes {nargs} values."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:413
+msgid "Option {name!r} does not take a value."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:474
+msgid "Option {name!r} requires an argument."
+msgid_plural "Option {name!r} requires {nargs} arguments."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/shell_completion.py:316
+msgid "Shell completion is not supported for Bash versions older than 4.4."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/shell_completion.py:322
+msgid "Couldn't detect Bash version, shell completion is not supported."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:161
+msgid "Repeat for confirmation"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:178
+msgid "Error: The value you entered was invalid."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:180
+#, python-brace-format
+msgid "Error: {e.message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:191
+msgid "Error: The two entered values do not match."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:247
+msgid "Error: invalid input"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:798
+msgid "Press any key to continue..."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:258
+#, python-brace-format
+msgid ""
+"Choose from:\n"
+"\t{choices}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:290
+msgid "{value!r} is not {choice}."
+msgid_plural "{value!r} is not one of {choices}."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:380
+msgid "{value!r} does not match the format {format}."
+msgid_plural "{value!r} does not match the formats {formats}."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:402
+msgid "{value!r} is not a valid {number_type}."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:458
+#, python-brace-format
+msgid "{value} is not in the range {range}."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:599
+msgid "{value!r} is not a valid boolean."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:623
+msgid "{value!r} is not a valid UUID."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:801
+msgid "file"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:803
+msgid "directory"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:805
+msgid "path"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:851
+msgid "{name} {filename!r} does not exist."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:860
+msgid "{name} {filename!r} is a file."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:868
+msgid "{name} {filename!r} is a directory."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:876
+msgid "{name} {filename!r} is not writable."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:884
+msgid "{name} {filename!r} is not readable."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:951
+#, python-brace-format
+msgid "{len_type} values are required, but {len_value} was given."
+msgid_plural "{len_type} values are required, but {len_value} were given."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/django/contrib/messages/apps.py:7
+#: venv2/lib/python2.7/site-packages/django/contrib/messages/apps.py:7
+msgid "Messages"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/contrib/sitemaps/apps.py:8
+#: venv2/lib/python2.7/site-packages/django/contrib/sitemaps/apps.py:7
+msgid "Site Maps"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/contrib/staticfiles/apps.py:9
+#: venv2/lib/python2.7/site-packages/django/contrib/staticfiles/apps.py:7
+msgid "Static Files"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/contrib/syndication/apps.py:7
+#: venv2/lib/python2.7/site-packages/django/contrib/syndication/apps.py:7
+msgid "Syndication"
+msgstr ""
+
+#. Translators: String used to replace omitted page numbers in elided page
+#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10].
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:30
+msgid "…"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:51
+#: venv2/lib/python2.7/site-packages/django/core/paginator.py:43
+msgid "That page number is not an integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:53
+#: venv2/lib/python2.7/site-packages/django/core/paginator.py:45
+msgid "That page number is less than 1"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:58
+#: venv2/lib/python2.7/site-packages/django/core/paginator.py:50
+msgid "That page contains no results"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/core/validators.py:22
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:34
+msgid "Enter a valid value."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/core/validators.py:93
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:675
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:107
+#: venv2/lib/python2.7/site-packages/django/forms/fields.py:671
+msgid "Enter a valid URL."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/core/validators.py:150
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:160
+msgid "Enter a valid integer."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/core/validators.py:161
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:171
+msgid "Enter a valid email address."
+msgstr ""
+
+#. Translators: "letters" means latin letters: a-z and A-Z.
+#: venv/lib/python3.6/site-packages/django/core/validators.py:262
+msgid ""
+"Enter a valid “slug” consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/core/validators.py:269
+msgid ""
+"Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or "
+"hyphens."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/core/validators.py:278
+#: venv/lib/python3.6/site-packages/django/core/validators.py:288
+#: venv/lib/python3.6/site-packages/django/core/validators.py:311
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:257
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:277
+msgid "Enter a valid IPv4 address."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/core/validators.py:296
+#: venv/lib/python3.6/site-packages/django/core/validators.py:312
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:262
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:278
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/core/validators.py:306
+#: venv/lib/python3.6/site-packages/django/core/validators.py:310
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:272
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:276
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/core/validators.py:340
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:308
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1131
+msgid "Enter only digits separated by commas."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/core/validators.py:346
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:314
+#, python-format
+msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/core/validators.py:379
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:345
+#, python-format
+msgid "Ensure this value is less than or equal to %(limit_value)s."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/core/validators.py:388
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:354
+#, python-format
+msgid "Ensure this value is greater than or equal to %(limit_value)s."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/core/validators.py:398
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:364
+#, python-format
+msgid ""
+"Ensure this value has at least %(limit_value)d character (it has "
+"%(show_value)d)."
+msgid_plural ""
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/django/core/validators.py:413
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:379
+#, python-format
+msgid ""
+"Ensure this value has at most %(limit_value)d character (it has "
+"%(show_value)d)."
+msgid_plural ""
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/django/core/validators.py:432
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:292
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:327
+#: venv2/lib/python2.7/site-packages/django/forms/fields.py:303
+#: venv2/lib/python2.7/site-packages/django/forms/fields.py:340
+msgid "Enter a number."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/core/validators.py:434
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:399
+#, python-format
+msgid "Ensure that there are no more than %(max)s digit in total."
+msgid_plural "Ensure that there are no more than %(max)s digits in total."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/django/core/validators.py:439
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:404
+#, python-format
+msgid "Ensure that there are no more than %(max)s decimal place."
+msgid_plural "Ensure that there are no more than %(max)s decimal places."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/django/core/validators.py:444
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:409
+#, python-format
+msgid ""
+"Ensure that there are no more than %(max)s digit before the decimal point."
+msgid_plural ""
+"Ensure that there are no more than %(max)s digits before the decimal point."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/django/core/validators.py:506
+#, python-format
+msgid ""
+"File extension “%(extension)s” is not allowed. Allowed extensions are: "
+"%(allowed_extensions)s."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/core/validators.py:559
+msgid "Null characters are not allowed."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/base.py:1210
+#: venv/lib/python3.6/site-packages/django/forms/models.py:768
+#: venv2/lib/python2.7/site-packages/django/db/models/base.py:1209
+#: venv2/lib/python2.7/site-packages/django/forms/models.py:749
+msgid "and"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/base.py:1212
+#: venv2/lib/python2.7/site-packages/django/db/models/base.py:1211
+#, python-format
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:100
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:116
+#, python-format
+msgid "Value %(value)r is not a valid choice."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:101
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:117
+msgid "This field cannot be null."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:102
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:118
+msgid "This field cannot be blank."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:103
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:119
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr ""
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:107
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:123
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:126
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:140
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:958
+#, python-format
+msgid "“%(value)s” value must be either True or False."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:959
+#, python-format
+msgid "“%(value)s” value must be either True, False, or None."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:961
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:992
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1002
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1058
+#, python-format
+msgid "String (up to %(max_length)s)"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1096
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1115
+msgid "Comma-separated integers"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1145
+#, python-format
+msgid ""
+"“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD "
+"format."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1147
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1290
+#, python-format
+msgid ""
+"“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid "
+"date."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1150
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1177
+msgid "Date (without time)"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1288
+#, python-format
+msgid ""
+"“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1292
+#, python-format
+msgid ""
+"“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]) but it is an invalid date/time."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1296
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1325
+msgid "Date (with time)"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1444
+#, python-format
+msgid "“%(value)s” value must be a decimal number."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1446
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1477
+msgid "Decimal number"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1585
+#, python-format
+msgid ""
+"“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[."
+"uuuuuu] format."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1588
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1631
+msgid "Duration"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1638
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1683
+msgid "Email address"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1661
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1707
+msgid "File path"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1727
+#, python-format
+msgid "“%(value)s” value must be a float."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1729
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1775
+msgid "Floating point number"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1767
+#, python-format
+msgid "“%(value)s” value must be an integer."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1769
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:901
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1809
+msgid "Integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1852
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:978
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1878
+msgid "Big (8 byte) integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1867
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2130
+msgid "Small integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1875
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1893
+msgid "IPv4 address"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1906
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1924
+msgid "IP address"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1986
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1987
+#, python-format
+msgid "“%(value)s” value must be either None, True or False."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1989
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2008
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2043
+msgid "Positive big integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2056
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2071
+msgid "Positive integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2069
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2083
+msgid "Positive small integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2083
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2096
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2115
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2137
+msgid "Text"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2181
+#, python-format
+msgid ""
+"“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"format."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2183
+#, python-format
+msgid ""
+"“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"invalid time."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2186
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2168
+msgid "Time"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2312
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2296
+msgid "URL"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2334
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2319
+msgid "Raw binary data"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2399
+#, python-format
+msgid "“%(value)s” is not a valid UUID."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2401
+msgid "Universally unique identifier"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:226
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/files.py:228
+msgid "File"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/json.py:18
+msgid "A JSON object"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/json.py:20
+msgid "Value must be valid JSON."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:790
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:788
+#, python-format
+msgid "%(model)s instance with %(field)s %(value)r does not exist."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:792
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:790
+msgid "Foreign Key (type determined by related field)"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1045
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1029
+msgid "One-to-one relationship"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1099
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1104
+#, python-format
+msgid "%(from)s-%(to)s relationship"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1100
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1105
+#, python-format
+msgid "%(from)s-%(to)s relationships"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1142
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1147
+msgid "Many-to-many relationship"
+msgstr ""
+
+#. Translators: If found as last label character, these punctuation
+#. characters will prevent the default label_suffix to be appended to the label
+#: venv/lib/python3.6/site-packages/django/forms/boundfield.py:150
+#: venv2/lib/python2.7/site-packages/django/forms/boundfield.py:181
+msgid ":?.!"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:54
+#: venv2/lib/python2.7/site-packages/django/forms/fields.py:56
+msgid "This field is required."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:247
+#: venv2/lib/python2.7/site-packages/django/forms/fields.py:258
+msgid "Enter a whole number."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:402
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1143
+#: venv2/lib/python2.7/site-packages/django/forms/fields.py:418
+#: venv2/lib/python2.7/site-packages/django/forms/fields.py:1149
+msgid "Enter a valid date."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:426
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1144
+#: venv2/lib/python2.7/site-packages/django/forms/fields.py:442
+#: venv2/lib/python2.7/site-packages/django/forms/fields.py:1150
+msgid "Enter a valid time."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:454
+#: venv2/lib/python2.7/site-packages/django/forms/fields.py:464
+msgid "Enter a valid date/time."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:488
+#: venv2/lib/python2.7/site-packages/django/forms/fields.py:493
+msgid "Enter a valid duration."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:489
+#, python-brace-format
+msgid "The number of days must be between {min_days} and {max_days}."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:549
+#: venv2/lib/python2.7/site-packages/django/forms/fields.py:547
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:550
+#: venv2/lib/python2.7/site-packages/django/forms/fields.py:548
+msgid "No file was submitted."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:551
+#: venv2/lib/python2.7/site-packages/django/forms/fields.py:549
+msgid "The submitted file is empty."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:553
+#: venv2/lib/python2.7/site-packages/django/forms/fields.py:551
+#, python-format
+msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
+msgid_plural ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:556
+#: venv2/lib/python2.7/site-packages/django/forms/fields.py:554
+msgid "Please either submit a file or check the clear checkbox, not both."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:617
+#: venv2/lib/python2.7/site-packages/django/forms/fields.py:619
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:779
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:869
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1309
+#: venv2/lib/python2.7/site-packages/django/forms/fields.py:776
+#: venv2/lib/python2.7/site-packages/django/forms/fields.py:872
+#: venv2/lib/python2.7/site-packages/django/forms/models.py:1265
+#, python-format
+msgid "Select a valid choice. %(value)s is not one of the available choices."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:870
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:985
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1308
+#: venv2/lib/python2.7/site-packages/django/forms/fields.py:873
+#: venv2/lib/python2.7/site-packages/django/forms/fields.py:990
+#: venv2/lib/python2.7/site-packages/django/forms/models.py:1264
+msgid "Enter a list of values."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:986
+#: venv2/lib/python2.7/site-packages/django/forms/fields.py:991
+msgid "Enter a complete value."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1202
+#: venv2/lib/python2.7/site-packages/django/forms/fields.py:1208
+msgid "Enter a valid UUID."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1232
+msgid "Enter a valid JSON."
+msgstr ""
+
+#. Translators: This is the default suffix added to form field labels
+#: venv/lib/python3.6/site-packages/django/forms/forms.py:76
+#: venv2/lib/python2.7/site-packages/django/forms/forms.py:87
+msgid ":"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/forms.py:203
+#: venv2/lib/python2.7/site-packages/django/forms/forms.py:213
+#, python-format
+msgid "(Hidden field %(name)s) %(error)s"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:61
+#, python-format
+msgid ""
+"ManagementForm data is missing or has been tampered with. Missing fields: "
+"%(field_names)s. You may need to file a bug report if the issue persists."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:370
+#, python-format
+msgid "Please submit at most %d form."
+msgid_plural "Please submit at most %d forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:377
+#, python-format
+msgid "Please submit at least %d form."
+msgid_plural "Please submit at least %d forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:405
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:412
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:390
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:392
+msgid "Order"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/models.py:763
+#: venv2/lib/python2.7/site-packages/django/forms/models.py:744
+#, python-format
+msgid "Please correct the duplicate data for %(field)s."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/models.py:767
+#: venv2/lib/python2.7/site-packages/django/forms/models.py:748
+#, python-format
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/models.py:773
+#: venv2/lib/python2.7/site-packages/django/forms/models.py:754
+#, python-format
+msgid ""
+"Please correct the duplicate data for %(field_name)s which must be unique "
+"for the %(lookup)s in %(date_field)s."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/models.py:782
+#: venv2/lib/python2.7/site-packages/django/forms/models.py:763
+msgid "Please correct the duplicate values below."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1109
+msgid "The inline value did not match the parent instance."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1193
+#: venv2/lib/python2.7/site-packages/django/forms/models.py:1154
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1311
+#, python-format
+msgid "“%(pk)s” is not a valid value."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/utils.py:172
+#, python-format
+msgid ""
+"%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:404
+#: venv2/lib/python2.7/site-packages/django/forms/widgets.py:378
+msgid "Currently"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:715
+#: venv2/lib/python2.7/site-packages/django/forms/widgets.py:704
+msgid "Yes"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:716
+#: venv2/lib/python2.7/site-packages/django/forms/widgets.py:705
+msgid "No"
+msgstr ""
+
+#. Translators: Please do not add spaces around commas.
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:805
+#: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:851
+msgid "yes,no,maybe"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:834
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:851
+#: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:880
+#: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:897
+#, python-format
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:853
+#: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:899
+#, python-format
+msgid "%s KB"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:855
+#: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:901
+#, python-format
+msgid "%s MB"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:857
+#: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:903
+#, python-format
+msgid "%s GB"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:859
+#: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:905
+#, python-format
+msgid "%s TB"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:861
+#: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:907
+#, python-format
+msgid "%s PB"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:66
+#: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:66
+msgid "p.m."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:67
+#: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:67
+msgid "a.m."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:72
+#: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:72
+msgid "PM"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:73
+#: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:73
+msgid "AM"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:146
+#: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:158
+msgid "midnight"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:148
+#: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:160
+msgid "noon"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:6
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:6
+msgid "Monday"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:6
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:6
+msgid "Tuesday"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:6
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:6
+msgid "Wednesday"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:6
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:6
+msgid "Thursday"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:6
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:6
+msgid "Friday"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:7
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:7
+msgid "Saturday"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:7
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:7
+msgid "Sunday"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:10
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:10
+msgid "Mon"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:10
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:10
+msgid "Tue"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:10
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:10
+msgid "Wed"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:10
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:10
+msgid "Thu"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:10
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:10
+msgid "Fri"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:11
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:11
+msgid "Sat"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:11
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:11
+msgid "Sun"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:14
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:18
+msgid "January"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:14
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:18
+msgid "February"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:14
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:18
+msgid "March"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:14
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:18
+msgid "April"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:14
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:18
+msgid "May"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:14
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:18
+msgid "June"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:15
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:19
+msgid "July"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:15
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:19
+msgid "August"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:15
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:19
+msgid "September"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:15
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:19
+msgid "October"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:15
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:19
+msgid "November"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:16
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:20
+msgid "December"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:19
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:23
+msgid "jan"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:19
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:23
+msgid "feb"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:19
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:23
+msgid "mar"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:19
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:23
+msgid "apr"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:19
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:23
+msgid "may"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:19
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:23
+msgid "jun"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:20
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:24
+msgid "jul"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:20
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:24
+msgid "aug"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:20
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:24
+msgid "sep"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:20
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:24
+msgid "oct"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:20
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:24
+msgid "nov"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:20
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:24
+msgid "dec"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:23
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:31
+msgctxt "abbrev. month"
+msgid "Jan."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:24
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:32
+msgctxt "abbrev. month"
+msgid "Feb."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:25
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:33
+msgctxt "abbrev. month"
+msgid "March"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:26
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:34
+msgctxt "abbrev. month"
+msgid "April"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:27
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:35
+msgctxt "abbrev. month"
+msgid "May"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:28
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:36
+msgctxt "abbrev. month"
+msgid "June"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:29
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:37
+msgctxt "abbrev. month"
+msgid "July"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:30
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:38
+msgctxt "abbrev. month"
+msgid "Aug."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:31
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:39
+msgctxt "abbrev. month"
+msgid "Sept."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:32
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:40
+msgctxt "abbrev. month"
+msgid "Oct."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:33
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:41
+msgctxt "abbrev. month"
+msgid "Nov."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:34
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:42
+msgctxt "abbrev. month"
+msgid "Dec."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:37
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:45
+msgctxt "alt. month"
+msgid "January"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:38
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:46
+msgctxt "alt. month"
+msgid "February"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:39
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:47
+msgctxt "alt. month"
+msgid "March"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:40
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:48
+msgctxt "alt. month"
+msgid "April"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:41
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:49
+msgctxt "alt. month"
+msgid "May"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:42
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:50
+msgctxt "alt. month"
+msgid "June"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:43
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:51
+msgctxt "alt. month"
+msgid "July"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:44
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:52
+msgctxt "alt. month"
+msgid "August"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:45
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:53
+msgctxt "alt. month"
+msgid "September"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:46
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:54
+msgctxt "alt. month"
+msgid "October"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:47
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:55
+msgctxt "alt. month"
+msgid "November"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/dates.py:48
+#: venv2/lib/python2.7/site-packages/django/utils/dates.py:56
+msgctxt "alt. month"
+msgid "December"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/ipv6.py:8
+#: venv2/lib/python2.7/site-packages/django/utils/ipv6.py:12
+msgid "This is not a valid IPv6 address."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/text.py:71
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s…"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/text.py:240
+#: venv2/lib/python2.7/site-packages/django/utils/text.py:251
+msgid "or"
+msgstr ""
+
+#. Translators: This string is used as a separator between list elements
+#: venv/lib/python3.6/site-packages/django/utils/text.py:259
+#: venv/lib/python3.6/site-packages/django/utils/timesince.py:94
+#: venv2/lib/python2.7/site-packages/django/utils/text.py:270
+#: venv2/lib/python2.7/site-packages/django/utils/timesince.py:71
+msgid ", "
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/utils/timesince.py:9
+#: venv2/lib/python2.7/site-packages/django/utils/timesince.py:11
+#, python-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/django/utils/timesince.py:10
+#: venv2/lib/python2.7/site-packages/django/utils/timesince.py:12
+#, python-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/django/utils/timesince.py:11
+#: venv2/lib/python2.7/site-packages/django/utils/timesince.py:13
+#, python-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/django/utils/timesince.py:12
+#: venv2/lib/python2.7/site-packages/django/utils/timesince.py:14
+#, python-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/django/utils/timesince.py:13
+#: venv2/lib/python2.7/site-packages/django/utils/timesince.py:15
+#, python-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/django/utils/timesince.py:14
+#: venv2/lib/python2.7/site-packages/django/utils/timesince.py:16
+#, python-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/django/views/csrf.py:110
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:109
+msgid "Forbidden"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/csrf.py:111
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:110
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/csrf.py:115
+msgid ""
+"You are seeing this message because this HTTPS site requires a “Referer "
+"header” to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/csrf.py:120
+msgid ""
+"If you have configured your browser to disable “Referer” headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for “same-"
+"origin” requests."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/csrf.py:124
+msgid ""
+"If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
+"including the “Referrer-Policy: no-referrer” header, please remove them. The "
+"CSRF protection requires the “Referer” header to do strict referer checking. "
+"If you’re concerned about privacy, use alternatives like <a rel=\"noreferrer"
+"\" …> for links to third-party sites."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/csrf.py:132
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:124
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/csrf.py:137
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for “same-origin” requests."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/csrf.py:142
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:134
+msgid "More information is available with DEBUG=True."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:41
+#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:48
+msgid "No year specified"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:61
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:111
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:208
+#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:72
+#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:132
+#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:249
+msgid "Date out of range"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:90
+#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:107
+msgid "No month specified"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:142
+#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:169
+msgid "No day specified"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:188
+#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:225
+msgid "No week specified"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:338
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:367
+#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:387
+#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:415
+#, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:594
+#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:669
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:628
+#, python-format
+msgid "Invalid date string “%(datestr)s” given format “%(format)s”"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/generic/detail.py:54
+#: venv2/lib/python2.7/site-packages/django/views/generic/detail.py:55
+#, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/generic/list.py:67
+msgid "Page is not “last”, nor can it be converted to an int."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/generic/list.py:72
+#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:82
+#, python-format
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/generic/list.py:154
+#, python-format
+msgid "Empty list and “%(class_name)s.allow_empty” is False."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/static.py:40
+#: venv2/lib/python2.7/site-packages/django/views/static.py:44
+msgid "Directory indexes are not allowed here."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/static.py:42
+#, python-format
+msgid "“%(path)s” does not exist"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/static.py:80
+#: venv2/lib/python2.7/site-packages/django/views/static.py:86
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:7
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:221
+msgid "The install worked successfully! Congratulations!"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:207
+#, python-format
+msgid ""
+"View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
+"target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:222
+#, python-format
+msgid ""
+"You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
+"%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
+"\">DEBUG=True</a> is in your settings file and you have not configured any "
+"URLs."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:230
+msgid "Django Documentation"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:231
+msgid "Topics, references, &amp; how-to’s"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:239
+msgid "Tutorial: A Polling App"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:240
+msgid "Get started with Django"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:248
+msgid "Django Community"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:249
+msgid "Connect, get help, or contribute"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django_bootstrap5/components.py:20
+msgid "close"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django_icons/renderers/image.py:217
+msgid "Icon of {}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/isort/main.py:158
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1615
+msgid "show this help message and exit"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:245
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:252
+msgid ""
+"Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
+"hyphens."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:463
+#, python-format
+msgid ""
+"File extension '%(extension)s' is not allowed. Allowed extensions are: "
+"'%(allowed_extensions)s'."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:905
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1807
+#, python-format
+msgid "'%(value)s' value must be an integer."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:990
+#, python-format
+msgid "'%(value)s' value must be either True or False."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1172
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+"format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1174
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1319
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
+"date."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1317
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1321
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]) but it is an invalid date/time."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1475
+#, python-format
+msgid "'%(value)s' value must be a decimal number."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1628
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
+"uuuuuu] format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1773
+#, python-format
+msgid "'%(value)s' value must be a float."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2006
+#, python-format
+msgid "'%(value)s' value must be either None, True or False."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2163
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2165
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"invalid time."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2366
+#, python-format
+msgid "'%(value)s' is not a valid UUID."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:97
+msgid "ManagementForm data is missing or has been tampered with"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:355
+#, python-format
+msgid "Please submit %d or fewer forms."
+msgid_plural "Please submit %d or fewer forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:362
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv2/lib/python2.7/site-packages/django/forms/models.py:1093
+msgid "The inline foreign key did not match the parent instance primary key."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/forms/models.py:1267
+#, python-format
+msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/forms/utils.py:172
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/utils/text.py:81
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/utils/timesince.py:60
+msgid "0 minutes"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:114
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:119
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:129
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/debug.py:520
+msgid "Welcome to Django"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/debug.py:521
+msgid "It worked!"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/debug.py:522
+msgid "Congratulations on your first Django-powered page."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/debug.py:524
+msgid ""
+"Next, start your first app by running <code>python manage.py startapp "
+"[app_label]</code>."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/debug.py:527
+msgid ""
+"You're seeing this message because you have <code>DEBUG = True</code> in "
+"your Django settings file and you haven't configured any URLs. Get to work!"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:703
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:77
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:172
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/static.py:46
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:313
+msgid "usage: "
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:821
+msgid ".__call__() not defined"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1105
+#, python-format
+msgid "unknown parser %r (choices: %s)"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1146
+#, python-format
+msgid "argument \"-\" with mode %r"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1349
+#, python-format
+msgid "cannot merge actions - two groups are named %r"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1387
+msgid "'required' is an invalid argument for positionals"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1407
+#, python-format
+msgid "invalid option string %r: must start with a character %r"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1428
+#, python-format
+msgid "dest= is required for options like %r"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1445
+#, python-format
+msgid "invalid conflict_resolution value: %r"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1463
+#, python-format
+msgid "conflicting option string(s): %s"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1526
+msgid "mutually exclusive arguments must be optional"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1596
+msgid "positional arguments"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1597
+msgid "optional arguments"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1621
+msgid "show program's version number and exit"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1653
+msgid "cannot have multiple subparser arguments"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1705
+#, python-format
+msgid "unrecognized arguments: %s"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1802
+#, python-format
+msgid "not allowed with argument %s"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1848
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1862
+#, python-format
+msgid "ignored explicit argument %r"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1952
+msgid "too few arguments"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1959
+#, python-format
+msgid "argument %s is required"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1973
+#, python-format
+msgid "one of the arguments %s is required"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:2019
+msgid "expected one argument"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:2020
+msgid "expected at most one argument"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:2021
+msgid "expected at least one argument"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:2023
+#, python-format
+msgid "expected %s argument(s)"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:2080
+#, python-format
+msgid "ambiguous option: %s could match %s"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:2142
+#, python-format
+msgid "unexpected option string: %s"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:2243
+#, python-format
+msgid "%r is not callable"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:2259
+#, python-format
+msgid "invalid %s value: %r"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:2269
+#, python-format
+msgid "invalid choice: %r (choose from %s)"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:2362
+#, python-format
+msgid "%s: error: %s\n"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:12
+msgid "Create New Secret"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:18
+msgid "Ephemeral"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:21
+#: virtsecrets/templates/create_secret_block.html:30
+msgid "no"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:22
+#: virtsecrets/templates/create_secret_block.html:31
+msgid "yes"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:27
+msgid "Private"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:46
+#: virtsecrets/templates/secrets.html:62
+msgid "Data"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:51
+msgid "Hypervisor doesn't have any Secrets"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:61
+msgid "Usage Type"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:89
+msgid "Set secret value"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:95
+msgid "Value"
+msgstr ""
+
+#: webvirtcloud/middleware.py:18
+#, python-format
+msgid "libvirt Error - %(exception)s"
+msgstr ""
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 60c21a0..d31d143 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -8,11 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2020-11-05 09:36+0000\n"
-=======
-"POT-Creation-Date: 2020-10-23 07:53+0000\n"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+"POT-Creation-Date: 2021-12-20 07:54+0000\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"
@@ -96,39 +92,39 @@ msgstr ""
 msgid "Create user instance"
 msgstr ""
 
-#: accounts/templates/account.html:27
+#: accounts/templates/account.html:28
 #: computes/templates/computes/instances.html:5
 #: computes/templates/computes/instances.html:9
-#: computes/templates/computes/instances.html:32
-#: computes/templates/overview.html:19 instances/templates/allinstances.html:5
+#: computes/templates/computes/instances.html:30
+#: computes/templates/overview.html:18 instances/templates/allinstances.html:5
 #: instances/templates/allinstances.html:9
 #: instances/templates/bottom_bar.html:17
 #: interfaces/templates/interface.html:16
-#: interfaces/templates/interfaces.html:20 networks/templates/network.html:17
+#: interfaces/templates/interfaces.html:22 networks/templates/network.html:17
 #: networks/templates/networks.html:19 nwfilters/templates/nwfilter.html:17
-#: nwfilters/templates/nwfilters.html:25 secrets/templates/secrets.html:23
-#: storages/templates/storage.html:22 storages/templates/storages.html:19
-#: templates/navbar.html:14
+#: nwfilters/templates/nwfilters.html:23 storages/templates/storage.html:23
+#: storages/templates/storages.html:19 templates/navbar.html:14
+#: virtsecrets/templates/secrets.html:25
 msgid "Instances"
 msgstr ""
 
-#: accounts/templates/account.html:30
+#: accounts/templates/account.html:33
 msgid "Public Keys"
 msgstr ""
 
-#: accounts/templates/account.html:40 admin/templates/admin/logs.html:27
+#: accounts/templates/account.html:44 admin/templates/admin/logs.html:27
 #: instances/templates/instance.html:5
 msgid "Instance"
 msgstr ""
 
-#: accounts/templates/account.html:41
+#: accounts/templates/account.html:45
 msgid "VNC"
 msgstr ""
 
-#: accounts/templates/account.html:42 instances/templates/instance.html:87
-#: instances/templates/instances/resize_tab.html:56
-#: instances/templates/instances/resize_tab.html:58
-#: instances/templates/instances/resize_tab.html:85
+#: accounts/templates/account.html:46 instances/templates/instance.html:93
+#: instances/templates/instances/resize_tab.html:55
+#: instances/templates/instances/resize_tab.html:57
+#: instances/templates/instances/resize_tab.html:84
 #: instances/templates/instances/resize_tab.html:121
 #: instances/templates/instances/resize_tab.html:125
 #: instances/templates/instances/resize_tab.html:151
@@ -137,47 +133,47 @@ msgstr ""
 msgid "Resize"
 msgstr ""
 
-#: accounts/templates/account.html:43 accounts/templates/account.html:61
-#: accounts/templates/profile.html:51 admin/templates/admin/group_list.html:46
-#: admin/templates/admin/user_list.html:68
-#: computes/templates/computes/list.html:54
-#: instances/templates/instances/settings_tab.html:310
-#: instances/templates/instances/settings_tab.html:314
+#: accounts/templates/account.html:47 accounts/templates/account.html:65
+#: accounts/templates/profile.html:55 admin/templates/admin/group_list.html:43
+#: admin/templates/admin/user_list.html:65
+#: computes/templates/computes/list.html:53
+#: instances/templates/instances/settings_tab.html:325
+#: instances/templates/instances/settings_tab.html:329
 #: interfaces/templates/interface.html:60 networks/templates/network.html:50
-#: nwfilters/templates/nwfilter.html:111 nwfilters/templates/nwfilter.html:151
-#: nwfilters/templates/nwfilters.html:120 secrets/templates/secrets.html:77
-#: storages/templates/storage.html:61 storages/templates/storage.html:174
-#: templates/common/confirm_delete.html:21
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:375
+#: nwfilters/templates/nwfilter.html:103 nwfilters/templates/nwfilter.html:143
+#: nwfilters/templates/nwfilters.html:118 storages/templates/storage.html:63
+#: storages/templates/storage.html:175 templates/common/confirm_delete.html:21
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:417
 #: venv2/lib/python2.7/site-packages/django/forms/formsets.py:394
+#: virtsecrets/templates/secrets.html:78
 msgid "Delete"
 msgstr ""
 
-#: accounts/templates/account.html:44
-#: instances/templates/create_instance_w2.html:81
-#: instances/templates/instances/settings_tab.html:239
-#: instances/templates/instances/snapshots_tab.html:49
-#: nwfilters/templates/nwfilter.html:101 nwfilters/templates/nwfilter.html:135
-#: nwfilters/templates/nwfilters.html:57 secrets/templates/secrets.html:62
-#: storages/templates/storage.html:100
+#: accounts/templates/account.html:48
+#: instances/templates/create_instance_w2.html:80
+#: instances/templates/instances/settings_tab.html:254
+#: instances/templates/instances/snapshots_tab.html:41
+#: nwfilters/templates/nwfilter.html:93 nwfilters/templates/nwfilter.html:127
+#: nwfilters/templates/nwfilters.html:55 storages/templates/storage.html:101
+#: virtsecrets/templates/secrets.html:63
 msgid "Action"
 msgstr ""
 
-#: accounts/templates/account.html:56
+#: accounts/templates/account.html:60
 msgid "edit"
 msgstr ""
 
-#: accounts/templates/account.html:74
+#: accounts/templates/account.html:78
 msgid "Key name"
 msgstr ""
 
-#: accounts/templates/account.html:75
+#: accounts/templates/account.html:79
 msgid "Public key"
 msgstr ""
 
 #: accounts/templates/accounts/change_password_form.html:7
 #: accounts/templates/accounts/change_password_form.html:14
-#: accounts/templates/profile.html:29
+#: accounts/templates/profile.html:33
 msgid "Change Password"
 msgstr ""
 
@@ -190,11 +186,11 @@ msgid "Cancel"
 msgstr ""
 
 #: accounts/templates/accounts/change_password_form.html:27
-#: instances/templates/instances/settings_tab.html:638
-#: instances/templates/instances/settings_tab.html:642
-#: instances/templates/instances/settings_tab.html:824
-#: instances/templates/instances/settings_tab.html:826
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:397
+#: instances/templates/instances/settings_tab.html:672
+#: instances/templates/instances/settings_tab.html:676
+#: instances/templates/instances/settings_tab.html:853
+#: instances/templates/instances/settings_tab.html:855
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:405
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:379
 msgid "Change"
 msgstr ""
@@ -223,7 +219,7 @@ msgstr ""
 
 #: accounts/templates/accounts/otp_login.html:24
 #: accounts/templates/login.html:5 accounts/templates/login.html:23
-#: accounts/templates/login.html:27
+#: accounts/templates/login.html:28
 msgid "Sign In"
 msgstr ""
 
@@ -235,12 +231,12 @@ msgstr ""
 msgid "Incorrect username or password."
 msgstr ""
 
-#: accounts/templates/login.html:24 admin/templates/admin/logs.html:26
-#: computes/templates/computes/instances.html:67
+#: accounts/templates/login.html:24 admin/templates/admin/logs.html:25
+#: computes/templates/computes/instances.html:64
 #: instances/templates/add_instance_owner_block.html:18
 #: instances/templates/allinstances_index_grouped.html:8
 #: instances/templates/allinstances_index_nongrouped.html:7
-#: instances/templates/instances/stats_tab.html:84
+#: instances/templates/instances/stats_tab.html:87
 msgid "User"
 msgstr ""
 
@@ -264,26 +260,26 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: accounts/templates/profile.html:14
+#: accounts/templates/profile.html:15
 msgid "Edit Profile"
 msgstr ""
 
-#: accounts/templates/profile.html:17
-#: instances/templates/instances/access_tab.html:23
+#: accounts/templates/profile.html:20
+#: instances/templates/instances/access_tab.html:20
 msgid "SSH Keys"
 msgstr ""
 
-#: accounts/templates/profile.html:34
-#: instances/templates/instances/settings_tab.html:686
-#: instances/templates/instances/settings_tab.html:688
+#: accounts/templates/profile.html:38
+#: instances/templates/instances/settings_tab.html:720
+#: instances/templates/instances/settings_tab.html:722
 msgid "Update"
 msgstr ""
 
-#: accounts/templates/profile.html:64
+#: accounts/templates/profile.html:68
 msgid "Add SSH Key"
 msgstr ""
 
-#: accounts/templates/profile.html:72
+#: accounts/templates/profile.html:76
 #: instances/templates/add_instance_network_block.html:50
 #: instances/templates/add_instance_owner_block.html:31
 #: instances/templates/create_flav_block.html:28
@@ -297,7 +293,6 @@ msgstr ""
 
 #: accounts/utils.py:51
 msgid "Please view HTML version of this message."
-<<<<<<< HEAD
 msgstr ""
 
 #: accounts/views.py:26
@@ -347,57 +342,6 @@ msgid "OTP QR code was emailed to user %(user)s"
 msgstr ""
 
 #: accounts/views.py:196
-=======
-msgstr ""
-
-#: accounts/views.py:26
-msgid "Profile updated"
-msgstr ""
-
-#: accounts/views.py:40
-msgid "SSH key added"
-msgstr ""
-
-#: accounts/views.py:45
-msgid "Add SSH key"
-msgstr ""
-
-#: accounts/views.py:53
-msgid "SSH key deleted"
-msgstr ""
-
-#: accounts/views.py:58
-msgid "Delete SSH key"
-msgstr ""
-
-#: accounts/views.py:86
-msgid "Password Changed"
-msgstr ""
-
-#: accounts/views.py:106
-msgid "Create User Instance"
-msgstr ""
-
-#: accounts/views.py:124
-msgid "Update User Instance"
-msgstr ""
-
-#: accounts/views.py:160
-#, python-format
-msgid "OTP Sent to %s"
-msgstr ""
-
-#: accounts/views.py:165
-msgid "Email OTP"
-msgstr ""
-
-#: accounts/views.py:175
-#, python-format
-msgid "OTP QR code was emailed to user %s"
-msgstr ""
-
-#: accounts/views.py:177
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "User email not set, failed to send QR code"
 msgstr ""
 
@@ -405,156 +349,145 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: admin/forms.py:56 admin/templates/admin/group_list.html:15
+#: admin/forms.py:56 admin/templates/admin/group_list.html:13
 #: templates/navbar.html:30
 msgid "Groups"
 msgstr ""
 
-<<<<<<< HEAD
 #: admin/forms.py:81
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, \n"
 "                    but you can change the password using <a href='{}'>this "
 "form</a>."
-=======
-#: admin/forms.py:79
-msgid ""
-"Raw passwords are not stored, so there is no way to see\n"
-"                this user's password, but you can change the password using "
-"<a href='{}'>this form</a>."
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgstr ""
 
 #: admin/templates/admin/group_list.html:5 admin/views.py:87
-#: instances/templates/instances/settings_tab.html:63 templates/navbar.html:29
+#: instances/templates/instances/settings_tab.html:69 templates/navbar.html:29
 msgid "Users"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:13
-#: admin/templates/admin/user_list.html:16
-#: computes/templates/computes/instances.html:18
-#: instances/templates/allinstances.html:16
-#: nwfilters/templates/nwfilters.html:12 storages/templates/storage.html:87
-#: templates/search_block.html:3
-msgid "Search"
-msgstr ""
-
-#: admin/templates/admin/group_list.html:23 admin/templates/admin/logs.html:16
-#: admin/templates/admin/user_list.html:26
-#: computes/templates/computes/instances.html:57
-#: computes/templates/computes/list.html:20
-#: instances/templates/create_instance_w2.html:66
-#: interfaces/templates/interfaces.html:47 networks/templates/networks.html:46
-#: nwfilters/templates/nwfilters.html:135 secrets/templates/secrets.html:50
-#: storages/templates/storage.html:187 storages/templates/storages.html:46
+#: admin/templates/admin/group_list.html:20 admin/templates/admin/logs.html:15
+#: admin/templates/admin/user_list.html:23
+#: computes/templates/computes/instances.html:55
+#: computes/templates/computes/list.html:19
+#: instances/templates/create_instance_w2.html:67
+#: interfaces/templates/interfaces.html:48 networks/templates/networks.html:45
+#: nwfilters/templates/nwfilters.html:132 storages/templates/storage.html:187
+#: storages/templates/storages.html:45 virtsecrets/templates/secrets.html:51
 msgid "Warning"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:23
+#: admin/templates/admin/group_list.html:20
 msgid "You don't have any groups"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:31
+#: admin/templates/admin/group_list.html:28
 msgid "Group Name"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:32
-#: admin/templates/admin/user_list.html:39
-#: computes/templates/computes/instances.html:71
-#: computes/templates/computes/list.html:31
+#: admin/templates/admin/group_list.html:29
+#: admin/templates/admin/user_list.html:36
+#: computes/templates/computes/instances.html:68
+#: computes/templates/computes/list.html:30
 #: instances/templates/allinstances_index_grouped.html:12
 #: instances/templates/allinstances_index_nongrouped.html:12
-#: instances/templates/instances/settings_tab.html:343
-#: instances/templates/instances/settings_tab.html:491
+#: instances/templates/instances/settings_tab.html:355
+#: instances/templates/instances/settings_tab.html:525
 #: networks/templates/network.html:175 networks/templates/network.html:284
 #: networks/templates/network.html:332
 msgid "Actions"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:43
-#: admin/templates/admin/user_list.html:62
-#: computes/templates/computes/list.html:53 networks/templates/network.html:82
-#: nwfilters/templates/nwfilter.html:59 secrets/templates/secrets.html:74
+#: admin/templates/admin/group_list.html:40
+#: admin/templates/admin/user_list.html:59
+#: computes/templates/computes/list.html:52 networks/templates/network.html:82
+#: nwfilters/templates/nwfilter.html:59 virtsecrets/templates/secrets.html:75
 msgid "Edit"
 msgstr ""
 
 #: admin/templates/admin/logs.html:5 admin/templates/admin/logs.html:7
-#: instances/templates/instances/stats_tab.html:13 templates/navbar.html:31
+#: instances/templates/instances/stats_tab.html:12 templates/navbar.html:31
 msgid "Logs"
 msgstr ""
 
-#: admin/templates/admin/logs.html:16
+#: admin/templates/admin/logs.html:15
 msgid "You don't have any Logs"
 msgstr ""
 
-#: admin/templates/admin/logs.html:25
-#: instances/templates/instances/snapshots_tab.html:48
-#: instances/templates/instances/stats_tab.html:83
+#: admin/templates/admin/logs.html:24
+#: instances/templates/instances/snapshots_tab.html:40
+#: instances/templates/instances/stats_tab.html:86
 msgid "Date"
 msgstr ""
 
+#: admin/templates/admin/logs.html:26
+#: console/templates/console-spice-full.html:202
+#: instances/templates/allinstances_index_nongrouped.html:7
+msgid "Host"
+msgstr ""
+
 #: admin/templates/admin/logs.html:28
-#: instances/templates/instances/stats_tab.html:85
+#: instances/templates/instances/stats_tab.html:88
 msgid "Message"
 msgstr ""
 
 #: admin/templates/admin/user_form.html:21
 #: computes/templates/computes/form.html:23
-#: instances/templates/edit_instance_volume.html:124
+#: instances/templates/instances/edit_instance_volume.html:111
 #: networks/templates/add_network_qos.html:51 templates/common/form.html:22
 msgid "Save"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:26
+#: admin/templates/admin/user_list.html:23
 msgid "You don't have any user"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:34
+#: admin/templates/admin/user_list.html:31
 msgid "Username"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:35
-#: computes/templates/computes/instances.html:68
-#: computes/templates/computes/list.html:29
+#: admin/templates/admin/user_list.html:32
+#: computes/templates/computes/instances.html:65
+#: computes/templates/computes/list.html:28
 #: instances/templates/allinstances_index_grouped.html:9
 #: instances/templates/allinstances_index_nongrouped.html:9
 msgid "Status"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:36
+#: admin/templates/admin/user_list.html:33
 msgid "Staff"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:37
+#: admin/templates/admin/user_list.html:34
 msgid "Superuser"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:38
+#: admin/templates/admin/user_list.html:35
 msgid "Can Clone"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:51
-#: computes/templates/computes/instances.html:94
-#: instances/templates/allinstances_index_grouped.html:57
-#: instances/templates/allinstances_index_nongrouped.html:40
+#: admin/templates/admin/user_list.html:48
+#: computes/templates/computes/instances.html:91
+#: instances/templates/allinstances_index_grouped.html:59
+#: instances/templates/allinstances_index_nongrouped.html:41
 #: instances/templates/instance.html:19
 msgid "Active"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:53
+#: admin/templates/admin/user_list.html:50
 msgid "Blocked"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:61
+#: admin/templates/admin/user_list.html:58
 msgid "View Profile"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:64
+#: admin/templates/admin/user_list.html:61
 msgid "Block"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:66
+#: admin/templates/admin/user_list.html:63
 msgid "Unblock"
 msgstr ""
 
@@ -566,11 +499,10 @@ msgstr ""
 msgid "Update Group"
 msgstr ""
 
-#: admin/views.py:113
+#: admin/views.py:110
 msgid "Create User"
 msgstr ""
 
-<<<<<<< HEAD
 #: admin/views.py:129
 msgid "Update User"
 msgstr ""
@@ -581,17 +513,6 @@ msgid "Password changed for %(user)s"
 msgstr ""
 
 #: admin/views.py:144
-=======
-#: admin/views.py:136
-msgid "Update User"
-msgstr ""
-
-#: admin/views.py:149
-msgid "User password changed: {}"
-msgstr ""
-
-#: admin/views.py:152
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "Wrong Data Provided"
 msgstr ""
 
@@ -877,33 +798,18 @@ msgid "Other Settings"
 msgstr ""
 
 #: appsettings/views.py:38
-<<<<<<< HEAD
 #, python-format
 msgid "SASS directory path is changed. Now: %(dir)s"
 msgstr ""
 
-#: appsettings/views.py:67
+#: appsettings/views.py:70
 #, python-format
 msgid "Theme is changed. Now: %(theme)s"
 msgstr ""
 
-#: appsettings/views.py:82
+#: appsettings/views.py:85
 #, python-format
 msgid "%(setting)s is changed. Now: %(value)s"
-=======
-#, python-brace-format
-msgid "SASS directory path is changed. Now: {sass_dir.value}"
-msgstr ""
-
-#: appsettings/views.py:65
-#, python-brace-format
-msgid "Theme changed. Now: {theme}"
-msgstr ""
-
-#: appsettings/views.py:80
-#, python-brace-format
-msgid "{setting.name} is changed. Now: {setting.value}"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgstr ""
 
 #: computes/forms.py:21
@@ -934,144 +840,144 @@ msgstr ""
 msgid "Create Compute"
 msgstr ""
 
-#: computes/templates/computes/instances.html:29
-#: computes/templates/computes/list.html:49
-#: computes/templates/computes/list.html:51 computes/templates/overview.html:6
-#: computes/templates/overview.html:16 interfaces/templates/interface.html:13
-#: interfaces/templates/interfaces.html:17 networks/templates/network.html:14
+#: computes/templates/computes/instances.html:27
+#: computes/templates/computes/list.html:48
+#: computes/templates/computes/list.html:50 computes/templates/overview.html:6
+#: computes/templates/overview.html:15 interfaces/templates/interface.html:13
+#: interfaces/templates/interfaces.html:19 networks/templates/network.html:14
 #: networks/templates/networks.html:16 nwfilters/templates/nwfilter.html:14
-#: nwfilters/templates/nwfilters.html:22 secrets/templates/secrets.html:20
-#: storages/templates/storage.html:19 storages/templates/storages.html:16
+#: nwfilters/templates/nwfilters.html:20 storages/templates/storage.html:20
+#: storages/templates/storages.html:16 virtsecrets/templates/secrets.html:22
 msgid "Overview"
 msgstr ""
 
-#: computes/templates/computes/instances.html:35
-#: computes/templates/overview.html:22 interfaces/templates/interface.html:19
-#: interfaces/templates/interfaces.html:23 networks/templates/network.html:20
+#: computes/templates/computes/instances.html:33
+#: computes/templates/overview.html:21 interfaces/templates/interface.html:19
+#: interfaces/templates/interfaces.html:25 networks/templates/network.html:20
 #: networks/templates/networks.html:22 nwfilters/templates/nwfilter.html:20
-#: nwfilters/templates/nwfilters.html:28 secrets/templates/secrets.html:26
-#: storages/templates/storage.html:25 storages/templates/storages.html:4
-#: storages/templates/storages.html:6 storages/templates/storages.html:22
+#: nwfilters/templates/nwfilters.html:26 storages/templates/storage.html:26
+#: storages/templates/storages.html:4 storages/templates/storages.html:6
+#: storages/templates/storages.html:22 virtsecrets/templates/secrets.html:28
 msgid "Storages"
 msgstr ""
 
-#: computes/templates/computes/instances.html:38
-#: computes/templates/overview.html:25 interfaces/templates/interface.html:22
-#: interfaces/templates/interfaces.html:26 networks/templates/network.html:23
+#: computes/templates/computes/instances.html:36
+#: computes/templates/overview.html:24 interfaces/templates/interface.html:22
+#: interfaces/templates/interfaces.html:28 networks/templates/network.html:23
 #: networks/templates/networks.html:4 networks/templates/networks.html:6
 #: networks/templates/networks.html:25 nwfilters/templates/nwfilter.html:23
-#: nwfilters/templates/nwfilters.html:31 secrets/templates/secrets.html:29
-#: storages/templates/storage.html:28 storages/templates/storages.html:25
+#: nwfilters/templates/nwfilters.html:29 storages/templates/storage.html:29
+#: storages/templates/storages.html:25 virtsecrets/templates/secrets.html:31
 msgid "Networks"
 msgstr ""
 
-#: computes/templates/computes/instances.html:41
-#: computes/templates/overview.html:28 interfaces/templates/interface.html:25
+#: computes/templates/computes/instances.html:39
+#: computes/templates/overview.html:27 interfaces/templates/interface.html:25
 #: interfaces/templates/interfaces.html:5
 #: interfaces/templates/interfaces.html:7
-#: interfaces/templates/interfaces.html:29 networks/templates/network.html:26
+#: interfaces/templates/interfaces.html:31 networks/templates/network.html:26
 #: networks/templates/networks.html:28 nwfilters/templates/nwfilter.html:26
-#: nwfilters/templates/nwfilters.html:34 secrets/templates/secrets.html:32
-#: storages/templates/storage.html:31 storages/templates/storages.html:28
+#: nwfilters/templates/nwfilters.html:32 storages/templates/storage.html:32
+#: storages/templates/storages.html:28 virtsecrets/templates/secrets.html:34
 msgid "Interfaces"
 msgstr ""
 
-#: computes/templates/computes/instances.html:44
-#: computes/templates/overview.html:31 interfaces/templates/interface.html:28
-#: interfaces/templates/interfaces.html:32 networks/templates/network.html:29
+#: computes/templates/computes/instances.html:42
+#: computes/templates/overview.html:30 interfaces/templates/interface.html:28
+#: interfaces/templates/interfaces.html:34 networks/templates/network.html:29
 #: networks/templates/networks.html:31 nwfilters/templates/nwfilter.html:29
 #: nwfilters/templates/nwfilters.html:5 nwfilters/templates/nwfilters.html:7
-#: nwfilters/templates/nwfilters.html:37 secrets/templates/secrets.html:35
-#: storages/templates/storage.html:34 storages/templates/storages.html:31
+#: nwfilters/templates/nwfilters.html:35 storages/templates/storage.html:35
+#: storages/templates/storages.html:31 virtsecrets/templates/secrets.html:37
 msgid "NWFilters"
 msgstr ""
 
-#: computes/templates/computes/instances.html:47
-#: computes/templates/overview.html:34 interfaces/templates/interface.html:31
-#: interfaces/templates/interfaces.html:35 networks/templates/network.html:32
+#: computes/templates/computes/instances.html:45
+#: computes/templates/overview.html:33 interfaces/templates/interface.html:31
+#: interfaces/templates/interfaces.html:37 networks/templates/network.html:32
 #: networks/templates/networks.html:34 nwfilters/templates/nwfilter.html:32
-#: nwfilters/templates/nwfilters.html:40 secrets/templates/secrets.html:4
-#: secrets/templates/secrets.html:10 secrets/templates/secrets.html:38
-#: storages/templates/create_stg_block.html:124
-#: storages/templates/storage.html:37 storages/templates/storages.html:34
+#: nwfilters/templates/nwfilters.html:38
+#: storages/templates/create_stg_block.html:138
+#: storages/templates/storage.html:38 storages/templates/storages.html:34
+#: virtsecrets/templates/secrets.html:4 virtsecrets/templates/secrets.html:10
+#: virtsecrets/templates/secrets.html:40
 msgid "Secrets"
 msgstr ""
 
-#: computes/templates/computes/instances.html:58
+#: computes/templates/computes/instances.html:56
 msgid "Hypervisor doesn't have any Instances"
 msgstr ""
 
-#: computes/templates/computes/instances.html:66
-#: computes/templates/computes/list.html:28
-#: instances/templates/add_instance_volume.html:40
-#: instances/templates/add_instance_volume.html:42
+#: computes/templates/computes/instances.html:63
+#: computes/templates/computes/list.html:27
+#: instances/templates/add_instance_volume.html:44
+#: instances/templates/add_instance_volume.html:46
 #: instances/templates/allinstances_index_grouped.html:7
 #: instances/templates/allinstances_index_nongrouped.html:5
-#: instances/templates/create_instance_w2.html:77
-#: instances/templates/create_instance_w2.html:103
-#: instances/templates/create_instance_w2.html:106
-#: instances/templates/create_instance_w2.html:305
-#: instances/templates/create_instance_w2.html:307
+#: instances/templates/create_instance_w2.html:76
+#: instances/templates/create_instance_w2.html:102
+#: instances/templates/create_instance_w2.html:105
+#: instances/templates/create_instance_w2.html:304
+#: instances/templates/create_instance_w2.html:306
 #: instances/templates/create_instance_w2.html:518
 #: instances/templates/create_instance_w2.html:520
-#: instances/templates/instances/settings_tab.html:340
-#: instances/templates/instances/snapshots_tab.html:47
+#: instances/templates/instances/settings_tab.html:353
+#: instances/templates/instances/snapshots_tab.html:39
 #: interfaces/templates/create_iface_block.html:18
 #: interfaces/templates/interface.html:75
 #: networks/templates/create_net_block.html:18
 #: networks/templates/modify_ipv4_fixed_address.html:30
 #: networks/templates/modify_ipv6_fixed_address.html:30
 #: networks/templates/network.html:174 networks/templates/network.html:283
-#: nwfilters/templates/nwfilter.html:41 nwfilters/templates/nwfilters.html:56
-#: nwfilters/templates/nwfilters.html:100
-#: nwfilters/templates/nwfilters.html:102
-#: storages/templates/create_stg_block.html:42
-#: storages/templates/create_stg_block.html:71
-#: storages/templates/create_stg_block.html:100
-#: storages/templates/create_stg_block.html:165
-#: storages/templates/create_stg_block.html:214
+#: nwfilters/templates/nwfilter.html:41 nwfilters/templates/nwfilters.html:54
+#: nwfilters/templates/nwfilters.html:98 nwfilters/templates/nwfilters.html:100
+#: storages/templates/create_stg_block.html:56
+#: storages/templates/create_stg_block.html:85
+#: storages/templates/create_stg_block.html:114
+#: storages/templates/create_stg_block.html:179
+#: storages/templates/create_stg_block.html:228
 #: storages/templates/create_stg_vol_block.html:21
-#: storages/templates/storage.html:96 storages/templates/storage.html:124
-#: storages/templates/storage.html:126
+#: storages/templates/storage.html:97 storages/templates/storage.html:125
+#: storages/templates/storage.html:127
 msgid "Name"
 msgstr ""
 
-#: computes/templates/computes/instances.html:66
+#: computes/templates/computes/instances.html:63
 #: instances/templates/allinstances_index_grouped.html:7
 #: instances/templates/allinstances_index_nongrouped.html:5
-#: instances/templates/instances/settings_tab.html:782
-#: instances/templates/instances/settings_tab.html:805
+#: instances/templates/instances/settings_tab.html:811
+#: instances/templates/instances/settings_tab.html:834
 msgid "Description"
 msgstr ""
 
-#: computes/templates/computes/instances.html:69
+#: computes/templates/computes/instances.html:66
 #: instances/templates/allinstances_index_grouped.html:10
 #: instances/templates/allinstances_index_nongrouped.html:10
-#: instances/templates/create_instance_w2.html:78
-#: instances/templates/create_instance_w2.html:323
+#: instances/templates/create_instance_w2.html:77
+#: instances/templates/create_instance_w2.html:322
 #: instances/templates/create_instance_w2.html:536
-#: instances/templates/instance.html:42 instances/templates/instance.html:44
+#: instances/templates/instance.html:43 instances/templates/instance.html:45
 msgid "VCPU"
 msgstr ""
 
-#: computes/templates/computes/instances.html:70
-#: computes/templates/overview.html:82
+#: computes/templates/computes/instances.html:67
+#: computes/templates/overview.html:80
 #: instances/templates/allinstances_index_grouped.html:11
 #: instances/templates/allinstances_index_nongrouped.html:11
-#: instances/templates/instances/resize_tab.html:13
+#: instances/templates/instances/resize_tab.html:12
 msgid "Memory"
 msgstr ""
 
-#: computes/templates/computes/instances.html:96
-#: instances/templates/allinstances_index_grouped.html:58
-#: instances/templates/allinstances_index_nongrouped.html:42
+#: computes/templates/computes/instances.html:93
+#: instances/templates/allinstances_index_grouped.html:60
+#: instances/templates/allinstances_index_nongrouped.html:43
 #: instances/templates/instance.html:16
 msgid "Off"
 msgstr ""
 
-#: computes/templates/computes/instances.html:98
-#: instances/templates/allinstances_index_grouped.html:60
-#: instances/templates/allinstances_index_nongrouped.html:44
+#: computes/templates/computes/instances.html:95
+#: instances/templates/allinstances_index_grouped.html:62
+#: instances/templates/allinstances_index_nongrouped.html:45
 msgid "Suspended"
 msgstr ""
 
@@ -1080,23 +986,24 @@ msgstr ""
 msgid "Computes"
 msgstr ""
 
-#: computes/templates/computes/list.html:20
+#: computes/templates/computes/list.html:19
 msgid "You don't have any computes"
 msgstr ""
 
-#: computes/templates/computes/list.html:30 computes/templates/overview.html:92
-#: instances/templates/instances/settings_tab.html:163
-#: instances/templates/instances/settings_tab.html:248
+#: computes/templates/computes/list.html:29 computes/templates/overview.html:90
+#: instances/templates/instances/settings_tab.html:176
+#: instances/templates/instances/settings_tab.html:215
+#: instances/templates/instances/settings_tab.html:263
 msgid "Details"
 msgstr ""
 
-#: computes/templates/computes/list.html:41
+#: computes/templates/computes/list.html:40
 #: instances/templates/allinstances_index_grouped.html:28
-#: instances/templates/instances/settings_tab.html:881
+#: instances/templates/instances/settings_tab.html:906
 msgid "Connected"
 msgstr ""
 
-#: computes/templates/computes/list.html:41
+#: computes/templates/computes/list.html:40
 msgid "Not Connected"
 msgstr ""
 
@@ -1120,67 +1027,69 @@ msgstr ""
 msgid "Add new host"
 msgstr ""
 
-#: computes/templates/overview.html:42
+#: computes/templates/overview.html:40
 msgid "Basic details"
 msgstr ""
 
-#: computes/templates/overview.html:44
-#: storages/templates/create_stg_block.html:171
+#: computes/templates/overview.html:42
+#: instances/templates/instances/info_tab.html:5
+#: storages/templates/create_stg_block.html:185
 msgid "Hostname"
 msgstr ""
 
-#: computes/templates/overview.html:46
+#: computes/templates/overview.html:44
 msgid "Hypervisors"
 msgstr ""
 
-#: computes/templates/overview.html:63
+#: computes/templates/overview.html:61
 msgid "more"
 msgstr ""
 
-#: computes/templates/overview.html:73
+#: computes/templates/overview.html:71
 msgid "Emulator"
 msgstr ""
 
-#: computes/templates/overview.html:75
+#: computes/templates/overview.html:73
+#: instances/templates/instances/info_tab.html:11
 msgid "Version"
 msgstr ""
 
-#: computes/templates/overview.html:77
+#: computes/templates/overview.html:75
 msgid "Qemu"
 msgstr ""
 
-#: computes/templates/overview.html:79
+#: computes/templates/overview.html:77
 msgid "Libvirt"
 msgstr ""
 
-#: computes/templates/overview.html:84
+#: computes/templates/overview.html:82
 #: instances/templates/create_instance_w1.html:36
-#: instances/templates/create_instance_w1.html:52
+#: instances/templates/create_instance_w1.html:50
 msgid "Architecture"
 msgstr ""
 
-#: computes/templates/overview.html:86
+#: computes/templates/overview.html:84
 msgid "Logical CPUs"
 msgstr ""
 
-#: computes/templates/overview.html:88
+#: computes/templates/overview.html:86
 msgid "Processor"
 msgstr ""
 
-#: computes/templates/overview.html:90
+#: computes/templates/overview.html:88
 msgid "Connection"
 msgstr ""
 
-#: computes/templates/overview.html:96
-#: instances/templates/edit_instance_volume.html:22
+#: computes/templates/overview.html:94
+#: instances/templates/instances/edit_instance_volume.html:25
 msgid "Performance"
 msgstr ""
 
-#: computes/templates/overview.html:102
+#: computes/templates/overview.html:100
 msgid "CPU Utilization"
 msgstr ""
 
-#: computes/templates/overview.html:111
+#: computes/templates/overview.html:109
 msgid "RAM Utilization"
 msgstr ""
 
@@ -1221,11 +1130,6 @@ msgstr ""
 msgid "File API is not supported"
 msgstr ""
 
-#: console/templates/console-spice-full.html:202
-#: instances/templates/allinstances_index_nongrouped.html:7
-msgid "Host"
-msgstr ""
-
 #: console/templates/console-spice-full.html:204
 msgid "Port"
 msgstr ""
@@ -1238,7 +1142,7 @@ msgstr ""
 #: interfaces/templates/interface.html:59 networks/templates/network.html:49
 #: networks/templates/network.html:119 networks/templates/network.html:125
 #: networks/templates/network.html:231 networks/templates/network.html:237
-#: storages/templates/storage.html:60
+#: storages/templates/storage.html:62
 msgid "Start"
 msgstr ""
 
@@ -1254,6 +1158,20 @@ msgstr ""
 msgid "Loading"
 msgstr ""
 
+#: console/views.py:52
+msgid ""
+"User does not have permission to access console or host/instance not exist"
+msgstr ""
+
+#: console/views.py:84
+msgid "Fail to get console. Please check the console configuration of your VM."
+msgstr ""
+
+#: console/views.py:86
+#, python-format
+msgid "Console type '%(type)s' has not support"
+msgstr ""
+
 #: instances/forms.py:37
 msgid "No Virtual Machine name has been entered"
 msgstr ""
@@ -1314,7 +1232,7 @@ msgstr ""
 msgid "created"
 msgstr ""
 
-#: instances/models.py:220
+#: instances/models.py:216
 msgid "Can access console without password"
 msgstr ""
 
@@ -1323,87 +1241,86 @@ msgid "Add Instance Network"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:18
-#: instances/templates/create_instance_w2.html:205
-#: instances/templates/instances/settings_tab.html:359
-#: instances/templates/instances/settings_tab.html:382
-#: instances/templates/instances/settings_tab.html:487
+#: instances/templates/create_instance_w2.html:182
+#: instances/templates/instances/settings_tab.html:373
+#: instances/templates/instances/settings_tab.html:409
+#: instances/templates/instances/settings_tab.html:521
 #: interfaces/templates/interface.html:45
 #: interfaces/templates/interface.html:74
-#: interfaces/templates/interfaces.html:63
+#: interfaces/templates/interfaces.html:64
 #: networks/templates/modify_ipv4_fixed_address.html:24
 #: networks/templates/network.html:172
 msgid "MAC"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:24
-#: instances/templates/create_instance_w2.html:164
-#: instances/templates/create_instance_w2.html:388
-#: instances/templates/create_instance_w2.html:605
-#: instances/templates/instances/settings_tab.html:30
-#: instances/templates/instances/settings_tab.html:394
+#: instances/templates/create_instance_w2.html:163
+#: instances/templates/create_instance_w2.html:387
+#: instances/templates/instances/settings_tab.html:36
+#: instances/templates/instances/settings_tab.html:421
 #: networks/templates/network.html:5 networks/templates/network.html:7
 #: networks/templates/network.html:107 networks/templates/network.html:218
 msgid "Network"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:37
-#: instances/templates/create_instance_w2.html:183
+#: instances/templates/create_instance_w2.html:188
 #: instances/templates/create_instance_w2.html:429
-#: instances/templates/create_instance_w2.html:642
-#: instances/templates/instances/settings_tab.html:403
+#: instances/templates/create_instance_w2.html:645
+#: instances/templates/instances/settings_tab.html:430
 #: nwfilters/templates/nwfilter.html:5 nwfilters/templates/nwfilter.html:7
 msgid "NWFilter"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:40
-#: instances/templates/add_instance_volume.html:117
+#: instances/templates/add_instance_volume.html:121
 #: instances/templates/create_inst_block.html:25
-#: instances/templates/create_instance_w2.html:158
-#: instances/templates/create_instance_w2.html:186
-#: instances/templates/create_instance_w2.html:377
+#: instances/templates/create_instance_w2.html:157
+#: instances/templates/create_instance_w2.html:191
+#: instances/templates/create_instance_w2.html:376
 #: instances/templates/create_instance_w2.html:432
 #: instances/templates/create_instance_w2.html:580
 #: instances/templates/create_instance_w2.html:599
-#: instances/templates/create_instance_w2.html:645
-#: instances/templates/instances/access_tab.html:135
-#: instances/templates/instances/settings_tab.html:183
-#: instances/templates/instances/settings_tab.html:407
-#: instances/templates/instances/stats_tab.html:90
+#: instances/templates/create_instance_w2.html:648
+#: instances/templates/instances/access_tab.html:123
+#: instances/templates/instances/settings_tab.html:191
+#: instances/templates/instances/settings_tab.html:434
+#: instances/templates/instances/stats_tab.html:93
 #: interfaces/templates/interface.html:41
-#: interfaces/templates/interface.html:43 nwfilters/templates/nwfilter.html:78
-#: storages/templates/create_stg_block.html:132
-#: storages/templates/storage.html:47 storages/templates/storage.html:49
-#: storages/templates/storage.html:51
+#: interfaces/templates/interface.html:43 nwfilters/templates/nwfilter.html:73
+#: storages/templates/create_stg_block.html:146
+#: storages/templates/storage.html:49 storages/templates/storage.html:51
+#: storages/templates/storage.html:53
 msgid "None"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:49
 #: instances/templates/add_instance_owner_block.html:30
-#: instances/templates/add_instance_volume.html:89
-#: instances/templates/add_instance_volume.html:144
+#: instances/templates/add_instance_volume.html:93
+#: instances/templates/add_instance_volume.html:148
 #: instances/templates/create_flav_block.html:25
 #: instances/templates/create_inst_block.html:34
-#: instances/templates/create_instance_w2.html:269
-#: instances/templates/edit_instance_volume.html:123
-#: instances/templates/instances/settings_tab.html:428
-#: interfaces/templates/create_iface_block.html:135
+#: instances/templates/create_instance_w2.html:268
+#: instances/templates/instances/edit_instance_volume.html:110
+#: instances/templates/instances/settings_tab.html:455
+#: interfaces/templates/create_iface_block.html:139
 #: networks/templates/add_network_qos.html:50
 #: networks/templates/create_net_block.html:85
 #: networks/templates/modify_ipv4_fixed_address.html:44
 #: networks/templates/modify_ipv6_fixed_address.html:44
 #: nwfilters/templates/add_nwf_rule.html:25
-#: nwfilters/templates/create_nwfilter_block.html:23
-#: nwfilters/templates/nwfilters.html:80 nwfilters/templates/nwfilters.html:108
-#: secrets/templates/create_secret_block.html:54
-#: secrets/templates/secrets.html:102
-#: storages/templates/create_stg_block.html:55
-#: storages/templates/create_stg_block.html:84
-#: storages/templates/create_stg_block.html:140
-#: storages/templates/create_stg_block.html:202
-#: storages/templates/create_stg_block.html:230
+#: nwfilters/templates/create_nwfilter_block.html:25
+#: nwfilters/templates/nwfilters.html:78 nwfilters/templates/nwfilters.html:106
+#: storages/templates/create_stg_block.html:69
+#: storages/templates/create_stg_block.html:98
+#: storages/templates/create_stg_block.html:154
+#: storages/templates/create_stg_block.html:216
+#: storages/templates/create_stg_block.html:244
 #: storages/templates/create_stg_vol_block.html:28
 #: storages/templates/create_stg_vol_block.html:56
-#: storages/templates/storage.html:154
+#: storages/templates/storage.html:155
+#: virtsecrets/templates/create_secret_block.html:54
+#: virtsecrets/templates/secrets.html:103
 msgid "Close"
 msgstr ""
 
@@ -1412,8 +1329,8 @@ msgid "Add Instance Owner"
 msgstr ""
 
 #: instances/templates/add_instance_volume.html:3
-#: instances/templates/add_instance_volume.html:90
-#: instances/templates/add_instance_volume.html:145
+#: instances/templates/add_instance_volume.html:94
+#: instances/templates/add_instance_volume.html:149
 msgid "Add Volume"
 msgstr ""
 
@@ -1421,72 +1338,73 @@ msgstr ""
 msgid "Add Instance Volume"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:18
+#: instances/templates/add_instance_volume.html:19
 msgid "New Disk"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:21
+#: instances/templates/add_instance_volume.html:24
 msgid "Existing Disk"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:28
-#: instances/templates/add_instance_volume.html:98
+#: instances/templates/add_instance_volume.html:32
+#: instances/templates/add_instance_volume.html:102
 msgid "Volume parameters"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:30
-#: instances/templates/add_instance_volume.html:100
-#: instances/templates/create_instance_w2.html:149
+#: instances/templates/add_instance_volume.html:34
+#: instances/templates/add_instance_volume.html:104
+#: instances/templates/create_instance_w2.html:148
 #: instances/templates/create_instance_w2.html:591
-#: instances/templates/instances/settings_tab.html:237
+#: instances/templates/instances/settings_tab.html:252
 #: storages/templates/storage.html:4 storages/templates/storage.html:9
 msgid "Storage"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:46
-#: storages/templates/create_stg_block.html:183
-#: storages/templates/storage.html:99 storages/templates/storage.html:137
+#: instances/templates/add_instance_volume.html:50
+#: storages/templates/create_stg_block.html:197
+#: storages/templates/storage.html:100 storages/templates/storage.html:138
 msgid "Format"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:56
-#: storages/templates/storage.html:52 storages/templates/storage.html:98
-#: storages/templates/storages.html:62
+#: instances/templates/add_instance_volume.html:60
+#: storages/templates/storage.html:54 storages/templates/storage.html:99
+#: storages/templates/storages.html:61
 msgid "Size"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:60
-#: instances/templates/create_instance_w2.html:91
+#: instances/templates/add_instance_volume.html:64
+#: instances/templates/create_instance_w2.html:90
 msgid "GB"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:63
-#: instances/templates/add_instance_volume.html:123
-#: instances/templates/edit_instance_volume.html:53
-#: instances/templates/instances/settings_tab.html:168
+#: instances/templates/add_instance_volume.html:67
+#: instances/templates/add_instance_volume.html:127
+#: instances/templates/instances/edit_instance_volume.html:89
+#: instances/templates/instances/settings_tab.html:181
+#: instances/templates/instances/settings_tab.html:220
 msgid "Bus"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:73
-#: instances/templates/add_instance_volume.html:133
+#: instances/templates/add_instance_volume.html:77
+#: instances/templates/add_instance_volume.html:137
 msgid "Cache"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:83
-#: instances/templates/instances/settings_tab.html:760
-#: storages/templates/storage.html:147
+#: instances/templates/add_instance_volume.html:87
+#: instances/templates/instances/settings_tab.html:789
+#: storages/templates/storage.html:148
 msgid "Metadata"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:103
+#: instances/templates/add_instance_volume.html:107
 msgid "Select Pool"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:114
+#: instances/templates/add_instance_volume.html:118
 msgid "Volume"
 msgstr ""
 
-#: instances/templates/allinstances.html:24
+#: instances/templates/allinstances.html:22
 msgid "Problem occurred with host"
 msgstr ""
 
@@ -1535,39 +1453,39 @@ msgid "New instance on %(host)s "
 msgstr ""
 
 #: instances/templates/create_instance_w1.html:41
-#: instances/templates/instances/settings_tab.html:49
+#: instances/templates/instances/settings_tab.html:55
 #: networks/templates/network.html:72 nwfilters/templates/nwfilter.html:49
 msgid "XML"
 msgstr ""
 
-#: instances/templates/create_instance_w1.html:62
+#: instances/templates/create_instance_w1.html:60
 msgid "Chipset"
 msgstr ""
 
-#: instances/templates/create_instance_w1.html:72
+#: instances/templates/create_instance_w1.html:70
 msgid "Next"
 msgstr ""
 
-#: instances/templates/create_instance_w1.html:89
-#: instances/templates/create_instance_w2.html:271
-#: instances/templates/create_instance_w2.html:273
+#: instances/templates/create_instance_w1.html:85
+#: instances/templates/create_instance_w2.html:270
+#: instances/templates/create_instance_w2.html:272
 #: instances/templates/create_instance_w2.html:500
 #: instances/templates/create_instance_w2.html:504
-#: instances/templates/create_instance_w2.html:713
-#: instances/templates/create_instance_w2.html:717
-#: interfaces/templates/create_iface_block.html:138
+#: instances/templates/create_instance_w2.html:716
+#: instances/templates/create_instance_w2.html:720
+#: interfaces/templates/create_iface_block.html:142
 #: networks/templates/create_net_block.html:86
 #: networks/templates/modify_ipv4_fixed_address.html:45
 #: networks/templates/modify_ipv6_fixed_address.html:45
-#: nwfilters/templates/create_nwfilter_block.html:24
-#: secrets/templates/create_secret_block.html:55
-#: storages/templates/create_stg_block.html:56
-#: storages/templates/create_stg_block.html:85
-#: storages/templates/create_stg_block.html:144
-#: storages/templates/create_stg_block.html:148
-#: storages/templates/create_stg_block.html:205
-#: storages/templates/create_stg_block.html:233
+#: nwfilters/templates/create_nwfilter_block.html:26
+#: storages/templates/create_stg_block.html:70
+#: storages/templates/create_stg_block.html:99
+#: storages/templates/create_stg_block.html:158
+#: storages/templates/create_stg_block.html:162
+#: storages/templates/create_stg_block.html:219
+#: storages/templates/create_stg_block.html:247
 #: storages/templates/create_stg_vol_block.html:57
+#: virtsecrets/templates/create_secret_block.html:55
 msgid "Create"
 msgstr ""
 
@@ -1583,113 +1501,113 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:66
-msgid "Hypervisor doesn't have any Flavors"
-msgstr ""
-
-#: instances/templates/create_instance_w2.html:71
+#: instances/templates/create_instance_w2.html:63
 msgid "Create from flavor"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:79
-#: instances/templates/create_instance_w2.html:352
+#: instances/templates/create_instance_w2.html:67
+msgid "Hypervisor doesn't have any Flavors"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:78
+#: instances/templates/create_instance_w2.html:351
 #: instances/templates/create_instance_w2.html:563
-#: instances/templates/instance.html:47
+#: instances/templates/instance.html:48
 msgid "RAM"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:80
-#: instances/templates/create_instance_w2.html:367
+#: instances/templates/create_instance_w2.html:79
+#: instances/templates/create_instance_w2.html:366
 msgid "HDD"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:90
-#: instances/templates/create_instance_w2.html:356
+#: instances/templates/create_instance_w2.html:89
+#: instances/templates/create_instance_w2.html:355
 #: instances/templates/create_instance_w2.html:567
-#: instances/templates/instance.html:47
+#: instances/templates/instance.html:48
 #: instances/templates/instances/resize_tab.html:95
-#: instances/templates/instances/resize_tab.html:108
+#: instances/templates/instances/resize_tab.html:109
 msgid "MB"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:97
+#: instances/templates/create_instance_w2.html:96
 msgid "Create Virtual Machine"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:115
-#: instances/templates/create_instance_w2.html:312
+#: instances/templates/create_instance_w2.html:114
+#: instances/templates/create_instance_w2.html:311
 #: instances/templates/create_instance_w2.html:525
 msgid "Firmware"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:127
-#: instances/templates/create_instance_w2.html:330
+#: instances/templates/create_instance_w2.html:126
+#: instances/templates/create_instance_w2.html:329
 #: instances/templates/create_instance_w2.html:542
 msgid "VCPU Config"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:130
-#: instances/templates/create_instance_w2.html:333
+#: instances/templates/create_instance_w2.html:129
+#: instances/templates/create_instance_w2.html:332
 #: instances/templates/create_instance_w2.html:545
 msgid "no-mode"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:174
+#: instances/templates/create_instance_w2.html:173
 #: instances/templates/create_instance_w2.html:402
-#: instances/templates/create_instance_w2.html:615
-#: instances/templates/edit_instance_volume.html:25
+#: instances/templates/create_instance_w2.html:618
+#: instances/templates/instances/edit_instance_volume.html:30
 msgid "Advanced"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:194
-#: instances/templates/create_instance_w2.html:631
+#: instances/templates/create_instance_w2.html:199
+#: instances/templates/create_instance_w2.html:634
 msgid "HDD cache mode"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:212
+#: instances/templates/create_instance_w2.html:211
 #: instances/templates/create_instance_w2.html:441
-#: instances/templates/create_instance_w2.html:654
+#: instances/templates/create_instance_w2.html:657
 msgid "Graphics"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:223
+#: instances/templates/create_instance_w2.html:222
 #: instances/templates/create_instance_w2.html:452
-#: instances/templates/create_instance_w2.html:665
+#: instances/templates/create_instance_w2.html:668
 msgid "Video"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:237
+#: instances/templates/create_instance_w2.html:236
 #: instances/templates/create_instance_w2.html:466
-#: instances/templates/create_instance_w2.html:679
+#: instances/templates/create_instance_w2.html:682
 msgid "Console Access"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:247
-#: instances/templates/create_instance_w2.html:249
+#: instances/templates/create_instance_w2.html:246
+#: instances/templates/create_instance_w2.html:248
 #: instances/templates/create_instance_w2.html:476
 #: instances/templates/create_instance_w2.html:478
-#: instances/templates/create_instance_w2.html:689
-#: instances/templates/create_instance_w2.html:691
+#: instances/templates/create_instance_w2.html:692
+#: instances/templates/create_instance_w2.html:694
 msgid "Console Password"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:253
+#: instances/templates/create_instance_w2.html:252
 #: instances/templates/create_instance_w2.html:482
-#: instances/templates/create_instance_w2.html:695
+#: instances/templates/create_instance_w2.html:698
 msgid "Guest Agent"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:260
+#: instances/templates/create_instance_w2.html:259
 #: instances/templates/create_instance_w2.html:489
-#: instances/templates/create_instance_w2.html:702
+#: instances/templates/create_instance_w2.html:705
 msgid "VirtIO"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:287
-#: instances/templates/instances/settings_tab.html:439
-#: instances/templates/instances/settings_tab.html:515
-#: instances/templates/instances/settings_tab.html:525
-#: instances/templates/instances/snapshots_tab.html:75
+#: instances/templates/create_instance_w2.html:286
+#: instances/templates/instances/settings_tab.html:473
+#: instances/templates/instances/settings_tab.html:549
+#: instances/templates/instances/settings_tab.html:559
+#: instances/templates/instances/snapshots_tab.html:67
 #: interfaces/templates/interface.html:60
 #: interfaces/templates/interface.html:62 networks/templates/network.html:50
 #: networks/templates/network.html:52 networks/templates/network.html:62
@@ -1697,35 +1615,35 @@ msgstr ""
 #: networks/templates/network.html:194 networks/templates/network.html:249
 #: networks/templates/network.html:298 networks/templates/network.html:303
 #: networks/templates/network.html:353 networks/templates/network.html:358
-#: nwfilters/templates/nwfilter.html:111 nwfilters/templates/nwfilter.html:151
-#: nwfilters/templates/nwfilters.html:120 secrets/templates/secrets.html:77
-#: storages/templates/storage.html:62 storages/templates/storage.html:65
-#: storages/templates/storage.html:77 storages/templates/storage.html:174
+#: nwfilters/templates/nwfilter.html:103 nwfilters/templates/nwfilter.html:143
+#: nwfilters/templates/nwfilters.html:118 storages/templates/storage.html:64
+#: storages/templates/storage.html:67 storages/templates/storage.html:79
+#: storages/templates/storage.html:175 virtsecrets/templates/secrets.html:78
 msgid "Are you sure?"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:359
+#: instances/templates/create_instance_w2.html:358
 msgid "Added Disks"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:372
+#: instances/templates/create_instance_w2.html:371
 #: instances/templates/create_instance_w2.html:575
 msgid "Select pool"
 msgstr ""
 
 #: instances/templates/create_instance_w2.html:411
-#: instances/templates/create_instance_w2.html:624
+#: instances/templates/create_instance_w2.html:627
 msgid "Disk Metadata"
 msgstr ""
 
 #: instances/templates/create_instance_w2.html:413
-#: instances/templates/create_instance_w2.html:626
+#: instances/templates/create_instance_w2.html:629
 msgid "Metadata preallocation"
 msgstr ""
 
 #: instances/templates/create_instance_w2.html:415
-#: instances/templates/create_instance_w2.html:628
-#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:360
+#: instances/templates/create_instance_w2.html:631
+#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:375
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/files.py:391
 msgid "Image"
 msgstr ""
@@ -1738,64 +1656,16 @@ msgstr ""
 msgid "Template Disk"
 msgstr ""
 
-#: instances/templates/edit_instance_volume.html:3
-msgid "Edit Volume"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:12
-msgid "Edit Instance Volume"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:19
-msgid "Virtual Disk"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:32
-msgid "Volume Path"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:38
-msgid "Readonly"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:44
-msgid "Shareable"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:63
-msgid "Serial Number"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:69
-msgid "Storage Format"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:78
-msgid "Cache mode"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:88
-msgid "IO mode"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:98
-msgid "Discard mode"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:108
-msgid "Detect zeroes"
+#: instances/templates/create_instance_w2.html:605
+msgid "Network/MAC"
 msgstr ""
 
 #: instances/templates/instance.html:22
 #: instances/templates/instance_actions.html:14
 #: instances/templates/instance_actions.html:25
 #: instances/templates/instance_actions.html:37
-#: instances/templates/instances/power_tab.html:25
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:82 instances/views.py:270
-=======
-#: instances/templates/instances/power_tab.html:82 instances/views.py:264
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:24
+#: instances/templates/instances/power_tab.html:81 instances/views.py:277
 msgid "Suspend"
 msgstr ""
 
@@ -1811,92 +1681,80 @@ msgstr ""
 msgid "Guest Agent Not Enabled & Not Connected"
 msgstr ""
 
-#: instances/templates/instance.html:50
-#: instances/templates/instances/resize_tab.html:18
-#: instances/templates/instances/settings_tab.html:16
+#: instances/templates/instance.html:51
+#: instances/templates/instances/resize_tab.html:17
+#: instances/templates/instances/settings_tab.html:22
 msgid "Disk"
 msgstr ""
 
-#: instances/templates/instance.html:57
+#: instances/templates/instance.html:59
+msgid "Show Instance OS details"
+msgstr ""
+
+#: instances/templates/instance.html:63
 msgid "Refresh instance info"
 msgstr ""
 
-#: instances/templates/instance.html:61
+#: instances/templates/instance.html:69
 msgid "quota reached"
 msgstr ""
 
-#: instances/templates/instance.html:75
+#: instances/templates/instance.html:81
 msgid "Power"
 msgstr ""
 
-#: instances/templates/instance.html:81
+#: instances/templates/instance.html:87
 msgid "Access"
 msgstr ""
 
-#: instances/templates/instance.html:94
+#: instances/templates/instance.html:100
 msgid "Snapshot"
 msgstr ""
 
-#: instances/templates/instance.html:101 templates/navbar.html:32
+#: instances/templates/instance.html:107 templates/navbar.html:32
 msgid "Settings"
 msgstr ""
 
-#: instances/templates/instance.html:107
+#: instances/templates/instance.html:113
 msgid "Stats"
 msgstr ""
 
-#: instances/templates/instance.html:113
-#: instances/templates/instances/destroy_instance_form.html:40
-#: instances/templates/instances/destroy_tab.html:18
-#: instances/templates/instances/destroy_tab.html:20
-<<<<<<< HEAD
-#: instances/templates/instances/destroy_tab.html:23 instances/views.py:312
-=======
-#: instances/templates/instances/destroy_tab.html:23 instances/views.py:306
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instance.html:119
+#: instances/templates/instances/destroy_instance_form.html:35
+#: instances/templates/instances/destroy_tab.html:17
+#: instances/templates/instances/destroy_tab.html:19
+#: instances/templates/instances/destroy_tab.html:22 instances/views.py:319
 msgid "Destroy"
 msgstr ""
 
 #: instances/templates/instance_actions.html:6
-#: instances/templates/instances/settings_tab.html:37
-#: instances/templates/instances/settings_tab.html:788
-#: instances/templates/instances/settings_tab.html:790
-#: nwfilters/templates/nwfilters.html:109
-#: nwfilters/templates/nwfilters.html:115 storages/templates/storage.html:155
-#: storages/templates/storage.html:162
+#: instances/templates/instances/settings_tab.html:43
+#: instances/templates/instances/settings_tab.html:817
+#: instances/templates/instances/settings_tab.html:819
+#: nwfilters/templates/nwfilters.html:107
+#: nwfilters/templates/nwfilters.html:113 storages/templates/storage.html:156
+#: storages/templates/storage.html:163
 msgid "Clone"
 msgstr ""
 
 #: instances/templates/instance_actions.html:10
 #: instances/templates/instance_actions.html:35
-#: instances/templates/instances/power_tab.html:47
-#: instances/templates/instances/power_tab.html:121
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:123 instances/views.py:245
-=======
-#: instances/templates/instances/power_tab.html:123 instances/views.py:239
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:46
+#: instances/templates/instances/power_tab.html:120
+#: instances/templates/instances/power_tab.html:122 instances/views.py:252
 msgid "Power On"
 msgstr ""
 
 #: instances/templates/instance_actions.html:15
-#: instances/templates/instances/power_tab.html:9
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:59 instances/views.py:261
-=======
-#: instances/templates/instances/power_tab.html:59 instances/views.py:255
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:8
+#: instances/templates/instances/power_tab.html:58 instances/views.py:268
 msgid "Power Off"
 msgstr ""
 
 #: instances/templates/instance_actions.html:16
 #: instances/templates/instance_actions.html:29
-#: instances/templates/instances/power_tab.html:14
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:66 instances/views.py:254
-=======
-#: instances/templates/instances/power_tab.html:66 instances/views.py:248
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:13
+#: instances/templates/instances/power_tab.html:65 instances/views.py:261
 msgid "Power Cycle"
 msgstr ""
 
@@ -1906,120 +1764,112 @@ msgid "VNC Console"
 msgstr ""
 
 #: instances/templates/instance_actions.html:22
-#: instances/templates/instances/power_tab.html:34
-#: instances/templates/instances/power_tab.html:93
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:108 instances/views.py:278
-=======
-#: instances/templates/instances/power_tab.html:108 instances/views.py:272
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:33
+#: instances/templates/instances/power_tab.html:92
+#: instances/templates/instances/power_tab.html:107 instances/views.py:285
 msgid "Resume"
 msgstr ""
 
 #: instances/templates/instance_actions.html:26
-#: instances/templates/instances/power_tab.html:19
-#: instances/templates/instances/power_tab.html:39
-#: instances/templates/instances/power_tab.html:74
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:100 instances/views.py:285
-=======
-#: instances/templates/instances/power_tab.html:100 instances/views.py:279
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:18
+#: instances/templates/instances/power_tab.html:38
+#: instances/templates/instances/power_tab.html:73
+#: instances/templates/instances/power_tab.html:99 instances/views.py:292
 msgid "Force Off"
 msgstr ""
 
 #: instances/templates/instance_actions.html:41
-#: instances/templates/instances/access_tab.html:9
-#: instances/templates/instances/access_tab.html:79
-#: instances/templates/instances/access_tab.html:87
-#: instances/templates/instances/access_tab.html:90
-#: instances/templates/instances/access_tab.html:94
-#: instances/templates/instances/settings_tab.html:23
+#: instances/templates/instances/access_tab.html:7
+#: instances/templates/instances/access_tab.html:67
+#: instances/templates/instances/access_tab.html:75
+#: instances/templates/instances/access_tab.html:78
+#: instances/templates/instances/access_tab.html:82
+#: instances/templates/instances/settings_tab.html:29
 msgid "Console"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:16
+#: instances/templates/instances/access_tab.html:13
 msgid "Root Password"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:31
-#: instances/templates/instances/access_tab.html:156
+#: instances/templates/instances/access_tab.html:27
+#: instances/templates/instances/access_tab.html:143
 msgid "VDI"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:39
+#: instances/templates/instances/access_tab.html:35
 #, python-format
 msgid ""
 " This action opens a new window with a %(type)s connection to the console of "
 "the instance."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:47
+#: instances/templates/instances/access_tab.html:42
 msgid "Scale"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:55
+#: instances/templates/instances/access_tab.html:48
 msgid "View Only"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:63
+#: instances/templates/instances/access_tab.html:54
 msgid "Resize Session"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:71
+#: instances/templates/instances/access_tab.html:60
 msgid "View Clipboard"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:82
+#: instances/templates/instances/access_tab.html:70
 msgid "Toggle Dropdown"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:86
-#: instances/templates/instances/access_tab.html:89
+#: instances/templates/instances/access_tab.html:74
+#: instances/templates/instances/access_tab.html:77
 msgid "Console port"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:87
+#: instances/templates/instances/access_tab.html:75
 msgid "Lite"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:90
+#: instances/templates/instances/access_tab.html:78
 msgid "Full"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:100
+#: instances/templates/instances/access_tab.html:88
 msgid "You need shut down your instance and enter a new root password."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:107
+#: instances/templates/instances/access_tab.html:95
 msgid "Enter Password"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:112
-#: instances/templates/instances/access_tab.html:115
+#: instances/templates/instances/access_tab.html:100
+#: instances/templates/instances/access_tab.html:103
 msgid "Reset Root Password"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:123
+#: instances/templates/instances/access_tab.html:111
 msgid "You need shut down your instance and choose your public key."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:142
-#: instances/templates/instances/access_tab.html:144
+#: instances/templates/instances/access_tab.html:130
+#: instances/templates/instances/access_tab.html:132
 msgid "Add Public Key"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:152
+#: instances/templates/instances/access_tab.html:140
 msgid ""
 "This action opens a remote viewer with a connection to the console of the "
 "instance."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:159
+#: instances/templates/instances/access_tab.html:145
 msgid "To download console.vv file for virt-viewer."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:160
+#: instances/templates/instances/access_tab.html:146
 msgid "Get console.vv"
 msgstr ""
 
@@ -2039,114 +1889,190 @@ msgstr ""
 msgid "This action is irreversible!"
 msgstr ""
 
-#: instances/templates/instances/destroy_instance_form.html:26
+#: instances/templates/instances/destroy_instance_form.html:24
 msgid "Remove Instance's data"
 msgstr ""
 
-#: instances/templates/instances/destroy_instance_form.html:34
+#: instances/templates/instances/destroy_instance_form.html:30
 msgid "Remove Instance's NVRAM"
 msgstr ""
 
-#: instances/templates/instances/destroy_instance_form.html:46
+#: instances/templates/instances/destroy_instance_form.html:41
 msgid "You cannot destroy instance!"
 msgstr ""
 
-#: instances/templates/instances/destroy_tab.html:8
+#: instances/templates/instances/destroy_tab.html:7
 msgid "Destroy Instance"
 msgstr ""
 
-#: instances/templates/instances/destroy_tab.html:15
+#: instances/templates/instances/destroy_tab.html:14
 msgid "This action starts remove instance process"
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:56
+#: instances/templates/instances/edit_instance_volume.html:3
+msgid "Edit Volume"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:12
+msgid "Edit Instance Volume"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:20
+msgid "Virtual Disk"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:38
+msgid "Volume Path"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:42
+msgid "Readonly"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:46
+msgid "Shareable"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:53
+msgid "Cache mode"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:61
+msgid "IO mode"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:69
+msgid "Discard mode"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:77
+msgid "Detect zeroes"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:97
+msgid "Serial Number"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:101
+msgid "Storage Format"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:111
+msgid "Are you sure to change volume properties?"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:3
+msgid "Guest Info"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:7
+msgid "OS Name"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:9
+msgid "OS Pretty-Name"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:13
+msgid "Kernel Release"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:15
+msgid "Kernel Version"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:17
+msgid "Timezone / Offset"
+msgstr ""
+
+#: instances/templates/instances/power_tab.html:55
 msgid "This action sends an ACPI shutdown signal to the instance."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:64
+#: instances/templates/instances/power_tab.html:63
 msgid ""
 "This action forcibly powers off and start the instance and may cause data "
 "corruption."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:71
-#: instances/templates/instances/power_tab.html:98
+#: instances/templates/instances/power_tab.html:70
+#: instances/templates/instances/power_tab.html:97
 msgid ""
 "This action forcibly powers off the instance and may cause data corruption."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:80
+#: instances/templates/instances/power_tab.html:79
 msgid "This action suspends the instance."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:91
+#: instances/templates/instances/power_tab.html:90
 msgid "This action restore the instance after suspend."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:106
+#: instances/templates/instances/power_tab.html:105
 msgid "Administrator blocked your instance."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:116
+#: instances/templates/instances/power_tab.html:115
 msgid "Click on Power On button to start this instance."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:120
+#: instances/templates/instances/power_tab.html:119
 msgid "Template instance cannot be started."
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:8
+#: instances/templates/instances/resize_tab.html:7
 msgid "CPU"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:29
+#: instances/templates/instances/resize_tab.html:28
 msgid "Logical host CPUs"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:31
+#: instances/templates/instances/resize_tab.html:30
 #: instances/templates/instances/resize_tab.html:95
 #: instances/templates/instances/resize_tab.html:136
 msgid "Current Allocation"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:45
-#: instances/templates/instances/resize_tab.html:108
+#: instances/templates/instances/resize_tab.html:44
+#: instances/templates/instances/resize_tab.html:109
 msgid "Maximum Allocation"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:63
+#: instances/templates/instances/resize_tab.html:62
 msgid "Logical Instance Active/Maximum CPUs"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:71
-#: instances/templates/instances/settings_tab.html:79
-#: instances/templates/instances/settings_tab.html:95
-#: networks/templates/network.html:62 storages/templates/storage.html:77
+#: instances/templates/instances/resize_tab.html:70
+#: instances/templates/instances/settings_tab.html:86
+#: instances/templates/instances/settings_tab.html:102
+#: networks/templates/network.html:62 storages/templates/storage.html:79
 msgid "Disable"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:73
+#: instances/templates/instances/resize_tab.html:72
 msgid "Constant"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:75
-#: instances/templates/instances/settings_tab.html:77
-#: instances/templates/instances/settings_tab.html:91
-#: networks/templates/network.html:60 storages/templates/storage.html:74
+#: instances/templates/instances/resize_tab.html:74
+#: instances/templates/instances/settings_tab.html:84
+#: instances/templates/instances/settings_tab.html:98
+#: networks/templates/network.html:60 storages/templates/storage.html:76
 msgid "Enable"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:84
+#: instances/templates/instances/resize_tab.html:83
 #: instances/templates/instances/resize_tab.html:124
 #: instances/templates/instances/resize_tab.html:157
 msgid "You don't have permission for resizing instance"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:93
+#: instances/templates/instances/resize_tab.html:92
 msgid "Total host memory"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:103
+#: instances/templates/instances/resize_tab.html:104
 #: instances/templates/instances/resize_tab.html:118
 msgid "Custom value"
 msgstr ""
@@ -2156,457 +2082,450 @@ msgid "Disk allocation (GB)"
 msgstr ""
 
 #: instances/templates/instances/resize_tab.html:140
-#: instances/templates/instances/settings_tab.html:269
+#: instances/templates/instances/settings_tab.html:284
 msgid "Error getting disk info"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:11
+#: instances/templates/instances/settings_tab.html:17
 msgid "Boot"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:44
-#: instances/templates/instances/settings_tab.html:621
-#: instances/templates/instances/settings_tab.html:623
+#: instances/templates/instances/settings_tab.html:50
+#: instances/templates/instances/settings_tab.html:655
+#: instances/templates/instances/settings_tab.html:657
 msgid "Migrate"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:56
+#: instances/templates/instances/settings_tab.html:62
+#: venv/lib/python3.6/site-packages/click/core.py:1351
 msgid "Options"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:72
-#: networks/templates/network.html:56 storages/templates/storage.html:69
+#: instances/templates/instances/settings_tab.html:79
+#: networks/templates/network.html:56 storages/templates/storage.html:71
 msgid "Autostart"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:75
+#: instances/templates/instances/settings_tab.html:82
 msgid "Autostart your instance when host server is power on "
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:84
+#: instances/templates/instances/settings_tab.html:91
 msgid "Boot Order"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:88
+#: instances/templates/instances/settings_tab.html:95
 msgid "Enable Boot Menu for your instance when it starts up "
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:91
+#: instances/templates/instances/settings_tab.html:98
 msgid "Show boot menu"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:95
+#: instances/templates/instances/settings_tab.html:102
 msgid "Hide boot menu"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:100
+#: instances/templates/instances/settings_tab.html:107
 msgid "Please shutdown instance to modify boot menu"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:130
+#: instances/templates/instances/settings_tab.html:137
 msgid "up: move selected devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:133
+#: instances/templates/instances/settings_tab.html:140
 msgid "down: move selected devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:139
-#: instances/templates/instances/settings_tab.html:429
+#: instances/templates/instances/settings_tab.html:146
+#: instances/templates/instances/settings_tab.html:456
 msgid "Apply"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:149
+#: instances/templates/instances/settings_tab.html:156
 msgid "Instance Media"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:152
+#: instances/templates/instances/settings_tab.html:159
 msgid "Add CD-ROM"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:169
-#: instances/templates/instances/settings_tab.html:234
+#: instances/templates/instances/settings_tab.html:182
+#: instances/templates/instances/settings_tab.html:221
+#: instances/templates/instances/settings_tab.html:249
 #: interfaces/templates/create_iface_block.html:34
-#: networks/templates/network.html:43 networks/templates/networks.html:59
-#: storages/templates/create_stg_block.html:77
+#: networks/templates/network.html:43 networks/templates/networks.html:58
+#: storages/templates/create_stg_block.html:91
 msgid "Device"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:170
+#: instances/templates/instances/settings_tab.html:183
+#: instances/templates/instances/settings_tab.html:222
 msgid "CD-ROM"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:188
-#: instances/templates/instances/settings_tab.html:190
+#: instances/templates/instances/settings_tab.html:196
+#: instances/templates/instances/settings_tab.html:198
 msgid "Mount"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:193
+#: instances/templates/instances/settings_tab.html:201
 msgid "Detach CD-ROM (remove device)"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:208
-#: instances/templates/instances/settings_tab.html:210
+#: instances/templates/instances/settings_tab.html:227
+#: instances/templates/instances/settings_tab.html:229
 msgid "Unmount"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:220
+#: instances/templates/instances/settings_tab.html:238
 msgid "There is not any CD-ROM device."
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:225
+#: instances/templates/instances/settings_tab.html:243
 msgid "Instance Volume"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:235
+#: instances/templates/instances/settings_tab.html:250
 msgid "Used"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:236
+#: instances/templates/instances/settings_tab.html:251
 msgid "Capacity"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:238
-#: instances/templates/instances/settings_tab.html:363
+#: instances/templates/instances/settings_tab.html:253
+#: instances/templates/instances/settings_tab.html:385
 msgid "Source"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:294
-#: instances/templates/instances/settings_tab.html:298
+#: instances/templates/instances/settings_tab.html:309
+#: instances/templates/instances/settings_tab.html:313
 msgid "Detach"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:294
+#: instances/templates/instances/settings_tab.html:309
 msgid "Are you sure to detach volume?"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:298
-#: instances/templates/instances/settings_tab.html:314
+#: instances/templates/instances/settings_tab.html:313
+#: instances/templates/instances/settings_tab.html:329
 msgid "Are you sure? This may lead data corruption!"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:310
+#: instances/templates/instances/settings_tab.html:325
 msgid "Are you sure to delete volume?"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:330
+#: instances/templates/instances/settings_tab.html:343
 msgid "Add a network device"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:336
+#: instances/templates/instances/settings_tab.html:349
 msgid "Network Devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:341
-#: instances/templates/instances/settings_tab.html:342
+#: instances/templates/instances/settings_tab.html:354
 msgid "Info"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:355
+#: instances/templates/instances/settings_tab.html:367
 msgid "active"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:361
-#: nwfilters/templates/nwfilter.html:75
+#: instances/templates/instances/settings_tab.html:379
+#: nwfilters/templates/nwfilter.html:71
 msgid "Filter"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:368
+#: instances/templates/instances/settings_tab.html:393
 msgid "Edit NIC"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:376
+#: instances/templates/instances/settings_tab.html:403
 msgid "Edit Instance Network"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:389
+#: instances/templates/instances/settings_tab.html:416
 msgid "Net Source"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:397
+#: instances/templates/instances/settings_tab.html:424
 #: interfaces/templates/interface.html:4 interfaces/templates/interface.html:6
 #: interfaces/templates/interface.html:39
 msgid "Interface"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:415
-#: instances/templates/instances/settings_tab.html:454
+#: instances/templates/instances/settings_tab.html:442
+#: instances/templates/instances/settings_tab.html:494
 msgid "Model"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:429
+#: instances/templates/instances/settings_tab.html:456
 msgid "Apply network changes"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:438
+#: instances/templates/instances/settings_tab.html:472
 msgid "Delete Device"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:446
-#: interfaces/templates/create_iface_block.html:71
+#: instances/templates/instances/settings_tab.html:482
+#: interfaces/templates/create_iface_block.html:72
 #: interfaces/templates/interface.html:41
 msgid "IPv4"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:450
-#: interfaces/templates/create_iface_block.html:74
+#: instances/templates/instances/settings_tab.html:488
+#: interfaces/templates/create_iface_block.html:77
 #: interfaces/templates/interface.html:43
 msgid "IPv6"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:456
-msgid "QoS"
-msgstr ""
-
-#: instances/templates/instances/settings_tab.html:468
+#: instances/templates/instances/settings_tab.html:502
 msgid ""
 "In most configurations, macvtap does not work for host to guest network "
 "communication"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:481
+#: instances/templates/instances/settings_tab.html:515
 #: networks/templates/network.html:322
 msgid "QoS Configuration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:487
+#: instances/templates/instances/settings_tab.html:521
 #: networks/templates/add_network_qos.html:18
-#: networks/templates/network.html:328 nwfilters/templates/nwfilter.html:131
+#: networks/templates/network.html:328 nwfilters/templates/nwfilter.html:123
 msgid "Direction"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:488
+#: instances/templates/instances/settings_tab.html:522
 #: networks/templates/add_network_qos.html:27
 #: networks/templates/network.html:329
 msgid "Average"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:489
+#: instances/templates/instances/settings_tab.html:523
 #: networks/templates/add_network_qos.html:34
 #: networks/templates/network.html:330
 msgid "Peak"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:490
+#: instances/templates/instances/settings_tab.html:524
 #: networks/templates/add_network_qos.html:41
 #: networks/templates/network.html:331
 msgid "Burst"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:515
+#: instances/templates/instances/settings_tab.html:549
 #: networks/templates/network.html:353
 msgid "Edit QoS"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:525
+#: instances/templates/instances/settings_tab.html:559
 #: networks/templates/network.html:358
 msgid "Delete QoS"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:541
+#: instances/templates/instances/settings_tab.html:575
 msgid "For migration both host servers must have equal settings and OS type"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:545
+#: instances/templates/instances/settings_tab.html:579
 msgid "Original host"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:551
+#: instances/templates/instances/settings_tab.html:585
 msgid "Host migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:568
+#: instances/templates/instances/settings_tab.html:602
 msgid "Live migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:576
+#: instances/templates/instances/settings_tab.html:610
 msgid "Unsafe migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:584
+#: instances/templates/instances/settings_tab.html:618
 msgid "Delete original"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:592
+#: instances/templates/instances/settings_tab.html:626
 msgid "Offline migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:600
+#: instances/templates/instances/settings_tab.html:634
 msgid "Post copy"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:608
+#: instances/templates/instances/settings_tab.html:642
 msgid "Forces CPU convergence during live migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:608
+#: instances/templates/instances/settings_tab.html:642
 msgid "Auto converge"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:616
+#: instances/templates/instances/settings_tab.html:650
 msgid "Compress instance memory for fast migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:616
+#: instances/templates/instances/settings_tab.html:650
 msgid "Compressed"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:629
+#: instances/templates/instances/settings_tab.html:663
 msgid "If you need to edit XML please Power Off the instance"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:651
+#: instances/templates/instances/settings_tab.html:685
 msgid "Instance owners"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:680
+#: instances/templates/instances/settings_tab.html:714
 msgid "To change console settings, shutdown the instance."
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:697
+#: instances/templates/instances/settings_tab.html:731
 msgid "Create a clone"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:700
+#: instances/templates/instances/settings_tab.html:734
 msgid "Clone Name"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:707
-#: instances/templates/instances/settings_tab.html:738
+#: instances/templates/instances/settings_tab.html:740
+#: instances/templates/instances/settings_tab.html:769
 msgid "Guess"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:726
+#: instances/templates/instances/settings_tab.html:758
 msgid "Network devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:736
+#: instances/templates/instances/settings_tab.html:767
 msgid "Random"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:751
+#: instances/templates/instances/settings_tab.html:781
 msgid "Storage devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:776
-#: instances/templates/instances/settings_tab.html:799
+#: instances/templates/instances/settings_tab.html:805
+#: instances/templates/instances/settings_tab.html:828
 msgid "Title"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:796
+#: instances/templates/instances/settings_tab.html:825
 msgid "To set instance template name description, shutdown the instance."
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:811
+#: instances/templates/instances/settings_tab.html:840
 msgid "Is template"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:832
+#: instances/templates/instances/settings_tab.html:861
 msgid "To set instance video model, shutdown the instance."
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:835
+#: instances/templates/instances/settings_tab.html:864
 msgid "Primary Video Model"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:839
+#: instances/templates/instances/settings_tab.html:868
 msgid "please choose"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:846
-#: instances/templates/instances/settings_tab.html:848
-#: instances/templates/instances/settings_tab.html:868
-#: instances/templates/instances/settings_tab.html:870
-#: instances/templates/instances/settings_tab.html:898
-#: secrets/templates/secrets.html:103
+#: instances/templates/instances/settings_tab.html:874
+#: instances/templates/instances/settings_tab.html:876
+#: instances/templates/instances/settings_tab.html:894
+#: instances/templates/instances/settings_tab.html:896
+#: instances/templates/instances/settings_tab.html:922
+#: virtsecrets/templates/secrets.html:104
 msgid "Set"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:856
+#: instances/templates/instances/settings_tab.html:883
 msgid "To set instance vCPUs hotpluggable"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:859
+#: instances/templates/instances/settings_tab.html:886
 msgid "vCPU Hot Plug"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:863
-#: instances/templates/instances/settings_tab.html:894
+#: instances/templates/instances/settings_tab.html:890
+#: instances/templates/instances/settings_tab.html:919
 msgid "Enabled"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:864
-#: instances/templates/instances/settings_tab.html:895
+#: instances/templates/instances/settings_tab.html:891
+#: instances/templates/instances/settings_tab.html:920
 msgid "Disabled"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:878
+#: instances/templates/instances/settings_tab.html:903
 msgid "To Enable/Disable Qemu Guest Agent. Status"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:883
+#: instances/templates/instances/settings_tab.html:908
 msgid "Disconnected"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:886
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:709
+#: instances/templates/instances/settings_tab.html:911
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:714
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:703
 msgid "Unknown"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:890
+#: instances/templates/instances/settings_tab.html:915
 msgid "Qemu Guest Agent"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:9
-#: instances/templates/instances/snapshots_tab.html:31
-#: instances/templates/instances/snapshots_tab.html:33
+#: instances/templates/instances/snapshots_tab.html:8
+#: instances/templates/instances/snapshots_tab.html:26
 msgid "Take Snapshot"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:14
+#: instances/templates/instances/snapshots_tab.html:13
 msgid "Manage Snapshots"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:22
+#: instances/templates/instances/snapshots_tab.html:20
 msgid ""
 "This may take more than an hour, depending on how much content is on your "
-"instance and how large the disk is."
+"instance and how large the disk is. It could cause web server timeout.."
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:27
+#: instances/templates/instances/snapshots_tab.html:25
 msgid "Enter Snapshot Name"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:38
-msgid "To take a snapshot please Power Off the instance."
-msgstr ""
-
-#: instances/templates/instances/snapshots_tab.html:43
+#: instances/templates/instances/snapshots_tab.html:35
 msgid "Choose a snapshot for restore/delete"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:61
+#: instances/templates/instances/snapshots_tab.html:53
 msgid "Revert to this Snapshot"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:66
+#: instances/templates/instances/snapshots_tab.html:58
 msgid "To restore snapshots you need Power Off the instance."
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:75
+#: instances/templates/instances/snapshots_tab.html:67
 msgid "Delete Snapshot"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:86
+#: instances/templates/instances/snapshots_tab.html:78
 msgid "You do not have any snapshots"
 msgstr ""
 
-#: instances/templates/instances/stats_tab.html:8
+#: instances/templates/instances/stats_tab.html:7
 msgid "Real Time"
 msgstr ""
 
-#: instances/templates/instances/stats_tab.html:23
+#: instances/templates/instances/stats_tab.html:22
 msgid "CPU Usage"
 msgstr ""
 
@@ -2614,11 +2533,11 @@ msgstr ""
 msgid "Memory Usage"
 msgstr ""
 
-#: instances/templates/instances/stats_tab.html:50
+#: instances/templates/instances/stats_tab.html:51
 msgid "Bandwidth Device"
 msgstr ""
 
-#: instances/templates/instances/stats_tab.html:65
+#: instances/templates/instances/stats_tab.html:67
 msgid "Disk I/O device"
 msgstr ""
 
@@ -2626,648 +2545,357 @@ msgstr ""
 msgid "None available device name"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:242
+#: instances/views.py:249
 msgid "Templates cannot be started."
 msgstr ""
 
-#: instances/views.py:345
+#: instances/views.py:352
 #, python-format
 msgid "Instance is migrated to %(hostname)s"
 msgstr ""
 
-#: instances/views.py:368
+#: instances/views.py:375
 msgid "Reset root password"
 msgstr ""
 
-#: instances/views.py:374 instances/views.py:403
+#: instances/views.py:381 instances/views.py:410
 msgid "Please shutdown down your instance and then try again"
 msgstr ""
 
-#: instances/views.py:395
-=======
-#: instances/views.py:236
-msgid "Templates cannot be started."
-msgstr ""
-
-#: instances/views.py:339
-#, python-format
-msgid "Migrate to %(hostname)%"
-msgstr ""
-
-#: instances/views.py:362
-msgid "Reset root password"
-msgstr ""
-
-#: instances/views.py:368 instances/views.py:397
-msgid "Please shutdown down your instance and then try again"
-msgstr ""
-
-#: instances/views.py:389
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:402
 #, python-format
 msgid "Installed new SSH public key %(keyname)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:422
-=======
-#: instances/views.py:416
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:429
 #, python-format
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize CPU of '%(instance_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:431
+#: instances/views.py:438
 #, python-format
 msgid "CPU is resized:  %(old)s to %(new)s"
 msgstr ""
 
-#: instances/views.py:459
-=======
-#: instances/views.py:425
-msgid "Resize CPU"
-msgstr ""
-
-#: instances/views.py:453
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:466
 #, python-format
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize memory of "
 "'%(instance_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:466
+#: instances/views.py:473
 #, python-format
 msgid ""
 "Memory is resized: current/max: %(old_cur)s/%(old_max)s to %(new_cur)s/"
 "%(new_max)s"
 msgstr ""
 
-#: instances/views.py:500
-=======
-#: instances/views.py:462
-msgid "Resize Memory"
-msgstr ""
-
-#: instances/views.py:491
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:507
 #, python-format
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize disks of '%(instance_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:507
+#: instances/views.py:514
 #, python-format
 msgid "Disk is resized: %(dev)s"
 msgstr ""
 
-#: instances/views.py:546
+#: instances/views.py:570
 #, python-format
 msgid "Attach new disk: %(name)s (%(format)s)"
 msgstr ""
 
-#: instances/views.py:577
-=======
-#: instances/views.py:498
-msgid "Disk resize"
-msgstr ""
-
-#: instances/views.py:537
-#, python-format
-msgid "Attach new disk %(name)s (%(format)s)"
-msgstr ""
-
-#: instances/views.py:568
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:609
 #, python-format
 msgid "Attach Existing disk: %(target_dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:635
-=======
-#: instances/views.py:624
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:667
 msgid "Volume changes are applied. But it will be activated after shutdown"
 msgstr ""
 
-#: instances/views.py:626
+#: instances/views.py:670
 msgid "Volume is changed successfully."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:639
-=======
-#: instances/views.py:627
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:671
 #, python-format
 msgid "Edit disk: %(target_dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:661
-=======
-#: instances/views.py:649
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:693
 #, python-format
 msgid "Delete disk: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:677
-=======
-#: instances/views.py:665
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:709
 #, python-format
 msgid "Detach disk: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:690
-=======
-#: instances/views.py:678
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:722
 #, python-format
 msgid "Add CD-ROM: %(target)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:703
-=======
-#: instances/views.py:691
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:735
 #, python-format
 msgid "Detach CD-ROM: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:716
-=======
-#: instances/views.py:704
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:748
 #, python-format
 msgid "Mount media: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:729
-=======
-#: instances/views.py:717
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:761
 #, python-format
 msgid "Unmount media: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:742
+#: instances/views.py:774
 #, python-format
 msgid "Create snapshot: %(snap)s"
 msgstr ""
 
-#: instances/views.py:753
+#: instances/views.py:785
 #, python-format
 msgid "Delete snapshot: %(snap)s"
-=======
-#: instances/views.py:730
-#, python-format
-msgid "New snapshot: %(name)s"
 msgstr ""
 
-#: instances/views.py:741
-#, python-format
-msgid "Delete snapshot: %(snap_name)s"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
-msgstr ""
-
-#: instances/views.py:752
+#: instances/views.py:796
 msgid "Successful revert snapshot: "
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:767
-msgid "Revert snapshot: %(snap)"
+#: instances/views.py:799
+#, python-format
+msgid "Revert snapshot: %(snap)s"
 msgstr ""
 
-#: instances/views.py:781
-=======
-#: instances/views.py:755
-msgid "Revert snapshot"
-msgstr ""
-
-#: instances/views.py:769
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:813
 #, python-format
 msgid "VCPU %(id)s is enabled=%(enabled)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:790
-=======
-#: instances/views.py:780
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:822
 #, python-format
 msgid "VCPU Hot-plug is enabled=%(status)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:800
+#: instances/views.py:832
 msgid "Set autostart"
 msgstr ""
 
-#: instances/views.py:809
+#: instances/views.py:841
 msgid "Unset autostart"
 msgstr ""
 
-#: instances/views.py:818
+#: instances/views.py:850
 msgid "Enable boot menu"
 msgstr ""
 
-#: instances/views.py:827
+#: instances/views.py:859
 msgid "Disable boot menu"
 msgstr ""
 
-#: instances/views.py:842
+#: instances/views.py:874
 msgid "Set boot order"
 msgstr ""
 
-#: instances/views.py:847
-=======
-#: instances/views.py:791
-msgid "Set autostart"
-msgstr ""
-
-#: instances/views.py:800
-msgid "Unset autostart"
-msgstr ""
-
-#: instances/views.py:809
-msgid "Enable boot menu"
-msgstr ""
-
-#: instances/views.py:818
-msgid "Disable boot menu"
-msgstr ""
-
-#: instances/views.py:833
-msgid "Set boot order"
-msgstr ""
-
-#: instances/views.py:836
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:879
 msgid "Boot menu changes applied. But it will be activated after shutdown"
 msgstr ""
 
-#: instances/views.py:838
+#: instances/views.py:882
 msgid "Boot order changed successfully."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:861
+#: instances/views.py:893
 msgid "Change instance XML"
 msgstr ""
 
-#: instances/views.py:875
+#: instances/views.py:907
 #, python-format
 msgid "Set Guest Agent: %(status)s"
 msgstr ""
 
-#: instances/views.py:885
-msgid "Set Video Model: %(model)"
-=======
-#: instances/views.py:849
-msgid "Edit XML"
-msgstr ""
-
-#: instances/views.py:863
+#: instances/views.py:917
 #, python-format
-msgid "Set Guest Agent %(status)s"
+msgid "Set Video Model: %(model)s"
 msgstr ""
 
-#: instances/views.py:873
-msgid "Set Video Model"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
-msgstr ""
-
-#: instances/views.py:882
+#: instances/views.py:926
 msgid "Change network"
 msgstr ""
 
-#: instances/views.py:895
+#: instances/views.py:949
 msgid "Network Device Config is changed. Please shutdown instance to activate."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:922
+#: instances/views.py:974
 #, python-format
 msgid "Add network: %(mac)s"
 msgstr ""
 
-#: instances/views.py:933
+#: instances/views.py:985
 #, python-format
 msgid "Delete Network: %(mac)s"
 msgstr ""
 
-#: instances/views.py:946
-=======
-#: instances/views.py:903
-msgid "Add network"
-msgstr ""
-
-#: instances/views.py:917
-msgid "Delete network"
-msgstr ""
-
-#: instances/views.py:933
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:998
 #, python-format
 msgid "Set Link State: %(state)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:966 networks/views.py:231
-=======
-#: instances/views.py:952
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1018 networks/views.py:231
 #, python-format
 msgid "%(qos_dir)s QoS is set"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:971
-=======
-#: instances/views.py:956
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1023
 #, python-format
 msgid ""
 "%(qos_dir)s QoS is set. Network XML is changed.                 Stop and "
 "start network to activate new config."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:988 networks/views.py:246
-=======
-#: instances/views.py:970
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1040 networks/views.py:246
 #, python-format
 msgid "%(qos_dir)s QoS is deleted"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:993
-=======
-#: instances/views.py:974
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1045
 #, python-format
 msgid ""
 "%(qos_dir)s QoS is deleted. Network XML is changed.                 Stop and "
 "start network to activate new config."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1012
+#: instances/views.py:1064
 msgid "Only one owner is allowed and the one already added"
 msgstr ""
 
-#: instances/views.py:1017
-=======
-#: instances/views.py:990
-msgid "Only one owner is allowed and the one already added"
-msgstr ""
-
-#: instances/views.py:995
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1069
 #, python-format
 msgid "Add owner: %(user)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1028
+#: instances/views.py:1080
 #, python-format
 msgid "Delete owner: %(userinstance_id)s "
 msgstr ""
 
-#: instances/views.py:1060
-=======
-#: instances/views.py:1006
-#, python-format
-msgid "Deleted owner %(userinstance_id)s"
-msgstr ""
-
-#: instances/views.py:1038
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1112
 #, python-format
 msgid "User '%(quota_msg)s' quota reached, cannot create '%(clone_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1066
+#: instances/views.py:1118
 #, python-format
 msgid "Instance '%(clone_name)s' already exists!"
 msgstr ""
 
-#: instances/views.py:1069
-=======
-#: instances/views.py:1044
-msgid "Instance 'clone_name' already exists!"
-msgstr ""
-
-#: instances/views.py:1047
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1121
 #, python-format
 msgid "Instance name '%(clone_name)s' contains invalid characters!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1072
-=======
-#: instances/views.py:1050
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1124
 #, python-format
 msgid "Instance MAC '%(clone_mac)s' invalid format!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1082
+#: instances/views.py:1134
 #, python-format
 msgid "Create a clone of '%(instance_name)s'"
 msgstr ""
 
-#: instances/views.py:1121
-=======
-#: instances/views.py:1060
-#, python-format
-msgid "Clone of '%(instance_name)s'"
-msgstr ""
-
-#: instances/views.py:1093
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1173
 msgid ""
 "Error setting console password. You should check that your instance have an "
 "graphic device."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1126
+#: instances/views.py:1178
 msgid "Set VNC password"
 msgstr ""
 
-#: instances/views.py:1135
+#: instances/views.py:1187
 msgid "Set VNC keymap"
 msgstr ""
 
-#: instances/views.py:1140
+#: instances/views.py:1192
 msgid "Set VNC type"
 msgstr ""
 
-#: instances/views.py:1145
+#: instances/views.py:1197
 msgid "Set VNC listen address"
 msgstr ""
 
-#: instances/views.py:1168
+#: instances/views.py:1220
 msgid "Edit options"
 msgstr ""
 
-#: instances/views.py:1182
+#: instances/views.py:1234
 msgid "Send console.vv file"
 msgstr ""
 
-#: instances/views.py:1243 instances/views.py:1337
+#: instances/views.py:1295 instances/views.py:1389
 msgid "A virtual machine with this name already exists"
 msgstr ""
 
-#: instances/views.py:1320
+#: instances/views.py:1372
 msgid "You haven't defined any storage pools"
 msgstr ""
 
-#: instances/views.py:1322
-msgid "You haven't defined any network pools"
-msgstr ""
-
-#: instances/views.py:1339
-msgid "There is an instance with same name. Remove it and try again!"
-msgstr ""
-
-#: instances/views.py:1343
-msgid "No Virtual Machine MAC has been entered"
-msgstr ""
-
 #: instances/views.py:1374
-msgid "Image has already exist. Please check volumes or change instance name"
-msgstr ""
-
-#: instances/views.py:1401
-msgid "First you need to create or select an image"
-msgstr ""
-
-#: instances/views.py:1419
-msgid "Invalid cache mode"
-msgstr ""
-
-#: instances/views.py:1460
-msgid "Instance is created"
-msgstr ""
-
-#: instances/views.py:1481
-msgid "Flavor Created"
-msgstr ""
-
-#: instances/views.py:1487
-msgid "Create Flavor"
-msgstr ""
-
-#: instances/views.py:1497
-msgid "Flavor Updated"
-msgstr ""
-
-#: instances/views.py:1503
-msgid "Update Flavor"
-msgstr ""
-
-#: instances/views.py:1512
-=======
-#: instances/views.py:1096
-msgid "Set VNC password"
-msgstr ""
-
-#: instances/views.py:1104
-msgid "Set VNC keymap"
-msgstr ""
-
-#: instances/views.py:1109
-msgid "Set VNC type"
-msgstr ""
-
-#: instances/views.py:1114
-msgid "Set VNC listen address"
-msgstr ""
-
-#: instances/views.py:1137
-msgid "Edit options"
-msgstr ""
-
-#: instances/views.py:1151
-msgid "Send console.vv file"
-msgstr ""
-
-#: instances/views.py:1206 instances/views.py:1298
-msgid "A virtual machine with this name already exists"
-msgstr ""
-
-#: instances/views.py:1281
-msgid "You haven't defined any storage pools"
-msgstr ""
-
-#: instances/views.py:1283
 msgid "You haven't defined any network pools"
 msgstr ""
 
-#: instances/views.py:1300
+#: instances/views.py:1391
 msgid "There is an instance with same name. Remove it and try again!"
 msgstr ""
 
-#: instances/views.py:1304
+#: instances/views.py:1395
 msgid "No Virtual Machine MAC has been entered"
 msgstr ""
 
-#: instances/views.py:1327
+#: instances/views.py:1426
 msgid "Image has already exist. Please check volumes or change instance name"
 msgstr ""
 
-#: instances/views.py:1347
+#: instances/views.py:1453
 msgid "First you need to create or select an image"
 msgstr ""
 
-#: instances/views.py:1365
+#: instances/views.py:1471
 msgid "Invalid cache mode"
 msgstr ""
 
-#: instances/views.py:1402
+#: instances/views.py:1512
 msgid "Instance is created"
 msgstr ""
 
-#: instances/views.py:1423
+#: instances/views.py:1533
 msgid "Flavor Created"
 msgstr ""
 
-#: instances/views.py:1431
+#: instances/views.py:1539
 msgid "Create Flavor"
 msgstr ""
 
-#: instances/views.py:1442
+#: instances/views.py:1549
 msgid "Flavor Updated"
 msgstr ""
 
-#: instances/views.py:1450
+#: instances/views.py:1555
 msgid "Update Flavor"
 msgstr ""
 
-#: instances/views.py:1460
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1564
 msgid "Flavor Deleted"
 msgstr ""
 
@@ -3333,12 +2961,12 @@ msgstr ""
 
 #: interfaces/templates/create_iface_block.html:44
 #: interfaces/templates/interface.html:76
-#: interfaces/templates/interfaces.html:62
-#: storages/templates/create_stg_block.html:35
-#: storages/templates/create_stg_block.html:64
-#: storages/templates/create_stg_block.html:93
-#: storages/templates/create_stg_block.html:158
-#: storages/templates/storages.html:60
+#: interfaces/templates/interfaces.html:63
+#: storages/templates/create_stg_block.html:49
+#: storages/templates/create_stg_block.html:78
+#: storages/templates/create_stg_block.html:107
+#: storages/templates/create_stg_block.html:172
+#: storages/templates/storages.html:59
 msgid "Type"
 msgstr ""
 
@@ -3366,43 +2994,43 @@ msgstr ""
 msgid "Delay"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:82
+#: interfaces/templates/create_iface_block.html:86
 msgid "IPv4 Mode"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:85
-#: interfaces/templates/create_iface_block.html:112
+#: interfaces/templates/create_iface_block.html:89
+#: interfaces/templates/create_iface_block.html:116
 #: networks/templates/network.html:109 networks/templates/network.html:220
 msgid "DHCP"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:86
-#: interfaces/templates/create_iface_block.html:113
+#: interfaces/templates/create_iface_block.html:90
+#: interfaces/templates/create_iface_block.html:117
 msgid "Static"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:87
-#: interfaces/templates/create_iface_block.html:111
+#: interfaces/templates/create_iface_block.html:91
+#: interfaces/templates/create_iface_block.html:115
 msgid "No configuration"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:92
+#: interfaces/templates/create_iface_block.html:96
 msgid "IPv4 Address"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:98
+#: interfaces/templates/create_iface_block.html:102
 msgid "IPv4 Gateway"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:108
+#: interfaces/templates/create_iface_block.html:112
 msgid "IPv6 Mode"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:118
+#: interfaces/templates/create_iface_block.html:122
 msgid "IPv6 Address"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:124
+#: interfaces/templates/create_iface_block.html:128
 msgid "IPv6 Gateway"
 msgstr ""
 
@@ -3420,12 +3048,12 @@ msgstr ""
 
 #: interfaces/templates/interface.html:55
 #: interfaces/templates/interface.html:78 networks/templates/network.html:45
-#: storages/templates/storage.html:56
+#: storages/templates/storage.html:58
 msgid "State"
 msgstr ""
 
 #: interfaces/templates/interface.html:62 networks/templates/network.html:52
-#: storages/templates/storage.html:64
+#: storages/templates/storage.html:66
 msgid "Stop"
 msgstr ""
 
@@ -3437,7 +3065,7 @@ msgstr ""
 msgid "Speed"
 msgstr ""
 
-#: interfaces/templates/interfaces.html:47
+#: interfaces/templates/interfaces.html:48
 msgid "Hypervisor doesn't have any Interfaces"
 msgstr ""
 
@@ -3446,14 +3074,18 @@ msgid "user"
 msgstr ""
 
 #: logs/models.py:6
-msgid "instance"
+msgid "host"
 msgstr ""
 
 #: logs/models.py:7
-msgid "message"
+msgid "instance"
 msgstr ""
 
 #: logs/models.py:8
+msgid "message"
+msgstr ""
+
+#: logs/models.py:9
 msgid "date"
 msgstr ""
 
@@ -3524,8 +3156,8 @@ msgid "Add New Network"
 msgstr ""
 
 #: networks/templates/create_net_block.html:20
-#: storages/templates/create_stg_block.html:44
-#: storages/templates/create_stg_block.html:73
+#: storages/templates/create_stg_block.html:58
+#: storages/templates/create_stg_block.html:87
 msgid "default"
 msgstr ""
 
@@ -3647,12 +3279,12 @@ msgid "IPv4 Fixed Addresses"
 msgstr ""
 
 #: networks/templates/network.html:158 networks/templates/network.html:268
-#: nwfilters/templates/nwfilters.html:85
+#: nwfilters/templates/nwfilters.html:83
 msgid "Show"
 msgstr ""
 
-#: networks/templates/network.html:166 networks/templates/network.html:276
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:395
+#: networks/templates/network.html:165 networks/templates/network.html:275
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:403
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:377
 msgid "Clear"
 msgstr ""
@@ -3677,11 +3309,11 @@ msgstr ""
 msgid "IPv6 Fixed Addresses"
 msgstr ""
 
-#: networks/templates/networks.html:46
+#: networks/templates/networks.html:45
 msgid "Hypervisor doesn't have any Network"
 msgstr ""
 
-#: networks/templates/networks.html:61
+#: networks/templates/networks.html:60
 msgid "Forward"
 msgstr ""
 
@@ -3693,7 +3325,6 @@ msgstr ""
 msgid "Please enter bridge/dev name"
 msgstr ""
 
-<<<<<<< HEAD
 #: networks/views.py:57
 msgid "For libvirt, the IPv6 network prefix must be /64"
 msgstr ""
@@ -3718,34 +3349,10 @@ msgid "%(family)s DHCP Range is Changed."
 msgstr ""
 
 #: networks/views.py:210
-=======
-#: networks/views.py:56
-msgid "For libvirt, the IPv6 network prefix must be /64"
-msgstr ""
-
-#: networks/views.py:126
-msgid "Unknown Network Family"
-msgstr ""
-
-#: networks/views.py:176
-msgid "{family.upper()} Fixed Address Operation Completed."
-msgstr ""
-
-#: networks/views.py:186
-msgid "{family.upper()} Fixed Address is Deleted."
-msgstr ""
-
-#: networks/views.py:194
-msgid "{family.upper()} DHCP Range is Changed."
-msgstr ""
-
-#: networks/views.py:203
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid ""
 "Network XML is changed. \\Stop and start network to activate new config."
 msgstr ""
 
-<<<<<<< HEAD
 #: networks/views.py:215
 msgid "Network XML is changed."
 msgstr ""
@@ -3762,34 +3369,6 @@ msgstr ""
 msgid ""
 "%(qos_dir)s QoS is deleted. Network XML is changed.                         "
 "Stop and start network to activate new config"
-=======
-#: networks/views.py:205
-msgid "Network XML is changed."
-msgstr ""
-
-#: networks/views.py:218
-msgid "{qos_dir.capitalize()} QoS is set. Network XML is changed."
-msgstr ""
-
-#: networks/views.py:219
-msgid "Stop and start network to activate new config"
-msgstr ""
-
-#: networks/views.py:221
-msgid "{} QoS is set"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
-msgstr ""
-
-#: networks/views.py:232
-msgid "{qos_dir.capitalize()} QoS is deleted. Network XML is changed. "
-msgstr ""
-
-#: networks/views.py:233
-msgid "Stop and start network to activate new config."
-msgstr ""
-
-#: networks/views.py:235
-msgid "{qos_dir.capitalize()} QoS is deleted"
 msgstr ""
 
 #: nwfilters/templates/add_nwf_rule.html:12
@@ -3804,8 +3383,8 @@ msgstr ""
 msgid "Create New NWFilter"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:39 nwfilters/templates/nwfilters.html:55
-#: secrets/templates/secrets.html:59
+#: nwfilters/templates/nwfilter.html:39 nwfilters/templates/nwfilters.html:53
+#: virtsecrets/templates/secrets.html:60
 msgid "UUID"
 msgstr ""
 
@@ -3813,47 +3392,46 @@ msgstr ""
 msgid "Filter References"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:100
+#: nwfilters/templates/nwfilter.html:92
 msgid "Reference"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:125
+#: nwfilters/templates/nwfilter.html:117
 msgid "Rules"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:129
+#: nwfilters/templates/nwfilter.html:121
 msgid "Rule"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:130
+#: nwfilters/templates/nwfilter.html:122
 msgid "Action Type"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:132
+#: nwfilters/templates/nwfilter.html:124
 msgid "Priority"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:133
+#: nwfilters/templates/nwfilter.html:125
 msgid "Statematch"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:134
+#: nwfilters/templates/nwfilter.html:126
 msgid "Directives"
 msgstr ""
 
-#: nwfilters/templates/nwfilters.html:71
+#: nwfilters/templates/nwfilters.html:69
 msgid "Details of NWFilter"
 msgstr ""
 
-#: nwfilters/templates/nwfilters.html:94
+#: nwfilters/templates/nwfilters.html:92
 msgid "Clone NWFilter"
 msgstr ""
 
-#: nwfilters/templates/nwfilters.html:135
+#: nwfilters/templates/nwfilters.html:132
 msgid "Hypervisor doesn't have any NWFilters"
 msgstr ""
 
-<<<<<<< HEAD
 #: nwfilters/views.py:44
 msgid "A network filter with this name already exists"
 msgstr ""
@@ -3863,98 +3441,23 @@ msgid "A network filter with this UUID already exists"
 msgstr ""
 
 #: nwfilters/views.py:51
-=======
-#: nwfilters/views.py:41
-msgid "A network filter with this name already exists"
-msgstr ""
-
-#: nwfilters/views.py:44
-msgid "A network filter with this UUID already exists"
-msgstr ""
-
-#: nwfilters/views.py:48
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid "%(filter)s network filter is created"
 msgstr ""
 
-<<<<<<< HEAD
 #: nwfilters/views.py:60
 #, python-format
 msgid "%(filter)s network filter is deleted"
 msgstr ""
 
-#: nwfilters/views.py:76
+#: nwfilters/views.py:77
 #, python-format
 msgid "NWFilter is in use by %(instance)s. Cannot be deleted."
 msgstr ""
 
-#: nwfilters/views.py:93
+#: nwfilters/views.py:96
 #, python-format
 msgid "Cloning NWFilter %(name)s as %(clone)s"
-=======
-#: nwfilters/views.py:57
-#, python-brace-format
-msgid "Deleting NWFilter: {name}"
-msgstr ""
-
-#: nwfilters/views.py:69
-#, python-brace-format
-msgid "NWFilter is in use by {inst}. Cannot be deleted."
-msgstr ""
-
-#: nwfilters/views.py:86
-#, python-brace-format
-msgid "Cloning NWFilter {name} as {cln_name}"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:12
-msgid "Create New Secret"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:18
-msgid "Ephemeral"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:21
-#: secrets/templates/create_secret_block.html:30
-msgid "no"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:22
-#: secrets/templates/create_secret_block.html:31
-msgid "yes"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:27
-msgid "Private"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:36
-#: storages/templates/storage.html:54
-msgid "Usage"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:46
-#: secrets/templates/secrets.html:61
-msgid "Data"
-msgstr ""
-
-#: secrets/templates/secrets.html:50
-msgid "Hypervisor doesn't have any Secrets"
-msgstr ""
-
-#: secrets/templates/secrets.html:60
-msgid "Usage Type"
-msgstr ""
-
-#: secrets/templates/secrets.html:88
-msgid "Set secret value"
-msgstr ""
-
-#: secrets/templates/secrets.html:94
-msgid "Value"
 msgstr ""
 
 #: storages/forms.py:10 storages/forms.py:37
@@ -3985,64 +3488,64 @@ msgstr ""
 msgid "Create Storage Pool"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:18
+#: storages/templates/create_stg_block.html:19
 msgid "DIR"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:21
+#: storages/templates/create_stg_block.html:24
 msgid "LVM"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:23
+#: storages/templates/create_stg_block.html:29
 msgid "CEPH"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:25
+#: storages/templates/create_stg_block.html:34
 msgid "NETFS"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:27
+#: storages/templates/create_stg_block.html:39
 msgid "ISO"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:48
-#: storages/templates/create_stg_block.html:222
+#: storages/templates/create_stg_block.html:62
+#: storages/templates/create_stg_block.html:236
 msgid "Path"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:106
+#: storages/templates/create_stg_block.html:120
 msgid "Ceph User"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:112
+#: storages/templates/create_stg_block.html:126
 msgid "Ceph Pool"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:118
+#: storages/templates/create_stg_block.html:132
 msgid "Ceph Host"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:177
+#: storages/templates/create_stg_block.html:191
 msgid "Remote Path"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:186
+#: storages/templates/create_stg_block.html:200
 msgid "auto"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:187
+#: storages/templates/create_stg_block.html:201
 msgid "nfs"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:188
+#: storages/templates/create_stg_block.html:202
 msgid "glusterfs"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:189
+#: storages/templates/create_stg_block.html:203
 msgid "cifs"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:194
+#: storages/templates/create_stg_block.html:208
 msgid "Local Path"
 msgstr ""
 
@@ -4058,47 +3561,52 @@ msgstr ""
 msgid "Add New Volume"
 msgstr ""
 
-#: storages/templates/storage.html:44
+#: storages/templates/storage.html:46
 msgid "Pool name"
 msgstr ""
 
-#: storages/templates/storage.html:46
+#: storages/templates/storage.html:48
 msgid "Pool type"
 msgstr ""
 
-#: storages/templates/storage.html:48
+#: storages/templates/storage.html:50
 msgid "Pool path"
 msgstr ""
 
-#: storages/templates/storage.html:50
+#: storages/templates/storage.html:52
 msgid "Pool status"
 msgstr ""
 
-#: storages/templates/storage.html:85 storages/templates/storages.html:64
+#: storages/templates/storage.html:56
+#: virtsecrets/templates/create_secret_block.html:36
+msgid "Usage"
+msgstr ""
+
+#: storages/templates/storage.html:90 storages/templates/storages.html:63
 msgid "Volumes"
 msgstr ""
 
-#: storages/templates/storage.html:97
+#: storages/templates/storage.html:98
 msgid "Allocated"
 msgstr ""
 
-#: storages/templates/storage.html:118
+#: storages/templates/storage.html:119
 msgid "Clone image"
 msgstr ""
 
-#: storages/templates/storage.html:131
+#: storages/templates/storage.html:132
 msgid "Convert"
 msgstr ""
 
-#: storages/templates/storage.html:140
+#: storages/templates/storage.html:141
 msgid "raw"
 msgstr ""
 
-#: storages/templates/storage.html:141
+#: storages/templates/storage.html:142
 msgid "qcow"
 msgstr ""
 
-#: storages/templates/storage.html:142
+#: storages/templates/storage.html:143
 msgid "qcow2"
 msgstr ""
 
@@ -4106,11 +3614,11 @@ msgstr ""
 msgid "Hypervisor doesn't have any Volumes"
 msgstr ""
 
-#: storages/templates/storages.html:46
+#: storages/templates/storages.html:45
 msgid "Hypervisor doesn't have any Storages"
 msgstr ""
 
-#: storages/views.py:39
+#: storages/views.py:40
 msgid "Pool name already use"
 msgstr ""
 
@@ -4118,67 +3626,44 @@ msgstr ""
 msgid "You need create secret for pool"
 msgstr ""
 
-<<<<<<< HEAD
-#: storages/views.py:48
-msgid "You need input all fields for creating ceph pool"
-msgstr ""
-
-#: storages/views.py:144
-#, python-format
-msgid "Volume: %(volume)s is deleted."
-msgstr ""
-
-#: storages/views.py:149
-msgid "ISO image already exist"
-msgstr ""
-
-#: storages/views.py:153
-#, python-format
-msgid "ISO: %(file)s is uploaded."
-msgstr ""
-
-#: storages/views.py:162
-msgid "Name of volume already in use"
-msgstr ""
-
-#: storages/views.py:174
-#, python-format
-msgid "%(image)s image cloned as %(clone)s successfully"
-msgstr ""
-
-#: storages/views.py:220
-#, python-format
-msgid "Image file %(name)s is created successfully"
-=======
 #: storages/views.py:49
 msgid "You need input all fields for creating ceph pool"
 msgstr ""
 
-#: storages/views.py:132
-#, python-brace-format
-msgid "Volume: {volname} is deleted."
+#: storages/views.py:96
+msgid "Security Issues with file uploading"
 msgstr ""
 
-#: storages/views.py:137
-msgid "ISO image already exist"
-msgstr ""
-
-#: storages/views.py:141
-msgid "ISO: {request.FILES['file']} is uploaded."
+#: storages/views.py:103
+msgid "File not found. Check the path variable and filename"
 msgstr ""
 
 #: storages/views.py:150
+#, python-format
+msgid "Volume: %(vol)s is deleted."
+msgstr ""
+
+#: storages/views.py:155
+msgid "ISO image already exist"
+msgstr ""
+
+#: storages/views.py:159
+#, python-format
+msgid "ISO: %(file)s is uploaded."
+msgstr ""
+
+#: storages/views.py:168
 msgid "Name of volume already in use"
 msgstr ""
 
-#: storages/views.py:160
-msgid "{data['image']} image cloned as {name} successfully"
+#: storages/views.py:180
+#, python-format
+msgid "%(image)s image cloned as %(name)s successfully"
 msgstr ""
 
-#: storages/views.py:199
-#, python-brace-format
-msgid "Image file {name} is created successfully"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: storages/views.py:226
+#, python-format
+msgid "Image file %(name)s is created successfully"
 msgstr ""
 
 #: templates/403.html:3
@@ -4239,18 +3724,321 @@ msgstr ""
 msgid "Processing"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/bootstrap4/components.py:17
-#: venv/lib/python3.6/site-packages/bootstrap4/templates/bootstrap4/form_errors.html:3
-#: venv/lib/python3.6/site-packages/bootstrap4/templates/bootstrap4/messages.html:4
-msgid "close"
+#: templates/search_block.html:3
+msgid "Search"
 msgstr ""
 
+#: venv/lib/python3.6/site-packages/click/_termui_impl.py:496
+#, python-brace-format
+msgid "{editor}: Editing failed"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_termui_impl.py:500
+#, python-brace-format
+msgid "{editor}: Editing failed: {e}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:20
+msgid ""
+"Click will abort further execution because Python was configured to use "
+"ASCII as encoding for the environment. Consult https://click.palletsprojects."
+"com/unicode-support/ for mitigation steps."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:56
+msgid ""
+"Additional information: on this system no suitable UTF-8 locales were "
+"discovered. This most likely requires resolving by reconfiguring the locale "
+"system."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:65
+msgid ""
+"This system supports the C.UTF-8 locale which is recommended. You might be "
+"able to resolve your issue by exporting the following environment variables:"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:75
+#, python-brace-format
+msgid ""
+"This system lists some UTF-8 supporting locales that you can pick from. The "
+"following suitable locales were discovered: {locales}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:93
+msgid ""
+"Click discovered that you exported a UTF-8 locale but the locale system "
+"could not pick up from it because it does not exist. The exported locale is "
+"{locale!r} but it is not supported."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1095
+msgid "Aborted!"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1279
+#: venv/lib/python3.6/site-packages/click/decorators.py:434
+msgid "Show this message and exit."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1308
+#: venv/lib/python3.6/site-packages/click/core.py:1334
+#, python-brace-format
+msgid "(Deprecated) {text}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1375
+#, python-brace-format
+msgid "Got unexpected extra argument ({args})"
+msgid_plural "Got unexpected extra arguments ({args})"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1390
+msgid "DeprecationWarning: The command {name!r} is deprecated."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1607
+msgid "Commands"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1639
+msgid "Missing command."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1717
+msgid "No such command {name!r}."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2258
+msgid "Value must be an iterable."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2278
+#, python-brace-format
+msgid "Takes {nargs} values but 1 was given."
+msgid_plural "Takes {nargs} values but {len} were given."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2701
+#, python-brace-format
+msgid "env var: {var}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2724
+msgid "(dynamic)"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2735
+#, python-brace-format
+msgid "default: {default}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2748
+msgid "required"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/decorators.py:339
+#, python-format
+msgid "%(prog)s, version %(version)s"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/decorators.py:403
+msgid "Show the version and exit."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:43
+#: venv/lib/python3.6/site-packages/click/exceptions.py:79
+#, python-brace-format
+msgid "Error: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:71
+#, python-brace-format
+msgid "Try '{command} {option}' for help."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:120
+#, python-brace-format
+msgid "Invalid value: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:122
+#, python-brace-format
+msgid "Invalid value for {param_hint}: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:178
+msgid "Missing argument"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:180
+msgid "Missing option"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:182
+msgid "Missing parameter"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:184
+#, python-brace-format
+msgid "Missing {param_type}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:191
+#, python-brace-format
+msgid "Missing parameter: {param_name}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:211
+#, python-brace-format
+msgid "No such option: {name}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:223
+#, python-brace-format
+msgid "Did you mean {possibility}?"
+msgid_plural "(Possible options: {possibilities})"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:261
+msgid "unknown error"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:268
+msgid "Could not open file {filename!r}: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:231
+msgid "Argument {name!r} takes {nargs} values."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:413
+msgid "Option {name!r} does not take a value."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:474
+msgid "Option {name!r} requires an argument."
+msgid_plural "Option {name!r} requires {nargs} arguments."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/shell_completion.py:316
+msgid "Shell completion is not supported for Bash versions older than 4.4."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/shell_completion.py:322
+msgid "Couldn't detect Bash version, shell completion is not supported."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:161
+msgid "Repeat for confirmation"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:178
+msgid "Error: The value you entered was invalid."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:180
+#, python-brace-format
+msgid "Error: {e.message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:191
+msgid "Error: The two entered values do not match."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:247
+msgid "Error: invalid input"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:798
+msgid "Press any key to continue..."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:258
+#, python-brace-format
+msgid ""
+"Choose from:\n"
+"\t{choices}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:290
+msgid "{value!r} is not {choice}."
+msgid_plural "{value!r} is not one of {choices}."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:380
+msgid "{value!r} does not match the format {format}."
+msgid_plural "{value!r} does not match the formats {formats}."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:402
+msgid "{value!r} is not a valid {number_type}."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:458
+#, python-brace-format
+msgid "{value} is not in the range {range}."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:599
+msgid "{value!r} is not a valid boolean."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:623
+msgid "{value!r} is not a valid UUID."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:801
+msgid "file"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:803
+msgid "directory"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:805
+msgid "path"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:851
+msgid "{name} {filename!r} does not exist."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:860
+msgid "{name} {filename!r} is a file."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:868
+msgid "{name} {filename!r} is a directory."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:876
+msgid "{name} {filename!r} is not writable."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:884
+msgid "{name} {filename!r} is not readable."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:951
+#, python-brace-format
+msgid "{len_type} values are required, but {len_value} was given."
+msgid_plural "{len_type} values are required, but {len_value} were given."
+msgstr[0] ""
+msgstr[1] ""
+
 #: venv/lib/python3.6/site-packages/django/contrib/messages/apps.py:7
 #: venv2/lib/python2.7/site-packages/django/contrib/messages/apps.py:7
 msgid "Messages"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/contrib/sitemaps/apps.py:7
+#: venv/lib/python3.6/site-packages/django/contrib/sitemaps/apps.py:8
 #: venv2/lib/python2.7/site-packages/django/contrib/sitemaps/apps.py:7
 msgid "Site Maps"
 msgstr ""
@@ -4265,103 +4053,108 @@ msgstr ""
 msgid "Syndication"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/paginator.py:45
+#. Translators: String used to replace omitted page numbers in elided page
+#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10].
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:30
+msgid "…"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:51
 #: venv2/lib/python2.7/site-packages/django/core/paginator.py:43
 msgid "That page number is not an integer"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/paginator.py:47
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:53
 #: venv2/lib/python2.7/site-packages/django/core/paginator.py:45
 msgid "That page number is less than 1"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/paginator.py:52
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:58
 #: venv2/lib/python2.7/site-packages/django/core/paginator.py:50
 msgid "That page contains no results"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:31
+#: venv/lib/python3.6/site-packages/django/core/validators.py:22
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:34
 msgid "Enter a valid value."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:102
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:658
+#: venv/lib/python3.6/site-packages/django/core/validators.py:93
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:675
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:107
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:671
 msgid "Enter a valid URL."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:154
+#: venv/lib/python3.6/site-packages/django/core/validators.py:150
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:160
 msgid "Enter a valid integer."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:165
+#: venv/lib/python3.6/site-packages/django/core/validators.py:161
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:171
 msgid "Enter a valid email address."
 msgstr ""
 
 #. Translators: "letters" means latin letters: a-z and A-Z.
-#: venv/lib/python3.6/site-packages/django/core/validators.py:239
-#: venv2/lib/python2.7/site-packages/django/core/validators.py:245
+#: venv/lib/python3.6/site-packages/django/core/validators.py:262
 msgid ""
-"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+"Enter a valid “slug” consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:246
-#: venv2/lib/python2.7/site-packages/django/core/validators.py:252
+#: venv/lib/python3.6/site-packages/django/core/validators.py:269
 msgid ""
-"Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
+"Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:255
-#: venv/lib/python3.6/site-packages/django/core/validators.py:275
+#: venv/lib/python3.6/site-packages/django/core/validators.py:278
+#: venv/lib/python3.6/site-packages/django/core/validators.py:288
+#: venv/lib/python3.6/site-packages/django/core/validators.py:311
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:257
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:277
 msgid "Enter a valid IPv4 address."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:260
-#: venv/lib/python3.6/site-packages/django/core/validators.py:276
+#: venv/lib/python3.6/site-packages/django/core/validators.py:296
+#: venv/lib/python3.6/site-packages/django/core/validators.py:312
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:262
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:278
 msgid "Enter a valid IPv6 address."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:270
-#: venv/lib/python3.6/site-packages/django/core/validators.py:274
+#: venv/lib/python3.6/site-packages/django/core/validators.py:306
+#: venv/lib/python3.6/site-packages/django/core/validators.py:310
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:272
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:276
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:304
+#: venv/lib/python3.6/site-packages/django/core/validators.py:340
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:308
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1131
 msgid "Enter only digits separated by commas."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:310
+#: venv/lib/python3.6/site-packages/django/core/validators.py:346
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:314
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:342
+#: venv/lib/python3.6/site-packages/django/core/validators.py:379
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:345
 #, python-format
 msgid "Ensure this value is less than or equal to %(limit_value)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:351
+#: venv/lib/python3.6/site-packages/django/core/validators.py:388
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:354
 #, python-format
 msgid "Ensure this value is greater than or equal to %(limit_value)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:361
+#: venv/lib/python3.6/site-packages/django/core/validators.py:398
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:364
 #, python-format
 msgid ""
@@ -4373,7 +4166,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:376
+#: venv/lib/python3.6/site-packages/django/core/validators.py:413
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:379
 #, python-format
 msgid ""
@@ -4385,15 +4178,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:395
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:290
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:325
+#: venv/lib/python3.6/site-packages/django/core/validators.py:432
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:292
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:327
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:303
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:340
 msgid "Enter a number."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:397
+#: venv/lib/python3.6/site-packages/django/core/validators.py:434
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:399
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
@@ -4401,7 +4194,7 @@ msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:402
+#: venv/lib/python3.6/site-packages/django/core/validators.py:439
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:404
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
@@ -4409,7 +4202,7 @@ msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:407
+#: venv/lib/python3.6/site-packages/django/core/validators.py:444
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:409
 #, python-format
 msgid ""
@@ -4419,48 +4212,47 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:469
-#: venv2/lib/python2.7/site-packages/django/core/validators.py:463
+#: venv/lib/python3.6/site-packages/django/core/validators.py:506
 #, python-format
 msgid ""
-"File extension '%(extension)s' is not allowed. Allowed extensions are: "
-"'%(allowed_extensions)s'."
+"File extension “%(extension)s” is not allowed. Allowed extensions are: "
+"%(allowed_extensions)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:521
+#: venv/lib/python3.6/site-packages/django/core/validators.py:559
 msgid "Null characters are not allowed."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/base.py:1165
-#: venv/lib/python3.6/site-packages/django/forms/models.py:756
+#: venv/lib/python3.6/site-packages/django/db/models/base.py:1210
+#: venv/lib/python3.6/site-packages/django/forms/models.py:768
 #: venv2/lib/python2.7/site-packages/django/db/models/base.py:1209
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:749
 msgid "and"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/base.py:1167
+#: venv/lib/python3.6/site-packages/django/db/models/base.py:1212
 #: venv2/lib/python2.7/site-packages/django/db/models/base.py:1211
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:104
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:100
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:116
 #, python-format
 msgid "Value %(value)r is not a valid choice."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:105
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:101
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:117
 msgid "This field cannot be null."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:106
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:102
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:118
 msgid "This field cannot be blank."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:107
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:103
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:119
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
@@ -4468,346 +4260,340 @@ msgstr ""
 
 #. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
 #. Eg: "Title must be unique for pub_date year"
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:111
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:107
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:123
 #, python-format
 msgid ""
 "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:128
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:126
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:140
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:905
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1772
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:901
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1809
-msgid "Integer"
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:909
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1770
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:905
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1807
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:958
 #, python-format
-msgid "'%(value)s' value must be an integer."
+msgid "“%(value)s” value must be either True or False."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:984
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1850
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:978
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1878
-msgid "Big (8 byte) integer"
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:996
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:990
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:959
 #, python-format
-msgid "'%(value)s' value must be either True or False."
+msgid "“%(value)s” value must be either True, False, or None."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:997
-#, python-format
-msgid "'%(value)s' value must be either True, False, or None."
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:999
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:961
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:992
 msgid "Boolean (Either True or False)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1040
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1002
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1058
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1104
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1096
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1115
 msgid "Comma-separated integers"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1153
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1172
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1145
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+"“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD "
 "format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1155
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1298
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1174
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1319
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1147
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1290
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
+"“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid "
 "date."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1158
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1150
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1177
 msgid "Date (without time)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1296
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1317
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1288
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ] format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1300
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1321
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1292
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
 "[TZ]) but it is an invalid date/time."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1304
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1296
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1325
 msgid "Date (with time)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1452
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1475
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1444
 #, python-format
-msgid "'%(value)s' value must be a decimal number."
+msgid "“%(value)s” value must be a decimal number."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1454
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1446
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1477
 msgid "Decimal number"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1593
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1628
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1585
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
+"“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[."
 "uuuuuu] format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1596
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1588
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1631
 msgid "Duration"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1646
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1638
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1683
 msgid "Email address"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1669
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1661
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1707
 msgid "File path"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1735
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1773
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1727
 #, python-format
-msgid "'%(value)s' value must be a float."
+msgid "“%(value)s” value must be a float."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1737
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1729
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1775
 msgid "Floating point number"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1866
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1767
+#, python-format
+msgid "“%(value)s” value must be an integer."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1769
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:901
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1809
+msgid "Integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1852
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:978
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1878
+msgid "Big (8 byte) integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1867
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2130
+msgid "Small integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1875
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1893
 msgid "IPv4 address"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1897
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1906
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1924
 msgid "IP address"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1977
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1978
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2006
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1986
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1987
 #, python-format
-msgid "'%(value)s' value must be either None, True or False."
+msgid "“%(value)s” value must be either None, True or False."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1980
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1989
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2008
 msgid "Boolean (Either True, False or None)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2015
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2043
+msgid "Positive big integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2056
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2071
 msgid "Positive integer"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2028
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2069
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2083
 msgid "Positive small integer"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2042
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2083
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2096
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2074
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2130
-msgid "Small integer"
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2081
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2115
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2137
 msgid "Text"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2109
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2163
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2181
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
 "format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2111
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2165
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2183
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
 "invalid time."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2114
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2186
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2168
 msgid "Time"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2240
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2312
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2296
 msgid "URL"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2262
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2334
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2319
 msgid "Raw binary data"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2312
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2366
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2399
 #, python-format
-msgid "'%(value)s' is not a valid UUID."
+msgid "“%(value)s” is not a valid UUID."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2314
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2401
 msgid "Universally unique identifier"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:221
+#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:226
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/files.py:228
 msgid "File"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:778
+#: venv/lib/python3.6/site-packages/django/db/models/fields/json.py:18
+msgid "A JSON object"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/json.py:20
+msgid "Value must be valid JSON."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:790
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:788
 #, python-format
 msgid "%(model)s instance with %(field)s %(value)r does not exist."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:780
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:792
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:790
 msgid "Foreign Key (type determined by related field)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1007
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1045
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1029
 msgid "One-to-one relationship"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1057
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1099
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1104
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1058
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1100
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1105
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1100
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1142
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1147
 msgid "Many-to-many relationship"
 msgstr ""
 
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the label
-#: venv/lib/python3.6/site-packages/django/forms/boundfield.py:146
+#: venv/lib/python3.6/site-packages/django/forms/boundfield.py:150
 #: venv2/lib/python2.7/site-packages/django/forms/boundfield.py:181
 msgid ":?.!"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:53
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:54
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:56
 msgid "This field is required."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:245
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:247
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:258
 msgid "Enter a whole number."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:396
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:1126
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:402
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1143
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:418
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:1149
 msgid "Enter a valid date."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:420
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:1127
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:426
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1144
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:442
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:1150
 msgid "Enter a valid time."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:442
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:454
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:464
 msgid "Enter a valid date/time."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:471
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:488
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:493
 msgid "Enter a valid duration."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:472
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:489
 #, python-brace-format
 msgid "The number of days must be between {min_days} and {max_days}."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:532
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:549
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:547
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:533
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:550
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:548
 msgid "No file was submitted."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:534
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:551
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:549
 msgid "The submitted file is empty."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:536
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:553
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:551
 #, python-format
 msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
@@ -4816,21 +4602,21 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:539
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:556
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:554
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:600
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:617
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:619
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:762
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:852
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1270
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:779
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:869
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1309
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:776
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:872
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1265
@@ -4838,78 +4624,82 @@ msgstr ""
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:853
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:968
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1269
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:870
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:985
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1308
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:873
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:990
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1264
 msgid "Enter a list of values."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:969
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:986
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:991
 msgid "Enter a complete value."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:1185
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1202
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:1208
 msgid "Enter a valid UUID."
 msgstr ""
 
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1232
+msgid "Enter a valid JSON."
+msgstr ""
+
 #. Translators: This is the default suffix added to form field labels
-#: venv/lib/python3.6/site-packages/django/forms/forms.py:86
+#: venv/lib/python3.6/site-packages/django/forms/forms.py:76
 #: venv2/lib/python2.7/site-packages/django/forms/forms.py:87
 msgid ":"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/forms.py:212
+#: venv/lib/python3.6/site-packages/django/forms/forms.py:203
 #: venv2/lib/python2.7/site-packages/django/forms/forms.py:213
 #, python-format
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:91
-#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:97
-msgid "ManagementForm data is missing or has been tampered with"
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:61
+#, python-format
+msgid ""
+"ManagementForm data is missing or has been tampered with. Missing fields: "
+"%(field_names)s. You may need to file a bug report if the issue persists."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:338
-#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:355
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:370
 #, python-format
-msgid "Please submit %d or fewer forms."
-msgid_plural "Please submit %d or fewer forms."
+msgid "Please submit at most %d form."
+msgid_plural "Please submit at most %d forms."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:345
-#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:362
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:377
 #, python-format
-msgid "Please submit %d or more forms."
-msgid_plural "Please submit %d or more forms."
+msgid "Please submit at least %d form."
+msgid_plural "Please submit at least %d forms."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:371
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:373
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:405
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:412
 #: venv2/lib/python2.7/site-packages/django/forms/formsets.py:390
 #: venv2/lib/python2.7/site-packages/django/forms/formsets.py:392
 msgid "Order"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:751
+#: venv/lib/python3.6/site-packages/django/forms/models.py:763
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:744
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:755
+#: venv/lib/python3.6/site-packages/django/forms/models.py:767
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:748
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:761
+#: venv/lib/python3.6/site-packages/django/forms/models.py:773
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:754
 #, python-format
 msgid ""
@@ -4917,55 +4707,55 @@ msgid ""
 "for the %(lookup)s in %(date_field)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:770
+#: venv/lib/python3.6/site-packages/django/forms/models.py:782
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:763
 msgid "Please correct the duplicate values below."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1091
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1109
 msgid "The inline value did not match the parent instance."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1158
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1193
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1154
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1272
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1311
 #, python-format
-msgid "\"%(pk)s\" is not a valid value."
+msgid "“%(pk)s” is not a valid value."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/utils.py:162
-#: venv2/lib/python2.7/site-packages/django/forms/utils.py:172
+#: venv/lib/python3.6/site-packages/django/forms/utils.py:172
 #, python-format
 msgid ""
-"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it "
 "may be ambiguous or it may not exist."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:396
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:404
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:378
 msgid "Currently"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:710
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:715
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:704
 msgid "Yes"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:711
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:716
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:705
 msgid "No"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:788
+#. Translators: Please do not add spaces around commas.
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:805
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:851
 msgid "yes,no,maybe"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:817
 #: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:834
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:851
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:880
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:897
 #, python-format
@@ -4974,62 +4764,62 @@ msgid_plural "%(size)d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:836
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:853
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:899
 #, python-format
 msgid "%s KB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:838
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:855
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:901
 #, python-format
 msgid "%s MB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:840
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:857
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:903
 #, python-format
 msgid "%s GB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:842
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:859
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:905
 #, python-format
 msgid "%s TB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:844
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:861
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:907
 #, python-format
 msgid "%s PB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:62
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:66
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:66
 msgid "p.m."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:63
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:67
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:67
 msgid "a.m."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:68
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:72
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:72
 msgid "PM"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:69
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:73
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:73
 msgid "AM"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:150
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:146
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:158
 msgid "midnight"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:152
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:148
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:160
 msgid "noon"
 msgstr ""
@@ -5373,20 +5163,20 @@ msgstr ""
 msgid "This is not a valid IPv6 address."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/text.py:67
+#: venv/lib/python3.6/site-packages/django/utils/text.py:71
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s…"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/text.py:233
+#: venv/lib/python3.6/site-packages/django/utils/text.py:240
 #: venv2/lib/python2.7/site-packages/django/utils/text.py:251
 msgid "or"
 msgstr ""
 
 #. Translators: This string is used as a separator between list elements
-#: venv/lib/python3.6/site-packages/django/utils/text.py:252
-#: venv/lib/python3.6/site-packages/django/utils/timesince.py:83
+#: venv/lib/python3.6/site-packages/django/utils/text.py:259
+#: venv/lib/python3.6/site-packages/django/utils/timesince.py:94
 #: venv2/lib/python2.7/site-packages/django/utils/text.py:270
 #: venv2/lib/python2.7/site-packages/django/utils/timesince.py:71
 msgid ", "
@@ -5440,11 +5230,6 @@ msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/utils/timesince.py:72
-#: venv2/lib/python2.7/site-packages/django/utils/timesince.py:60
-msgid "0 minutes"
-msgstr ""
-
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:110
 #: venv2/lib/python2.7/site-packages/django/views/csrf.py:109
 msgid "Forbidden"
@@ -5456,29 +5241,27 @@ msgid "CSRF verification failed. Request aborted."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:115
-#: venv2/lib/python2.7/site-packages/django/views/csrf.py:114
 msgid ""
-"You are seeing this message because this HTTPS site requires a 'Referer "
-"header' to be sent by your Web browser, but none was sent. This header is "
+"You are seeing this message because this HTTPS site requires a “Referer "
+"header” to be sent by your Web browser, but none was sent. This header is "
 "required for security reasons, to ensure that your browser is not being "
 "hijacked by third parties."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:120
-#: venv2/lib/python2.7/site-packages/django/views/csrf.py:119
 msgid ""
-"If you have configured your browser to disable 'Referer' headers, please re-"
-"enable them, at least for this site, or for HTTPS connections, or for 'same-"
-"origin' requests."
+"If you have configured your browser to disable “Referer” headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for “same-"
+"origin” requests."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:124
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
-"including the 'Referrer-Policy: no-referrer' header, please remove them. The "
-"CSRF protection requires the 'Referer' header to do strict referer checking. "
-"If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
-"\" ...> for links to third-party sites."
+"including the “Referrer-Policy: no-referrer” header, please remove them. The "
+"CSRF protection requires the “Referer” header to do strict referer checking. "
+"If you’re concerned about privacy, use alternatives like <a rel=\"noreferrer"
+"\" …> for links to third-party sites."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:132
@@ -5490,10 +5273,9 @@ msgid ""
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:137
-#: venv2/lib/python2.7/site-packages/django/views/csrf.py:129
 msgid ""
 "If you have configured your browser to disable cookies, please re-enable "
-"them, at least for this site, or for 'same-origin' requests."
+"them, at least for this site, or for “same-origin” requests."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:142
@@ -5538,7 +5320,7 @@ msgstr ""
 msgid "No %(verbose_name_plural)s available"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:589
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:594
 #: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:669
 #, python-format
 msgid ""
@@ -5546,10 +5328,9 @@ msgid ""
 "allow_future is False."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:623
-#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:703
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:628
 #, python-format
-msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgid "Invalid date string “%(datestr)s” given format “%(format)s”"
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/detail.py:54
@@ -5559,8 +5340,7 @@ msgid "No %(verbose_name)s found matching the query"
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/list.py:67
-#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:77
-msgid "Page is not 'last', nor can it be converted to an int."
+msgid "Page is not “last”, nor can it be converted to an int."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/list.py:72
@@ -5570,9 +5350,8 @@ msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/list.py:154
-#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:172
 #, python-format
-msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgid "Empty list and “%(class_name)s.allow_empty” is False."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/static.py:40
@@ -5581,9 +5360,8 @@ msgid "Directory indexes are not allowed here."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/static.py:42
-#: venv2/lib/python2.7/site-packages/django/views/static.py:46
 #, python-format
-msgid "\"%(path)s\" does not exist"
+msgid "“%(path)s” does not exist"
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/static.py:80
@@ -5592,22 +5370,19 @@ msgstr ""
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:6
-msgid "Django: the Web framework for perfectionists with deadlines."
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:7
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:221
+msgid "The install worked successfully! Congratulations!"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:345
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:207
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:367
-msgid "The install worked successfully! Congratulations!"
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:368
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:222
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
@@ -5616,39 +5391,160 @@ msgid ""
 "URLs."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:383
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:230
 msgid "Django Documentation"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:384
-msgid "Topics, references, &amp; how-to's"
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:231
+msgid "Topics, references, &amp; how-to’s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:395
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:239
 msgid "Tutorial: A Polling App"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:396
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:240
 msgid "Get started with Django"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:407
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:248
 msgid "Django Community"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:408
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:249
 msgid "Connect, get help, or contribute"
 msgstr ""
 
+#: venv/lib/python3.6/site-packages/django_bootstrap5/components.py:20
+msgid "close"
+msgstr ""
+
 #: venv/lib/python3.6/site-packages/django_icons/renderers/image.py:217
 msgid "Icon of {}"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/qr_code/qrcode/utils.py:73
-#, python-format
-msgid "The option '%s' is not a valid option for a QR code."
+#: venv/lib/python3.6/site-packages/isort/main.py:158
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1615
+msgid "show this help message and exit"
 msgstr ""
 
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:245
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:252
+msgid ""
+"Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
+"hyphens."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:463
+#, python-format
+msgid ""
+"File extension '%(extension)s' is not allowed. Allowed extensions are: "
+"'%(allowed_extensions)s'."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:905
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1807
+#, python-format
+msgid "'%(value)s' value must be an integer."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:990
+#, python-format
+msgid "'%(value)s' value must be either True or False."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1172
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+"format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1174
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1319
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
+"date."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1317
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1321
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]) but it is an invalid date/time."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1475
+#, python-format
+msgid "'%(value)s' value must be a decimal number."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1628
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
+"uuuuuu] format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1773
+#, python-format
+msgid "'%(value)s' value must be a float."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2006
+#, python-format
+msgid "'%(value)s' value must be either None, True or False."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2163
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2165
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"invalid time."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2366
+#, python-format
+msgid "'%(value)s' is not a valid UUID."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:97
+msgid "ManagementForm data is missing or has been tampered with"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:355
+#, python-format
+msgid "Please submit %d or fewer forms."
+msgid_plural "Please submit %d or fewer forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:362
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1093
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
@@ -5658,12 +5554,44 @@ msgstr ""
 msgid "\"%(pk)s\" is not a valid value for a primary key."
 msgstr ""
 
+#: venv2/lib/python2.7/site-packages/django/forms/utils.py:172
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
 #: venv2/lib/python2.7/site-packages/django/utils/text.py:81
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
+#: venv2/lib/python2.7/site-packages/django/utils/timesince.py:60
+msgid "0 minutes"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:114
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:119
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:129
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
 #: venv2/lib/python2.7/site-packages/django/views/debug.py:520
 msgid "Welcome to Django"
 msgstr ""
@@ -5688,6 +5616,25 @@ msgid ""
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 
+#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:703
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:77
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:172
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/static.py:46
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
+
 #: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:313
 msgid "usage: "
 msgstr ""
@@ -5747,10 +5694,6 @@ msgstr ""
 msgid "optional arguments"
 msgstr ""
 
-#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1615
-msgid "show this help message and exit"
-msgstr ""
-
 #: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1621
 msgid "show program's version number and exit"
 msgstr ""
@@ -5836,6 +5779,49 @@ msgstr ""
 msgid "%s: error: %s\n"
 msgstr ""
 
+#: virtsecrets/templates/create_secret_block.html:12
+msgid "Create New Secret"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:18
+msgid "Ephemeral"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:21
+#: virtsecrets/templates/create_secret_block.html:30
+msgid "no"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:22
+#: virtsecrets/templates/create_secret_block.html:31
+msgid "yes"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:27
+msgid "Private"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:46
+#: virtsecrets/templates/secrets.html:62
+msgid "Data"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:51
+msgid "Hypervisor doesn't have any Secrets"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:61
+msgid "Usage Type"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:89
+msgid "Set secret value"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:95
+msgid "Value"
+msgstr ""
+
 #: webvirtcloud/middleware.py:18
 #, python-format
 msgid "libvirt Error - %(exception)s"
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 60c21a0..0eae6db 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -8,11 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2020-11-05 09:36+0000\n"
-=======
-"POT-Creation-Date: 2020-10-23 07:53+0000\n"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+"POT-Creation-Date: 2021-12-20 07:53+0000\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"
@@ -96,39 +92,39 @@ msgstr ""
 msgid "Create user instance"
 msgstr ""
 
-#: accounts/templates/account.html:27
+#: accounts/templates/account.html:28
 #: computes/templates/computes/instances.html:5
 #: computes/templates/computes/instances.html:9
-#: computes/templates/computes/instances.html:32
-#: computes/templates/overview.html:19 instances/templates/allinstances.html:5
+#: computes/templates/computes/instances.html:30
+#: computes/templates/overview.html:18 instances/templates/allinstances.html:5
 #: instances/templates/allinstances.html:9
 #: instances/templates/bottom_bar.html:17
 #: interfaces/templates/interface.html:16
-#: interfaces/templates/interfaces.html:20 networks/templates/network.html:17
+#: interfaces/templates/interfaces.html:22 networks/templates/network.html:17
 #: networks/templates/networks.html:19 nwfilters/templates/nwfilter.html:17
-#: nwfilters/templates/nwfilters.html:25 secrets/templates/secrets.html:23
-#: storages/templates/storage.html:22 storages/templates/storages.html:19
-#: templates/navbar.html:14
+#: nwfilters/templates/nwfilters.html:23 storages/templates/storage.html:23
+#: storages/templates/storages.html:19 templates/navbar.html:14
+#: virtsecrets/templates/secrets.html:25
 msgid "Instances"
 msgstr ""
 
-#: accounts/templates/account.html:30
+#: accounts/templates/account.html:33
 msgid "Public Keys"
 msgstr ""
 
-#: accounts/templates/account.html:40 admin/templates/admin/logs.html:27
+#: accounts/templates/account.html:44 admin/templates/admin/logs.html:27
 #: instances/templates/instance.html:5
 msgid "Instance"
 msgstr ""
 
-#: accounts/templates/account.html:41
+#: accounts/templates/account.html:45
 msgid "VNC"
 msgstr ""
 
-#: accounts/templates/account.html:42 instances/templates/instance.html:87
-#: instances/templates/instances/resize_tab.html:56
-#: instances/templates/instances/resize_tab.html:58
-#: instances/templates/instances/resize_tab.html:85
+#: accounts/templates/account.html:46 instances/templates/instance.html:93
+#: instances/templates/instances/resize_tab.html:55
+#: instances/templates/instances/resize_tab.html:57
+#: instances/templates/instances/resize_tab.html:84
 #: instances/templates/instances/resize_tab.html:121
 #: instances/templates/instances/resize_tab.html:125
 #: instances/templates/instances/resize_tab.html:151
@@ -137,47 +133,47 @@ msgstr ""
 msgid "Resize"
 msgstr ""
 
-#: accounts/templates/account.html:43 accounts/templates/account.html:61
-#: accounts/templates/profile.html:51 admin/templates/admin/group_list.html:46
-#: admin/templates/admin/user_list.html:68
-#: computes/templates/computes/list.html:54
-#: instances/templates/instances/settings_tab.html:310
-#: instances/templates/instances/settings_tab.html:314
+#: accounts/templates/account.html:47 accounts/templates/account.html:65
+#: accounts/templates/profile.html:55 admin/templates/admin/group_list.html:43
+#: admin/templates/admin/user_list.html:65
+#: computes/templates/computes/list.html:53
+#: instances/templates/instances/settings_tab.html:325
+#: instances/templates/instances/settings_tab.html:329
 #: interfaces/templates/interface.html:60 networks/templates/network.html:50
-#: nwfilters/templates/nwfilter.html:111 nwfilters/templates/nwfilter.html:151
-#: nwfilters/templates/nwfilters.html:120 secrets/templates/secrets.html:77
-#: storages/templates/storage.html:61 storages/templates/storage.html:174
-#: templates/common/confirm_delete.html:21
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:375
+#: nwfilters/templates/nwfilter.html:103 nwfilters/templates/nwfilter.html:143
+#: nwfilters/templates/nwfilters.html:118 storages/templates/storage.html:63
+#: storages/templates/storage.html:175 templates/common/confirm_delete.html:21
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:417
 #: venv2/lib/python2.7/site-packages/django/forms/formsets.py:394
+#: virtsecrets/templates/secrets.html:78
 msgid "Delete"
 msgstr ""
 
-#: accounts/templates/account.html:44
-#: instances/templates/create_instance_w2.html:81
-#: instances/templates/instances/settings_tab.html:239
-#: instances/templates/instances/snapshots_tab.html:49
-#: nwfilters/templates/nwfilter.html:101 nwfilters/templates/nwfilter.html:135
-#: nwfilters/templates/nwfilters.html:57 secrets/templates/secrets.html:62
-#: storages/templates/storage.html:100
+#: accounts/templates/account.html:48
+#: instances/templates/create_instance_w2.html:80
+#: instances/templates/instances/settings_tab.html:254
+#: instances/templates/instances/snapshots_tab.html:41
+#: nwfilters/templates/nwfilter.html:93 nwfilters/templates/nwfilter.html:127
+#: nwfilters/templates/nwfilters.html:55 storages/templates/storage.html:101
+#: virtsecrets/templates/secrets.html:63
 msgid "Action"
 msgstr ""
 
-#: accounts/templates/account.html:56
+#: accounts/templates/account.html:60
 msgid "edit"
 msgstr ""
 
-#: accounts/templates/account.html:74
+#: accounts/templates/account.html:78
 msgid "Key name"
 msgstr ""
 
-#: accounts/templates/account.html:75
+#: accounts/templates/account.html:79
 msgid "Public key"
 msgstr ""
 
 #: accounts/templates/accounts/change_password_form.html:7
 #: accounts/templates/accounts/change_password_form.html:14
-#: accounts/templates/profile.html:29
+#: accounts/templates/profile.html:33
 msgid "Change Password"
 msgstr ""
 
@@ -190,11 +186,11 @@ msgid "Cancel"
 msgstr ""
 
 #: accounts/templates/accounts/change_password_form.html:27
-#: instances/templates/instances/settings_tab.html:638
-#: instances/templates/instances/settings_tab.html:642
-#: instances/templates/instances/settings_tab.html:824
-#: instances/templates/instances/settings_tab.html:826
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:397
+#: instances/templates/instances/settings_tab.html:672
+#: instances/templates/instances/settings_tab.html:676
+#: instances/templates/instances/settings_tab.html:853
+#: instances/templates/instances/settings_tab.html:855
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:405
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:379
 msgid "Change"
 msgstr ""
@@ -223,7 +219,7 @@ msgstr ""
 
 #: accounts/templates/accounts/otp_login.html:24
 #: accounts/templates/login.html:5 accounts/templates/login.html:23
-#: accounts/templates/login.html:27
+#: accounts/templates/login.html:28
 msgid "Sign In"
 msgstr ""
 
@@ -235,12 +231,12 @@ msgstr ""
 msgid "Incorrect username or password."
 msgstr ""
 
-#: accounts/templates/login.html:24 admin/templates/admin/logs.html:26
-#: computes/templates/computes/instances.html:67
+#: accounts/templates/login.html:24 admin/templates/admin/logs.html:25
+#: computes/templates/computes/instances.html:64
 #: instances/templates/add_instance_owner_block.html:18
 #: instances/templates/allinstances_index_grouped.html:8
 #: instances/templates/allinstances_index_nongrouped.html:7
-#: instances/templates/instances/stats_tab.html:84
+#: instances/templates/instances/stats_tab.html:87
 msgid "User"
 msgstr ""
 
@@ -264,26 +260,26 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: accounts/templates/profile.html:14
+#: accounts/templates/profile.html:15
 msgid "Edit Profile"
 msgstr ""
 
-#: accounts/templates/profile.html:17
-#: instances/templates/instances/access_tab.html:23
+#: accounts/templates/profile.html:20
+#: instances/templates/instances/access_tab.html:20
 msgid "SSH Keys"
 msgstr ""
 
-#: accounts/templates/profile.html:34
-#: instances/templates/instances/settings_tab.html:686
-#: instances/templates/instances/settings_tab.html:688
+#: accounts/templates/profile.html:38
+#: instances/templates/instances/settings_tab.html:720
+#: instances/templates/instances/settings_tab.html:722
 msgid "Update"
 msgstr ""
 
-#: accounts/templates/profile.html:64
+#: accounts/templates/profile.html:68
 msgid "Add SSH Key"
 msgstr ""
 
-#: accounts/templates/profile.html:72
+#: accounts/templates/profile.html:76
 #: instances/templates/add_instance_network_block.html:50
 #: instances/templates/add_instance_owner_block.html:31
 #: instances/templates/create_flav_block.html:28
@@ -297,7 +293,6 @@ msgstr ""
 
 #: accounts/utils.py:51
 msgid "Please view HTML version of this message."
-<<<<<<< HEAD
 msgstr ""
 
 #: accounts/views.py:26
@@ -347,57 +342,6 @@ msgid "OTP QR code was emailed to user %(user)s"
 msgstr ""
 
 #: accounts/views.py:196
-=======
-msgstr ""
-
-#: accounts/views.py:26
-msgid "Profile updated"
-msgstr ""
-
-#: accounts/views.py:40
-msgid "SSH key added"
-msgstr ""
-
-#: accounts/views.py:45
-msgid "Add SSH key"
-msgstr ""
-
-#: accounts/views.py:53
-msgid "SSH key deleted"
-msgstr ""
-
-#: accounts/views.py:58
-msgid "Delete SSH key"
-msgstr ""
-
-#: accounts/views.py:86
-msgid "Password Changed"
-msgstr ""
-
-#: accounts/views.py:106
-msgid "Create User Instance"
-msgstr ""
-
-#: accounts/views.py:124
-msgid "Update User Instance"
-msgstr ""
-
-#: accounts/views.py:160
-#, python-format
-msgid "OTP Sent to %s"
-msgstr ""
-
-#: accounts/views.py:165
-msgid "Email OTP"
-msgstr ""
-
-#: accounts/views.py:175
-#, python-format
-msgid "OTP QR code was emailed to user %s"
-msgstr ""
-
-#: accounts/views.py:177
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "User email not set, failed to send QR code"
 msgstr ""
 
@@ -405,156 +349,145 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: admin/forms.py:56 admin/templates/admin/group_list.html:15
+#: admin/forms.py:56 admin/templates/admin/group_list.html:13
 #: templates/navbar.html:30
 msgid "Groups"
 msgstr ""
 
-<<<<<<< HEAD
 #: admin/forms.py:81
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, \n"
 "                    but you can change the password using <a href='{}'>this "
 "form</a>."
-=======
-#: admin/forms.py:79
-msgid ""
-"Raw passwords are not stored, so there is no way to see\n"
-"                this user's password, but you can change the password using "
-"<a href='{}'>this form</a>."
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgstr ""
 
 #: admin/templates/admin/group_list.html:5 admin/views.py:87
-#: instances/templates/instances/settings_tab.html:63 templates/navbar.html:29
+#: instances/templates/instances/settings_tab.html:69 templates/navbar.html:29
 msgid "Users"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:13
-#: admin/templates/admin/user_list.html:16
-#: computes/templates/computes/instances.html:18
-#: instances/templates/allinstances.html:16
-#: nwfilters/templates/nwfilters.html:12 storages/templates/storage.html:87
-#: templates/search_block.html:3
-msgid "Search"
-msgstr ""
-
-#: admin/templates/admin/group_list.html:23 admin/templates/admin/logs.html:16
-#: admin/templates/admin/user_list.html:26
-#: computes/templates/computes/instances.html:57
-#: computes/templates/computes/list.html:20
-#: instances/templates/create_instance_w2.html:66
-#: interfaces/templates/interfaces.html:47 networks/templates/networks.html:46
-#: nwfilters/templates/nwfilters.html:135 secrets/templates/secrets.html:50
-#: storages/templates/storage.html:187 storages/templates/storages.html:46
+#: admin/templates/admin/group_list.html:20 admin/templates/admin/logs.html:15
+#: admin/templates/admin/user_list.html:23
+#: computes/templates/computes/instances.html:55
+#: computes/templates/computes/list.html:19
+#: instances/templates/create_instance_w2.html:67
+#: interfaces/templates/interfaces.html:48 networks/templates/networks.html:45
+#: nwfilters/templates/nwfilters.html:132 storages/templates/storage.html:187
+#: storages/templates/storages.html:45 virtsecrets/templates/secrets.html:51
 msgid "Warning"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:23
+#: admin/templates/admin/group_list.html:20
 msgid "You don't have any groups"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:31
+#: admin/templates/admin/group_list.html:28
 msgid "Group Name"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:32
-#: admin/templates/admin/user_list.html:39
-#: computes/templates/computes/instances.html:71
-#: computes/templates/computes/list.html:31
+#: admin/templates/admin/group_list.html:29
+#: admin/templates/admin/user_list.html:36
+#: computes/templates/computes/instances.html:68
+#: computes/templates/computes/list.html:30
 #: instances/templates/allinstances_index_grouped.html:12
 #: instances/templates/allinstances_index_nongrouped.html:12
-#: instances/templates/instances/settings_tab.html:343
-#: instances/templates/instances/settings_tab.html:491
+#: instances/templates/instances/settings_tab.html:355
+#: instances/templates/instances/settings_tab.html:525
 #: networks/templates/network.html:175 networks/templates/network.html:284
 #: networks/templates/network.html:332
 msgid "Actions"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:43
-#: admin/templates/admin/user_list.html:62
-#: computes/templates/computes/list.html:53 networks/templates/network.html:82
-#: nwfilters/templates/nwfilter.html:59 secrets/templates/secrets.html:74
+#: admin/templates/admin/group_list.html:40
+#: admin/templates/admin/user_list.html:59
+#: computes/templates/computes/list.html:52 networks/templates/network.html:82
+#: nwfilters/templates/nwfilter.html:59 virtsecrets/templates/secrets.html:75
 msgid "Edit"
 msgstr ""
 
 #: admin/templates/admin/logs.html:5 admin/templates/admin/logs.html:7
-#: instances/templates/instances/stats_tab.html:13 templates/navbar.html:31
+#: instances/templates/instances/stats_tab.html:12 templates/navbar.html:31
 msgid "Logs"
 msgstr ""
 
-#: admin/templates/admin/logs.html:16
+#: admin/templates/admin/logs.html:15
 msgid "You don't have any Logs"
 msgstr ""
 
-#: admin/templates/admin/logs.html:25
-#: instances/templates/instances/snapshots_tab.html:48
-#: instances/templates/instances/stats_tab.html:83
+#: admin/templates/admin/logs.html:24
+#: instances/templates/instances/snapshots_tab.html:40
+#: instances/templates/instances/stats_tab.html:86
 msgid "Date"
 msgstr ""
 
+#: admin/templates/admin/logs.html:26
+#: console/templates/console-spice-full.html:202
+#: instances/templates/allinstances_index_nongrouped.html:7
+msgid "Host"
+msgstr ""
+
 #: admin/templates/admin/logs.html:28
-#: instances/templates/instances/stats_tab.html:85
+#: instances/templates/instances/stats_tab.html:88
 msgid "Message"
 msgstr ""
 
 #: admin/templates/admin/user_form.html:21
 #: computes/templates/computes/form.html:23
-#: instances/templates/edit_instance_volume.html:124
+#: instances/templates/instances/edit_instance_volume.html:111
 #: networks/templates/add_network_qos.html:51 templates/common/form.html:22
 msgid "Save"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:26
+#: admin/templates/admin/user_list.html:23
 msgid "You don't have any user"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:34
+#: admin/templates/admin/user_list.html:31
 msgid "Username"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:35
-#: computes/templates/computes/instances.html:68
-#: computes/templates/computes/list.html:29
+#: admin/templates/admin/user_list.html:32
+#: computes/templates/computes/instances.html:65
+#: computes/templates/computes/list.html:28
 #: instances/templates/allinstances_index_grouped.html:9
 #: instances/templates/allinstances_index_nongrouped.html:9
 msgid "Status"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:36
+#: admin/templates/admin/user_list.html:33
 msgid "Staff"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:37
+#: admin/templates/admin/user_list.html:34
 msgid "Superuser"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:38
+#: admin/templates/admin/user_list.html:35
 msgid "Can Clone"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:51
-#: computes/templates/computes/instances.html:94
-#: instances/templates/allinstances_index_grouped.html:57
-#: instances/templates/allinstances_index_nongrouped.html:40
+#: admin/templates/admin/user_list.html:48
+#: computes/templates/computes/instances.html:91
+#: instances/templates/allinstances_index_grouped.html:59
+#: instances/templates/allinstances_index_nongrouped.html:41
 #: instances/templates/instance.html:19
 msgid "Active"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:53
+#: admin/templates/admin/user_list.html:50
 msgid "Blocked"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:61
+#: admin/templates/admin/user_list.html:58
 msgid "View Profile"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:64
+#: admin/templates/admin/user_list.html:61
 msgid "Block"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:66
+#: admin/templates/admin/user_list.html:63
 msgid "Unblock"
 msgstr ""
 
@@ -566,11 +499,10 @@ msgstr ""
 msgid "Update Group"
 msgstr ""
 
-#: admin/views.py:113
+#: admin/views.py:110
 msgid "Create User"
 msgstr ""
 
-<<<<<<< HEAD
 #: admin/views.py:129
 msgid "Update User"
 msgstr ""
@@ -581,17 +513,6 @@ msgid "Password changed for %(user)s"
 msgstr ""
 
 #: admin/views.py:144
-=======
-#: admin/views.py:136
-msgid "Update User"
-msgstr ""
-
-#: admin/views.py:149
-msgid "User password changed: {}"
-msgstr ""
-
-#: admin/views.py:152
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "Wrong Data Provided"
 msgstr ""
 
@@ -877,33 +798,18 @@ msgid "Other Settings"
 msgstr ""
 
 #: appsettings/views.py:38
-<<<<<<< HEAD
 #, python-format
 msgid "SASS directory path is changed. Now: %(dir)s"
 msgstr ""
 
-#: appsettings/views.py:67
+#: appsettings/views.py:70
 #, python-format
 msgid "Theme is changed. Now: %(theme)s"
 msgstr ""
 
-#: appsettings/views.py:82
+#: appsettings/views.py:85
 #, python-format
 msgid "%(setting)s is changed. Now: %(value)s"
-=======
-#, python-brace-format
-msgid "SASS directory path is changed. Now: {sass_dir.value}"
-msgstr ""
-
-#: appsettings/views.py:65
-#, python-brace-format
-msgid "Theme changed. Now: {theme}"
-msgstr ""
-
-#: appsettings/views.py:80
-#, python-brace-format
-msgid "{setting.name} is changed. Now: {setting.value}"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgstr ""
 
 #: computes/forms.py:21
@@ -934,144 +840,144 @@ msgstr ""
 msgid "Create Compute"
 msgstr ""
 
-#: computes/templates/computes/instances.html:29
-#: computes/templates/computes/list.html:49
-#: computes/templates/computes/list.html:51 computes/templates/overview.html:6
-#: computes/templates/overview.html:16 interfaces/templates/interface.html:13
-#: interfaces/templates/interfaces.html:17 networks/templates/network.html:14
+#: computes/templates/computes/instances.html:27
+#: computes/templates/computes/list.html:48
+#: computes/templates/computes/list.html:50 computes/templates/overview.html:6
+#: computes/templates/overview.html:15 interfaces/templates/interface.html:13
+#: interfaces/templates/interfaces.html:19 networks/templates/network.html:14
 #: networks/templates/networks.html:16 nwfilters/templates/nwfilter.html:14
-#: nwfilters/templates/nwfilters.html:22 secrets/templates/secrets.html:20
-#: storages/templates/storage.html:19 storages/templates/storages.html:16
+#: nwfilters/templates/nwfilters.html:20 storages/templates/storage.html:20
+#: storages/templates/storages.html:16 virtsecrets/templates/secrets.html:22
 msgid "Overview"
 msgstr ""
 
-#: computes/templates/computes/instances.html:35
-#: computes/templates/overview.html:22 interfaces/templates/interface.html:19
-#: interfaces/templates/interfaces.html:23 networks/templates/network.html:20
+#: computes/templates/computes/instances.html:33
+#: computes/templates/overview.html:21 interfaces/templates/interface.html:19
+#: interfaces/templates/interfaces.html:25 networks/templates/network.html:20
 #: networks/templates/networks.html:22 nwfilters/templates/nwfilter.html:20
-#: nwfilters/templates/nwfilters.html:28 secrets/templates/secrets.html:26
-#: storages/templates/storage.html:25 storages/templates/storages.html:4
-#: storages/templates/storages.html:6 storages/templates/storages.html:22
+#: nwfilters/templates/nwfilters.html:26 storages/templates/storage.html:26
+#: storages/templates/storages.html:4 storages/templates/storages.html:6
+#: storages/templates/storages.html:22 virtsecrets/templates/secrets.html:28
 msgid "Storages"
 msgstr ""
 
-#: computes/templates/computes/instances.html:38
-#: computes/templates/overview.html:25 interfaces/templates/interface.html:22
-#: interfaces/templates/interfaces.html:26 networks/templates/network.html:23
+#: computes/templates/computes/instances.html:36
+#: computes/templates/overview.html:24 interfaces/templates/interface.html:22
+#: interfaces/templates/interfaces.html:28 networks/templates/network.html:23
 #: networks/templates/networks.html:4 networks/templates/networks.html:6
 #: networks/templates/networks.html:25 nwfilters/templates/nwfilter.html:23
-#: nwfilters/templates/nwfilters.html:31 secrets/templates/secrets.html:29
-#: storages/templates/storage.html:28 storages/templates/storages.html:25
+#: nwfilters/templates/nwfilters.html:29 storages/templates/storage.html:29
+#: storages/templates/storages.html:25 virtsecrets/templates/secrets.html:31
 msgid "Networks"
 msgstr ""
 
-#: computes/templates/computes/instances.html:41
-#: computes/templates/overview.html:28 interfaces/templates/interface.html:25
+#: computes/templates/computes/instances.html:39
+#: computes/templates/overview.html:27 interfaces/templates/interface.html:25
 #: interfaces/templates/interfaces.html:5
 #: interfaces/templates/interfaces.html:7
-#: interfaces/templates/interfaces.html:29 networks/templates/network.html:26
+#: interfaces/templates/interfaces.html:31 networks/templates/network.html:26
 #: networks/templates/networks.html:28 nwfilters/templates/nwfilter.html:26
-#: nwfilters/templates/nwfilters.html:34 secrets/templates/secrets.html:32
-#: storages/templates/storage.html:31 storages/templates/storages.html:28
+#: nwfilters/templates/nwfilters.html:32 storages/templates/storage.html:32
+#: storages/templates/storages.html:28 virtsecrets/templates/secrets.html:34
 msgid "Interfaces"
 msgstr ""
 
-#: computes/templates/computes/instances.html:44
-#: computes/templates/overview.html:31 interfaces/templates/interface.html:28
-#: interfaces/templates/interfaces.html:32 networks/templates/network.html:29
+#: computes/templates/computes/instances.html:42
+#: computes/templates/overview.html:30 interfaces/templates/interface.html:28
+#: interfaces/templates/interfaces.html:34 networks/templates/network.html:29
 #: networks/templates/networks.html:31 nwfilters/templates/nwfilter.html:29
 #: nwfilters/templates/nwfilters.html:5 nwfilters/templates/nwfilters.html:7
-#: nwfilters/templates/nwfilters.html:37 secrets/templates/secrets.html:35
-#: storages/templates/storage.html:34 storages/templates/storages.html:31
+#: nwfilters/templates/nwfilters.html:35 storages/templates/storage.html:35
+#: storages/templates/storages.html:31 virtsecrets/templates/secrets.html:37
 msgid "NWFilters"
 msgstr ""
 
-#: computes/templates/computes/instances.html:47
-#: computes/templates/overview.html:34 interfaces/templates/interface.html:31
-#: interfaces/templates/interfaces.html:35 networks/templates/network.html:32
+#: computes/templates/computes/instances.html:45
+#: computes/templates/overview.html:33 interfaces/templates/interface.html:31
+#: interfaces/templates/interfaces.html:37 networks/templates/network.html:32
 #: networks/templates/networks.html:34 nwfilters/templates/nwfilter.html:32
-#: nwfilters/templates/nwfilters.html:40 secrets/templates/secrets.html:4
-#: secrets/templates/secrets.html:10 secrets/templates/secrets.html:38
-#: storages/templates/create_stg_block.html:124
-#: storages/templates/storage.html:37 storages/templates/storages.html:34
+#: nwfilters/templates/nwfilters.html:38
+#: storages/templates/create_stg_block.html:138
+#: storages/templates/storage.html:38 storages/templates/storages.html:34
+#: virtsecrets/templates/secrets.html:4 virtsecrets/templates/secrets.html:10
+#: virtsecrets/templates/secrets.html:40
 msgid "Secrets"
 msgstr ""
 
-#: computes/templates/computes/instances.html:58
+#: computes/templates/computes/instances.html:56
 msgid "Hypervisor doesn't have any Instances"
 msgstr ""
 
-#: computes/templates/computes/instances.html:66
-#: computes/templates/computes/list.html:28
-#: instances/templates/add_instance_volume.html:40
-#: instances/templates/add_instance_volume.html:42
+#: computes/templates/computes/instances.html:63
+#: computes/templates/computes/list.html:27
+#: instances/templates/add_instance_volume.html:44
+#: instances/templates/add_instance_volume.html:46
 #: instances/templates/allinstances_index_grouped.html:7
 #: instances/templates/allinstances_index_nongrouped.html:5
-#: instances/templates/create_instance_w2.html:77
-#: instances/templates/create_instance_w2.html:103
-#: instances/templates/create_instance_w2.html:106
-#: instances/templates/create_instance_w2.html:305
-#: instances/templates/create_instance_w2.html:307
+#: instances/templates/create_instance_w2.html:76
+#: instances/templates/create_instance_w2.html:102
+#: instances/templates/create_instance_w2.html:105
+#: instances/templates/create_instance_w2.html:304
+#: instances/templates/create_instance_w2.html:306
 #: instances/templates/create_instance_w2.html:518
 #: instances/templates/create_instance_w2.html:520
-#: instances/templates/instances/settings_tab.html:340
-#: instances/templates/instances/snapshots_tab.html:47
+#: instances/templates/instances/settings_tab.html:353
+#: instances/templates/instances/snapshots_tab.html:39
 #: interfaces/templates/create_iface_block.html:18
 #: interfaces/templates/interface.html:75
 #: networks/templates/create_net_block.html:18
 #: networks/templates/modify_ipv4_fixed_address.html:30
 #: networks/templates/modify_ipv6_fixed_address.html:30
 #: networks/templates/network.html:174 networks/templates/network.html:283
-#: nwfilters/templates/nwfilter.html:41 nwfilters/templates/nwfilters.html:56
-#: nwfilters/templates/nwfilters.html:100
-#: nwfilters/templates/nwfilters.html:102
-#: storages/templates/create_stg_block.html:42
-#: storages/templates/create_stg_block.html:71
-#: storages/templates/create_stg_block.html:100
-#: storages/templates/create_stg_block.html:165
-#: storages/templates/create_stg_block.html:214
+#: nwfilters/templates/nwfilter.html:41 nwfilters/templates/nwfilters.html:54
+#: nwfilters/templates/nwfilters.html:98 nwfilters/templates/nwfilters.html:100
+#: storages/templates/create_stg_block.html:56
+#: storages/templates/create_stg_block.html:85
+#: storages/templates/create_stg_block.html:114
+#: storages/templates/create_stg_block.html:179
+#: storages/templates/create_stg_block.html:228
 #: storages/templates/create_stg_vol_block.html:21
-#: storages/templates/storage.html:96 storages/templates/storage.html:124
-#: storages/templates/storage.html:126
+#: storages/templates/storage.html:97 storages/templates/storage.html:125
+#: storages/templates/storage.html:127
 msgid "Name"
 msgstr ""
 
-#: computes/templates/computes/instances.html:66
+#: computes/templates/computes/instances.html:63
 #: instances/templates/allinstances_index_grouped.html:7
 #: instances/templates/allinstances_index_nongrouped.html:5
-#: instances/templates/instances/settings_tab.html:782
-#: instances/templates/instances/settings_tab.html:805
+#: instances/templates/instances/settings_tab.html:811
+#: instances/templates/instances/settings_tab.html:834
 msgid "Description"
 msgstr ""
 
-#: computes/templates/computes/instances.html:69
+#: computes/templates/computes/instances.html:66
 #: instances/templates/allinstances_index_grouped.html:10
 #: instances/templates/allinstances_index_nongrouped.html:10
-#: instances/templates/create_instance_w2.html:78
-#: instances/templates/create_instance_w2.html:323
+#: instances/templates/create_instance_w2.html:77
+#: instances/templates/create_instance_w2.html:322
 #: instances/templates/create_instance_w2.html:536
-#: instances/templates/instance.html:42 instances/templates/instance.html:44
+#: instances/templates/instance.html:43 instances/templates/instance.html:45
 msgid "VCPU"
 msgstr ""
 
-#: computes/templates/computes/instances.html:70
-#: computes/templates/overview.html:82
+#: computes/templates/computes/instances.html:67
+#: computes/templates/overview.html:80
 #: instances/templates/allinstances_index_grouped.html:11
 #: instances/templates/allinstances_index_nongrouped.html:11
-#: instances/templates/instances/resize_tab.html:13
+#: instances/templates/instances/resize_tab.html:12
 msgid "Memory"
 msgstr ""
 
-#: computes/templates/computes/instances.html:96
-#: instances/templates/allinstances_index_grouped.html:58
-#: instances/templates/allinstances_index_nongrouped.html:42
+#: computes/templates/computes/instances.html:93
+#: instances/templates/allinstances_index_grouped.html:60
+#: instances/templates/allinstances_index_nongrouped.html:43
 #: instances/templates/instance.html:16
 msgid "Off"
 msgstr ""
 
-#: computes/templates/computes/instances.html:98
-#: instances/templates/allinstances_index_grouped.html:60
-#: instances/templates/allinstances_index_nongrouped.html:44
+#: computes/templates/computes/instances.html:95
+#: instances/templates/allinstances_index_grouped.html:62
+#: instances/templates/allinstances_index_nongrouped.html:45
 msgid "Suspended"
 msgstr ""
 
@@ -1080,23 +986,24 @@ msgstr ""
 msgid "Computes"
 msgstr ""
 
-#: computes/templates/computes/list.html:20
+#: computes/templates/computes/list.html:19
 msgid "You don't have any computes"
 msgstr ""
 
-#: computes/templates/computes/list.html:30 computes/templates/overview.html:92
-#: instances/templates/instances/settings_tab.html:163
-#: instances/templates/instances/settings_tab.html:248
+#: computes/templates/computes/list.html:29 computes/templates/overview.html:90
+#: instances/templates/instances/settings_tab.html:176
+#: instances/templates/instances/settings_tab.html:215
+#: instances/templates/instances/settings_tab.html:263
 msgid "Details"
 msgstr ""
 
-#: computes/templates/computes/list.html:41
+#: computes/templates/computes/list.html:40
 #: instances/templates/allinstances_index_grouped.html:28
-#: instances/templates/instances/settings_tab.html:881
+#: instances/templates/instances/settings_tab.html:906
 msgid "Connected"
 msgstr ""
 
-#: computes/templates/computes/list.html:41
+#: computes/templates/computes/list.html:40
 msgid "Not Connected"
 msgstr ""
 
@@ -1120,67 +1027,69 @@ msgstr ""
 msgid "Add new host"
 msgstr ""
 
-#: computes/templates/overview.html:42
+#: computes/templates/overview.html:40
 msgid "Basic details"
 msgstr ""
 
-#: computes/templates/overview.html:44
-#: storages/templates/create_stg_block.html:171
+#: computes/templates/overview.html:42
+#: instances/templates/instances/info_tab.html:5
+#: storages/templates/create_stg_block.html:185
 msgid "Hostname"
 msgstr ""
 
-#: computes/templates/overview.html:46
+#: computes/templates/overview.html:44
 msgid "Hypervisors"
 msgstr ""
 
-#: computes/templates/overview.html:63
+#: computes/templates/overview.html:61
 msgid "more"
 msgstr ""
 
-#: computes/templates/overview.html:73
+#: computes/templates/overview.html:71
 msgid "Emulator"
 msgstr ""
 
-#: computes/templates/overview.html:75
+#: computes/templates/overview.html:73
+#: instances/templates/instances/info_tab.html:11
 msgid "Version"
 msgstr ""
 
-#: computes/templates/overview.html:77
+#: computes/templates/overview.html:75
 msgid "Qemu"
 msgstr ""
 
-#: computes/templates/overview.html:79
+#: computes/templates/overview.html:77
 msgid "Libvirt"
 msgstr ""
 
-#: computes/templates/overview.html:84
+#: computes/templates/overview.html:82
 #: instances/templates/create_instance_w1.html:36
-#: instances/templates/create_instance_w1.html:52
+#: instances/templates/create_instance_w1.html:50
 msgid "Architecture"
 msgstr ""
 
-#: computes/templates/overview.html:86
+#: computes/templates/overview.html:84
 msgid "Logical CPUs"
 msgstr ""
 
-#: computes/templates/overview.html:88
+#: computes/templates/overview.html:86
 msgid "Processor"
 msgstr ""
 
-#: computes/templates/overview.html:90
+#: computes/templates/overview.html:88
 msgid "Connection"
 msgstr ""
 
-#: computes/templates/overview.html:96
-#: instances/templates/edit_instance_volume.html:22
+#: computes/templates/overview.html:94
+#: instances/templates/instances/edit_instance_volume.html:25
 msgid "Performance"
 msgstr ""
 
-#: computes/templates/overview.html:102
+#: computes/templates/overview.html:100
 msgid "CPU Utilization"
 msgstr ""
 
-#: computes/templates/overview.html:111
+#: computes/templates/overview.html:109
 msgid "RAM Utilization"
 msgstr ""
 
@@ -1221,11 +1130,6 @@ msgstr ""
 msgid "File API is not supported"
 msgstr ""
 
-#: console/templates/console-spice-full.html:202
-#: instances/templates/allinstances_index_nongrouped.html:7
-msgid "Host"
-msgstr ""
-
 #: console/templates/console-spice-full.html:204
 msgid "Port"
 msgstr ""
@@ -1238,7 +1142,7 @@ msgstr ""
 #: interfaces/templates/interface.html:59 networks/templates/network.html:49
 #: networks/templates/network.html:119 networks/templates/network.html:125
 #: networks/templates/network.html:231 networks/templates/network.html:237
-#: storages/templates/storage.html:60
+#: storages/templates/storage.html:62
 msgid "Start"
 msgstr ""
 
@@ -1254,6 +1158,20 @@ msgstr ""
 msgid "Loading"
 msgstr ""
 
+#: console/views.py:52
+msgid ""
+"User does not have permission to access console or host/instance not exist"
+msgstr ""
+
+#: console/views.py:84
+msgid "Fail to get console. Please check the console configuration of your VM."
+msgstr ""
+
+#: console/views.py:86
+#, python-format
+msgid "Console type '%(type)s' has not support"
+msgstr ""
+
 #: instances/forms.py:37
 msgid "No Virtual Machine name has been entered"
 msgstr ""
@@ -1314,7 +1232,7 @@ msgstr ""
 msgid "created"
 msgstr ""
 
-#: instances/models.py:220
+#: instances/models.py:216
 msgid "Can access console without password"
 msgstr ""
 
@@ -1323,87 +1241,86 @@ msgid "Add Instance Network"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:18
-#: instances/templates/create_instance_w2.html:205
-#: instances/templates/instances/settings_tab.html:359
-#: instances/templates/instances/settings_tab.html:382
-#: instances/templates/instances/settings_tab.html:487
+#: instances/templates/create_instance_w2.html:182
+#: instances/templates/instances/settings_tab.html:373
+#: instances/templates/instances/settings_tab.html:409
+#: instances/templates/instances/settings_tab.html:521
 #: interfaces/templates/interface.html:45
 #: interfaces/templates/interface.html:74
-#: interfaces/templates/interfaces.html:63
+#: interfaces/templates/interfaces.html:64
 #: networks/templates/modify_ipv4_fixed_address.html:24
 #: networks/templates/network.html:172
 msgid "MAC"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:24
-#: instances/templates/create_instance_w2.html:164
-#: instances/templates/create_instance_w2.html:388
-#: instances/templates/create_instance_w2.html:605
-#: instances/templates/instances/settings_tab.html:30
-#: instances/templates/instances/settings_tab.html:394
+#: instances/templates/create_instance_w2.html:163
+#: instances/templates/create_instance_w2.html:387
+#: instances/templates/instances/settings_tab.html:36
+#: instances/templates/instances/settings_tab.html:421
 #: networks/templates/network.html:5 networks/templates/network.html:7
 #: networks/templates/network.html:107 networks/templates/network.html:218
 msgid "Network"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:37
-#: instances/templates/create_instance_w2.html:183
+#: instances/templates/create_instance_w2.html:188
 #: instances/templates/create_instance_w2.html:429
-#: instances/templates/create_instance_w2.html:642
-#: instances/templates/instances/settings_tab.html:403
+#: instances/templates/create_instance_w2.html:645
+#: instances/templates/instances/settings_tab.html:430
 #: nwfilters/templates/nwfilter.html:5 nwfilters/templates/nwfilter.html:7
 msgid "NWFilter"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:40
-#: instances/templates/add_instance_volume.html:117
+#: instances/templates/add_instance_volume.html:121
 #: instances/templates/create_inst_block.html:25
-#: instances/templates/create_instance_w2.html:158
-#: instances/templates/create_instance_w2.html:186
-#: instances/templates/create_instance_w2.html:377
+#: instances/templates/create_instance_w2.html:157
+#: instances/templates/create_instance_w2.html:191
+#: instances/templates/create_instance_w2.html:376
 #: instances/templates/create_instance_w2.html:432
 #: instances/templates/create_instance_w2.html:580
 #: instances/templates/create_instance_w2.html:599
-#: instances/templates/create_instance_w2.html:645
-#: instances/templates/instances/access_tab.html:135
-#: instances/templates/instances/settings_tab.html:183
-#: instances/templates/instances/settings_tab.html:407
-#: instances/templates/instances/stats_tab.html:90
+#: instances/templates/create_instance_w2.html:648
+#: instances/templates/instances/access_tab.html:123
+#: instances/templates/instances/settings_tab.html:191
+#: instances/templates/instances/settings_tab.html:434
+#: instances/templates/instances/stats_tab.html:93
 #: interfaces/templates/interface.html:41
-#: interfaces/templates/interface.html:43 nwfilters/templates/nwfilter.html:78
-#: storages/templates/create_stg_block.html:132
-#: storages/templates/storage.html:47 storages/templates/storage.html:49
-#: storages/templates/storage.html:51
+#: interfaces/templates/interface.html:43 nwfilters/templates/nwfilter.html:73
+#: storages/templates/create_stg_block.html:146
+#: storages/templates/storage.html:49 storages/templates/storage.html:51
+#: storages/templates/storage.html:53
 msgid "None"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:49
 #: instances/templates/add_instance_owner_block.html:30
-#: instances/templates/add_instance_volume.html:89
-#: instances/templates/add_instance_volume.html:144
+#: instances/templates/add_instance_volume.html:93
+#: instances/templates/add_instance_volume.html:148
 #: instances/templates/create_flav_block.html:25
 #: instances/templates/create_inst_block.html:34
-#: instances/templates/create_instance_w2.html:269
-#: instances/templates/edit_instance_volume.html:123
-#: instances/templates/instances/settings_tab.html:428
-#: interfaces/templates/create_iface_block.html:135
+#: instances/templates/create_instance_w2.html:268
+#: instances/templates/instances/edit_instance_volume.html:110
+#: instances/templates/instances/settings_tab.html:455
+#: interfaces/templates/create_iface_block.html:139
 #: networks/templates/add_network_qos.html:50
 #: networks/templates/create_net_block.html:85
 #: networks/templates/modify_ipv4_fixed_address.html:44
 #: networks/templates/modify_ipv6_fixed_address.html:44
 #: nwfilters/templates/add_nwf_rule.html:25
-#: nwfilters/templates/create_nwfilter_block.html:23
-#: nwfilters/templates/nwfilters.html:80 nwfilters/templates/nwfilters.html:108
-#: secrets/templates/create_secret_block.html:54
-#: secrets/templates/secrets.html:102
-#: storages/templates/create_stg_block.html:55
-#: storages/templates/create_stg_block.html:84
-#: storages/templates/create_stg_block.html:140
-#: storages/templates/create_stg_block.html:202
-#: storages/templates/create_stg_block.html:230
+#: nwfilters/templates/create_nwfilter_block.html:25
+#: nwfilters/templates/nwfilters.html:78 nwfilters/templates/nwfilters.html:106
+#: storages/templates/create_stg_block.html:69
+#: storages/templates/create_stg_block.html:98
+#: storages/templates/create_stg_block.html:154
+#: storages/templates/create_stg_block.html:216
+#: storages/templates/create_stg_block.html:244
 #: storages/templates/create_stg_vol_block.html:28
 #: storages/templates/create_stg_vol_block.html:56
-#: storages/templates/storage.html:154
+#: storages/templates/storage.html:155
+#: virtsecrets/templates/create_secret_block.html:54
+#: virtsecrets/templates/secrets.html:103
 msgid "Close"
 msgstr ""
 
@@ -1412,8 +1329,8 @@ msgid "Add Instance Owner"
 msgstr ""
 
 #: instances/templates/add_instance_volume.html:3
-#: instances/templates/add_instance_volume.html:90
-#: instances/templates/add_instance_volume.html:145
+#: instances/templates/add_instance_volume.html:94
+#: instances/templates/add_instance_volume.html:149
 msgid "Add Volume"
 msgstr ""
 
@@ -1421,72 +1338,73 @@ msgstr ""
 msgid "Add Instance Volume"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:18
+#: instances/templates/add_instance_volume.html:19
 msgid "New Disk"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:21
+#: instances/templates/add_instance_volume.html:24
 msgid "Existing Disk"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:28
-#: instances/templates/add_instance_volume.html:98
+#: instances/templates/add_instance_volume.html:32
+#: instances/templates/add_instance_volume.html:102
 msgid "Volume parameters"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:30
-#: instances/templates/add_instance_volume.html:100
-#: instances/templates/create_instance_w2.html:149
+#: instances/templates/add_instance_volume.html:34
+#: instances/templates/add_instance_volume.html:104
+#: instances/templates/create_instance_w2.html:148
 #: instances/templates/create_instance_w2.html:591
-#: instances/templates/instances/settings_tab.html:237
+#: instances/templates/instances/settings_tab.html:252
 #: storages/templates/storage.html:4 storages/templates/storage.html:9
 msgid "Storage"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:46
-#: storages/templates/create_stg_block.html:183
-#: storages/templates/storage.html:99 storages/templates/storage.html:137
+#: instances/templates/add_instance_volume.html:50
+#: storages/templates/create_stg_block.html:197
+#: storages/templates/storage.html:100 storages/templates/storage.html:138
 msgid "Format"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:56
-#: storages/templates/storage.html:52 storages/templates/storage.html:98
-#: storages/templates/storages.html:62
+#: instances/templates/add_instance_volume.html:60
+#: storages/templates/storage.html:54 storages/templates/storage.html:99
+#: storages/templates/storages.html:61
 msgid "Size"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:60
-#: instances/templates/create_instance_w2.html:91
+#: instances/templates/add_instance_volume.html:64
+#: instances/templates/create_instance_w2.html:90
 msgid "GB"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:63
-#: instances/templates/add_instance_volume.html:123
-#: instances/templates/edit_instance_volume.html:53
-#: instances/templates/instances/settings_tab.html:168
+#: instances/templates/add_instance_volume.html:67
+#: instances/templates/add_instance_volume.html:127
+#: instances/templates/instances/edit_instance_volume.html:89
+#: instances/templates/instances/settings_tab.html:181
+#: instances/templates/instances/settings_tab.html:220
 msgid "Bus"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:73
-#: instances/templates/add_instance_volume.html:133
+#: instances/templates/add_instance_volume.html:77
+#: instances/templates/add_instance_volume.html:137
 msgid "Cache"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:83
-#: instances/templates/instances/settings_tab.html:760
-#: storages/templates/storage.html:147
+#: instances/templates/add_instance_volume.html:87
+#: instances/templates/instances/settings_tab.html:789
+#: storages/templates/storage.html:148
 msgid "Metadata"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:103
+#: instances/templates/add_instance_volume.html:107
 msgid "Select Pool"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:114
+#: instances/templates/add_instance_volume.html:118
 msgid "Volume"
 msgstr ""
 
-#: instances/templates/allinstances.html:24
+#: instances/templates/allinstances.html:22
 msgid "Problem occurred with host"
 msgstr ""
 
@@ -1535,39 +1453,39 @@ msgid "New instance on %(host)s "
 msgstr ""
 
 #: instances/templates/create_instance_w1.html:41
-#: instances/templates/instances/settings_tab.html:49
+#: instances/templates/instances/settings_tab.html:55
 #: networks/templates/network.html:72 nwfilters/templates/nwfilter.html:49
 msgid "XML"
 msgstr ""
 
-#: instances/templates/create_instance_w1.html:62
+#: instances/templates/create_instance_w1.html:60
 msgid "Chipset"
 msgstr ""
 
-#: instances/templates/create_instance_w1.html:72
+#: instances/templates/create_instance_w1.html:70
 msgid "Next"
 msgstr ""
 
-#: instances/templates/create_instance_w1.html:89
-#: instances/templates/create_instance_w2.html:271
-#: instances/templates/create_instance_w2.html:273
+#: instances/templates/create_instance_w1.html:85
+#: instances/templates/create_instance_w2.html:270
+#: instances/templates/create_instance_w2.html:272
 #: instances/templates/create_instance_w2.html:500
 #: instances/templates/create_instance_w2.html:504
-#: instances/templates/create_instance_w2.html:713
-#: instances/templates/create_instance_w2.html:717
-#: interfaces/templates/create_iface_block.html:138
+#: instances/templates/create_instance_w2.html:716
+#: instances/templates/create_instance_w2.html:720
+#: interfaces/templates/create_iface_block.html:142
 #: networks/templates/create_net_block.html:86
 #: networks/templates/modify_ipv4_fixed_address.html:45
 #: networks/templates/modify_ipv6_fixed_address.html:45
-#: nwfilters/templates/create_nwfilter_block.html:24
-#: secrets/templates/create_secret_block.html:55
-#: storages/templates/create_stg_block.html:56
-#: storages/templates/create_stg_block.html:85
-#: storages/templates/create_stg_block.html:144
-#: storages/templates/create_stg_block.html:148
-#: storages/templates/create_stg_block.html:205
-#: storages/templates/create_stg_block.html:233
+#: nwfilters/templates/create_nwfilter_block.html:26
+#: storages/templates/create_stg_block.html:70
+#: storages/templates/create_stg_block.html:99
+#: storages/templates/create_stg_block.html:158
+#: storages/templates/create_stg_block.html:162
+#: storages/templates/create_stg_block.html:219
+#: storages/templates/create_stg_block.html:247
 #: storages/templates/create_stg_vol_block.html:57
+#: virtsecrets/templates/create_secret_block.html:55
 msgid "Create"
 msgstr ""
 
@@ -1583,113 +1501,113 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:66
-msgid "Hypervisor doesn't have any Flavors"
-msgstr ""
-
-#: instances/templates/create_instance_w2.html:71
+#: instances/templates/create_instance_w2.html:63
 msgid "Create from flavor"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:79
-#: instances/templates/create_instance_w2.html:352
+#: instances/templates/create_instance_w2.html:67
+msgid "Hypervisor doesn't have any Flavors"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:78
+#: instances/templates/create_instance_w2.html:351
 #: instances/templates/create_instance_w2.html:563
-#: instances/templates/instance.html:47
+#: instances/templates/instance.html:48
 msgid "RAM"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:80
-#: instances/templates/create_instance_w2.html:367
+#: instances/templates/create_instance_w2.html:79
+#: instances/templates/create_instance_w2.html:366
 msgid "HDD"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:90
-#: instances/templates/create_instance_w2.html:356
+#: instances/templates/create_instance_w2.html:89
+#: instances/templates/create_instance_w2.html:355
 #: instances/templates/create_instance_w2.html:567
-#: instances/templates/instance.html:47
+#: instances/templates/instance.html:48
 #: instances/templates/instances/resize_tab.html:95
-#: instances/templates/instances/resize_tab.html:108
+#: instances/templates/instances/resize_tab.html:109
 msgid "MB"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:97
+#: instances/templates/create_instance_w2.html:96
 msgid "Create Virtual Machine"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:115
-#: instances/templates/create_instance_w2.html:312
+#: instances/templates/create_instance_w2.html:114
+#: instances/templates/create_instance_w2.html:311
 #: instances/templates/create_instance_w2.html:525
 msgid "Firmware"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:127
-#: instances/templates/create_instance_w2.html:330
+#: instances/templates/create_instance_w2.html:126
+#: instances/templates/create_instance_w2.html:329
 #: instances/templates/create_instance_w2.html:542
 msgid "VCPU Config"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:130
-#: instances/templates/create_instance_w2.html:333
+#: instances/templates/create_instance_w2.html:129
+#: instances/templates/create_instance_w2.html:332
 #: instances/templates/create_instance_w2.html:545
 msgid "no-mode"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:174
+#: instances/templates/create_instance_w2.html:173
 #: instances/templates/create_instance_w2.html:402
-#: instances/templates/create_instance_w2.html:615
-#: instances/templates/edit_instance_volume.html:25
+#: instances/templates/create_instance_w2.html:618
+#: instances/templates/instances/edit_instance_volume.html:30
 msgid "Advanced"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:194
-#: instances/templates/create_instance_w2.html:631
+#: instances/templates/create_instance_w2.html:199
+#: instances/templates/create_instance_w2.html:634
 msgid "HDD cache mode"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:212
+#: instances/templates/create_instance_w2.html:211
 #: instances/templates/create_instance_w2.html:441
-#: instances/templates/create_instance_w2.html:654
+#: instances/templates/create_instance_w2.html:657
 msgid "Graphics"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:223
+#: instances/templates/create_instance_w2.html:222
 #: instances/templates/create_instance_w2.html:452
-#: instances/templates/create_instance_w2.html:665
+#: instances/templates/create_instance_w2.html:668
 msgid "Video"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:237
+#: instances/templates/create_instance_w2.html:236
 #: instances/templates/create_instance_w2.html:466
-#: instances/templates/create_instance_w2.html:679
+#: instances/templates/create_instance_w2.html:682
 msgid "Console Access"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:247
-#: instances/templates/create_instance_w2.html:249
+#: instances/templates/create_instance_w2.html:246
+#: instances/templates/create_instance_w2.html:248
 #: instances/templates/create_instance_w2.html:476
 #: instances/templates/create_instance_w2.html:478
-#: instances/templates/create_instance_w2.html:689
-#: instances/templates/create_instance_w2.html:691
+#: instances/templates/create_instance_w2.html:692
+#: instances/templates/create_instance_w2.html:694
 msgid "Console Password"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:253
+#: instances/templates/create_instance_w2.html:252
 #: instances/templates/create_instance_w2.html:482
-#: instances/templates/create_instance_w2.html:695
+#: instances/templates/create_instance_w2.html:698
 msgid "Guest Agent"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:260
+#: instances/templates/create_instance_w2.html:259
 #: instances/templates/create_instance_w2.html:489
-#: instances/templates/create_instance_w2.html:702
+#: instances/templates/create_instance_w2.html:705
 msgid "VirtIO"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:287
-#: instances/templates/instances/settings_tab.html:439
-#: instances/templates/instances/settings_tab.html:515
-#: instances/templates/instances/settings_tab.html:525
-#: instances/templates/instances/snapshots_tab.html:75
+#: instances/templates/create_instance_w2.html:286
+#: instances/templates/instances/settings_tab.html:473
+#: instances/templates/instances/settings_tab.html:549
+#: instances/templates/instances/settings_tab.html:559
+#: instances/templates/instances/snapshots_tab.html:67
 #: interfaces/templates/interface.html:60
 #: interfaces/templates/interface.html:62 networks/templates/network.html:50
 #: networks/templates/network.html:52 networks/templates/network.html:62
@@ -1697,35 +1615,35 @@ msgstr ""
 #: networks/templates/network.html:194 networks/templates/network.html:249
 #: networks/templates/network.html:298 networks/templates/network.html:303
 #: networks/templates/network.html:353 networks/templates/network.html:358
-#: nwfilters/templates/nwfilter.html:111 nwfilters/templates/nwfilter.html:151
-#: nwfilters/templates/nwfilters.html:120 secrets/templates/secrets.html:77
-#: storages/templates/storage.html:62 storages/templates/storage.html:65
-#: storages/templates/storage.html:77 storages/templates/storage.html:174
+#: nwfilters/templates/nwfilter.html:103 nwfilters/templates/nwfilter.html:143
+#: nwfilters/templates/nwfilters.html:118 storages/templates/storage.html:64
+#: storages/templates/storage.html:67 storages/templates/storage.html:79
+#: storages/templates/storage.html:175 virtsecrets/templates/secrets.html:78
 msgid "Are you sure?"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:359
+#: instances/templates/create_instance_w2.html:358
 msgid "Added Disks"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:372
+#: instances/templates/create_instance_w2.html:371
 #: instances/templates/create_instance_w2.html:575
 msgid "Select pool"
 msgstr ""
 
 #: instances/templates/create_instance_w2.html:411
-#: instances/templates/create_instance_w2.html:624
+#: instances/templates/create_instance_w2.html:627
 msgid "Disk Metadata"
 msgstr ""
 
 #: instances/templates/create_instance_w2.html:413
-#: instances/templates/create_instance_w2.html:626
+#: instances/templates/create_instance_w2.html:629
 msgid "Metadata preallocation"
 msgstr ""
 
 #: instances/templates/create_instance_w2.html:415
-#: instances/templates/create_instance_w2.html:628
-#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:360
+#: instances/templates/create_instance_w2.html:631
+#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:375
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/files.py:391
 msgid "Image"
 msgstr ""
@@ -1738,64 +1656,16 @@ msgstr ""
 msgid "Template Disk"
 msgstr ""
 
-#: instances/templates/edit_instance_volume.html:3
-msgid "Edit Volume"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:12
-msgid "Edit Instance Volume"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:19
-msgid "Virtual Disk"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:32
-msgid "Volume Path"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:38
-msgid "Readonly"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:44
-msgid "Shareable"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:63
-msgid "Serial Number"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:69
-msgid "Storage Format"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:78
-msgid "Cache mode"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:88
-msgid "IO mode"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:98
-msgid "Discard mode"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:108
-msgid "Detect zeroes"
+#: instances/templates/create_instance_w2.html:605
+msgid "Network/MAC"
 msgstr ""
 
 #: instances/templates/instance.html:22
 #: instances/templates/instance_actions.html:14
 #: instances/templates/instance_actions.html:25
 #: instances/templates/instance_actions.html:37
-#: instances/templates/instances/power_tab.html:25
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:82 instances/views.py:270
-=======
-#: instances/templates/instances/power_tab.html:82 instances/views.py:264
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:24
+#: instances/templates/instances/power_tab.html:81 instances/views.py:277
 msgid "Suspend"
 msgstr ""
 
@@ -1811,92 +1681,80 @@ msgstr ""
 msgid "Guest Agent Not Enabled & Not Connected"
 msgstr ""
 
-#: instances/templates/instance.html:50
-#: instances/templates/instances/resize_tab.html:18
-#: instances/templates/instances/settings_tab.html:16
+#: instances/templates/instance.html:51
+#: instances/templates/instances/resize_tab.html:17
+#: instances/templates/instances/settings_tab.html:22
 msgid "Disk"
 msgstr ""
 
-#: instances/templates/instance.html:57
+#: instances/templates/instance.html:59
+msgid "Show Instance OS details"
+msgstr ""
+
+#: instances/templates/instance.html:63
 msgid "Refresh instance info"
 msgstr ""
 
-#: instances/templates/instance.html:61
+#: instances/templates/instance.html:69
 msgid "quota reached"
 msgstr ""
 
-#: instances/templates/instance.html:75
+#: instances/templates/instance.html:81
 msgid "Power"
 msgstr ""
 
-#: instances/templates/instance.html:81
+#: instances/templates/instance.html:87
 msgid "Access"
 msgstr ""
 
-#: instances/templates/instance.html:94
+#: instances/templates/instance.html:100
 msgid "Snapshot"
 msgstr ""
 
-#: instances/templates/instance.html:101 templates/navbar.html:32
+#: instances/templates/instance.html:107 templates/navbar.html:32
 msgid "Settings"
 msgstr ""
 
-#: instances/templates/instance.html:107
+#: instances/templates/instance.html:113
 msgid "Stats"
 msgstr ""
 
-#: instances/templates/instance.html:113
-#: instances/templates/instances/destroy_instance_form.html:40
-#: instances/templates/instances/destroy_tab.html:18
-#: instances/templates/instances/destroy_tab.html:20
-<<<<<<< HEAD
-#: instances/templates/instances/destroy_tab.html:23 instances/views.py:312
-=======
-#: instances/templates/instances/destroy_tab.html:23 instances/views.py:306
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instance.html:119
+#: instances/templates/instances/destroy_instance_form.html:35
+#: instances/templates/instances/destroy_tab.html:17
+#: instances/templates/instances/destroy_tab.html:19
+#: instances/templates/instances/destroy_tab.html:22 instances/views.py:319
 msgid "Destroy"
 msgstr ""
 
 #: instances/templates/instance_actions.html:6
-#: instances/templates/instances/settings_tab.html:37
-#: instances/templates/instances/settings_tab.html:788
-#: instances/templates/instances/settings_tab.html:790
-#: nwfilters/templates/nwfilters.html:109
-#: nwfilters/templates/nwfilters.html:115 storages/templates/storage.html:155
-#: storages/templates/storage.html:162
+#: instances/templates/instances/settings_tab.html:43
+#: instances/templates/instances/settings_tab.html:817
+#: instances/templates/instances/settings_tab.html:819
+#: nwfilters/templates/nwfilters.html:107
+#: nwfilters/templates/nwfilters.html:113 storages/templates/storage.html:156
+#: storages/templates/storage.html:163
 msgid "Clone"
 msgstr ""
 
 #: instances/templates/instance_actions.html:10
 #: instances/templates/instance_actions.html:35
-#: instances/templates/instances/power_tab.html:47
-#: instances/templates/instances/power_tab.html:121
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:123 instances/views.py:245
-=======
-#: instances/templates/instances/power_tab.html:123 instances/views.py:239
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:46
+#: instances/templates/instances/power_tab.html:120
+#: instances/templates/instances/power_tab.html:122 instances/views.py:252
 msgid "Power On"
 msgstr ""
 
 #: instances/templates/instance_actions.html:15
-#: instances/templates/instances/power_tab.html:9
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:59 instances/views.py:261
-=======
-#: instances/templates/instances/power_tab.html:59 instances/views.py:255
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:8
+#: instances/templates/instances/power_tab.html:58 instances/views.py:268
 msgid "Power Off"
 msgstr ""
 
 #: instances/templates/instance_actions.html:16
 #: instances/templates/instance_actions.html:29
-#: instances/templates/instances/power_tab.html:14
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:66 instances/views.py:254
-=======
-#: instances/templates/instances/power_tab.html:66 instances/views.py:248
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:13
+#: instances/templates/instances/power_tab.html:65 instances/views.py:261
 msgid "Power Cycle"
 msgstr ""
 
@@ -1906,120 +1764,112 @@ msgid "VNC Console"
 msgstr ""
 
 #: instances/templates/instance_actions.html:22
-#: instances/templates/instances/power_tab.html:34
-#: instances/templates/instances/power_tab.html:93
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:108 instances/views.py:278
-=======
-#: instances/templates/instances/power_tab.html:108 instances/views.py:272
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:33
+#: instances/templates/instances/power_tab.html:92
+#: instances/templates/instances/power_tab.html:107 instances/views.py:285
 msgid "Resume"
 msgstr ""
 
 #: instances/templates/instance_actions.html:26
-#: instances/templates/instances/power_tab.html:19
-#: instances/templates/instances/power_tab.html:39
-#: instances/templates/instances/power_tab.html:74
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:100 instances/views.py:285
-=======
-#: instances/templates/instances/power_tab.html:100 instances/views.py:279
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:18
+#: instances/templates/instances/power_tab.html:38
+#: instances/templates/instances/power_tab.html:73
+#: instances/templates/instances/power_tab.html:99 instances/views.py:292
 msgid "Force Off"
 msgstr ""
 
 #: instances/templates/instance_actions.html:41
-#: instances/templates/instances/access_tab.html:9
-#: instances/templates/instances/access_tab.html:79
-#: instances/templates/instances/access_tab.html:87
-#: instances/templates/instances/access_tab.html:90
-#: instances/templates/instances/access_tab.html:94
-#: instances/templates/instances/settings_tab.html:23
+#: instances/templates/instances/access_tab.html:7
+#: instances/templates/instances/access_tab.html:67
+#: instances/templates/instances/access_tab.html:75
+#: instances/templates/instances/access_tab.html:78
+#: instances/templates/instances/access_tab.html:82
+#: instances/templates/instances/settings_tab.html:29
 msgid "Console"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:16
+#: instances/templates/instances/access_tab.html:13
 msgid "Root Password"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:31
-#: instances/templates/instances/access_tab.html:156
+#: instances/templates/instances/access_tab.html:27
+#: instances/templates/instances/access_tab.html:143
 msgid "VDI"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:39
+#: instances/templates/instances/access_tab.html:35
 #, python-format
 msgid ""
 " This action opens a new window with a %(type)s connection to the console of "
 "the instance."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:47
+#: instances/templates/instances/access_tab.html:42
 msgid "Scale"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:55
+#: instances/templates/instances/access_tab.html:48
 msgid "View Only"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:63
+#: instances/templates/instances/access_tab.html:54
 msgid "Resize Session"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:71
+#: instances/templates/instances/access_tab.html:60
 msgid "View Clipboard"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:82
+#: instances/templates/instances/access_tab.html:70
 msgid "Toggle Dropdown"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:86
-#: instances/templates/instances/access_tab.html:89
+#: instances/templates/instances/access_tab.html:74
+#: instances/templates/instances/access_tab.html:77
 msgid "Console port"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:87
+#: instances/templates/instances/access_tab.html:75
 msgid "Lite"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:90
+#: instances/templates/instances/access_tab.html:78
 msgid "Full"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:100
+#: instances/templates/instances/access_tab.html:88
 msgid "You need shut down your instance and enter a new root password."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:107
+#: instances/templates/instances/access_tab.html:95
 msgid "Enter Password"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:112
-#: instances/templates/instances/access_tab.html:115
+#: instances/templates/instances/access_tab.html:100
+#: instances/templates/instances/access_tab.html:103
 msgid "Reset Root Password"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:123
+#: instances/templates/instances/access_tab.html:111
 msgid "You need shut down your instance and choose your public key."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:142
-#: instances/templates/instances/access_tab.html:144
+#: instances/templates/instances/access_tab.html:130
+#: instances/templates/instances/access_tab.html:132
 msgid "Add Public Key"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:152
+#: instances/templates/instances/access_tab.html:140
 msgid ""
 "This action opens a remote viewer with a connection to the console of the "
 "instance."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:159
+#: instances/templates/instances/access_tab.html:145
 msgid "To download console.vv file for virt-viewer."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:160
+#: instances/templates/instances/access_tab.html:146
 msgid "Get console.vv"
 msgstr ""
 
@@ -2039,114 +1889,190 @@ msgstr ""
 msgid "This action is irreversible!"
 msgstr ""
 
-#: instances/templates/instances/destroy_instance_form.html:26
+#: instances/templates/instances/destroy_instance_form.html:24
 msgid "Remove Instance's data"
 msgstr ""
 
-#: instances/templates/instances/destroy_instance_form.html:34
+#: instances/templates/instances/destroy_instance_form.html:30
 msgid "Remove Instance's NVRAM"
 msgstr ""
 
-#: instances/templates/instances/destroy_instance_form.html:46
+#: instances/templates/instances/destroy_instance_form.html:41
 msgid "You cannot destroy instance!"
 msgstr ""
 
-#: instances/templates/instances/destroy_tab.html:8
+#: instances/templates/instances/destroy_tab.html:7
 msgid "Destroy Instance"
 msgstr ""
 
-#: instances/templates/instances/destroy_tab.html:15
+#: instances/templates/instances/destroy_tab.html:14
 msgid "This action starts remove instance process"
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:56
+#: instances/templates/instances/edit_instance_volume.html:3
+msgid "Edit Volume"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:12
+msgid "Edit Instance Volume"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:20
+msgid "Virtual Disk"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:38
+msgid "Volume Path"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:42
+msgid "Readonly"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:46
+msgid "Shareable"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:53
+msgid "Cache mode"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:61
+msgid "IO mode"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:69
+msgid "Discard mode"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:77
+msgid "Detect zeroes"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:97
+msgid "Serial Number"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:101
+msgid "Storage Format"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:111
+msgid "Are you sure to change volume properties?"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:3
+msgid "Guest Info"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:7
+msgid "OS Name"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:9
+msgid "OS Pretty-Name"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:13
+msgid "Kernel Release"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:15
+msgid "Kernel Version"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:17
+msgid "Timezone / Offset"
+msgstr ""
+
+#: instances/templates/instances/power_tab.html:55
 msgid "This action sends an ACPI shutdown signal to the instance."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:64
+#: instances/templates/instances/power_tab.html:63
 msgid ""
 "This action forcibly powers off and start the instance and may cause data "
 "corruption."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:71
-#: instances/templates/instances/power_tab.html:98
+#: instances/templates/instances/power_tab.html:70
+#: instances/templates/instances/power_tab.html:97
 msgid ""
 "This action forcibly powers off the instance and may cause data corruption."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:80
+#: instances/templates/instances/power_tab.html:79
 msgid "This action suspends the instance."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:91
+#: instances/templates/instances/power_tab.html:90
 msgid "This action restore the instance after suspend."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:106
+#: instances/templates/instances/power_tab.html:105
 msgid "Administrator blocked your instance."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:116
+#: instances/templates/instances/power_tab.html:115
 msgid "Click on Power On button to start this instance."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:120
+#: instances/templates/instances/power_tab.html:119
 msgid "Template instance cannot be started."
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:8
+#: instances/templates/instances/resize_tab.html:7
 msgid "CPU"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:29
+#: instances/templates/instances/resize_tab.html:28
 msgid "Logical host CPUs"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:31
+#: instances/templates/instances/resize_tab.html:30
 #: instances/templates/instances/resize_tab.html:95
 #: instances/templates/instances/resize_tab.html:136
 msgid "Current Allocation"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:45
-#: instances/templates/instances/resize_tab.html:108
+#: instances/templates/instances/resize_tab.html:44
+#: instances/templates/instances/resize_tab.html:109
 msgid "Maximum Allocation"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:63
+#: instances/templates/instances/resize_tab.html:62
 msgid "Logical Instance Active/Maximum CPUs"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:71
-#: instances/templates/instances/settings_tab.html:79
-#: instances/templates/instances/settings_tab.html:95
-#: networks/templates/network.html:62 storages/templates/storage.html:77
+#: instances/templates/instances/resize_tab.html:70
+#: instances/templates/instances/settings_tab.html:86
+#: instances/templates/instances/settings_tab.html:102
+#: networks/templates/network.html:62 storages/templates/storage.html:79
 msgid "Disable"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:73
+#: instances/templates/instances/resize_tab.html:72
 msgid "Constant"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:75
-#: instances/templates/instances/settings_tab.html:77
-#: instances/templates/instances/settings_tab.html:91
-#: networks/templates/network.html:60 storages/templates/storage.html:74
+#: instances/templates/instances/resize_tab.html:74
+#: instances/templates/instances/settings_tab.html:84
+#: instances/templates/instances/settings_tab.html:98
+#: networks/templates/network.html:60 storages/templates/storage.html:76
 msgid "Enable"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:84
+#: instances/templates/instances/resize_tab.html:83
 #: instances/templates/instances/resize_tab.html:124
 #: instances/templates/instances/resize_tab.html:157
 msgid "You don't have permission for resizing instance"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:93
+#: instances/templates/instances/resize_tab.html:92
 msgid "Total host memory"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:103
+#: instances/templates/instances/resize_tab.html:104
 #: instances/templates/instances/resize_tab.html:118
 msgid "Custom value"
 msgstr ""
@@ -2156,457 +2082,450 @@ msgid "Disk allocation (GB)"
 msgstr ""
 
 #: instances/templates/instances/resize_tab.html:140
-#: instances/templates/instances/settings_tab.html:269
+#: instances/templates/instances/settings_tab.html:284
 msgid "Error getting disk info"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:11
+#: instances/templates/instances/settings_tab.html:17
 msgid "Boot"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:44
-#: instances/templates/instances/settings_tab.html:621
-#: instances/templates/instances/settings_tab.html:623
+#: instances/templates/instances/settings_tab.html:50
+#: instances/templates/instances/settings_tab.html:655
+#: instances/templates/instances/settings_tab.html:657
 msgid "Migrate"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:56
+#: instances/templates/instances/settings_tab.html:62
+#: venv/lib/python3.6/site-packages/click/core.py:1351
 msgid "Options"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:72
-#: networks/templates/network.html:56 storages/templates/storage.html:69
+#: instances/templates/instances/settings_tab.html:79
+#: networks/templates/network.html:56 storages/templates/storage.html:71
 msgid "Autostart"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:75
+#: instances/templates/instances/settings_tab.html:82
 msgid "Autostart your instance when host server is power on "
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:84
+#: instances/templates/instances/settings_tab.html:91
 msgid "Boot Order"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:88
+#: instances/templates/instances/settings_tab.html:95
 msgid "Enable Boot Menu for your instance when it starts up "
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:91
+#: instances/templates/instances/settings_tab.html:98
 msgid "Show boot menu"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:95
+#: instances/templates/instances/settings_tab.html:102
 msgid "Hide boot menu"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:100
+#: instances/templates/instances/settings_tab.html:107
 msgid "Please shutdown instance to modify boot menu"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:130
+#: instances/templates/instances/settings_tab.html:137
 msgid "up: move selected devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:133
+#: instances/templates/instances/settings_tab.html:140
 msgid "down: move selected devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:139
-#: instances/templates/instances/settings_tab.html:429
+#: instances/templates/instances/settings_tab.html:146
+#: instances/templates/instances/settings_tab.html:456
 msgid "Apply"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:149
+#: instances/templates/instances/settings_tab.html:156
 msgid "Instance Media"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:152
+#: instances/templates/instances/settings_tab.html:159
 msgid "Add CD-ROM"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:169
-#: instances/templates/instances/settings_tab.html:234
+#: instances/templates/instances/settings_tab.html:182
+#: instances/templates/instances/settings_tab.html:221
+#: instances/templates/instances/settings_tab.html:249
 #: interfaces/templates/create_iface_block.html:34
-#: networks/templates/network.html:43 networks/templates/networks.html:59
-#: storages/templates/create_stg_block.html:77
+#: networks/templates/network.html:43 networks/templates/networks.html:58
+#: storages/templates/create_stg_block.html:91
 msgid "Device"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:170
+#: instances/templates/instances/settings_tab.html:183
+#: instances/templates/instances/settings_tab.html:222
 msgid "CD-ROM"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:188
-#: instances/templates/instances/settings_tab.html:190
+#: instances/templates/instances/settings_tab.html:196
+#: instances/templates/instances/settings_tab.html:198
 msgid "Mount"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:193
+#: instances/templates/instances/settings_tab.html:201
 msgid "Detach CD-ROM (remove device)"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:208
-#: instances/templates/instances/settings_tab.html:210
+#: instances/templates/instances/settings_tab.html:227
+#: instances/templates/instances/settings_tab.html:229
 msgid "Unmount"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:220
+#: instances/templates/instances/settings_tab.html:238
 msgid "There is not any CD-ROM device."
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:225
+#: instances/templates/instances/settings_tab.html:243
 msgid "Instance Volume"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:235
+#: instances/templates/instances/settings_tab.html:250
 msgid "Used"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:236
+#: instances/templates/instances/settings_tab.html:251
 msgid "Capacity"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:238
-#: instances/templates/instances/settings_tab.html:363
+#: instances/templates/instances/settings_tab.html:253
+#: instances/templates/instances/settings_tab.html:385
 msgid "Source"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:294
-#: instances/templates/instances/settings_tab.html:298
+#: instances/templates/instances/settings_tab.html:309
+#: instances/templates/instances/settings_tab.html:313
 msgid "Detach"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:294
+#: instances/templates/instances/settings_tab.html:309
 msgid "Are you sure to detach volume?"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:298
-#: instances/templates/instances/settings_tab.html:314
+#: instances/templates/instances/settings_tab.html:313
+#: instances/templates/instances/settings_tab.html:329
 msgid "Are you sure? This may lead data corruption!"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:310
+#: instances/templates/instances/settings_tab.html:325
 msgid "Are you sure to delete volume?"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:330
+#: instances/templates/instances/settings_tab.html:343
 msgid "Add a network device"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:336
+#: instances/templates/instances/settings_tab.html:349
 msgid "Network Devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:341
-#: instances/templates/instances/settings_tab.html:342
+#: instances/templates/instances/settings_tab.html:354
 msgid "Info"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:355
+#: instances/templates/instances/settings_tab.html:367
 msgid "active"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:361
-#: nwfilters/templates/nwfilter.html:75
+#: instances/templates/instances/settings_tab.html:379
+#: nwfilters/templates/nwfilter.html:71
 msgid "Filter"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:368
+#: instances/templates/instances/settings_tab.html:393
 msgid "Edit NIC"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:376
+#: instances/templates/instances/settings_tab.html:403
 msgid "Edit Instance Network"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:389
+#: instances/templates/instances/settings_tab.html:416
 msgid "Net Source"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:397
+#: instances/templates/instances/settings_tab.html:424
 #: interfaces/templates/interface.html:4 interfaces/templates/interface.html:6
 #: interfaces/templates/interface.html:39
 msgid "Interface"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:415
-#: instances/templates/instances/settings_tab.html:454
+#: instances/templates/instances/settings_tab.html:442
+#: instances/templates/instances/settings_tab.html:494
 msgid "Model"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:429
+#: instances/templates/instances/settings_tab.html:456
 msgid "Apply network changes"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:438
+#: instances/templates/instances/settings_tab.html:472
 msgid "Delete Device"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:446
-#: interfaces/templates/create_iface_block.html:71
+#: instances/templates/instances/settings_tab.html:482
+#: interfaces/templates/create_iface_block.html:72
 #: interfaces/templates/interface.html:41
 msgid "IPv4"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:450
-#: interfaces/templates/create_iface_block.html:74
+#: instances/templates/instances/settings_tab.html:488
+#: interfaces/templates/create_iface_block.html:77
 #: interfaces/templates/interface.html:43
 msgid "IPv6"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:456
-msgid "QoS"
-msgstr ""
-
-#: instances/templates/instances/settings_tab.html:468
+#: instances/templates/instances/settings_tab.html:502
 msgid ""
 "In most configurations, macvtap does not work for host to guest network "
 "communication"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:481
+#: instances/templates/instances/settings_tab.html:515
 #: networks/templates/network.html:322
 msgid "QoS Configuration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:487
+#: instances/templates/instances/settings_tab.html:521
 #: networks/templates/add_network_qos.html:18
-#: networks/templates/network.html:328 nwfilters/templates/nwfilter.html:131
+#: networks/templates/network.html:328 nwfilters/templates/nwfilter.html:123
 msgid "Direction"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:488
+#: instances/templates/instances/settings_tab.html:522
 #: networks/templates/add_network_qos.html:27
 #: networks/templates/network.html:329
 msgid "Average"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:489
+#: instances/templates/instances/settings_tab.html:523
 #: networks/templates/add_network_qos.html:34
 #: networks/templates/network.html:330
 msgid "Peak"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:490
+#: instances/templates/instances/settings_tab.html:524
 #: networks/templates/add_network_qos.html:41
 #: networks/templates/network.html:331
 msgid "Burst"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:515
+#: instances/templates/instances/settings_tab.html:549
 #: networks/templates/network.html:353
 msgid "Edit QoS"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:525
+#: instances/templates/instances/settings_tab.html:559
 #: networks/templates/network.html:358
 msgid "Delete QoS"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:541
+#: instances/templates/instances/settings_tab.html:575
 msgid "For migration both host servers must have equal settings and OS type"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:545
+#: instances/templates/instances/settings_tab.html:579
 msgid "Original host"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:551
+#: instances/templates/instances/settings_tab.html:585
 msgid "Host migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:568
+#: instances/templates/instances/settings_tab.html:602
 msgid "Live migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:576
+#: instances/templates/instances/settings_tab.html:610
 msgid "Unsafe migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:584
+#: instances/templates/instances/settings_tab.html:618
 msgid "Delete original"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:592
+#: instances/templates/instances/settings_tab.html:626
 msgid "Offline migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:600
+#: instances/templates/instances/settings_tab.html:634
 msgid "Post copy"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:608
+#: instances/templates/instances/settings_tab.html:642
 msgid "Forces CPU convergence during live migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:608
+#: instances/templates/instances/settings_tab.html:642
 msgid "Auto converge"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:616
+#: instances/templates/instances/settings_tab.html:650
 msgid "Compress instance memory for fast migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:616
+#: instances/templates/instances/settings_tab.html:650
 msgid "Compressed"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:629
+#: instances/templates/instances/settings_tab.html:663
 msgid "If you need to edit XML please Power Off the instance"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:651
+#: instances/templates/instances/settings_tab.html:685
 msgid "Instance owners"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:680
+#: instances/templates/instances/settings_tab.html:714
 msgid "To change console settings, shutdown the instance."
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:697
+#: instances/templates/instances/settings_tab.html:731
 msgid "Create a clone"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:700
+#: instances/templates/instances/settings_tab.html:734
 msgid "Clone Name"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:707
-#: instances/templates/instances/settings_tab.html:738
+#: instances/templates/instances/settings_tab.html:740
+#: instances/templates/instances/settings_tab.html:769
 msgid "Guess"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:726
+#: instances/templates/instances/settings_tab.html:758
 msgid "Network devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:736
+#: instances/templates/instances/settings_tab.html:767
 msgid "Random"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:751
+#: instances/templates/instances/settings_tab.html:781
 msgid "Storage devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:776
-#: instances/templates/instances/settings_tab.html:799
+#: instances/templates/instances/settings_tab.html:805
+#: instances/templates/instances/settings_tab.html:828
 msgid "Title"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:796
+#: instances/templates/instances/settings_tab.html:825
 msgid "To set instance template name description, shutdown the instance."
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:811
+#: instances/templates/instances/settings_tab.html:840
 msgid "Is template"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:832
+#: instances/templates/instances/settings_tab.html:861
 msgid "To set instance video model, shutdown the instance."
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:835
+#: instances/templates/instances/settings_tab.html:864
 msgid "Primary Video Model"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:839
+#: instances/templates/instances/settings_tab.html:868
 msgid "please choose"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:846
-#: instances/templates/instances/settings_tab.html:848
-#: instances/templates/instances/settings_tab.html:868
-#: instances/templates/instances/settings_tab.html:870
-#: instances/templates/instances/settings_tab.html:898
-#: secrets/templates/secrets.html:103
+#: instances/templates/instances/settings_tab.html:874
+#: instances/templates/instances/settings_tab.html:876
+#: instances/templates/instances/settings_tab.html:894
+#: instances/templates/instances/settings_tab.html:896
+#: instances/templates/instances/settings_tab.html:922
+#: virtsecrets/templates/secrets.html:104
 msgid "Set"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:856
+#: instances/templates/instances/settings_tab.html:883
 msgid "To set instance vCPUs hotpluggable"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:859
+#: instances/templates/instances/settings_tab.html:886
 msgid "vCPU Hot Plug"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:863
-#: instances/templates/instances/settings_tab.html:894
+#: instances/templates/instances/settings_tab.html:890
+#: instances/templates/instances/settings_tab.html:919
 msgid "Enabled"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:864
-#: instances/templates/instances/settings_tab.html:895
+#: instances/templates/instances/settings_tab.html:891
+#: instances/templates/instances/settings_tab.html:920
 msgid "Disabled"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:878
+#: instances/templates/instances/settings_tab.html:903
 msgid "To Enable/Disable Qemu Guest Agent. Status"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:883
+#: instances/templates/instances/settings_tab.html:908
 msgid "Disconnected"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:886
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:709
+#: instances/templates/instances/settings_tab.html:911
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:714
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:703
 msgid "Unknown"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:890
+#: instances/templates/instances/settings_tab.html:915
 msgid "Qemu Guest Agent"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:9
-#: instances/templates/instances/snapshots_tab.html:31
-#: instances/templates/instances/snapshots_tab.html:33
+#: instances/templates/instances/snapshots_tab.html:8
+#: instances/templates/instances/snapshots_tab.html:26
 msgid "Take Snapshot"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:14
+#: instances/templates/instances/snapshots_tab.html:13
 msgid "Manage Snapshots"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:22
+#: instances/templates/instances/snapshots_tab.html:20
 msgid ""
 "This may take more than an hour, depending on how much content is on your "
-"instance and how large the disk is."
+"instance and how large the disk is. It could cause web server timeout.."
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:27
+#: instances/templates/instances/snapshots_tab.html:25
 msgid "Enter Snapshot Name"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:38
-msgid "To take a snapshot please Power Off the instance."
-msgstr ""
-
-#: instances/templates/instances/snapshots_tab.html:43
+#: instances/templates/instances/snapshots_tab.html:35
 msgid "Choose a snapshot for restore/delete"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:61
+#: instances/templates/instances/snapshots_tab.html:53
 msgid "Revert to this Snapshot"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:66
+#: instances/templates/instances/snapshots_tab.html:58
 msgid "To restore snapshots you need Power Off the instance."
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:75
+#: instances/templates/instances/snapshots_tab.html:67
 msgid "Delete Snapshot"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:86
+#: instances/templates/instances/snapshots_tab.html:78
 msgid "You do not have any snapshots"
 msgstr ""
 
-#: instances/templates/instances/stats_tab.html:8
+#: instances/templates/instances/stats_tab.html:7
 msgid "Real Time"
 msgstr ""
 
-#: instances/templates/instances/stats_tab.html:23
+#: instances/templates/instances/stats_tab.html:22
 msgid "CPU Usage"
 msgstr ""
 
@@ -2614,11 +2533,11 @@ msgstr ""
 msgid "Memory Usage"
 msgstr ""
 
-#: instances/templates/instances/stats_tab.html:50
+#: instances/templates/instances/stats_tab.html:51
 msgid "Bandwidth Device"
 msgstr ""
 
-#: instances/templates/instances/stats_tab.html:65
+#: instances/templates/instances/stats_tab.html:67
 msgid "Disk I/O device"
 msgstr ""
 
@@ -2626,648 +2545,357 @@ msgstr ""
 msgid "None available device name"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:242
+#: instances/views.py:249
 msgid "Templates cannot be started."
 msgstr ""
 
-#: instances/views.py:345
+#: instances/views.py:352
 #, python-format
 msgid "Instance is migrated to %(hostname)s"
 msgstr ""
 
-#: instances/views.py:368
+#: instances/views.py:375
 msgid "Reset root password"
 msgstr ""
 
-#: instances/views.py:374 instances/views.py:403
+#: instances/views.py:381 instances/views.py:410
 msgid "Please shutdown down your instance and then try again"
 msgstr ""
 
-#: instances/views.py:395
-=======
-#: instances/views.py:236
-msgid "Templates cannot be started."
-msgstr ""
-
-#: instances/views.py:339
-#, python-format
-msgid "Migrate to %(hostname)%"
-msgstr ""
-
-#: instances/views.py:362
-msgid "Reset root password"
-msgstr ""
-
-#: instances/views.py:368 instances/views.py:397
-msgid "Please shutdown down your instance and then try again"
-msgstr ""
-
-#: instances/views.py:389
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:402
 #, python-format
 msgid "Installed new SSH public key %(keyname)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:422
-=======
-#: instances/views.py:416
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:429
 #, python-format
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize CPU of '%(instance_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:431
+#: instances/views.py:438
 #, python-format
 msgid "CPU is resized:  %(old)s to %(new)s"
 msgstr ""
 
-#: instances/views.py:459
-=======
-#: instances/views.py:425
-msgid "Resize CPU"
-msgstr ""
-
-#: instances/views.py:453
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:466
 #, python-format
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize memory of "
 "'%(instance_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:466
+#: instances/views.py:473
 #, python-format
 msgid ""
 "Memory is resized: current/max: %(old_cur)s/%(old_max)s to %(new_cur)s/"
 "%(new_max)s"
 msgstr ""
 
-#: instances/views.py:500
-=======
-#: instances/views.py:462
-msgid "Resize Memory"
-msgstr ""
-
-#: instances/views.py:491
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:507
 #, python-format
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize disks of '%(instance_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:507
+#: instances/views.py:514
 #, python-format
 msgid "Disk is resized: %(dev)s"
 msgstr ""
 
-#: instances/views.py:546
+#: instances/views.py:570
 #, python-format
 msgid "Attach new disk: %(name)s (%(format)s)"
 msgstr ""
 
-#: instances/views.py:577
-=======
-#: instances/views.py:498
-msgid "Disk resize"
-msgstr ""
-
-#: instances/views.py:537
-#, python-format
-msgid "Attach new disk %(name)s (%(format)s)"
-msgstr ""
-
-#: instances/views.py:568
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:609
 #, python-format
 msgid "Attach Existing disk: %(target_dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:635
-=======
-#: instances/views.py:624
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:667
 msgid "Volume changes are applied. But it will be activated after shutdown"
 msgstr ""
 
-#: instances/views.py:626
+#: instances/views.py:670
 msgid "Volume is changed successfully."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:639
-=======
-#: instances/views.py:627
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:671
 #, python-format
 msgid "Edit disk: %(target_dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:661
-=======
-#: instances/views.py:649
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:693
 #, python-format
 msgid "Delete disk: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:677
-=======
-#: instances/views.py:665
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:709
 #, python-format
 msgid "Detach disk: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:690
-=======
-#: instances/views.py:678
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:722
 #, python-format
 msgid "Add CD-ROM: %(target)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:703
-=======
-#: instances/views.py:691
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:735
 #, python-format
 msgid "Detach CD-ROM: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:716
-=======
-#: instances/views.py:704
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:748
 #, python-format
 msgid "Mount media: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:729
-=======
-#: instances/views.py:717
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:761
 #, python-format
 msgid "Unmount media: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:742
+#: instances/views.py:774
 #, python-format
 msgid "Create snapshot: %(snap)s"
 msgstr ""
 
-#: instances/views.py:753
+#: instances/views.py:785
 #, python-format
 msgid "Delete snapshot: %(snap)s"
-=======
-#: instances/views.py:730
-#, python-format
-msgid "New snapshot: %(name)s"
 msgstr ""
 
-#: instances/views.py:741
-#, python-format
-msgid "Delete snapshot: %(snap_name)s"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
-msgstr ""
-
-#: instances/views.py:752
+#: instances/views.py:796
 msgid "Successful revert snapshot: "
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:767
-msgid "Revert snapshot: %(snap)"
+#: instances/views.py:799
+#, python-format
+msgid "Revert snapshot: %(snap)s"
 msgstr ""
 
-#: instances/views.py:781
-=======
-#: instances/views.py:755
-msgid "Revert snapshot"
-msgstr ""
-
-#: instances/views.py:769
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:813
 #, python-format
 msgid "VCPU %(id)s is enabled=%(enabled)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:790
-=======
-#: instances/views.py:780
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:822
 #, python-format
 msgid "VCPU Hot-plug is enabled=%(status)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:800
+#: instances/views.py:832
 msgid "Set autostart"
 msgstr ""
 
-#: instances/views.py:809
+#: instances/views.py:841
 msgid "Unset autostart"
 msgstr ""
 
-#: instances/views.py:818
+#: instances/views.py:850
 msgid "Enable boot menu"
 msgstr ""
 
-#: instances/views.py:827
+#: instances/views.py:859
 msgid "Disable boot menu"
 msgstr ""
 
-#: instances/views.py:842
+#: instances/views.py:874
 msgid "Set boot order"
 msgstr ""
 
-#: instances/views.py:847
-=======
-#: instances/views.py:791
-msgid "Set autostart"
-msgstr ""
-
-#: instances/views.py:800
-msgid "Unset autostart"
-msgstr ""
-
-#: instances/views.py:809
-msgid "Enable boot menu"
-msgstr ""
-
-#: instances/views.py:818
-msgid "Disable boot menu"
-msgstr ""
-
-#: instances/views.py:833
-msgid "Set boot order"
-msgstr ""
-
-#: instances/views.py:836
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:879
 msgid "Boot menu changes applied. But it will be activated after shutdown"
 msgstr ""
 
-#: instances/views.py:838
+#: instances/views.py:882
 msgid "Boot order changed successfully."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:861
+#: instances/views.py:893
 msgid "Change instance XML"
 msgstr ""
 
-#: instances/views.py:875
+#: instances/views.py:907
 #, python-format
 msgid "Set Guest Agent: %(status)s"
 msgstr ""
 
-#: instances/views.py:885
-msgid "Set Video Model: %(model)"
-=======
-#: instances/views.py:849
-msgid "Edit XML"
-msgstr ""
-
-#: instances/views.py:863
+#: instances/views.py:917
 #, python-format
-msgid "Set Guest Agent %(status)s"
+msgid "Set Video Model: %(model)s"
 msgstr ""
 
-#: instances/views.py:873
-msgid "Set Video Model"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
-msgstr ""
-
-#: instances/views.py:882
+#: instances/views.py:926
 msgid "Change network"
 msgstr ""
 
-#: instances/views.py:895
+#: instances/views.py:949
 msgid "Network Device Config is changed. Please shutdown instance to activate."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:922
+#: instances/views.py:974
 #, python-format
 msgid "Add network: %(mac)s"
 msgstr ""
 
-#: instances/views.py:933
+#: instances/views.py:985
 #, python-format
 msgid "Delete Network: %(mac)s"
 msgstr ""
 
-#: instances/views.py:946
-=======
-#: instances/views.py:903
-msgid "Add network"
-msgstr ""
-
-#: instances/views.py:917
-msgid "Delete network"
-msgstr ""
-
-#: instances/views.py:933
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:998
 #, python-format
 msgid "Set Link State: %(state)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:966 networks/views.py:231
-=======
-#: instances/views.py:952
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1018 networks/views.py:231
 #, python-format
 msgid "%(qos_dir)s QoS is set"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:971
-=======
-#: instances/views.py:956
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1023
 #, python-format
 msgid ""
 "%(qos_dir)s QoS is set. Network XML is changed.                 Stop and "
 "start network to activate new config."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:988 networks/views.py:246
-=======
-#: instances/views.py:970
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1040 networks/views.py:246
 #, python-format
 msgid "%(qos_dir)s QoS is deleted"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:993
-=======
-#: instances/views.py:974
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1045
 #, python-format
 msgid ""
 "%(qos_dir)s QoS is deleted. Network XML is changed.                 Stop and "
 "start network to activate new config."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1012
+#: instances/views.py:1064
 msgid "Only one owner is allowed and the one already added"
 msgstr ""
 
-#: instances/views.py:1017
-=======
-#: instances/views.py:990
-msgid "Only one owner is allowed and the one already added"
-msgstr ""
-
-#: instances/views.py:995
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1069
 #, python-format
 msgid "Add owner: %(user)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1028
+#: instances/views.py:1080
 #, python-format
 msgid "Delete owner: %(userinstance_id)s "
 msgstr ""
 
-#: instances/views.py:1060
-=======
-#: instances/views.py:1006
-#, python-format
-msgid "Deleted owner %(userinstance_id)s"
-msgstr ""
-
-#: instances/views.py:1038
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1112
 #, python-format
 msgid "User '%(quota_msg)s' quota reached, cannot create '%(clone_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1066
+#: instances/views.py:1118
 #, python-format
 msgid "Instance '%(clone_name)s' already exists!"
 msgstr ""
 
-#: instances/views.py:1069
-=======
-#: instances/views.py:1044
-msgid "Instance 'clone_name' already exists!"
-msgstr ""
-
-#: instances/views.py:1047
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1121
 #, python-format
 msgid "Instance name '%(clone_name)s' contains invalid characters!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1072
-=======
-#: instances/views.py:1050
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1124
 #, python-format
 msgid "Instance MAC '%(clone_mac)s' invalid format!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1082
+#: instances/views.py:1134
 #, python-format
 msgid "Create a clone of '%(instance_name)s'"
 msgstr ""
 
-#: instances/views.py:1121
-=======
-#: instances/views.py:1060
-#, python-format
-msgid "Clone of '%(instance_name)s'"
-msgstr ""
-
-#: instances/views.py:1093
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1173
 msgid ""
 "Error setting console password. You should check that your instance have an "
 "graphic device."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1126
+#: instances/views.py:1178
 msgid "Set VNC password"
 msgstr ""
 
-#: instances/views.py:1135
+#: instances/views.py:1187
 msgid "Set VNC keymap"
 msgstr ""
 
-#: instances/views.py:1140
+#: instances/views.py:1192
 msgid "Set VNC type"
 msgstr ""
 
-#: instances/views.py:1145
+#: instances/views.py:1197
 msgid "Set VNC listen address"
 msgstr ""
 
-#: instances/views.py:1168
+#: instances/views.py:1220
 msgid "Edit options"
 msgstr ""
 
-#: instances/views.py:1182
+#: instances/views.py:1234
 msgid "Send console.vv file"
 msgstr ""
 
-#: instances/views.py:1243 instances/views.py:1337
+#: instances/views.py:1295 instances/views.py:1389
 msgid "A virtual machine with this name already exists"
 msgstr ""
 
-#: instances/views.py:1320
+#: instances/views.py:1372
 msgid "You haven't defined any storage pools"
 msgstr ""
 
-#: instances/views.py:1322
-msgid "You haven't defined any network pools"
-msgstr ""
-
-#: instances/views.py:1339
-msgid "There is an instance with same name. Remove it and try again!"
-msgstr ""
-
-#: instances/views.py:1343
-msgid "No Virtual Machine MAC has been entered"
-msgstr ""
-
 #: instances/views.py:1374
-msgid "Image has already exist. Please check volumes or change instance name"
-msgstr ""
-
-#: instances/views.py:1401
-msgid "First you need to create or select an image"
-msgstr ""
-
-#: instances/views.py:1419
-msgid "Invalid cache mode"
-msgstr ""
-
-#: instances/views.py:1460
-msgid "Instance is created"
-msgstr ""
-
-#: instances/views.py:1481
-msgid "Flavor Created"
-msgstr ""
-
-#: instances/views.py:1487
-msgid "Create Flavor"
-msgstr ""
-
-#: instances/views.py:1497
-msgid "Flavor Updated"
-msgstr ""
-
-#: instances/views.py:1503
-msgid "Update Flavor"
-msgstr ""
-
-#: instances/views.py:1512
-=======
-#: instances/views.py:1096
-msgid "Set VNC password"
-msgstr ""
-
-#: instances/views.py:1104
-msgid "Set VNC keymap"
-msgstr ""
-
-#: instances/views.py:1109
-msgid "Set VNC type"
-msgstr ""
-
-#: instances/views.py:1114
-msgid "Set VNC listen address"
-msgstr ""
-
-#: instances/views.py:1137
-msgid "Edit options"
-msgstr ""
-
-#: instances/views.py:1151
-msgid "Send console.vv file"
-msgstr ""
-
-#: instances/views.py:1206 instances/views.py:1298
-msgid "A virtual machine with this name already exists"
-msgstr ""
-
-#: instances/views.py:1281
-msgid "You haven't defined any storage pools"
-msgstr ""
-
-#: instances/views.py:1283
 msgid "You haven't defined any network pools"
 msgstr ""
 
-#: instances/views.py:1300
+#: instances/views.py:1391
 msgid "There is an instance with same name. Remove it and try again!"
 msgstr ""
 
-#: instances/views.py:1304
+#: instances/views.py:1395
 msgid "No Virtual Machine MAC has been entered"
 msgstr ""
 
-#: instances/views.py:1327
+#: instances/views.py:1426
 msgid "Image has already exist. Please check volumes or change instance name"
 msgstr ""
 
-#: instances/views.py:1347
+#: instances/views.py:1453
 msgid "First you need to create or select an image"
 msgstr ""
 
-#: instances/views.py:1365
+#: instances/views.py:1471
 msgid "Invalid cache mode"
 msgstr ""
 
-#: instances/views.py:1402
+#: instances/views.py:1512
 msgid "Instance is created"
 msgstr ""
 
-#: instances/views.py:1423
+#: instances/views.py:1533
 msgid "Flavor Created"
 msgstr ""
 
-#: instances/views.py:1431
+#: instances/views.py:1539
 msgid "Create Flavor"
 msgstr ""
 
-#: instances/views.py:1442
+#: instances/views.py:1549
 msgid "Flavor Updated"
 msgstr ""
 
-#: instances/views.py:1450
+#: instances/views.py:1555
 msgid "Update Flavor"
 msgstr ""
 
-#: instances/views.py:1460
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1564
 msgid "Flavor Deleted"
 msgstr ""
 
@@ -3333,12 +2961,12 @@ msgstr ""
 
 #: interfaces/templates/create_iface_block.html:44
 #: interfaces/templates/interface.html:76
-#: interfaces/templates/interfaces.html:62
-#: storages/templates/create_stg_block.html:35
-#: storages/templates/create_stg_block.html:64
-#: storages/templates/create_stg_block.html:93
-#: storages/templates/create_stg_block.html:158
-#: storages/templates/storages.html:60
+#: interfaces/templates/interfaces.html:63
+#: storages/templates/create_stg_block.html:49
+#: storages/templates/create_stg_block.html:78
+#: storages/templates/create_stg_block.html:107
+#: storages/templates/create_stg_block.html:172
+#: storages/templates/storages.html:59
 msgid "Type"
 msgstr ""
 
@@ -3366,43 +2994,43 @@ msgstr ""
 msgid "Delay"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:82
+#: interfaces/templates/create_iface_block.html:86
 msgid "IPv4 Mode"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:85
-#: interfaces/templates/create_iface_block.html:112
+#: interfaces/templates/create_iface_block.html:89
+#: interfaces/templates/create_iface_block.html:116
 #: networks/templates/network.html:109 networks/templates/network.html:220
 msgid "DHCP"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:86
-#: interfaces/templates/create_iface_block.html:113
+#: interfaces/templates/create_iface_block.html:90
+#: interfaces/templates/create_iface_block.html:117
 msgid "Static"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:87
-#: interfaces/templates/create_iface_block.html:111
+#: interfaces/templates/create_iface_block.html:91
+#: interfaces/templates/create_iface_block.html:115
 msgid "No configuration"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:92
+#: interfaces/templates/create_iface_block.html:96
 msgid "IPv4 Address"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:98
+#: interfaces/templates/create_iface_block.html:102
 msgid "IPv4 Gateway"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:108
+#: interfaces/templates/create_iface_block.html:112
 msgid "IPv6 Mode"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:118
+#: interfaces/templates/create_iface_block.html:122
 msgid "IPv6 Address"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:124
+#: interfaces/templates/create_iface_block.html:128
 msgid "IPv6 Gateway"
 msgstr ""
 
@@ -3420,12 +3048,12 @@ msgstr ""
 
 #: interfaces/templates/interface.html:55
 #: interfaces/templates/interface.html:78 networks/templates/network.html:45
-#: storages/templates/storage.html:56
+#: storages/templates/storage.html:58
 msgid "State"
 msgstr ""
 
 #: interfaces/templates/interface.html:62 networks/templates/network.html:52
-#: storages/templates/storage.html:64
+#: storages/templates/storage.html:66
 msgid "Stop"
 msgstr ""
 
@@ -3437,7 +3065,7 @@ msgstr ""
 msgid "Speed"
 msgstr ""
 
-#: interfaces/templates/interfaces.html:47
+#: interfaces/templates/interfaces.html:48
 msgid "Hypervisor doesn't have any Interfaces"
 msgstr ""
 
@@ -3446,14 +3074,18 @@ msgid "user"
 msgstr ""
 
 #: logs/models.py:6
-msgid "instance"
+msgid "host"
 msgstr ""
 
 #: logs/models.py:7
-msgid "message"
+msgid "instance"
 msgstr ""
 
 #: logs/models.py:8
+msgid "message"
+msgstr ""
+
+#: logs/models.py:9
 msgid "date"
 msgstr ""
 
@@ -3524,8 +3156,8 @@ msgid "Add New Network"
 msgstr ""
 
 #: networks/templates/create_net_block.html:20
-#: storages/templates/create_stg_block.html:44
-#: storages/templates/create_stg_block.html:73
+#: storages/templates/create_stg_block.html:58
+#: storages/templates/create_stg_block.html:87
 msgid "default"
 msgstr ""
 
@@ -3647,12 +3279,12 @@ msgid "IPv4 Fixed Addresses"
 msgstr ""
 
 #: networks/templates/network.html:158 networks/templates/network.html:268
-#: nwfilters/templates/nwfilters.html:85
+#: nwfilters/templates/nwfilters.html:83
 msgid "Show"
 msgstr ""
 
-#: networks/templates/network.html:166 networks/templates/network.html:276
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:395
+#: networks/templates/network.html:165 networks/templates/network.html:275
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:403
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:377
 msgid "Clear"
 msgstr ""
@@ -3677,11 +3309,11 @@ msgstr ""
 msgid "IPv6 Fixed Addresses"
 msgstr ""
 
-#: networks/templates/networks.html:46
+#: networks/templates/networks.html:45
 msgid "Hypervisor doesn't have any Network"
 msgstr ""
 
-#: networks/templates/networks.html:61
+#: networks/templates/networks.html:60
 msgid "Forward"
 msgstr ""
 
@@ -3693,7 +3325,6 @@ msgstr ""
 msgid "Please enter bridge/dev name"
 msgstr ""
 
-<<<<<<< HEAD
 #: networks/views.py:57
 msgid "For libvirt, the IPv6 network prefix must be /64"
 msgstr ""
@@ -3718,34 +3349,10 @@ msgid "%(family)s DHCP Range is Changed."
 msgstr ""
 
 #: networks/views.py:210
-=======
-#: networks/views.py:56
-msgid "For libvirt, the IPv6 network prefix must be /64"
-msgstr ""
-
-#: networks/views.py:126
-msgid "Unknown Network Family"
-msgstr ""
-
-#: networks/views.py:176
-msgid "{family.upper()} Fixed Address Operation Completed."
-msgstr ""
-
-#: networks/views.py:186
-msgid "{family.upper()} Fixed Address is Deleted."
-msgstr ""
-
-#: networks/views.py:194
-msgid "{family.upper()} DHCP Range is Changed."
-msgstr ""
-
-#: networks/views.py:203
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid ""
 "Network XML is changed. \\Stop and start network to activate new config."
 msgstr ""
 
-<<<<<<< HEAD
 #: networks/views.py:215
 msgid "Network XML is changed."
 msgstr ""
@@ -3762,34 +3369,6 @@ msgstr ""
 msgid ""
 "%(qos_dir)s QoS is deleted. Network XML is changed.                         "
 "Stop and start network to activate new config"
-=======
-#: networks/views.py:205
-msgid "Network XML is changed."
-msgstr ""
-
-#: networks/views.py:218
-msgid "{qos_dir.capitalize()} QoS is set. Network XML is changed."
-msgstr ""
-
-#: networks/views.py:219
-msgid "Stop and start network to activate new config"
-msgstr ""
-
-#: networks/views.py:221
-msgid "{} QoS is set"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
-msgstr ""
-
-#: networks/views.py:232
-msgid "{qos_dir.capitalize()} QoS is deleted. Network XML is changed. "
-msgstr ""
-
-#: networks/views.py:233
-msgid "Stop and start network to activate new config."
-msgstr ""
-
-#: networks/views.py:235
-msgid "{qos_dir.capitalize()} QoS is deleted"
 msgstr ""
 
 #: nwfilters/templates/add_nwf_rule.html:12
@@ -3804,8 +3383,8 @@ msgstr ""
 msgid "Create New NWFilter"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:39 nwfilters/templates/nwfilters.html:55
-#: secrets/templates/secrets.html:59
+#: nwfilters/templates/nwfilter.html:39 nwfilters/templates/nwfilters.html:53
+#: virtsecrets/templates/secrets.html:60
 msgid "UUID"
 msgstr ""
 
@@ -3813,47 +3392,46 @@ msgstr ""
 msgid "Filter References"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:100
+#: nwfilters/templates/nwfilter.html:92
 msgid "Reference"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:125
+#: nwfilters/templates/nwfilter.html:117
 msgid "Rules"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:129
+#: nwfilters/templates/nwfilter.html:121
 msgid "Rule"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:130
+#: nwfilters/templates/nwfilter.html:122
 msgid "Action Type"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:132
+#: nwfilters/templates/nwfilter.html:124
 msgid "Priority"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:133
+#: nwfilters/templates/nwfilter.html:125
 msgid "Statematch"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:134
+#: nwfilters/templates/nwfilter.html:126
 msgid "Directives"
 msgstr ""
 
-#: nwfilters/templates/nwfilters.html:71
+#: nwfilters/templates/nwfilters.html:69
 msgid "Details of NWFilter"
 msgstr ""
 
-#: nwfilters/templates/nwfilters.html:94
+#: nwfilters/templates/nwfilters.html:92
 msgid "Clone NWFilter"
 msgstr ""
 
-#: nwfilters/templates/nwfilters.html:135
+#: nwfilters/templates/nwfilters.html:132
 msgid "Hypervisor doesn't have any NWFilters"
 msgstr ""
 
-<<<<<<< HEAD
 #: nwfilters/views.py:44
 msgid "A network filter with this name already exists"
 msgstr ""
@@ -3863,98 +3441,23 @@ msgid "A network filter with this UUID already exists"
 msgstr ""
 
 #: nwfilters/views.py:51
-=======
-#: nwfilters/views.py:41
-msgid "A network filter with this name already exists"
-msgstr ""
-
-#: nwfilters/views.py:44
-msgid "A network filter with this UUID already exists"
-msgstr ""
-
-#: nwfilters/views.py:48
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid "%(filter)s network filter is created"
 msgstr ""
 
-<<<<<<< HEAD
 #: nwfilters/views.py:60
 #, python-format
 msgid "%(filter)s network filter is deleted"
 msgstr ""
 
-#: nwfilters/views.py:76
+#: nwfilters/views.py:77
 #, python-format
 msgid "NWFilter is in use by %(instance)s. Cannot be deleted."
 msgstr ""
 
-#: nwfilters/views.py:93
+#: nwfilters/views.py:96
 #, python-format
 msgid "Cloning NWFilter %(name)s as %(clone)s"
-=======
-#: nwfilters/views.py:57
-#, python-brace-format
-msgid "Deleting NWFilter: {name}"
-msgstr ""
-
-#: nwfilters/views.py:69
-#, python-brace-format
-msgid "NWFilter is in use by {inst}. Cannot be deleted."
-msgstr ""
-
-#: nwfilters/views.py:86
-#, python-brace-format
-msgid "Cloning NWFilter {name} as {cln_name}"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:12
-msgid "Create New Secret"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:18
-msgid "Ephemeral"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:21
-#: secrets/templates/create_secret_block.html:30
-msgid "no"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:22
-#: secrets/templates/create_secret_block.html:31
-msgid "yes"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:27
-msgid "Private"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:36
-#: storages/templates/storage.html:54
-msgid "Usage"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:46
-#: secrets/templates/secrets.html:61
-msgid "Data"
-msgstr ""
-
-#: secrets/templates/secrets.html:50
-msgid "Hypervisor doesn't have any Secrets"
-msgstr ""
-
-#: secrets/templates/secrets.html:60
-msgid "Usage Type"
-msgstr ""
-
-#: secrets/templates/secrets.html:88
-msgid "Set secret value"
-msgstr ""
-
-#: secrets/templates/secrets.html:94
-msgid "Value"
 msgstr ""
 
 #: storages/forms.py:10 storages/forms.py:37
@@ -3985,64 +3488,64 @@ msgstr ""
 msgid "Create Storage Pool"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:18
+#: storages/templates/create_stg_block.html:19
 msgid "DIR"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:21
+#: storages/templates/create_stg_block.html:24
 msgid "LVM"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:23
+#: storages/templates/create_stg_block.html:29
 msgid "CEPH"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:25
+#: storages/templates/create_stg_block.html:34
 msgid "NETFS"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:27
+#: storages/templates/create_stg_block.html:39
 msgid "ISO"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:48
-#: storages/templates/create_stg_block.html:222
+#: storages/templates/create_stg_block.html:62
+#: storages/templates/create_stg_block.html:236
 msgid "Path"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:106
+#: storages/templates/create_stg_block.html:120
 msgid "Ceph User"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:112
+#: storages/templates/create_stg_block.html:126
 msgid "Ceph Pool"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:118
+#: storages/templates/create_stg_block.html:132
 msgid "Ceph Host"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:177
+#: storages/templates/create_stg_block.html:191
 msgid "Remote Path"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:186
+#: storages/templates/create_stg_block.html:200
 msgid "auto"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:187
+#: storages/templates/create_stg_block.html:201
 msgid "nfs"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:188
+#: storages/templates/create_stg_block.html:202
 msgid "glusterfs"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:189
+#: storages/templates/create_stg_block.html:203
 msgid "cifs"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:194
+#: storages/templates/create_stg_block.html:208
 msgid "Local Path"
 msgstr ""
 
@@ -4058,47 +3561,52 @@ msgstr ""
 msgid "Add New Volume"
 msgstr ""
 
-#: storages/templates/storage.html:44
+#: storages/templates/storage.html:46
 msgid "Pool name"
 msgstr ""
 
-#: storages/templates/storage.html:46
+#: storages/templates/storage.html:48
 msgid "Pool type"
 msgstr ""
 
-#: storages/templates/storage.html:48
+#: storages/templates/storage.html:50
 msgid "Pool path"
 msgstr ""
 
-#: storages/templates/storage.html:50
+#: storages/templates/storage.html:52
 msgid "Pool status"
 msgstr ""
 
-#: storages/templates/storage.html:85 storages/templates/storages.html:64
+#: storages/templates/storage.html:56
+#: virtsecrets/templates/create_secret_block.html:36
+msgid "Usage"
+msgstr ""
+
+#: storages/templates/storage.html:90 storages/templates/storages.html:63
 msgid "Volumes"
 msgstr ""
 
-#: storages/templates/storage.html:97
+#: storages/templates/storage.html:98
 msgid "Allocated"
 msgstr ""
 
-#: storages/templates/storage.html:118
+#: storages/templates/storage.html:119
 msgid "Clone image"
 msgstr ""
 
-#: storages/templates/storage.html:131
+#: storages/templates/storage.html:132
 msgid "Convert"
 msgstr ""
 
-#: storages/templates/storage.html:140
+#: storages/templates/storage.html:141
 msgid "raw"
 msgstr ""
 
-#: storages/templates/storage.html:141
+#: storages/templates/storage.html:142
 msgid "qcow"
 msgstr ""
 
-#: storages/templates/storage.html:142
+#: storages/templates/storage.html:143
 msgid "qcow2"
 msgstr ""
 
@@ -4106,11 +3614,11 @@ msgstr ""
 msgid "Hypervisor doesn't have any Volumes"
 msgstr ""
 
-#: storages/templates/storages.html:46
+#: storages/templates/storages.html:45
 msgid "Hypervisor doesn't have any Storages"
 msgstr ""
 
-#: storages/views.py:39
+#: storages/views.py:40
 msgid "Pool name already use"
 msgstr ""
 
@@ -4118,67 +3626,44 @@ msgstr ""
 msgid "You need create secret for pool"
 msgstr ""
 
-<<<<<<< HEAD
-#: storages/views.py:48
-msgid "You need input all fields for creating ceph pool"
-msgstr ""
-
-#: storages/views.py:144
-#, python-format
-msgid "Volume: %(volume)s is deleted."
-msgstr ""
-
-#: storages/views.py:149
-msgid "ISO image already exist"
-msgstr ""
-
-#: storages/views.py:153
-#, python-format
-msgid "ISO: %(file)s is uploaded."
-msgstr ""
-
-#: storages/views.py:162
-msgid "Name of volume already in use"
-msgstr ""
-
-#: storages/views.py:174
-#, python-format
-msgid "%(image)s image cloned as %(clone)s successfully"
-msgstr ""
-
-#: storages/views.py:220
-#, python-format
-msgid "Image file %(name)s is created successfully"
-=======
 #: storages/views.py:49
 msgid "You need input all fields for creating ceph pool"
 msgstr ""
 
-#: storages/views.py:132
-#, python-brace-format
-msgid "Volume: {volname} is deleted."
+#: storages/views.py:96
+msgid "Security Issues with file uploading"
 msgstr ""
 
-#: storages/views.py:137
-msgid "ISO image already exist"
-msgstr ""
-
-#: storages/views.py:141
-msgid "ISO: {request.FILES['file']} is uploaded."
+#: storages/views.py:103
+msgid "File not found. Check the path variable and filename"
 msgstr ""
 
 #: storages/views.py:150
+#, python-format
+msgid "Volume: %(vol)s is deleted."
+msgstr ""
+
+#: storages/views.py:155
+msgid "ISO image already exist"
+msgstr ""
+
+#: storages/views.py:159
+#, python-format
+msgid "ISO: %(file)s is uploaded."
+msgstr ""
+
+#: storages/views.py:168
 msgid "Name of volume already in use"
 msgstr ""
 
-#: storages/views.py:160
-msgid "{data['image']} image cloned as {name} successfully"
+#: storages/views.py:180
+#, python-format
+msgid "%(image)s image cloned as %(name)s successfully"
 msgstr ""
 
-#: storages/views.py:199
-#, python-brace-format
-msgid "Image file {name} is created successfully"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: storages/views.py:226
+#, python-format
+msgid "Image file %(name)s is created successfully"
 msgstr ""
 
 #: templates/403.html:3
@@ -4239,18 +3724,321 @@ msgstr ""
 msgid "Processing"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/bootstrap4/components.py:17
-#: venv/lib/python3.6/site-packages/bootstrap4/templates/bootstrap4/form_errors.html:3
-#: venv/lib/python3.6/site-packages/bootstrap4/templates/bootstrap4/messages.html:4
-msgid "close"
+#: templates/search_block.html:3
+msgid "Search"
 msgstr ""
 
+#: venv/lib/python3.6/site-packages/click/_termui_impl.py:496
+#, python-brace-format
+msgid "{editor}: Editing failed"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_termui_impl.py:500
+#, python-brace-format
+msgid "{editor}: Editing failed: {e}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:20
+msgid ""
+"Click will abort further execution because Python was configured to use "
+"ASCII as encoding for the environment. Consult https://click.palletsprojects."
+"com/unicode-support/ for mitigation steps."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:56
+msgid ""
+"Additional information: on this system no suitable UTF-8 locales were "
+"discovered. This most likely requires resolving by reconfiguring the locale "
+"system."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:65
+msgid ""
+"This system supports the C.UTF-8 locale which is recommended. You might be "
+"able to resolve your issue by exporting the following environment variables:"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:75
+#, python-brace-format
+msgid ""
+"This system lists some UTF-8 supporting locales that you can pick from. The "
+"following suitable locales were discovered: {locales}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:93
+msgid ""
+"Click discovered that you exported a UTF-8 locale but the locale system "
+"could not pick up from it because it does not exist. The exported locale is "
+"{locale!r} but it is not supported."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1095
+msgid "Aborted!"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1279
+#: venv/lib/python3.6/site-packages/click/decorators.py:434
+msgid "Show this message and exit."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1308
+#: venv/lib/python3.6/site-packages/click/core.py:1334
+#, python-brace-format
+msgid "(Deprecated) {text}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1375
+#, python-brace-format
+msgid "Got unexpected extra argument ({args})"
+msgid_plural "Got unexpected extra arguments ({args})"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1390
+msgid "DeprecationWarning: The command {name!r} is deprecated."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1607
+msgid "Commands"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1639
+msgid "Missing command."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1717
+msgid "No such command {name!r}."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2258
+msgid "Value must be an iterable."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2278
+#, python-brace-format
+msgid "Takes {nargs} values but 1 was given."
+msgid_plural "Takes {nargs} values but {len} were given."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2701
+#, python-brace-format
+msgid "env var: {var}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2724
+msgid "(dynamic)"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2735
+#, python-brace-format
+msgid "default: {default}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2748
+msgid "required"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/decorators.py:339
+#, python-format
+msgid "%(prog)s, version %(version)s"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/decorators.py:403
+msgid "Show the version and exit."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:43
+#: venv/lib/python3.6/site-packages/click/exceptions.py:79
+#, python-brace-format
+msgid "Error: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:71
+#, python-brace-format
+msgid "Try '{command} {option}' for help."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:120
+#, python-brace-format
+msgid "Invalid value: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:122
+#, python-brace-format
+msgid "Invalid value for {param_hint}: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:178
+msgid "Missing argument"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:180
+msgid "Missing option"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:182
+msgid "Missing parameter"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:184
+#, python-brace-format
+msgid "Missing {param_type}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:191
+#, python-brace-format
+msgid "Missing parameter: {param_name}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:211
+#, python-brace-format
+msgid "No such option: {name}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:223
+#, python-brace-format
+msgid "Did you mean {possibility}?"
+msgid_plural "(Possible options: {possibilities})"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:261
+msgid "unknown error"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:268
+msgid "Could not open file {filename!r}: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:231
+msgid "Argument {name!r} takes {nargs} values."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:413
+msgid "Option {name!r} does not take a value."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:474
+msgid "Option {name!r} requires an argument."
+msgid_plural "Option {name!r} requires {nargs} arguments."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/shell_completion.py:316
+msgid "Shell completion is not supported for Bash versions older than 4.4."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/shell_completion.py:322
+msgid "Couldn't detect Bash version, shell completion is not supported."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:161
+msgid "Repeat for confirmation"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:178
+msgid "Error: The value you entered was invalid."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:180
+#, python-brace-format
+msgid "Error: {e.message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:191
+msgid "Error: The two entered values do not match."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:247
+msgid "Error: invalid input"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:798
+msgid "Press any key to continue..."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:258
+#, python-brace-format
+msgid ""
+"Choose from:\n"
+"\t{choices}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:290
+msgid "{value!r} is not {choice}."
+msgid_plural "{value!r} is not one of {choices}."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:380
+msgid "{value!r} does not match the format {format}."
+msgid_plural "{value!r} does not match the formats {formats}."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:402
+msgid "{value!r} is not a valid {number_type}."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:458
+#, python-brace-format
+msgid "{value} is not in the range {range}."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:599
+msgid "{value!r} is not a valid boolean."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:623
+msgid "{value!r} is not a valid UUID."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:801
+msgid "file"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:803
+msgid "directory"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:805
+msgid "path"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:851
+msgid "{name} {filename!r} does not exist."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:860
+msgid "{name} {filename!r} is a file."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:868
+msgid "{name} {filename!r} is a directory."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:876
+msgid "{name} {filename!r} is not writable."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:884
+msgid "{name} {filename!r} is not readable."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:951
+#, python-brace-format
+msgid "{len_type} values are required, but {len_value} was given."
+msgid_plural "{len_type} values are required, but {len_value} were given."
+msgstr[0] ""
+msgstr[1] ""
+
 #: venv/lib/python3.6/site-packages/django/contrib/messages/apps.py:7
 #: venv2/lib/python2.7/site-packages/django/contrib/messages/apps.py:7
 msgid "Messages"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/contrib/sitemaps/apps.py:7
+#: venv/lib/python3.6/site-packages/django/contrib/sitemaps/apps.py:8
 #: venv2/lib/python2.7/site-packages/django/contrib/sitemaps/apps.py:7
 msgid "Site Maps"
 msgstr ""
@@ -4265,103 +4053,108 @@ msgstr ""
 msgid "Syndication"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/paginator.py:45
+#. Translators: String used to replace omitted page numbers in elided page
+#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10].
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:30
+msgid "…"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:51
 #: venv2/lib/python2.7/site-packages/django/core/paginator.py:43
 msgid "That page number is not an integer"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/paginator.py:47
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:53
 #: venv2/lib/python2.7/site-packages/django/core/paginator.py:45
 msgid "That page number is less than 1"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/paginator.py:52
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:58
 #: venv2/lib/python2.7/site-packages/django/core/paginator.py:50
 msgid "That page contains no results"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:31
+#: venv/lib/python3.6/site-packages/django/core/validators.py:22
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:34
 msgid "Enter a valid value."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:102
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:658
+#: venv/lib/python3.6/site-packages/django/core/validators.py:93
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:675
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:107
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:671
 msgid "Enter a valid URL."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:154
+#: venv/lib/python3.6/site-packages/django/core/validators.py:150
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:160
 msgid "Enter a valid integer."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:165
+#: venv/lib/python3.6/site-packages/django/core/validators.py:161
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:171
 msgid "Enter a valid email address."
 msgstr ""
 
 #. Translators: "letters" means latin letters: a-z and A-Z.
-#: venv/lib/python3.6/site-packages/django/core/validators.py:239
-#: venv2/lib/python2.7/site-packages/django/core/validators.py:245
+#: venv/lib/python3.6/site-packages/django/core/validators.py:262
 msgid ""
-"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+"Enter a valid “slug” consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:246
-#: venv2/lib/python2.7/site-packages/django/core/validators.py:252
+#: venv/lib/python3.6/site-packages/django/core/validators.py:269
 msgid ""
-"Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
+"Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:255
-#: venv/lib/python3.6/site-packages/django/core/validators.py:275
+#: venv/lib/python3.6/site-packages/django/core/validators.py:278
+#: venv/lib/python3.6/site-packages/django/core/validators.py:288
+#: venv/lib/python3.6/site-packages/django/core/validators.py:311
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:257
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:277
 msgid "Enter a valid IPv4 address."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:260
-#: venv/lib/python3.6/site-packages/django/core/validators.py:276
+#: venv/lib/python3.6/site-packages/django/core/validators.py:296
+#: venv/lib/python3.6/site-packages/django/core/validators.py:312
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:262
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:278
 msgid "Enter a valid IPv6 address."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:270
-#: venv/lib/python3.6/site-packages/django/core/validators.py:274
+#: venv/lib/python3.6/site-packages/django/core/validators.py:306
+#: venv/lib/python3.6/site-packages/django/core/validators.py:310
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:272
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:276
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:304
+#: venv/lib/python3.6/site-packages/django/core/validators.py:340
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:308
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1131
 msgid "Enter only digits separated by commas."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:310
+#: venv/lib/python3.6/site-packages/django/core/validators.py:346
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:314
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:342
+#: venv/lib/python3.6/site-packages/django/core/validators.py:379
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:345
 #, python-format
 msgid "Ensure this value is less than or equal to %(limit_value)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:351
+#: venv/lib/python3.6/site-packages/django/core/validators.py:388
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:354
 #, python-format
 msgid "Ensure this value is greater than or equal to %(limit_value)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:361
+#: venv/lib/python3.6/site-packages/django/core/validators.py:398
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:364
 #, python-format
 msgid ""
@@ -4373,7 +4166,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:376
+#: venv/lib/python3.6/site-packages/django/core/validators.py:413
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:379
 #, python-format
 msgid ""
@@ -4385,15 +4178,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:395
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:290
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:325
+#: venv/lib/python3.6/site-packages/django/core/validators.py:432
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:292
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:327
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:303
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:340
 msgid "Enter a number."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:397
+#: venv/lib/python3.6/site-packages/django/core/validators.py:434
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:399
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
@@ -4401,7 +4194,7 @@ msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:402
+#: venv/lib/python3.6/site-packages/django/core/validators.py:439
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:404
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
@@ -4409,7 +4202,7 @@ msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:407
+#: venv/lib/python3.6/site-packages/django/core/validators.py:444
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:409
 #, python-format
 msgid ""
@@ -4419,48 +4212,47 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:469
-#: venv2/lib/python2.7/site-packages/django/core/validators.py:463
+#: venv/lib/python3.6/site-packages/django/core/validators.py:506
 #, python-format
 msgid ""
-"File extension '%(extension)s' is not allowed. Allowed extensions are: "
-"'%(allowed_extensions)s'."
+"File extension “%(extension)s” is not allowed. Allowed extensions are: "
+"%(allowed_extensions)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:521
+#: venv/lib/python3.6/site-packages/django/core/validators.py:559
 msgid "Null characters are not allowed."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/base.py:1165
-#: venv/lib/python3.6/site-packages/django/forms/models.py:756
+#: venv/lib/python3.6/site-packages/django/db/models/base.py:1210
+#: venv/lib/python3.6/site-packages/django/forms/models.py:768
 #: venv2/lib/python2.7/site-packages/django/db/models/base.py:1209
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:749
 msgid "and"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/base.py:1167
+#: venv/lib/python3.6/site-packages/django/db/models/base.py:1212
 #: venv2/lib/python2.7/site-packages/django/db/models/base.py:1211
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:104
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:100
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:116
 #, python-format
 msgid "Value %(value)r is not a valid choice."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:105
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:101
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:117
 msgid "This field cannot be null."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:106
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:102
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:118
 msgid "This field cannot be blank."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:107
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:103
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:119
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
@@ -4468,346 +4260,340 @@ msgstr ""
 
 #. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
 #. Eg: "Title must be unique for pub_date year"
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:111
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:107
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:123
 #, python-format
 msgid ""
 "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:128
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:126
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:140
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:905
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1772
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:901
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1809
-msgid "Integer"
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:909
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1770
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:905
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1807
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:958
 #, python-format
-msgid "'%(value)s' value must be an integer."
+msgid "“%(value)s” value must be either True or False."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:984
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1850
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:978
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1878
-msgid "Big (8 byte) integer"
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:996
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:990
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:959
 #, python-format
-msgid "'%(value)s' value must be either True or False."
+msgid "“%(value)s” value must be either True, False, or None."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:997
-#, python-format
-msgid "'%(value)s' value must be either True, False, or None."
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:999
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:961
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:992
 msgid "Boolean (Either True or False)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1040
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1002
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1058
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1104
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1096
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1115
 msgid "Comma-separated integers"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1153
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1172
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1145
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+"“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD "
 "format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1155
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1298
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1174
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1319
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1147
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1290
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
+"“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid "
 "date."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1158
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1150
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1177
 msgid "Date (without time)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1296
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1317
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1288
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ] format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1300
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1321
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1292
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
 "[TZ]) but it is an invalid date/time."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1304
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1296
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1325
 msgid "Date (with time)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1452
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1475
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1444
 #, python-format
-msgid "'%(value)s' value must be a decimal number."
+msgid "“%(value)s” value must be a decimal number."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1454
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1446
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1477
 msgid "Decimal number"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1593
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1628
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1585
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
+"“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[."
 "uuuuuu] format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1596
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1588
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1631
 msgid "Duration"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1646
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1638
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1683
 msgid "Email address"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1669
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1661
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1707
 msgid "File path"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1735
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1773
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1727
 #, python-format
-msgid "'%(value)s' value must be a float."
+msgid "“%(value)s” value must be a float."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1737
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1729
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1775
 msgid "Floating point number"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1866
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1767
+#, python-format
+msgid "“%(value)s” value must be an integer."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1769
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:901
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1809
+msgid "Integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1852
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:978
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1878
+msgid "Big (8 byte) integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1867
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2130
+msgid "Small integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1875
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1893
 msgid "IPv4 address"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1897
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1906
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1924
 msgid "IP address"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1977
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1978
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2006
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1986
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1987
 #, python-format
-msgid "'%(value)s' value must be either None, True or False."
+msgid "“%(value)s” value must be either None, True or False."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1980
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1989
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2008
 msgid "Boolean (Either True, False or None)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2015
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2043
+msgid "Positive big integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2056
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2071
 msgid "Positive integer"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2028
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2069
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2083
 msgid "Positive small integer"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2042
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2083
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2096
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2074
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2130
-msgid "Small integer"
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2081
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2115
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2137
 msgid "Text"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2109
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2163
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2181
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
 "format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2111
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2165
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2183
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
 "invalid time."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2114
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2186
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2168
 msgid "Time"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2240
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2312
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2296
 msgid "URL"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2262
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2334
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2319
 msgid "Raw binary data"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2312
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2366
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2399
 #, python-format
-msgid "'%(value)s' is not a valid UUID."
+msgid "“%(value)s” is not a valid UUID."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2314
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2401
 msgid "Universally unique identifier"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:221
+#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:226
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/files.py:228
 msgid "File"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:778
+#: venv/lib/python3.6/site-packages/django/db/models/fields/json.py:18
+msgid "A JSON object"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/json.py:20
+msgid "Value must be valid JSON."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:790
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:788
 #, python-format
 msgid "%(model)s instance with %(field)s %(value)r does not exist."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:780
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:792
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:790
 msgid "Foreign Key (type determined by related field)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1007
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1045
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1029
 msgid "One-to-one relationship"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1057
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1099
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1104
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1058
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1100
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1105
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1100
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1142
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1147
 msgid "Many-to-many relationship"
 msgstr ""
 
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the label
-#: venv/lib/python3.6/site-packages/django/forms/boundfield.py:146
+#: venv/lib/python3.6/site-packages/django/forms/boundfield.py:150
 #: venv2/lib/python2.7/site-packages/django/forms/boundfield.py:181
 msgid ":?.!"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:53
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:54
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:56
 msgid "This field is required."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:245
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:247
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:258
 msgid "Enter a whole number."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:396
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:1126
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:402
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1143
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:418
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:1149
 msgid "Enter a valid date."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:420
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:1127
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:426
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1144
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:442
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:1150
 msgid "Enter a valid time."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:442
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:454
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:464
 msgid "Enter a valid date/time."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:471
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:488
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:493
 msgid "Enter a valid duration."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:472
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:489
 #, python-brace-format
 msgid "The number of days must be between {min_days} and {max_days}."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:532
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:549
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:547
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:533
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:550
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:548
 msgid "No file was submitted."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:534
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:551
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:549
 msgid "The submitted file is empty."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:536
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:553
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:551
 #, python-format
 msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
@@ -4816,21 +4602,21 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:539
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:556
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:554
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:600
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:617
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:619
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:762
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:852
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1270
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:779
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:869
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1309
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:776
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:872
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1265
@@ -4838,78 +4624,82 @@ msgstr ""
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:853
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:968
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1269
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:870
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:985
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1308
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:873
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:990
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1264
 msgid "Enter a list of values."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:969
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:986
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:991
 msgid "Enter a complete value."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:1185
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1202
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:1208
 msgid "Enter a valid UUID."
 msgstr ""
 
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1232
+msgid "Enter a valid JSON."
+msgstr ""
+
 #. Translators: This is the default suffix added to form field labels
-#: venv/lib/python3.6/site-packages/django/forms/forms.py:86
+#: venv/lib/python3.6/site-packages/django/forms/forms.py:76
 #: venv2/lib/python2.7/site-packages/django/forms/forms.py:87
 msgid ":"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/forms.py:212
+#: venv/lib/python3.6/site-packages/django/forms/forms.py:203
 #: venv2/lib/python2.7/site-packages/django/forms/forms.py:213
 #, python-format
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:91
-#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:97
-msgid "ManagementForm data is missing or has been tampered with"
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:61
+#, python-format
+msgid ""
+"ManagementForm data is missing or has been tampered with. Missing fields: "
+"%(field_names)s. You may need to file a bug report if the issue persists."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:338
-#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:355
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:370
 #, python-format
-msgid "Please submit %d or fewer forms."
-msgid_plural "Please submit %d or fewer forms."
+msgid "Please submit at most %d form."
+msgid_plural "Please submit at most %d forms."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:345
-#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:362
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:377
 #, python-format
-msgid "Please submit %d or more forms."
-msgid_plural "Please submit %d or more forms."
+msgid "Please submit at least %d form."
+msgid_plural "Please submit at least %d forms."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:371
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:373
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:405
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:412
 #: venv2/lib/python2.7/site-packages/django/forms/formsets.py:390
 #: venv2/lib/python2.7/site-packages/django/forms/formsets.py:392
 msgid "Order"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:751
+#: venv/lib/python3.6/site-packages/django/forms/models.py:763
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:744
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:755
+#: venv/lib/python3.6/site-packages/django/forms/models.py:767
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:748
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:761
+#: venv/lib/python3.6/site-packages/django/forms/models.py:773
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:754
 #, python-format
 msgid ""
@@ -4917,55 +4707,55 @@ msgid ""
 "for the %(lookup)s in %(date_field)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:770
+#: venv/lib/python3.6/site-packages/django/forms/models.py:782
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:763
 msgid "Please correct the duplicate values below."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1091
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1109
 msgid "The inline value did not match the parent instance."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1158
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1193
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1154
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1272
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1311
 #, python-format
-msgid "\"%(pk)s\" is not a valid value."
+msgid "“%(pk)s” is not a valid value."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/utils.py:162
-#: venv2/lib/python2.7/site-packages/django/forms/utils.py:172
+#: venv/lib/python3.6/site-packages/django/forms/utils.py:172
 #, python-format
 msgid ""
-"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it "
 "may be ambiguous or it may not exist."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:396
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:404
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:378
 msgid "Currently"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:710
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:715
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:704
 msgid "Yes"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:711
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:716
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:705
 msgid "No"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:788
+#. Translators: Please do not add spaces around commas.
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:805
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:851
 msgid "yes,no,maybe"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:817
 #: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:834
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:851
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:880
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:897
 #, python-format
@@ -4974,62 +4764,62 @@ msgid_plural "%(size)d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:836
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:853
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:899
 #, python-format
 msgid "%s KB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:838
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:855
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:901
 #, python-format
 msgid "%s MB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:840
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:857
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:903
 #, python-format
 msgid "%s GB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:842
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:859
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:905
 #, python-format
 msgid "%s TB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:844
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:861
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:907
 #, python-format
 msgid "%s PB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:62
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:66
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:66
 msgid "p.m."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:63
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:67
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:67
 msgid "a.m."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:68
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:72
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:72
 msgid "PM"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:69
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:73
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:73
 msgid "AM"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:150
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:146
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:158
 msgid "midnight"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:152
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:148
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:160
 msgid "noon"
 msgstr ""
@@ -5373,20 +5163,20 @@ msgstr ""
 msgid "This is not a valid IPv6 address."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/text.py:67
+#: venv/lib/python3.6/site-packages/django/utils/text.py:71
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s…"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/text.py:233
+#: venv/lib/python3.6/site-packages/django/utils/text.py:240
 #: venv2/lib/python2.7/site-packages/django/utils/text.py:251
 msgid "or"
 msgstr ""
 
 #. Translators: This string is used as a separator between list elements
-#: venv/lib/python3.6/site-packages/django/utils/text.py:252
-#: venv/lib/python3.6/site-packages/django/utils/timesince.py:83
+#: venv/lib/python3.6/site-packages/django/utils/text.py:259
+#: venv/lib/python3.6/site-packages/django/utils/timesince.py:94
 #: venv2/lib/python2.7/site-packages/django/utils/text.py:270
 #: venv2/lib/python2.7/site-packages/django/utils/timesince.py:71
 msgid ", "
@@ -5440,11 +5230,6 @@ msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/utils/timesince.py:72
-#: venv2/lib/python2.7/site-packages/django/utils/timesince.py:60
-msgid "0 minutes"
-msgstr ""
-
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:110
 #: venv2/lib/python2.7/site-packages/django/views/csrf.py:109
 msgid "Forbidden"
@@ -5456,29 +5241,27 @@ msgid "CSRF verification failed. Request aborted."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:115
-#: venv2/lib/python2.7/site-packages/django/views/csrf.py:114
 msgid ""
-"You are seeing this message because this HTTPS site requires a 'Referer "
-"header' to be sent by your Web browser, but none was sent. This header is "
+"You are seeing this message because this HTTPS site requires a “Referer "
+"header” to be sent by your Web browser, but none was sent. This header is "
 "required for security reasons, to ensure that your browser is not being "
 "hijacked by third parties."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:120
-#: venv2/lib/python2.7/site-packages/django/views/csrf.py:119
 msgid ""
-"If you have configured your browser to disable 'Referer' headers, please re-"
-"enable them, at least for this site, or for HTTPS connections, or for 'same-"
-"origin' requests."
+"If you have configured your browser to disable “Referer” headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for “same-"
+"origin” requests."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:124
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
-"including the 'Referrer-Policy: no-referrer' header, please remove them. The "
-"CSRF protection requires the 'Referer' header to do strict referer checking. "
-"If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
-"\" ...> for links to third-party sites."
+"including the “Referrer-Policy: no-referrer” header, please remove them. The "
+"CSRF protection requires the “Referer” header to do strict referer checking. "
+"If you’re concerned about privacy, use alternatives like <a rel=\"noreferrer"
+"\" …> for links to third-party sites."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:132
@@ -5490,10 +5273,9 @@ msgid ""
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:137
-#: venv2/lib/python2.7/site-packages/django/views/csrf.py:129
 msgid ""
 "If you have configured your browser to disable cookies, please re-enable "
-"them, at least for this site, or for 'same-origin' requests."
+"them, at least for this site, or for “same-origin” requests."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:142
@@ -5538,7 +5320,7 @@ msgstr ""
 msgid "No %(verbose_name_plural)s available"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:589
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:594
 #: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:669
 #, python-format
 msgid ""
@@ -5546,10 +5328,9 @@ msgid ""
 "allow_future is False."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:623
-#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:703
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:628
 #, python-format
-msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgid "Invalid date string “%(datestr)s” given format “%(format)s”"
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/detail.py:54
@@ -5559,8 +5340,7 @@ msgid "No %(verbose_name)s found matching the query"
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/list.py:67
-#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:77
-msgid "Page is not 'last', nor can it be converted to an int."
+msgid "Page is not “last”, nor can it be converted to an int."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/list.py:72
@@ -5570,9 +5350,8 @@ msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/list.py:154
-#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:172
 #, python-format
-msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgid "Empty list and “%(class_name)s.allow_empty” is False."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/static.py:40
@@ -5581,9 +5360,8 @@ msgid "Directory indexes are not allowed here."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/static.py:42
-#: venv2/lib/python2.7/site-packages/django/views/static.py:46
 #, python-format
-msgid "\"%(path)s\" does not exist"
+msgid "“%(path)s” does not exist"
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/static.py:80
@@ -5592,22 +5370,19 @@ msgstr ""
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:6
-msgid "Django: the Web framework for perfectionists with deadlines."
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:7
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:221
+msgid "The install worked successfully! Congratulations!"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:345
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:207
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:367
-msgid "The install worked successfully! Congratulations!"
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:368
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:222
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
@@ -5616,39 +5391,160 @@ msgid ""
 "URLs."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:383
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:230
 msgid "Django Documentation"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:384
-msgid "Topics, references, &amp; how-to's"
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:231
+msgid "Topics, references, &amp; how-to’s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:395
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:239
 msgid "Tutorial: A Polling App"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:396
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:240
 msgid "Get started with Django"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:407
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:248
 msgid "Django Community"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:408
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:249
 msgid "Connect, get help, or contribute"
 msgstr ""
 
+#: venv/lib/python3.6/site-packages/django_bootstrap5/components.py:20
+msgid "close"
+msgstr ""
+
 #: venv/lib/python3.6/site-packages/django_icons/renderers/image.py:217
 msgid "Icon of {}"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/qr_code/qrcode/utils.py:73
-#, python-format
-msgid "The option '%s' is not a valid option for a QR code."
+#: venv/lib/python3.6/site-packages/isort/main.py:158
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1615
+msgid "show this help message and exit"
 msgstr ""
 
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:245
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:252
+msgid ""
+"Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
+"hyphens."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:463
+#, python-format
+msgid ""
+"File extension '%(extension)s' is not allowed. Allowed extensions are: "
+"'%(allowed_extensions)s'."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:905
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1807
+#, python-format
+msgid "'%(value)s' value must be an integer."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:990
+#, python-format
+msgid "'%(value)s' value must be either True or False."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1172
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+"format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1174
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1319
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
+"date."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1317
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1321
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]) but it is an invalid date/time."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1475
+#, python-format
+msgid "'%(value)s' value must be a decimal number."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1628
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
+"uuuuuu] format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1773
+#, python-format
+msgid "'%(value)s' value must be a float."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2006
+#, python-format
+msgid "'%(value)s' value must be either None, True or False."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2163
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2165
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"invalid time."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2366
+#, python-format
+msgid "'%(value)s' is not a valid UUID."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:97
+msgid "ManagementForm data is missing or has been tampered with"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:355
+#, python-format
+msgid "Please submit %d or fewer forms."
+msgid_plural "Please submit %d or fewer forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:362
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1093
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
@@ -5658,12 +5554,44 @@ msgstr ""
 msgid "\"%(pk)s\" is not a valid value for a primary key."
 msgstr ""
 
+#: venv2/lib/python2.7/site-packages/django/forms/utils.py:172
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
 #: venv2/lib/python2.7/site-packages/django/utils/text.py:81
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
+#: venv2/lib/python2.7/site-packages/django/utils/timesince.py:60
+msgid "0 minutes"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:114
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:119
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:129
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
 #: venv2/lib/python2.7/site-packages/django/views/debug.py:520
 msgid "Welcome to Django"
 msgstr ""
@@ -5688,6 +5616,25 @@ msgid ""
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 
+#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:703
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:77
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:172
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/static.py:46
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
+
 #: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:313
 msgid "usage: "
 msgstr ""
@@ -5747,10 +5694,6 @@ msgstr ""
 msgid "optional arguments"
 msgstr ""
 
-#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1615
-msgid "show this help message and exit"
-msgstr ""
-
 #: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1621
 msgid "show program's version number and exit"
 msgstr ""
@@ -5836,6 +5779,49 @@ msgstr ""
 msgid "%s: error: %s\n"
 msgstr ""
 
+#: virtsecrets/templates/create_secret_block.html:12
+msgid "Create New Secret"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:18
+msgid "Ephemeral"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:21
+#: virtsecrets/templates/create_secret_block.html:30
+msgid "no"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:22
+#: virtsecrets/templates/create_secret_block.html:31
+msgid "yes"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:27
+msgid "Private"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:46
+#: virtsecrets/templates/secrets.html:62
+msgid "Data"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:51
+msgid "Hypervisor doesn't have any Secrets"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:61
+msgid "Usage Type"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:89
+msgid "Set secret value"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:95
+msgid "Value"
+msgstr ""
+
 #: webvirtcloud/middleware.py:18
 #, python-format
 msgid "libvirt Error - %(exception)s"
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 60c21a0..0eae6db 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,11 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2020-11-05 09:36+0000\n"
-=======
-"POT-Creation-Date: 2020-10-23 07:53+0000\n"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+"POT-Creation-Date: 2021-12-20 07:53+0000\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"
@@ -96,39 +92,39 @@ msgstr ""
 msgid "Create user instance"
 msgstr ""
 
-#: accounts/templates/account.html:27
+#: accounts/templates/account.html:28
 #: computes/templates/computes/instances.html:5
 #: computes/templates/computes/instances.html:9
-#: computes/templates/computes/instances.html:32
-#: computes/templates/overview.html:19 instances/templates/allinstances.html:5
+#: computes/templates/computes/instances.html:30
+#: computes/templates/overview.html:18 instances/templates/allinstances.html:5
 #: instances/templates/allinstances.html:9
 #: instances/templates/bottom_bar.html:17
 #: interfaces/templates/interface.html:16
-#: interfaces/templates/interfaces.html:20 networks/templates/network.html:17
+#: interfaces/templates/interfaces.html:22 networks/templates/network.html:17
 #: networks/templates/networks.html:19 nwfilters/templates/nwfilter.html:17
-#: nwfilters/templates/nwfilters.html:25 secrets/templates/secrets.html:23
-#: storages/templates/storage.html:22 storages/templates/storages.html:19
-#: templates/navbar.html:14
+#: nwfilters/templates/nwfilters.html:23 storages/templates/storage.html:23
+#: storages/templates/storages.html:19 templates/navbar.html:14
+#: virtsecrets/templates/secrets.html:25
 msgid "Instances"
 msgstr ""
 
-#: accounts/templates/account.html:30
+#: accounts/templates/account.html:33
 msgid "Public Keys"
 msgstr ""
 
-#: accounts/templates/account.html:40 admin/templates/admin/logs.html:27
+#: accounts/templates/account.html:44 admin/templates/admin/logs.html:27
 #: instances/templates/instance.html:5
 msgid "Instance"
 msgstr ""
 
-#: accounts/templates/account.html:41
+#: accounts/templates/account.html:45
 msgid "VNC"
 msgstr ""
 
-#: accounts/templates/account.html:42 instances/templates/instance.html:87
-#: instances/templates/instances/resize_tab.html:56
-#: instances/templates/instances/resize_tab.html:58
-#: instances/templates/instances/resize_tab.html:85
+#: accounts/templates/account.html:46 instances/templates/instance.html:93
+#: instances/templates/instances/resize_tab.html:55
+#: instances/templates/instances/resize_tab.html:57
+#: instances/templates/instances/resize_tab.html:84
 #: instances/templates/instances/resize_tab.html:121
 #: instances/templates/instances/resize_tab.html:125
 #: instances/templates/instances/resize_tab.html:151
@@ -137,47 +133,47 @@ msgstr ""
 msgid "Resize"
 msgstr ""
 
-#: accounts/templates/account.html:43 accounts/templates/account.html:61
-#: accounts/templates/profile.html:51 admin/templates/admin/group_list.html:46
-#: admin/templates/admin/user_list.html:68
-#: computes/templates/computes/list.html:54
-#: instances/templates/instances/settings_tab.html:310
-#: instances/templates/instances/settings_tab.html:314
+#: accounts/templates/account.html:47 accounts/templates/account.html:65
+#: accounts/templates/profile.html:55 admin/templates/admin/group_list.html:43
+#: admin/templates/admin/user_list.html:65
+#: computes/templates/computes/list.html:53
+#: instances/templates/instances/settings_tab.html:325
+#: instances/templates/instances/settings_tab.html:329
 #: interfaces/templates/interface.html:60 networks/templates/network.html:50
-#: nwfilters/templates/nwfilter.html:111 nwfilters/templates/nwfilter.html:151
-#: nwfilters/templates/nwfilters.html:120 secrets/templates/secrets.html:77
-#: storages/templates/storage.html:61 storages/templates/storage.html:174
-#: templates/common/confirm_delete.html:21
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:375
+#: nwfilters/templates/nwfilter.html:103 nwfilters/templates/nwfilter.html:143
+#: nwfilters/templates/nwfilters.html:118 storages/templates/storage.html:63
+#: storages/templates/storage.html:175 templates/common/confirm_delete.html:21
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:417
 #: venv2/lib/python2.7/site-packages/django/forms/formsets.py:394
+#: virtsecrets/templates/secrets.html:78
 msgid "Delete"
 msgstr ""
 
-#: accounts/templates/account.html:44
-#: instances/templates/create_instance_w2.html:81
-#: instances/templates/instances/settings_tab.html:239
-#: instances/templates/instances/snapshots_tab.html:49
-#: nwfilters/templates/nwfilter.html:101 nwfilters/templates/nwfilter.html:135
-#: nwfilters/templates/nwfilters.html:57 secrets/templates/secrets.html:62
-#: storages/templates/storage.html:100
+#: accounts/templates/account.html:48
+#: instances/templates/create_instance_w2.html:80
+#: instances/templates/instances/settings_tab.html:254
+#: instances/templates/instances/snapshots_tab.html:41
+#: nwfilters/templates/nwfilter.html:93 nwfilters/templates/nwfilter.html:127
+#: nwfilters/templates/nwfilters.html:55 storages/templates/storage.html:101
+#: virtsecrets/templates/secrets.html:63
 msgid "Action"
 msgstr ""
 
-#: accounts/templates/account.html:56
+#: accounts/templates/account.html:60
 msgid "edit"
 msgstr ""
 
-#: accounts/templates/account.html:74
+#: accounts/templates/account.html:78
 msgid "Key name"
 msgstr ""
 
-#: accounts/templates/account.html:75
+#: accounts/templates/account.html:79
 msgid "Public key"
 msgstr ""
 
 #: accounts/templates/accounts/change_password_form.html:7
 #: accounts/templates/accounts/change_password_form.html:14
-#: accounts/templates/profile.html:29
+#: accounts/templates/profile.html:33
 msgid "Change Password"
 msgstr ""
 
@@ -190,11 +186,11 @@ msgid "Cancel"
 msgstr ""
 
 #: accounts/templates/accounts/change_password_form.html:27
-#: instances/templates/instances/settings_tab.html:638
-#: instances/templates/instances/settings_tab.html:642
-#: instances/templates/instances/settings_tab.html:824
-#: instances/templates/instances/settings_tab.html:826
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:397
+#: instances/templates/instances/settings_tab.html:672
+#: instances/templates/instances/settings_tab.html:676
+#: instances/templates/instances/settings_tab.html:853
+#: instances/templates/instances/settings_tab.html:855
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:405
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:379
 msgid "Change"
 msgstr ""
@@ -223,7 +219,7 @@ msgstr ""
 
 #: accounts/templates/accounts/otp_login.html:24
 #: accounts/templates/login.html:5 accounts/templates/login.html:23
-#: accounts/templates/login.html:27
+#: accounts/templates/login.html:28
 msgid "Sign In"
 msgstr ""
 
@@ -235,12 +231,12 @@ msgstr ""
 msgid "Incorrect username or password."
 msgstr ""
 
-#: accounts/templates/login.html:24 admin/templates/admin/logs.html:26
-#: computes/templates/computes/instances.html:67
+#: accounts/templates/login.html:24 admin/templates/admin/logs.html:25
+#: computes/templates/computes/instances.html:64
 #: instances/templates/add_instance_owner_block.html:18
 #: instances/templates/allinstances_index_grouped.html:8
 #: instances/templates/allinstances_index_nongrouped.html:7
-#: instances/templates/instances/stats_tab.html:84
+#: instances/templates/instances/stats_tab.html:87
 msgid "User"
 msgstr ""
 
@@ -264,26 +260,26 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: accounts/templates/profile.html:14
+#: accounts/templates/profile.html:15
 msgid "Edit Profile"
 msgstr ""
 
-#: accounts/templates/profile.html:17
-#: instances/templates/instances/access_tab.html:23
+#: accounts/templates/profile.html:20
+#: instances/templates/instances/access_tab.html:20
 msgid "SSH Keys"
 msgstr ""
 
-#: accounts/templates/profile.html:34
-#: instances/templates/instances/settings_tab.html:686
-#: instances/templates/instances/settings_tab.html:688
+#: accounts/templates/profile.html:38
+#: instances/templates/instances/settings_tab.html:720
+#: instances/templates/instances/settings_tab.html:722
 msgid "Update"
 msgstr ""
 
-#: accounts/templates/profile.html:64
+#: accounts/templates/profile.html:68
 msgid "Add SSH Key"
 msgstr ""
 
-#: accounts/templates/profile.html:72
+#: accounts/templates/profile.html:76
 #: instances/templates/add_instance_network_block.html:50
 #: instances/templates/add_instance_owner_block.html:31
 #: instances/templates/create_flav_block.html:28
@@ -297,7 +293,6 @@ msgstr ""
 
 #: accounts/utils.py:51
 msgid "Please view HTML version of this message."
-<<<<<<< HEAD
 msgstr ""
 
 #: accounts/views.py:26
@@ -347,57 +342,6 @@ msgid "OTP QR code was emailed to user %(user)s"
 msgstr ""
 
 #: accounts/views.py:196
-=======
-msgstr ""
-
-#: accounts/views.py:26
-msgid "Profile updated"
-msgstr ""
-
-#: accounts/views.py:40
-msgid "SSH key added"
-msgstr ""
-
-#: accounts/views.py:45
-msgid "Add SSH key"
-msgstr ""
-
-#: accounts/views.py:53
-msgid "SSH key deleted"
-msgstr ""
-
-#: accounts/views.py:58
-msgid "Delete SSH key"
-msgstr ""
-
-#: accounts/views.py:86
-msgid "Password Changed"
-msgstr ""
-
-#: accounts/views.py:106
-msgid "Create User Instance"
-msgstr ""
-
-#: accounts/views.py:124
-msgid "Update User Instance"
-msgstr ""
-
-#: accounts/views.py:160
-#, python-format
-msgid "OTP Sent to %s"
-msgstr ""
-
-#: accounts/views.py:165
-msgid "Email OTP"
-msgstr ""
-
-#: accounts/views.py:175
-#, python-format
-msgid "OTP QR code was emailed to user %s"
-msgstr ""
-
-#: accounts/views.py:177
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "User email not set, failed to send QR code"
 msgstr ""
 
@@ -405,156 +349,145 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: admin/forms.py:56 admin/templates/admin/group_list.html:15
+#: admin/forms.py:56 admin/templates/admin/group_list.html:13
 #: templates/navbar.html:30
 msgid "Groups"
 msgstr ""
 
-<<<<<<< HEAD
 #: admin/forms.py:81
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, \n"
 "                    but you can change the password using <a href='{}'>this "
 "form</a>."
-=======
-#: admin/forms.py:79
-msgid ""
-"Raw passwords are not stored, so there is no way to see\n"
-"                this user's password, but you can change the password using "
-"<a href='{}'>this form</a>."
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgstr ""
 
 #: admin/templates/admin/group_list.html:5 admin/views.py:87
-#: instances/templates/instances/settings_tab.html:63 templates/navbar.html:29
+#: instances/templates/instances/settings_tab.html:69 templates/navbar.html:29
 msgid "Users"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:13
-#: admin/templates/admin/user_list.html:16
-#: computes/templates/computes/instances.html:18
-#: instances/templates/allinstances.html:16
-#: nwfilters/templates/nwfilters.html:12 storages/templates/storage.html:87
-#: templates/search_block.html:3
-msgid "Search"
-msgstr ""
-
-#: admin/templates/admin/group_list.html:23 admin/templates/admin/logs.html:16
-#: admin/templates/admin/user_list.html:26
-#: computes/templates/computes/instances.html:57
-#: computes/templates/computes/list.html:20
-#: instances/templates/create_instance_w2.html:66
-#: interfaces/templates/interfaces.html:47 networks/templates/networks.html:46
-#: nwfilters/templates/nwfilters.html:135 secrets/templates/secrets.html:50
-#: storages/templates/storage.html:187 storages/templates/storages.html:46
+#: admin/templates/admin/group_list.html:20 admin/templates/admin/logs.html:15
+#: admin/templates/admin/user_list.html:23
+#: computes/templates/computes/instances.html:55
+#: computes/templates/computes/list.html:19
+#: instances/templates/create_instance_w2.html:67
+#: interfaces/templates/interfaces.html:48 networks/templates/networks.html:45
+#: nwfilters/templates/nwfilters.html:132 storages/templates/storage.html:187
+#: storages/templates/storages.html:45 virtsecrets/templates/secrets.html:51
 msgid "Warning"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:23
+#: admin/templates/admin/group_list.html:20
 msgid "You don't have any groups"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:31
+#: admin/templates/admin/group_list.html:28
 msgid "Group Name"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:32
-#: admin/templates/admin/user_list.html:39
-#: computes/templates/computes/instances.html:71
-#: computes/templates/computes/list.html:31
+#: admin/templates/admin/group_list.html:29
+#: admin/templates/admin/user_list.html:36
+#: computes/templates/computes/instances.html:68
+#: computes/templates/computes/list.html:30
 #: instances/templates/allinstances_index_grouped.html:12
 #: instances/templates/allinstances_index_nongrouped.html:12
-#: instances/templates/instances/settings_tab.html:343
-#: instances/templates/instances/settings_tab.html:491
+#: instances/templates/instances/settings_tab.html:355
+#: instances/templates/instances/settings_tab.html:525
 #: networks/templates/network.html:175 networks/templates/network.html:284
 #: networks/templates/network.html:332
 msgid "Actions"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:43
-#: admin/templates/admin/user_list.html:62
-#: computes/templates/computes/list.html:53 networks/templates/network.html:82
-#: nwfilters/templates/nwfilter.html:59 secrets/templates/secrets.html:74
+#: admin/templates/admin/group_list.html:40
+#: admin/templates/admin/user_list.html:59
+#: computes/templates/computes/list.html:52 networks/templates/network.html:82
+#: nwfilters/templates/nwfilter.html:59 virtsecrets/templates/secrets.html:75
 msgid "Edit"
 msgstr ""
 
 #: admin/templates/admin/logs.html:5 admin/templates/admin/logs.html:7
-#: instances/templates/instances/stats_tab.html:13 templates/navbar.html:31
+#: instances/templates/instances/stats_tab.html:12 templates/navbar.html:31
 msgid "Logs"
 msgstr ""
 
-#: admin/templates/admin/logs.html:16
+#: admin/templates/admin/logs.html:15
 msgid "You don't have any Logs"
 msgstr ""
 
-#: admin/templates/admin/logs.html:25
-#: instances/templates/instances/snapshots_tab.html:48
-#: instances/templates/instances/stats_tab.html:83
+#: admin/templates/admin/logs.html:24
+#: instances/templates/instances/snapshots_tab.html:40
+#: instances/templates/instances/stats_tab.html:86
 msgid "Date"
 msgstr ""
 
+#: admin/templates/admin/logs.html:26
+#: console/templates/console-spice-full.html:202
+#: instances/templates/allinstances_index_nongrouped.html:7
+msgid "Host"
+msgstr ""
+
 #: admin/templates/admin/logs.html:28
-#: instances/templates/instances/stats_tab.html:85
+#: instances/templates/instances/stats_tab.html:88
 msgid "Message"
 msgstr ""
 
 #: admin/templates/admin/user_form.html:21
 #: computes/templates/computes/form.html:23
-#: instances/templates/edit_instance_volume.html:124
+#: instances/templates/instances/edit_instance_volume.html:111
 #: networks/templates/add_network_qos.html:51 templates/common/form.html:22
 msgid "Save"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:26
+#: admin/templates/admin/user_list.html:23
 msgid "You don't have any user"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:34
+#: admin/templates/admin/user_list.html:31
 msgid "Username"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:35
-#: computes/templates/computes/instances.html:68
-#: computes/templates/computes/list.html:29
+#: admin/templates/admin/user_list.html:32
+#: computes/templates/computes/instances.html:65
+#: computes/templates/computes/list.html:28
 #: instances/templates/allinstances_index_grouped.html:9
 #: instances/templates/allinstances_index_nongrouped.html:9
 msgid "Status"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:36
+#: admin/templates/admin/user_list.html:33
 msgid "Staff"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:37
+#: admin/templates/admin/user_list.html:34
 msgid "Superuser"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:38
+#: admin/templates/admin/user_list.html:35
 msgid "Can Clone"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:51
-#: computes/templates/computes/instances.html:94
-#: instances/templates/allinstances_index_grouped.html:57
-#: instances/templates/allinstances_index_nongrouped.html:40
+#: admin/templates/admin/user_list.html:48
+#: computes/templates/computes/instances.html:91
+#: instances/templates/allinstances_index_grouped.html:59
+#: instances/templates/allinstances_index_nongrouped.html:41
 #: instances/templates/instance.html:19
 msgid "Active"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:53
+#: admin/templates/admin/user_list.html:50
 msgid "Blocked"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:61
+#: admin/templates/admin/user_list.html:58
 msgid "View Profile"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:64
+#: admin/templates/admin/user_list.html:61
 msgid "Block"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:66
+#: admin/templates/admin/user_list.html:63
 msgid "Unblock"
 msgstr ""
 
@@ -566,11 +499,10 @@ msgstr ""
 msgid "Update Group"
 msgstr ""
 
-#: admin/views.py:113
+#: admin/views.py:110
 msgid "Create User"
 msgstr ""
 
-<<<<<<< HEAD
 #: admin/views.py:129
 msgid "Update User"
 msgstr ""
@@ -581,17 +513,6 @@ msgid "Password changed for %(user)s"
 msgstr ""
 
 #: admin/views.py:144
-=======
-#: admin/views.py:136
-msgid "Update User"
-msgstr ""
-
-#: admin/views.py:149
-msgid "User password changed: {}"
-msgstr ""
-
-#: admin/views.py:152
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "Wrong Data Provided"
 msgstr ""
 
@@ -877,33 +798,18 @@ msgid "Other Settings"
 msgstr ""
 
 #: appsettings/views.py:38
-<<<<<<< HEAD
 #, python-format
 msgid "SASS directory path is changed. Now: %(dir)s"
 msgstr ""
 
-#: appsettings/views.py:67
+#: appsettings/views.py:70
 #, python-format
 msgid "Theme is changed. Now: %(theme)s"
 msgstr ""
 
-#: appsettings/views.py:82
+#: appsettings/views.py:85
 #, python-format
 msgid "%(setting)s is changed. Now: %(value)s"
-=======
-#, python-brace-format
-msgid "SASS directory path is changed. Now: {sass_dir.value}"
-msgstr ""
-
-#: appsettings/views.py:65
-#, python-brace-format
-msgid "Theme changed. Now: {theme}"
-msgstr ""
-
-#: appsettings/views.py:80
-#, python-brace-format
-msgid "{setting.name} is changed. Now: {setting.value}"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgstr ""
 
 #: computes/forms.py:21
@@ -934,144 +840,144 @@ msgstr ""
 msgid "Create Compute"
 msgstr ""
 
-#: computes/templates/computes/instances.html:29
-#: computes/templates/computes/list.html:49
-#: computes/templates/computes/list.html:51 computes/templates/overview.html:6
-#: computes/templates/overview.html:16 interfaces/templates/interface.html:13
-#: interfaces/templates/interfaces.html:17 networks/templates/network.html:14
+#: computes/templates/computes/instances.html:27
+#: computes/templates/computes/list.html:48
+#: computes/templates/computes/list.html:50 computes/templates/overview.html:6
+#: computes/templates/overview.html:15 interfaces/templates/interface.html:13
+#: interfaces/templates/interfaces.html:19 networks/templates/network.html:14
 #: networks/templates/networks.html:16 nwfilters/templates/nwfilter.html:14
-#: nwfilters/templates/nwfilters.html:22 secrets/templates/secrets.html:20
-#: storages/templates/storage.html:19 storages/templates/storages.html:16
+#: nwfilters/templates/nwfilters.html:20 storages/templates/storage.html:20
+#: storages/templates/storages.html:16 virtsecrets/templates/secrets.html:22
 msgid "Overview"
 msgstr ""
 
-#: computes/templates/computes/instances.html:35
-#: computes/templates/overview.html:22 interfaces/templates/interface.html:19
-#: interfaces/templates/interfaces.html:23 networks/templates/network.html:20
+#: computes/templates/computes/instances.html:33
+#: computes/templates/overview.html:21 interfaces/templates/interface.html:19
+#: interfaces/templates/interfaces.html:25 networks/templates/network.html:20
 #: networks/templates/networks.html:22 nwfilters/templates/nwfilter.html:20
-#: nwfilters/templates/nwfilters.html:28 secrets/templates/secrets.html:26
-#: storages/templates/storage.html:25 storages/templates/storages.html:4
-#: storages/templates/storages.html:6 storages/templates/storages.html:22
+#: nwfilters/templates/nwfilters.html:26 storages/templates/storage.html:26
+#: storages/templates/storages.html:4 storages/templates/storages.html:6
+#: storages/templates/storages.html:22 virtsecrets/templates/secrets.html:28
 msgid "Storages"
 msgstr ""
 
-#: computes/templates/computes/instances.html:38
-#: computes/templates/overview.html:25 interfaces/templates/interface.html:22
-#: interfaces/templates/interfaces.html:26 networks/templates/network.html:23
+#: computes/templates/computes/instances.html:36
+#: computes/templates/overview.html:24 interfaces/templates/interface.html:22
+#: interfaces/templates/interfaces.html:28 networks/templates/network.html:23
 #: networks/templates/networks.html:4 networks/templates/networks.html:6
 #: networks/templates/networks.html:25 nwfilters/templates/nwfilter.html:23
-#: nwfilters/templates/nwfilters.html:31 secrets/templates/secrets.html:29
-#: storages/templates/storage.html:28 storages/templates/storages.html:25
+#: nwfilters/templates/nwfilters.html:29 storages/templates/storage.html:29
+#: storages/templates/storages.html:25 virtsecrets/templates/secrets.html:31
 msgid "Networks"
 msgstr ""
 
-#: computes/templates/computes/instances.html:41
-#: computes/templates/overview.html:28 interfaces/templates/interface.html:25
+#: computes/templates/computes/instances.html:39
+#: computes/templates/overview.html:27 interfaces/templates/interface.html:25
 #: interfaces/templates/interfaces.html:5
 #: interfaces/templates/interfaces.html:7
-#: interfaces/templates/interfaces.html:29 networks/templates/network.html:26
+#: interfaces/templates/interfaces.html:31 networks/templates/network.html:26
 #: networks/templates/networks.html:28 nwfilters/templates/nwfilter.html:26
-#: nwfilters/templates/nwfilters.html:34 secrets/templates/secrets.html:32
-#: storages/templates/storage.html:31 storages/templates/storages.html:28
+#: nwfilters/templates/nwfilters.html:32 storages/templates/storage.html:32
+#: storages/templates/storages.html:28 virtsecrets/templates/secrets.html:34
 msgid "Interfaces"
 msgstr ""
 
-#: computes/templates/computes/instances.html:44
-#: computes/templates/overview.html:31 interfaces/templates/interface.html:28
-#: interfaces/templates/interfaces.html:32 networks/templates/network.html:29
+#: computes/templates/computes/instances.html:42
+#: computes/templates/overview.html:30 interfaces/templates/interface.html:28
+#: interfaces/templates/interfaces.html:34 networks/templates/network.html:29
 #: networks/templates/networks.html:31 nwfilters/templates/nwfilter.html:29
 #: nwfilters/templates/nwfilters.html:5 nwfilters/templates/nwfilters.html:7
-#: nwfilters/templates/nwfilters.html:37 secrets/templates/secrets.html:35
-#: storages/templates/storage.html:34 storages/templates/storages.html:31
+#: nwfilters/templates/nwfilters.html:35 storages/templates/storage.html:35
+#: storages/templates/storages.html:31 virtsecrets/templates/secrets.html:37
 msgid "NWFilters"
 msgstr ""
 
-#: computes/templates/computes/instances.html:47
-#: computes/templates/overview.html:34 interfaces/templates/interface.html:31
-#: interfaces/templates/interfaces.html:35 networks/templates/network.html:32
+#: computes/templates/computes/instances.html:45
+#: computes/templates/overview.html:33 interfaces/templates/interface.html:31
+#: interfaces/templates/interfaces.html:37 networks/templates/network.html:32
 #: networks/templates/networks.html:34 nwfilters/templates/nwfilter.html:32
-#: nwfilters/templates/nwfilters.html:40 secrets/templates/secrets.html:4
-#: secrets/templates/secrets.html:10 secrets/templates/secrets.html:38
-#: storages/templates/create_stg_block.html:124
-#: storages/templates/storage.html:37 storages/templates/storages.html:34
+#: nwfilters/templates/nwfilters.html:38
+#: storages/templates/create_stg_block.html:138
+#: storages/templates/storage.html:38 storages/templates/storages.html:34
+#: virtsecrets/templates/secrets.html:4 virtsecrets/templates/secrets.html:10
+#: virtsecrets/templates/secrets.html:40
 msgid "Secrets"
 msgstr ""
 
-#: computes/templates/computes/instances.html:58
+#: computes/templates/computes/instances.html:56
 msgid "Hypervisor doesn't have any Instances"
 msgstr ""
 
-#: computes/templates/computes/instances.html:66
-#: computes/templates/computes/list.html:28
-#: instances/templates/add_instance_volume.html:40
-#: instances/templates/add_instance_volume.html:42
+#: computes/templates/computes/instances.html:63
+#: computes/templates/computes/list.html:27
+#: instances/templates/add_instance_volume.html:44
+#: instances/templates/add_instance_volume.html:46
 #: instances/templates/allinstances_index_grouped.html:7
 #: instances/templates/allinstances_index_nongrouped.html:5
-#: instances/templates/create_instance_w2.html:77
-#: instances/templates/create_instance_w2.html:103
-#: instances/templates/create_instance_w2.html:106
-#: instances/templates/create_instance_w2.html:305
-#: instances/templates/create_instance_w2.html:307
+#: instances/templates/create_instance_w2.html:76
+#: instances/templates/create_instance_w2.html:102
+#: instances/templates/create_instance_w2.html:105
+#: instances/templates/create_instance_w2.html:304
+#: instances/templates/create_instance_w2.html:306
 #: instances/templates/create_instance_w2.html:518
 #: instances/templates/create_instance_w2.html:520
-#: instances/templates/instances/settings_tab.html:340
-#: instances/templates/instances/snapshots_tab.html:47
+#: instances/templates/instances/settings_tab.html:353
+#: instances/templates/instances/snapshots_tab.html:39
 #: interfaces/templates/create_iface_block.html:18
 #: interfaces/templates/interface.html:75
 #: networks/templates/create_net_block.html:18
 #: networks/templates/modify_ipv4_fixed_address.html:30
 #: networks/templates/modify_ipv6_fixed_address.html:30
 #: networks/templates/network.html:174 networks/templates/network.html:283
-#: nwfilters/templates/nwfilter.html:41 nwfilters/templates/nwfilters.html:56
-#: nwfilters/templates/nwfilters.html:100
-#: nwfilters/templates/nwfilters.html:102
-#: storages/templates/create_stg_block.html:42
-#: storages/templates/create_stg_block.html:71
-#: storages/templates/create_stg_block.html:100
-#: storages/templates/create_stg_block.html:165
-#: storages/templates/create_stg_block.html:214
+#: nwfilters/templates/nwfilter.html:41 nwfilters/templates/nwfilters.html:54
+#: nwfilters/templates/nwfilters.html:98 nwfilters/templates/nwfilters.html:100
+#: storages/templates/create_stg_block.html:56
+#: storages/templates/create_stg_block.html:85
+#: storages/templates/create_stg_block.html:114
+#: storages/templates/create_stg_block.html:179
+#: storages/templates/create_stg_block.html:228
 #: storages/templates/create_stg_vol_block.html:21
-#: storages/templates/storage.html:96 storages/templates/storage.html:124
-#: storages/templates/storage.html:126
+#: storages/templates/storage.html:97 storages/templates/storage.html:125
+#: storages/templates/storage.html:127
 msgid "Name"
 msgstr ""
 
-#: computes/templates/computes/instances.html:66
+#: computes/templates/computes/instances.html:63
 #: instances/templates/allinstances_index_grouped.html:7
 #: instances/templates/allinstances_index_nongrouped.html:5
-#: instances/templates/instances/settings_tab.html:782
-#: instances/templates/instances/settings_tab.html:805
+#: instances/templates/instances/settings_tab.html:811
+#: instances/templates/instances/settings_tab.html:834
 msgid "Description"
 msgstr ""
 
-#: computes/templates/computes/instances.html:69
+#: computes/templates/computes/instances.html:66
 #: instances/templates/allinstances_index_grouped.html:10
 #: instances/templates/allinstances_index_nongrouped.html:10
-#: instances/templates/create_instance_w2.html:78
-#: instances/templates/create_instance_w2.html:323
+#: instances/templates/create_instance_w2.html:77
+#: instances/templates/create_instance_w2.html:322
 #: instances/templates/create_instance_w2.html:536
-#: instances/templates/instance.html:42 instances/templates/instance.html:44
+#: instances/templates/instance.html:43 instances/templates/instance.html:45
 msgid "VCPU"
 msgstr ""
 
-#: computes/templates/computes/instances.html:70
-#: computes/templates/overview.html:82
+#: computes/templates/computes/instances.html:67
+#: computes/templates/overview.html:80
 #: instances/templates/allinstances_index_grouped.html:11
 #: instances/templates/allinstances_index_nongrouped.html:11
-#: instances/templates/instances/resize_tab.html:13
+#: instances/templates/instances/resize_tab.html:12
 msgid "Memory"
 msgstr ""
 
-#: computes/templates/computes/instances.html:96
-#: instances/templates/allinstances_index_grouped.html:58
-#: instances/templates/allinstances_index_nongrouped.html:42
+#: computes/templates/computes/instances.html:93
+#: instances/templates/allinstances_index_grouped.html:60
+#: instances/templates/allinstances_index_nongrouped.html:43
 #: instances/templates/instance.html:16
 msgid "Off"
 msgstr ""
 
-#: computes/templates/computes/instances.html:98
-#: instances/templates/allinstances_index_grouped.html:60
-#: instances/templates/allinstances_index_nongrouped.html:44
+#: computes/templates/computes/instances.html:95
+#: instances/templates/allinstances_index_grouped.html:62
+#: instances/templates/allinstances_index_nongrouped.html:45
 msgid "Suspended"
 msgstr ""
 
@@ -1080,23 +986,24 @@ msgstr ""
 msgid "Computes"
 msgstr ""
 
-#: computes/templates/computes/list.html:20
+#: computes/templates/computes/list.html:19
 msgid "You don't have any computes"
 msgstr ""
 
-#: computes/templates/computes/list.html:30 computes/templates/overview.html:92
-#: instances/templates/instances/settings_tab.html:163
-#: instances/templates/instances/settings_tab.html:248
+#: computes/templates/computes/list.html:29 computes/templates/overview.html:90
+#: instances/templates/instances/settings_tab.html:176
+#: instances/templates/instances/settings_tab.html:215
+#: instances/templates/instances/settings_tab.html:263
 msgid "Details"
 msgstr ""
 
-#: computes/templates/computes/list.html:41
+#: computes/templates/computes/list.html:40
 #: instances/templates/allinstances_index_grouped.html:28
-#: instances/templates/instances/settings_tab.html:881
+#: instances/templates/instances/settings_tab.html:906
 msgid "Connected"
 msgstr ""
 
-#: computes/templates/computes/list.html:41
+#: computes/templates/computes/list.html:40
 msgid "Not Connected"
 msgstr ""
 
@@ -1120,67 +1027,69 @@ msgstr ""
 msgid "Add new host"
 msgstr ""
 
-#: computes/templates/overview.html:42
+#: computes/templates/overview.html:40
 msgid "Basic details"
 msgstr ""
 
-#: computes/templates/overview.html:44
-#: storages/templates/create_stg_block.html:171
+#: computes/templates/overview.html:42
+#: instances/templates/instances/info_tab.html:5
+#: storages/templates/create_stg_block.html:185
 msgid "Hostname"
 msgstr ""
 
-#: computes/templates/overview.html:46
+#: computes/templates/overview.html:44
 msgid "Hypervisors"
 msgstr ""
 
-#: computes/templates/overview.html:63
+#: computes/templates/overview.html:61
 msgid "more"
 msgstr ""
 
-#: computes/templates/overview.html:73
+#: computes/templates/overview.html:71
 msgid "Emulator"
 msgstr ""
 
-#: computes/templates/overview.html:75
+#: computes/templates/overview.html:73
+#: instances/templates/instances/info_tab.html:11
 msgid "Version"
 msgstr ""
 
-#: computes/templates/overview.html:77
+#: computes/templates/overview.html:75
 msgid "Qemu"
 msgstr ""
 
-#: computes/templates/overview.html:79
+#: computes/templates/overview.html:77
 msgid "Libvirt"
 msgstr ""
 
-#: computes/templates/overview.html:84
+#: computes/templates/overview.html:82
 #: instances/templates/create_instance_w1.html:36
-#: instances/templates/create_instance_w1.html:52
+#: instances/templates/create_instance_w1.html:50
 msgid "Architecture"
 msgstr ""
 
-#: computes/templates/overview.html:86
+#: computes/templates/overview.html:84
 msgid "Logical CPUs"
 msgstr ""
 
-#: computes/templates/overview.html:88
+#: computes/templates/overview.html:86
 msgid "Processor"
 msgstr ""
 
-#: computes/templates/overview.html:90
+#: computes/templates/overview.html:88
 msgid "Connection"
 msgstr ""
 
-#: computes/templates/overview.html:96
-#: instances/templates/edit_instance_volume.html:22
+#: computes/templates/overview.html:94
+#: instances/templates/instances/edit_instance_volume.html:25
 msgid "Performance"
 msgstr ""
 
-#: computes/templates/overview.html:102
+#: computes/templates/overview.html:100
 msgid "CPU Utilization"
 msgstr ""
 
-#: computes/templates/overview.html:111
+#: computes/templates/overview.html:109
 msgid "RAM Utilization"
 msgstr ""
 
@@ -1221,11 +1130,6 @@ msgstr ""
 msgid "File API is not supported"
 msgstr ""
 
-#: console/templates/console-spice-full.html:202
-#: instances/templates/allinstances_index_nongrouped.html:7
-msgid "Host"
-msgstr ""
-
 #: console/templates/console-spice-full.html:204
 msgid "Port"
 msgstr ""
@@ -1238,7 +1142,7 @@ msgstr ""
 #: interfaces/templates/interface.html:59 networks/templates/network.html:49
 #: networks/templates/network.html:119 networks/templates/network.html:125
 #: networks/templates/network.html:231 networks/templates/network.html:237
-#: storages/templates/storage.html:60
+#: storages/templates/storage.html:62
 msgid "Start"
 msgstr ""
 
@@ -1254,6 +1158,20 @@ msgstr ""
 msgid "Loading"
 msgstr ""
 
+#: console/views.py:52
+msgid ""
+"User does not have permission to access console or host/instance not exist"
+msgstr ""
+
+#: console/views.py:84
+msgid "Fail to get console. Please check the console configuration of your VM."
+msgstr ""
+
+#: console/views.py:86
+#, python-format
+msgid "Console type '%(type)s' has not support"
+msgstr ""
+
 #: instances/forms.py:37
 msgid "No Virtual Machine name has been entered"
 msgstr ""
@@ -1314,7 +1232,7 @@ msgstr ""
 msgid "created"
 msgstr ""
 
-#: instances/models.py:220
+#: instances/models.py:216
 msgid "Can access console without password"
 msgstr ""
 
@@ -1323,87 +1241,86 @@ msgid "Add Instance Network"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:18
-#: instances/templates/create_instance_w2.html:205
-#: instances/templates/instances/settings_tab.html:359
-#: instances/templates/instances/settings_tab.html:382
-#: instances/templates/instances/settings_tab.html:487
+#: instances/templates/create_instance_w2.html:182
+#: instances/templates/instances/settings_tab.html:373
+#: instances/templates/instances/settings_tab.html:409
+#: instances/templates/instances/settings_tab.html:521
 #: interfaces/templates/interface.html:45
 #: interfaces/templates/interface.html:74
-#: interfaces/templates/interfaces.html:63
+#: interfaces/templates/interfaces.html:64
 #: networks/templates/modify_ipv4_fixed_address.html:24
 #: networks/templates/network.html:172
 msgid "MAC"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:24
-#: instances/templates/create_instance_w2.html:164
-#: instances/templates/create_instance_w2.html:388
-#: instances/templates/create_instance_w2.html:605
-#: instances/templates/instances/settings_tab.html:30
-#: instances/templates/instances/settings_tab.html:394
+#: instances/templates/create_instance_w2.html:163
+#: instances/templates/create_instance_w2.html:387
+#: instances/templates/instances/settings_tab.html:36
+#: instances/templates/instances/settings_tab.html:421
 #: networks/templates/network.html:5 networks/templates/network.html:7
 #: networks/templates/network.html:107 networks/templates/network.html:218
 msgid "Network"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:37
-#: instances/templates/create_instance_w2.html:183
+#: instances/templates/create_instance_w2.html:188
 #: instances/templates/create_instance_w2.html:429
-#: instances/templates/create_instance_w2.html:642
-#: instances/templates/instances/settings_tab.html:403
+#: instances/templates/create_instance_w2.html:645
+#: instances/templates/instances/settings_tab.html:430
 #: nwfilters/templates/nwfilter.html:5 nwfilters/templates/nwfilter.html:7
 msgid "NWFilter"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:40
-#: instances/templates/add_instance_volume.html:117
+#: instances/templates/add_instance_volume.html:121
 #: instances/templates/create_inst_block.html:25
-#: instances/templates/create_instance_w2.html:158
-#: instances/templates/create_instance_w2.html:186
-#: instances/templates/create_instance_w2.html:377
+#: instances/templates/create_instance_w2.html:157
+#: instances/templates/create_instance_w2.html:191
+#: instances/templates/create_instance_w2.html:376
 #: instances/templates/create_instance_w2.html:432
 #: instances/templates/create_instance_w2.html:580
 #: instances/templates/create_instance_w2.html:599
-#: instances/templates/create_instance_w2.html:645
-#: instances/templates/instances/access_tab.html:135
-#: instances/templates/instances/settings_tab.html:183
-#: instances/templates/instances/settings_tab.html:407
-#: instances/templates/instances/stats_tab.html:90
+#: instances/templates/create_instance_w2.html:648
+#: instances/templates/instances/access_tab.html:123
+#: instances/templates/instances/settings_tab.html:191
+#: instances/templates/instances/settings_tab.html:434
+#: instances/templates/instances/stats_tab.html:93
 #: interfaces/templates/interface.html:41
-#: interfaces/templates/interface.html:43 nwfilters/templates/nwfilter.html:78
-#: storages/templates/create_stg_block.html:132
-#: storages/templates/storage.html:47 storages/templates/storage.html:49
-#: storages/templates/storage.html:51
+#: interfaces/templates/interface.html:43 nwfilters/templates/nwfilter.html:73
+#: storages/templates/create_stg_block.html:146
+#: storages/templates/storage.html:49 storages/templates/storage.html:51
+#: storages/templates/storage.html:53
 msgid "None"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:49
 #: instances/templates/add_instance_owner_block.html:30
-#: instances/templates/add_instance_volume.html:89
-#: instances/templates/add_instance_volume.html:144
+#: instances/templates/add_instance_volume.html:93
+#: instances/templates/add_instance_volume.html:148
 #: instances/templates/create_flav_block.html:25
 #: instances/templates/create_inst_block.html:34
-#: instances/templates/create_instance_w2.html:269
-#: instances/templates/edit_instance_volume.html:123
-#: instances/templates/instances/settings_tab.html:428
-#: interfaces/templates/create_iface_block.html:135
+#: instances/templates/create_instance_w2.html:268
+#: instances/templates/instances/edit_instance_volume.html:110
+#: instances/templates/instances/settings_tab.html:455
+#: interfaces/templates/create_iface_block.html:139
 #: networks/templates/add_network_qos.html:50
 #: networks/templates/create_net_block.html:85
 #: networks/templates/modify_ipv4_fixed_address.html:44
 #: networks/templates/modify_ipv6_fixed_address.html:44
 #: nwfilters/templates/add_nwf_rule.html:25
-#: nwfilters/templates/create_nwfilter_block.html:23
-#: nwfilters/templates/nwfilters.html:80 nwfilters/templates/nwfilters.html:108
-#: secrets/templates/create_secret_block.html:54
-#: secrets/templates/secrets.html:102
-#: storages/templates/create_stg_block.html:55
-#: storages/templates/create_stg_block.html:84
-#: storages/templates/create_stg_block.html:140
-#: storages/templates/create_stg_block.html:202
-#: storages/templates/create_stg_block.html:230
+#: nwfilters/templates/create_nwfilter_block.html:25
+#: nwfilters/templates/nwfilters.html:78 nwfilters/templates/nwfilters.html:106
+#: storages/templates/create_stg_block.html:69
+#: storages/templates/create_stg_block.html:98
+#: storages/templates/create_stg_block.html:154
+#: storages/templates/create_stg_block.html:216
+#: storages/templates/create_stg_block.html:244
 #: storages/templates/create_stg_vol_block.html:28
 #: storages/templates/create_stg_vol_block.html:56
-#: storages/templates/storage.html:154
+#: storages/templates/storage.html:155
+#: virtsecrets/templates/create_secret_block.html:54
+#: virtsecrets/templates/secrets.html:103
 msgid "Close"
 msgstr ""
 
@@ -1412,8 +1329,8 @@ msgid "Add Instance Owner"
 msgstr ""
 
 #: instances/templates/add_instance_volume.html:3
-#: instances/templates/add_instance_volume.html:90
-#: instances/templates/add_instance_volume.html:145
+#: instances/templates/add_instance_volume.html:94
+#: instances/templates/add_instance_volume.html:149
 msgid "Add Volume"
 msgstr ""
 
@@ -1421,72 +1338,73 @@ msgstr ""
 msgid "Add Instance Volume"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:18
+#: instances/templates/add_instance_volume.html:19
 msgid "New Disk"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:21
+#: instances/templates/add_instance_volume.html:24
 msgid "Existing Disk"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:28
-#: instances/templates/add_instance_volume.html:98
+#: instances/templates/add_instance_volume.html:32
+#: instances/templates/add_instance_volume.html:102
 msgid "Volume parameters"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:30
-#: instances/templates/add_instance_volume.html:100
-#: instances/templates/create_instance_w2.html:149
+#: instances/templates/add_instance_volume.html:34
+#: instances/templates/add_instance_volume.html:104
+#: instances/templates/create_instance_w2.html:148
 #: instances/templates/create_instance_w2.html:591
-#: instances/templates/instances/settings_tab.html:237
+#: instances/templates/instances/settings_tab.html:252
 #: storages/templates/storage.html:4 storages/templates/storage.html:9
 msgid "Storage"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:46
-#: storages/templates/create_stg_block.html:183
-#: storages/templates/storage.html:99 storages/templates/storage.html:137
+#: instances/templates/add_instance_volume.html:50
+#: storages/templates/create_stg_block.html:197
+#: storages/templates/storage.html:100 storages/templates/storage.html:138
 msgid "Format"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:56
-#: storages/templates/storage.html:52 storages/templates/storage.html:98
-#: storages/templates/storages.html:62
+#: instances/templates/add_instance_volume.html:60
+#: storages/templates/storage.html:54 storages/templates/storage.html:99
+#: storages/templates/storages.html:61
 msgid "Size"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:60
-#: instances/templates/create_instance_w2.html:91
+#: instances/templates/add_instance_volume.html:64
+#: instances/templates/create_instance_w2.html:90
 msgid "GB"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:63
-#: instances/templates/add_instance_volume.html:123
-#: instances/templates/edit_instance_volume.html:53
-#: instances/templates/instances/settings_tab.html:168
+#: instances/templates/add_instance_volume.html:67
+#: instances/templates/add_instance_volume.html:127
+#: instances/templates/instances/edit_instance_volume.html:89
+#: instances/templates/instances/settings_tab.html:181
+#: instances/templates/instances/settings_tab.html:220
 msgid "Bus"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:73
-#: instances/templates/add_instance_volume.html:133
+#: instances/templates/add_instance_volume.html:77
+#: instances/templates/add_instance_volume.html:137
 msgid "Cache"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:83
-#: instances/templates/instances/settings_tab.html:760
-#: storages/templates/storage.html:147
+#: instances/templates/add_instance_volume.html:87
+#: instances/templates/instances/settings_tab.html:789
+#: storages/templates/storage.html:148
 msgid "Metadata"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:103
+#: instances/templates/add_instance_volume.html:107
 msgid "Select Pool"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:114
+#: instances/templates/add_instance_volume.html:118
 msgid "Volume"
 msgstr ""
 
-#: instances/templates/allinstances.html:24
+#: instances/templates/allinstances.html:22
 msgid "Problem occurred with host"
 msgstr ""
 
@@ -1535,39 +1453,39 @@ msgid "New instance on %(host)s "
 msgstr ""
 
 #: instances/templates/create_instance_w1.html:41
-#: instances/templates/instances/settings_tab.html:49
+#: instances/templates/instances/settings_tab.html:55
 #: networks/templates/network.html:72 nwfilters/templates/nwfilter.html:49
 msgid "XML"
 msgstr ""
 
-#: instances/templates/create_instance_w1.html:62
+#: instances/templates/create_instance_w1.html:60
 msgid "Chipset"
 msgstr ""
 
-#: instances/templates/create_instance_w1.html:72
+#: instances/templates/create_instance_w1.html:70
 msgid "Next"
 msgstr ""
 
-#: instances/templates/create_instance_w1.html:89
-#: instances/templates/create_instance_w2.html:271
-#: instances/templates/create_instance_w2.html:273
+#: instances/templates/create_instance_w1.html:85
+#: instances/templates/create_instance_w2.html:270
+#: instances/templates/create_instance_w2.html:272
 #: instances/templates/create_instance_w2.html:500
 #: instances/templates/create_instance_w2.html:504
-#: instances/templates/create_instance_w2.html:713
-#: instances/templates/create_instance_w2.html:717
-#: interfaces/templates/create_iface_block.html:138
+#: instances/templates/create_instance_w2.html:716
+#: instances/templates/create_instance_w2.html:720
+#: interfaces/templates/create_iface_block.html:142
 #: networks/templates/create_net_block.html:86
 #: networks/templates/modify_ipv4_fixed_address.html:45
 #: networks/templates/modify_ipv6_fixed_address.html:45
-#: nwfilters/templates/create_nwfilter_block.html:24
-#: secrets/templates/create_secret_block.html:55
-#: storages/templates/create_stg_block.html:56
-#: storages/templates/create_stg_block.html:85
-#: storages/templates/create_stg_block.html:144
-#: storages/templates/create_stg_block.html:148
-#: storages/templates/create_stg_block.html:205
-#: storages/templates/create_stg_block.html:233
+#: nwfilters/templates/create_nwfilter_block.html:26
+#: storages/templates/create_stg_block.html:70
+#: storages/templates/create_stg_block.html:99
+#: storages/templates/create_stg_block.html:158
+#: storages/templates/create_stg_block.html:162
+#: storages/templates/create_stg_block.html:219
+#: storages/templates/create_stg_block.html:247
 #: storages/templates/create_stg_vol_block.html:57
+#: virtsecrets/templates/create_secret_block.html:55
 msgid "Create"
 msgstr ""
 
@@ -1583,113 +1501,113 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:66
-msgid "Hypervisor doesn't have any Flavors"
-msgstr ""
-
-#: instances/templates/create_instance_w2.html:71
+#: instances/templates/create_instance_w2.html:63
 msgid "Create from flavor"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:79
-#: instances/templates/create_instance_w2.html:352
+#: instances/templates/create_instance_w2.html:67
+msgid "Hypervisor doesn't have any Flavors"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:78
+#: instances/templates/create_instance_w2.html:351
 #: instances/templates/create_instance_w2.html:563
-#: instances/templates/instance.html:47
+#: instances/templates/instance.html:48
 msgid "RAM"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:80
-#: instances/templates/create_instance_w2.html:367
+#: instances/templates/create_instance_w2.html:79
+#: instances/templates/create_instance_w2.html:366
 msgid "HDD"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:90
-#: instances/templates/create_instance_w2.html:356
+#: instances/templates/create_instance_w2.html:89
+#: instances/templates/create_instance_w2.html:355
 #: instances/templates/create_instance_w2.html:567
-#: instances/templates/instance.html:47
+#: instances/templates/instance.html:48
 #: instances/templates/instances/resize_tab.html:95
-#: instances/templates/instances/resize_tab.html:108
+#: instances/templates/instances/resize_tab.html:109
 msgid "MB"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:97
+#: instances/templates/create_instance_w2.html:96
 msgid "Create Virtual Machine"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:115
-#: instances/templates/create_instance_w2.html:312
+#: instances/templates/create_instance_w2.html:114
+#: instances/templates/create_instance_w2.html:311
 #: instances/templates/create_instance_w2.html:525
 msgid "Firmware"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:127
-#: instances/templates/create_instance_w2.html:330
+#: instances/templates/create_instance_w2.html:126
+#: instances/templates/create_instance_w2.html:329
 #: instances/templates/create_instance_w2.html:542
 msgid "VCPU Config"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:130
-#: instances/templates/create_instance_w2.html:333
+#: instances/templates/create_instance_w2.html:129
+#: instances/templates/create_instance_w2.html:332
 #: instances/templates/create_instance_w2.html:545
 msgid "no-mode"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:174
+#: instances/templates/create_instance_w2.html:173
 #: instances/templates/create_instance_w2.html:402
-#: instances/templates/create_instance_w2.html:615
-#: instances/templates/edit_instance_volume.html:25
+#: instances/templates/create_instance_w2.html:618
+#: instances/templates/instances/edit_instance_volume.html:30
 msgid "Advanced"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:194
-#: instances/templates/create_instance_w2.html:631
+#: instances/templates/create_instance_w2.html:199
+#: instances/templates/create_instance_w2.html:634
 msgid "HDD cache mode"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:212
+#: instances/templates/create_instance_w2.html:211
 #: instances/templates/create_instance_w2.html:441
-#: instances/templates/create_instance_w2.html:654
+#: instances/templates/create_instance_w2.html:657
 msgid "Graphics"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:223
+#: instances/templates/create_instance_w2.html:222
 #: instances/templates/create_instance_w2.html:452
-#: instances/templates/create_instance_w2.html:665
+#: instances/templates/create_instance_w2.html:668
 msgid "Video"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:237
+#: instances/templates/create_instance_w2.html:236
 #: instances/templates/create_instance_w2.html:466
-#: instances/templates/create_instance_w2.html:679
+#: instances/templates/create_instance_w2.html:682
 msgid "Console Access"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:247
-#: instances/templates/create_instance_w2.html:249
+#: instances/templates/create_instance_w2.html:246
+#: instances/templates/create_instance_w2.html:248
 #: instances/templates/create_instance_w2.html:476
 #: instances/templates/create_instance_w2.html:478
-#: instances/templates/create_instance_w2.html:689
-#: instances/templates/create_instance_w2.html:691
+#: instances/templates/create_instance_w2.html:692
+#: instances/templates/create_instance_w2.html:694
 msgid "Console Password"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:253
+#: instances/templates/create_instance_w2.html:252
 #: instances/templates/create_instance_w2.html:482
-#: instances/templates/create_instance_w2.html:695
+#: instances/templates/create_instance_w2.html:698
 msgid "Guest Agent"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:260
+#: instances/templates/create_instance_w2.html:259
 #: instances/templates/create_instance_w2.html:489
-#: instances/templates/create_instance_w2.html:702
+#: instances/templates/create_instance_w2.html:705
 msgid "VirtIO"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:287
-#: instances/templates/instances/settings_tab.html:439
-#: instances/templates/instances/settings_tab.html:515
-#: instances/templates/instances/settings_tab.html:525
-#: instances/templates/instances/snapshots_tab.html:75
+#: instances/templates/create_instance_w2.html:286
+#: instances/templates/instances/settings_tab.html:473
+#: instances/templates/instances/settings_tab.html:549
+#: instances/templates/instances/settings_tab.html:559
+#: instances/templates/instances/snapshots_tab.html:67
 #: interfaces/templates/interface.html:60
 #: interfaces/templates/interface.html:62 networks/templates/network.html:50
 #: networks/templates/network.html:52 networks/templates/network.html:62
@@ -1697,35 +1615,35 @@ msgstr ""
 #: networks/templates/network.html:194 networks/templates/network.html:249
 #: networks/templates/network.html:298 networks/templates/network.html:303
 #: networks/templates/network.html:353 networks/templates/network.html:358
-#: nwfilters/templates/nwfilter.html:111 nwfilters/templates/nwfilter.html:151
-#: nwfilters/templates/nwfilters.html:120 secrets/templates/secrets.html:77
-#: storages/templates/storage.html:62 storages/templates/storage.html:65
-#: storages/templates/storage.html:77 storages/templates/storage.html:174
+#: nwfilters/templates/nwfilter.html:103 nwfilters/templates/nwfilter.html:143
+#: nwfilters/templates/nwfilters.html:118 storages/templates/storage.html:64
+#: storages/templates/storage.html:67 storages/templates/storage.html:79
+#: storages/templates/storage.html:175 virtsecrets/templates/secrets.html:78
 msgid "Are you sure?"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:359
+#: instances/templates/create_instance_w2.html:358
 msgid "Added Disks"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:372
+#: instances/templates/create_instance_w2.html:371
 #: instances/templates/create_instance_w2.html:575
 msgid "Select pool"
 msgstr ""
 
 #: instances/templates/create_instance_w2.html:411
-#: instances/templates/create_instance_w2.html:624
+#: instances/templates/create_instance_w2.html:627
 msgid "Disk Metadata"
 msgstr ""
 
 #: instances/templates/create_instance_w2.html:413
-#: instances/templates/create_instance_w2.html:626
+#: instances/templates/create_instance_w2.html:629
 msgid "Metadata preallocation"
 msgstr ""
 
 #: instances/templates/create_instance_w2.html:415
-#: instances/templates/create_instance_w2.html:628
-#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:360
+#: instances/templates/create_instance_w2.html:631
+#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:375
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/files.py:391
 msgid "Image"
 msgstr ""
@@ -1738,64 +1656,16 @@ msgstr ""
 msgid "Template Disk"
 msgstr ""
 
-#: instances/templates/edit_instance_volume.html:3
-msgid "Edit Volume"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:12
-msgid "Edit Instance Volume"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:19
-msgid "Virtual Disk"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:32
-msgid "Volume Path"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:38
-msgid "Readonly"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:44
-msgid "Shareable"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:63
-msgid "Serial Number"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:69
-msgid "Storage Format"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:78
-msgid "Cache mode"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:88
-msgid "IO mode"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:98
-msgid "Discard mode"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:108
-msgid "Detect zeroes"
+#: instances/templates/create_instance_w2.html:605
+msgid "Network/MAC"
 msgstr ""
 
 #: instances/templates/instance.html:22
 #: instances/templates/instance_actions.html:14
 #: instances/templates/instance_actions.html:25
 #: instances/templates/instance_actions.html:37
-#: instances/templates/instances/power_tab.html:25
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:82 instances/views.py:270
-=======
-#: instances/templates/instances/power_tab.html:82 instances/views.py:264
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:24
+#: instances/templates/instances/power_tab.html:81 instances/views.py:277
 msgid "Suspend"
 msgstr ""
 
@@ -1811,92 +1681,80 @@ msgstr ""
 msgid "Guest Agent Not Enabled & Not Connected"
 msgstr ""
 
-#: instances/templates/instance.html:50
-#: instances/templates/instances/resize_tab.html:18
-#: instances/templates/instances/settings_tab.html:16
+#: instances/templates/instance.html:51
+#: instances/templates/instances/resize_tab.html:17
+#: instances/templates/instances/settings_tab.html:22
 msgid "Disk"
 msgstr ""
 
-#: instances/templates/instance.html:57
+#: instances/templates/instance.html:59
+msgid "Show Instance OS details"
+msgstr ""
+
+#: instances/templates/instance.html:63
 msgid "Refresh instance info"
 msgstr ""
 
-#: instances/templates/instance.html:61
+#: instances/templates/instance.html:69
 msgid "quota reached"
 msgstr ""
 
-#: instances/templates/instance.html:75
+#: instances/templates/instance.html:81
 msgid "Power"
 msgstr ""
 
-#: instances/templates/instance.html:81
+#: instances/templates/instance.html:87
 msgid "Access"
 msgstr ""
 
-#: instances/templates/instance.html:94
+#: instances/templates/instance.html:100
 msgid "Snapshot"
 msgstr ""
 
-#: instances/templates/instance.html:101 templates/navbar.html:32
+#: instances/templates/instance.html:107 templates/navbar.html:32
 msgid "Settings"
 msgstr ""
 
-#: instances/templates/instance.html:107
+#: instances/templates/instance.html:113
 msgid "Stats"
 msgstr ""
 
-#: instances/templates/instance.html:113
-#: instances/templates/instances/destroy_instance_form.html:40
-#: instances/templates/instances/destroy_tab.html:18
-#: instances/templates/instances/destroy_tab.html:20
-<<<<<<< HEAD
-#: instances/templates/instances/destroy_tab.html:23 instances/views.py:312
-=======
-#: instances/templates/instances/destroy_tab.html:23 instances/views.py:306
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instance.html:119
+#: instances/templates/instances/destroy_instance_form.html:35
+#: instances/templates/instances/destroy_tab.html:17
+#: instances/templates/instances/destroy_tab.html:19
+#: instances/templates/instances/destroy_tab.html:22 instances/views.py:319
 msgid "Destroy"
 msgstr ""
 
 #: instances/templates/instance_actions.html:6
-#: instances/templates/instances/settings_tab.html:37
-#: instances/templates/instances/settings_tab.html:788
-#: instances/templates/instances/settings_tab.html:790
-#: nwfilters/templates/nwfilters.html:109
-#: nwfilters/templates/nwfilters.html:115 storages/templates/storage.html:155
-#: storages/templates/storage.html:162
+#: instances/templates/instances/settings_tab.html:43
+#: instances/templates/instances/settings_tab.html:817
+#: instances/templates/instances/settings_tab.html:819
+#: nwfilters/templates/nwfilters.html:107
+#: nwfilters/templates/nwfilters.html:113 storages/templates/storage.html:156
+#: storages/templates/storage.html:163
 msgid "Clone"
 msgstr ""
 
 #: instances/templates/instance_actions.html:10
 #: instances/templates/instance_actions.html:35
-#: instances/templates/instances/power_tab.html:47
-#: instances/templates/instances/power_tab.html:121
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:123 instances/views.py:245
-=======
-#: instances/templates/instances/power_tab.html:123 instances/views.py:239
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:46
+#: instances/templates/instances/power_tab.html:120
+#: instances/templates/instances/power_tab.html:122 instances/views.py:252
 msgid "Power On"
 msgstr ""
 
 #: instances/templates/instance_actions.html:15
-#: instances/templates/instances/power_tab.html:9
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:59 instances/views.py:261
-=======
-#: instances/templates/instances/power_tab.html:59 instances/views.py:255
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:8
+#: instances/templates/instances/power_tab.html:58 instances/views.py:268
 msgid "Power Off"
 msgstr ""
 
 #: instances/templates/instance_actions.html:16
 #: instances/templates/instance_actions.html:29
-#: instances/templates/instances/power_tab.html:14
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:66 instances/views.py:254
-=======
-#: instances/templates/instances/power_tab.html:66 instances/views.py:248
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:13
+#: instances/templates/instances/power_tab.html:65 instances/views.py:261
 msgid "Power Cycle"
 msgstr ""
 
@@ -1906,120 +1764,112 @@ msgid "VNC Console"
 msgstr ""
 
 #: instances/templates/instance_actions.html:22
-#: instances/templates/instances/power_tab.html:34
-#: instances/templates/instances/power_tab.html:93
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:108 instances/views.py:278
-=======
-#: instances/templates/instances/power_tab.html:108 instances/views.py:272
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:33
+#: instances/templates/instances/power_tab.html:92
+#: instances/templates/instances/power_tab.html:107 instances/views.py:285
 msgid "Resume"
 msgstr ""
 
 #: instances/templates/instance_actions.html:26
-#: instances/templates/instances/power_tab.html:19
-#: instances/templates/instances/power_tab.html:39
-#: instances/templates/instances/power_tab.html:74
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:100 instances/views.py:285
-=======
-#: instances/templates/instances/power_tab.html:100 instances/views.py:279
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:18
+#: instances/templates/instances/power_tab.html:38
+#: instances/templates/instances/power_tab.html:73
+#: instances/templates/instances/power_tab.html:99 instances/views.py:292
 msgid "Force Off"
 msgstr ""
 
 #: instances/templates/instance_actions.html:41
-#: instances/templates/instances/access_tab.html:9
-#: instances/templates/instances/access_tab.html:79
-#: instances/templates/instances/access_tab.html:87
-#: instances/templates/instances/access_tab.html:90
-#: instances/templates/instances/access_tab.html:94
-#: instances/templates/instances/settings_tab.html:23
+#: instances/templates/instances/access_tab.html:7
+#: instances/templates/instances/access_tab.html:67
+#: instances/templates/instances/access_tab.html:75
+#: instances/templates/instances/access_tab.html:78
+#: instances/templates/instances/access_tab.html:82
+#: instances/templates/instances/settings_tab.html:29
 msgid "Console"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:16
+#: instances/templates/instances/access_tab.html:13
 msgid "Root Password"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:31
-#: instances/templates/instances/access_tab.html:156
+#: instances/templates/instances/access_tab.html:27
+#: instances/templates/instances/access_tab.html:143
 msgid "VDI"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:39
+#: instances/templates/instances/access_tab.html:35
 #, python-format
 msgid ""
 " This action opens a new window with a %(type)s connection to the console of "
 "the instance."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:47
+#: instances/templates/instances/access_tab.html:42
 msgid "Scale"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:55
+#: instances/templates/instances/access_tab.html:48
 msgid "View Only"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:63
+#: instances/templates/instances/access_tab.html:54
 msgid "Resize Session"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:71
+#: instances/templates/instances/access_tab.html:60
 msgid "View Clipboard"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:82
+#: instances/templates/instances/access_tab.html:70
 msgid "Toggle Dropdown"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:86
-#: instances/templates/instances/access_tab.html:89
+#: instances/templates/instances/access_tab.html:74
+#: instances/templates/instances/access_tab.html:77
 msgid "Console port"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:87
+#: instances/templates/instances/access_tab.html:75
 msgid "Lite"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:90
+#: instances/templates/instances/access_tab.html:78
 msgid "Full"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:100
+#: instances/templates/instances/access_tab.html:88
 msgid "You need shut down your instance and enter a new root password."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:107
+#: instances/templates/instances/access_tab.html:95
 msgid "Enter Password"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:112
-#: instances/templates/instances/access_tab.html:115
+#: instances/templates/instances/access_tab.html:100
+#: instances/templates/instances/access_tab.html:103
 msgid "Reset Root Password"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:123
+#: instances/templates/instances/access_tab.html:111
 msgid "You need shut down your instance and choose your public key."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:142
-#: instances/templates/instances/access_tab.html:144
+#: instances/templates/instances/access_tab.html:130
+#: instances/templates/instances/access_tab.html:132
 msgid "Add Public Key"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:152
+#: instances/templates/instances/access_tab.html:140
 msgid ""
 "This action opens a remote viewer with a connection to the console of the "
 "instance."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:159
+#: instances/templates/instances/access_tab.html:145
 msgid "To download console.vv file for virt-viewer."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:160
+#: instances/templates/instances/access_tab.html:146
 msgid "Get console.vv"
 msgstr ""
 
@@ -2039,114 +1889,190 @@ msgstr ""
 msgid "This action is irreversible!"
 msgstr ""
 
-#: instances/templates/instances/destroy_instance_form.html:26
+#: instances/templates/instances/destroy_instance_form.html:24
 msgid "Remove Instance's data"
 msgstr ""
 
-#: instances/templates/instances/destroy_instance_form.html:34
+#: instances/templates/instances/destroy_instance_form.html:30
 msgid "Remove Instance's NVRAM"
 msgstr ""
 
-#: instances/templates/instances/destroy_instance_form.html:46
+#: instances/templates/instances/destroy_instance_form.html:41
 msgid "You cannot destroy instance!"
 msgstr ""
 
-#: instances/templates/instances/destroy_tab.html:8
+#: instances/templates/instances/destroy_tab.html:7
 msgid "Destroy Instance"
 msgstr ""
 
-#: instances/templates/instances/destroy_tab.html:15
+#: instances/templates/instances/destroy_tab.html:14
 msgid "This action starts remove instance process"
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:56
+#: instances/templates/instances/edit_instance_volume.html:3
+msgid "Edit Volume"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:12
+msgid "Edit Instance Volume"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:20
+msgid "Virtual Disk"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:38
+msgid "Volume Path"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:42
+msgid "Readonly"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:46
+msgid "Shareable"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:53
+msgid "Cache mode"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:61
+msgid "IO mode"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:69
+msgid "Discard mode"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:77
+msgid "Detect zeroes"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:97
+msgid "Serial Number"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:101
+msgid "Storage Format"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:111
+msgid "Are you sure to change volume properties?"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:3
+msgid "Guest Info"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:7
+msgid "OS Name"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:9
+msgid "OS Pretty-Name"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:13
+msgid "Kernel Release"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:15
+msgid "Kernel Version"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:17
+msgid "Timezone / Offset"
+msgstr ""
+
+#: instances/templates/instances/power_tab.html:55
 msgid "This action sends an ACPI shutdown signal to the instance."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:64
+#: instances/templates/instances/power_tab.html:63
 msgid ""
 "This action forcibly powers off and start the instance and may cause data "
 "corruption."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:71
-#: instances/templates/instances/power_tab.html:98
+#: instances/templates/instances/power_tab.html:70
+#: instances/templates/instances/power_tab.html:97
 msgid ""
 "This action forcibly powers off the instance and may cause data corruption."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:80
+#: instances/templates/instances/power_tab.html:79
 msgid "This action suspends the instance."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:91
+#: instances/templates/instances/power_tab.html:90
 msgid "This action restore the instance after suspend."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:106
+#: instances/templates/instances/power_tab.html:105
 msgid "Administrator blocked your instance."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:116
+#: instances/templates/instances/power_tab.html:115
 msgid "Click on Power On button to start this instance."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:120
+#: instances/templates/instances/power_tab.html:119
 msgid "Template instance cannot be started."
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:8
+#: instances/templates/instances/resize_tab.html:7
 msgid "CPU"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:29
+#: instances/templates/instances/resize_tab.html:28
 msgid "Logical host CPUs"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:31
+#: instances/templates/instances/resize_tab.html:30
 #: instances/templates/instances/resize_tab.html:95
 #: instances/templates/instances/resize_tab.html:136
 msgid "Current Allocation"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:45
-#: instances/templates/instances/resize_tab.html:108
+#: instances/templates/instances/resize_tab.html:44
+#: instances/templates/instances/resize_tab.html:109
 msgid "Maximum Allocation"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:63
+#: instances/templates/instances/resize_tab.html:62
 msgid "Logical Instance Active/Maximum CPUs"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:71
-#: instances/templates/instances/settings_tab.html:79
-#: instances/templates/instances/settings_tab.html:95
-#: networks/templates/network.html:62 storages/templates/storage.html:77
+#: instances/templates/instances/resize_tab.html:70
+#: instances/templates/instances/settings_tab.html:86
+#: instances/templates/instances/settings_tab.html:102
+#: networks/templates/network.html:62 storages/templates/storage.html:79
 msgid "Disable"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:73
+#: instances/templates/instances/resize_tab.html:72
 msgid "Constant"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:75
-#: instances/templates/instances/settings_tab.html:77
-#: instances/templates/instances/settings_tab.html:91
-#: networks/templates/network.html:60 storages/templates/storage.html:74
+#: instances/templates/instances/resize_tab.html:74
+#: instances/templates/instances/settings_tab.html:84
+#: instances/templates/instances/settings_tab.html:98
+#: networks/templates/network.html:60 storages/templates/storage.html:76
 msgid "Enable"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:84
+#: instances/templates/instances/resize_tab.html:83
 #: instances/templates/instances/resize_tab.html:124
 #: instances/templates/instances/resize_tab.html:157
 msgid "You don't have permission for resizing instance"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:93
+#: instances/templates/instances/resize_tab.html:92
 msgid "Total host memory"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:103
+#: instances/templates/instances/resize_tab.html:104
 #: instances/templates/instances/resize_tab.html:118
 msgid "Custom value"
 msgstr ""
@@ -2156,457 +2082,450 @@ msgid "Disk allocation (GB)"
 msgstr ""
 
 #: instances/templates/instances/resize_tab.html:140
-#: instances/templates/instances/settings_tab.html:269
+#: instances/templates/instances/settings_tab.html:284
 msgid "Error getting disk info"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:11
+#: instances/templates/instances/settings_tab.html:17
 msgid "Boot"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:44
-#: instances/templates/instances/settings_tab.html:621
-#: instances/templates/instances/settings_tab.html:623
+#: instances/templates/instances/settings_tab.html:50
+#: instances/templates/instances/settings_tab.html:655
+#: instances/templates/instances/settings_tab.html:657
 msgid "Migrate"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:56
+#: instances/templates/instances/settings_tab.html:62
+#: venv/lib/python3.6/site-packages/click/core.py:1351
 msgid "Options"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:72
-#: networks/templates/network.html:56 storages/templates/storage.html:69
+#: instances/templates/instances/settings_tab.html:79
+#: networks/templates/network.html:56 storages/templates/storage.html:71
 msgid "Autostart"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:75
+#: instances/templates/instances/settings_tab.html:82
 msgid "Autostart your instance when host server is power on "
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:84
+#: instances/templates/instances/settings_tab.html:91
 msgid "Boot Order"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:88
+#: instances/templates/instances/settings_tab.html:95
 msgid "Enable Boot Menu for your instance when it starts up "
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:91
+#: instances/templates/instances/settings_tab.html:98
 msgid "Show boot menu"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:95
+#: instances/templates/instances/settings_tab.html:102
 msgid "Hide boot menu"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:100
+#: instances/templates/instances/settings_tab.html:107
 msgid "Please shutdown instance to modify boot menu"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:130
+#: instances/templates/instances/settings_tab.html:137
 msgid "up: move selected devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:133
+#: instances/templates/instances/settings_tab.html:140
 msgid "down: move selected devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:139
-#: instances/templates/instances/settings_tab.html:429
+#: instances/templates/instances/settings_tab.html:146
+#: instances/templates/instances/settings_tab.html:456
 msgid "Apply"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:149
+#: instances/templates/instances/settings_tab.html:156
 msgid "Instance Media"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:152
+#: instances/templates/instances/settings_tab.html:159
 msgid "Add CD-ROM"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:169
-#: instances/templates/instances/settings_tab.html:234
+#: instances/templates/instances/settings_tab.html:182
+#: instances/templates/instances/settings_tab.html:221
+#: instances/templates/instances/settings_tab.html:249
 #: interfaces/templates/create_iface_block.html:34
-#: networks/templates/network.html:43 networks/templates/networks.html:59
-#: storages/templates/create_stg_block.html:77
+#: networks/templates/network.html:43 networks/templates/networks.html:58
+#: storages/templates/create_stg_block.html:91
 msgid "Device"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:170
+#: instances/templates/instances/settings_tab.html:183
+#: instances/templates/instances/settings_tab.html:222
 msgid "CD-ROM"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:188
-#: instances/templates/instances/settings_tab.html:190
+#: instances/templates/instances/settings_tab.html:196
+#: instances/templates/instances/settings_tab.html:198
 msgid "Mount"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:193
+#: instances/templates/instances/settings_tab.html:201
 msgid "Detach CD-ROM (remove device)"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:208
-#: instances/templates/instances/settings_tab.html:210
+#: instances/templates/instances/settings_tab.html:227
+#: instances/templates/instances/settings_tab.html:229
 msgid "Unmount"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:220
+#: instances/templates/instances/settings_tab.html:238
 msgid "There is not any CD-ROM device."
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:225
+#: instances/templates/instances/settings_tab.html:243
 msgid "Instance Volume"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:235
+#: instances/templates/instances/settings_tab.html:250
 msgid "Used"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:236
+#: instances/templates/instances/settings_tab.html:251
 msgid "Capacity"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:238
-#: instances/templates/instances/settings_tab.html:363
+#: instances/templates/instances/settings_tab.html:253
+#: instances/templates/instances/settings_tab.html:385
 msgid "Source"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:294
-#: instances/templates/instances/settings_tab.html:298
+#: instances/templates/instances/settings_tab.html:309
+#: instances/templates/instances/settings_tab.html:313
 msgid "Detach"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:294
+#: instances/templates/instances/settings_tab.html:309
 msgid "Are you sure to detach volume?"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:298
-#: instances/templates/instances/settings_tab.html:314
+#: instances/templates/instances/settings_tab.html:313
+#: instances/templates/instances/settings_tab.html:329
 msgid "Are you sure? This may lead data corruption!"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:310
+#: instances/templates/instances/settings_tab.html:325
 msgid "Are you sure to delete volume?"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:330
+#: instances/templates/instances/settings_tab.html:343
 msgid "Add a network device"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:336
+#: instances/templates/instances/settings_tab.html:349
 msgid "Network Devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:341
-#: instances/templates/instances/settings_tab.html:342
+#: instances/templates/instances/settings_tab.html:354
 msgid "Info"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:355
+#: instances/templates/instances/settings_tab.html:367
 msgid "active"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:361
-#: nwfilters/templates/nwfilter.html:75
+#: instances/templates/instances/settings_tab.html:379
+#: nwfilters/templates/nwfilter.html:71
 msgid "Filter"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:368
+#: instances/templates/instances/settings_tab.html:393
 msgid "Edit NIC"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:376
+#: instances/templates/instances/settings_tab.html:403
 msgid "Edit Instance Network"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:389
+#: instances/templates/instances/settings_tab.html:416
 msgid "Net Source"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:397
+#: instances/templates/instances/settings_tab.html:424
 #: interfaces/templates/interface.html:4 interfaces/templates/interface.html:6
 #: interfaces/templates/interface.html:39
 msgid "Interface"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:415
-#: instances/templates/instances/settings_tab.html:454
+#: instances/templates/instances/settings_tab.html:442
+#: instances/templates/instances/settings_tab.html:494
 msgid "Model"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:429
+#: instances/templates/instances/settings_tab.html:456
 msgid "Apply network changes"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:438
+#: instances/templates/instances/settings_tab.html:472
 msgid "Delete Device"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:446
-#: interfaces/templates/create_iface_block.html:71
+#: instances/templates/instances/settings_tab.html:482
+#: interfaces/templates/create_iface_block.html:72
 #: interfaces/templates/interface.html:41
 msgid "IPv4"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:450
-#: interfaces/templates/create_iface_block.html:74
+#: instances/templates/instances/settings_tab.html:488
+#: interfaces/templates/create_iface_block.html:77
 #: interfaces/templates/interface.html:43
 msgid "IPv6"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:456
-msgid "QoS"
-msgstr ""
-
-#: instances/templates/instances/settings_tab.html:468
+#: instances/templates/instances/settings_tab.html:502
 msgid ""
 "In most configurations, macvtap does not work for host to guest network "
 "communication"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:481
+#: instances/templates/instances/settings_tab.html:515
 #: networks/templates/network.html:322
 msgid "QoS Configuration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:487
+#: instances/templates/instances/settings_tab.html:521
 #: networks/templates/add_network_qos.html:18
-#: networks/templates/network.html:328 nwfilters/templates/nwfilter.html:131
+#: networks/templates/network.html:328 nwfilters/templates/nwfilter.html:123
 msgid "Direction"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:488
+#: instances/templates/instances/settings_tab.html:522
 #: networks/templates/add_network_qos.html:27
 #: networks/templates/network.html:329
 msgid "Average"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:489
+#: instances/templates/instances/settings_tab.html:523
 #: networks/templates/add_network_qos.html:34
 #: networks/templates/network.html:330
 msgid "Peak"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:490
+#: instances/templates/instances/settings_tab.html:524
 #: networks/templates/add_network_qos.html:41
 #: networks/templates/network.html:331
 msgid "Burst"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:515
+#: instances/templates/instances/settings_tab.html:549
 #: networks/templates/network.html:353
 msgid "Edit QoS"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:525
+#: instances/templates/instances/settings_tab.html:559
 #: networks/templates/network.html:358
 msgid "Delete QoS"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:541
+#: instances/templates/instances/settings_tab.html:575
 msgid "For migration both host servers must have equal settings and OS type"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:545
+#: instances/templates/instances/settings_tab.html:579
 msgid "Original host"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:551
+#: instances/templates/instances/settings_tab.html:585
 msgid "Host migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:568
+#: instances/templates/instances/settings_tab.html:602
 msgid "Live migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:576
+#: instances/templates/instances/settings_tab.html:610
 msgid "Unsafe migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:584
+#: instances/templates/instances/settings_tab.html:618
 msgid "Delete original"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:592
+#: instances/templates/instances/settings_tab.html:626
 msgid "Offline migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:600
+#: instances/templates/instances/settings_tab.html:634
 msgid "Post copy"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:608
+#: instances/templates/instances/settings_tab.html:642
 msgid "Forces CPU convergence during live migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:608
+#: instances/templates/instances/settings_tab.html:642
 msgid "Auto converge"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:616
+#: instances/templates/instances/settings_tab.html:650
 msgid "Compress instance memory for fast migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:616
+#: instances/templates/instances/settings_tab.html:650
 msgid "Compressed"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:629
+#: instances/templates/instances/settings_tab.html:663
 msgid "If you need to edit XML please Power Off the instance"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:651
+#: instances/templates/instances/settings_tab.html:685
 msgid "Instance owners"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:680
+#: instances/templates/instances/settings_tab.html:714
 msgid "To change console settings, shutdown the instance."
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:697
+#: instances/templates/instances/settings_tab.html:731
 msgid "Create a clone"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:700
+#: instances/templates/instances/settings_tab.html:734
 msgid "Clone Name"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:707
-#: instances/templates/instances/settings_tab.html:738
+#: instances/templates/instances/settings_tab.html:740
+#: instances/templates/instances/settings_tab.html:769
 msgid "Guess"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:726
+#: instances/templates/instances/settings_tab.html:758
 msgid "Network devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:736
+#: instances/templates/instances/settings_tab.html:767
 msgid "Random"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:751
+#: instances/templates/instances/settings_tab.html:781
 msgid "Storage devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:776
-#: instances/templates/instances/settings_tab.html:799
+#: instances/templates/instances/settings_tab.html:805
+#: instances/templates/instances/settings_tab.html:828
 msgid "Title"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:796
+#: instances/templates/instances/settings_tab.html:825
 msgid "To set instance template name description, shutdown the instance."
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:811
+#: instances/templates/instances/settings_tab.html:840
 msgid "Is template"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:832
+#: instances/templates/instances/settings_tab.html:861
 msgid "To set instance video model, shutdown the instance."
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:835
+#: instances/templates/instances/settings_tab.html:864
 msgid "Primary Video Model"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:839
+#: instances/templates/instances/settings_tab.html:868
 msgid "please choose"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:846
-#: instances/templates/instances/settings_tab.html:848
-#: instances/templates/instances/settings_tab.html:868
-#: instances/templates/instances/settings_tab.html:870
-#: instances/templates/instances/settings_tab.html:898
-#: secrets/templates/secrets.html:103
+#: instances/templates/instances/settings_tab.html:874
+#: instances/templates/instances/settings_tab.html:876
+#: instances/templates/instances/settings_tab.html:894
+#: instances/templates/instances/settings_tab.html:896
+#: instances/templates/instances/settings_tab.html:922
+#: virtsecrets/templates/secrets.html:104
 msgid "Set"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:856
+#: instances/templates/instances/settings_tab.html:883
 msgid "To set instance vCPUs hotpluggable"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:859
+#: instances/templates/instances/settings_tab.html:886
 msgid "vCPU Hot Plug"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:863
-#: instances/templates/instances/settings_tab.html:894
+#: instances/templates/instances/settings_tab.html:890
+#: instances/templates/instances/settings_tab.html:919
 msgid "Enabled"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:864
-#: instances/templates/instances/settings_tab.html:895
+#: instances/templates/instances/settings_tab.html:891
+#: instances/templates/instances/settings_tab.html:920
 msgid "Disabled"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:878
+#: instances/templates/instances/settings_tab.html:903
 msgid "To Enable/Disable Qemu Guest Agent. Status"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:883
+#: instances/templates/instances/settings_tab.html:908
 msgid "Disconnected"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:886
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:709
+#: instances/templates/instances/settings_tab.html:911
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:714
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:703
 msgid "Unknown"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:890
+#: instances/templates/instances/settings_tab.html:915
 msgid "Qemu Guest Agent"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:9
-#: instances/templates/instances/snapshots_tab.html:31
-#: instances/templates/instances/snapshots_tab.html:33
+#: instances/templates/instances/snapshots_tab.html:8
+#: instances/templates/instances/snapshots_tab.html:26
 msgid "Take Snapshot"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:14
+#: instances/templates/instances/snapshots_tab.html:13
 msgid "Manage Snapshots"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:22
+#: instances/templates/instances/snapshots_tab.html:20
 msgid ""
 "This may take more than an hour, depending on how much content is on your "
-"instance and how large the disk is."
+"instance and how large the disk is. It could cause web server timeout.."
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:27
+#: instances/templates/instances/snapshots_tab.html:25
 msgid "Enter Snapshot Name"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:38
-msgid "To take a snapshot please Power Off the instance."
-msgstr ""
-
-#: instances/templates/instances/snapshots_tab.html:43
+#: instances/templates/instances/snapshots_tab.html:35
 msgid "Choose a snapshot for restore/delete"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:61
+#: instances/templates/instances/snapshots_tab.html:53
 msgid "Revert to this Snapshot"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:66
+#: instances/templates/instances/snapshots_tab.html:58
 msgid "To restore snapshots you need Power Off the instance."
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:75
+#: instances/templates/instances/snapshots_tab.html:67
 msgid "Delete Snapshot"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:86
+#: instances/templates/instances/snapshots_tab.html:78
 msgid "You do not have any snapshots"
 msgstr ""
 
-#: instances/templates/instances/stats_tab.html:8
+#: instances/templates/instances/stats_tab.html:7
 msgid "Real Time"
 msgstr ""
 
-#: instances/templates/instances/stats_tab.html:23
+#: instances/templates/instances/stats_tab.html:22
 msgid "CPU Usage"
 msgstr ""
 
@@ -2614,11 +2533,11 @@ msgstr ""
 msgid "Memory Usage"
 msgstr ""
 
-#: instances/templates/instances/stats_tab.html:50
+#: instances/templates/instances/stats_tab.html:51
 msgid "Bandwidth Device"
 msgstr ""
 
-#: instances/templates/instances/stats_tab.html:65
+#: instances/templates/instances/stats_tab.html:67
 msgid "Disk I/O device"
 msgstr ""
 
@@ -2626,648 +2545,357 @@ msgstr ""
 msgid "None available device name"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:242
+#: instances/views.py:249
 msgid "Templates cannot be started."
 msgstr ""
 
-#: instances/views.py:345
+#: instances/views.py:352
 #, python-format
 msgid "Instance is migrated to %(hostname)s"
 msgstr ""
 
-#: instances/views.py:368
+#: instances/views.py:375
 msgid "Reset root password"
 msgstr ""
 
-#: instances/views.py:374 instances/views.py:403
+#: instances/views.py:381 instances/views.py:410
 msgid "Please shutdown down your instance and then try again"
 msgstr ""
 
-#: instances/views.py:395
-=======
-#: instances/views.py:236
-msgid "Templates cannot be started."
-msgstr ""
-
-#: instances/views.py:339
-#, python-format
-msgid "Migrate to %(hostname)%"
-msgstr ""
-
-#: instances/views.py:362
-msgid "Reset root password"
-msgstr ""
-
-#: instances/views.py:368 instances/views.py:397
-msgid "Please shutdown down your instance and then try again"
-msgstr ""
-
-#: instances/views.py:389
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:402
 #, python-format
 msgid "Installed new SSH public key %(keyname)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:422
-=======
-#: instances/views.py:416
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:429
 #, python-format
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize CPU of '%(instance_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:431
+#: instances/views.py:438
 #, python-format
 msgid "CPU is resized:  %(old)s to %(new)s"
 msgstr ""
 
-#: instances/views.py:459
-=======
-#: instances/views.py:425
-msgid "Resize CPU"
-msgstr ""
-
-#: instances/views.py:453
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:466
 #, python-format
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize memory of "
 "'%(instance_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:466
+#: instances/views.py:473
 #, python-format
 msgid ""
 "Memory is resized: current/max: %(old_cur)s/%(old_max)s to %(new_cur)s/"
 "%(new_max)s"
 msgstr ""
 
-#: instances/views.py:500
-=======
-#: instances/views.py:462
-msgid "Resize Memory"
-msgstr ""
-
-#: instances/views.py:491
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:507
 #, python-format
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize disks of '%(instance_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:507
+#: instances/views.py:514
 #, python-format
 msgid "Disk is resized: %(dev)s"
 msgstr ""
 
-#: instances/views.py:546
+#: instances/views.py:570
 #, python-format
 msgid "Attach new disk: %(name)s (%(format)s)"
 msgstr ""
 
-#: instances/views.py:577
-=======
-#: instances/views.py:498
-msgid "Disk resize"
-msgstr ""
-
-#: instances/views.py:537
-#, python-format
-msgid "Attach new disk %(name)s (%(format)s)"
-msgstr ""
-
-#: instances/views.py:568
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:609
 #, python-format
 msgid "Attach Existing disk: %(target_dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:635
-=======
-#: instances/views.py:624
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:667
 msgid "Volume changes are applied. But it will be activated after shutdown"
 msgstr ""
 
-#: instances/views.py:626
+#: instances/views.py:670
 msgid "Volume is changed successfully."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:639
-=======
-#: instances/views.py:627
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:671
 #, python-format
 msgid "Edit disk: %(target_dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:661
-=======
-#: instances/views.py:649
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:693
 #, python-format
 msgid "Delete disk: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:677
-=======
-#: instances/views.py:665
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:709
 #, python-format
 msgid "Detach disk: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:690
-=======
-#: instances/views.py:678
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:722
 #, python-format
 msgid "Add CD-ROM: %(target)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:703
-=======
-#: instances/views.py:691
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:735
 #, python-format
 msgid "Detach CD-ROM: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:716
-=======
-#: instances/views.py:704
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:748
 #, python-format
 msgid "Mount media: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:729
-=======
-#: instances/views.py:717
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:761
 #, python-format
 msgid "Unmount media: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:742
+#: instances/views.py:774
 #, python-format
 msgid "Create snapshot: %(snap)s"
 msgstr ""
 
-#: instances/views.py:753
+#: instances/views.py:785
 #, python-format
 msgid "Delete snapshot: %(snap)s"
-=======
-#: instances/views.py:730
-#, python-format
-msgid "New snapshot: %(name)s"
 msgstr ""
 
-#: instances/views.py:741
-#, python-format
-msgid "Delete snapshot: %(snap_name)s"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
-msgstr ""
-
-#: instances/views.py:752
+#: instances/views.py:796
 msgid "Successful revert snapshot: "
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:767
-msgid "Revert snapshot: %(snap)"
+#: instances/views.py:799
+#, python-format
+msgid "Revert snapshot: %(snap)s"
 msgstr ""
 
-#: instances/views.py:781
-=======
-#: instances/views.py:755
-msgid "Revert snapshot"
-msgstr ""
-
-#: instances/views.py:769
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:813
 #, python-format
 msgid "VCPU %(id)s is enabled=%(enabled)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:790
-=======
-#: instances/views.py:780
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:822
 #, python-format
 msgid "VCPU Hot-plug is enabled=%(status)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:800
+#: instances/views.py:832
 msgid "Set autostart"
 msgstr ""
 
-#: instances/views.py:809
+#: instances/views.py:841
 msgid "Unset autostart"
 msgstr ""
 
-#: instances/views.py:818
+#: instances/views.py:850
 msgid "Enable boot menu"
 msgstr ""
 
-#: instances/views.py:827
+#: instances/views.py:859
 msgid "Disable boot menu"
 msgstr ""
 
-#: instances/views.py:842
+#: instances/views.py:874
 msgid "Set boot order"
 msgstr ""
 
-#: instances/views.py:847
-=======
-#: instances/views.py:791
-msgid "Set autostart"
-msgstr ""
-
-#: instances/views.py:800
-msgid "Unset autostart"
-msgstr ""
-
-#: instances/views.py:809
-msgid "Enable boot menu"
-msgstr ""
-
-#: instances/views.py:818
-msgid "Disable boot menu"
-msgstr ""
-
-#: instances/views.py:833
-msgid "Set boot order"
-msgstr ""
-
-#: instances/views.py:836
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:879
 msgid "Boot menu changes applied. But it will be activated after shutdown"
 msgstr ""
 
-#: instances/views.py:838
+#: instances/views.py:882
 msgid "Boot order changed successfully."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:861
+#: instances/views.py:893
 msgid "Change instance XML"
 msgstr ""
 
-#: instances/views.py:875
+#: instances/views.py:907
 #, python-format
 msgid "Set Guest Agent: %(status)s"
 msgstr ""
 
-#: instances/views.py:885
-msgid "Set Video Model: %(model)"
-=======
-#: instances/views.py:849
-msgid "Edit XML"
-msgstr ""
-
-#: instances/views.py:863
+#: instances/views.py:917
 #, python-format
-msgid "Set Guest Agent %(status)s"
+msgid "Set Video Model: %(model)s"
 msgstr ""
 
-#: instances/views.py:873
-msgid "Set Video Model"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
-msgstr ""
-
-#: instances/views.py:882
+#: instances/views.py:926
 msgid "Change network"
 msgstr ""
 
-#: instances/views.py:895
+#: instances/views.py:949
 msgid "Network Device Config is changed. Please shutdown instance to activate."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:922
+#: instances/views.py:974
 #, python-format
 msgid "Add network: %(mac)s"
 msgstr ""
 
-#: instances/views.py:933
+#: instances/views.py:985
 #, python-format
 msgid "Delete Network: %(mac)s"
 msgstr ""
 
-#: instances/views.py:946
-=======
-#: instances/views.py:903
-msgid "Add network"
-msgstr ""
-
-#: instances/views.py:917
-msgid "Delete network"
-msgstr ""
-
-#: instances/views.py:933
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:998
 #, python-format
 msgid "Set Link State: %(state)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:966 networks/views.py:231
-=======
-#: instances/views.py:952
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1018 networks/views.py:231
 #, python-format
 msgid "%(qos_dir)s QoS is set"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:971
-=======
-#: instances/views.py:956
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1023
 #, python-format
 msgid ""
 "%(qos_dir)s QoS is set. Network XML is changed.                 Stop and "
 "start network to activate new config."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:988 networks/views.py:246
-=======
-#: instances/views.py:970
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1040 networks/views.py:246
 #, python-format
 msgid "%(qos_dir)s QoS is deleted"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:993
-=======
-#: instances/views.py:974
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1045
 #, python-format
 msgid ""
 "%(qos_dir)s QoS is deleted. Network XML is changed.                 Stop and "
 "start network to activate new config."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1012
+#: instances/views.py:1064
 msgid "Only one owner is allowed and the one already added"
 msgstr ""
 
-#: instances/views.py:1017
-=======
-#: instances/views.py:990
-msgid "Only one owner is allowed and the one already added"
-msgstr ""
-
-#: instances/views.py:995
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1069
 #, python-format
 msgid "Add owner: %(user)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1028
+#: instances/views.py:1080
 #, python-format
 msgid "Delete owner: %(userinstance_id)s "
 msgstr ""
 
-#: instances/views.py:1060
-=======
-#: instances/views.py:1006
-#, python-format
-msgid "Deleted owner %(userinstance_id)s"
-msgstr ""
-
-#: instances/views.py:1038
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1112
 #, python-format
 msgid "User '%(quota_msg)s' quota reached, cannot create '%(clone_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1066
+#: instances/views.py:1118
 #, python-format
 msgid "Instance '%(clone_name)s' already exists!"
 msgstr ""
 
-#: instances/views.py:1069
-=======
-#: instances/views.py:1044
-msgid "Instance 'clone_name' already exists!"
-msgstr ""
-
-#: instances/views.py:1047
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1121
 #, python-format
 msgid "Instance name '%(clone_name)s' contains invalid characters!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1072
-=======
-#: instances/views.py:1050
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1124
 #, python-format
 msgid "Instance MAC '%(clone_mac)s' invalid format!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1082
+#: instances/views.py:1134
 #, python-format
 msgid "Create a clone of '%(instance_name)s'"
 msgstr ""
 
-#: instances/views.py:1121
-=======
-#: instances/views.py:1060
-#, python-format
-msgid "Clone of '%(instance_name)s'"
-msgstr ""
-
-#: instances/views.py:1093
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1173
 msgid ""
 "Error setting console password. You should check that your instance have an "
 "graphic device."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1126
+#: instances/views.py:1178
 msgid "Set VNC password"
 msgstr ""
 
-#: instances/views.py:1135
+#: instances/views.py:1187
 msgid "Set VNC keymap"
 msgstr ""
 
-#: instances/views.py:1140
+#: instances/views.py:1192
 msgid "Set VNC type"
 msgstr ""
 
-#: instances/views.py:1145
+#: instances/views.py:1197
 msgid "Set VNC listen address"
 msgstr ""
 
-#: instances/views.py:1168
+#: instances/views.py:1220
 msgid "Edit options"
 msgstr ""
 
-#: instances/views.py:1182
+#: instances/views.py:1234
 msgid "Send console.vv file"
 msgstr ""
 
-#: instances/views.py:1243 instances/views.py:1337
+#: instances/views.py:1295 instances/views.py:1389
 msgid "A virtual machine with this name already exists"
 msgstr ""
 
-#: instances/views.py:1320
+#: instances/views.py:1372
 msgid "You haven't defined any storage pools"
 msgstr ""
 
-#: instances/views.py:1322
-msgid "You haven't defined any network pools"
-msgstr ""
-
-#: instances/views.py:1339
-msgid "There is an instance with same name. Remove it and try again!"
-msgstr ""
-
-#: instances/views.py:1343
-msgid "No Virtual Machine MAC has been entered"
-msgstr ""
-
 #: instances/views.py:1374
-msgid "Image has already exist. Please check volumes or change instance name"
-msgstr ""
-
-#: instances/views.py:1401
-msgid "First you need to create or select an image"
-msgstr ""
-
-#: instances/views.py:1419
-msgid "Invalid cache mode"
-msgstr ""
-
-#: instances/views.py:1460
-msgid "Instance is created"
-msgstr ""
-
-#: instances/views.py:1481
-msgid "Flavor Created"
-msgstr ""
-
-#: instances/views.py:1487
-msgid "Create Flavor"
-msgstr ""
-
-#: instances/views.py:1497
-msgid "Flavor Updated"
-msgstr ""
-
-#: instances/views.py:1503
-msgid "Update Flavor"
-msgstr ""
-
-#: instances/views.py:1512
-=======
-#: instances/views.py:1096
-msgid "Set VNC password"
-msgstr ""
-
-#: instances/views.py:1104
-msgid "Set VNC keymap"
-msgstr ""
-
-#: instances/views.py:1109
-msgid "Set VNC type"
-msgstr ""
-
-#: instances/views.py:1114
-msgid "Set VNC listen address"
-msgstr ""
-
-#: instances/views.py:1137
-msgid "Edit options"
-msgstr ""
-
-#: instances/views.py:1151
-msgid "Send console.vv file"
-msgstr ""
-
-#: instances/views.py:1206 instances/views.py:1298
-msgid "A virtual machine with this name already exists"
-msgstr ""
-
-#: instances/views.py:1281
-msgid "You haven't defined any storage pools"
-msgstr ""
-
-#: instances/views.py:1283
 msgid "You haven't defined any network pools"
 msgstr ""
 
-#: instances/views.py:1300
+#: instances/views.py:1391
 msgid "There is an instance with same name. Remove it and try again!"
 msgstr ""
 
-#: instances/views.py:1304
+#: instances/views.py:1395
 msgid "No Virtual Machine MAC has been entered"
 msgstr ""
 
-#: instances/views.py:1327
+#: instances/views.py:1426
 msgid "Image has already exist. Please check volumes or change instance name"
 msgstr ""
 
-#: instances/views.py:1347
+#: instances/views.py:1453
 msgid "First you need to create or select an image"
 msgstr ""
 
-#: instances/views.py:1365
+#: instances/views.py:1471
 msgid "Invalid cache mode"
 msgstr ""
 
-#: instances/views.py:1402
+#: instances/views.py:1512
 msgid "Instance is created"
 msgstr ""
 
-#: instances/views.py:1423
+#: instances/views.py:1533
 msgid "Flavor Created"
 msgstr ""
 
-#: instances/views.py:1431
+#: instances/views.py:1539
 msgid "Create Flavor"
 msgstr ""
 
-#: instances/views.py:1442
+#: instances/views.py:1549
 msgid "Flavor Updated"
 msgstr ""
 
-#: instances/views.py:1450
+#: instances/views.py:1555
 msgid "Update Flavor"
 msgstr ""
 
-#: instances/views.py:1460
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1564
 msgid "Flavor Deleted"
 msgstr ""
 
@@ -3333,12 +2961,12 @@ msgstr ""
 
 #: interfaces/templates/create_iface_block.html:44
 #: interfaces/templates/interface.html:76
-#: interfaces/templates/interfaces.html:62
-#: storages/templates/create_stg_block.html:35
-#: storages/templates/create_stg_block.html:64
-#: storages/templates/create_stg_block.html:93
-#: storages/templates/create_stg_block.html:158
-#: storages/templates/storages.html:60
+#: interfaces/templates/interfaces.html:63
+#: storages/templates/create_stg_block.html:49
+#: storages/templates/create_stg_block.html:78
+#: storages/templates/create_stg_block.html:107
+#: storages/templates/create_stg_block.html:172
+#: storages/templates/storages.html:59
 msgid "Type"
 msgstr ""
 
@@ -3366,43 +2994,43 @@ msgstr ""
 msgid "Delay"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:82
+#: interfaces/templates/create_iface_block.html:86
 msgid "IPv4 Mode"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:85
-#: interfaces/templates/create_iface_block.html:112
+#: interfaces/templates/create_iface_block.html:89
+#: interfaces/templates/create_iface_block.html:116
 #: networks/templates/network.html:109 networks/templates/network.html:220
 msgid "DHCP"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:86
-#: interfaces/templates/create_iface_block.html:113
+#: interfaces/templates/create_iface_block.html:90
+#: interfaces/templates/create_iface_block.html:117
 msgid "Static"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:87
-#: interfaces/templates/create_iface_block.html:111
+#: interfaces/templates/create_iface_block.html:91
+#: interfaces/templates/create_iface_block.html:115
 msgid "No configuration"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:92
+#: interfaces/templates/create_iface_block.html:96
 msgid "IPv4 Address"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:98
+#: interfaces/templates/create_iface_block.html:102
 msgid "IPv4 Gateway"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:108
+#: interfaces/templates/create_iface_block.html:112
 msgid "IPv6 Mode"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:118
+#: interfaces/templates/create_iface_block.html:122
 msgid "IPv6 Address"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:124
+#: interfaces/templates/create_iface_block.html:128
 msgid "IPv6 Gateway"
 msgstr ""
 
@@ -3420,12 +3048,12 @@ msgstr ""
 
 #: interfaces/templates/interface.html:55
 #: interfaces/templates/interface.html:78 networks/templates/network.html:45
-#: storages/templates/storage.html:56
+#: storages/templates/storage.html:58
 msgid "State"
 msgstr ""
 
 #: interfaces/templates/interface.html:62 networks/templates/network.html:52
-#: storages/templates/storage.html:64
+#: storages/templates/storage.html:66
 msgid "Stop"
 msgstr ""
 
@@ -3437,7 +3065,7 @@ msgstr ""
 msgid "Speed"
 msgstr ""
 
-#: interfaces/templates/interfaces.html:47
+#: interfaces/templates/interfaces.html:48
 msgid "Hypervisor doesn't have any Interfaces"
 msgstr ""
 
@@ -3446,14 +3074,18 @@ msgid "user"
 msgstr ""
 
 #: logs/models.py:6
-msgid "instance"
+msgid "host"
 msgstr ""
 
 #: logs/models.py:7
-msgid "message"
+msgid "instance"
 msgstr ""
 
 #: logs/models.py:8
+msgid "message"
+msgstr ""
+
+#: logs/models.py:9
 msgid "date"
 msgstr ""
 
@@ -3524,8 +3156,8 @@ msgid "Add New Network"
 msgstr ""
 
 #: networks/templates/create_net_block.html:20
-#: storages/templates/create_stg_block.html:44
-#: storages/templates/create_stg_block.html:73
+#: storages/templates/create_stg_block.html:58
+#: storages/templates/create_stg_block.html:87
 msgid "default"
 msgstr ""
 
@@ -3647,12 +3279,12 @@ msgid "IPv4 Fixed Addresses"
 msgstr ""
 
 #: networks/templates/network.html:158 networks/templates/network.html:268
-#: nwfilters/templates/nwfilters.html:85
+#: nwfilters/templates/nwfilters.html:83
 msgid "Show"
 msgstr ""
 
-#: networks/templates/network.html:166 networks/templates/network.html:276
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:395
+#: networks/templates/network.html:165 networks/templates/network.html:275
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:403
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:377
 msgid "Clear"
 msgstr ""
@@ -3677,11 +3309,11 @@ msgstr ""
 msgid "IPv6 Fixed Addresses"
 msgstr ""
 
-#: networks/templates/networks.html:46
+#: networks/templates/networks.html:45
 msgid "Hypervisor doesn't have any Network"
 msgstr ""
 
-#: networks/templates/networks.html:61
+#: networks/templates/networks.html:60
 msgid "Forward"
 msgstr ""
 
@@ -3693,7 +3325,6 @@ msgstr ""
 msgid "Please enter bridge/dev name"
 msgstr ""
 
-<<<<<<< HEAD
 #: networks/views.py:57
 msgid "For libvirt, the IPv6 network prefix must be /64"
 msgstr ""
@@ -3718,34 +3349,10 @@ msgid "%(family)s DHCP Range is Changed."
 msgstr ""
 
 #: networks/views.py:210
-=======
-#: networks/views.py:56
-msgid "For libvirt, the IPv6 network prefix must be /64"
-msgstr ""
-
-#: networks/views.py:126
-msgid "Unknown Network Family"
-msgstr ""
-
-#: networks/views.py:176
-msgid "{family.upper()} Fixed Address Operation Completed."
-msgstr ""
-
-#: networks/views.py:186
-msgid "{family.upper()} Fixed Address is Deleted."
-msgstr ""
-
-#: networks/views.py:194
-msgid "{family.upper()} DHCP Range is Changed."
-msgstr ""
-
-#: networks/views.py:203
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid ""
 "Network XML is changed. \\Stop and start network to activate new config."
 msgstr ""
 
-<<<<<<< HEAD
 #: networks/views.py:215
 msgid "Network XML is changed."
 msgstr ""
@@ -3762,34 +3369,6 @@ msgstr ""
 msgid ""
 "%(qos_dir)s QoS is deleted. Network XML is changed.                         "
 "Stop and start network to activate new config"
-=======
-#: networks/views.py:205
-msgid "Network XML is changed."
-msgstr ""
-
-#: networks/views.py:218
-msgid "{qos_dir.capitalize()} QoS is set. Network XML is changed."
-msgstr ""
-
-#: networks/views.py:219
-msgid "Stop and start network to activate new config"
-msgstr ""
-
-#: networks/views.py:221
-msgid "{} QoS is set"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
-msgstr ""
-
-#: networks/views.py:232
-msgid "{qos_dir.capitalize()} QoS is deleted. Network XML is changed. "
-msgstr ""
-
-#: networks/views.py:233
-msgid "Stop and start network to activate new config."
-msgstr ""
-
-#: networks/views.py:235
-msgid "{qos_dir.capitalize()} QoS is deleted"
 msgstr ""
 
 #: nwfilters/templates/add_nwf_rule.html:12
@@ -3804,8 +3383,8 @@ msgstr ""
 msgid "Create New NWFilter"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:39 nwfilters/templates/nwfilters.html:55
-#: secrets/templates/secrets.html:59
+#: nwfilters/templates/nwfilter.html:39 nwfilters/templates/nwfilters.html:53
+#: virtsecrets/templates/secrets.html:60
 msgid "UUID"
 msgstr ""
 
@@ -3813,47 +3392,46 @@ msgstr ""
 msgid "Filter References"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:100
+#: nwfilters/templates/nwfilter.html:92
 msgid "Reference"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:125
+#: nwfilters/templates/nwfilter.html:117
 msgid "Rules"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:129
+#: nwfilters/templates/nwfilter.html:121
 msgid "Rule"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:130
+#: nwfilters/templates/nwfilter.html:122
 msgid "Action Type"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:132
+#: nwfilters/templates/nwfilter.html:124
 msgid "Priority"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:133
+#: nwfilters/templates/nwfilter.html:125
 msgid "Statematch"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:134
+#: nwfilters/templates/nwfilter.html:126
 msgid "Directives"
 msgstr ""
 
-#: nwfilters/templates/nwfilters.html:71
+#: nwfilters/templates/nwfilters.html:69
 msgid "Details of NWFilter"
 msgstr ""
 
-#: nwfilters/templates/nwfilters.html:94
+#: nwfilters/templates/nwfilters.html:92
 msgid "Clone NWFilter"
 msgstr ""
 
-#: nwfilters/templates/nwfilters.html:135
+#: nwfilters/templates/nwfilters.html:132
 msgid "Hypervisor doesn't have any NWFilters"
 msgstr ""
 
-<<<<<<< HEAD
 #: nwfilters/views.py:44
 msgid "A network filter with this name already exists"
 msgstr ""
@@ -3863,98 +3441,23 @@ msgid "A network filter with this UUID already exists"
 msgstr ""
 
 #: nwfilters/views.py:51
-=======
-#: nwfilters/views.py:41
-msgid "A network filter with this name already exists"
-msgstr ""
-
-#: nwfilters/views.py:44
-msgid "A network filter with this UUID already exists"
-msgstr ""
-
-#: nwfilters/views.py:48
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid "%(filter)s network filter is created"
 msgstr ""
 
-<<<<<<< HEAD
 #: nwfilters/views.py:60
 #, python-format
 msgid "%(filter)s network filter is deleted"
 msgstr ""
 
-#: nwfilters/views.py:76
+#: nwfilters/views.py:77
 #, python-format
 msgid "NWFilter is in use by %(instance)s. Cannot be deleted."
 msgstr ""
 
-#: nwfilters/views.py:93
+#: nwfilters/views.py:96
 #, python-format
 msgid "Cloning NWFilter %(name)s as %(clone)s"
-=======
-#: nwfilters/views.py:57
-#, python-brace-format
-msgid "Deleting NWFilter: {name}"
-msgstr ""
-
-#: nwfilters/views.py:69
-#, python-brace-format
-msgid "NWFilter is in use by {inst}. Cannot be deleted."
-msgstr ""
-
-#: nwfilters/views.py:86
-#, python-brace-format
-msgid "Cloning NWFilter {name} as {cln_name}"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:12
-msgid "Create New Secret"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:18
-msgid "Ephemeral"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:21
-#: secrets/templates/create_secret_block.html:30
-msgid "no"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:22
-#: secrets/templates/create_secret_block.html:31
-msgid "yes"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:27
-msgid "Private"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:36
-#: storages/templates/storage.html:54
-msgid "Usage"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:46
-#: secrets/templates/secrets.html:61
-msgid "Data"
-msgstr ""
-
-#: secrets/templates/secrets.html:50
-msgid "Hypervisor doesn't have any Secrets"
-msgstr ""
-
-#: secrets/templates/secrets.html:60
-msgid "Usage Type"
-msgstr ""
-
-#: secrets/templates/secrets.html:88
-msgid "Set secret value"
-msgstr ""
-
-#: secrets/templates/secrets.html:94
-msgid "Value"
 msgstr ""
 
 #: storages/forms.py:10 storages/forms.py:37
@@ -3985,64 +3488,64 @@ msgstr ""
 msgid "Create Storage Pool"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:18
+#: storages/templates/create_stg_block.html:19
 msgid "DIR"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:21
+#: storages/templates/create_stg_block.html:24
 msgid "LVM"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:23
+#: storages/templates/create_stg_block.html:29
 msgid "CEPH"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:25
+#: storages/templates/create_stg_block.html:34
 msgid "NETFS"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:27
+#: storages/templates/create_stg_block.html:39
 msgid "ISO"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:48
-#: storages/templates/create_stg_block.html:222
+#: storages/templates/create_stg_block.html:62
+#: storages/templates/create_stg_block.html:236
 msgid "Path"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:106
+#: storages/templates/create_stg_block.html:120
 msgid "Ceph User"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:112
+#: storages/templates/create_stg_block.html:126
 msgid "Ceph Pool"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:118
+#: storages/templates/create_stg_block.html:132
 msgid "Ceph Host"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:177
+#: storages/templates/create_stg_block.html:191
 msgid "Remote Path"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:186
+#: storages/templates/create_stg_block.html:200
 msgid "auto"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:187
+#: storages/templates/create_stg_block.html:201
 msgid "nfs"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:188
+#: storages/templates/create_stg_block.html:202
 msgid "glusterfs"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:189
+#: storages/templates/create_stg_block.html:203
 msgid "cifs"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:194
+#: storages/templates/create_stg_block.html:208
 msgid "Local Path"
 msgstr ""
 
@@ -4058,47 +3561,52 @@ msgstr ""
 msgid "Add New Volume"
 msgstr ""
 
-#: storages/templates/storage.html:44
+#: storages/templates/storage.html:46
 msgid "Pool name"
 msgstr ""
 
-#: storages/templates/storage.html:46
+#: storages/templates/storage.html:48
 msgid "Pool type"
 msgstr ""
 
-#: storages/templates/storage.html:48
+#: storages/templates/storage.html:50
 msgid "Pool path"
 msgstr ""
 
-#: storages/templates/storage.html:50
+#: storages/templates/storage.html:52
 msgid "Pool status"
 msgstr ""
 
-#: storages/templates/storage.html:85 storages/templates/storages.html:64
+#: storages/templates/storage.html:56
+#: virtsecrets/templates/create_secret_block.html:36
+msgid "Usage"
+msgstr ""
+
+#: storages/templates/storage.html:90 storages/templates/storages.html:63
 msgid "Volumes"
 msgstr ""
 
-#: storages/templates/storage.html:97
+#: storages/templates/storage.html:98
 msgid "Allocated"
 msgstr ""
 
-#: storages/templates/storage.html:118
+#: storages/templates/storage.html:119
 msgid "Clone image"
 msgstr ""
 
-#: storages/templates/storage.html:131
+#: storages/templates/storage.html:132
 msgid "Convert"
 msgstr ""
 
-#: storages/templates/storage.html:140
+#: storages/templates/storage.html:141
 msgid "raw"
 msgstr ""
 
-#: storages/templates/storage.html:141
+#: storages/templates/storage.html:142
 msgid "qcow"
 msgstr ""
 
-#: storages/templates/storage.html:142
+#: storages/templates/storage.html:143
 msgid "qcow2"
 msgstr ""
 
@@ -4106,11 +3614,11 @@ msgstr ""
 msgid "Hypervisor doesn't have any Volumes"
 msgstr ""
 
-#: storages/templates/storages.html:46
+#: storages/templates/storages.html:45
 msgid "Hypervisor doesn't have any Storages"
 msgstr ""
 
-#: storages/views.py:39
+#: storages/views.py:40
 msgid "Pool name already use"
 msgstr ""
 
@@ -4118,67 +3626,44 @@ msgstr ""
 msgid "You need create secret for pool"
 msgstr ""
 
-<<<<<<< HEAD
-#: storages/views.py:48
-msgid "You need input all fields for creating ceph pool"
-msgstr ""
-
-#: storages/views.py:144
-#, python-format
-msgid "Volume: %(volume)s is deleted."
-msgstr ""
-
-#: storages/views.py:149
-msgid "ISO image already exist"
-msgstr ""
-
-#: storages/views.py:153
-#, python-format
-msgid "ISO: %(file)s is uploaded."
-msgstr ""
-
-#: storages/views.py:162
-msgid "Name of volume already in use"
-msgstr ""
-
-#: storages/views.py:174
-#, python-format
-msgid "%(image)s image cloned as %(clone)s successfully"
-msgstr ""
-
-#: storages/views.py:220
-#, python-format
-msgid "Image file %(name)s is created successfully"
-=======
 #: storages/views.py:49
 msgid "You need input all fields for creating ceph pool"
 msgstr ""
 
-#: storages/views.py:132
-#, python-brace-format
-msgid "Volume: {volname} is deleted."
+#: storages/views.py:96
+msgid "Security Issues with file uploading"
 msgstr ""
 
-#: storages/views.py:137
-msgid "ISO image already exist"
-msgstr ""
-
-#: storages/views.py:141
-msgid "ISO: {request.FILES['file']} is uploaded."
+#: storages/views.py:103
+msgid "File not found. Check the path variable and filename"
 msgstr ""
 
 #: storages/views.py:150
+#, python-format
+msgid "Volume: %(vol)s is deleted."
+msgstr ""
+
+#: storages/views.py:155
+msgid "ISO image already exist"
+msgstr ""
+
+#: storages/views.py:159
+#, python-format
+msgid "ISO: %(file)s is uploaded."
+msgstr ""
+
+#: storages/views.py:168
 msgid "Name of volume already in use"
 msgstr ""
 
-#: storages/views.py:160
-msgid "{data['image']} image cloned as {name} successfully"
+#: storages/views.py:180
+#, python-format
+msgid "%(image)s image cloned as %(name)s successfully"
 msgstr ""
 
-#: storages/views.py:199
-#, python-brace-format
-msgid "Image file {name} is created successfully"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: storages/views.py:226
+#, python-format
+msgid "Image file %(name)s is created successfully"
 msgstr ""
 
 #: templates/403.html:3
@@ -4239,18 +3724,321 @@ msgstr ""
 msgid "Processing"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/bootstrap4/components.py:17
-#: venv/lib/python3.6/site-packages/bootstrap4/templates/bootstrap4/form_errors.html:3
-#: venv/lib/python3.6/site-packages/bootstrap4/templates/bootstrap4/messages.html:4
-msgid "close"
+#: templates/search_block.html:3
+msgid "Search"
 msgstr ""
 
+#: venv/lib/python3.6/site-packages/click/_termui_impl.py:496
+#, python-brace-format
+msgid "{editor}: Editing failed"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_termui_impl.py:500
+#, python-brace-format
+msgid "{editor}: Editing failed: {e}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:20
+msgid ""
+"Click will abort further execution because Python was configured to use "
+"ASCII as encoding for the environment. Consult https://click.palletsprojects."
+"com/unicode-support/ for mitigation steps."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:56
+msgid ""
+"Additional information: on this system no suitable UTF-8 locales were "
+"discovered. This most likely requires resolving by reconfiguring the locale "
+"system."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:65
+msgid ""
+"This system supports the C.UTF-8 locale which is recommended. You might be "
+"able to resolve your issue by exporting the following environment variables:"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:75
+#, python-brace-format
+msgid ""
+"This system lists some UTF-8 supporting locales that you can pick from. The "
+"following suitable locales were discovered: {locales}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:93
+msgid ""
+"Click discovered that you exported a UTF-8 locale but the locale system "
+"could not pick up from it because it does not exist. The exported locale is "
+"{locale!r} but it is not supported."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1095
+msgid "Aborted!"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1279
+#: venv/lib/python3.6/site-packages/click/decorators.py:434
+msgid "Show this message and exit."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1308
+#: venv/lib/python3.6/site-packages/click/core.py:1334
+#, python-brace-format
+msgid "(Deprecated) {text}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1375
+#, python-brace-format
+msgid "Got unexpected extra argument ({args})"
+msgid_plural "Got unexpected extra arguments ({args})"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1390
+msgid "DeprecationWarning: The command {name!r} is deprecated."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1607
+msgid "Commands"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1639
+msgid "Missing command."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1717
+msgid "No such command {name!r}."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2258
+msgid "Value must be an iterable."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2278
+#, python-brace-format
+msgid "Takes {nargs} values but 1 was given."
+msgid_plural "Takes {nargs} values but {len} were given."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2701
+#, python-brace-format
+msgid "env var: {var}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2724
+msgid "(dynamic)"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2735
+#, python-brace-format
+msgid "default: {default}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2748
+msgid "required"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/decorators.py:339
+#, python-format
+msgid "%(prog)s, version %(version)s"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/decorators.py:403
+msgid "Show the version and exit."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:43
+#: venv/lib/python3.6/site-packages/click/exceptions.py:79
+#, python-brace-format
+msgid "Error: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:71
+#, python-brace-format
+msgid "Try '{command} {option}' for help."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:120
+#, python-brace-format
+msgid "Invalid value: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:122
+#, python-brace-format
+msgid "Invalid value for {param_hint}: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:178
+msgid "Missing argument"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:180
+msgid "Missing option"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:182
+msgid "Missing parameter"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:184
+#, python-brace-format
+msgid "Missing {param_type}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:191
+#, python-brace-format
+msgid "Missing parameter: {param_name}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:211
+#, python-brace-format
+msgid "No such option: {name}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:223
+#, python-brace-format
+msgid "Did you mean {possibility}?"
+msgid_plural "(Possible options: {possibilities})"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:261
+msgid "unknown error"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:268
+msgid "Could not open file {filename!r}: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:231
+msgid "Argument {name!r} takes {nargs} values."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:413
+msgid "Option {name!r} does not take a value."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:474
+msgid "Option {name!r} requires an argument."
+msgid_plural "Option {name!r} requires {nargs} arguments."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/shell_completion.py:316
+msgid "Shell completion is not supported for Bash versions older than 4.4."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/shell_completion.py:322
+msgid "Couldn't detect Bash version, shell completion is not supported."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:161
+msgid "Repeat for confirmation"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:178
+msgid "Error: The value you entered was invalid."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:180
+#, python-brace-format
+msgid "Error: {e.message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:191
+msgid "Error: The two entered values do not match."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:247
+msgid "Error: invalid input"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:798
+msgid "Press any key to continue..."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:258
+#, python-brace-format
+msgid ""
+"Choose from:\n"
+"\t{choices}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:290
+msgid "{value!r} is not {choice}."
+msgid_plural "{value!r} is not one of {choices}."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:380
+msgid "{value!r} does not match the format {format}."
+msgid_plural "{value!r} does not match the formats {formats}."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:402
+msgid "{value!r} is not a valid {number_type}."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:458
+#, python-brace-format
+msgid "{value} is not in the range {range}."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:599
+msgid "{value!r} is not a valid boolean."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:623
+msgid "{value!r} is not a valid UUID."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:801
+msgid "file"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:803
+msgid "directory"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:805
+msgid "path"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:851
+msgid "{name} {filename!r} does not exist."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:860
+msgid "{name} {filename!r} is a file."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:868
+msgid "{name} {filename!r} is a directory."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:876
+msgid "{name} {filename!r} is not writable."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:884
+msgid "{name} {filename!r} is not readable."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:951
+#, python-brace-format
+msgid "{len_type} values are required, but {len_value} was given."
+msgid_plural "{len_type} values are required, but {len_value} were given."
+msgstr[0] ""
+msgstr[1] ""
+
 #: venv/lib/python3.6/site-packages/django/contrib/messages/apps.py:7
 #: venv2/lib/python2.7/site-packages/django/contrib/messages/apps.py:7
 msgid "Messages"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/contrib/sitemaps/apps.py:7
+#: venv/lib/python3.6/site-packages/django/contrib/sitemaps/apps.py:8
 #: venv2/lib/python2.7/site-packages/django/contrib/sitemaps/apps.py:7
 msgid "Site Maps"
 msgstr ""
@@ -4265,103 +4053,108 @@ msgstr ""
 msgid "Syndication"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/paginator.py:45
+#. Translators: String used to replace omitted page numbers in elided page
+#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10].
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:30
+msgid "…"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:51
 #: venv2/lib/python2.7/site-packages/django/core/paginator.py:43
 msgid "That page number is not an integer"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/paginator.py:47
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:53
 #: venv2/lib/python2.7/site-packages/django/core/paginator.py:45
 msgid "That page number is less than 1"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/paginator.py:52
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:58
 #: venv2/lib/python2.7/site-packages/django/core/paginator.py:50
 msgid "That page contains no results"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:31
+#: venv/lib/python3.6/site-packages/django/core/validators.py:22
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:34
 msgid "Enter a valid value."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:102
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:658
+#: venv/lib/python3.6/site-packages/django/core/validators.py:93
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:675
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:107
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:671
 msgid "Enter a valid URL."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:154
+#: venv/lib/python3.6/site-packages/django/core/validators.py:150
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:160
 msgid "Enter a valid integer."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:165
+#: venv/lib/python3.6/site-packages/django/core/validators.py:161
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:171
 msgid "Enter a valid email address."
 msgstr ""
 
 #. Translators: "letters" means latin letters: a-z and A-Z.
-#: venv/lib/python3.6/site-packages/django/core/validators.py:239
-#: venv2/lib/python2.7/site-packages/django/core/validators.py:245
+#: venv/lib/python3.6/site-packages/django/core/validators.py:262
 msgid ""
-"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+"Enter a valid “slug” consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:246
-#: venv2/lib/python2.7/site-packages/django/core/validators.py:252
+#: venv/lib/python3.6/site-packages/django/core/validators.py:269
 msgid ""
-"Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
+"Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:255
-#: venv/lib/python3.6/site-packages/django/core/validators.py:275
+#: venv/lib/python3.6/site-packages/django/core/validators.py:278
+#: venv/lib/python3.6/site-packages/django/core/validators.py:288
+#: venv/lib/python3.6/site-packages/django/core/validators.py:311
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:257
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:277
 msgid "Enter a valid IPv4 address."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:260
-#: venv/lib/python3.6/site-packages/django/core/validators.py:276
+#: venv/lib/python3.6/site-packages/django/core/validators.py:296
+#: venv/lib/python3.6/site-packages/django/core/validators.py:312
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:262
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:278
 msgid "Enter a valid IPv6 address."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:270
-#: venv/lib/python3.6/site-packages/django/core/validators.py:274
+#: venv/lib/python3.6/site-packages/django/core/validators.py:306
+#: venv/lib/python3.6/site-packages/django/core/validators.py:310
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:272
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:276
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:304
+#: venv/lib/python3.6/site-packages/django/core/validators.py:340
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:308
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1131
 msgid "Enter only digits separated by commas."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:310
+#: venv/lib/python3.6/site-packages/django/core/validators.py:346
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:314
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:342
+#: venv/lib/python3.6/site-packages/django/core/validators.py:379
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:345
 #, python-format
 msgid "Ensure this value is less than or equal to %(limit_value)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:351
+#: venv/lib/python3.6/site-packages/django/core/validators.py:388
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:354
 #, python-format
 msgid "Ensure this value is greater than or equal to %(limit_value)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:361
+#: venv/lib/python3.6/site-packages/django/core/validators.py:398
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:364
 #, python-format
 msgid ""
@@ -4373,7 +4166,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:376
+#: venv/lib/python3.6/site-packages/django/core/validators.py:413
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:379
 #, python-format
 msgid ""
@@ -4385,15 +4178,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:395
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:290
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:325
+#: venv/lib/python3.6/site-packages/django/core/validators.py:432
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:292
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:327
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:303
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:340
 msgid "Enter a number."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:397
+#: venv/lib/python3.6/site-packages/django/core/validators.py:434
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:399
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
@@ -4401,7 +4194,7 @@ msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:402
+#: venv/lib/python3.6/site-packages/django/core/validators.py:439
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:404
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
@@ -4409,7 +4202,7 @@ msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:407
+#: venv/lib/python3.6/site-packages/django/core/validators.py:444
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:409
 #, python-format
 msgid ""
@@ -4419,48 +4212,47 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:469
-#: venv2/lib/python2.7/site-packages/django/core/validators.py:463
+#: venv/lib/python3.6/site-packages/django/core/validators.py:506
 #, python-format
 msgid ""
-"File extension '%(extension)s' is not allowed. Allowed extensions are: "
-"'%(allowed_extensions)s'."
+"File extension “%(extension)s” is not allowed. Allowed extensions are: "
+"%(allowed_extensions)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:521
+#: venv/lib/python3.6/site-packages/django/core/validators.py:559
 msgid "Null characters are not allowed."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/base.py:1165
-#: venv/lib/python3.6/site-packages/django/forms/models.py:756
+#: venv/lib/python3.6/site-packages/django/db/models/base.py:1210
+#: venv/lib/python3.6/site-packages/django/forms/models.py:768
 #: venv2/lib/python2.7/site-packages/django/db/models/base.py:1209
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:749
 msgid "and"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/base.py:1167
+#: venv/lib/python3.6/site-packages/django/db/models/base.py:1212
 #: venv2/lib/python2.7/site-packages/django/db/models/base.py:1211
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:104
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:100
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:116
 #, python-format
 msgid "Value %(value)r is not a valid choice."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:105
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:101
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:117
 msgid "This field cannot be null."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:106
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:102
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:118
 msgid "This field cannot be blank."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:107
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:103
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:119
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
@@ -4468,346 +4260,340 @@ msgstr ""
 
 #. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
 #. Eg: "Title must be unique for pub_date year"
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:111
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:107
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:123
 #, python-format
 msgid ""
 "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:128
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:126
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:140
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:905
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1772
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:901
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1809
-msgid "Integer"
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:909
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1770
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:905
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1807
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:958
 #, python-format
-msgid "'%(value)s' value must be an integer."
+msgid "“%(value)s” value must be either True or False."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:984
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1850
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:978
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1878
-msgid "Big (8 byte) integer"
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:996
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:990
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:959
 #, python-format
-msgid "'%(value)s' value must be either True or False."
+msgid "“%(value)s” value must be either True, False, or None."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:997
-#, python-format
-msgid "'%(value)s' value must be either True, False, or None."
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:999
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:961
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:992
 msgid "Boolean (Either True or False)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1040
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1002
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1058
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1104
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1096
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1115
 msgid "Comma-separated integers"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1153
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1172
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1145
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+"“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD "
 "format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1155
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1298
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1174
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1319
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1147
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1290
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
+"“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid "
 "date."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1158
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1150
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1177
 msgid "Date (without time)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1296
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1317
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1288
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ] format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1300
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1321
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1292
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
 "[TZ]) but it is an invalid date/time."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1304
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1296
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1325
 msgid "Date (with time)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1452
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1475
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1444
 #, python-format
-msgid "'%(value)s' value must be a decimal number."
+msgid "“%(value)s” value must be a decimal number."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1454
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1446
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1477
 msgid "Decimal number"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1593
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1628
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1585
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
+"“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[."
 "uuuuuu] format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1596
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1588
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1631
 msgid "Duration"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1646
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1638
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1683
 msgid "Email address"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1669
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1661
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1707
 msgid "File path"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1735
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1773
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1727
 #, python-format
-msgid "'%(value)s' value must be a float."
+msgid "“%(value)s” value must be a float."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1737
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1729
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1775
 msgid "Floating point number"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1866
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1767
+#, python-format
+msgid "“%(value)s” value must be an integer."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1769
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:901
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1809
+msgid "Integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1852
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:978
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1878
+msgid "Big (8 byte) integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1867
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2130
+msgid "Small integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1875
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1893
 msgid "IPv4 address"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1897
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1906
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1924
 msgid "IP address"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1977
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1978
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2006
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1986
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1987
 #, python-format
-msgid "'%(value)s' value must be either None, True or False."
+msgid "“%(value)s” value must be either None, True or False."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1980
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1989
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2008
 msgid "Boolean (Either True, False or None)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2015
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2043
+msgid "Positive big integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2056
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2071
 msgid "Positive integer"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2028
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2069
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2083
 msgid "Positive small integer"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2042
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2083
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2096
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2074
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2130
-msgid "Small integer"
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2081
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2115
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2137
 msgid "Text"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2109
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2163
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2181
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
 "format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2111
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2165
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2183
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
 "invalid time."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2114
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2186
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2168
 msgid "Time"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2240
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2312
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2296
 msgid "URL"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2262
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2334
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2319
 msgid "Raw binary data"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2312
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2366
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2399
 #, python-format
-msgid "'%(value)s' is not a valid UUID."
+msgid "“%(value)s” is not a valid UUID."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2314
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2401
 msgid "Universally unique identifier"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:221
+#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:226
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/files.py:228
 msgid "File"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:778
+#: venv/lib/python3.6/site-packages/django/db/models/fields/json.py:18
+msgid "A JSON object"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/json.py:20
+msgid "Value must be valid JSON."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:790
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:788
 #, python-format
 msgid "%(model)s instance with %(field)s %(value)r does not exist."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:780
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:792
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:790
 msgid "Foreign Key (type determined by related field)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1007
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1045
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1029
 msgid "One-to-one relationship"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1057
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1099
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1104
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1058
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1100
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1105
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1100
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1142
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1147
 msgid "Many-to-many relationship"
 msgstr ""
 
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the label
-#: venv/lib/python3.6/site-packages/django/forms/boundfield.py:146
+#: venv/lib/python3.6/site-packages/django/forms/boundfield.py:150
 #: venv2/lib/python2.7/site-packages/django/forms/boundfield.py:181
 msgid ":?.!"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:53
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:54
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:56
 msgid "This field is required."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:245
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:247
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:258
 msgid "Enter a whole number."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:396
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:1126
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:402
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1143
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:418
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:1149
 msgid "Enter a valid date."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:420
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:1127
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:426
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1144
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:442
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:1150
 msgid "Enter a valid time."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:442
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:454
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:464
 msgid "Enter a valid date/time."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:471
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:488
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:493
 msgid "Enter a valid duration."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:472
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:489
 #, python-brace-format
 msgid "The number of days must be between {min_days} and {max_days}."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:532
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:549
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:547
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:533
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:550
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:548
 msgid "No file was submitted."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:534
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:551
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:549
 msgid "The submitted file is empty."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:536
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:553
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:551
 #, python-format
 msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
@@ -4816,21 +4602,21 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:539
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:556
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:554
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:600
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:617
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:619
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:762
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:852
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1270
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:779
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:869
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1309
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:776
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:872
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1265
@@ -4838,78 +4624,82 @@ msgstr ""
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:853
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:968
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1269
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:870
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:985
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1308
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:873
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:990
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1264
 msgid "Enter a list of values."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:969
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:986
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:991
 msgid "Enter a complete value."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:1185
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1202
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:1208
 msgid "Enter a valid UUID."
 msgstr ""
 
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1232
+msgid "Enter a valid JSON."
+msgstr ""
+
 #. Translators: This is the default suffix added to form field labels
-#: venv/lib/python3.6/site-packages/django/forms/forms.py:86
+#: venv/lib/python3.6/site-packages/django/forms/forms.py:76
 #: venv2/lib/python2.7/site-packages/django/forms/forms.py:87
 msgid ":"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/forms.py:212
+#: venv/lib/python3.6/site-packages/django/forms/forms.py:203
 #: venv2/lib/python2.7/site-packages/django/forms/forms.py:213
 #, python-format
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:91
-#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:97
-msgid "ManagementForm data is missing or has been tampered with"
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:61
+#, python-format
+msgid ""
+"ManagementForm data is missing or has been tampered with. Missing fields: "
+"%(field_names)s. You may need to file a bug report if the issue persists."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:338
-#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:355
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:370
 #, python-format
-msgid "Please submit %d or fewer forms."
-msgid_plural "Please submit %d or fewer forms."
+msgid "Please submit at most %d form."
+msgid_plural "Please submit at most %d forms."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:345
-#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:362
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:377
 #, python-format
-msgid "Please submit %d or more forms."
-msgid_plural "Please submit %d or more forms."
+msgid "Please submit at least %d form."
+msgid_plural "Please submit at least %d forms."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:371
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:373
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:405
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:412
 #: venv2/lib/python2.7/site-packages/django/forms/formsets.py:390
 #: venv2/lib/python2.7/site-packages/django/forms/formsets.py:392
 msgid "Order"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:751
+#: venv/lib/python3.6/site-packages/django/forms/models.py:763
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:744
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:755
+#: venv/lib/python3.6/site-packages/django/forms/models.py:767
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:748
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:761
+#: venv/lib/python3.6/site-packages/django/forms/models.py:773
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:754
 #, python-format
 msgid ""
@@ -4917,55 +4707,55 @@ msgid ""
 "for the %(lookup)s in %(date_field)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:770
+#: venv/lib/python3.6/site-packages/django/forms/models.py:782
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:763
 msgid "Please correct the duplicate values below."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1091
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1109
 msgid "The inline value did not match the parent instance."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1158
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1193
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1154
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1272
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1311
 #, python-format
-msgid "\"%(pk)s\" is not a valid value."
+msgid "“%(pk)s” is not a valid value."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/utils.py:162
-#: venv2/lib/python2.7/site-packages/django/forms/utils.py:172
+#: venv/lib/python3.6/site-packages/django/forms/utils.py:172
 #, python-format
 msgid ""
-"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it "
 "may be ambiguous or it may not exist."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:396
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:404
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:378
 msgid "Currently"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:710
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:715
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:704
 msgid "Yes"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:711
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:716
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:705
 msgid "No"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:788
+#. Translators: Please do not add spaces around commas.
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:805
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:851
 msgid "yes,no,maybe"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:817
 #: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:834
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:851
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:880
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:897
 #, python-format
@@ -4974,62 +4764,62 @@ msgid_plural "%(size)d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:836
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:853
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:899
 #, python-format
 msgid "%s KB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:838
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:855
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:901
 #, python-format
 msgid "%s MB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:840
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:857
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:903
 #, python-format
 msgid "%s GB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:842
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:859
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:905
 #, python-format
 msgid "%s TB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:844
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:861
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:907
 #, python-format
 msgid "%s PB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:62
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:66
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:66
 msgid "p.m."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:63
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:67
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:67
 msgid "a.m."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:68
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:72
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:72
 msgid "PM"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:69
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:73
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:73
 msgid "AM"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:150
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:146
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:158
 msgid "midnight"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:152
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:148
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:160
 msgid "noon"
 msgstr ""
@@ -5373,20 +5163,20 @@ msgstr ""
 msgid "This is not a valid IPv6 address."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/text.py:67
+#: venv/lib/python3.6/site-packages/django/utils/text.py:71
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s…"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/text.py:233
+#: venv/lib/python3.6/site-packages/django/utils/text.py:240
 #: venv2/lib/python2.7/site-packages/django/utils/text.py:251
 msgid "or"
 msgstr ""
 
 #. Translators: This string is used as a separator between list elements
-#: venv/lib/python3.6/site-packages/django/utils/text.py:252
-#: venv/lib/python3.6/site-packages/django/utils/timesince.py:83
+#: venv/lib/python3.6/site-packages/django/utils/text.py:259
+#: venv/lib/python3.6/site-packages/django/utils/timesince.py:94
 #: venv2/lib/python2.7/site-packages/django/utils/text.py:270
 #: venv2/lib/python2.7/site-packages/django/utils/timesince.py:71
 msgid ", "
@@ -5440,11 +5230,6 @@ msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/utils/timesince.py:72
-#: venv2/lib/python2.7/site-packages/django/utils/timesince.py:60
-msgid "0 minutes"
-msgstr ""
-
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:110
 #: venv2/lib/python2.7/site-packages/django/views/csrf.py:109
 msgid "Forbidden"
@@ -5456,29 +5241,27 @@ msgid "CSRF verification failed. Request aborted."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:115
-#: venv2/lib/python2.7/site-packages/django/views/csrf.py:114
 msgid ""
-"You are seeing this message because this HTTPS site requires a 'Referer "
-"header' to be sent by your Web browser, but none was sent. This header is "
+"You are seeing this message because this HTTPS site requires a “Referer "
+"header” to be sent by your Web browser, but none was sent. This header is "
 "required for security reasons, to ensure that your browser is not being "
 "hijacked by third parties."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:120
-#: venv2/lib/python2.7/site-packages/django/views/csrf.py:119
 msgid ""
-"If you have configured your browser to disable 'Referer' headers, please re-"
-"enable them, at least for this site, or for HTTPS connections, or for 'same-"
-"origin' requests."
+"If you have configured your browser to disable “Referer” headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for “same-"
+"origin” requests."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:124
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
-"including the 'Referrer-Policy: no-referrer' header, please remove them. The "
-"CSRF protection requires the 'Referer' header to do strict referer checking. "
-"If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
-"\" ...> for links to third-party sites."
+"including the “Referrer-Policy: no-referrer” header, please remove them. The "
+"CSRF protection requires the “Referer” header to do strict referer checking. "
+"If you’re concerned about privacy, use alternatives like <a rel=\"noreferrer"
+"\" …> for links to third-party sites."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:132
@@ -5490,10 +5273,9 @@ msgid ""
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:137
-#: venv2/lib/python2.7/site-packages/django/views/csrf.py:129
 msgid ""
 "If you have configured your browser to disable cookies, please re-enable "
-"them, at least for this site, or for 'same-origin' requests."
+"them, at least for this site, or for “same-origin” requests."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:142
@@ -5538,7 +5320,7 @@ msgstr ""
 msgid "No %(verbose_name_plural)s available"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:589
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:594
 #: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:669
 #, python-format
 msgid ""
@@ -5546,10 +5328,9 @@ msgid ""
 "allow_future is False."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:623
-#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:703
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:628
 #, python-format
-msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgid "Invalid date string “%(datestr)s” given format “%(format)s”"
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/detail.py:54
@@ -5559,8 +5340,7 @@ msgid "No %(verbose_name)s found matching the query"
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/list.py:67
-#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:77
-msgid "Page is not 'last', nor can it be converted to an int."
+msgid "Page is not “last”, nor can it be converted to an int."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/list.py:72
@@ -5570,9 +5350,8 @@ msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/list.py:154
-#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:172
 #, python-format
-msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgid "Empty list and “%(class_name)s.allow_empty” is False."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/static.py:40
@@ -5581,9 +5360,8 @@ msgid "Directory indexes are not allowed here."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/static.py:42
-#: venv2/lib/python2.7/site-packages/django/views/static.py:46
 #, python-format
-msgid "\"%(path)s\" does not exist"
+msgid "“%(path)s” does not exist"
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/static.py:80
@@ -5592,22 +5370,19 @@ msgstr ""
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:6
-msgid "Django: the Web framework for perfectionists with deadlines."
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:7
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:221
+msgid "The install worked successfully! Congratulations!"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:345
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:207
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:367
-msgid "The install worked successfully! Congratulations!"
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:368
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:222
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
@@ -5616,39 +5391,160 @@ msgid ""
 "URLs."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:383
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:230
 msgid "Django Documentation"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:384
-msgid "Topics, references, &amp; how-to's"
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:231
+msgid "Topics, references, &amp; how-to’s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:395
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:239
 msgid "Tutorial: A Polling App"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:396
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:240
 msgid "Get started with Django"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:407
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:248
 msgid "Django Community"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:408
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:249
 msgid "Connect, get help, or contribute"
 msgstr ""
 
+#: venv/lib/python3.6/site-packages/django_bootstrap5/components.py:20
+msgid "close"
+msgstr ""
+
 #: venv/lib/python3.6/site-packages/django_icons/renderers/image.py:217
 msgid "Icon of {}"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/qr_code/qrcode/utils.py:73
-#, python-format
-msgid "The option '%s' is not a valid option for a QR code."
+#: venv/lib/python3.6/site-packages/isort/main.py:158
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1615
+msgid "show this help message and exit"
 msgstr ""
 
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:245
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:252
+msgid ""
+"Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
+"hyphens."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:463
+#, python-format
+msgid ""
+"File extension '%(extension)s' is not allowed. Allowed extensions are: "
+"'%(allowed_extensions)s'."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:905
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1807
+#, python-format
+msgid "'%(value)s' value must be an integer."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:990
+#, python-format
+msgid "'%(value)s' value must be either True or False."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1172
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+"format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1174
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1319
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
+"date."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1317
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1321
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]) but it is an invalid date/time."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1475
+#, python-format
+msgid "'%(value)s' value must be a decimal number."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1628
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
+"uuuuuu] format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1773
+#, python-format
+msgid "'%(value)s' value must be a float."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2006
+#, python-format
+msgid "'%(value)s' value must be either None, True or False."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2163
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2165
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"invalid time."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2366
+#, python-format
+msgid "'%(value)s' is not a valid UUID."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:97
+msgid "ManagementForm data is missing or has been tampered with"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:355
+#, python-format
+msgid "Please submit %d or fewer forms."
+msgid_plural "Please submit %d or fewer forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:362
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1093
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
@@ -5658,12 +5554,44 @@ msgstr ""
 msgid "\"%(pk)s\" is not a valid value for a primary key."
 msgstr ""
 
+#: venv2/lib/python2.7/site-packages/django/forms/utils.py:172
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
 #: venv2/lib/python2.7/site-packages/django/utils/text.py:81
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
+#: venv2/lib/python2.7/site-packages/django/utils/timesince.py:60
+msgid "0 minutes"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:114
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:119
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:129
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
 #: venv2/lib/python2.7/site-packages/django/views/debug.py:520
 msgid "Welcome to Django"
 msgstr ""
@@ -5688,6 +5616,25 @@ msgid ""
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 
+#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:703
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:77
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:172
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/static.py:46
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
+
 #: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:313
 msgid "usage: "
 msgstr ""
@@ -5747,10 +5694,6 @@ msgstr ""
 msgid "optional arguments"
 msgstr ""
 
-#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1615
-msgid "show this help message and exit"
-msgstr ""
-
 #: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1621
 msgid "show program's version number and exit"
 msgstr ""
@@ -5836,6 +5779,49 @@ msgstr ""
 msgid "%s: error: %s\n"
 msgstr ""
 
+#: virtsecrets/templates/create_secret_block.html:12
+msgid "Create New Secret"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:18
+msgid "Ephemeral"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:21
+#: virtsecrets/templates/create_secret_block.html:30
+msgid "no"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:22
+#: virtsecrets/templates/create_secret_block.html:31
+msgid "yes"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:27
+msgid "Private"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:46
+#: virtsecrets/templates/secrets.html:62
+msgid "Data"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:51
+msgid "Hypervisor doesn't have any Secrets"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:61
+msgid "Usage Type"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:89
+msgid "Set secret value"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:95
+msgid "Value"
+msgstr ""
+
 #: webvirtcloud/middleware.py:18
 #, python-format
 msgid "libvirt Error - %(exception)s"
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index cc1bde9..520676f 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -8,11 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2020-11-05 09:36+0000\n"
-=======
-"POT-Creation-Date: 2020-10-23 07:53+0000\n"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+"POT-Creation-Date: 2021-12-20 07:54+0000\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"
@@ -96,39 +92,39 @@ msgstr ""
 msgid "Create user instance"
 msgstr ""
 
-#: accounts/templates/account.html:27
+#: accounts/templates/account.html:28
 #: computes/templates/computes/instances.html:5
 #: computes/templates/computes/instances.html:9
-#: computes/templates/computes/instances.html:32
-#: computes/templates/overview.html:19 instances/templates/allinstances.html:5
+#: computes/templates/computes/instances.html:30
+#: computes/templates/overview.html:18 instances/templates/allinstances.html:5
 #: instances/templates/allinstances.html:9
 #: instances/templates/bottom_bar.html:17
 #: interfaces/templates/interface.html:16
-#: interfaces/templates/interfaces.html:20 networks/templates/network.html:17
+#: interfaces/templates/interfaces.html:22 networks/templates/network.html:17
 #: networks/templates/networks.html:19 nwfilters/templates/nwfilter.html:17
-#: nwfilters/templates/nwfilters.html:25 secrets/templates/secrets.html:23
-#: storages/templates/storage.html:22 storages/templates/storages.html:19
-#: templates/navbar.html:14
+#: nwfilters/templates/nwfilters.html:23 storages/templates/storage.html:23
+#: storages/templates/storages.html:19 templates/navbar.html:14
+#: virtsecrets/templates/secrets.html:25
 msgid "Instances"
 msgstr ""
 
-#: accounts/templates/account.html:30
+#: accounts/templates/account.html:33
 msgid "Public Keys"
 msgstr ""
 
-#: accounts/templates/account.html:40 admin/templates/admin/logs.html:27
+#: accounts/templates/account.html:44 admin/templates/admin/logs.html:27
 #: instances/templates/instance.html:5
 msgid "Instance"
 msgstr ""
 
-#: accounts/templates/account.html:41
+#: accounts/templates/account.html:45
 msgid "VNC"
 msgstr ""
 
-#: accounts/templates/account.html:42 instances/templates/instance.html:87
-#: instances/templates/instances/resize_tab.html:56
-#: instances/templates/instances/resize_tab.html:58
-#: instances/templates/instances/resize_tab.html:85
+#: accounts/templates/account.html:46 instances/templates/instance.html:93
+#: instances/templates/instances/resize_tab.html:55
+#: instances/templates/instances/resize_tab.html:57
+#: instances/templates/instances/resize_tab.html:84
 #: instances/templates/instances/resize_tab.html:121
 #: instances/templates/instances/resize_tab.html:125
 #: instances/templates/instances/resize_tab.html:151
@@ -137,47 +133,47 @@ msgstr ""
 msgid "Resize"
 msgstr ""
 
-#: accounts/templates/account.html:43 accounts/templates/account.html:61
-#: accounts/templates/profile.html:51 admin/templates/admin/group_list.html:46
-#: admin/templates/admin/user_list.html:68
-#: computes/templates/computes/list.html:54
-#: instances/templates/instances/settings_tab.html:310
-#: instances/templates/instances/settings_tab.html:314
+#: accounts/templates/account.html:47 accounts/templates/account.html:65
+#: accounts/templates/profile.html:55 admin/templates/admin/group_list.html:43
+#: admin/templates/admin/user_list.html:65
+#: computes/templates/computes/list.html:53
+#: instances/templates/instances/settings_tab.html:325
+#: instances/templates/instances/settings_tab.html:329
 #: interfaces/templates/interface.html:60 networks/templates/network.html:50
-#: nwfilters/templates/nwfilter.html:111 nwfilters/templates/nwfilter.html:151
-#: nwfilters/templates/nwfilters.html:120 secrets/templates/secrets.html:77
-#: storages/templates/storage.html:61 storages/templates/storage.html:174
-#: templates/common/confirm_delete.html:21
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:375
+#: nwfilters/templates/nwfilter.html:103 nwfilters/templates/nwfilter.html:143
+#: nwfilters/templates/nwfilters.html:118 storages/templates/storage.html:63
+#: storages/templates/storage.html:175 templates/common/confirm_delete.html:21
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:417
 #: venv2/lib/python2.7/site-packages/django/forms/formsets.py:394
+#: virtsecrets/templates/secrets.html:78
 msgid "Delete"
 msgstr ""
 
-#: accounts/templates/account.html:44
-#: instances/templates/create_instance_w2.html:81
-#: instances/templates/instances/settings_tab.html:239
-#: instances/templates/instances/snapshots_tab.html:49
-#: nwfilters/templates/nwfilter.html:101 nwfilters/templates/nwfilter.html:135
-#: nwfilters/templates/nwfilters.html:57 secrets/templates/secrets.html:62
-#: storages/templates/storage.html:100
+#: accounts/templates/account.html:48
+#: instances/templates/create_instance_w2.html:80
+#: instances/templates/instances/settings_tab.html:254
+#: instances/templates/instances/snapshots_tab.html:41
+#: nwfilters/templates/nwfilter.html:93 nwfilters/templates/nwfilter.html:127
+#: nwfilters/templates/nwfilters.html:55 storages/templates/storage.html:101
+#: virtsecrets/templates/secrets.html:63
 msgid "Action"
 msgstr ""
 
-#: accounts/templates/account.html:56
+#: accounts/templates/account.html:60
 msgid "edit"
 msgstr ""
 
-#: accounts/templates/account.html:74
+#: accounts/templates/account.html:78
 msgid "Key name"
 msgstr ""
 
-#: accounts/templates/account.html:75
+#: accounts/templates/account.html:79
 msgid "Public key"
 msgstr ""
 
 #: accounts/templates/accounts/change_password_form.html:7
 #: accounts/templates/accounts/change_password_form.html:14
-#: accounts/templates/profile.html:29
+#: accounts/templates/profile.html:33
 msgid "Change Password"
 msgstr ""
 
@@ -190,11 +186,11 @@ msgid "Cancel"
 msgstr ""
 
 #: accounts/templates/accounts/change_password_form.html:27
-#: instances/templates/instances/settings_tab.html:638
-#: instances/templates/instances/settings_tab.html:642
-#: instances/templates/instances/settings_tab.html:824
-#: instances/templates/instances/settings_tab.html:826
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:397
+#: instances/templates/instances/settings_tab.html:672
+#: instances/templates/instances/settings_tab.html:676
+#: instances/templates/instances/settings_tab.html:853
+#: instances/templates/instances/settings_tab.html:855
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:405
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:379
 msgid "Change"
 msgstr ""
@@ -223,7 +219,7 @@ msgstr ""
 
 #: accounts/templates/accounts/otp_login.html:24
 #: accounts/templates/login.html:5 accounts/templates/login.html:23
-#: accounts/templates/login.html:27
+#: accounts/templates/login.html:28
 msgid "Sign In"
 msgstr ""
 
@@ -235,12 +231,12 @@ msgstr ""
 msgid "Incorrect username or password."
 msgstr ""
 
-#: accounts/templates/login.html:24 admin/templates/admin/logs.html:26
-#: computes/templates/computes/instances.html:67
+#: accounts/templates/login.html:24 admin/templates/admin/logs.html:25
+#: computes/templates/computes/instances.html:64
 #: instances/templates/add_instance_owner_block.html:18
 #: instances/templates/allinstances_index_grouped.html:8
 #: instances/templates/allinstances_index_nongrouped.html:7
-#: instances/templates/instances/stats_tab.html:84
+#: instances/templates/instances/stats_tab.html:87
 msgid "User"
 msgstr ""
 
@@ -264,26 +260,26 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: accounts/templates/profile.html:14
+#: accounts/templates/profile.html:15
 msgid "Edit Profile"
 msgstr ""
 
-#: accounts/templates/profile.html:17
-#: instances/templates/instances/access_tab.html:23
+#: accounts/templates/profile.html:20
+#: instances/templates/instances/access_tab.html:20
 msgid "SSH Keys"
 msgstr ""
 
-#: accounts/templates/profile.html:34
-#: instances/templates/instances/settings_tab.html:686
-#: instances/templates/instances/settings_tab.html:688
+#: accounts/templates/profile.html:38
+#: instances/templates/instances/settings_tab.html:720
+#: instances/templates/instances/settings_tab.html:722
 msgid "Update"
 msgstr ""
 
-#: accounts/templates/profile.html:64
+#: accounts/templates/profile.html:68
 msgid "Add SSH Key"
 msgstr ""
 
-#: accounts/templates/profile.html:72
+#: accounts/templates/profile.html:76
 #: instances/templates/add_instance_network_block.html:50
 #: instances/templates/add_instance_owner_block.html:31
 #: instances/templates/create_flav_block.html:28
@@ -297,7 +293,6 @@ msgstr ""
 
 #: accounts/utils.py:51
 msgid "Please view HTML version of this message."
-<<<<<<< HEAD
 msgstr ""
 
 #: accounts/views.py:26
@@ -347,57 +342,6 @@ msgid "OTP QR code was emailed to user %(user)s"
 msgstr ""
 
 #: accounts/views.py:196
-=======
-msgstr ""
-
-#: accounts/views.py:26
-msgid "Profile updated"
-msgstr ""
-
-#: accounts/views.py:40
-msgid "SSH key added"
-msgstr ""
-
-#: accounts/views.py:45
-msgid "Add SSH key"
-msgstr ""
-
-#: accounts/views.py:53
-msgid "SSH key deleted"
-msgstr ""
-
-#: accounts/views.py:58
-msgid "Delete SSH key"
-msgstr ""
-
-#: accounts/views.py:86
-msgid "Password Changed"
-msgstr ""
-
-#: accounts/views.py:106
-msgid "Create User Instance"
-msgstr ""
-
-#: accounts/views.py:124
-msgid "Update User Instance"
-msgstr ""
-
-#: accounts/views.py:160
-#, python-format
-msgid "OTP Sent to %s"
-msgstr ""
-
-#: accounts/views.py:165
-msgid "Email OTP"
-msgstr ""
-
-#: accounts/views.py:175
-#, python-format
-msgid "OTP QR code was emailed to user %s"
-msgstr ""
-
-#: accounts/views.py:177
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "User email not set, failed to send QR code"
 msgstr ""
 
@@ -405,156 +349,145 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: admin/forms.py:56 admin/templates/admin/group_list.html:15
+#: admin/forms.py:56 admin/templates/admin/group_list.html:13
 #: templates/navbar.html:30
 msgid "Groups"
 msgstr ""
 
-<<<<<<< HEAD
 #: admin/forms.py:81
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, \n"
 "                    but you can change the password using <a href='{}'>this "
 "form</a>."
-=======
-#: admin/forms.py:79
-msgid ""
-"Raw passwords are not stored, so there is no way to see\n"
-"                this user's password, but you can change the password using "
-"<a href='{}'>this form</a>."
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgstr ""
 
 #: admin/templates/admin/group_list.html:5 admin/views.py:87
-#: instances/templates/instances/settings_tab.html:63 templates/navbar.html:29
+#: instances/templates/instances/settings_tab.html:69 templates/navbar.html:29
 msgid "Users"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:13
-#: admin/templates/admin/user_list.html:16
-#: computes/templates/computes/instances.html:18
-#: instances/templates/allinstances.html:16
-#: nwfilters/templates/nwfilters.html:12 storages/templates/storage.html:87
-#: templates/search_block.html:3
-msgid "Search"
-msgstr ""
-
-#: admin/templates/admin/group_list.html:23 admin/templates/admin/logs.html:16
-#: admin/templates/admin/user_list.html:26
-#: computes/templates/computes/instances.html:57
-#: computes/templates/computes/list.html:20
-#: instances/templates/create_instance_w2.html:66
-#: interfaces/templates/interfaces.html:47 networks/templates/networks.html:46
-#: nwfilters/templates/nwfilters.html:135 secrets/templates/secrets.html:50
-#: storages/templates/storage.html:187 storages/templates/storages.html:46
+#: admin/templates/admin/group_list.html:20 admin/templates/admin/logs.html:15
+#: admin/templates/admin/user_list.html:23
+#: computes/templates/computes/instances.html:55
+#: computes/templates/computes/list.html:19
+#: instances/templates/create_instance_w2.html:67
+#: interfaces/templates/interfaces.html:48 networks/templates/networks.html:45
+#: nwfilters/templates/nwfilters.html:132 storages/templates/storage.html:187
+#: storages/templates/storages.html:45 virtsecrets/templates/secrets.html:51
 msgid "Warning"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:23
+#: admin/templates/admin/group_list.html:20
 msgid "You don't have any groups"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:31
+#: admin/templates/admin/group_list.html:28
 msgid "Group Name"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:32
-#: admin/templates/admin/user_list.html:39
-#: computes/templates/computes/instances.html:71
-#: computes/templates/computes/list.html:31
+#: admin/templates/admin/group_list.html:29
+#: admin/templates/admin/user_list.html:36
+#: computes/templates/computes/instances.html:68
+#: computes/templates/computes/list.html:30
 #: instances/templates/allinstances_index_grouped.html:12
 #: instances/templates/allinstances_index_nongrouped.html:12
-#: instances/templates/instances/settings_tab.html:343
-#: instances/templates/instances/settings_tab.html:491
+#: instances/templates/instances/settings_tab.html:355
+#: instances/templates/instances/settings_tab.html:525
 #: networks/templates/network.html:175 networks/templates/network.html:284
 #: networks/templates/network.html:332
 msgid "Actions"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:43
-#: admin/templates/admin/user_list.html:62
-#: computes/templates/computes/list.html:53 networks/templates/network.html:82
-#: nwfilters/templates/nwfilter.html:59 secrets/templates/secrets.html:74
+#: admin/templates/admin/group_list.html:40
+#: admin/templates/admin/user_list.html:59
+#: computes/templates/computes/list.html:52 networks/templates/network.html:82
+#: nwfilters/templates/nwfilter.html:59 virtsecrets/templates/secrets.html:75
 msgid "Edit"
 msgstr ""
 
 #: admin/templates/admin/logs.html:5 admin/templates/admin/logs.html:7
-#: instances/templates/instances/stats_tab.html:13 templates/navbar.html:31
+#: instances/templates/instances/stats_tab.html:12 templates/navbar.html:31
 msgid "Logs"
 msgstr ""
 
-#: admin/templates/admin/logs.html:16
+#: admin/templates/admin/logs.html:15
 msgid "You don't have any Logs"
 msgstr ""
 
-#: admin/templates/admin/logs.html:25
-#: instances/templates/instances/snapshots_tab.html:48
-#: instances/templates/instances/stats_tab.html:83
+#: admin/templates/admin/logs.html:24
+#: instances/templates/instances/snapshots_tab.html:40
+#: instances/templates/instances/stats_tab.html:86
 msgid "Date"
 msgstr ""
 
+#: admin/templates/admin/logs.html:26
+#: console/templates/console-spice-full.html:202
+#: instances/templates/allinstances_index_nongrouped.html:7
+msgid "Host"
+msgstr ""
+
 #: admin/templates/admin/logs.html:28
-#: instances/templates/instances/stats_tab.html:85
+#: instances/templates/instances/stats_tab.html:88
 msgid "Message"
 msgstr ""
 
 #: admin/templates/admin/user_form.html:21
 #: computes/templates/computes/form.html:23
-#: instances/templates/edit_instance_volume.html:124
+#: instances/templates/instances/edit_instance_volume.html:111
 #: networks/templates/add_network_qos.html:51 templates/common/form.html:22
 msgid "Save"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:26
+#: admin/templates/admin/user_list.html:23
 msgid "You don't have any user"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:34
+#: admin/templates/admin/user_list.html:31
 msgid "Username"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:35
-#: computes/templates/computes/instances.html:68
-#: computes/templates/computes/list.html:29
+#: admin/templates/admin/user_list.html:32
+#: computes/templates/computes/instances.html:65
+#: computes/templates/computes/list.html:28
 #: instances/templates/allinstances_index_grouped.html:9
 #: instances/templates/allinstances_index_nongrouped.html:9
 msgid "Status"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:36
+#: admin/templates/admin/user_list.html:33
 msgid "Staff"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:37
+#: admin/templates/admin/user_list.html:34
 msgid "Superuser"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:38
+#: admin/templates/admin/user_list.html:35
 msgid "Can Clone"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:51
-#: computes/templates/computes/instances.html:94
-#: instances/templates/allinstances_index_grouped.html:57
-#: instances/templates/allinstances_index_nongrouped.html:40
+#: admin/templates/admin/user_list.html:48
+#: computes/templates/computes/instances.html:91
+#: instances/templates/allinstances_index_grouped.html:59
+#: instances/templates/allinstances_index_nongrouped.html:41
 #: instances/templates/instance.html:19
 msgid "Active"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:53
+#: admin/templates/admin/user_list.html:50
 msgid "Blocked"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:61
+#: admin/templates/admin/user_list.html:58
 msgid "View Profile"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:64
+#: admin/templates/admin/user_list.html:61
 msgid "Block"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:66
+#: admin/templates/admin/user_list.html:63
 msgid "Unblock"
 msgstr ""
 
@@ -566,11 +499,10 @@ msgstr ""
 msgid "Update Group"
 msgstr ""
 
-#: admin/views.py:113
+#: admin/views.py:110
 msgid "Create User"
 msgstr ""
 
-<<<<<<< HEAD
 #: admin/views.py:129
 msgid "Update User"
 msgstr ""
@@ -581,17 +513,6 @@ msgid "Password changed for %(user)s"
 msgstr ""
 
 #: admin/views.py:144
-=======
-#: admin/views.py:136
-msgid "Update User"
-msgstr ""
-
-#: admin/views.py:149
-msgid "User password changed: {}"
-msgstr ""
-
-#: admin/views.py:152
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "Wrong Data Provided"
 msgstr ""
 
@@ -877,33 +798,18 @@ msgid "Other Settings"
 msgstr ""
 
 #: appsettings/views.py:38
-<<<<<<< HEAD
 #, python-format
 msgid "SASS directory path is changed. Now: %(dir)s"
 msgstr ""
 
-#: appsettings/views.py:67
+#: appsettings/views.py:70
 #, python-format
 msgid "Theme is changed. Now: %(theme)s"
 msgstr ""
 
-#: appsettings/views.py:82
+#: appsettings/views.py:85
 #, python-format
 msgid "%(setting)s is changed. Now: %(value)s"
-=======
-#, python-brace-format
-msgid "SASS directory path is changed. Now: {sass_dir.value}"
-msgstr ""
-
-#: appsettings/views.py:65
-#, python-brace-format
-msgid "Theme changed. Now: {theme}"
-msgstr ""
-
-#: appsettings/views.py:80
-#, python-brace-format
-msgid "{setting.name} is changed. Now: {setting.value}"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgstr ""
 
 #: computes/forms.py:21
@@ -934,144 +840,144 @@ msgstr ""
 msgid "Create Compute"
 msgstr ""
 
-#: computes/templates/computes/instances.html:29
-#: computes/templates/computes/list.html:49
-#: computes/templates/computes/list.html:51 computes/templates/overview.html:6
-#: computes/templates/overview.html:16 interfaces/templates/interface.html:13
-#: interfaces/templates/interfaces.html:17 networks/templates/network.html:14
+#: computes/templates/computes/instances.html:27
+#: computes/templates/computes/list.html:48
+#: computes/templates/computes/list.html:50 computes/templates/overview.html:6
+#: computes/templates/overview.html:15 interfaces/templates/interface.html:13
+#: interfaces/templates/interfaces.html:19 networks/templates/network.html:14
 #: networks/templates/networks.html:16 nwfilters/templates/nwfilter.html:14
-#: nwfilters/templates/nwfilters.html:22 secrets/templates/secrets.html:20
-#: storages/templates/storage.html:19 storages/templates/storages.html:16
+#: nwfilters/templates/nwfilters.html:20 storages/templates/storage.html:20
+#: storages/templates/storages.html:16 virtsecrets/templates/secrets.html:22
 msgid "Overview"
 msgstr ""
 
-#: computes/templates/computes/instances.html:35
-#: computes/templates/overview.html:22 interfaces/templates/interface.html:19
-#: interfaces/templates/interfaces.html:23 networks/templates/network.html:20
+#: computes/templates/computes/instances.html:33
+#: computes/templates/overview.html:21 interfaces/templates/interface.html:19
+#: interfaces/templates/interfaces.html:25 networks/templates/network.html:20
 #: networks/templates/networks.html:22 nwfilters/templates/nwfilter.html:20
-#: nwfilters/templates/nwfilters.html:28 secrets/templates/secrets.html:26
-#: storages/templates/storage.html:25 storages/templates/storages.html:4
-#: storages/templates/storages.html:6 storages/templates/storages.html:22
+#: nwfilters/templates/nwfilters.html:26 storages/templates/storage.html:26
+#: storages/templates/storages.html:4 storages/templates/storages.html:6
+#: storages/templates/storages.html:22 virtsecrets/templates/secrets.html:28
 msgid "Storages"
 msgstr ""
 
-#: computes/templates/computes/instances.html:38
-#: computes/templates/overview.html:25 interfaces/templates/interface.html:22
-#: interfaces/templates/interfaces.html:26 networks/templates/network.html:23
+#: computes/templates/computes/instances.html:36
+#: computes/templates/overview.html:24 interfaces/templates/interface.html:22
+#: interfaces/templates/interfaces.html:28 networks/templates/network.html:23
 #: networks/templates/networks.html:4 networks/templates/networks.html:6
 #: networks/templates/networks.html:25 nwfilters/templates/nwfilter.html:23
-#: nwfilters/templates/nwfilters.html:31 secrets/templates/secrets.html:29
-#: storages/templates/storage.html:28 storages/templates/storages.html:25
+#: nwfilters/templates/nwfilters.html:29 storages/templates/storage.html:29
+#: storages/templates/storages.html:25 virtsecrets/templates/secrets.html:31
 msgid "Networks"
 msgstr ""
 
-#: computes/templates/computes/instances.html:41
-#: computes/templates/overview.html:28 interfaces/templates/interface.html:25
+#: computes/templates/computes/instances.html:39
+#: computes/templates/overview.html:27 interfaces/templates/interface.html:25
 #: interfaces/templates/interfaces.html:5
 #: interfaces/templates/interfaces.html:7
-#: interfaces/templates/interfaces.html:29 networks/templates/network.html:26
+#: interfaces/templates/interfaces.html:31 networks/templates/network.html:26
 #: networks/templates/networks.html:28 nwfilters/templates/nwfilter.html:26
-#: nwfilters/templates/nwfilters.html:34 secrets/templates/secrets.html:32
-#: storages/templates/storage.html:31 storages/templates/storages.html:28
+#: nwfilters/templates/nwfilters.html:32 storages/templates/storage.html:32
+#: storages/templates/storages.html:28 virtsecrets/templates/secrets.html:34
 msgid "Interfaces"
 msgstr ""
 
-#: computes/templates/computes/instances.html:44
-#: computes/templates/overview.html:31 interfaces/templates/interface.html:28
-#: interfaces/templates/interfaces.html:32 networks/templates/network.html:29
+#: computes/templates/computes/instances.html:42
+#: computes/templates/overview.html:30 interfaces/templates/interface.html:28
+#: interfaces/templates/interfaces.html:34 networks/templates/network.html:29
 #: networks/templates/networks.html:31 nwfilters/templates/nwfilter.html:29
 #: nwfilters/templates/nwfilters.html:5 nwfilters/templates/nwfilters.html:7
-#: nwfilters/templates/nwfilters.html:37 secrets/templates/secrets.html:35
-#: storages/templates/storage.html:34 storages/templates/storages.html:31
+#: nwfilters/templates/nwfilters.html:35 storages/templates/storage.html:35
+#: storages/templates/storages.html:31 virtsecrets/templates/secrets.html:37
 msgid "NWFilters"
 msgstr ""
 
-#: computes/templates/computes/instances.html:47
-#: computes/templates/overview.html:34 interfaces/templates/interface.html:31
-#: interfaces/templates/interfaces.html:35 networks/templates/network.html:32
+#: computes/templates/computes/instances.html:45
+#: computes/templates/overview.html:33 interfaces/templates/interface.html:31
+#: interfaces/templates/interfaces.html:37 networks/templates/network.html:32
 #: networks/templates/networks.html:34 nwfilters/templates/nwfilter.html:32
-#: nwfilters/templates/nwfilters.html:40 secrets/templates/secrets.html:4
-#: secrets/templates/secrets.html:10 secrets/templates/secrets.html:38
-#: storages/templates/create_stg_block.html:124
-#: storages/templates/storage.html:37 storages/templates/storages.html:34
+#: nwfilters/templates/nwfilters.html:38
+#: storages/templates/create_stg_block.html:138
+#: storages/templates/storage.html:38 storages/templates/storages.html:34
+#: virtsecrets/templates/secrets.html:4 virtsecrets/templates/secrets.html:10
+#: virtsecrets/templates/secrets.html:40
 msgid "Secrets"
 msgstr ""
 
-#: computes/templates/computes/instances.html:58
+#: computes/templates/computes/instances.html:56
 msgid "Hypervisor doesn't have any Instances"
 msgstr ""
 
-#: computes/templates/computes/instances.html:66
-#: computes/templates/computes/list.html:28
-#: instances/templates/add_instance_volume.html:40
-#: instances/templates/add_instance_volume.html:42
+#: computes/templates/computes/instances.html:63
+#: computes/templates/computes/list.html:27
+#: instances/templates/add_instance_volume.html:44
+#: instances/templates/add_instance_volume.html:46
 #: instances/templates/allinstances_index_grouped.html:7
 #: instances/templates/allinstances_index_nongrouped.html:5
-#: instances/templates/create_instance_w2.html:77
-#: instances/templates/create_instance_w2.html:103
-#: instances/templates/create_instance_w2.html:106
-#: instances/templates/create_instance_w2.html:305
-#: instances/templates/create_instance_w2.html:307
+#: instances/templates/create_instance_w2.html:76
+#: instances/templates/create_instance_w2.html:102
+#: instances/templates/create_instance_w2.html:105
+#: instances/templates/create_instance_w2.html:304
+#: instances/templates/create_instance_w2.html:306
 #: instances/templates/create_instance_w2.html:518
 #: instances/templates/create_instance_w2.html:520
-#: instances/templates/instances/settings_tab.html:340
-#: instances/templates/instances/snapshots_tab.html:47
+#: instances/templates/instances/settings_tab.html:353
+#: instances/templates/instances/snapshots_tab.html:39
 #: interfaces/templates/create_iface_block.html:18
 #: interfaces/templates/interface.html:75
 #: networks/templates/create_net_block.html:18
 #: networks/templates/modify_ipv4_fixed_address.html:30
 #: networks/templates/modify_ipv6_fixed_address.html:30
 #: networks/templates/network.html:174 networks/templates/network.html:283
-#: nwfilters/templates/nwfilter.html:41 nwfilters/templates/nwfilters.html:56
-#: nwfilters/templates/nwfilters.html:100
-#: nwfilters/templates/nwfilters.html:102
-#: storages/templates/create_stg_block.html:42
-#: storages/templates/create_stg_block.html:71
-#: storages/templates/create_stg_block.html:100
-#: storages/templates/create_stg_block.html:165
-#: storages/templates/create_stg_block.html:214
+#: nwfilters/templates/nwfilter.html:41 nwfilters/templates/nwfilters.html:54
+#: nwfilters/templates/nwfilters.html:98 nwfilters/templates/nwfilters.html:100
+#: storages/templates/create_stg_block.html:56
+#: storages/templates/create_stg_block.html:85
+#: storages/templates/create_stg_block.html:114
+#: storages/templates/create_stg_block.html:179
+#: storages/templates/create_stg_block.html:228
 #: storages/templates/create_stg_vol_block.html:21
-#: storages/templates/storage.html:96 storages/templates/storage.html:124
-#: storages/templates/storage.html:126
+#: storages/templates/storage.html:97 storages/templates/storage.html:125
+#: storages/templates/storage.html:127
 msgid "Name"
 msgstr ""
 
-#: computes/templates/computes/instances.html:66
+#: computes/templates/computes/instances.html:63
 #: instances/templates/allinstances_index_grouped.html:7
 #: instances/templates/allinstances_index_nongrouped.html:5
-#: instances/templates/instances/settings_tab.html:782
-#: instances/templates/instances/settings_tab.html:805
+#: instances/templates/instances/settings_tab.html:811
+#: instances/templates/instances/settings_tab.html:834
 msgid "Description"
 msgstr ""
 
-#: computes/templates/computes/instances.html:69
+#: computes/templates/computes/instances.html:66
 #: instances/templates/allinstances_index_grouped.html:10
 #: instances/templates/allinstances_index_nongrouped.html:10
-#: instances/templates/create_instance_w2.html:78
-#: instances/templates/create_instance_w2.html:323
+#: instances/templates/create_instance_w2.html:77
+#: instances/templates/create_instance_w2.html:322
 #: instances/templates/create_instance_w2.html:536
-#: instances/templates/instance.html:42 instances/templates/instance.html:44
+#: instances/templates/instance.html:43 instances/templates/instance.html:45
 msgid "VCPU"
 msgstr ""
 
-#: computes/templates/computes/instances.html:70
-#: computes/templates/overview.html:82
+#: computes/templates/computes/instances.html:67
+#: computes/templates/overview.html:80
 #: instances/templates/allinstances_index_grouped.html:11
 #: instances/templates/allinstances_index_nongrouped.html:11
-#: instances/templates/instances/resize_tab.html:13
+#: instances/templates/instances/resize_tab.html:12
 msgid "Memory"
 msgstr ""
 
-#: computes/templates/computes/instances.html:96
-#: instances/templates/allinstances_index_grouped.html:58
-#: instances/templates/allinstances_index_nongrouped.html:42
+#: computes/templates/computes/instances.html:93
+#: instances/templates/allinstances_index_grouped.html:60
+#: instances/templates/allinstances_index_nongrouped.html:43
 #: instances/templates/instance.html:16
 msgid "Off"
 msgstr ""
 
-#: computes/templates/computes/instances.html:98
-#: instances/templates/allinstances_index_grouped.html:60
-#: instances/templates/allinstances_index_nongrouped.html:44
+#: computes/templates/computes/instances.html:95
+#: instances/templates/allinstances_index_grouped.html:62
+#: instances/templates/allinstances_index_nongrouped.html:45
 msgid "Suspended"
 msgstr ""
 
@@ -1080,23 +986,24 @@ msgstr ""
 msgid "Computes"
 msgstr ""
 
-#: computes/templates/computes/list.html:20
+#: computes/templates/computes/list.html:19
 msgid "You don't have any computes"
 msgstr ""
 
-#: computes/templates/computes/list.html:30 computes/templates/overview.html:92
-#: instances/templates/instances/settings_tab.html:163
-#: instances/templates/instances/settings_tab.html:248
+#: computes/templates/computes/list.html:29 computes/templates/overview.html:90
+#: instances/templates/instances/settings_tab.html:176
+#: instances/templates/instances/settings_tab.html:215
+#: instances/templates/instances/settings_tab.html:263
 msgid "Details"
 msgstr ""
 
-#: computes/templates/computes/list.html:41
+#: computes/templates/computes/list.html:40
 #: instances/templates/allinstances_index_grouped.html:28
-#: instances/templates/instances/settings_tab.html:881
+#: instances/templates/instances/settings_tab.html:906
 msgid "Connected"
 msgstr ""
 
-#: computes/templates/computes/list.html:41
+#: computes/templates/computes/list.html:40
 msgid "Not Connected"
 msgstr ""
 
@@ -1120,67 +1027,69 @@ msgstr ""
 msgid "Add new host"
 msgstr ""
 
-#: computes/templates/overview.html:42
+#: computes/templates/overview.html:40
 msgid "Basic details"
 msgstr ""
 
-#: computes/templates/overview.html:44
-#: storages/templates/create_stg_block.html:171
+#: computes/templates/overview.html:42
+#: instances/templates/instances/info_tab.html:5
+#: storages/templates/create_stg_block.html:185
 msgid "Hostname"
 msgstr ""
 
-#: computes/templates/overview.html:46
+#: computes/templates/overview.html:44
 msgid "Hypervisors"
 msgstr ""
 
-#: computes/templates/overview.html:63
+#: computes/templates/overview.html:61
 msgid "more"
 msgstr ""
 
-#: computes/templates/overview.html:73
+#: computes/templates/overview.html:71
 msgid "Emulator"
 msgstr ""
 
-#: computes/templates/overview.html:75
+#: computes/templates/overview.html:73
+#: instances/templates/instances/info_tab.html:11
 msgid "Version"
 msgstr ""
 
-#: computes/templates/overview.html:77
+#: computes/templates/overview.html:75
 msgid "Qemu"
 msgstr ""
 
-#: computes/templates/overview.html:79
+#: computes/templates/overview.html:77
 msgid "Libvirt"
 msgstr ""
 
-#: computes/templates/overview.html:84
+#: computes/templates/overview.html:82
 #: instances/templates/create_instance_w1.html:36
-#: instances/templates/create_instance_w1.html:52
+#: instances/templates/create_instance_w1.html:50
 msgid "Architecture"
 msgstr ""
 
-#: computes/templates/overview.html:86
+#: computes/templates/overview.html:84
 msgid "Logical CPUs"
 msgstr ""
 
-#: computes/templates/overview.html:88
+#: computes/templates/overview.html:86
 msgid "Processor"
 msgstr ""
 
-#: computes/templates/overview.html:90
+#: computes/templates/overview.html:88
 msgid "Connection"
 msgstr ""
 
-#: computes/templates/overview.html:96
-#: instances/templates/edit_instance_volume.html:22
+#: computes/templates/overview.html:94
+#: instances/templates/instances/edit_instance_volume.html:25
 msgid "Performance"
 msgstr ""
 
-#: computes/templates/overview.html:102
+#: computes/templates/overview.html:100
 msgid "CPU Utilization"
 msgstr ""
 
-#: computes/templates/overview.html:111
+#: computes/templates/overview.html:109
 msgid "RAM Utilization"
 msgstr ""
 
@@ -1221,11 +1130,6 @@ msgstr ""
 msgid "File API is not supported"
 msgstr ""
 
-#: console/templates/console-spice-full.html:202
-#: instances/templates/allinstances_index_nongrouped.html:7
-msgid "Host"
-msgstr ""
-
 #: console/templates/console-spice-full.html:204
 msgid "Port"
 msgstr ""
@@ -1238,7 +1142,7 @@ msgstr ""
 #: interfaces/templates/interface.html:59 networks/templates/network.html:49
 #: networks/templates/network.html:119 networks/templates/network.html:125
 #: networks/templates/network.html:231 networks/templates/network.html:237
-#: storages/templates/storage.html:60
+#: storages/templates/storage.html:62
 msgid "Start"
 msgstr ""
 
@@ -1254,6 +1158,20 @@ msgstr ""
 msgid "Loading"
 msgstr ""
 
+#: console/views.py:52
+msgid ""
+"User does not have permission to access console or host/instance not exist"
+msgstr ""
+
+#: console/views.py:84
+msgid "Fail to get console. Please check the console configuration of your VM."
+msgstr ""
+
+#: console/views.py:86
+#, python-format
+msgid "Console type '%(type)s' has not support"
+msgstr ""
+
 #: instances/forms.py:37
 msgid "No Virtual Machine name has been entered"
 msgstr ""
@@ -1314,7 +1232,7 @@ msgstr ""
 msgid "created"
 msgstr ""
 
-#: instances/models.py:220
+#: instances/models.py:216
 msgid "Can access console without password"
 msgstr ""
 
@@ -1323,87 +1241,86 @@ msgid "Add Instance Network"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:18
-#: instances/templates/create_instance_w2.html:205
-#: instances/templates/instances/settings_tab.html:359
-#: instances/templates/instances/settings_tab.html:382
-#: instances/templates/instances/settings_tab.html:487
+#: instances/templates/create_instance_w2.html:182
+#: instances/templates/instances/settings_tab.html:373
+#: instances/templates/instances/settings_tab.html:409
+#: instances/templates/instances/settings_tab.html:521
 #: interfaces/templates/interface.html:45
 #: interfaces/templates/interface.html:74
-#: interfaces/templates/interfaces.html:63
+#: interfaces/templates/interfaces.html:64
 #: networks/templates/modify_ipv4_fixed_address.html:24
 #: networks/templates/network.html:172
 msgid "MAC"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:24
-#: instances/templates/create_instance_w2.html:164
-#: instances/templates/create_instance_w2.html:388
-#: instances/templates/create_instance_w2.html:605
-#: instances/templates/instances/settings_tab.html:30
-#: instances/templates/instances/settings_tab.html:394
+#: instances/templates/create_instance_w2.html:163
+#: instances/templates/create_instance_w2.html:387
+#: instances/templates/instances/settings_tab.html:36
+#: instances/templates/instances/settings_tab.html:421
 #: networks/templates/network.html:5 networks/templates/network.html:7
 #: networks/templates/network.html:107 networks/templates/network.html:218
 msgid "Network"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:37
-#: instances/templates/create_instance_w2.html:183
+#: instances/templates/create_instance_w2.html:188
 #: instances/templates/create_instance_w2.html:429
-#: instances/templates/create_instance_w2.html:642
-#: instances/templates/instances/settings_tab.html:403
+#: instances/templates/create_instance_w2.html:645
+#: instances/templates/instances/settings_tab.html:430
 #: nwfilters/templates/nwfilter.html:5 nwfilters/templates/nwfilter.html:7
 msgid "NWFilter"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:40
-#: instances/templates/add_instance_volume.html:117
+#: instances/templates/add_instance_volume.html:121
 #: instances/templates/create_inst_block.html:25
-#: instances/templates/create_instance_w2.html:158
-#: instances/templates/create_instance_w2.html:186
-#: instances/templates/create_instance_w2.html:377
+#: instances/templates/create_instance_w2.html:157
+#: instances/templates/create_instance_w2.html:191
+#: instances/templates/create_instance_w2.html:376
 #: instances/templates/create_instance_w2.html:432
 #: instances/templates/create_instance_w2.html:580
 #: instances/templates/create_instance_w2.html:599
-#: instances/templates/create_instance_w2.html:645
-#: instances/templates/instances/access_tab.html:135
-#: instances/templates/instances/settings_tab.html:183
-#: instances/templates/instances/settings_tab.html:407
-#: instances/templates/instances/stats_tab.html:90
+#: instances/templates/create_instance_w2.html:648
+#: instances/templates/instances/access_tab.html:123
+#: instances/templates/instances/settings_tab.html:191
+#: instances/templates/instances/settings_tab.html:434
+#: instances/templates/instances/stats_tab.html:93
 #: interfaces/templates/interface.html:41
-#: interfaces/templates/interface.html:43 nwfilters/templates/nwfilter.html:78
-#: storages/templates/create_stg_block.html:132
-#: storages/templates/storage.html:47 storages/templates/storage.html:49
-#: storages/templates/storage.html:51
+#: interfaces/templates/interface.html:43 nwfilters/templates/nwfilter.html:73
+#: storages/templates/create_stg_block.html:146
+#: storages/templates/storage.html:49 storages/templates/storage.html:51
+#: storages/templates/storage.html:53
 msgid "None"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:49
 #: instances/templates/add_instance_owner_block.html:30
-#: instances/templates/add_instance_volume.html:89
-#: instances/templates/add_instance_volume.html:144
+#: instances/templates/add_instance_volume.html:93
+#: instances/templates/add_instance_volume.html:148
 #: instances/templates/create_flav_block.html:25
 #: instances/templates/create_inst_block.html:34
-#: instances/templates/create_instance_w2.html:269
-#: instances/templates/edit_instance_volume.html:123
-#: instances/templates/instances/settings_tab.html:428
-#: interfaces/templates/create_iface_block.html:135
+#: instances/templates/create_instance_w2.html:268
+#: instances/templates/instances/edit_instance_volume.html:110
+#: instances/templates/instances/settings_tab.html:455
+#: interfaces/templates/create_iface_block.html:139
 #: networks/templates/add_network_qos.html:50
 #: networks/templates/create_net_block.html:85
 #: networks/templates/modify_ipv4_fixed_address.html:44
 #: networks/templates/modify_ipv6_fixed_address.html:44
 #: nwfilters/templates/add_nwf_rule.html:25
-#: nwfilters/templates/create_nwfilter_block.html:23
-#: nwfilters/templates/nwfilters.html:80 nwfilters/templates/nwfilters.html:108
-#: secrets/templates/create_secret_block.html:54
-#: secrets/templates/secrets.html:102
-#: storages/templates/create_stg_block.html:55
-#: storages/templates/create_stg_block.html:84
-#: storages/templates/create_stg_block.html:140
-#: storages/templates/create_stg_block.html:202
-#: storages/templates/create_stg_block.html:230
+#: nwfilters/templates/create_nwfilter_block.html:25
+#: nwfilters/templates/nwfilters.html:78 nwfilters/templates/nwfilters.html:106
+#: storages/templates/create_stg_block.html:69
+#: storages/templates/create_stg_block.html:98
+#: storages/templates/create_stg_block.html:154
+#: storages/templates/create_stg_block.html:216
+#: storages/templates/create_stg_block.html:244
 #: storages/templates/create_stg_vol_block.html:28
 #: storages/templates/create_stg_vol_block.html:56
-#: storages/templates/storage.html:154
+#: storages/templates/storage.html:155
+#: virtsecrets/templates/create_secret_block.html:54
+#: virtsecrets/templates/secrets.html:103
 msgid "Close"
 msgstr ""
 
@@ -1412,8 +1329,8 @@ msgid "Add Instance Owner"
 msgstr ""
 
 #: instances/templates/add_instance_volume.html:3
-#: instances/templates/add_instance_volume.html:90
-#: instances/templates/add_instance_volume.html:145
+#: instances/templates/add_instance_volume.html:94
+#: instances/templates/add_instance_volume.html:149
 msgid "Add Volume"
 msgstr ""
 
@@ -1421,72 +1338,73 @@ msgstr ""
 msgid "Add Instance Volume"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:18
+#: instances/templates/add_instance_volume.html:19
 msgid "New Disk"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:21
+#: instances/templates/add_instance_volume.html:24
 msgid "Existing Disk"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:28
-#: instances/templates/add_instance_volume.html:98
+#: instances/templates/add_instance_volume.html:32
+#: instances/templates/add_instance_volume.html:102
 msgid "Volume parameters"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:30
-#: instances/templates/add_instance_volume.html:100
-#: instances/templates/create_instance_w2.html:149
+#: instances/templates/add_instance_volume.html:34
+#: instances/templates/add_instance_volume.html:104
+#: instances/templates/create_instance_w2.html:148
 #: instances/templates/create_instance_w2.html:591
-#: instances/templates/instances/settings_tab.html:237
+#: instances/templates/instances/settings_tab.html:252
 #: storages/templates/storage.html:4 storages/templates/storage.html:9
 msgid "Storage"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:46
-#: storages/templates/create_stg_block.html:183
-#: storages/templates/storage.html:99 storages/templates/storage.html:137
+#: instances/templates/add_instance_volume.html:50
+#: storages/templates/create_stg_block.html:197
+#: storages/templates/storage.html:100 storages/templates/storage.html:138
 msgid "Format"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:56
-#: storages/templates/storage.html:52 storages/templates/storage.html:98
-#: storages/templates/storages.html:62
+#: instances/templates/add_instance_volume.html:60
+#: storages/templates/storage.html:54 storages/templates/storage.html:99
+#: storages/templates/storages.html:61
 msgid "Size"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:60
-#: instances/templates/create_instance_w2.html:91
+#: instances/templates/add_instance_volume.html:64
+#: instances/templates/create_instance_w2.html:90
 msgid "GB"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:63
-#: instances/templates/add_instance_volume.html:123
-#: instances/templates/edit_instance_volume.html:53
-#: instances/templates/instances/settings_tab.html:168
+#: instances/templates/add_instance_volume.html:67
+#: instances/templates/add_instance_volume.html:127
+#: instances/templates/instances/edit_instance_volume.html:89
+#: instances/templates/instances/settings_tab.html:181
+#: instances/templates/instances/settings_tab.html:220
 msgid "Bus"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:73
-#: instances/templates/add_instance_volume.html:133
+#: instances/templates/add_instance_volume.html:77
+#: instances/templates/add_instance_volume.html:137
 msgid "Cache"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:83
-#: instances/templates/instances/settings_tab.html:760
-#: storages/templates/storage.html:147
+#: instances/templates/add_instance_volume.html:87
+#: instances/templates/instances/settings_tab.html:789
+#: storages/templates/storage.html:148
 msgid "Metadata"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:103
+#: instances/templates/add_instance_volume.html:107
 msgid "Select Pool"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:114
+#: instances/templates/add_instance_volume.html:118
 msgid "Volume"
 msgstr ""
 
-#: instances/templates/allinstances.html:24
+#: instances/templates/allinstances.html:22
 msgid "Problem occurred with host"
 msgstr ""
 
@@ -1535,39 +1453,39 @@ msgid "New instance on %(host)s "
 msgstr ""
 
 #: instances/templates/create_instance_w1.html:41
-#: instances/templates/instances/settings_tab.html:49
+#: instances/templates/instances/settings_tab.html:55
 #: networks/templates/network.html:72 nwfilters/templates/nwfilter.html:49
 msgid "XML"
 msgstr ""
 
-#: instances/templates/create_instance_w1.html:62
+#: instances/templates/create_instance_w1.html:60
 msgid "Chipset"
 msgstr ""
 
-#: instances/templates/create_instance_w1.html:72
+#: instances/templates/create_instance_w1.html:70
 msgid "Next"
 msgstr ""
 
-#: instances/templates/create_instance_w1.html:89
-#: instances/templates/create_instance_w2.html:271
-#: instances/templates/create_instance_w2.html:273
+#: instances/templates/create_instance_w1.html:85
+#: instances/templates/create_instance_w2.html:270
+#: instances/templates/create_instance_w2.html:272
 #: instances/templates/create_instance_w2.html:500
 #: instances/templates/create_instance_w2.html:504
-#: instances/templates/create_instance_w2.html:713
-#: instances/templates/create_instance_w2.html:717
-#: interfaces/templates/create_iface_block.html:138
+#: instances/templates/create_instance_w2.html:716
+#: instances/templates/create_instance_w2.html:720
+#: interfaces/templates/create_iface_block.html:142
 #: networks/templates/create_net_block.html:86
 #: networks/templates/modify_ipv4_fixed_address.html:45
 #: networks/templates/modify_ipv6_fixed_address.html:45
-#: nwfilters/templates/create_nwfilter_block.html:24
-#: secrets/templates/create_secret_block.html:55
-#: storages/templates/create_stg_block.html:56
-#: storages/templates/create_stg_block.html:85
-#: storages/templates/create_stg_block.html:144
-#: storages/templates/create_stg_block.html:148
-#: storages/templates/create_stg_block.html:205
-#: storages/templates/create_stg_block.html:233
+#: nwfilters/templates/create_nwfilter_block.html:26
+#: storages/templates/create_stg_block.html:70
+#: storages/templates/create_stg_block.html:99
+#: storages/templates/create_stg_block.html:158
+#: storages/templates/create_stg_block.html:162
+#: storages/templates/create_stg_block.html:219
+#: storages/templates/create_stg_block.html:247
 #: storages/templates/create_stg_vol_block.html:57
+#: virtsecrets/templates/create_secret_block.html:55
 msgid "Create"
 msgstr ""
 
@@ -1583,113 +1501,113 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:66
-msgid "Hypervisor doesn't have any Flavors"
-msgstr ""
-
-#: instances/templates/create_instance_w2.html:71
+#: instances/templates/create_instance_w2.html:63
 msgid "Create from flavor"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:79
-#: instances/templates/create_instance_w2.html:352
+#: instances/templates/create_instance_w2.html:67
+msgid "Hypervisor doesn't have any Flavors"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:78
+#: instances/templates/create_instance_w2.html:351
 #: instances/templates/create_instance_w2.html:563
-#: instances/templates/instance.html:47
+#: instances/templates/instance.html:48
 msgid "RAM"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:80
-#: instances/templates/create_instance_w2.html:367
+#: instances/templates/create_instance_w2.html:79
+#: instances/templates/create_instance_w2.html:366
 msgid "HDD"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:90
-#: instances/templates/create_instance_w2.html:356
+#: instances/templates/create_instance_w2.html:89
+#: instances/templates/create_instance_w2.html:355
 #: instances/templates/create_instance_w2.html:567
-#: instances/templates/instance.html:47
+#: instances/templates/instance.html:48
 #: instances/templates/instances/resize_tab.html:95
-#: instances/templates/instances/resize_tab.html:108
+#: instances/templates/instances/resize_tab.html:109
 msgid "MB"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:97
+#: instances/templates/create_instance_w2.html:96
 msgid "Create Virtual Machine"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:115
-#: instances/templates/create_instance_w2.html:312
+#: instances/templates/create_instance_w2.html:114
+#: instances/templates/create_instance_w2.html:311
 #: instances/templates/create_instance_w2.html:525
 msgid "Firmware"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:127
-#: instances/templates/create_instance_w2.html:330
+#: instances/templates/create_instance_w2.html:126
+#: instances/templates/create_instance_w2.html:329
 #: instances/templates/create_instance_w2.html:542
 msgid "VCPU Config"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:130
-#: instances/templates/create_instance_w2.html:333
+#: instances/templates/create_instance_w2.html:129
+#: instances/templates/create_instance_w2.html:332
 #: instances/templates/create_instance_w2.html:545
 msgid "no-mode"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:174
+#: instances/templates/create_instance_w2.html:173
 #: instances/templates/create_instance_w2.html:402
-#: instances/templates/create_instance_w2.html:615
-#: instances/templates/edit_instance_volume.html:25
+#: instances/templates/create_instance_w2.html:618
+#: instances/templates/instances/edit_instance_volume.html:30
 msgid "Advanced"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:194
-#: instances/templates/create_instance_w2.html:631
+#: instances/templates/create_instance_w2.html:199
+#: instances/templates/create_instance_w2.html:634
 msgid "HDD cache mode"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:212
+#: instances/templates/create_instance_w2.html:211
 #: instances/templates/create_instance_w2.html:441
-#: instances/templates/create_instance_w2.html:654
+#: instances/templates/create_instance_w2.html:657
 msgid "Graphics"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:223
+#: instances/templates/create_instance_w2.html:222
 #: instances/templates/create_instance_w2.html:452
-#: instances/templates/create_instance_w2.html:665
+#: instances/templates/create_instance_w2.html:668
 msgid "Video"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:237
+#: instances/templates/create_instance_w2.html:236
 #: instances/templates/create_instance_w2.html:466
-#: instances/templates/create_instance_w2.html:679
+#: instances/templates/create_instance_w2.html:682
 msgid "Console Access"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:247
-#: instances/templates/create_instance_w2.html:249
+#: instances/templates/create_instance_w2.html:246
+#: instances/templates/create_instance_w2.html:248
 #: instances/templates/create_instance_w2.html:476
 #: instances/templates/create_instance_w2.html:478
-#: instances/templates/create_instance_w2.html:689
-#: instances/templates/create_instance_w2.html:691
+#: instances/templates/create_instance_w2.html:692
+#: instances/templates/create_instance_w2.html:694
 msgid "Console Password"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:253
+#: instances/templates/create_instance_w2.html:252
 #: instances/templates/create_instance_w2.html:482
-#: instances/templates/create_instance_w2.html:695
+#: instances/templates/create_instance_w2.html:698
 msgid "Guest Agent"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:260
+#: instances/templates/create_instance_w2.html:259
 #: instances/templates/create_instance_w2.html:489
-#: instances/templates/create_instance_w2.html:702
+#: instances/templates/create_instance_w2.html:705
 msgid "VirtIO"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:287
-#: instances/templates/instances/settings_tab.html:439
-#: instances/templates/instances/settings_tab.html:515
-#: instances/templates/instances/settings_tab.html:525
-#: instances/templates/instances/snapshots_tab.html:75
+#: instances/templates/create_instance_w2.html:286
+#: instances/templates/instances/settings_tab.html:473
+#: instances/templates/instances/settings_tab.html:549
+#: instances/templates/instances/settings_tab.html:559
+#: instances/templates/instances/snapshots_tab.html:67
 #: interfaces/templates/interface.html:60
 #: interfaces/templates/interface.html:62 networks/templates/network.html:50
 #: networks/templates/network.html:52 networks/templates/network.html:62
@@ -1697,35 +1615,35 @@ msgstr ""
 #: networks/templates/network.html:194 networks/templates/network.html:249
 #: networks/templates/network.html:298 networks/templates/network.html:303
 #: networks/templates/network.html:353 networks/templates/network.html:358
-#: nwfilters/templates/nwfilter.html:111 nwfilters/templates/nwfilter.html:151
-#: nwfilters/templates/nwfilters.html:120 secrets/templates/secrets.html:77
-#: storages/templates/storage.html:62 storages/templates/storage.html:65
-#: storages/templates/storage.html:77 storages/templates/storage.html:174
+#: nwfilters/templates/nwfilter.html:103 nwfilters/templates/nwfilter.html:143
+#: nwfilters/templates/nwfilters.html:118 storages/templates/storage.html:64
+#: storages/templates/storage.html:67 storages/templates/storage.html:79
+#: storages/templates/storage.html:175 virtsecrets/templates/secrets.html:78
 msgid "Are you sure?"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:359
+#: instances/templates/create_instance_w2.html:358
 msgid "Added Disks"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:372
+#: instances/templates/create_instance_w2.html:371
 #: instances/templates/create_instance_w2.html:575
 msgid "Select pool"
 msgstr ""
 
 #: instances/templates/create_instance_w2.html:411
-#: instances/templates/create_instance_w2.html:624
+#: instances/templates/create_instance_w2.html:627
 msgid "Disk Metadata"
 msgstr ""
 
 #: instances/templates/create_instance_w2.html:413
-#: instances/templates/create_instance_w2.html:626
+#: instances/templates/create_instance_w2.html:629
 msgid "Metadata preallocation"
 msgstr ""
 
 #: instances/templates/create_instance_w2.html:415
-#: instances/templates/create_instance_w2.html:628
-#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:360
+#: instances/templates/create_instance_w2.html:631
+#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:375
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/files.py:391
 msgid "Image"
 msgstr ""
@@ -1738,64 +1656,16 @@ msgstr ""
 msgid "Template Disk"
 msgstr ""
 
-#: instances/templates/edit_instance_volume.html:3
-msgid "Edit Volume"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:12
-msgid "Edit Instance Volume"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:19
-msgid "Virtual Disk"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:32
-msgid "Volume Path"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:38
-msgid "Readonly"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:44
-msgid "Shareable"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:63
-msgid "Serial Number"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:69
-msgid "Storage Format"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:78
-msgid "Cache mode"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:88
-msgid "IO mode"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:98
-msgid "Discard mode"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:108
-msgid "Detect zeroes"
+#: instances/templates/create_instance_w2.html:605
+msgid "Network/MAC"
 msgstr ""
 
 #: instances/templates/instance.html:22
 #: instances/templates/instance_actions.html:14
 #: instances/templates/instance_actions.html:25
 #: instances/templates/instance_actions.html:37
-#: instances/templates/instances/power_tab.html:25
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:82 instances/views.py:270
-=======
-#: instances/templates/instances/power_tab.html:82 instances/views.py:264
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:24
+#: instances/templates/instances/power_tab.html:81 instances/views.py:277
 msgid "Suspend"
 msgstr ""
 
@@ -1811,92 +1681,80 @@ msgstr ""
 msgid "Guest Agent Not Enabled & Not Connected"
 msgstr ""
 
-#: instances/templates/instance.html:50
-#: instances/templates/instances/resize_tab.html:18
-#: instances/templates/instances/settings_tab.html:16
+#: instances/templates/instance.html:51
+#: instances/templates/instances/resize_tab.html:17
+#: instances/templates/instances/settings_tab.html:22
 msgid "Disk"
 msgstr ""
 
-#: instances/templates/instance.html:57
+#: instances/templates/instance.html:59
+msgid "Show Instance OS details"
+msgstr ""
+
+#: instances/templates/instance.html:63
 msgid "Refresh instance info"
 msgstr ""
 
-#: instances/templates/instance.html:61
+#: instances/templates/instance.html:69
 msgid "quota reached"
 msgstr ""
 
-#: instances/templates/instance.html:75
+#: instances/templates/instance.html:81
 msgid "Power"
 msgstr ""
 
-#: instances/templates/instance.html:81
+#: instances/templates/instance.html:87
 msgid "Access"
 msgstr ""
 
-#: instances/templates/instance.html:94
+#: instances/templates/instance.html:100
 msgid "Snapshot"
 msgstr ""
 
-#: instances/templates/instance.html:101 templates/navbar.html:32
+#: instances/templates/instance.html:107 templates/navbar.html:32
 msgid "Settings"
 msgstr ""
 
-#: instances/templates/instance.html:107
+#: instances/templates/instance.html:113
 msgid "Stats"
 msgstr ""
 
-#: instances/templates/instance.html:113
-#: instances/templates/instances/destroy_instance_form.html:40
-#: instances/templates/instances/destroy_tab.html:18
-#: instances/templates/instances/destroy_tab.html:20
-<<<<<<< HEAD
-#: instances/templates/instances/destroy_tab.html:23 instances/views.py:312
-=======
-#: instances/templates/instances/destroy_tab.html:23 instances/views.py:306
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instance.html:119
+#: instances/templates/instances/destroy_instance_form.html:35
+#: instances/templates/instances/destroy_tab.html:17
+#: instances/templates/instances/destroy_tab.html:19
+#: instances/templates/instances/destroy_tab.html:22 instances/views.py:319
 msgid "Destroy"
 msgstr ""
 
 #: instances/templates/instance_actions.html:6
-#: instances/templates/instances/settings_tab.html:37
-#: instances/templates/instances/settings_tab.html:788
-#: instances/templates/instances/settings_tab.html:790
-#: nwfilters/templates/nwfilters.html:109
-#: nwfilters/templates/nwfilters.html:115 storages/templates/storage.html:155
-#: storages/templates/storage.html:162
+#: instances/templates/instances/settings_tab.html:43
+#: instances/templates/instances/settings_tab.html:817
+#: instances/templates/instances/settings_tab.html:819
+#: nwfilters/templates/nwfilters.html:107
+#: nwfilters/templates/nwfilters.html:113 storages/templates/storage.html:156
+#: storages/templates/storage.html:163
 msgid "Clone"
 msgstr ""
 
 #: instances/templates/instance_actions.html:10
 #: instances/templates/instance_actions.html:35
-#: instances/templates/instances/power_tab.html:47
-#: instances/templates/instances/power_tab.html:121
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:123 instances/views.py:245
-=======
-#: instances/templates/instances/power_tab.html:123 instances/views.py:239
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:46
+#: instances/templates/instances/power_tab.html:120
+#: instances/templates/instances/power_tab.html:122 instances/views.py:252
 msgid "Power On"
 msgstr ""
 
 #: instances/templates/instance_actions.html:15
-#: instances/templates/instances/power_tab.html:9
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:59 instances/views.py:261
-=======
-#: instances/templates/instances/power_tab.html:59 instances/views.py:255
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:8
+#: instances/templates/instances/power_tab.html:58 instances/views.py:268
 msgid "Power Off"
 msgstr ""
 
 #: instances/templates/instance_actions.html:16
 #: instances/templates/instance_actions.html:29
-#: instances/templates/instances/power_tab.html:14
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:66 instances/views.py:254
-=======
-#: instances/templates/instances/power_tab.html:66 instances/views.py:248
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:13
+#: instances/templates/instances/power_tab.html:65 instances/views.py:261
 msgid "Power Cycle"
 msgstr ""
 
@@ -1906,120 +1764,112 @@ msgid "VNC Console"
 msgstr ""
 
 #: instances/templates/instance_actions.html:22
-#: instances/templates/instances/power_tab.html:34
-#: instances/templates/instances/power_tab.html:93
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:108 instances/views.py:278
-=======
-#: instances/templates/instances/power_tab.html:108 instances/views.py:272
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:33
+#: instances/templates/instances/power_tab.html:92
+#: instances/templates/instances/power_tab.html:107 instances/views.py:285
 msgid "Resume"
 msgstr ""
 
 #: instances/templates/instance_actions.html:26
-#: instances/templates/instances/power_tab.html:19
-#: instances/templates/instances/power_tab.html:39
-#: instances/templates/instances/power_tab.html:74
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:100 instances/views.py:285
-=======
-#: instances/templates/instances/power_tab.html:100 instances/views.py:279
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:18
+#: instances/templates/instances/power_tab.html:38
+#: instances/templates/instances/power_tab.html:73
+#: instances/templates/instances/power_tab.html:99 instances/views.py:292
 msgid "Force Off"
 msgstr ""
 
 #: instances/templates/instance_actions.html:41
-#: instances/templates/instances/access_tab.html:9
-#: instances/templates/instances/access_tab.html:79
-#: instances/templates/instances/access_tab.html:87
-#: instances/templates/instances/access_tab.html:90
-#: instances/templates/instances/access_tab.html:94
-#: instances/templates/instances/settings_tab.html:23
+#: instances/templates/instances/access_tab.html:7
+#: instances/templates/instances/access_tab.html:67
+#: instances/templates/instances/access_tab.html:75
+#: instances/templates/instances/access_tab.html:78
+#: instances/templates/instances/access_tab.html:82
+#: instances/templates/instances/settings_tab.html:29
 msgid "Console"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:16
+#: instances/templates/instances/access_tab.html:13
 msgid "Root Password"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:31
-#: instances/templates/instances/access_tab.html:156
+#: instances/templates/instances/access_tab.html:27
+#: instances/templates/instances/access_tab.html:143
 msgid "VDI"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:39
+#: instances/templates/instances/access_tab.html:35
 #, python-format
 msgid ""
 " This action opens a new window with a %(type)s connection to the console of "
 "the instance."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:47
+#: instances/templates/instances/access_tab.html:42
 msgid "Scale"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:55
+#: instances/templates/instances/access_tab.html:48
 msgid "View Only"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:63
+#: instances/templates/instances/access_tab.html:54
 msgid "Resize Session"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:71
+#: instances/templates/instances/access_tab.html:60
 msgid "View Clipboard"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:82
+#: instances/templates/instances/access_tab.html:70
 msgid "Toggle Dropdown"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:86
-#: instances/templates/instances/access_tab.html:89
+#: instances/templates/instances/access_tab.html:74
+#: instances/templates/instances/access_tab.html:77
 msgid "Console port"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:87
+#: instances/templates/instances/access_tab.html:75
 msgid "Lite"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:90
+#: instances/templates/instances/access_tab.html:78
 msgid "Full"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:100
+#: instances/templates/instances/access_tab.html:88
 msgid "You need shut down your instance and enter a new root password."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:107
+#: instances/templates/instances/access_tab.html:95
 msgid "Enter Password"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:112
-#: instances/templates/instances/access_tab.html:115
+#: instances/templates/instances/access_tab.html:100
+#: instances/templates/instances/access_tab.html:103
 msgid "Reset Root Password"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:123
+#: instances/templates/instances/access_tab.html:111
 msgid "You need shut down your instance and choose your public key."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:142
-#: instances/templates/instances/access_tab.html:144
+#: instances/templates/instances/access_tab.html:130
+#: instances/templates/instances/access_tab.html:132
 msgid "Add Public Key"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:152
+#: instances/templates/instances/access_tab.html:140
 msgid ""
 "This action opens a remote viewer with a connection to the console of the "
 "instance."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:159
+#: instances/templates/instances/access_tab.html:145
 msgid "To download console.vv file for virt-viewer."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:160
+#: instances/templates/instances/access_tab.html:146
 msgid "Get console.vv"
 msgstr ""
 
@@ -2039,114 +1889,190 @@ msgstr ""
 msgid "This action is irreversible!"
 msgstr ""
 
-#: instances/templates/instances/destroy_instance_form.html:26
+#: instances/templates/instances/destroy_instance_form.html:24
 msgid "Remove Instance's data"
 msgstr ""
 
-#: instances/templates/instances/destroy_instance_form.html:34
+#: instances/templates/instances/destroy_instance_form.html:30
 msgid "Remove Instance's NVRAM"
 msgstr ""
 
-#: instances/templates/instances/destroy_instance_form.html:46
+#: instances/templates/instances/destroy_instance_form.html:41
 msgid "You cannot destroy instance!"
 msgstr ""
 
-#: instances/templates/instances/destroy_tab.html:8
+#: instances/templates/instances/destroy_tab.html:7
 msgid "Destroy Instance"
 msgstr ""
 
-#: instances/templates/instances/destroy_tab.html:15
+#: instances/templates/instances/destroy_tab.html:14
 msgid "This action starts remove instance process"
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:56
+#: instances/templates/instances/edit_instance_volume.html:3
+msgid "Edit Volume"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:12
+msgid "Edit Instance Volume"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:20
+msgid "Virtual Disk"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:38
+msgid "Volume Path"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:42
+msgid "Readonly"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:46
+msgid "Shareable"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:53
+msgid "Cache mode"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:61
+msgid "IO mode"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:69
+msgid "Discard mode"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:77
+msgid "Detect zeroes"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:97
+msgid "Serial Number"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:101
+msgid "Storage Format"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:111
+msgid "Are you sure to change volume properties?"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:3
+msgid "Guest Info"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:7
+msgid "OS Name"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:9
+msgid "OS Pretty-Name"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:13
+msgid "Kernel Release"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:15
+msgid "Kernel Version"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:17
+msgid "Timezone / Offset"
+msgstr ""
+
+#: instances/templates/instances/power_tab.html:55
 msgid "This action sends an ACPI shutdown signal to the instance."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:64
+#: instances/templates/instances/power_tab.html:63
 msgid ""
 "This action forcibly powers off and start the instance and may cause data "
 "corruption."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:71
-#: instances/templates/instances/power_tab.html:98
+#: instances/templates/instances/power_tab.html:70
+#: instances/templates/instances/power_tab.html:97
 msgid ""
 "This action forcibly powers off the instance and may cause data corruption."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:80
+#: instances/templates/instances/power_tab.html:79
 msgid "This action suspends the instance."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:91
+#: instances/templates/instances/power_tab.html:90
 msgid "This action restore the instance after suspend."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:106
+#: instances/templates/instances/power_tab.html:105
 msgid "Administrator blocked your instance."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:116
+#: instances/templates/instances/power_tab.html:115
 msgid "Click on Power On button to start this instance."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:120
+#: instances/templates/instances/power_tab.html:119
 msgid "Template instance cannot be started."
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:8
+#: instances/templates/instances/resize_tab.html:7
 msgid "CPU"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:29
+#: instances/templates/instances/resize_tab.html:28
 msgid "Logical host CPUs"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:31
+#: instances/templates/instances/resize_tab.html:30
 #: instances/templates/instances/resize_tab.html:95
 #: instances/templates/instances/resize_tab.html:136
 msgid "Current Allocation"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:45
-#: instances/templates/instances/resize_tab.html:108
+#: instances/templates/instances/resize_tab.html:44
+#: instances/templates/instances/resize_tab.html:109
 msgid "Maximum Allocation"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:63
+#: instances/templates/instances/resize_tab.html:62
 msgid "Logical Instance Active/Maximum CPUs"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:71
-#: instances/templates/instances/settings_tab.html:79
-#: instances/templates/instances/settings_tab.html:95
-#: networks/templates/network.html:62 storages/templates/storage.html:77
+#: instances/templates/instances/resize_tab.html:70
+#: instances/templates/instances/settings_tab.html:86
+#: instances/templates/instances/settings_tab.html:102
+#: networks/templates/network.html:62 storages/templates/storage.html:79
 msgid "Disable"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:73
+#: instances/templates/instances/resize_tab.html:72
 msgid "Constant"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:75
-#: instances/templates/instances/settings_tab.html:77
-#: instances/templates/instances/settings_tab.html:91
-#: networks/templates/network.html:60 storages/templates/storage.html:74
+#: instances/templates/instances/resize_tab.html:74
+#: instances/templates/instances/settings_tab.html:84
+#: instances/templates/instances/settings_tab.html:98
+#: networks/templates/network.html:60 storages/templates/storage.html:76
 msgid "Enable"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:84
+#: instances/templates/instances/resize_tab.html:83
 #: instances/templates/instances/resize_tab.html:124
 #: instances/templates/instances/resize_tab.html:157
 msgid "You don't have permission for resizing instance"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:93
+#: instances/templates/instances/resize_tab.html:92
 msgid "Total host memory"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:103
+#: instances/templates/instances/resize_tab.html:104
 #: instances/templates/instances/resize_tab.html:118
 msgid "Custom value"
 msgstr ""
@@ -2156,457 +2082,450 @@ msgid "Disk allocation (GB)"
 msgstr ""
 
 #: instances/templates/instances/resize_tab.html:140
-#: instances/templates/instances/settings_tab.html:269
+#: instances/templates/instances/settings_tab.html:284
 msgid "Error getting disk info"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:11
+#: instances/templates/instances/settings_tab.html:17
 msgid "Boot"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:44
-#: instances/templates/instances/settings_tab.html:621
-#: instances/templates/instances/settings_tab.html:623
+#: instances/templates/instances/settings_tab.html:50
+#: instances/templates/instances/settings_tab.html:655
+#: instances/templates/instances/settings_tab.html:657
 msgid "Migrate"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:56
+#: instances/templates/instances/settings_tab.html:62
+#: venv/lib/python3.6/site-packages/click/core.py:1351
 msgid "Options"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:72
-#: networks/templates/network.html:56 storages/templates/storage.html:69
+#: instances/templates/instances/settings_tab.html:79
+#: networks/templates/network.html:56 storages/templates/storage.html:71
 msgid "Autostart"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:75
+#: instances/templates/instances/settings_tab.html:82
 msgid "Autostart your instance when host server is power on "
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:84
+#: instances/templates/instances/settings_tab.html:91
 msgid "Boot Order"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:88
+#: instances/templates/instances/settings_tab.html:95
 msgid "Enable Boot Menu for your instance when it starts up "
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:91
+#: instances/templates/instances/settings_tab.html:98
 msgid "Show boot menu"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:95
+#: instances/templates/instances/settings_tab.html:102
 msgid "Hide boot menu"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:100
+#: instances/templates/instances/settings_tab.html:107
 msgid "Please shutdown instance to modify boot menu"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:130
+#: instances/templates/instances/settings_tab.html:137
 msgid "up: move selected devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:133
+#: instances/templates/instances/settings_tab.html:140
 msgid "down: move selected devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:139
-#: instances/templates/instances/settings_tab.html:429
+#: instances/templates/instances/settings_tab.html:146
+#: instances/templates/instances/settings_tab.html:456
 msgid "Apply"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:149
+#: instances/templates/instances/settings_tab.html:156
 msgid "Instance Media"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:152
+#: instances/templates/instances/settings_tab.html:159
 msgid "Add CD-ROM"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:169
-#: instances/templates/instances/settings_tab.html:234
+#: instances/templates/instances/settings_tab.html:182
+#: instances/templates/instances/settings_tab.html:221
+#: instances/templates/instances/settings_tab.html:249
 #: interfaces/templates/create_iface_block.html:34
-#: networks/templates/network.html:43 networks/templates/networks.html:59
-#: storages/templates/create_stg_block.html:77
+#: networks/templates/network.html:43 networks/templates/networks.html:58
+#: storages/templates/create_stg_block.html:91
 msgid "Device"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:170
+#: instances/templates/instances/settings_tab.html:183
+#: instances/templates/instances/settings_tab.html:222
 msgid "CD-ROM"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:188
-#: instances/templates/instances/settings_tab.html:190
+#: instances/templates/instances/settings_tab.html:196
+#: instances/templates/instances/settings_tab.html:198
 msgid "Mount"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:193
+#: instances/templates/instances/settings_tab.html:201
 msgid "Detach CD-ROM (remove device)"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:208
-#: instances/templates/instances/settings_tab.html:210
+#: instances/templates/instances/settings_tab.html:227
+#: instances/templates/instances/settings_tab.html:229
 msgid "Unmount"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:220
+#: instances/templates/instances/settings_tab.html:238
 msgid "There is not any CD-ROM device."
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:225
+#: instances/templates/instances/settings_tab.html:243
 msgid "Instance Volume"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:235
+#: instances/templates/instances/settings_tab.html:250
 msgid "Used"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:236
+#: instances/templates/instances/settings_tab.html:251
 msgid "Capacity"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:238
-#: instances/templates/instances/settings_tab.html:363
+#: instances/templates/instances/settings_tab.html:253
+#: instances/templates/instances/settings_tab.html:385
 msgid "Source"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:294
-#: instances/templates/instances/settings_tab.html:298
+#: instances/templates/instances/settings_tab.html:309
+#: instances/templates/instances/settings_tab.html:313
 msgid "Detach"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:294
+#: instances/templates/instances/settings_tab.html:309
 msgid "Are you sure to detach volume?"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:298
-#: instances/templates/instances/settings_tab.html:314
+#: instances/templates/instances/settings_tab.html:313
+#: instances/templates/instances/settings_tab.html:329
 msgid "Are you sure? This may lead data corruption!"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:310
+#: instances/templates/instances/settings_tab.html:325
 msgid "Are you sure to delete volume?"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:330
+#: instances/templates/instances/settings_tab.html:343
 msgid "Add a network device"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:336
+#: instances/templates/instances/settings_tab.html:349
 msgid "Network Devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:341
-#: instances/templates/instances/settings_tab.html:342
+#: instances/templates/instances/settings_tab.html:354
 msgid "Info"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:355
+#: instances/templates/instances/settings_tab.html:367
 msgid "active"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:361
-#: nwfilters/templates/nwfilter.html:75
+#: instances/templates/instances/settings_tab.html:379
+#: nwfilters/templates/nwfilter.html:71
 msgid "Filter"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:368
+#: instances/templates/instances/settings_tab.html:393
 msgid "Edit NIC"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:376
+#: instances/templates/instances/settings_tab.html:403
 msgid "Edit Instance Network"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:389
+#: instances/templates/instances/settings_tab.html:416
 msgid "Net Source"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:397
+#: instances/templates/instances/settings_tab.html:424
 #: interfaces/templates/interface.html:4 interfaces/templates/interface.html:6
 #: interfaces/templates/interface.html:39
 msgid "Interface"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:415
-#: instances/templates/instances/settings_tab.html:454
+#: instances/templates/instances/settings_tab.html:442
+#: instances/templates/instances/settings_tab.html:494
 msgid "Model"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:429
+#: instances/templates/instances/settings_tab.html:456
 msgid "Apply network changes"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:438
+#: instances/templates/instances/settings_tab.html:472
 msgid "Delete Device"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:446
-#: interfaces/templates/create_iface_block.html:71
+#: instances/templates/instances/settings_tab.html:482
+#: interfaces/templates/create_iface_block.html:72
 #: interfaces/templates/interface.html:41
 msgid "IPv4"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:450
-#: interfaces/templates/create_iface_block.html:74
+#: instances/templates/instances/settings_tab.html:488
+#: interfaces/templates/create_iface_block.html:77
 #: interfaces/templates/interface.html:43
 msgid "IPv6"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:456
-msgid "QoS"
-msgstr ""
-
-#: instances/templates/instances/settings_tab.html:468
+#: instances/templates/instances/settings_tab.html:502
 msgid ""
 "In most configurations, macvtap does not work for host to guest network "
 "communication"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:481
+#: instances/templates/instances/settings_tab.html:515
 #: networks/templates/network.html:322
 msgid "QoS Configuration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:487
+#: instances/templates/instances/settings_tab.html:521
 #: networks/templates/add_network_qos.html:18
-#: networks/templates/network.html:328 nwfilters/templates/nwfilter.html:131
+#: networks/templates/network.html:328 nwfilters/templates/nwfilter.html:123
 msgid "Direction"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:488
+#: instances/templates/instances/settings_tab.html:522
 #: networks/templates/add_network_qos.html:27
 #: networks/templates/network.html:329
 msgid "Average"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:489
+#: instances/templates/instances/settings_tab.html:523
 #: networks/templates/add_network_qos.html:34
 #: networks/templates/network.html:330
 msgid "Peak"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:490
+#: instances/templates/instances/settings_tab.html:524
 #: networks/templates/add_network_qos.html:41
 #: networks/templates/network.html:331
 msgid "Burst"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:515
+#: instances/templates/instances/settings_tab.html:549
 #: networks/templates/network.html:353
 msgid "Edit QoS"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:525
+#: instances/templates/instances/settings_tab.html:559
 #: networks/templates/network.html:358
 msgid "Delete QoS"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:541
+#: instances/templates/instances/settings_tab.html:575
 msgid "For migration both host servers must have equal settings and OS type"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:545
+#: instances/templates/instances/settings_tab.html:579
 msgid "Original host"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:551
+#: instances/templates/instances/settings_tab.html:585
 msgid "Host migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:568
+#: instances/templates/instances/settings_tab.html:602
 msgid "Live migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:576
+#: instances/templates/instances/settings_tab.html:610
 msgid "Unsafe migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:584
+#: instances/templates/instances/settings_tab.html:618
 msgid "Delete original"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:592
+#: instances/templates/instances/settings_tab.html:626
 msgid "Offline migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:600
+#: instances/templates/instances/settings_tab.html:634
 msgid "Post copy"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:608
+#: instances/templates/instances/settings_tab.html:642
 msgid "Forces CPU convergence during live migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:608
+#: instances/templates/instances/settings_tab.html:642
 msgid "Auto converge"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:616
+#: instances/templates/instances/settings_tab.html:650
 msgid "Compress instance memory for fast migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:616
+#: instances/templates/instances/settings_tab.html:650
 msgid "Compressed"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:629
+#: instances/templates/instances/settings_tab.html:663
 msgid "If you need to edit XML please Power Off the instance"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:651
+#: instances/templates/instances/settings_tab.html:685
 msgid "Instance owners"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:680
+#: instances/templates/instances/settings_tab.html:714
 msgid "To change console settings, shutdown the instance."
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:697
+#: instances/templates/instances/settings_tab.html:731
 msgid "Create a clone"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:700
+#: instances/templates/instances/settings_tab.html:734
 msgid "Clone Name"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:707
-#: instances/templates/instances/settings_tab.html:738
+#: instances/templates/instances/settings_tab.html:740
+#: instances/templates/instances/settings_tab.html:769
 msgid "Guess"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:726
+#: instances/templates/instances/settings_tab.html:758
 msgid "Network devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:736
+#: instances/templates/instances/settings_tab.html:767
 msgid "Random"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:751
+#: instances/templates/instances/settings_tab.html:781
 msgid "Storage devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:776
-#: instances/templates/instances/settings_tab.html:799
+#: instances/templates/instances/settings_tab.html:805
+#: instances/templates/instances/settings_tab.html:828
 msgid "Title"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:796
+#: instances/templates/instances/settings_tab.html:825
 msgid "To set instance template name description, shutdown the instance."
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:811
+#: instances/templates/instances/settings_tab.html:840
 msgid "Is template"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:832
+#: instances/templates/instances/settings_tab.html:861
 msgid "To set instance video model, shutdown the instance."
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:835
+#: instances/templates/instances/settings_tab.html:864
 msgid "Primary Video Model"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:839
+#: instances/templates/instances/settings_tab.html:868
 msgid "please choose"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:846
-#: instances/templates/instances/settings_tab.html:848
-#: instances/templates/instances/settings_tab.html:868
-#: instances/templates/instances/settings_tab.html:870
-#: instances/templates/instances/settings_tab.html:898
-#: secrets/templates/secrets.html:103
+#: instances/templates/instances/settings_tab.html:874
+#: instances/templates/instances/settings_tab.html:876
+#: instances/templates/instances/settings_tab.html:894
+#: instances/templates/instances/settings_tab.html:896
+#: instances/templates/instances/settings_tab.html:922
+#: virtsecrets/templates/secrets.html:104
 msgid "Set"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:856
+#: instances/templates/instances/settings_tab.html:883
 msgid "To set instance vCPUs hotpluggable"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:859
+#: instances/templates/instances/settings_tab.html:886
 msgid "vCPU Hot Plug"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:863
-#: instances/templates/instances/settings_tab.html:894
+#: instances/templates/instances/settings_tab.html:890
+#: instances/templates/instances/settings_tab.html:919
 msgid "Enabled"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:864
-#: instances/templates/instances/settings_tab.html:895
+#: instances/templates/instances/settings_tab.html:891
+#: instances/templates/instances/settings_tab.html:920
 msgid "Disabled"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:878
+#: instances/templates/instances/settings_tab.html:903
 msgid "To Enable/Disable Qemu Guest Agent. Status"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:883
+#: instances/templates/instances/settings_tab.html:908
 msgid "Disconnected"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:886
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:709
+#: instances/templates/instances/settings_tab.html:911
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:714
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:703
 msgid "Unknown"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:890
+#: instances/templates/instances/settings_tab.html:915
 msgid "Qemu Guest Agent"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:9
-#: instances/templates/instances/snapshots_tab.html:31
-#: instances/templates/instances/snapshots_tab.html:33
+#: instances/templates/instances/snapshots_tab.html:8
+#: instances/templates/instances/snapshots_tab.html:26
 msgid "Take Snapshot"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:14
+#: instances/templates/instances/snapshots_tab.html:13
 msgid "Manage Snapshots"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:22
+#: instances/templates/instances/snapshots_tab.html:20
 msgid ""
 "This may take more than an hour, depending on how much content is on your "
-"instance and how large the disk is."
+"instance and how large the disk is. It could cause web server timeout.."
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:27
+#: instances/templates/instances/snapshots_tab.html:25
 msgid "Enter Snapshot Name"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:38
-msgid "To take a snapshot please Power Off the instance."
-msgstr ""
-
-#: instances/templates/instances/snapshots_tab.html:43
+#: instances/templates/instances/snapshots_tab.html:35
 msgid "Choose a snapshot for restore/delete"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:61
+#: instances/templates/instances/snapshots_tab.html:53
 msgid "Revert to this Snapshot"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:66
+#: instances/templates/instances/snapshots_tab.html:58
 msgid "To restore snapshots you need Power Off the instance."
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:75
+#: instances/templates/instances/snapshots_tab.html:67
 msgid "Delete Snapshot"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:86
+#: instances/templates/instances/snapshots_tab.html:78
 msgid "You do not have any snapshots"
 msgstr ""
 
-#: instances/templates/instances/stats_tab.html:8
+#: instances/templates/instances/stats_tab.html:7
 msgid "Real Time"
 msgstr ""
 
-#: instances/templates/instances/stats_tab.html:23
+#: instances/templates/instances/stats_tab.html:22
 msgid "CPU Usage"
 msgstr ""
 
@@ -2614,11 +2533,11 @@ msgstr ""
 msgid "Memory Usage"
 msgstr ""
 
-#: instances/templates/instances/stats_tab.html:50
+#: instances/templates/instances/stats_tab.html:51
 msgid "Bandwidth Device"
 msgstr ""
 
-#: instances/templates/instances/stats_tab.html:65
+#: instances/templates/instances/stats_tab.html:67
 msgid "Disk I/O device"
 msgstr ""
 
@@ -2626,648 +2545,357 @@ msgstr ""
 msgid "None available device name"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:242
+#: instances/views.py:249
 msgid "Templates cannot be started."
 msgstr ""
 
-#: instances/views.py:345
+#: instances/views.py:352
 #, python-format
 msgid "Instance is migrated to %(hostname)s"
 msgstr ""
 
-#: instances/views.py:368
+#: instances/views.py:375
 msgid "Reset root password"
 msgstr ""
 
-#: instances/views.py:374 instances/views.py:403
+#: instances/views.py:381 instances/views.py:410
 msgid "Please shutdown down your instance and then try again"
 msgstr ""
 
-#: instances/views.py:395
-=======
-#: instances/views.py:236
-msgid "Templates cannot be started."
-msgstr ""
-
-#: instances/views.py:339
-#, python-format
-msgid "Migrate to %(hostname)%"
-msgstr ""
-
-#: instances/views.py:362
-msgid "Reset root password"
-msgstr ""
-
-#: instances/views.py:368 instances/views.py:397
-msgid "Please shutdown down your instance and then try again"
-msgstr ""
-
-#: instances/views.py:389
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:402
 #, python-format
 msgid "Installed new SSH public key %(keyname)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:422
-=======
-#: instances/views.py:416
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:429
 #, python-format
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize CPU of '%(instance_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:431
+#: instances/views.py:438
 #, python-format
 msgid "CPU is resized:  %(old)s to %(new)s"
 msgstr ""
 
-#: instances/views.py:459
-=======
-#: instances/views.py:425
-msgid "Resize CPU"
-msgstr ""
-
-#: instances/views.py:453
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:466
 #, python-format
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize memory of "
 "'%(instance_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:466
+#: instances/views.py:473
 #, python-format
 msgid ""
 "Memory is resized: current/max: %(old_cur)s/%(old_max)s to %(new_cur)s/"
 "%(new_max)s"
 msgstr ""
 
-#: instances/views.py:500
-=======
-#: instances/views.py:462
-msgid "Resize Memory"
-msgstr ""
-
-#: instances/views.py:491
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:507
 #, python-format
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize disks of '%(instance_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:507
+#: instances/views.py:514
 #, python-format
 msgid "Disk is resized: %(dev)s"
 msgstr ""
 
-#: instances/views.py:546
+#: instances/views.py:570
 #, python-format
 msgid "Attach new disk: %(name)s (%(format)s)"
 msgstr ""
 
-#: instances/views.py:577
-=======
-#: instances/views.py:498
-msgid "Disk resize"
-msgstr ""
-
-#: instances/views.py:537
-#, python-format
-msgid "Attach new disk %(name)s (%(format)s)"
-msgstr ""
-
-#: instances/views.py:568
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:609
 #, python-format
 msgid "Attach Existing disk: %(target_dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:635
-=======
-#: instances/views.py:624
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:667
 msgid "Volume changes are applied. But it will be activated after shutdown"
 msgstr ""
 
-#: instances/views.py:626
+#: instances/views.py:670
 msgid "Volume is changed successfully."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:639
-=======
-#: instances/views.py:627
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:671
 #, python-format
 msgid "Edit disk: %(target_dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:661
-=======
-#: instances/views.py:649
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:693
 #, python-format
 msgid "Delete disk: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:677
-=======
-#: instances/views.py:665
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:709
 #, python-format
 msgid "Detach disk: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:690
-=======
-#: instances/views.py:678
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:722
 #, python-format
 msgid "Add CD-ROM: %(target)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:703
-=======
-#: instances/views.py:691
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:735
 #, python-format
 msgid "Detach CD-ROM: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:716
-=======
-#: instances/views.py:704
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:748
 #, python-format
 msgid "Mount media: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:729
-=======
-#: instances/views.py:717
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:761
 #, python-format
 msgid "Unmount media: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:742
+#: instances/views.py:774
 #, python-format
 msgid "Create snapshot: %(snap)s"
 msgstr ""
 
-#: instances/views.py:753
+#: instances/views.py:785
 #, python-format
 msgid "Delete snapshot: %(snap)s"
-=======
-#: instances/views.py:730
-#, python-format
-msgid "New snapshot: %(name)s"
 msgstr ""
 
-#: instances/views.py:741
-#, python-format
-msgid "Delete snapshot: %(snap_name)s"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
-msgstr ""
-
-#: instances/views.py:752
+#: instances/views.py:796
 msgid "Successful revert snapshot: "
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:767
-msgid "Revert snapshot: %(snap)"
+#: instances/views.py:799
+#, python-format
+msgid "Revert snapshot: %(snap)s"
 msgstr ""
 
-#: instances/views.py:781
-=======
-#: instances/views.py:755
-msgid "Revert snapshot"
-msgstr ""
-
-#: instances/views.py:769
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:813
 #, python-format
 msgid "VCPU %(id)s is enabled=%(enabled)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:790
-=======
-#: instances/views.py:780
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:822
 #, python-format
 msgid "VCPU Hot-plug is enabled=%(status)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:800
+#: instances/views.py:832
 msgid "Set autostart"
 msgstr ""
 
-#: instances/views.py:809
+#: instances/views.py:841
 msgid "Unset autostart"
 msgstr ""
 
-#: instances/views.py:818
+#: instances/views.py:850
 msgid "Enable boot menu"
 msgstr ""
 
-#: instances/views.py:827
+#: instances/views.py:859
 msgid "Disable boot menu"
 msgstr ""
 
-#: instances/views.py:842
+#: instances/views.py:874
 msgid "Set boot order"
 msgstr ""
 
-#: instances/views.py:847
-=======
-#: instances/views.py:791
-msgid "Set autostart"
-msgstr ""
-
-#: instances/views.py:800
-msgid "Unset autostart"
-msgstr ""
-
-#: instances/views.py:809
-msgid "Enable boot menu"
-msgstr ""
-
-#: instances/views.py:818
-msgid "Disable boot menu"
-msgstr ""
-
-#: instances/views.py:833
-msgid "Set boot order"
-msgstr ""
-
-#: instances/views.py:836
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:879
 msgid "Boot menu changes applied. But it will be activated after shutdown"
 msgstr ""
 
-#: instances/views.py:838
+#: instances/views.py:882
 msgid "Boot order changed successfully."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:861
+#: instances/views.py:893
 msgid "Change instance XML"
 msgstr ""
 
-#: instances/views.py:875
+#: instances/views.py:907
 #, python-format
 msgid "Set Guest Agent: %(status)s"
 msgstr ""
 
-#: instances/views.py:885
-msgid "Set Video Model: %(model)"
-=======
-#: instances/views.py:849
-msgid "Edit XML"
-msgstr ""
-
-#: instances/views.py:863
+#: instances/views.py:917
 #, python-format
-msgid "Set Guest Agent %(status)s"
+msgid "Set Video Model: %(model)s"
 msgstr ""
 
-#: instances/views.py:873
-msgid "Set Video Model"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
-msgstr ""
-
-#: instances/views.py:882
+#: instances/views.py:926
 msgid "Change network"
 msgstr ""
 
-#: instances/views.py:895
+#: instances/views.py:949
 msgid "Network Device Config is changed. Please shutdown instance to activate."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:922
+#: instances/views.py:974
 #, python-format
 msgid "Add network: %(mac)s"
 msgstr ""
 
-#: instances/views.py:933
+#: instances/views.py:985
 #, python-format
 msgid "Delete Network: %(mac)s"
 msgstr ""
 
-#: instances/views.py:946
-=======
-#: instances/views.py:903
-msgid "Add network"
-msgstr ""
-
-#: instances/views.py:917
-msgid "Delete network"
-msgstr ""
-
-#: instances/views.py:933
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:998
 #, python-format
 msgid "Set Link State: %(state)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:966 networks/views.py:231
-=======
-#: instances/views.py:952
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1018 networks/views.py:231
 #, python-format
 msgid "%(qos_dir)s QoS is set"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:971
-=======
-#: instances/views.py:956
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1023
 #, python-format
 msgid ""
 "%(qos_dir)s QoS is set. Network XML is changed.                 Stop and "
 "start network to activate new config."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:988 networks/views.py:246
-=======
-#: instances/views.py:970
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1040 networks/views.py:246
 #, python-format
 msgid "%(qos_dir)s QoS is deleted"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:993
-=======
-#: instances/views.py:974
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1045
 #, python-format
 msgid ""
 "%(qos_dir)s QoS is deleted. Network XML is changed.                 Stop and "
 "start network to activate new config."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1012
+#: instances/views.py:1064
 msgid "Only one owner is allowed and the one already added"
 msgstr ""
 
-#: instances/views.py:1017
-=======
-#: instances/views.py:990
-msgid "Only one owner is allowed and the one already added"
-msgstr ""
-
-#: instances/views.py:995
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1069
 #, python-format
 msgid "Add owner: %(user)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1028
+#: instances/views.py:1080
 #, python-format
 msgid "Delete owner: %(userinstance_id)s "
 msgstr ""
 
-#: instances/views.py:1060
-=======
-#: instances/views.py:1006
-#, python-format
-msgid "Deleted owner %(userinstance_id)s"
-msgstr ""
-
-#: instances/views.py:1038
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1112
 #, python-format
 msgid "User '%(quota_msg)s' quota reached, cannot create '%(clone_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1066
+#: instances/views.py:1118
 #, python-format
 msgid "Instance '%(clone_name)s' already exists!"
 msgstr ""
 
-#: instances/views.py:1069
-=======
-#: instances/views.py:1044
-msgid "Instance 'clone_name' already exists!"
-msgstr ""
-
-#: instances/views.py:1047
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1121
 #, python-format
 msgid "Instance name '%(clone_name)s' contains invalid characters!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1072
-=======
-#: instances/views.py:1050
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1124
 #, python-format
 msgid "Instance MAC '%(clone_mac)s' invalid format!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1082
+#: instances/views.py:1134
 #, python-format
 msgid "Create a clone of '%(instance_name)s'"
 msgstr ""
 
-#: instances/views.py:1121
-=======
-#: instances/views.py:1060
-#, python-format
-msgid "Clone of '%(instance_name)s'"
-msgstr ""
-
-#: instances/views.py:1093
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1173
 msgid ""
 "Error setting console password. You should check that your instance have an "
 "graphic device."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1126
+#: instances/views.py:1178
 msgid "Set VNC password"
 msgstr ""
 
-#: instances/views.py:1135
+#: instances/views.py:1187
 msgid "Set VNC keymap"
 msgstr ""
 
-#: instances/views.py:1140
+#: instances/views.py:1192
 msgid "Set VNC type"
 msgstr ""
 
-#: instances/views.py:1145
+#: instances/views.py:1197
 msgid "Set VNC listen address"
 msgstr ""
 
-#: instances/views.py:1168
+#: instances/views.py:1220
 msgid "Edit options"
 msgstr ""
 
-#: instances/views.py:1182
+#: instances/views.py:1234
 msgid "Send console.vv file"
 msgstr ""
 
-#: instances/views.py:1243 instances/views.py:1337
+#: instances/views.py:1295 instances/views.py:1389
 msgid "A virtual machine with this name already exists"
 msgstr ""
 
-#: instances/views.py:1320
+#: instances/views.py:1372
 msgid "You haven't defined any storage pools"
 msgstr ""
 
-#: instances/views.py:1322
-msgid "You haven't defined any network pools"
-msgstr ""
-
-#: instances/views.py:1339
-msgid "There is an instance with same name. Remove it and try again!"
-msgstr ""
-
-#: instances/views.py:1343
-msgid "No Virtual Machine MAC has been entered"
-msgstr ""
-
 #: instances/views.py:1374
-msgid "Image has already exist. Please check volumes or change instance name"
-msgstr ""
-
-#: instances/views.py:1401
-msgid "First you need to create or select an image"
-msgstr ""
-
-#: instances/views.py:1419
-msgid "Invalid cache mode"
-msgstr ""
-
-#: instances/views.py:1460
-msgid "Instance is created"
-msgstr ""
-
-#: instances/views.py:1481
-msgid "Flavor Created"
-msgstr ""
-
-#: instances/views.py:1487
-msgid "Create Flavor"
-msgstr ""
-
-#: instances/views.py:1497
-msgid "Flavor Updated"
-msgstr ""
-
-#: instances/views.py:1503
-msgid "Update Flavor"
-msgstr ""
-
-#: instances/views.py:1512
-=======
-#: instances/views.py:1096
-msgid "Set VNC password"
-msgstr ""
-
-#: instances/views.py:1104
-msgid "Set VNC keymap"
-msgstr ""
-
-#: instances/views.py:1109
-msgid "Set VNC type"
-msgstr ""
-
-#: instances/views.py:1114
-msgid "Set VNC listen address"
-msgstr ""
-
-#: instances/views.py:1137
-msgid "Edit options"
-msgstr ""
-
-#: instances/views.py:1151
-msgid "Send console.vv file"
-msgstr ""
-
-#: instances/views.py:1206 instances/views.py:1298
-msgid "A virtual machine with this name already exists"
-msgstr ""
-
-#: instances/views.py:1281
-msgid "You haven't defined any storage pools"
-msgstr ""
-
-#: instances/views.py:1283
 msgid "You haven't defined any network pools"
 msgstr ""
 
-#: instances/views.py:1300
+#: instances/views.py:1391
 msgid "There is an instance with same name. Remove it and try again!"
 msgstr ""
 
-#: instances/views.py:1304
+#: instances/views.py:1395
 msgid "No Virtual Machine MAC has been entered"
 msgstr ""
 
-#: instances/views.py:1327
+#: instances/views.py:1426
 msgid "Image has already exist. Please check volumes or change instance name"
 msgstr ""
 
-#: instances/views.py:1347
+#: instances/views.py:1453
 msgid "First you need to create or select an image"
 msgstr ""
 
-#: instances/views.py:1365
+#: instances/views.py:1471
 msgid "Invalid cache mode"
 msgstr ""
 
-#: instances/views.py:1402
+#: instances/views.py:1512
 msgid "Instance is created"
 msgstr ""
 
-#: instances/views.py:1423
+#: instances/views.py:1533
 msgid "Flavor Created"
 msgstr ""
 
-#: instances/views.py:1431
+#: instances/views.py:1539
 msgid "Create Flavor"
 msgstr ""
 
-#: instances/views.py:1442
+#: instances/views.py:1549
 msgid "Flavor Updated"
 msgstr ""
 
-#: instances/views.py:1450
+#: instances/views.py:1555
 msgid "Update Flavor"
 msgstr ""
 
-#: instances/views.py:1460
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1564
 msgid "Flavor Deleted"
 msgstr ""
 
@@ -3333,12 +2961,12 @@ msgstr ""
 
 #: interfaces/templates/create_iface_block.html:44
 #: interfaces/templates/interface.html:76
-#: interfaces/templates/interfaces.html:62
-#: storages/templates/create_stg_block.html:35
-#: storages/templates/create_stg_block.html:64
-#: storages/templates/create_stg_block.html:93
-#: storages/templates/create_stg_block.html:158
-#: storages/templates/storages.html:60
+#: interfaces/templates/interfaces.html:63
+#: storages/templates/create_stg_block.html:49
+#: storages/templates/create_stg_block.html:78
+#: storages/templates/create_stg_block.html:107
+#: storages/templates/create_stg_block.html:172
+#: storages/templates/storages.html:59
 msgid "Type"
 msgstr ""
 
@@ -3366,43 +2994,43 @@ msgstr ""
 msgid "Delay"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:82
+#: interfaces/templates/create_iface_block.html:86
 msgid "IPv4 Mode"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:85
-#: interfaces/templates/create_iface_block.html:112
+#: interfaces/templates/create_iface_block.html:89
+#: interfaces/templates/create_iface_block.html:116
 #: networks/templates/network.html:109 networks/templates/network.html:220
 msgid "DHCP"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:86
-#: interfaces/templates/create_iface_block.html:113
+#: interfaces/templates/create_iface_block.html:90
+#: interfaces/templates/create_iface_block.html:117
 msgid "Static"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:87
-#: interfaces/templates/create_iface_block.html:111
+#: interfaces/templates/create_iface_block.html:91
+#: interfaces/templates/create_iface_block.html:115
 msgid "No configuration"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:92
+#: interfaces/templates/create_iface_block.html:96
 msgid "IPv4 Address"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:98
+#: interfaces/templates/create_iface_block.html:102
 msgid "IPv4 Gateway"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:108
+#: interfaces/templates/create_iface_block.html:112
 msgid "IPv6 Mode"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:118
+#: interfaces/templates/create_iface_block.html:122
 msgid "IPv6 Address"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:124
+#: interfaces/templates/create_iface_block.html:128
 msgid "IPv6 Gateway"
 msgstr ""
 
@@ -3420,12 +3048,12 @@ msgstr ""
 
 #: interfaces/templates/interface.html:55
 #: interfaces/templates/interface.html:78 networks/templates/network.html:45
-#: storages/templates/storage.html:56
+#: storages/templates/storage.html:58
 msgid "State"
 msgstr ""
 
 #: interfaces/templates/interface.html:62 networks/templates/network.html:52
-#: storages/templates/storage.html:64
+#: storages/templates/storage.html:66
 msgid "Stop"
 msgstr ""
 
@@ -3437,7 +3065,7 @@ msgstr ""
 msgid "Speed"
 msgstr ""
 
-#: interfaces/templates/interfaces.html:47
+#: interfaces/templates/interfaces.html:48
 msgid "Hypervisor doesn't have any Interfaces"
 msgstr ""
 
@@ -3446,14 +3074,18 @@ msgid "user"
 msgstr ""
 
 #: logs/models.py:6
-msgid "instance"
+msgid "host"
 msgstr ""
 
 #: logs/models.py:7
-msgid "message"
+msgid "instance"
 msgstr ""
 
 #: logs/models.py:8
+msgid "message"
+msgstr ""
+
+#: logs/models.py:9
 msgid "date"
 msgstr ""
 
@@ -3524,8 +3156,8 @@ msgid "Add New Network"
 msgstr ""
 
 #: networks/templates/create_net_block.html:20
-#: storages/templates/create_stg_block.html:44
-#: storages/templates/create_stg_block.html:73
+#: storages/templates/create_stg_block.html:58
+#: storages/templates/create_stg_block.html:87
 msgid "default"
 msgstr ""
 
@@ -3647,12 +3279,12 @@ msgid "IPv4 Fixed Addresses"
 msgstr ""
 
 #: networks/templates/network.html:158 networks/templates/network.html:268
-#: nwfilters/templates/nwfilters.html:85
+#: nwfilters/templates/nwfilters.html:83
 msgid "Show"
 msgstr ""
 
-#: networks/templates/network.html:166 networks/templates/network.html:276
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:395
+#: networks/templates/network.html:165 networks/templates/network.html:275
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:403
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:377
 msgid "Clear"
 msgstr ""
@@ -3677,11 +3309,11 @@ msgstr ""
 msgid "IPv6 Fixed Addresses"
 msgstr ""
 
-#: networks/templates/networks.html:46
+#: networks/templates/networks.html:45
 msgid "Hypervisor doesn't have any Network"
 msgstr ""
 
-#: networks/templates/networks.html:61
+#: networks/templates/networks.html:60
 msgid "Forward"
 msgstr ""
 
@@ -3693,7 +3325,6 @@ msgstr ""
 msgid "Please enter bridge/dev name"
 msgstr ""
 
-<<<<<<< HEAD
 #: networks/views.py:57
 msgid "For libvirt, the IPv6 network prefix must be /64"
 msgstr ""
@@ -3718,34 +3349,10 @@ msgid "%(family)s DHCP Range is Changed."
 msgstr ""
 
 #: networks/views.py:210
-=======
-#: networks/views.py:56
-msgid "For libvirt, the IPv6 network prefix must be /64"
-msgstr ""
-
-#: networks/views.py:126
-msgid "Unknown Network Family"
-msgstr ""
-
-#: networks/views.py:176
-msgid "{family.upper()} Fixed Address Operation Completed."
-msgstr ""
-
-#: networks/views.py:186
-msgid "{family.upper()} Fixed Address is Deleted."
-msgstr ""
-
-#: networks/views.py:194
-msgid "{family.upper()} DHCP Range is Changed."
-msgstr ""
-
-#: networks/views.py:203
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid ""
 "Network XML is changed. \\Stop and start network to activate new config."
 msgstr ""
 
-<<<<<<< HEAD
 #: networks/views.py:215
 msgid "Network XML is changed."
 msgstr ""
@@ -3762,34 +3369,6 @@ msgstr ""
 msgid ""
 "%(qos_dir)s QoS is deleted. Network XML is changed.                         "
 "Stop and start network to activate new config"
-=======
-#: networks/views.py:205
-msgid "Network XML is changed."
-msgstr ""
-
-#: networks/views.py:218
-msgid "{qos_dir.capitalize()} QoS is set. Network XML is changed."
-msgstr ""
-
-#: networks/views.py:219
-msgid "Stop and start network to activate new config"
-msgstr ""
-
-#: networks/views.py:221
-msgid "{} QoS is set"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
-msgstr ""
-
-#: networks/views.py:232
-msgid "{qos_dir.capitalize()} QoS is deleted. Network XML is changed. "
-msgstr ""
-
-#: networks/views.py:233
-msgid "Stop and start network to activate new config."
-msgstr ""
-
-#: networks/views.py:235
-msgid "{qos_dir.capitalize()} QoS is deleted"
 msgstr ""
 
 #: nwfilters/templates/add_nwf_rule.html:12
@@ -3804,8 +3383,8 @@ msgstr ""
 msgid "Create New NWFilter"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:39 nwfilters/templates/nwfilters.html:55
-#: secrets/templates/secrets.html:59
+#: nwfilters/templates/nwfilter.html:39 nwfilters/templates/nwfilters.html:53
+#: virtsecrets/templates/secrets.html:60
 msgid "UUID"
 msgstr ""
 
@@ -3813,47 +3392,46 @@ msgstr ""
 msgid "Filter References"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:100
+#: nwfilters/templates/nwfilter.html:92
 msgid "Reference"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:125
+#: nwfilters/templates/nwfilter.html:117
 msgid "Rules"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:129
+#: nwfilters/templates/nwfilter.html:121
 msgid "Rule"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:130
+#: nwfilters/templates/nwfilter.html:122
 msgid "Action Type"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:132
+#: nwfilters/templates/nwfilter.html:124
 msgid "Priority"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:133
+#: nwfilters/templates/nwfilter.html:125
 msgid "Statematch"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:134
+#: nwfilters/templates/nwfilter.html:126
 msgid "Directives"
 msgstr ""
 
-#: nwfilters/templates/nwfilters.html:71
+#: nwfilters/templates/nwfilters.html:69
 msgid "Details of NWFilter"
 msgstr ""
 
-#: nwfilters/templates/nwfilters.html:94
+#: nwfilters/templates/nwfilters.html:92
 msgid "Clone NWFilter"
 msgstr ""
 
-#: nwfilters/templates/nwfilters.html:135
+#: nwfilters/templates/nwfilters.html:132
 msgid "Hypervisor doesn't have any NWFilters"
 msgstr ""
 
-<<<<<<< HEAD
 #: nwfilters/views.py:44
 msgid "A network filter with this name already exists"
 msgstr ""
@@ -3863,98 +3441,23 @@ msgid "A network filter with this UUID already exists"
 msgstr ""
 
 #: nwfilters/views.py:51
-=======
-#: nwfilters/views.py:41
-msgid "A network filter with this name already exists"
-msgstr ""
-
-#: nwfilters/views.py:44
-msgid "A network filter with this UUID already exists"
-msgstr ""
-
-#: nwfilters/views.py:48
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid "%(filter)s network filter is created"
 msgstr ""
 
-<<<<<<< HEAD
 #: nwfilters/views.py:60
 #, python-format
 msgid "%(filter)s network filter is deleted"
 msgstr ""
 
-#: nwfilters/views.py:76
+#: nwfilters/views.py:77
 #, python-format
 msgid "NWFilter is in use by %(instance)s. Cannot be deleted."
 msgstr ""
 
-#: nwfilters/views.py:93
+#: nwfilters/views.py:96
 #, python-format
 msgid "Cloning NWFilter %(name)s as %(clone)s"
-=======
-#: nwfilters/views.py:57
-#, python-brace-format
-msgid "Deleting NWFilter: {name}"
-msgstr ""
-
-#: nwfilters/views.py:69
-#, python-brace-format
-msgid "NWFilter is in use by {inst}. Cannot be deleted."
-msgstr ""
-
-#: nwfilters/views.py:86
-#, python-brace-format
-msgid "Cloning NWFilter {name} as {cln_name}"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:12
-msgid "Create New Secret"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:18
-msgid "Ephemeral"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:21
-#: secrets/templates/create_secret_block.html:30
-msgid "no"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:22
-#: secrets/templates/create_secret_block.html:31
-msgid "yes"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:27
-msgid "Private"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:36
-#: storages/templates/storage.html:54
-msgid "Usage"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:46
-#: secrets/templates/secrets.html:61
-msgid "Data"
-msgstr ""
-
-#: secrets/templates/secrets.html:50
-msgid "Hypervisor doesn't have any Secrets"
-msgstr ""
-
-#: secrets/templates/secrets.html:60
-msgid "Usage Type"
-msgstr ""
-
-#: secrets/templates/secrets.html:88
-msgid "Set secret value"
-msgstr ""
-
-#: secrets/templates/secrets.html:94
-msgid "Value"
 msgstr ""
 
 #: storages/forms.py:10 storages/forms.py:37
@@ -3985,64 +3488,64 @@ msgstr ""
 msgid "Create Storage Pool"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:18
+#: storages/templates/create_stg_block.html:19
 msgid "DIR"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:21
+#: storages/templates/create_stg_block.html:24
 msgid "LVM"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:23
+#: storages/templates/create_stg_block.html:29
 msgid "CEPH"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:25
+#: storages/templates/create_stg_block.html:34
 msgid "NETFS"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:27
+#: storages/templates/create_stg_block.html:39
 msgid "ISO"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:48
-#: storages/templates/create_stg_block.html:222
+#: storages/templates/create_stg_block.html:62
+#: storages/templates/create_stg_block.html:236
 msgid "Path"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:106
+#: storages/templates/create_stg_block.html:120
 msgid "Ceph User"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:112
+#: storages/templates/create_stg_block.html:126
 msgid "Ceph Pool"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:118
+#: storages/templates/create_stg_block.html:132
 msgid "Ceph Host"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:177
+#: storages/templates/create_stg_block.html:191
 msgid "Remote Path"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:186
+#: storages/templates/create_stg_block.html:200
 msgid "auto"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:187
+#: storages/templates/create_stg_block.html:201
 msgid "nfs"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:188
+#: storages/templates/create_stg_block.html:202
 msgid "glusterfs"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:189
+#: storages/templates/create_stg_block.html:203
 msgid "cifs"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:194
+#: storages/templates/create_stg_block.html:208
 msgid "Local Path"
 msgstr ""
 
@@ -4058,47 +3561,52 @@ msgstr ""
 msgid "Add New Volume"
 msgstr ""
 
-#: storages/templates/storage.html:44
+#: storages/templates/storage.html:46
 msgid "Pool name"
 msgstr ""
 
-#: storages/templates/storage.html:46
+#: storages/templates/storage.html:48
 msgid "Pool type"
 msgstr ""
 
-#: storages/templates/storage.html:48
+#: storages/templates/storage.html:50
 msgid "Pool path"
 msgstr ""
 
-#: storages/templates/storage.html:50
+#: storages/templates/storage.html:52
 msgid "Pool status"
 msgstr ""
 
-#: storages/templates/storage.html:85 storages/templates/storages.html:64
+#: storages/templates/storage.html:56
+#: virtsecrets/templates/create_secret_block.html:36
+msgid "Usage"
+msgstr ""
+
+#: storages/templates/storage.html:90 storages/templates/storages.html:63
 msgid "Volumes"
 msgstr ""
 
-#: storages/templates/storage.html:97
+#: storages/templates/storage.html:98
 msgid "Allocated"
 msgstr ""
 
-#: storages/templates/storage.html:118
+#: storages/templates/storage.html:119
 msgid "Clone image"
 msgstr ""
 
-#: storages/templates/storage.html:131
+#: storages/templates/storage.html:132
 msgid "Convert"
 msgstr ""
 
-#: storages/templates/storage.html:140
+#: storages/templates/storage.html:141
 msgid "raw"
 msgstr ""
 
-#: storages/templates/storage.html:141
+#: storages/templates/storage.html:142
 msgid "qcow"
 msgstr ""
 
-#: storages/templates/storage.html:142
+#: storages/templates/storage.html:143
 msgid "qcow2"
 msgstr ""
 
@@ -4106,11 +3614,11 @@ msgstr ""
 msgid "Hypervisor doesn't have any Volumes"
 msgstr ""
 
-#: storages/templates/storages.html:46
+#: storages/templates/storages.html:45
 msgid "Hypervisor doesn't have any Storages"
 msgstr ""
 
-#: storages/views.py:39
+#: storages/views.py:40
 msgid "Pool name already use"
 msgstr ""
 
@@ -4118,67 +3626,44 @@ msgstr ""
 msgid "You need create secret for pool"
 msgstr ""
 
-<<<<<<< HEAD
-#: storages/views.py:48
-msgid "You need input all fields for creating ceph pool"
-msgstr ""
-
-#: storages/views.py:144
-#, python-format
-msgid "Volume: %(volume)s is deleted."
-msgstr ""
-
-#: storages/views.py:149
-msgid "ISO image already exist"
-msgstr ""
-
-#: storages/views.py:153
-#, python-format
-msgid "ISO: %(file)s is uploaded."
-msgstr ""
-
-#: storages/views.py:162
-msgid "Name of volume already in use"
-msgstr ""
-
-#: storages/views.py:174
-#, python-format
-msgid "%(image)s image cloned as %(clone)s successfully"
-msgstr ""
-
-#: storages/views.py:220
-#, python-format
-msgid "Image file %(name)s is created successfully"
-=======
 #: storages/views.py:49
 msgid "You need input all fields for creating ceph pool"
 msgstr ""
 
-#: storages/views.py:132
-#, python-brace-format
-msgid "Volume: {volname} is deleted."
+#: storages/views.py:96
+msgid "Security Issues with file uploading"
 msgstr ""
 
-#: storages/views.py:137
-msgid "ISO image already exist"
-msgstr ""
-
-#: storages/views.py:141
-msgid "ISO: {request.FILES['file']} is uploaded."
+#: storages/views.py:103
+msgid "File not found. Check the path variable and filename"
 msgstr ""
 
 #: storages/views.py:150
+#, python-format
+msgid "Volume: %(vol)s is deleted."
+msgstr ""
+
+#: storages/views.py:155
+msgid "ISO image already exist"
+msgstr ""
+
+#: storages/views.py:159
+#, python-format
+msgid "ISO: %(file)s is uploaded."
+msgstr ""
+
+#: storages/views.py:168
 msgid "Name of volume already in use"
 msgstr ""
 
-#: storages/views.py:160
-msgid "{data['image']} image cloned as {name} successfully"
+#: storages/views.py:180
+#, python-format
+msgid "%(image)s image cloned as %(name)s successfully"
 msgstr ""
 
-#: storages/views.py:199
-#, python-brace-format
-msgid "Image file {name} is created successfully"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: storages/views.py:226
+#, python-format
+msgid "Image file %(name)s is created successfully"
 msgstr ""
 
 #: templates/403.html:3
@@ -4239,18 +3724,321 @@ msgstr ""
 msgid "Processing"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/bootstrap4/components.py:17
-#: venv/lib/python3.6/site-packages/bootstrap4/templates/bootstrap4/form_errors.html:3
-#: venv/lib/python3.6/site-packages/bootstrap4/templates/bootstrap4/messages.html:4
-msgid "close"
+#: templates/search_block.html:3
+msgid "Search"
 msgstr ""
 
+#: venv/lib/python3.6/site-packages/click/_termui_impl.py:496
+#, python-brace-format
+msgid "{editor}: Editing failed"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_termui_impl.py:500
+#, python-brace-format
+msgid "{editor}: Editing failed: {e}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:20
+msgid ""
+"Click will abort further execution because Python was configured to use "
+"ASCII as encoding for the environment. Consult https://click.palletsprojects."
+"com/unicode-support/ for mitigation steps."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:56
+msgid ""
+"Additional information: on this system no suitable UTF-8 locales were "
+"discovered. This most likely requires resolving by reconfiguring the locale "
+"system."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:65
+msgid ""
+"This system supports the C.UTF-8 locale which is recommended. You might be "
+"able to resolve your issue by exporting the following environment variables:"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:75
+#, python-brace-format
+msgid ""
+"This system lists some UTF-8 supporting locales that you can pick from. The "
+"following suitable locales were discovered: {locales}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:93
+msgid ""
+"Click discovered that you exported a UTF-8 locale but the locale system "
+"could not pick up from it because it does not exist. The exported locale is "
+"{locale!r} but it is not supported."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1095
+msgid "Aborted!"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1279
+#: venv/lib/python3.6/site-packages/click/decorators.py:434
+msgid "Show this message and exit."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1308
+#: venv/lib/python3.6/site-packages/click/core.py:1334
+#, python-brace-format
+msgid "(Deprecated) {text}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1375
+#, python-brace-format
+msgid "Got unexpected extra argument ({args})"
+msgid_plural "Got unexpected extra arguments ({args})"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1390
+msgid "DeprecationWarning: The command {name!r} is deprecated."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1607
+msgid "Commands"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1639
+msgid "Missing command."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1717
+msgid "No such command {name!r}."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2258
+msgid "Value must be an iterable."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2278
+#, python-brace-format
+msgid "Takes {nargs} values but 1 was given."
+msgid_plural "Takes {nargs} values but {len} were given."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2701
+#, python-brace-format
+msgid "env var: {var}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2724
+msgid "(dynamic)"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2735
+#, python-brace-format
+msgid "default: {default}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2748
+msgid "required"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/decorators.py:339
+#, python-format
+msgid "%(prog)s, version %(version)s"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/decorators.py:403
+msgid "Show the version and exit."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:43
+#: venv/lib/python3.6/site-packages/click/exceptions.py:79
+#, python-brace-format
+msgid "Error: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:71
+#, python-brace-format
+msgid "Try '{command} {option}' for help."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:120
+#, python-brace-format
+msgid "Invalid value: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:122
+#, python-brace-format
+msgid "Invalid value for {param_hint}: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:178
+msgid "Missing argument"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:180
+msgid "Missing option"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:182
+msgid "Missing parameter"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:184
+#, python-brace-format
+msgid "Missing {param_type}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:191
+#, python-brace-format
+msgid "Missing parameter: {param_name}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:211
+#, python-brace-format
+msgid "No such option: {name}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:223
+#, python-brace-format
+msgid "Did you mean {possibility}?"
+msgid_plural "(Possible options: {possibilities})"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:261
+msgid "unknown error"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:268
+msgid "Could not open file {filename!r}: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:231
+msgid "Argument {name!r} takes {nargs} values."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:413
+msgid "Option {name!r} does not take a value."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:474
+msgid "Option {name!r} requires an argument."
+msgid_plural "Option {name!r} requires {nargs} arguments."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/shell_completion.py:316
+msgid "Shell completion is not supported for Bash versions older than 4.4."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/shell_completion.py:322
+msgid "Couldn't detect Bash version, shell completion is not supported."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:161
+msgid "Repeat for confirmation"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:178
+msgid "Error: The value you entered was invalid."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:180
+#, python-brace-format
+msgid "Error: {e.message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:191
+msgid "Error: The two entered values do not match."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:247
+msgid "Error: invalid input"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:798
+msgid "Press any key to continue..."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:258
+#, python-brace-format
+msgid ""
+"Choose from:\n"
+"\t{choices}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:290
+msgid "{value!r} is not {choice}."
+msgid_plural "{value!r} is not one of {choices}."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:380
+msgid "{value!r} does not match the format {format}."
+msgid_plural "{value!r} does not match the formats {formats}."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:402
+msgid "{value!r} is not a valid {number_type}."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:458
+#, python-brace-format
+msgid "{value} is not in the range {range}."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:599
+msgid "{value!r} is not a valid boolean."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:623
+msgid "{value!r} is not a valid UUID."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:801
+msgid "file"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:803
+msgid "directory"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:805
+msgid "path"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:851
+msgid "{name} {filename!r} does not exist."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:860
+msgid "{name} {filename!r} is a file."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:868
+msgid "{name} {filename!r} is a directory."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:876
+msgid "{name} {filename!r} is not writable."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:884
+msgid "{name} {filename!r} is not readable."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:951
+#, python-brace-format
+msgid "{len_type} values are required, but {len_value} was given."
+msgid_plural "{len_type} values are required, but {len_value} were given."
+msgstr[0] ""
+msgstr[1] ""
+
 #: venv/lib/python3.6/site-packages/django/contrib/messages/apps.py:7
 #: venv2/lib/python2.7/site-packages/django/contrib/messages/apps.py:7
 msgid "Messages"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/contrib/sitemaps/apps.py:7
+#: venv/lib/python3.6/site-packages/django/contrib/sitemaps/apps.py:8
 #: venv2/lib/python2.7/site-packages/django/contrib/sitemaps/apps.py:7
 msgid "Site Maps"
 msgstr ""
@@ -4265,103 +4053,108 @@ msgstr ""
 msgid "Syndication"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/paginator.py:45
+#. Translators: String used to replace omitted page numbers in elided page
+#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10].
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:30
+msgid "…"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:51
 #: venv2/lib/python2.7/site-packages/django/core/paginator.py:43
 msgid "That page number is not an integer"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/paginator.py:47
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:53
 #: venv2/lib/python2.7/site-packages/django/core/paginator.py:45
 msgid "That page number is less than 1"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/paginator.py:52
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:58
 #: venv2/lib/python2.7/site-packages/django/core/paginator.py:50
 msgid "That page contains no results"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:31
+#: venv/lib/python3.6/site-packages/django/core/validators.py:22
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:34
 msgid "Enter a valid value."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:102
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:658
+#: venv/lib/python3.6/site-packages/django/core/validators.py:93
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:675
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:107
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:671
 msgid "Enter a valid URL."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:154
+#: venv/lib/python3.6/site-packages/django/core/validators.py:150
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:160
 msgid "Enter a valid integer."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:165
+#: venv/lib/python3.6/site-packages/django/core/validators.py:161
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:171
 msgid "Enter a valid email address."
 msgstr ""
 
 #. Translators: "letters" means latin letters: a-z and A-Z.
-#: venv/lib/python3.6/site-packages/django/core/validators.py:239
-#: venv2/lib/python2.7/site-packages/django/core/validators.py:245
+#: venv/lib/python3.6/site-packages/django/core/validators.py:262
 msgid ""
-"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+"Enter a valid “slug” consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:246
-#: venv2/lib/python2.7/site-packages/django/core/validators.py:252
+#: venv/lib/python3.6/site-packages/django/core/validators.py:269
 msgid ""
-"Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
+"Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:255
-#: venv/lib/python3.6/site-packages/django/core/validators.py:275
+#: venv/lib/python3.6/site-packages/django/core/validators.py:278
+#: venv/lib/python3.6/site-packages/django/core/validators.py:288
+#: venv/lib/python3.6/site-packages/django/core/validators.py:311
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:257
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:277
 msgid "Enter a valid IPv4 address."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:260
-#: venv/lib/python3.6/site-packages/django/core/validators.py:276
+#: venv/lib/python3.6/site-packages/django/core/validators.py:296
+#: venv/lib/python3.6/site-packages/django/core/validators.py:312
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:262
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:278
 msgid "Enter a valid IPv6 address."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:270
-#: venv/lib/python3.6/site-packages/django/core/validators.py:274
+#: venv/lib/python3.6/site-packages/django/core/validators.py:306
+#: venv/lib/python3.6/site-packages/django/core/validators.py:310
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:272
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:276
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:304
+#: venv/lib/python3.6/site-packages/django/core/validators.py:340
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:308
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1131
 msgid "Enter only digits separated by commas."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:310
+#: venv/lib/python3.6/site-packages/django/core/validators.py:346
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:314
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:342
+#: venv/lib/python3.6/site-packages/django/core/validators.py:379
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:345
 #, python-format
 msgid "Ensure this value is less than or equal to %(limit_value)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:351
+#: venv/lib/python3.6/site-packages/django/core/validators.py:388
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:354
 #, python-format
 msgid "Ensure this value is greater than or equal to %(limit_value)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:361
+#: venv/lib/python3.6/site-packages/django/core/validators.py:398
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:364
 #, python-format
 msgid ""
@@ -4373,7 +4166,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:376
+#: venv/lib/python3.6/site-packages/django/core/validators.py:413
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:379
 #, python-format
 msgid ""
@@ -4385,15 +4178,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:395
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:290
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:325
+#: venv/lib/python3.6/site-packages/django/core/validators.py:432
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:292
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:327
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:303
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:340
 msgid "Enter a number."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:397
+#: venv/lib/python3.6/site-packages/django/core/validators.py:434
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:399
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
@@ -4401,7 +4194,7 @@ msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:402
+#: venv/lib/python3.6/site-packages/django/core/validators.py:439
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:404
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
@@ -4409,7 +4202,7 @@ msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:407
+#: venv/lib/python3.6/site-packages/django/core/validators.py:444
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:409
 #, python-format
 msgid ""
@@ -4419,48 +4212,47 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:469
-#: venv2/lib/python2.7/site-packages/django/core/validators.py:463
+#: venv/lib/python3.6/site-packages/django/core/validators.py:506
 #, python-format
 msgid ""
-"File extension '%(extension)s' is not allowed. Allowed extensions are: "
-"'%(allowed_extensions)s'."
+"File extension “%(extension)s” is not allowed. Allowed extensions are: "
+"%(allowed_extensions)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:521
+#: venv/lib/python3.6/site-packages/django/core/validators.py:559
 msgid "Null characters are not allowed."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/base.py:1165
-#: venv/lib/python3.6/site-packages/django/forms/models.py:756
+#: venv/lib/python3.6/site-packages/django/db/models/base.py:1210
+#: venv/lib/python3.6/site-packages/django/forms/models.py:768
 #: venv2/lib/python2.7/site-packages/django/db/models/base.py:1209
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:749
 msgid "and"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/base.py:1167
+#: venv/lib/python3.6/site-packages/django/db/models/base.py:1212
 #: venv2/lib/python2.7/site-packages/django/db/models/base.py:1211
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:104
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:100
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:116
 #, python-format
 msgid "Value %(value)r is not a valid choice."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:105
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:101
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:117
 msgid "This field cannot be null."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:106
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:102
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:118
 msgid "This field cannot be blank."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:107
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:103
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:119
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
@@ -4468,346 +4260,340 @@ msgstr ""
 
 #. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
 #. Eg: "Title must be unique for pub_date year"
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:111
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:107
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:123
 #, python-format
 msgid ""
 "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:128
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:126
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:140
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:905
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1772
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:901
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1809
-msgid "Integer"
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:909
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1770
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:905
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1807
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:958
 #, python-format
-msgid "'%(value)s' value must be an integer."
+msgid "“%(value)s” value must be either True or False."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:984
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1850
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:978
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1878
-msgid "Big (8 byte) integer"
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:996
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:990
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:959
 #, python-format
-msgid "'%(value)s' value must be either True or False."
+msgid "“%(value)s” value must be either True, False, or None."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:997
-#, python-format
-msgid "'%(value)s' value must be either True, False, or None."
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:999
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:961
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:992
 msgid "Boolean (Either True or False)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1040
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1002
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1058
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1104
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1096
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1115
 msgid "Comma-separated integers"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1153
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1172
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1145
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+"“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD "
 "format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1155
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1298
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1174
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1319
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1147
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1290
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
+"“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid "
 "date."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1158
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1150
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1177
 msgid "Date (without time)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1296
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1317
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1288
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ] format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1300
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1321
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1292
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
 "[TZ]) but it is an invalid date/time."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1304
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1296
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1325
 msgid "Date (with time)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1452
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1475
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1444
 #, python-format
-msgid "'%(value)s' value must be a decimal number."
+msgid "“%(value)s” value must be a decimal number."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1454
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1446
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1477
 msgid "Decimal number"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1593
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1628
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1585
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
+"“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[."
 "uuuuuu] format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1596
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1588
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1631
 msgid "Duration"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1646
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1638
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1683
 msgid "Email address"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1669
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1661
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1707
 msgid "File path"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1735
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1773
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1727
 #, python-format
-msgid "'%(value)s' value must be a float."
+msgid "“%(value)s” value must be a float."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1737
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1729
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1775
 msgid "Floating point number"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1866
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1767
+#, python-format
+msgid "“%(value)s” value must be an integer."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1769
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:901
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1809
+msgid "Integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1852
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:978
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1878
+msgid "Big (8 byte) integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1867
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2130
+msgid "Small integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1875
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1893
 msgid "IPv4 address"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1897
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1906
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1924
 msgid "IP address"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1977
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1978
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2006
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1986
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1987
 #, python-format
-msgid "'%(value)s' value must be either None, True or False."
+msgid "“%(value)s” value must be either None, True or False."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1980
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1989
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2008
 msgid "Boolean (Either True, False or None)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2015
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2043
+msgid "Positive big integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2056
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2071
 msgid "Positive integer"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2028
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2069
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2083
 msgid "Positive small integer"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2042
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2083
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2096
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2074
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2130
-msgid "Small integer"
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2081
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2115
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2137
 msgid "Text"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2109
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2163
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2181
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
 "format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2111
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2165
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2183
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
 "invalid time."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2114
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2186
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2168
 msgid "Time"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2240
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2312
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2296
 msgid "URL"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2262
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2334
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2319
 msgid "Raw binary data"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2312
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2366
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2399
 #, python-format
-msgid "'%(value)s' is not a valid UUID."
+msgid "“%(value)s” is not a valid UUID."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2314
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2401
 msgid "Universally unique identifier"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:221
+#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:226
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/files.py:228
 msgid "File"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:778
+#: venv/lib/python3.6/site-packages/django/db/models/fields/json.py:18
+msgid "A JSON object"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/json.py:20
+msgid "Value must be valid JSON."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:790
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:788
 #, python-format
 msgid "%(model)s instance with %(field)s %(value)r does not exist."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:780
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:792
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:790
 msgid "Foreign Key (type determined by related field)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1007
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1045
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1029
 msgid "One-to-one relationship"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1057
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1099
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1104
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1058
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1100
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1105
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1100
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1142
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1147
 msgid "Many-to-many relationship"
 msgstr ""
 
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the label
-#: venv/lib/python3.6/site-packages/django/forms/boundfield.py:146
+#: venv/lib/python3.6/site-packages/django/forms/boundfield.py:150
 #: venv2/lib/python2.7/site-packages/django/forms/boundfield.py:181
 msgid ":?.!"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:53
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:54
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:56
 msgid "This field is required."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:245
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:247
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:258
 msgid "Enter a whole number."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:396
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:1126
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:402
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1143
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:418
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:1149
 msgid "Enter a valid date."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:420
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:1127
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:426
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1144
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:442
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:1150
 msgid "Enter a valid time."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:442
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:454
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:464
 msgid "Enter a valid date/time."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:471
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:488
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:493
 msgid "Enter a valid duration."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:472
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:489
 #, python-brace-format
 msgid "The number of days must be between {min_days} and {max_days}."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:532
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:549
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:547
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:533
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:550
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:548
 msgid "No file was submitted."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:534
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:551
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:549
 msgid "The submitted file is empty."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:536
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:553
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:551
 #, python-format
 msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
@@ -4816,21 +4602,21 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:539
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:556
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:554
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:600
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:617
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:619
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:762
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:852
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1270
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:779
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:869
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1309
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:776
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:872
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1265
@@ -4838,78 +4624,82 @@ msgstr ""
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:853
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:968
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1269
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:870
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:985
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1308
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:873
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:990
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1264
 msgid "Enter a list of values."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:969
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:986
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:991
 msgid "Enter a complete value."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:1185
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1202
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:1208
 msgid "Enter a valid UUID."
 msgstr ""
 
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1232
+msgid "Enter a valid JSON."
+msgstr ""
+
 #. Translators: This is the default suffix added to form field labels
-#: venv/lib/python3.6/site-packages/django/forms/forms.py:86
+#: venv/lib/python3.6/site-packages/django/forms/forms.py:76
 #: venv2/lib/python2.7/site-packages/django/forms/forms.py:87
 msgid ":"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/forms.py:212
+#: venv/lib/python3.6/site-packages/django/forms/forms.py:203
 #: venv2/lib/python2.7/site-packages/django/forms/forms.py:213
 #, python-format
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:91
-#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:97
-msgid "ManagementForm data is missing or has been tampered with"
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:61
+#, python-format
+msgid ""
+"ManagementForm data is missing or has been tampered with. Missing fields: "
+"%(field_names)s. You may need to file a bug report if the issue persists."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:338
-#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:355
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:370
 #, python-format
-msgid "Please submit %d or fewer forms."
-msgid_plural "Please submit %d or fewer forms."
+msgid "Please submit at most %d form."
+msgid_plural "Please submit at most %d forms."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:345
-#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:362
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:377
 #, python-format
-msgid "Please submit %d or more forms."
-msgid_plural "Please submit %d or more forms."
+msgid "Please submit at least %d form."
+msgid_plural "Please submit at least %d forms."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:371
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:373
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:405
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:412
 #: venv2/lib/python2.7/site-packages/django/forms/formsets.py:390
 #: venv2/lib/python2.7/site-packages/django/forms/formsets.py:392
 msgid "Order"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:751
+#: venv/lib/python3.6/site-packages/django/forms/models.py:763
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:744
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:755
+#: venv/lib/python3.6/site-packages/django/forms/models.py:767
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:748
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:761
+#: venv/lib/python3.6/site-packages/django/forms/models.py:773
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:754
 #, python-format
 msgid ""
@@ -4917,55 +4707,55 @@ msgid ""
 "for the %(lookup)s in %(date_field)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:770
+#: venv/lib/python3.6/site-packages/django/forms/models.py:782
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:763
 msgid "Please correct the duplicate values below."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1091
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1109
 msgid "The inline value did not match the parent instance."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1158
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1193
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1154
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1272
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1311
 #, python-format
-msgid "\"%(pk)s\" is not a valid value."
+msgid "“%(pk)s” is not a valid value."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/utils.py:162
-#: venv2/lib/python2.7/site-packages/django/forms/utils.py:172
+#: venv/lib/python3.6/site-packages/django/forms/utils.py:172
 #, python-format
 msgid ""
-"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it "
 "may be ambiguous or it may not exist."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:396
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:404
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:378
 msgid "Currently"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:710
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:715
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:704
 msgid "Yes"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:711
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:716
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:705
 msgid "No"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:788
+#. Translators: Please do not add spaces around commas.
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:805
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:851
 msgid "yes,no,maybe"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:817
 #: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:834
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:851
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:880
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:897
 #, python-format
@@ -4974,62 +4764,62 @@ msgid_plural "%(size)d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:836
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:853
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:899
 #, python-format
 msgid "%s KB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:838
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:855
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:901
 #, python-format
 msgid "%s MB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:840
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:857
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:903
 #, python-format
 msgid "%s GB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:842
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:859
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:905
 #, python-format
 msgid "%s TB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:844
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:861
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:907
 #, python-format
 msgid "%s PB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:62
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:66
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:66
 msgid "p.m."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:63
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:67
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:67
 msgid "a.m."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:68
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:72
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:72
 msgid "PM"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:69
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:73
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:73
 msgid "AM"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:150
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:146
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:158
 msgid "midnight"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:152
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:148
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:160
 msgid "noon"
 msgstr ""
@@ -5373,20 +5163,20 @@ msgstr ""
 msgid "This is not a valid IPv6 address."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/text.py:67
+#: venv/lib/python3.6/site-packages/django/utils/text.py:71
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s…"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/text.py:233
+#: venv/lib/python3.6/site-packages/django/utils/text.py:240
 #: venv2/lib/python2.7/site-packages/django/utils/text.py:251
 msgid "or"
 msgstr ""
 
 #. Translators: This string is used as a separator between list elements
-#: venv/lib/python3.6/site-packages/django/utils/text.py:252
-#: venv/lib/python3.6/site-packages/django/utils/timesince.py:83
+#: venv/lib/python3.6/site-packages/django/utils/text.py:259
+#: venv/lib/python3.6/site-packages/django/utils/timesince.py:94
 #: venv2/lib/python2.7/site-packages/django/utils/text.py:270
 #: venv2/lib/python2.7/site-packages/django/utils/timesince.py:71
 msgid ", "
@@ -5440,11 +5230,6 @@ msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/utils/timesince.py:72
-#: venv2/lib/python2.7/site-packages/django/utils/timesince.py:60
-msgid "0 minutes"
-msgstr ""
-
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:110
 #: venv2/lib/python2.7/site-packages/django/views/csrf.py:109
 msgid "Forbidden"
@@ -5456,29 +5241,27 @@ msgid "CSRF verification failed. Request aborted."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:115
-#: venv2/lib/python2.7/site-packages/django/views/csrf.py:114
 msgid ""
-"You are seeing this message because this HTTPS site requires a 'Referer "
-"header' to be sent by your Web browser, but none was sent. This header is "
+"You are seeing this message because this HTTPS site requires a “Referer "
+"header” to be sent by your Web browser, but none was sent. This header is "
 "required for security reasons, to ensure that your browser is not being "
 "hijacked by third parties."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:120
-#: venv2/lib/python2.7/site-packages/django/views/csrf.py:119
 msgid ""
-"If you have configured your browser to disable 'Referer' headers, please re-"
-"enable them, at least for this site, or for HTTPS connections, or for 'same-"
-"origin' requests."
+"If you have configured your browser to disable “Referer” headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for “same-"
+"origin” requests."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:124
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
-"including the 'Referrer-Policy: no-referrer' header, please remove them. The "
-"CSRF protection requires the 'Referer' header to do strict referer checking. "
-"If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
-"\" ...> for links to third-party sites."
+"including the “Referrer-Policy: no-referrer” header, please remove them. The "
+"CSRF protection requires the “Referer” header to do strict referer checking. "
+"If you’re concerned about privacy, use alternatives like <a rel=\"noreferrer"
+"\" …> for links to third-party sites."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:132
@@ -5490,10 +5273,9 @@ msgid ""
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:137
-#: venv2/lib/python2.7/site-packages/django/views/csrf.py:129
 msgid ""
 "If you have configured your browser to disable cookies, please re-enable "
-"them, at least for this site, or for 'same-origin' requests."
+"them, at least for this site, or for “same-origin” requests."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:142
@@ -5538,7 +5320,7 @@ msgstr ""
 msgid "No %(verbose_name_plural)s available"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:589
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:594
 #: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:669
 #, python-format
 msgid ""
@@ -5546,10 +5328,9 @@ msgid ""
 "allow_future is False."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:623
-#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:703
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:628
 #, python-format
-msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgid "Invalid date string “%(datestr)s” given format “%(format)s”"
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/detail.py:54
@@ -5559,8 +5340,7 @@ msgid "No %(verbose_name)s found matching the query"
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/list.py:67
-#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:77
-msgid "Page is not 'last', nor can it be converted to an int."
+msgid "Page is not “last”, nor can it be converted to an int."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/list.py:72
@@ -5570,9 +5350,8 @@ msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/list.py:154
-#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:172
 #, python-format
-msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgid "Empty list and “%(class_name)s.allow_empty” is False."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/static.py:40
@@ -5581,9 +5360,8 @@ msgid "Directory indexes are not allowed here."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/static.py:42
-#: venv2/lib/python2.7/site-packages/django/views/static.py:46
 #, python-format
-msgid "\"%(path)s\" does not exist"
+msgid "“%(path)s” does not exist"
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/static.py:80
@@ -5592,22 +5370,19 @@ msgstr ""
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:6
-msgid "Django: the Web framework for perfectionists with deadlines."
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:7
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:221
+msgid "The install worked successfully! Congratulations!"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:345
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:207
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:367
-msgid "The install worked successfully! Congratulations!"
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:368
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:222
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
@@ -5616,39 +5391,160 @@ msgid ""
 "URLs."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:383
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:230
 msgid "Django Documentation"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:384
-msgid "Topics, references, &amp; how-to's"
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:231
+msgid "Topics, references, &amp; how-to’s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:395
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:239
 msgid "Tutorial: A Polling App"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:396
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:240
 msgid "Get started with Django"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:407
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:248
 msgid "Django Community"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:408
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:249
 msgid "Connect, get help, or contribute"
 msgstr ""
 
+#: venv/lib/python3.6/site-packages/django_bootstrap5/components.py:20
+msgid "close"
+msgstr ""
+
 #: venv/lib/python3.6/site-packages/django_icons/renderers/image.py:217
 msgid "Icon of {}"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/qr_code/qrcode/utils.py:73
-#, python-format
-msgid "The option '%s' is not a valid option for a QR code."
+#: venv/lib/python3.6/site-packages/isort/main.py:158
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1615
+msgid "show this help message and exit"
 msgstr ""
 
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:245
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:252
+msgid ""
+"Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
+"hyphens."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:463
+#, python-format
+msgid ""
+"File extension '%(extension)s' is not allowed. Allowed extensions are: "
+"'%(allowed_extensions)s'."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:905
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1807
+#, python-format
+msgid "'%(value)s' value must be an integer."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:990
+#, python-format
+msgid "'%(value)s' value must be either True or False."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1172
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+"format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1174
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1319
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
+"date."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1317
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1321
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]) but it is an invalid date/time."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1475
+#, python-format
+msgid "'%(value)s' value must be a decimal number."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1628
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
+"uuuuuu] format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1773
+#, python-format
+msgid "'%(value)s' value must be a float."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2006
+#, python-format
+msgid "'%(value)s' value must be either None, True or False."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2163
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2165
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"invalid time."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2366
+#, python-format
+msgid "'%(value)s' is not a valid UUID."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:97
+msgid "ManagementForm data is missing or has been tampered with"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:355
+#, python-format
+msgid "Please submit %d or fewer forms."
+msgid_plural "Please submit %d or fewer forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:362
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1093
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
@@ -5658,12 +5554,44 @@ msgstr ""
 msgid "\"%(pk)s\" is not a valid value for a primary key."
 msgstr ""
 
+#: venv2/lib/python2.7/site-packages/django/forms/utils.py:172
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
 #: venv2/lib/python2.7/site-packages/django/utils/text.py:81
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
+#: venv2/lib/python2.7/site-packages/django/utils/timesince.py:60
+msgid "0 minutes"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:114
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:119
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:129
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
 #: venv2/lib/python2.7/site-packages/django/views/debug.py:520
 msgid "Welcome to Django"
 msgstr ""
@@ -5688,6 +5616,25 @@ msgid ""
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 
+#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:703
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:77
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:172
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/static.py:46
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
+
 #: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:313
 msgid "usage: "
 msgstr ""
@@ -5747,10 +5694,6 @@ msgstr ""
 msgid "optional arguments"
 msgstr ""
 
-#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1615
-msgid "show this help message and exit"
-msgstr ""
-
 #: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1621
 msgid "show program's version number and exit"
 msgstr ""
@@ -5836,6 +5779,49 @@ msgstr ""
 msgid "%s: error: %s\n"
 msgstr ""
 
+#: virtsecrets/templates/create_secret_block.html:12
+msgid "Create New Secret"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:18
+msgid "Ephemeral"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:21
+#: virtsecrets/templates/create_secret_block.html:30
+msgid "no"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:22
+#: virtsecrets/templates/create_secret_block.html:31
+msgid "yes"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:27
+msgid "Private"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:46
+#: virtsecrets/templates/secrets.html:62
+msgid "Data"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:51
+msgid "Hypervisor doesn't have any Secrets"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:61
+msgid "Usage Type"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:89
+msgid "Set secret value"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:95
+msgid "Value"
+msgstr ""
+
 #: webvirtcloud/middleware.py:18
 #, python-format
 msgid "libvirt Error - %(exception)s"
diff --git a/locale/nl/LC_MESSAGES/django.po b/locale/nl/LC_MESSAGES/django.po
index 60c21a0..78c3db7 100644
--- a/locale/nl/LC_MESSAGES/django.po
+++ b/locale/nl/LC_MESSAGES/django.po
@@ -8,11 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
 "POT-Creation-Date: 2020-11-05 09:36+0000\n"
-=======
-"POT-Creation-Date: 2020-10-23 07:53+0000\n"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -297,7 +293,6 @@ msgstr ""
 
 #: accounts/utils.py:51
 msgid "Please view HTML version of this message."
-<<<<<<< HEAD
 msgstr ""
 
 #: accounts/views.py:26
@@ -347,57 +342,6 @@ msgid "OTP QR code was emailed to user %(user)s"
 msgstr ""
 
 #: accounts/views.py:196
-=======
-msgstr ""
-
-#: accounts/views.py:26
-msgid "Profile updated"
-msgstr ""
-
-#: accounts/views.py:40
-msgid "SSH key added"
-msgstr ""
-
-#: accounts/views.py:45
-msgid "Add SSH key"
-msgstr ""
-
-#: accounts/views.py:53
-msgid "SSH key deleted"
-msgstr ""
-
-#: accounts/views.py:58
-msgid "Delete SSH key"
-msgstr ""
-
-#: accounts/views.py:86
-msgid "Password Changed"
-msgstr ""
-
-#: accounts/views.py:106
-msgid "Create User Instance"
-msgstr ""
-
-#: accounts/views.py:124
-msgid "Update User Instance"
-msgstr ""
-
-#: accounts/views.py:160
-#, python-format
-msgid "OTP Sent to %s"
-msgstr ""
-
-#: accounts/views.py:165
-msgid "Email OTP"
-msgstr ""
-
-#: accounts/views.py:175
-#, python-format
-msgid "OTP QR code was emailed to user %s"
-msgstr ""
-
-#: accounts/views.py:177
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "User email not set, failed to send QR code"
 msgstr ""
 
@@ -410,20 +354,12 @@ msgstr ""
 msgid "Groups"
 msgstr ""
 
-<<<<<<< HEAD
 #: admin/forms.py:81
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, \n"
 "                    but you can change the password using <a href='{}'>this "
 "form</a>."
-=======
-#: admin/forms.py:79
-msgid ""
-"Raw passwords are not stored, so there is no way to see\n"
-"                this user's password, but you can change the password using "
-"<a href='{}'>this form</a>."
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgstr ""
 
 #: admin/templates/admin/group_list.html:5 admin/views.py:87
@@ -570,7 +506,6 @@ msgstr ""
 msgid "Create User"
 msgstr ""
 
-<<<<<<< HEAD
 #: admin/views.py:129
 msgid "Update User"
 msgstr ""
@@ -581,17 +516,6 @@ msgid "Password changed for %(user)s"
 msgstr ""
 
 #: admin/views.py:144
-=======
-#: admin/views.py:136
-msgid "Update User"
-msgstr ""
-
-#: admin/views.py:149
-msgid "User password changed: {}"
-msgstr ""
-
-#: admin/views.py:152
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "Wrong Data Provided"
 msgstr ""
 
@@ -877,7 +801,6 @@ msgid "Other Settings"
 msgstr ""
 
 #: appsettings/views.py:38
-<<<<<<< HEAD
 #, python-format
 msgid "SASS directory path is changed. Now: %(dir)s"
 msgstr ""
@@ -890,20 +813,6 @@ msgstr ""
 #: appsettings/views.py:82
 #, python-format
 msgid "%(setting)s is changed. Now: %(value)s"
-=======
-#, python-brace-format
-msgid "SASS directory path is changed. Now: {sass_dir.value}"
-msgstr ""
-
-#: appsettings/views.py:65
-#, python-brace-format
-msgid "Theme changed. Now: {theme}"
-msgstr ""
-
-#: appsettings/views.py:80
-#, python-brace-format
-msgid "{setting.name} is changed. Now: {setting.value}"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgstr ""
 
 #: computes/forms.py:21
@@ -1791,11 +1700,7 @@ msgstr ""
 #: instances/templates/instance_actions.html:25
 #: instances/templates/instance_actions.html:37
 #: instances/templates/instances/power_tab.html:25
-<<<<<<< HEAD
 #: instances/templates/instances/power_tab.html:82 instances/views.py:270
-=======
-#: instances/templates/instances/power_tab.html:82 instances/views.py:264
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "Suspend"
 msgstr ""
 
@@ -1849,11 +1754,7 @@ msgstr ""
 #: instances/templates/instances/destroy_instance_form.html:40
 #: instances/templates/instances/destroy_tab.html:18
 #: instances/templates/instances/destroy_tab.html:20
-<<<<<<< HEAD
 #: instances/templates/instances/destroy_tab.html:23 instances/views.py:312
-=======
-#: instances/templates/instances/destroy_tab.html:23 instances/views.py:306
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "Destroy"
 msgstr ""
 
@@ -1871,32 +1772,20 @@ msgstr ""
 #: instances/templates/instance_actions.html:35
 #: instances/templates/instances/power_tab.html:47
 #: instances/templates/instances/power_tab.html:121
-<<<<<<< HEAD
 #: instances/templates/instances/power_tab.html:123 instances/views.py:245
-=======
-#: instances/templates/instances/power_tab.html:123 instances/views.py:239
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "Power On"
 msgstr ""
 
 #: instances/templates/instance_actions.html:15
 #: instances/templates/instances/power_tab.html:9
-<<<<<<< HEAD
 #: instances/templates/instances/power_tab.html:59 instances/views.py:261
-=======
-#: instances/templates/instances/power_tab.html:59 instances/views.py:255
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "Power Off"
 msgstr ""
 
 #: instances/templates/instance_actions.html:16
 #: instances/templates/instance_actions.html:29
 #: instances/templates/instances/power_tab.html:14
-<<<<<<< HEAD
 #: instances/templates/instances/power_tab.html:66 instances/views.py:254
-=======
-#: instances/templates/instances/power_tab.html:66 instances/views.py:248
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "Power Cycle"
 msgstr ""
 
@@ -1908,11 +1797,7 @@ msgstr ""
 #: instances/templates/instance_actions.html:22
 #: instances/templates/instances/power_tab.html:34
 #: instances/templates/instances/power_tab.html:93
-<<<<<<< HEAD
 #: instances/templates/instances/power_tab.html:108 instances/views.py:278
-=======
-#: instances/templates/instances/power_tab.html:108 instances/views.py:272
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "Resume"
 msgstr ""
 
@@ -1920,11 +1805,7 @@ msgstr ""
 #: instances/templates/instances/power_tab.html:19
 #: instances/templates/instances/power_tab.html:39
 #: instances/templates/instances/power_tab.html:74
-<<<<<<< HEAD
 #: instances/templates/instances/power_tab.html:100 instances/views.py:285
-=======
-#: instances/templates/instances/power_tab.html:100 instances/views.py:279
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "Force Off"
 msgstr ""
 
@@ -2626,7 +2507,6 @@ msgstr ""
 msgid "None available device name"
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:242
 msgid "Templates cannot be started."
 msgstr ""
@@ -2645,61 +2525,28 @@ msgid "Please shutdown down your instance and then try again"
 msgstr ""
 
 #: instances/views.py:395
-=======
-#: instances/views.py:236
-msgid "Templates cannot be started."
-msgstr ""
-
-#: instances/views.py:339
-#, python-format
-msgid "Migrate to %(hostname)%"
-msgstr ""
-
-#: instances/views.py:362
-msgid "Reset root password"
-msgstr ""
-
-#: instances/views.py:368 instances/views.py:397
-msgid "Please shutdown down your instance and then try again"
-msgstr ""
-
-#: instances/views.py:389
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid "Installed new SSH public key %(keyname)s"
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:422
-=======
-#: instances/views.py:416
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize CPU of '%(instance_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:431
 #, python-format
 msgid "CPU is resized:  %(old)s to %(new)s"
 msgstr ""
 
 #: instances/views.py:459
-=======
-#: instances/views.py:425
-msgid "Resize CPU"
-msgstr ""
-
-#: instances/views.py:453
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize memory of "
 "'%(instance_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:466
 #, python-format
 msgid ""
@@ -2708,19 +2555,11 @@ msgid ""
 msgstr ""
 
 #: instances/views.py:500
-=======
-#: instances/views.py:462
-msgid "Resize Memory"
-msgstr ""
-
-#: instances/views.py:491
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize disks of '%(instance_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:507
 #, python-format
 msgid "Disk is resized: %(dev)s"
@@ -2732,27 +2571,11 @@ msgid "Attach new disk: %(name)s (%(format)s)"
 msgstr ""
 
 #: instances/views.py:577
-=======
-#: instances/views.py:498
-msgid "Disk resize"
-msgstr ""
-
-#: instances/views.py:537
-#, python-format
-msgid "Attach new disk %(name)s (%(format)s)"
-msgstr ""
-
-#: instances/views.py:568
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid "Attach Existing disk: %(target_dev)s"
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:635
-=======
-#: instances/views.py:624
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "Volume changes are applied. But it will be activated after shutdown"
 msgstr ""
 
@@ -2760,70 +2583,41 @@ msgstr ""
 msgid "Volume is changed successfully."
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:639
-=======
-#: instances/views.py:627
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid "Edit disk: %(target_dev)s"
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:661
-=======
-#: instances/views.py:649
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid "Delete disk: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:677
-=======
-#: instances/views.py:665
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid "Detach disk: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:690
-=======
-#: instances/views.py:678
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid "Add CD-ROM: %(target)s"
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:703
-=======
-#: instances/views.py:691
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid "Detach CD-ROM: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:716
-=======
-#: instances/views.py:704
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid "Mount media: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:729
-=======
-#: instances/views.py:717
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid "Unmount media: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:742
 #, python-format
 msgid "Create snapshot: %(snap)s"
@@ -2832,49 +2626,26 @@ msgstr ""
 #: instances/views.py:753
 #, python-format
 msgid "Delete snapshot: %(snap)s"
-=======
-#: instances/views.py:730
-#, python-format
-msgid "New snapshot: %(name)s"
-msgstr ""
-
-#: instances/views.py:741
-#, python-format
-msgid "Delete snapshot: %(snap_name)s"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgstr ""
 
 #: instances/views.py:752
 msgid "Successful revert snapshot: "
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:767
 msgid "Revert snapshot: %(snap)"
 msgstr ""
 
 #: instances/views.py:781
-=======
-#: instances/views.py:755
-msgid "Revert snapshot"
-msgstr ""
-
-#: instances/views.py:769
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid "VCPU %(id)s is enabled=%(enabled)s"
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:790
-=======
-#: instances/views.py:780
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid "VCPU Hot-plug is enabled=%(status)s"
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:800
 msgid "Set autostart"
 msgstr ""
@@ -2896,29 +2667,6 @@ msgid "Set boot order"
 msgstr ""
 
 #: instances/views.py:847
-=======
-#: instances/views.py:791
-msgid "Set autostart"
-msgstr ""
-
-#: instances/views.py:800
-msgid "Unset autostart"
-msgstr ""
-
-#: instances/views.py:809
-msgid "Enable boot menu"
-msgstr ""
-
-#: instances/views.py:818
-msgid "Disable boot menu"
-msgstr ""
-
-#: instances/views.py:833
-msgid "Set boot order"
-msgstr ""
-
-#: instances/views.py:836
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "Boot menu changes applied. But it will be activated after shutdown"
 msgstr ""
 
@@ -2926,7 +2674,6 @@ msgstr ""
 msgid "Boot order changed successfully."
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:861
 msgid "Change instance XML"
 msgstr ""
@@ -2938,19 +2685,6 @@ msgstr ""
 
 #: instances/views.py:885
 msgid "Set Video Model: %(model)"
-=======
-#: instances/views.py:849
-msgid "Edit XML"
-msgstr ""
-
-#: instances/views.py:863
-#, python-format
-msgid "Set Guest Agent %(status)s"
-msgstr ""
-
-#: instances/views.py:873
-msgid "Set Video Model"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgstr ""
 
 #: instances/views.py:882
@@ -2961,7 +2695,6 @@ msgstr ""
 msgid "Network Device Config is changed. Please shutdown instance to activate."
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:922
 #, python-format
 msgid "Add network: %(mac)s"
@@ -2973,145 +2706,79 @@ msgid "Delete Network: %(mac)s"
 msgstr ""
 
 #: instances/views.py:946
-=======
-#: instances/views.py:903
-msgid "Add network"
-msgstr ""
-
-#: instances/views.py:917
-msgid "Delete network"
-msgstr ""
-
-#: instances/views.py:933
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid "Set Link State: %(state)s"
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:966 networks/views.py:231
-=======
-#: instances/views.py:952
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid "%(qos_dir)s QoS is set"
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:971
-=======
-#: instances/views.py:956
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid ""
 "%(qos_dir)s QoS is set. Network XML is changed.                 Stop and "
 "start network to activate new config."
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:988 networks/views.py:246
-=======
-#: instances/views.py:970
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid "%(qos_dir)s QoS is deleted"
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:993
-=======
-#: instances/views.py:974
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid ""
 "%(qos_dir)s QoS is deleted. Network XML is changed.                 Stop and "
 "start network to activate new config."
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:1012
 msgid "Only one owner is allowed and the one already added"
 msgstr ""
 
 #: instances/views.py:1017
-=======
-#: instances/views.py:990
-msgid "Only one owner is allowed and the one already added"
-msgstr ""
-
-#: instances/views.py:995
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid "Add owner: %(user)s"
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:1028
 #, python-format
 msgid "Delete owner: %(userinstance_id)s "
 msgstr ""
 
 #: instances/views.py:1060
-=======
-#: instances/views.py:1006
-#, python-format
-msgid "Deleted owner %(userinstance_id)s"
-msgstr ""
-
-#: instances/views.py:1038
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid "User '%(quota_msg)s' quota reached, cannot create '%(clone_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:1066
 #, python-format
 msgid "Instance '%(clone_name)s' already exists!"
 msgstr ""
 
 #: instances/views.py:1069
-=======
-#: instances/views.py:1044
-msgid "Instance 'clone_name' already exists!"
-msgstr ""
-
-#: instances/views.py:1047
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid "Instance name '%(clone_name)s' contains invalid characters!"
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:1072
-=======
-#: instances/views.py:1050
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid "Instance MAC '%(clone_mac)s' invalid format!"
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:1082
 #, python-format
 msgid "Create a clone of '%(instance_name)s'"
 msgstr ""
 
 #: instances/views.py:1121
-=======
-#: instances/views.py:1060
-#, python-format
-msgid "Clone of '%(instance_name)s'"
-msgstr ""
-
-#: instances/views.py:1093
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid ""
 "Error setting console password. You should check that your instance have an "
 "graphic device."
 msgstr ""
 
-<<<<<<< HEAD
 #: instances/views.py:1126
 msgid "Set VNC password"
 msgstr ""
@@ -3189,85 +2856,6 @@ msgid "Update Flavor"
 msgstr ""
 
 #: instances/views.py:1512
-=======
-#: instances/views.py:1096
-msgid "Set VNC password"
-msgstr ""
-
-#: instances/views.py:1104
-msgid "Set VNC keymap"
-msgstr ""
-
-#: instances/views.py:1109
-msgid "Set VNC type"
-msgstr ""
-
-#: instances/views.py:1114
-msgid "Set VNC listen address"
-msgstr ""
-
-#: instances/views.py:1137
-msgid "Edit options"
-msgstr ""
-
-#: instances/views.py:1151
-msgid "Send console.vv file"
-msgstr ""
-
-#: instances/views.py:1206 instances/views.py:1298
-msgid "A virtual machine with this name already exists"
-msgstr ""
-
-#: instances/views.py:1281
-msgid "You haven't defined any storage pools"
-msgstr ""
-
-#: instances/views.py:1283
-msgid "You haven't defined any network pools"
-msgstr ""
-
-#: instances/views.py:1300
-msgid "There is an instance with same name. Remove it and try again!"
-msgstr ""
-
-#: instances/views.py:1304
-msgid "No Virtual Machine MAC has been entered"
-msgstr ""
-
-#: instances/views.py:1327
-msgid "Image has already exist. Please check volumes or change instance name"
-msgstr ""
-
-#: instances/views.py:1347
-msgid "First you need to create or select an image"
-msgstr ""
-
-#: instances/views.py:1365
-msgid "Invalid cache mode"
-msgstr ""
-
-#: instances/views.py:1402
-msgid "Instance is created"
-msgstr ""
-
-#: instances/views.py:1423
-msgid "Flavor Created"
-msgstr ""
-
-#: instances/views.py:1431
-msgid "Create Flavor"
-msgstr ""
-
-#: instances/views.py:1442
-msgid "Flavor Updated"
-msgstr ""
-
-#: instances/views.py:1450
-msgid "Update Flavor"
-msgstr ""
-
-#: instances/views.py:1460
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "Flavor Deleted"
 msgstr ""
 
@@ -3693,7 +3281,6 @@ msgstr ""
 msgid "Please enter bridge/dev name"
 msgstr ""
 
-<<<<<<< HEAD
 #: networks/views.py:57
 msgid "For libvirt, the IPv6 network prefix must be /64"
 msgstr ""
@@ -3718,34 +3305,10 @@ msgid "%(family)s DHCP Range is Changed."
 msgstr ""
 
 #: networks/views.py:210
-=======
-#: networks/views.py:56
-msgid "For libvirt, the IPv6 network prefix must be /64"
-msgstr ""
-
-#: networks/views.py:126
-msgid "Unknown Network Family"
-msgstr ""
-
-#: networks/views.py:176
-msgid "{family.upper()} Fixed Address Operation Completed."
-msgstr ""
-
-#: networks/views.py:186
-msgid "{family.upper()} Fixed Address is Deleted."
-msgstr ""
-
-#: networks/views.py:194
-msgid "{family.upper()} DHCP Range is Changed."
-msgstr ""
-
-#: networks/views.py:203
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid ""
 "Network XML is changed. \\Stop and start network to activate new config."
 msgstr ""
 
-<<<<<<< HEAD
 #: networks/views.py:215
 msgid "Network XML is changed."
 msgstr ""
@@ -3762,22 +3325,6 @@ msgstr ""
 msgid ""
 "%(qos_dir)s QoS is deleted. Network XML is changed.                         "
 "Stop and start network to activate new config"
-=======
-#: networks/views.py:205
-msgid "Network XML is changed."
-msgstr ""
-
-#: networks/views.py:218
-msgid "{qos_dir.capitalize()} QoS is set. Network XML is changed."
-msgstr ""
-
-#: networks/views.py:219
-msgid "Stop and start network to activate new config"
-msgstr ""
-
-#: networks/views.py:221
-msgid "{} QoS is set"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgstr ""
 
 #: networks/views.py:232
@@ -3853,7 +3400,6 @@ msgstr ""
 msgid "Hypervisor doesn't have any NWFilters"
 msgstr ""
 
-<<<<<<< HEAD
 #: nwfilters/views.py:44
 msgid "A network filter with this name already exists"
 msgstr ""
@@ -3863,22 +3409,10 @@ msgid "A network filter with this UUID already exists"
 msgstr ""
 
 #: nwfilters/views.py:51
-=======
-#: nwfilters/views.py:41
-msgid "A network filter with this name already exists"
-msgstr ""
-
-#: nwfilters/views.py:44
-msgid "A network filter with this UUID already exists"
-msgstr ""
-
-#: nwfilters/views.py:48
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid "%(filter)s network filter is created"
 msgstr ""
 
-<<<<<<< HEAD
 #: nwfilters/views.py:60
 #, python-format
 msgid "%(filter)s network filter is deleted"
@@ -3892,21 +3426,6 @@ msgstr ""
 #: nwfilters/views.py:93
 #, python-format
 msgid "Cloning NWFilter %(name)s as %(clone)s"
-=======
-#: nwfilters/views.py:57
-#, python-brace-format
-msgid "Deleting NWFilter: {name}"
-msgstr ""
-
-#: nwfilters/views.py:69
-#, python-brace-format
-msgid "NWFilter is in use by {inst}. Cannot be deleted."
-msgstr ""
-
-#: nwfilters/views.py:86
-#, python-brace-format
-msgid "Cloning NWFilter {name} as {cln_name}"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgstr ""
 
 #: secrets/templates/create_secret_block.html:12
@@ -4118,7 +3637,6 @@ msgstr ""
 msgid "You need create secret for pool"
 msgstr ""
 
-<<<<<<< HEAD
 #: storages/views.py:48
 msgid "You need input all fields for creating ceph pool"
 msgstr ""
@@ -4149,36 +3667,6 @@ msgstr ""
 #: storages/views.py:220
 #, python-format
 msgid "Image file %(name)s is created successfully"
-=======
-#: storages/views.py:49
-msgid "You need input all fields for creating ceph pool"
-msgstr ""
-
-#: storages/views.py:132
-#, python-brace-format
-msgid "Volume: {volname} is deleted."
-msgstr ""
-
-#: storages/views.py:137
-msgid "ISO image already exist"
-msgstr ""
-
-#: storages/views.py:141
-msgid "ISO: {request.FILES['file']} is uploaded."
-msgstr ""
-
-#: storages/views.py:150
-msgid "Name of volume already in use"
-msgstr ""
-
-#: storages/views.py:160
-msgid "{data['image']} image cloned as {name} successfully"
-msgstr ""
-
-#: storages/views.py:199
-#, python-brace-format
-msgid "Image file {name} is created successfully"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgstr ""
 
 #: templates/403.html:3
diff --git a/locale/ru/LC_MESSAGES/django.po b/locale/ru/LC_MESSAGES/django.po
index 65b869b..602c435 100644
--- a/locale/ru/LC_MESSAGES/django.po
+++ b/locale/ru/LC_MESSAGES/django.po
@@ -8,11 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2020-11-05 09:36+0000\n"
-=======
-"POT-Creation-Date: 2020-10-23 07:53+0000\n"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+"POT-Creation-Date: 2021-12-20 07:55+0000\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"
@@ -98,39 +94,39 @@ msgstr ""
 msgid "Create user instance"
 msgstr ""
 
-#: accounts/templates/account.html:27
+#: accounts/templates/account.html:28
 #: computes/templates/computes/instances.html:5
 #: computes/templates/computes/instances.html:9
-#: computes/templates/computes/instances.html:32
-#: computes/templates/overview.html:19 instances/templates/allinstances.html:5
+#: computes/templates/computes/instances.html:30
+#: computes/templates/overview.html:18 instances/templates/allinstances.html:5
 #: instances/templates/allinstances.html:9
 #: instances/templates/bottom_bar.html:17
 #: interfaces/templates/interface.html:16
-#: interfaces/templates/interfaces.html:20 networks/templates/network.html:17
+#: interfaces/templates/interfaces.html:22 networks/templates/network.html:17
 #: networks/templates/networks.html:19 nwfilters/templates/nwfilter.html:17
-#: nwfilters/templates/nwfilters.html:25 secrets/templates/secrets.html:23
-#: storages/templates/storage.html:22 storages/templates/storages.html:19
-#: templates/navbar.html:14
+#: nwfilters/templates/nwfilters.html:23 storages/templates/storage.html:23
+#: storages/templates/storages.html:19 templates/navbar.html:14
+#: virtsecrets/templates/secrets.html:25
 msgid "Instances"
 msgstr ""
 
-#: accounts/templates/account.html:30
+#: accounts/templates/account.html:33
 msgid "Public Keys"
 msgstr ""
 
-#: accounts/templates/account.html:40 admin/templates/admin/logs.html:27
+#: accounts/templates/account.html:44 admin/templates/admin/logs.html:27
 #: instances/templates/instance.html:5
 msgid "Instance"
 msgstr ""
 
-#: accounts/templates/account.html:41
+#: accounts/templates/account.html:45
 msgid "VNC"
 msgstr ""
 
-#: accounts/templates/account.html:42 instances/templates/instance.html:87
-#: instances/templates/instances/resize_tab.html:56
-#: instances/templates/instances/resize_tab.html:58
-#: instances/templates/instances/resize_tab.html:85
+#: accounts/templates/account.html:46 instances/templates/instance.html:93
+#: instances/templates/instances/resize_tab.html:55
+#: instances/templates/instances/resize_tab.html:57
+#: instances/templates/instances/resize_tab.html:84
 #: instances/templates/instances/resize_tab.html:121
 #: instances/templates/instances/resize_tab.html:125
 #: instances/templates/instances/resize_tab.html:151
@@ -139,47 +135,47 @@ msgstr ""
 msgid "Resize"
 msgstr ""
 
-#: accounts/templates/account.html:43 accounts/templates/account.html:61
-#: accounts/templates/profile.html:51 admin/templates/admin/group_list.html:46
-#: admin/templates/admin/user_list.html:68
-#: computes/templates/computes/list.html:54
-#: instances/templates/instances/settings_tab.html:310
-#: instances/templates/instances/settings_tab.html:314
+#: accounts/templates/account.html:47 accounts/templates/account.html:65
+#: accounts/templates/profile.html:55 admin/templates/admin/group_list.html:43
+#: admin/templates/admin/user_list.html:65
+#: computes/templates/computes/list.html:53
+#: instances/templates/instances/settings_tab.html:325
+#: instances/templates/instances/settings_tab.html:329
 #: interfaces/templates/interface.html:60 networks/templates/network.html:50
-#: nwfilters/templates/nwfilter.html:111 nwfilters/templates/nwfilter.html:151
-#: nwfilters/templates/nwfilters.html:120 secrets/templates/secrets.html:77
-#: storages/templates/storage.html:61 storages/templates/storage.html:174
-#: templates/common/confirm_delete.html:21
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:375
+#: nwfilters/templates/nwfilter.html:103 nwfilters/templates/nwfilter.html:143
+#: nwfilters/templates/nwfilters.html:118 storages/templates/storage.html:63
+#: storages/templates/storage.html:175 templates/common/confirm_delete.html:21
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:417
 #: venv2/lib/python2.7/site-packages/django/forms/formsets.py:394
+#: virtsecrets/templates/secrets.html:78
 msgid "Delete"
 msgstr ""
 
-#: accounts/templates/account.html:44
-#: instances/templates/create_instance_w2.html:81
-#: instances/templates/instances/settings_tab.html:239
-#: instances/templates/instances/snapshots_tab.html:49
-#: nwfilters/templates/nwfilter.html:101 nwfilters/templates/nwfilter.html:135
-#: nwfilters/templates/nwfilters.html:57 secrets/templates/secrets.html:62
-#: storages/templates/storage.html:100
+#: accounts/templates/account.html:48
+#: instances/templates/create_instance_w2.html:80
+#: instances/templates/instances/settings_tab.html:254
+#: instances/templates/instances/snapshots_tab.html:41
+#: nwfilters/templates/nwfilter.html:93 nwfilters/templates/nwfilter.html:127
+#: nwfilters/templates/nwfilters.html:55 storages/templates/storage.html:101
+#: virtsecrets/templates/secrets.html:63
 msgid "Action"
 msgstr ""
 
-#: accounts/templates/account.html:56
+#: accounts/templates/account.html:60
 msgid "edit"
 msgstr ""
 
-#: accounts/templates/account.html:74
+#: accounts/templates/account.html:78
 msgid "Key name"
 msgstr ""
 
-#: accounts/templates/account.html:75
+#: accounts/templates/account.html:79
 msgid "Public key"
 msgstr ""
 
 #: accounts/templates/accounts/change_password_form.html:7
 #: accounts/templates/accounts/change_password_form.html:14
-#: accounts/templates/profile.html:29
+#: accounts/templates/profile.html:33
 msgid "Change Password"
 msgstr ""
 
@@ -192,11 +188,11 @@ msgid "Cancel"
 msgstr ""
 
 #: accounts/templates/accounts/change_password_form.html:27
-#: instances/templates/instances/settings_tab.html:638
-#: instances/templates/instances/settings_tab.html:642
-#: instances/templates/instances/settings_tab.html:824
-#: instances/templates/instances/settings_tab.html:826
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:397
+#: instances/templates/instances/settings_tab.html:672
+#: instances/templates/instances/settings_tab.html:676
+#: instances/templates/instances/settings_tab.html:853
+#: instances/templates/instances/settings_tab.html:855
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:405
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:379
 msgid "Change"
 msgstr ""
@@ -225,7 +221,7 @@ msgstr ""
 
 #: accounts/templates/accounts/otp_login.html:24
 #: accounts/templates/login.html:5 accounts/templates/login.html:23
-#: accounts/templates/login.html:27
+#: accounts/templates/login.html:28
 msgid "Sign In"
 msgstr ""
 
@@ -237,12 +233,12 @@ msgstr ""
 msgid "Incorrect username or password."
 msgstr ""
 
-#: accounts/templates/login.html:24 admin/templates/admin/logs.html:26
-#: computes/templates/computes/instances.html:67
+#: accounts/templates/login.html:24 admin/templates/admin/logs.html:25
+#: computes/templates/computes/instances.html:64
 #: instances/templates/add_instance_owner_block.html:18
 #: instances/templates/allinstances_index_grouped.html:8
 #: instances/templates/allinstances_index_nongrouped.html:7
-#: instances/templates/instances/stats_tab.html:84
+#: instances/templates/instances/stats_tab.html:87
 msgid "User"
 msgstr ""
 
@@ -266,26 +262,26 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: accounts/templates/profile.html:14
+#: accounts/templates/profile.html:15
 msgid "Edit Profile"
 msgstr ""
 
-#: accounts/templates/profile.html:17
-#: instances/templates/instances/access_tab.html:23
+#: accounts/templates/profile.html:20
+#: instances/templates/instances/access_tab.html:20
 msgid "SSH Keys"
 msgstr ""
 
-#: accounts/templates/profile.html:34
-#: instances/templates/instances/settings_tab.html:686
-#: instances/templates/instances/settings_tab.html:688
+#: accounts/templates/profile.html:38
+#: instances/templates/instances/settings_tab.html:720
+#: instances/templates/instances/settings_tab.html:722
 msgid "Update"
 msgstr ""
 
-#: accounts/templates/profile.html:64
+#: accounts/templates/profile.html:68
 msgid "Add SSH Key"
 msgstr ""
 
-#: accounts/templates/profile.html:72
+#: accounts/templates/profile.html:76
 #: instances/templates/add_instance_network_block.html:50
 #: instances/templates/add_instance_owner_block.html:31
 #: instances/templates/create_flav_block.html:28
@@ -299,7 +295,6 @@ msgstr ""
 
 #: accounts/utils.py:51
 msgid "Please view HTML version of this message."
-<<<<<<< HEAD
 msgstr ""
 
 #: accounts/views.py:26
@@ -349,57 +344,6 @@ msgid "OTP QR code was emailed to user %(user)s"
 msgstr ""
 
 #: accounts/views.py:196
-=======
-msgstr ""
-
-#: accounts/views.py:26
-msgid "Profile updated"
-msgstr ""
-
-#: accounts/views.py:40
-msgid "SSH key added"
-msgstr ""
-
-#: accounts/views.py:45
-msgid "Add SSH key"
-msgstr ""
-
-#: accounts/views.py:53
-msgid "SSH key deleted"
-msgstr ""
-
-#: accounts/views.py:58
-msgid "Delete SSH key"
-msgstr ""
-
-#: accounts/views.py:86
-msgid "Password Changed"
-msgstr ""
-
-#: accounts/views.py:106
-msgid "Create User Instance"
-msgstr ""
-
-#: accounts/views.py:124
-msgid "Update User Instance"
-msgstr ""
-
-#: accounts/views.py:160
-#, python-format
-msgid "OTP Sent to %s"
-msgstr ""
-
-#: accounts/views.py:165
-msgid "Email OTP"
-msgstr ""
-
-#: accounts/views.py:175
-#, python-format
-msgid "OTP QR code was emailed to user %s"
-msgstr ""
-
-#: accounts/views.py:177
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "User email not set, failed to send QR code"
 msgstr ""
 
@@ -407,156 +351,145 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: admin/forms.py:56 admin/templates/admin/group_list.html:15
+#: admin/forms.py:56 admin/templates/admin/group_list.html:13
 #: templates/navbar.html:30
 msgid "Groups"
 msgstr ""
 
-<<<<<<< HEAD
 #: admin/forms.py:81
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, \n"
 "                    but you can change the password using <a href='{}'>this "
 "form</a>."
-=======
-#: admin/forms.py:79
-msgid ""
-"Raw passwords are not stored, so there is no way to see\n"
-"                this user's password, but you can change the password using "
-"<a href='{}'>this form</a>."
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgstr ""
 
 #: admin/templates/admin/group_list.html:5 admin/views.py:87
-#: instances/templates/instances/settings_tab.html:63 templates/navbar.html:29
+#: instances/templates/instances/settings_tab.html:69 templates/navbar.html:29
 msgid "Users"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:13
-#: admin/templates/admin/user_list.html:16
-#: computes/templates/computes/instances.html:18
-#: instances/templates/allinstances.html:16
-#: nwfilters/templates/nwfilters.html:12 storages/templates/storage.html:87
-#: templates/search_block.html:3
-msgid "Search"
-msgstr ""
-
-#: admin/templates/admin/group_list.html:23 admin/templates/admin/logs.html:16
-#: admin/templates/admin/user_list.html:26
-#: computes/templates/computes/instances.html:57
-#: computes/templates/computes/list.html:20
-#: instances/templates/create_instance_w2.html:66
-#: interfaces/templates/interfaces.html:47 networks/templates/networks.html:46
-#: nwfilters/templates/nwfilters.html:135 secrets/templates/secrets.html:50
-#: storages/templates/storage.html:187 storages/templates/storages.html:46
+#: admin/templates/admin/group_list.html:20 admin/templates/admin/logs.html:15
+#: admin/templates/admin/user_list.html:23
+#: computes/templates/computes/instances.html:55
+#: computes/templates/computes/list.html:19
+#: instances/templates/create_instance_w2.html:67
+#: interfaces/templates/interfaces.html:48 networks/templates/networks.html:45
+#: nwfilters/templates/nwfilters.html:132 storages/templates/storage.html:187
+#: storages/templates/storages.html:45 virtsecrets/templates/secrets.html:51
 msgid "Warning"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:23
+#: admin/templates/admin/group_list.html:20
 msgid "You don't have any groups"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:31
+#: admin/templates/admin/group_list.html:28
 msgid "Group Name"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:32
-#: admin/templates/admin/user_list.html:39
-#: computes/templates/computes/instances.html:71
-#: computes/templates/computes/list.html:31
+#: admin/templates/admin/group_list.html:29
+#: admin/templates/admin/user_list.html:36
+#: computes/templates/computes/instances.html:68
+#: computes/templates/computes/list.html:30
 #: instances/templates/allinstances_index_grouped.html:12
 #: instances/templates/allinstances_index_nongrouped.html:12
-#: instances/templates/instances/settings_tab.html:343
-#: instances/templates/instances/settings_tab.html:491
+#: instances/templates/instances/settings_tab.html:355
+#: instances/templates/instances/settings_tab.html:525
 #: networks/templates/network.html:175 networks/templates/network.html:284
 #: networks/templates/network.html:332
 msgid "Actions"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:43
-#: admin/templates/admin/user_list.html:62
-#: computes/templates/computes/list.html:53 networks/templates/network.html:82
-#: nwfilters/templates/nwfilter.html:59 secrets/templates/secrets.html:74
+#: admin/templates/admin/group_list.html:40
+#: admin/templates/admin/user_list.html:59
+#: computes/templates/computes/list.html:52 networks/templates/network.html:82
+#: nwfilters/templates/nwfilter.html:59 virtsecrets/templates/secrets.html:75
 msgid "Edit"
 msgstr ""
 
 #: admin/templates/admin/logs.html:5 admin/templates/admin/logs.html:7
-#: instances/templates/instances/stats_tab.html:13 templates/navbar.html:31
+#: instances/templates/instances/stats_tab.html:12 templates/navbar.html:31
 msgid "Logs"
 msgstr ""
 
-#: admin/templates/admin/logs.html:16
+#: admin/templates/admin/logs.html:15
 msgid "You don't have any Logs"
 msgstr ""
 
-#: admin/templates/admin/logs.html:25
-#: instances/templates/instances/snapshots_tab.html:48
-#: instances/templates/instances/stats_tab.html:83
+#: admin/templates/admin/logs.html:24
+#: instances/templates/instances/snapshots_tab.html:40
+#: instances/templates/instances/stats_tab.html:86
 msgid "Date"
 msgstr ""
 
+#: admin/templates/admin/logs.html:26
+#: console/templates/console-spice-full.html:202
+#: instances/templates/allinstances_index_nongrouped.html:7
+msgid "Host"
+msgstr ""
+
 #: admin/templates/admin/logs.html:28
-#: instances/templates/instances/stats_tab.html:85
+#: instances/templates/instances/stats_tab.html:88
 msgid "Message"
 msgstr ""
 
 #: admin/templates/admin/user_form.html:21
 #: computes/templates/computes/form.html:23
-#: instances/templates/edit_instance_volume.html:124
+#: instances/templates/instances/edit_instance_volume.html:111
 #: networks/templates/add_network_qos.html:51 templates/common/form.html:22
 msgid "Save"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:26
+#: admin/templates/admin/user_list.html:23
 msgid "You don't have any user"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:34
+#: admin/templates/admin/user_list.html:31
 msgid "Username"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:35
-#: computes/templates/computes/instances.html:68
-#: computes/templates/computes/list.html:29
+#: admin/templates/admin/user_list.html:32
+#: computes/templates/computes/instances.html:65
+#: computes/templates/computes/list.html:28
 #: instances/templates/allinstances_index_grouped.html:9
 #: instances/templates/allinstances_index_nongrouped.html:9
 msgid "Status"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:36
+#: admin/templates/admin/user_list.html:33
 msgid "Staff"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:37
+#: admin/templates/admin/user_list.html:34
 msgid "Superuser"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:38
+#: admin/templates/admin/user_list.html:35
 msgid "Can Clone"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:51
-#: computes/templates/computes/instances.html:94
-#: instances/templates/allinstances_index_grouped.html:57
-#: instances/templates/allinstances_index_nongrouped.html:40
+#: admin/templates/admin/user_list.html:48
+#: computes/templates/computes/instances.html:91
+#: instances/templates/allinstances_index_grouped.html:59
+#: instances/templates/allinstances_index_nongrouped.html:41
 #: instances/templates/instance.html:19
 msgid "Active"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:53
+#: admin/templates/admin/user_list.html:50
 msgid "Blocked"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:61
+#: admin/templates/admin/user_list.html:58
 msgid "View Profile"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:64
+#: admin/templates/admin/user_list.html:61
 msgid "Block"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:66
+#: admin/templates/admin/user_list.html:63
 msgid "Unblock"
 msgstr ""
 
@@ -568,11 +501,10 @@ msgstr ""
 msgid "Update Group"
 msgstr ""
 
-#: admin/views.py:113
+#: admin/views.py:110
 msgid "Create User"
 msgstr ""
 
-<<<<<<< HEAD
 #: admin/views.py:129
 msgid "Update User"
 msgstr ""
@@ -583,17 +515,6 @@ msgid "Password changed for %(user)s"
 msgstr ""
 
 #: admin/views.py:144
-=======
-#: admin/views.py:136
-msgid "Update User"
-msgstr ""
-
-#: admin/views.py:149
-msgid "User password changed: {}"
-msgstr ""
-
-#: admin/views.py:152
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "Wrong Data Provided"
 msgstr ""
 
@@ -879,33 +800,18 @@ msgid "Other Settings"
 msgstr ""
 
 #: appsettings/views.py:38
-<<<<<<< HEAD
 #, python-format
 msgid "SASS directory path is changed. Now: %(dir)s"
 msgstr ""
 
-#: appsettings/views.py:67
+#: appsettings/views.py:70
 #, python-format
 msgid "Theme is changed. Now: %(theme)s"
 msgstr ""
 
-#: appsettings/views.py:82
+#: appsettings/views.py:85
 #, python-format
 msgid "%(setting)s is changed. Now: %(value)s"
-=======
-#, python-brace-format
-msgid "SASS directory path is changed. Now: {sass_dir.value}"
-msgstr ""
-
-#: appsettings/views.py:65
-#, python-brace-format
-msgid "Theme changed. Now: {theme}"
-msgstr ""
-
-#: appsettings/views.py:80
-#, python-brace-format
-msgid "{setting.name} is changed. Now: {setting.value}"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgstr ""
 
 #: computes/forms.py:21
@@ -936,144 +842,144 @@ msgstr ""
 msgid "Create Compute"
 msgstr ""
 
-#: computes/templates/computes/instances.html:29
-#: computes/templates/computes/list.html:49
-#: computes/templates/computes/list.html:51 computes/templates/overview.html:6
-#: computes/templates/overview.html:16 interfaces/templates/interface.html:13
-#: interfaces/templates/interfaces.html:17 networks/templates/network.html:14
+#: computes/templates/computes/instances.html:27
+#: computes/templates/computes/list.html:48
+#: computes/templates/computes/list.html:50 computes/templates/overview.html:6
+#: computes/templates/overview.html:15 interfaces/templates/interface.html:13
+#: interfaces/templates/interfaces.html:19 networks/templates/network.html:14
 #: networks/templates/networks.html:16 nwfilters/templates/nwfilter.html:14
-#: nwfilters/templates/nwfilters.html:22 secrets/templates/secrets.html:20
-#: storages/templates/storage.html:19 storages/templates/storages.html:16
+#: nwfilters/templates/nwfilters.html:20 storages/templates/storage.html:20
+#: storages/templates/storages.html:16 virtsecrets/templates/secrets.html:22
 msgid "Overview"
 msgstr ""
 
-#: computes/templates/computes/instances.html:35
-#: computes/templates/overview.html:22 interfaces/templates/interface.html:19
-#: interfaces/templates/interfaces.html:23 networks/templates/network.html:20
+#: computes/templates/computes/instances.html:33
+#: computes/templates/overview.html:21 interfaces/templates/interface.html:19
+#: interfaces/templates/interfaces.html:25 networks/templates/network.html:20
 #: networks/templates/networks.html:22 nwfilters/templates/nwfilter.html:20
-#: nwfilters/templates/nwfilters.html:28 secrets/templates/secrets.html:26
-#: storages/templates/storage.html:25 storages/templates/storages.html:4
-#: storages/templates/storages.html:6 storages/templates/storages.html:22
+#: nwfilters/templates/nwfilters.html:26 storages/templates/storage.html:26
+#: storages/templates/storages.html:4 storages/templates/storages.html:6
+#: storages/templates/storages.html:22 virtsecrets/templates/secrets.html:28
 msgid "Storages"
 msgstr ""
 
-#: computes/templates/computes/instances.html:38
-#: computes/templates/overview.html:25 interfaces/templates/interface.html:22
-#: interfaces/templates/interfaces.html:26 networks/templates/network.html:23
+#: computes/templates/computes/instances.html:36
+#: computes/templates/overview.html:24 interfaces/templates/interface.html:22
+#: interfaces/templates/interfaces.html:28 networks/templates/network.html:23
 #: networks/templates/networks.html:4 networks/templates/networks.html:6
 #: networks/templates/networks.html:25 nwfilters/templates/nwfilter.html:23
-#: nwfilters/templates/nwfilters.html:31 secrets/templates/secrets.html:29
-#: storages/templates/storage.html:28 storages/templates/storages.html:25
+#: nwfilters/templates/nwfilters.html:29 storages/templates/storage.html:29
+#: storages/templates/storages.html:25 virtsecrets/templates/secrets.html:31
 msgid "Networks"
 msgstr ""
 
-#: computes/templates/computes/instances.html:41
-#: computes/templates/overview.html:28 interfaces/templates/interface.html:25
+#: computes/templates/computes/instances.html:39
+#: computes/templates/overview.html:27 interfaces/templates/interface.html:25
 #: interfaces/templates/interfaces.html:5
 #: interfaces/templates/interfaces.html:7
-#: interfaces/templates/interfaces.html:29 networks/templates/network.html:26
+#: interfaces/templates/interfaces.html:31 networks/templates/network.html:26
 #: networks/templates/networks.html:28 nwfilters/templates/nwfilter.html:26
-#: nwfilters/templates/nwfilters.html:34 secrets/templates/secrets.html:32
-#: storages/templates/storage.html:31 storages/templates/storages.html:28
+#: nwfilters/templates/nwfilters.html:32 storages/templates/storage.html:32
+#: storages/templates/storages.html:28 virtsecrets/templates/secrets.html:34
 msgid "Interfaces"
 msgstr ""
 
-#: computes/templates/computes/instances.html:44
-#: computes/templates/overview.html:31 interfaces/templates/interface.html:28
-#: interfaces/templates/interfaces.html:32 networks/templates/network.html:29
+#: computes/templates/computes/instances.html:42
+#: computes/templates/overview.html:30 interfaces/templates/interface.html:28
+#: interfaces/templates/interfaces.html:34 networks/templates/network.html:29
 #: networks/templates/networks.html:31 nwfilters/templates/nwfilter.html:29
 #: nwfilters/templates/nwfilters.html:5 nwfilters/templates/nwfilters.html:7
-#: nwfilters/templates/nwfilters.html:37 secrets/templates/secrets.html:35
-#: storages/templates/storage.html:34 storages/templates/storages.html:31
+#: nwfilters/templates/nwfilters.html:35 storages/templates/storage.html:35
+#: storages/templates/storages.html:31 virtsecrets/templates/secrets.html:37
 msgid "NWFilters"
 msgstr ""
 
-#: computes/templates/computes/instances.html:47
-#: computes/templates/overview.html:34 interfaces/templates/interface.html:31
-#: interfaces/templates/interfaces.html:35 networks/templates/network.html:32
+#: computes/templates/computes/instances.html:45
+#: computes/templates/overview.html:33 interfaces/templates/interface.html:31
+#: interfaces/templates/interfaces.html:37 networks/templates/network.html:32
 #: networks/templates/networks.html:34 nwfilters/templates/nwfilter.html:32
-#: nwfilters/templates/nwfilters.html:40 secrets/templates/secrets.html:4
-#: secrets/templates/secrets.html:10 secrets/templates/secrets.html:38
-#: storages/templates/create_stg_block.html:124
-#: storages/templates/storage.html:37 storages/templates/storages.html:34
+#: nwfilters/templates/nwfilters.html:38
+#: storages/templates/create_stg_block.html:138
+#: storages/templates/storage.html:38 storages/templates/storages.html:34
+#: virtsecrets/templates/secrets.html:4 virtsecrets/templates/secrets.html:10
+#: virtsecrets/templates/secrets.html:40
 msgid "Secrets"
 msgstr ""
 
-#: computes/templates/computes/instances.html:58
+#: computes/templates/computes/instances.html:56
 msgid "Hypervisor doesn't have any Instances"
 msgstr ""
 
-#: computes/templates/computes/instances.html:66
-#: computes/templates/computes/list.html:28
-#: instances/templates/add_instance_volume.html:40
-#: instances/templates/add_instance_volume.html:42
+#: computes/templates/computes/instances.html:63
+#: computes/templates/computes/list.html:27
+#: instances/templates/add_instance_volume.html:44
+#: instances/templates/add_instance_volume.html:46
 #: instances/templates/allinstances_index_grouped.html:7
 #: instances/templates/allinstances_index_nongrouped.html:5
-#: instances/templates/create_instance_w2.html:77
-#: instances/templates/create_instance_w2.html:103
-#: instances/templates/create_instance_w2.html:106
-#: instances/templates/create_instance_w2.html:305
-#: instances/templates/create_instance_w2.html:307
+#: instances/templates/create_instance_w2.html:76
+#: instances/templates/create_instance_w2.html:102
+#: instances/templates/create_instance_w2.html:105
+#: instances/templates/create_instance_w2.html:304
+#: instances/templates/create_instance_w2.html:306
 #: instances/templates/create_instance_w2.html:518
 #: instances/templates/create_instance_w2.html:520
-#: instances/templates/instances/settings_tab.html:340
-#: instances/templates/instances/snapshots_tab.html:47
+#: instances/templates/instances/settings_tab.html:353
+#: instances/templates/instances/snapshots_tab.html:39
 #: interfaces/templates/create_iface_block.html:18
 #: interfaces/templates/interface.html:75
 #: networks/templates/create_net_block.html:18
 #: networks/templates/modify_ipv4_fixed_address.html:30
 #: networks/templates/modify_ipv6_fixed_address.html:30
 #: networks/templates/network.html:174 networks/templates/network.html:283
-#: nwfilters/templates/nwfilter.html:41 nwfilters/templates/nwfilters.html:56
-#: nwfilters/templates/nwfilters.html:100
-#: nwfilters/templates/nwfilters.html:102
-#: storages/templates/create_stg_block.html:42
-#: storages/templates/create_stg_block.html:71
-#: storages/templates/create_stg_block.html:100
-#: storages/templates/create_stg_block.html:165
-#: storages/templates/create_stg_block.html:214
+#: nwfilters/templates/nwfilter.html:41 nwfilters/templates/nwfilters.html:54
+#: nwfilters/templates/nwfilters.html:98 nwfilters/templates/nwfilters.html:100
+#: storages/templates/create_stg_block.html:56
+#: storages/templates/create_stg_block.html:85
+#: storages/templates/create_stg_block.html:114
+#: storages/templates/create_stg_block.html:179
+#: storages/templates/create_stg_block.html:228
 #: storages/templates/create_stg_vol_block.html:21
-#: storages/templates/storage.html:96 storages/templates/storage.html:124
-#: storages/templates/storage.html:126
+#: storages/templates/storage.html:97 storages/templates/storage.html:125
+#: storages/templates/storage.html:127
 msgid "Name"
 msgstr ""
 
-#: computes/templates/computes/instances.html:66
+#: computes/templates/computes/instances.html:63
 #: instances/templates/allinstances_index_grouped.html:7
 #: instances/templates/allinstances_index_nongrouped.html:5
-#: instances/templates/instances/settings_tab.html:782
-#: instances/templates/instances/settings_tab.html:805
+#: instances/templates/instances/settings_tab.html:811
+#: instances/templates/instances/settings_tab.html:834
 msgid "Description"
 msgstr ""
 
-#: computes/templates/computes/instances.html:69
+#: computes/templates/computes/instances.html:66
 #: instances/templates/allinstances_index_grouped.html:10
 #: instances/templates/allinstances_index_nongrouped.html:10
-#: instances/templates/create_instance_w2.html:78
-#: instances/templates/create_instance_w2.html:323
+#: instances/templates/create_instance_w2.html:77
+#: instances/templates/create_instance_w2.html:322
 #: instances/templates/create_instance_w2.html:536
-#: instances/templates/instance.html:42 instances/templates/instance.html:44
+#: instances/templates/instance.html:43 instances/templates/instance.html:45
 msgid "VCPU"
 msgstr ""
 
-#: computes/templates/computes/instances.html:70
-#: computes/templates/overview.html:82
+#: computes/templates/computes/instances.html:67
+#: computes/templates/overview.html:80
 #: instances/templates/allinstances_index_grouped.html:11
 #: instances/templates/allinstances_index_nongrouped.html:11
-#: instances/templates/instances/resize_tab.html:13
+#: instances/templates/instances/resize_tab.html:12
 msgid "Memory"
 msgstr ""
 
-#: computes/templates/computes/instances.html:96
-#: instances/templates/allinstances_index_grouped.html:58
-#: instances/templates/allinstances_index_nongrouped.html:42
+#: computes/templates/computes/instances.html:93
+#: instances/templates/allinstances_index_grouped.html:60
+#: instances/templates/allinstances_index_nongrouped.html:43
 #: instances/templates/instance.html:16
 msgid "Off"
 msgstr ""
 
-#: computes/templates/computes/instances.html:98
-#: instances/templates/allinstances_index_grouped.html:60
-#: instances/templates/allinstances_index_nongrouped.html:44
+#: computes/templates/computes/instances.html:95
+#: instances/templates/allinstances_index_grouped.html:62
+#: instances/templates/allinstances_index_nongrouped.html:45
 msgid "Suspended"
 msgstr ""
 
@@ -1082,23 +988,24 @@ msgstr ""
 msgid "Computes"
 msgstr ""
 
-#: computes/templates/computes/list.html:20
+#: computes/templates/computes/list.html:19
 msgid "You don't have any computes"
 msgstr ""
 
-#: computes/templates/computes/list.html:30 computes/templates/overview.html:92
-#: instances/templates/instances/settings_tab.html:163
-#: instances/templates/instances/settings_tab.html:248
+#: computes/templates/computes/list.html:29 computes/templates/overview.html:90
+#: instances/templates/instances/settings_tab.html:176
+#: instances/templates/instances/settings_tab.html:215
+#: instances/templates/instances/settings_tab.html:263
 msgid "Details"
 msgstr ""
 
-#: computes/templates/computes/list.html:41
+#: computes/templates/computes/list.html:40
 #: instances/templates/allinstances_index_grouped.html:28
-#: instances/templates/instances/settings_tab.html:881
+#: instances/templates/instances/settings_tab.html:906
 msgid "Connected"
 msgstr ""
 
-#: computes/templates/computes/list.html:41
+#: computes/templates/computes/list.html:40
 msgid "Not Connected"
 msgstr ""
 
@@ -1122,67 +1029,69 @@ msgstr ""
 msgid "Add new host"
 msgstr ""
 
-#: computes/templates/overview.html:42
+#: computes/templates/overview.html:40
 msgid "Basic details"
 msgstr ""
 
-#: computes/templates/overview.html:44
-#: storages/templates/create_stg_block.html:171
+#: computes/templates/overview.html:42
+#: instances/templates/instances/info_tab.html:5
+#: storages/templates/create_stg_block.html:185
 msgid "Hostname"
 msgstr ""
 
-#: computes/templates/overview.html:46
+#: computes/templates/overview.html:44
 msgid "Hypervisors"
 msgstr ""
 
-#: computes/templates/overview.html:63
+#: computes/templates/overview.html:61
 msgid "more"
 msgstr ""
 
-#: computes/templates/overview.html:73
+#: computes/templates/overview.html:71
 msgid "Emulator"
 msgstr ""
 
-#: computes/templates/overview.html:75
+#: computes/templates/overview.html:73
+#: instances/templates/instances/info_tab.html:11
 msgid "Version"
 msgstr ""
 
-#: computes/templates/overview.html:77
+#: computes/templates/overview.html:75
 msgid "Qemu"
 msgstr ""
 
-#: computes/templates/overview.html:79
+#: computes/templates/overview.html:77
 msgid "Libvirt"
 msgstr ""
 
-#: computes/templates/overview.html:84
+#: computes/templates/overview.html:82
 #: instances/templates/create_instance_w1.html:36
-#: instances/templates/create_instance_w1.html:52
+#: instances/templates/create_instance_w1.html:50
 msgid "Architecture"
 msgstr ""
 
-#: computes/templates/overview.html:86
+#: computes/templates/overview.html:84
 msgid "Logical CPUs"
 msgstr ""
 
-#: computes/templates/overview.html:88
+#: computes/templates/overview.html:86
 msgid "Processor"
 msgstr ""
 
-#: computes/templates/overview.html:90
+#: computes/templates/overview.html:88
 msgid "Connection"
 msgstr ""
 
-#: computes/templates/overview.html:96
-#: instances/templates/edit_instance_volume.html:22
+#: computes/templates/overview.html:94
+#: instances/templates/instances/edit_instance_volume.html:25
 msgid "Performance"
 msgstr ""
 
-#: computes/templates/overview.html:102
+#: computes/templates/overview.html:100
 msgid "CPU Utilization"
 msgstr ""
 
-#: computes/templates/overview.html:111
+#: computes/templates/overview.html:109
 msgid "RAM Utilization"
 msgstr ""
 
@@ -1223,11 +1132,6 @@ msgstr ""
 msgid "File API is not supported"
 msgstr ""
 
-#: console/templates/console-spice-full.html:202
-#: instances/templates/allinstances_index_nongrouped.html:7
-msgid "Host"
-msgstr ""
-
 #: console/templates/console-spice-full.html:204
 msgid "Port"
 msgstr ""
@@ -1240,7 +1144,7 @@ msgstr ""
 #: interfaces/templates/interface.html:59 networks/templates/network.html:49
 #: networks/templates/network.html:119 networks/templates/network.html:125
 #: networks/templates/network.html:231 networks/templates/network.html:237
-#: storages/templates/storage.html:60
+#: storages/templates/storage.html:62
 msgid "Start"
 msgstr ""
 
@@ -1256,6 +1160,20 @@ msgstr ""
 msgid "Loading"
 msgstr ""
 
+#: console/views.py:52
+msgid ""
+"User does not have permission to access console or host/instance not exist"
+msgstr ""
+
+#: console/views.py:84
+msgid "Fail to get console. Please check the console configuration of your VM."
+msgstr ""
+
+#: console/views.py:86
+#, python-format
+msgid "Console type '%(type)s' has not support"
+msgstr ""
+
 #: instances/forms.py:37
 msgid "No Virtual Machine name has been entered"
 msgstr ""
@@ -1316,7 +1234,7 @@ msgstr ""
 msgid "created"
 msgstr ""
 
-#: instances/models.py:220
+#: instances/models.py:216
 msgid "Can access console without password"
 msgstr ""
 
@@ -1325,87 +1243,86 @@ msgid "Add Instance Network"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:18
-#: instances/templates/create_instance_w2.html:205
-#: instances/templates/instances/settings_tab.html:359
-#: instances/templates/instances/settings_tab.html:382
-#: instances/templates/instances/settings_tab.html:487
+#: instances/templates/create_instance_w2.html:182
+#: instances/templates/instances/settings_tab.html:373
+#: instances/templates/instances/settings_tab.html:409
+#: instances/templates/instances/settings_tab.html:521
 #: interfaces/templates/interface.html:45
 #: interfaces/templates/interface.html:74
-#: interfaces/templates/interfaces.html:63
+#: interfaces/templates/interfaces.html:64
 #: networks/templates/modify_ipv4_fixed_address.html:24
 #: networks/templates/network.html:172
 msgid "MAC"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:24
-#: instances/templates/create_instance_w2.html:164
-#: instances/templates/create_instance_w2.html:388
-#: instances/templates/create_instance_w2.html:605
-#: instances/templates/instances/settings_tab.html:30
-#: instances/templates/instances/settings_tab.html:394
+#: instances/templates/create_instance_w2.html:163
+#: instances/templates/create_instance_w2.html:387
+#: instances/templates/instances/settings_tab.html:36
+#: instances/templates/instances/settings_tab.html:421
 #: networks/templates/network.html:5 networks/templates/network.html:7
 #: networks/templates/network.html:107 networks/templates/network.html:218
 msgid "Network"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:37
-#: instances/templates/create_instance_w2.html:183
+#: instances/templates/create_instance_w2.html:188
 #: instances/templates/create_instance_w2.html:429
-#: instances/templates/create_instance_w2.html:642
-#: instances/templates/instances/settings_tab.html:403
+#: instances/templates/create_instance_w2.html:645
+#: instances/templates/instances/settings_tab.html:430
 #: nwfilters/templates/nwfilter.html:5 nwfilters/templates/nwfilter.html:7
 msgid "NWFilter"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:40
-#: instances/templates/add_instance_volume.html:117
+#: instances/templates/add_instance_volume.html:121
 #: instances/templates/create_inst_block.html:25
-#: instances/templates/create_instance_w2.html:158
-#: instances/templates/create_instance_w2.html:186
-#: instances/templates/create_instance_w2.html:377
+#: instances/templates/create_instance_w2.html:157
+#: instances/templates/create_instance_w2.html:191
+#: instances/templates/create_instance_w2.html:376
 #: instances/templates/create_instance_w2.html:432
 #: instances/templates/create_instance_w2.html:580
 #: instances/templates/create_instance_w2.html:599
-#: instances/templates/create_instance_w2.html:645
-#: instances/templates/instances/access_tab.html:135
-#: instances/templates/instances/settings_tab.html:183
-#: instances/templates/instances/settings_tab.html:407
-#: instances/templates/instances/stats_tab.html:90
+#: instances/templates/create_instance_w2.html:648
+#: instances/templates/instances/access_tab.html:123
+#: instances/templates/instances/settings_tab.html:191
+#: instances/templates/instances/settings_tab.html:434
+#: instances/templates/instances/stats_tab.html:93
 #: interfaces/templates/interface.html:41
-#: interfaces/templates/interface.html:43 nwfilters/templates/nwfilter.html:78
-#: storages/templates/create_stg_block.html:132
-#: storages/templates/storage.html:47 storages/templates/storage.html:49
-#: storages/templates/storage.html:51
+#: interfaces/templates/interface.html:43 nwfilters/templates/nwfilter.html:73
+#: storages/templates/create_stg_block.html:146
+#: storages/templates/storage.html:49 storages/templates/storage.html:51
+#: storages/templates/storage.html:53
 msgid "None"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:49
 #: instances/templates/add_instance_owner_block.html:30
-#: instances/templates/add_instance_volume.html:89
-#: instances/templates/add_instance_volume.html:144
+#: instances/templates/add_instance_volume.html:93
+#: instances/templates/add_instance_volume.html:148
 #: instances/templates/create_flav_block.html:25
 #: instances/templates/create_inst_block.html:34
-#: instances/templates/create_instance_w2.html:269
-#: instances/templates/edit_instance_volume.html:123
-#: instances/templates/instances/settings_tab.html:428
-#: interfaces/templates/create_iface_block.html:135
+#: instances/templates/create_instance_w2.html:268
+#: instances/templates/instances/edit_instance_volume.html:110
+#: instances/templates/instances/settings_tab.html:455
+#: interfaces/templates/create_iface_block.html:139
 #: networks/templates/add_network_qos.html:50
 #: networks/templates/create_net_block.html:85
 #: networks/templates/modify_ipv4_fixed_address.html:44
 #: networks/templates/modify_ipv6_fixed_address.html:44
 #: nwfilters/templates/add_nwf_rule.html:25
-#: nwfilters/templates/create_nwfilter_block.html:23
-#: nwfilters/templates/nwfilters.html:80 nwfilters/templates/nwfilters.html:108
-#: secrets/templates/create_secret_block.html:54
-#: secrets/templates/secrets.html:102
-#: storages/templates/create_stg_block.html:55
-#: storages/templates/create_stg_block.html:84
-#: storages/templates/create_stg_block.html:140
-#: storages/templates/create_stg_block.html:202
-#: storages/templates/create_stg_block.html:230
+#: nwfilters/templates/create_nwfilter_block.html:25
+#: nwfilters/templates/nwfilters.html:78 nwfilters/templates/nwfilters.html:106
+#: storages/templates/create_stg_block.html:69
+#: storages/templates/create_stg_block.html:98
+#: storages/templates/create_stg_block.html:154
+#: storages/templates/create_stg_block.html:216
+#: storages/templates/create_stg_block.html:244
 #: storages/templates/create_stg_vol_block.html:28
 #: storages/templates/create_stg_vol_block.html:56
-#: storages/templates/storage.html:154
+#: storages/templates/storage.html:155
+#: virtsecrets/templates/create_secret_block.html:54
+#: virtsecrets/templates/secrets.html:103
 msgid "Close"
 msgstr ""
 
@@ -1414,8 +1331,8 @@ msgid "Add Instance Owner"
 msgstr ""
 
 #: instances/templates/add_instance_volume.html:3
-#: instances/templates/add_instance_volume.html:90
-#: instances/templates/add_instance_volume.html:145
+#: instances/templates/add_instance_volume.html:94
+#: instances/templates/add_instance_volume.html:149
 msgid "Add Volume"
 msgstr ""
 
@@ -1423,72 +1340,73 @@ msgstr ""
 msgid "Add Instance Volume"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:18
+#: instances/templates/add_instance_volume.html:19
 msgid "New Disk"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:21
+#: instances/templates/add_instance_volume.html:24
 msgid "Existing Disk"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:28
-#: instances/templates/add_instance_volume.html:98
+#: instances/templates/add_instance_volume.html:32
+#: instances/templates/add_instance_volume.html:102
 msgid "Volume parameters"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:30
-#: instances/templates/add_instance_volume.html:100
-#: instances/templates/create_instance_w2.html:149
+#: instances/templates/add_instance_volume.html:34
+#: instances/templates/add_instance_volume.html:104
+#: instances/templates/create_instance_w2.html:148
 #: instances/templates/create_instance_w2.html:591
-#: instances/templates/instances/settings_tab.html:237
+#: instances/templates/instances/settings_tab.html:252
 #: storages/templates/storage.html:4 storages/templates/storage.html:9
 msgid "Storage"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:46
-#: storages/templates/create_stg_block.html:183
-#: storages/templates/storage.html:99 storages/templates/storage.html:137
+#: instances/templates/add_instance_volume.html:50
+#: storages/templates/create_stg_block.html:197
+#: storages/templates/storage.html:100 storages/templates/storage.html:138
 msgid "Format"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:56
-#: storages/templates/storage.html:52 storages/templates/storage.html:98
-#: storages/templates/storages.html:62
+#: instances/templates/add_instance_volume.html:60
+#: storages/templates/storage.html:54 storages/templates/storage.html:99
+#: storages/templates/storages.html:61
 msgid "Size"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:60
-#: instances/templates/create_instance_w2.html:91
+#: instances/templates/add_instance_volume.html:64
+#: instances/templates/create_instance_w2.html:90
 msgid "GB"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:63
-#: instances/templates/add_instance_volume.html:123
-#: instances/templates/edit_instance_volume.html:53
-#: instances/templates/instances/settings_tab.html:168
+#: instances/templates/add_instance_volume.html:67
+#: instances/templates/add_instance_volume.html:127
+#: instances/templates/instances/edit_instance_volume.html:89
+#: instances/templates/instances/settings_tab.html:181
+#: instances/templates/instances/settings_tab.html:220
 msgid "Bus"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:73
-#: instances/templates/add_instance_volume.html:133
+#: instances/templates/add_instance_volume.html:77
+#: instances/templates/add_instance_volume.html:137
 msgid "Cache"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:83
-#: instances/templates/instances/settings_tab.html:760
-#: storages/templates/storage.html:147
+#: instances/templates/add_instance_volume.html:87
+#: instances/templates/instances/settings_tab.html:789
+#: storages/templates/storage.html:148
 msgid "Metadata"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:103
+#: instances/templates/add_instance_volume.html:107
 msgid "Select Pool"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:114
+#: instances/templates/add_instance_volume.html:118
 msgid "Volume"
 msgstr ""
 
-#: instances/templates/allinstances.html:24
+#: instances/templates/allinstances.html:22
 msgid "Problem occurred with host"
 msgstr ""
 
@@ -1537,39 +1455,39 @@ msgid "New instance on %(host)s "
 msgstr ""
 
 #: instances/templates/create_instance_w1.html:41
-#: instances/templates/instances/settings_tab.html:49
+#: instances/templates/instances/settings_tab.html:55
 #: networks/templates/network.html:72 nwfilters/templates/nwfilter.html:49
 msgid "XML"
 msgstr ""
 
-#: instances/templates/create_instance_w1.html:62
+#: instances/templates/create_instance_w1.html:60
 msgid "Chipset"
 msgstr ""
 
-#: instances/templates/create_instance_w1.html:72
+#: instances/templates/create_instance_w1.html:70
 msgid "Next"
 msgstr ""
 
-#: instances/templates/create_instance_w1.html:89
-#: instances/templates/create_instance_w2.html:271
-#: instances/templates/create_instance_w2.html:273
+#: instances/templates/create_instance_w1.html:85
+#: instances/templates/create_instance_w2.html:270
+#: instances/templates/create_instance_w2.html:272
 #: instances/templates/create_instance_w2.html:500
 #: instances/templates/create_instance_w2.html:504
-#: instances/templates/create_instance_w2.html:713
-#: instances/templates/create_instance_w2.html:717
-#: interfaces/templates/create_iface_block.html:138
+#: instances/templates/create_instance_w2.html:716
+#: instances/templates/create_instance_w2.html:720
+#: interfaces/templates/create_iface_block.html:142
 #: networks/templates/create_net_block.html:86
 #: networks/templates/modify_ipv4_fixed_address.html:45
 #: networks/templates/modify_ipv6_fixed_address.html:45
-#: nwfilters/templates/create_nwfilter_block.html:24
-#: secrets/templates/create_secret_block.html:55
-#: storages/templates/create_stg_block.html:56
-#: storages/templates/create_stg_block.html:85
-#: storages/templates/create_stg_block.html:144
-#: storages/templates/create_stg_block.html:148
-#: storages/templates/create_stg_block.html:205
-#: storages/templates/create_stg_block.html:233
+#: nwfilters/templates/create_nwfilter_block.html:26
+#: storages/templates/create_stg_block.html:70
+#: storages/templates/create_stg_block.html:99
+#: storages/templates/create_stg_block.html:158
+#: storages/templates/create_stg_block.html:162
+#: storages/templates/create_stg_block.html:219
+#: storages/templates/create_stg_block.html:247
 #: storages/templates/create_stg_vol_block.html:57
+#: virtsecrets/templates/create_secret_block.html:55
 msgid "Create"
 msgstr ""
 
@@ -1585,113 +1503,113 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:66
-msgid "Hypervisor doesn't have any Flavors"
-msgstr ""
-
-#: instances/templates/create_instance_w2.html:71
+#: instances/templates/create_instance_w2.html:63
 msgid "Create from flavor"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:79
-#: instances/templates/create_instance_w2.html:352
+#: instances/templates/create_instance_w2.html:67
+msgid "Hypervisor doesn't have any Flavors"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:78
+#: instances/templates/create_instance_w2.html:351
 #: instances/templates/create_instance_w2.html:563
-#: instances/templates/instance.html:47
+#: instances/templates/instance.html:48
 msgid "RAM"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:80
-#: instances/templates/create_instance_w2.html:367
+#: instances/templates/create_instance_w2.html:79
+#: instances/templates/create_instance_w2.html:366
 msgid "HDD"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:90
-#: instances/templates/create_instance_w2.html:356
+#: instances/templates/create_instance_w2.html:89
+#: instances/templates/create_instance_w2.html:355
 #: instances/templates/create_instance_w2.html:567
-#: instances/templates/instance.html:47
+#: instances/templates/instance.html:48
 #: instances/templates/instances/resize_tab.html:95
-#: instances/templates/instances/resize_tab.html:108
+#: instances/templates/instances/resize_tab.html:109
 msgid "MB"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:97
+#: instances/templates/create_instance_w2.html:96
 msgid "Create Virtual Machine"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:115
-#: instances/templates/create_instance_w2.html:312
+#: instances/templates/create_instance_w2.html:114
+#: instances/templates/create_instance_w2.html:311
 #: instances/templates/create_instance_w2.html:525
 msgid "Firmware"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:127
-#: instances/templates/create_instance_w2.html:330
+#: instances/templates/create_instance_w2.html:126
+#: instances/templates/create_instance_w2.html:329
 #: instances/templates/create_instance_w2.html:542
 msgid "VCPU Config"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:130
-#: instances/templates/create_instance_w2.html:333
+#: instances/templates/create_instance_w2.html:129
+#: instances/templates/create_instance_w2.html:332
 #: instances/templates/create_instance_w2.html:545
 msgid "no-mode"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:174
+#: instances/templates/create_instance_w2.html:173
 #: instances/templates/create_instance_w2.html:402
-#: instances/templates/create_instance_w2.html:615
-#: instances/templates/edit_instance_volume.html:25
+#: instances/templates/create_instance_w2.html:618
+#: instances/templates/instances/edit_instance_volume.html:30
 msgid "Advanced"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:194
-#: instances/templates/create_instance_w2.html:631
+#: instances/templates/create_instance_w2.html:199
+#: instances/templates/create_instance_w2.html:634
 msgid "HDD cache mode"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:212
+#: instances/templates/create_instance_w2.html:211
 #: instances/templates/create_instance_w2.html:441
-#: instances/templates/create_instance_w2.html:654
+#: instances/templates/create_instance_w2.html:657
 msgid "Graphics"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:223
+#: instances/templates/create_instance_w2.html:222
 #: instances/templates/create_instance_w2.html:452
-#: instances/templates/create_instance_w2.html:665
+#: instances/templates/create_instance_w2.html:668
 msgid "Video"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:237
+#: instances/templates/create_instance_w2.html:236
 #: instances/templates/create_instance_w2.html:466
-#: instances/templates/create_instance_w2.html:679
+#: instances/templates/create_instance_w2.html:682
 msgid "Console Access"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:247
-#: instances/templates/create_instance_w2.html:249
+#: instances/templates/create_instance_w2.html:246
+#: instances/templates/create_instance_w2.html:248
 #: instances/templates/create_instance_w2.html:476
 #: instances/templates/create_instance_w2.html:478
-#: instances/templates/create_instance_w2.html:689
-#: instances/templates/create_instance_w2.html:691
+#: instances/templates/create_instance_w2.html:692
+#: instances/templates/create_instance_w2.html:694
 msgid "Console Password"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:253
+#: instances/templates/create_instance_w2.html:252
 #: instances/templates/create_instance_w2.html:482
-#: instances/templates/create_instance_w2.html:695
+#: instances/templates/create_instance_w2.html:698
 msgid "Guest Agent"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:260
+#: instances/templates/create_instance_w2.html:259
 #: instances/templates/create_instance_w2.html:489
-#: instances/templates/create_instance_w2.html:702
+#: instances/templates/create_instance_w2.html:705
 msgid "VirtIO"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:287
-#: instances/templates/instances/settings_tab.html:439
-#: instances/templates/instances/settings_tab.html:515
-#: instances/templates/instances/settings_tab.html:525
-#: instances/templates/instances/snapshots_tab.html:75
+#: instances/templates/create_instance_w2.html:286
+#: instances/templates/instances/settings_tab.html:473
+#: instances/templates/instances/settings_tab.html:549
+#: instances/templates/instances/settings_tab.html:559
+#: instances/templates/instances/snapshots_tab.html:67
 #: interfaces/templates/interface.html:60
 #: interfaces/templates/interface.html:62 networks/templates/network.html:50
 #: networks/templates/network.html:52 networks/templates/network.html:62
@@ -1699,35 +1617,35 @@ msgstr ""
 #: networks/templates/network.html:194 networks/templates/network.html:249
 #: networks/templates/network.html:298 networks/templates/network.html:303
 #: networks/templates/network.html:353 networks/templates/network.html:358
-#: nwfilters/templates/nwfilter.html:111 nwfilters/templates/nwfilter.html:151
-#: nwfilters/templates/nwfilters.html:120 secrets/templates/secrets.html:77
-#: storages/templates/storage.html:62 storages/templates/storage.html:65
-#: storages/templates/storage.html:77 storages/templates/storage.html:174
+#: nwfilters/templates/nwfilter.html:103 nwfilters/templates/nwfilter.html:143
+#: nwfilters/templates/nwfilters.html:118 storages/templates/storage.html:64
+#: storages/templates/storage.html:67 storages/templates/storage.html:79
+#: storages/templates/storage.html:175 virtsecrets/templates/secrets.html:78
 msgid "Are you sure?"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:359
+#: instances/templates/create_instance_w2.html:358
 msgid "Added Disks"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:372
+#: instances/templates/create_instance_w2.html:371
 #: instances/templates/create_instance_w2.html:575
 msgid "Select pool"
 msgstr ""
 
 #: instances/templates/create_instance_w2.html:411
-#: instances/templates/create_instance_w2.html:624
+#: instances/templates/create_instance_w2.html:627
 msgid "Disk Metadata"
 msgstr ""
 
 #: instances/templates/create_instance_w2.html:413
-#: instances/templates/create_instance_w2.html:626
+#: instances/templates/create_instance_w2.html:629
 msgid "Metadata preallocation"
 msgstr ""
 
 #: instances/templates/create_instance_w2.html:415
-#: instances/templates/create_instance_w2.html:628
-#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:360
+#: instances/templates/create_instance_w2.html:631
+#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:375
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/files.py:391
 msgid "Image"
 msgstr ""
@@ -1740,64 +1658,16 @@ msgstr ""
 msgid "Template Disk"
 msgstr ""
 
-#: instances/templates/edit_instance_volume.html:3
-msgid "Edit Volume"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:12
-msgid "Edit Instance Volume"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:19
-msgid "Virtual Disk"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:32
-msgid "Volume Path"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:38
-msgid "Readonly"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:44
-msgid "Shareable"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:63
-msgid "Serial Number"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:69
-msgid "Storage Format"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:78
-msgid "Cache mode"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:88
-msgid "IO mode"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:98
-msgid "Discard mode"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:108
-msgid "Detect zeroes"
+#: instances/templates/create_instance_w2.html:605
+msgid "Network/MAC"
 msgstr ""
 
 #: instances/templates/instance.html:22
 #: instances/templates/instance_actions.html:14
 #: instances/templates/instance_actions.html:25
 #: instances/templates/instance_actions.html:37
-#: instances/templates/instances/power_tab.html:25
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:82 instances/views.py:270
-=======
-#: instances/templates/instances/power_tab.html:82 instances/views.py:264
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:24
+#: instances/templates/instances/power_tab.html:81 instances/views.py:277
 msgid "Suspend"
 msgstr ""
 
@@ -1813,92 +1683,80 @@ msgstr ""
 msgid "Guest Agent Not Enabled & Not Connected"
 msgstr ""
 
-#: instances/templates/instance.html:50
-#: instances/templates/instances/resize_tab.html:18
-#: instances/templates/instances/settings_tab.html:16
+#: instances/templates/instance.html:51
+#: instances/templates/instances/resize_tab.html:17
+#: instances/templates/instances/settings_tab.html:22
 msgid "Disk"
 msgstr ""
 
-#: instances/templates/instance.html:57
+#: instances/templates/instance.html:59
+msgid "Show Instance OS details"
+msgstr ""
+
+#: instances/templates/instance.html:63
 msgid "Refresh instance info"
 msgstr ""
 
-#: instances/templates/instance.html:61
+#: instances/templates/instance.html:69
 msgid "quota reached"
 msgstr ""
 
-#: instances/templates/instance.html:75
+#: instances/templates/instance.html:81
 msgid "Power"
 msgstr ""
 
-#: instances/templates/instance.html:81
+#: instances/templates/instance.html:87
 msgid "Access"
 msgstr ""
 
-#: instances/templates/instance.html:94
+#: instances/templates/instance.html:100
 msgid "Snapshot"
 msgstr ""
 
-#: instances/templates/instance.html:101 templates/navbar.html:32
+#: instances/templates/instance.html:107 templates/navbar.html:32
 msgid "Settings"
 msgstr ""
 
-#: instances/templates/instance.html:107
+#: instances/templates/instance.html:113
 msgid "Stats"
 msgstr ""
 
-#: instances/templates/instance.html:113
-#: instances/templates/instances/destroy_instance_form.html:40
-#: instances/templates/instances/destroy_tab.html:18
-#: instances/templates/instances/destroy_tab.html:20
-<<<<<<< HEAD
-#: instances/templates/instances/destroy_tab.html:23 instances/views.py:312
-=======
-#: instances/templates/instances/destroy_tab.html:23 instances/views.py:306
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instance.html:119
+#: instances/templates/instances/destroy_instance_form.html:35
+#: instances/templates/instances/destroy_tab.html:17
+#: instances/templates/instances/destroy_tab.html:19
+#: instances/templates/instances/destroy_tab.html:22 instances/views.py:319
 msgid "Destroy"
 msgstr ""
 
 #: instances/templates/instance_actions.html:6
-#: instances/templates/instances/settings_tab.html:37
-#: instances/templates/instances/settings_tab.html:788
-#: instances/templates/instances/settings_tab.html:790
-#: nwfilters/templates/nwfilters.html:109
-#: nwfilters/templates/nwfilters.html:115 storages/templates/storage.html:155
-#: storages/templates/storage.html:162
+#: instances/templates/instances/settings_tab.html:43
+#: instances/templates/instances/settings_tab.html:817
+#: instances/templates/instances/settings_tab.html:819
+#: nwfilters/templates/nwfilters.html:107
+#: nwfilters/templates/nwfilters.html:113 storages/templates/storage.html:156
+#: storages/templates/storage.html:163
 msgid "Clone"
 msgstr ""
 
 #: instances/templates/instance_actions.html:10
 #: instances/templates/instance_actions.html:35
-#: instances/templates/instances/power_tab.html:47
-#: instances/templates/instances/power_tab.html:121
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:123 instances/views.py:245
-=======
-#: instances/templates/instances/power_tab.html:123 instances/views.py:239
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:46
+#: instances/templates/instances/power_tab.html:120
+#: instances/templates/instances/power_tab.html:122 instances/views.py:252
 msgid "Power On"
 msgstr ""
 
 #: instances/templates/instance_actions.html:15
-#: instances/templates/instances/power_tab.html:9
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:59 instances/views.py:261
-=======
-#: instances/templates/instances/power_tab.html:59 instances/views.py:255
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:8
+#: instances/templates/instances/power_tab.html:58 instances/views.py:268
 msgid "Power Off"
 msgstr ""
 
 #: instances/templates/instance_actions.html:16
 #: instances/templates/instance_actions.html:29
-#: instances/templates/instances/power_tab.html:14
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:66 instances/views.py:254
-=======
-#: instances/templates/instances/power_tab.html:66 instances/views.py:248
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:13
+#: instances/templates/instances/power_tab.html:65 instances/views.py:261
 msgid "Power Cycle"
 msgstr ""
 
@@ -1908,120 +1766,112 @@ msgid "VNC Console"
 msgstr ""
 
 #: instances/templates/instance_actions.html:22
-#: instances/templates/instances/power_tab.html:34
-#: instances/templates/instances/power_tab.html:93
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:108 instances/views.py:278
-=======
-#: instances/templates/instances/power_tab.html:108 instances/views.py:272
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:33
+#: instances/templates/instances/power_tab.html:92
+#: instances/templates/instances/power_tab.html:107 instances/views.py:285
 msgid "Resume"
 msgstr ""
 
 #: instances/templates/instance_actions.html:26
-#: instances/templates/instances/power_tab.html:19
-#: instances/templates/instances/power_tab.html:39
-#: instances/templates/instances/power_tab.html:74
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:100 instances/views.py:285
-=======
-#: instances/templates/instances/power_tab.html:100 instances/views.py:279
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:18
+#: instances/templates/instances/power_tab.html:38
+#: instances/templates/instances/power_tab.html:73
+#: instances/templates/instances/power_tab.html:99 instances/views.py:292
 msgid "Force Off"
 msgstr ""
 
 #: instances/templates/instance_actions.html:41
-#: instances/templates/instances/access_tab.html:9
-#: instances/templates/instances/access_tab.html:79
-#: instances/templates/instances/access_tab.html:87
-#: instances/templates/instances/access_tab.html:90
-#: instances/templates/instances/access_tab.html:94
-#: instances/templates/instances/settings_tab.html:23
+#: instances/templates/instances/access_tab.html:7
+#: instances/templates/instances/access_tab.html:67
+#: instances/templates/instances/access_tab.html:75
+#: instances/templates/instances/access_tab.html:78
+#: instances/templates/instances/access_tab.html:82
+#: instances/templates/instances/settings_tab.html:29
 msgid "Console"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:16
+#: instances/templates/instances/access_tab.html:13
 msgid "Root Password"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:31
-#: instances/templates/instances/access_tab.html:156
+#: instances/templates/instances/access_tab.html:27
+#: instances/templates/instances/access_tab.html:143
 msgid "VDI"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:39
+#: instances/templates/instances/access_tab.html:35
 #, python-format
 msgid ""
 " This action opens a new window with a %(type)s connection to the console of "
 "the instance."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:47
+#: instances/templates/instances/access_tab.html:42
 msgid "Scale"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:55
+#: instances/templates/instances/access_tab.html:48
 msgid "View Only"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:63
+#: instances/templates/instances/access_tab.html:54
 msgid "Resize Session"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:71
+#: instances/templates/instances/access_tab.html:60
 msgid "View Clipboard"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:82
+#: instances/templates/instances/access_tab.html:70
 msgid "Toggle Dropdown"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:86
-#: instances/templates/instances/access_tab.html:89
+#: instances/templates/instances/access_tab.html:74
+#: instances/templates/instances/access_tab.html:77
 msgid "Console port"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:87
+#: instances/templates/instances/access_tab.html:75
 msgid "Lite"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:90
+#: instances/templates/instances/access_tab.html:78
 msgid "Full"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:100
+#: instances/templates/instances/access_tab.html:88
 msgid "You need shut down your instance and enter a new root password."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:107
+#: instances/templates/instances/access_tab.html:95
 msgid "Enter Password"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:112
-#: instances/templates/instances/access_tab.html:115
+#: instances/templates/instances/access_tab.html:100
+#: instances/templates/instances/access_tab.html:103
 msgid "Reset Root Password"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:123
+#: instances/templates/instances/access_tab.html:111
 msgid "You need shut down your instance and choose your public key."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:142
-#: instances/templates/instances/access_tab.html:144
+#: instances/templates/instances/access_tab.html:130
+#: instances/templates/instances/access_tab.html:132
 msgid "Add Public Key"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:152
+#: instances/templates/instances/access_tab.html:140
 msgid ""
 "This action opens a remote viewer with a connection to the console of the "
 "instance."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:159
+#: instances/templates/instances/access_tab.html:145
 msgid "To download console.vv file for virt-viewer."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:160
+#: instances/templates/instances/access_tab.html:146
 msgid "Get console.vv"
 msgstr ""
 
@@ -2041,114 +1891,190 @@ msgstr ""
 msgid "This action is irreversible!"
 msgstr ""
 
-#: instances/templates/instances/destroy_instance_form.html:26
+#: instances/templates/instances/destroy_instance_form.html:24
 msgid "Remove Instance's data"
 msgstr ""
 
-#: instances/templates/instances/destroy_instance_form.html:34
+#: instances/templates/instances/destroy_instance_form.html:30
 msgid "Remove Instance's NVRAM"
 msgstr ""
 
-#: instances/templates/instances/destroy_instance_form.html:46
+#: instances/templates/instances/destroy_instance_form.html:41
 msgid "You cannot destroy instance!"
 msgstr ""
 
-#: instances/templates/instances/destroy_tab.html:8
+#: instances/templates/instances/destroy_tab.html:7
 msgid "Destroy Instance"
 msgstr ""
 
-#: instances/templates/instances/destroy_tab.html:15
+#: instances/templates/instances/destroy_tab.html:14
 msgid "This action starts remove instance process"
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:56
+#: instances/templates/instances/edit_instance_volume.html:3
+msgid "Edit Volume"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:12
+msgid "Edit Instance Volume"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:20
+msgid "Virtual Disk"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:38
+msgid "Volume Path"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:42
+msgid "Readonly"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:46
+msgid "Shareable"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:53
+msgid "Cache mode"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:61
+msgid "IO mode"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:69
+msgid "Discard mode"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:77
+msgid "Detect zeroes"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:97
+msgid "Serial Number"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:101
+msgid "Storage Format"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:111
+msgid "Are you sure to change volume properties?"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:3
+msgid "Guest Info"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:7
+msgid "OS Name"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:9
+msgid "OS Pretty-Name"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:13
+msgid "Kernel Release"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:15
+msgid "Kernel Version"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:17
+msgid "Timezone / Offset"
+msgstr ""
+
+#: instances/templates/instances/power_tab.html:55
 msgid "This action sends an ACPI shutdown signal to the instance."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:64
+#: instances/templates/instances/power_tab.html:63
 msgid ""
 "This action forcibly powers off and start the instance and may cause data "
 "corruption."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:71
-#: instances/templates/instances/power_tab.html:98
+#: instances/templates/instances/power_tab.html:70
+#: instances/templates/instances/power_tab.html:97
 msgid ""
 "This action forcibly powers off the instance and may cause data corruption."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:80
+#: instances/templates/instances/power_tab.html:79
 msgid "This action suspends the instance."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:91
+#: instances/templates/instances/power_tab.html:90
 msgid "This action restore the instance after suspend."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:106
+#: instances/templates/instances/power_tab.html:105
 msgid "Administrator blocked your instance."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:116
+#: instances/templates/instances/power_tab.html:115
 msgid "Click on Power On button to start this instance."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:120
+#: instances/templates/instances/power_tab.html:119
 msgid "Template instance cannot be started."
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:8
+#: instances/templates/instances/resize_tab.html:7
 msgid "CPU"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:29
+#: instances/templates/instances/resize_tab.html:28
 msgid "Logical host CPUs"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:31
+#: instances/templates/instances/resize_tab.html:30
 #: instances/templates/instances/resize_tab.html:95
 #: instances/templates/instances/resize_tab.html:136
 msgid "Current Allocation"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:45
-#: instances/templates/instances/resize_tab.html:108
+#: instances/templates/instances/resize_tab.html:44
+#: instances/templates/instances/resize_tab.html:109
 msgid "Maximum Allocation"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:63
+#: instances/templates/instances/resize_tab.html:62
 msgid "Logical Instance Active/Maximum CPUs"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:71
-#: instances/templates/instances/settings_tab.html:79
-#: instances/templates/instances/settings_tab.html:95
-#: networks/templates/network.html:62 storages/templates/storage.html:77
+#: instances/templates/instances/resize_tab.html:70
+#: instances/templates/instances/settings_tab.html:86
+#: instances/templates/instances/settings_tab.html:102
+#: networks/templates/network.html:62 storages/templates/storage.html:79
 msgid "Disable"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:73
+#: instances/templates/instances/resize_tab.html:72
 msgid "Constant"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:75
-#: instances/templates/instances/settings_tab.html:77
-#: instances/templates/instances/settings_tab.html:91
-#: networks/templates/network.html:60 storages/templates/storage.html:74
+#: instances/templates/instances/resize_tab.html:74
+#: instances/templates/instances/settings_tab.html:84
+#: instances/templates/instances/settings_tab.html:98
+#: networks/templates/network.html:60 storages/templates/storage.html:76
 msgid "Enable"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:84
+#: instances/templates/instances/resize_tab.html:83
 #: instances/templates/instances/resize_tab.html:124
 #: instances/templates/instances/resize_tab.html:157
 msgid "You don't have permission for resizing instance"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:93
+#: instances/templates/instances/resize_tab.html:92
 msgid "Total host memory"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:103
+#: instances/templates/instances/resize_tab.html:104
 #: instances/templates/instances/resize_tab.html:118
 msgid "Custom value"
 msgstr ""
@@ -2158,457 +2084,450 @@ msgid "Disk allocation (GB)"
 msgstr ""
 
 #: instances/templates/instances/resize_tab.html:140
-#: instances/templates/instances/settings_tab.html:269
+#: instances/templates/instances/settings_tab.html:284
 msgid "Error getting disk info"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:11
+#: instances/templates/instances/settings_tab.html:17
 msgid "Boot"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:44
-#: instances/templates/instances/settings_tab.html:621
-#: instances/templates/instances/settings_tab.html:623
+#: instances/templates/instances/settings_tab.html:50
+#: instances/templates/instances/settings_tab.html:655
+#: instances/templates/instances/settings_tab.html:657
 msgid "Migrate"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:56
+#: instances/templates/instances/settings_tab.html:62
+#: venv/lib/python3.6/site-packages/click/core.py:1351
 msgid "Options"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:72
-#: networks/templates/network.html:56 storages/templates/storage.html:69
+#: instances/templates/instances/settings_tab.html:79
+#: networks/templates/network.html:56 storages/templates/storage.html:71
 msgid "Autostart"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:75
+#: instances/templates/instances/settings_tab.html:82
 msgid "Autostart your instance when host server is power on "
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:84
+#: instances/templates/instances/settings_tab.html:91
 msgid "Boot Order"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:88
+#: instances/templates/instances/settings_tab.html:95
 msgid "Enable Boot Menu for your instance when it starts up "
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:91
+#: instances/templates/instances/settings_tab.html:98
 msgid "Show boot menu"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:95
+#: instances/templates/instances/settings_tab.html:102
 msgid "Hide boot menu"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:100
+#: instances/templates/instances/settings_tab.html:107
 msgid "Please shutdown instance to modify boot menu"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:130
+#: instances/templates/instances/settings_tab.html:137
 msgid "up: move selected devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:133
+#: instances/templates/instances/settings_tab.html:140
 msgid "down: move selected devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:139
-#: instances/templates/instances/settings_tab.html:429
+#: instances/templates/instances/settings_tab.html:146
+#: instances/templates/instances/settings_tab.html:456
 msgid "Apply"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:149
+#: instances/templates/instances/settings_tab.html:156
 msgid "Instance Media"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:152
+#: instances/templates/instances/settings_tab.html:159
 msgid "Add CD-ROM"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:169
-#: instances/templates/instances/settings_tab.html:234
+#: instances/templates/instances/settings_tab.html:182
+#: instances/templates/instances/settings_tab.html:221
+#: instances/templates/instances/settings_tab.html:249
 #: interfaces/templates/create_iface_block.html:34
-#: networks/templates/network.html:43 networks/templates/networks.html:59
-#: storages/templates/create_stg_block.html:77
+#: networks/templates/network.html:43 networks/templates/networks.html:58
+#: storages/templates/create_stg_block.html:91
 msgid "Device"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:170
+#: instances/templates/instances/settings_tab.html:183
+#: instances/templates/instances/settings_tab.html:222
 msgid "CD-ROM"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:188
-#: instances/templates/instances/settings_tab.html:190
+#: instances/templates/instances/settings_tab.html:196
+#: instances/templates/instances/settings_tab.html:198
 msgid "Mount"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:193
+#: instances/templates/instances/settings_tab.html:201
 msgid "Detach CD-ROM (remove device)"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:208
-#: instances/templates/instances/settings_tab.html:210
+#: instances/templates/instances/settings_tab.html:227
+#: instances/templates/instances/settings_tab.html:229
 msgid "Unmount"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:220
+#: instances/templates/instances/settings_tab.html:238
 msgid "There is not any CD-ROM device."
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:225
+#: instances/templates/instances/settings_tab.html:243
 msgid "Instance Volume"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:235
+#: instances/templates/instances/settings_tab.html:250
 msgid "Used"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:236
+#: instances/templates/instances/settings_tab.html:251
 msgid "Capacity"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:238
-#: instances/templates/instances/settings_tab.html:363
+#: instances/templates/instances/settings_tab.html:253
+#: instances/templates/instances/settings_tab.html:385
 msgid "Source"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:294
-#: instances/templates/instances/settings_tab.html:298
+#: instances/templates/instances/settings_tab.html:309
+#: instances/templates/instances/settings_tab.html:313
 msgid "Detach"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:294
+#: instances/templates/instances/settings_tab.html:309
 msgid "Are you sure to detach volume?"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:298
-#: instances/templates/instances/settings_tab.html:314
+#: instances/templates/instances/settings_tab.html:313
+#: instances/templates/instances/settings_tab.html:329
 msgid "Are you sure? This may lead data corruption!"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:310
+#: instances/templates/instances/settings_tab.html:325
 msgid "Are you sure to delete volume?"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:330
+#: instances/templates/instances/settings_tab.html:343
 msgid "Add a network device"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:336
+#: instances/templates/instances/settings_tab.html:349
 msgid "Network Devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:341
-#: instances/templates/instances/settings_tab.html:342
+#: instances/templates/instances/settings_tab.html:354
 msgid "Info"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:355
+#: instances/templates/instances/settings_tab.html:367
 msgid "active"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:361
-#: nwfilters/templates/nwfilter.html:75
+#: instances/templates/instances/settings_tab.html:379
+#: nwfilters/templates/nwfilter.html:71
 msgid "Filter"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:368
+#: instances/templates/instances/settings_tab.html:393
 msgid "Edit NIC"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:376
+#: instances/templates/instances/settings_tab.html:403
 msgid "Edit Instance Network"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:389
+#: instances/templates/instances/settings_tab.html:416
 msgid "Net Source"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:397
+#: instances/templates/instances/settings_tab.html:424
 #: interfaces/templates/interface.html:4 interfaces/templates/interface.html:6
 #: interfaces/templates/interface.html:39
 msgid "Interface"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:415
-#: instances/templates/instances/settings_tab.html:454
+#: instances/templates/instances/settings_tab.html:442
+#: instances/templates/instances/settings_tab.html:494
 msgid "Model"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:429
+#: instances/templates/instances/settings_tab.html:456
 msgid "Apply network changes"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:438
+#: instances/templates/instances/settings_tab.html:472
 msgid "Delete Device"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:446
-#: interfaces/templates/create_iface_block.html:71
+#: instances/templates/instances/settings_tab.html:482
+#: interfaces/templates/create_iface_block.html:72
 #: interfaces/templates/interface.html:41
 msgid "IPv4"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:450
-#: interfaces/templates/create_iface_block.html:74
+#: instances/templates/instances/settings_tab.html:488
+#: interfaces/templates/create_iface_block.html:77
 #: interfaces/templates/interface.html:43
 msgid "IPv6"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:456
-msgid "QoS"
-msgstr ""
-
-#: instances/templates/instances/settings_tab.html:468
+#: instances/templates/instances/settings_tab.html:502
 msgid ""
 "In most configurations, macvtap does not work for host to guest network "
 "communication"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:481
+#: instances/templates/instances/settings_tab.html:515
 #: networks/templates/network.html:322
 msgid "QoS Configuration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:487
+#: instances/templates/instances/settings_tab.html:521
 #: networks/templates/add_network_qos.html:18
-#: networks/templates/network.html:328 nwfilters/templates/nwfilter.html:131
+#: networks/templates/network.html:328 nwfilters/templates/nwfilter.html:123
 msgid "Direction"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:488
+#: instances/templates/instances/settings_tab.html:522
 #: networks/templates/add_network_qos.html:27
 #: networks/templates/network.html:329
 msgid "Average"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:489
+#: instances/templates/instances/settings_tab.html:523
 #: networks/templates/add_network_qos.html:34
 #: networks/templates/network.html:330
 msgid "Peak"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:490
+#: instances/templates/instances/settings_tab.html:524
 #: networks/templates/add_network_qos.html:41
 #: networks/templates/network.html:331
 msgid "Burst"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:515
+#: instances/templates/instances/settings_tab.html:549
 #: networks/templates/network.html:353
 msgid "Edit QoS"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:525
+#: instances/templates/instances/settings_tab.html:559
 #: networks/templates/network.html:358
 msgid "Delete QoS"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:541
+#: instances/templates/instances/settings_tab.html:575
 msgid "For migration both host servers must have equal settings and OS type"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:545
+#: instances/templates/instances/settings_tab.html:579
 msgid "Original host"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:551
+#: instances/templates/instances/settings_tab.html:585
 msgid "Host migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:568
+#: instances/templates/instances/settings_tab.html:602
 msgid "Live migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:576
+#: instances/templates/instances/settings_tab.html:610
 msgid "Unsafe migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:584
+#: instances/templates/instances/settings_tab.html:618
 msgid "Delete original"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:592
+#: instances/templates/instances/settings_tab.html:626
 msgid "Offline migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:600
+#: instances/templates/instances/settings_tab.html:634
 msgid "Post copy"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:608
+#: instances/templates/instances/settings_tab.html:642
 msgid "Forces CPU convergence during live migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:608
+#: instances/templates/instances/settings_tab.html:642
 msgid "Auto converge"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:616
+#: instances/templates/instances/settings_tab.html:650
 msgid "Compress instance memory for fast migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:616
+#: instances/templates/instances/settings_tab.html:650
 msgid "Compressed"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:629
+#: instances/templates/instances/settings_tab.html:663
 msgid "If you need to edit XML please Power Off the instance"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:651
+#: instances/templates/instances/settings_tab.html:685
 msgid "Instance owners"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:680
+#: instances/templates/instances/settings_tab.html:714
 msgid "To change console settings, shutdown the instance."
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:697
+#: instances/templates/instances/settings_tab.html:731
 msgid "Create a clone"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:700
+#: instances/templates/instances/settings_tab.html:734
 msgid "Clone Name"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:707
-#: instances/templates/instances/settings_tab.html:738
+#: instances/templates/instances/settings_tab.html:740
+#: instances/templates/instances/settings_tab.html:769
 msgid "Guess"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:726
+#: instances/templates/instances/settings_tab.html:758
 msgid "Network devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:736
+#: instances/templates/instances/settings_tab.html:767
 msgid "Random"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:751
+#: instances/templates/instances/settings_tab.html:781
 msgid "Storage devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:776
-#: instances/templates/instances/settings_tab.html:799
+#: instances/templates/instances/settings_tab.html:805
+#: instances/templates/instances/settings_tab.html:828
 msgid "Title"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:796
+#: instances/templates/instances/settings_tab.html:825
 msgid "To set instance template name description, shutdown the instance."
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:811
+#: instances/templates/instances/settings_tab.html:840
 msgid "Is template"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:832
+#: instances/templates/instances/settings_tab.html:861
 msgid "To set instance video model, shutdown the instance."
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:835
+#: instances/templates/instances/settings_tab.html:864
 msgid "Primary Video Model"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:839
+#: instances/templates/instances/settings_tab.html:868
 msgid "please choose"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:846
-#: instances/templates/instances/settings_tab.html:848
-#: instances/templates/instances/settings_tab.html:868
-#: instances/templates/instances/settings_tab.html:870
-#: instances/templates/instances/settings_tab.html:898
-#: secrets/templates/secrets.html:103
+#: instances/templates/instances/settings_tab.html:874
+#: instances/templates/instances/settings_tab.html:876
+#: instances/templates/instances/settings_tab.html:894
+#: instances/templates/instances/settings_tab.html:896
+#: instances/templates/instances/settings_tab.html:922
+#: virtsecrets/templates/secrets.html:104
 msgid "Set"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:856
+#: instances/templates/instances/settings_tab.html:883
 msgid "To set instance vCPUs hotpluggable"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:859
+#: instances/templates/instances/settings_tab.html:886
 msgid "vCPU Hot Plug"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:863
-#: instances/templates/instances/settings_tab.html:894
+#: instances/templates/instances/settings_tab.html:890
+#: instances/templates/instances/settings_tab.html:919
 msgid "Enabled"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:864
-#: instances/templates/instances/settings_tab.html:895
+#: instances/templates/instances/settings_tab.html:891
+#: instances/templates/instances/settings_tab.html:920
 msgid "Disabled"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:878
+#: instances/templates/instances/settings_tab.html:903
 msgid "To Enable/Disable Qemu Guest Agent. Status"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:883
+#: instances/templates/instances/settings_tab.html:908
 msgid "Disconnected"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:886
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:709
+#: instances/templates/instances/settings_tab.html:911
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:714
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:703
 msgid "Unknown"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:890
+#: instances/templates/instances/settings_tab.html:915
 msgid "Qemu Guest Agent"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:9
-#: instances/templates/instances/snapshots_tab.html:31
-#: instances/templates/instances/snapshots_tab.html:33
+#: instances/templates/instances/snapshots_tab.html:8
+#: instances/templates/instances/snapshots_tab.html:26
 msgid "Take Snapshot"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:14
+#: instances/templates/instances/snapshots_tab.html:13
 msgid "Manage Snapshots"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:22
+#: instances/templates/instances/snapshots_tab.html:20
 msgid ""
 "This may take more than an hour, depending on how much content is on your "
-"instance and how large the disk is."
+"instance and how large the disk is. It could cause web server timeout.."
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:27
+#: instances/templates/instances/snapshots_tab.html:25
 msgid "Enter Snapshot Name"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:38
-msgid "To take a snapshot please Power Off the instance."
-msgstr ""
-
-#: instances/templates/instances/snapshots_tab.html:43
+#: instances/templates/instances/snapshots_tab.html:35
 msgid "Choose a snapshot for restore/delete"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:61
+#: instances/templates/instances/snapshots_tab.html:53
 msgid "Revert to this Snapshot"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:66
+#: instances/templates/instances/snapshots_tab.html:58
 msgid "To restore snapshots you need Power Off the instance."
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:75
+#: instances/templates/instances/snapshots_tab.html:67
 msgid "Delete Snapshot"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:86
+#: instances/templates/instances/snapshots_tab.html:78
 msgid "You do not have any snapshots"
 msgstr ""
 
-#: instances/templates/instances/stats_tab.html:8
+#: instances/templates/instances/stats_tab.html:7
 msgid "Real Time"
 msgstr ""
 
-#: instances/templates/instances/stats_tab.html:23
+#: instances/templates/instances/stats_tab.html:22
 msgid "CPU Usage"
 msgstr ""
 
@@ -2616,11 +2535,11 @@ msgstr ""
 msgid "Memory Usage"
 msgstr ""
 
-#: instances/templates/instances/stats_tab.html:50
+#: instances/templates/instances/stats_tab.html:51
 msgid "Bandwidth Device"
 msgstr ""
 
-#: instances/templates/instances/stats_tab.html:65
+#: instances/templates/instances/stats_tab.html:67
 msgid "Disk I/O device"
 msgstr ""
 
@@ -2628,648 +2547,357 @@ msgstr ""
 msgid "None available device name"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:242
+#: instances/views.py:249
 msgid "Templates cannot be started."
 msgstr ""
 
-#: instances/views.py:345
+#: instances/views.py:352
 #, python-format
 msgid "Instance is migrated to %(hostname)s"
 msgstr ""
 
-#: instances/views.py:368
+#: instances/views.py:375
 msgid "Reset root password"
 msgstr ""
 
-#: instances/views.py:374 instances/views.py:403
+#: instances/views.py:381 instances/views.py:410
 msgid "Please shutdown down your instance and then try again"
 msgstr ""
 
-#: instances/views.py:395
-=======
-#: instances/views.py:236
-msgid "Templates cannot be started."
-msgstr ""
-
-#: instances/views.py:339
-#, python-format
-msgid "Migrate to %(hostname)%"
-msgstr ""
-
-#: instances/views.py:362
-msgid "Reset root password"
-msgstr ""
-
-#: instances/views.py:368 instances/views.py:397
-msgid "Please shutdown down your instance and then try again"
-msgstr ""
-
-#: instances/views.py:389
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:402
 #, python-format
 msgid "Installed new SSH public key %(keyname)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:422
-=======
-#: instances/views.py:416
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:429
 #, python-format
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize CPU of '%(instance_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:431
+#: instances/views.py:438
 #, python-format
 msgid "CPU is resized:  %(old)s to %(new)s"
 msgstr ""
 
-#: instances/views.py:459
-=======
-#: instances/views.py:425
-msgid "Resize CPU"
-msgstr ""
-
-#: instances/views.py:453
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:466
 #, python-format
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize memory of "
 "'%(instance_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:466
+#: instances/views.py:473
 #, python-format
 msgid ""
 "Memory is resized: current/max: %(old_cur)s/%(old_max)s to %(new_cur)s/"
 "%(new_max)s"
 msgstr ""
 
-#: instances/views.py:500
-=======
-#: instances/views.py:462
-msgid "Resize Memory"
-msgstr ""
-
-#: instances/views.py:491
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:507
 #, python-format
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize disks of '%(instance_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:507
+#: instances/views.py:514
 #, python-format
 msgid "Disk is resized: %(dev)s"
 msgstr ""
 
-#: instances/views.py:546
+#: instances/views.py:570
 #, python-format
 msgid "Attach new disk: %(name)s (%(format)s)"
 msgstr ""
 
-#: instances/views.py:577
-=======
-#: instances/views.py:498
-msgid "Disk resize"
-msgstr ""
-
-#: instances/views.py:537
-#, python-format
-msgid "Attach new disk %(name)s (%(format)s)"
-msgstr ""
-
-#: instances/views.py:568
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:609
 #, python-format
 msgid "Attach Existing disk: %(target_dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:635
-=======
-#: instances/views.py:624
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:667
 msgid "Volume changes are applied. But it will be activated after shutdown"
 msgstr ""
 
-#: instances/views.py:626
+#: instances/views.py:670
 msgid "Volume is changed successfully."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:639
-=======
-#: instances/views.py:627
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:671
 #, python-format
 msgid "Edit disk: %(target_dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:661
-=======
-#: instances/views.py:649
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:693
 #, python-format
 msgid "Delete disk: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:677
-=======
-#: instances/views.py:665
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:709
 #, python-format
 msgid "Detach disk: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:690
-=======
-#: instances/views.py:678
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:722
 #, python-format
 msgid "Add CD-ROM: %(target)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:703
-=======
-#: instances/views.py:691
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:735
 #, python-format
 msgid "Detach CD-ROM: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:716
-=======
-#: instances/views.py:704
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:748
 #, python-format
 msgid "Mount media: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:729
-=======
-#: instances/views.py:717
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:761
 #, python-format
 msgid "Unmount media: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:742
+#: instances/views.py:774
 #, python-format
 msgid "Create snapshot: %(snap)s"
 msgstr ""
 
-#: instances/views.py:753
+#: instances/views.py:785
 #, python-format
 msgid "Delete snapshot: %(snap)s"
-=======
-#: instances/views.py:730
-#, python-format
-msgid "New snapshot: %(name)s"
 msgstr ""
 
-#: instances/views.py:741
-#, python-format
-msgid "Delete snapshot: %(snap_name)s"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
-msgstr ""
-
-#: instances/views.py:752
+#: instances/views.py:796
 msgid "Successful revert snapshot: "
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:767
-msgid "Revert snapshot: %(snap)"
+#: instances/views.py:799
+#, python-format
+msgid "Revert snapshot: %(snap)s"
 msgstr ""
 
-#: instances/views.py:781
-=======
-#: instances/views.py:755
-msgid "Revert snapshot"
-msgstr ""
-
-#: instances/views.py:769
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:813
 #, python-format
 msgid "VCPU %(id)s is enabled=%(enabled)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:790
-=======
-#: instances/views.py:780
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:822
 #, python-format
 msgid "VCPU Hot-plug is enabled=%(status)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:800
+#: instances/views.py:832
 msgid "Set autostart"
 msgstr ""
 
-#: instances/views.py:809
+#: instances/views.py:841
 msgid "Unset autostart"
 msgstr ""
 
-#: instances/views.py:818
+#: instances/views.py:850
 msgid "Enable boot menu"
 msgstr ""
 
-#: instances/views.py:827
+#: instances/views.py:859
 msgid "Disable boot menu"
 msgstr ""
 
-#: instances/views.py:842
+#: instances/views.py:874
 msgid "Set boot order"
 msgstr ""
 
-#: instances/views.py:847
-=======
-#: instances/views.py:791
-msgid "Set autostart"
-msgstr ""
-
-#: instances/views.py:800
-msgid "Unset autostart"
-msgstr ""
-
-#: instances/views.py:809
-msgid "Enable boot menu"
-msgstr ""
-
-#: instances/views.py:818
-msgid "Disable boot menu"
-msgstr ""
-
-#: instances/views.py:833
-msgid "Set boot order"
-msgstr ""
-
-#: instances/views.py:836
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:879
 msgid "Boot menu changes applied. But it will be activated after shutdown"
 msgstr ""
 
-#: instances/views.py:838
+#: instances/views.py:882
 msgid "Boot order changed successfully."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:861
+#: instances/views.py:893
 msgid "Change instance XML"
 msgstr ""
 
-#: instances/views.py:875
+#: instances/views.py:907
 #, python-format
 msgid "Set Guest Agent: %(status)s"
 msgstr ""
 
-#: instances/views.py:885
-msgid "Set Video Model: %(model)"
-=======
-#: instances/views.py:849
-msgid "Edit XML"
-msgstr ""
-
-#: instances/views.py:863
+#: instances/views.py:917
 #, python-format
-msgid "Set Guest Agent %(status)s"
+msgid "Set Video Model: %(model)s"
 msgstr ""
 
-#: instances/views.py:873
-msgid "Set Video Model"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
-msgstr ""
-
-#: instances/views.py:882
+#: instances/views.py:926
 msgid "Change network"
 msgstr ""
 
-#: instances/views.py:895
+#: instances/views.py:949
 msgid "Network Device Config is changed. Please shutdown instance to activate."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:922
+#: instances/views.py:974
 #, python-format
 msgid "Add network: %(mac)s"
 msgstr ""
 
-#: instances/views.py:933
+#: instances/views.py:985
 #, python-format
 msgid "Delete Network: %(mac)s"
 msgstr ""
 
-#: instances/views.py:946
-=======
-#: instances/views.py:903
-msgid "Add network"
-msgstr ""
-
-#: instances/views.py:917
-msgid "Delete network"
-msgstr ""
-
-#: instances/views.py:933
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:998
 #, python-format
 msgid "Set Link State: %(state)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:966 networks/views.py:231
-=======
-#: instances/views.py:952
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1018 networks/views.py:231
 #, python-format
 msgid "%(qos_dir)s QoS is set"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:971
-=======
-#: instances/views.py:956
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1023
 #, python-format
 msgid ""
 "%(qos_dir)s QoS is set. Network XML is changed.                 Stop and "
 "start network to activate new config."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:988 networks/views.py:246
-=======
-#: instances/views.py:970
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1040 networks/views.py:246
 #, python-format
 msgid "%(qos_dir)s QoS is deleted"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:993
-=======
-#: instances/views.py:974
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1045
 #, python-format
 msgid ""
 "%(qos_dir)s QoS is deleted. Network XML is changed.                 Stop and "
 "start network to activate new config."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1012
+#: instances/views.py:1064
 msgid "Only one owner is allowed and the one already added"
 msgstr ""
 
-#: instances/views.py:1017
-=======
-#: instances/views.py:990
-msgid "Only one owner is allowed and the one already added"
-msgstr ""
-
-#: instances/views.py:995
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1069
 #, python-format
 msgid "Add owner: %(user)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1028
+#: instances/views.py:1080
 #, python-format
 msgid "Delete owner: %(userinstance_id)s "
 msgstr ""
 
-#: instances/views.py:1060
-=======
-#: instances/views.py:1006
-#, python-format
-msgid "Deleted owner %(userinstance_id)s"
-msgstr ""
-
-#: instances/views.py:1038
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1112
 #, python-format
 msgid "User '%(quota_msg)s' quota reached, cannot create '%(clone_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1066
+#: instances/views.py:1118
 #, python-format
 msgid "Instance '%(clone_name)s' already exists!"
 msgstr ""
 
-#: instances/views.py:1069
-=======
-#: instances/views.py:1044
-msgid "Instance 'clone_name' already exists!"
-msgstr ""
-
-#: instances/views.py:1047
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1121
 #, python-format
 msgid "Instance name '%(clone_name)s' contains invalid characters!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1072
-=======
-#: instances/views.py:1050
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1124
 #, python-format
 msgid "Instance MAC '%(clone_mac)s' invalid format!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1082
+#: instances/views.py:1134
 #, python-format
 msgid "Create a clone of '%(instance_name)s'"
 msgstr ""
 
-#: instances/views.py:1121
-=======
-#: instances/views.py:1060
-#, python-format
-msgid "Clone of '%(instance_name)s'"
-msgstr ""
-
-#: instances/views.py:1093
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1173
 msgid ""
 "Error setting console password. You should check that your instance have an "
 "graphic device."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1126
+#: instances/views.py:1178
 msgid "Set VNC password"
 msgstr ""
 
-#: instances/views.py:1135
+#: instances/views.py:1187
 msgid "Set VNC keymap"
 msgstr ""
 
-#: instances/views.py:1140
+#: instances/views.py:1192
 msgid "Set VNC type"
 msgstr ""
 
-#: instances/views.py:1145
+#: instances/views.py:1197
 msgid "Set VNC listen address"
 msgstr ""
 
-#: instances/views.py:1168
+#: instances/views.py:1220
 msgid "Edit options"
 msgstr ""
 
-#: instances/views.py:1182
+#: instances/views.py:1234
 msgid "Send console.vv file"
 msgstr ""
 
-#: instances/views.py:1243 instances/views.py:1337
+#: instances/views.py:1295 instances/views.py:1389
 msgid "A virtual machine with this name already exists"
 msgstr ""
 
-#: instances/views.py:1320
+#: instances/views.py:1372
 msgid "You haven't defined any storage pools"
 msgstr ""
 
-#: instances/views.py:1322
-msgid "You haven't defined any network pools"
-msgstr ""
-
-#: instances/views.py:1339
-msgid "There is an instance with same name. Remove it and try again!"
-msgstr ""
-
-#: instances/views.py:1343
-msgid "No Virtual Machine MAC has been entered"
-msgstr ""
-
 #: instances/views.py:1374
-msgid "Image has already exist. Please check volumes or change instance name"
-msgstr ""
-
-#: instances/views.py:1401
-msgid "First you need to create or select an image"
-msgstr ""
-
-#: instances/views.py:1419
-msgid "Invalid cache mode"
-msgstr ""
-
-#: instances/views.py:1460
-msgid "Instance is created"
-msgstr ""
-
-#: instances/views.py:1481
-msgid "Flavor Created"
-msgstr ""
-
-#: instances/views.py:1487
-msgid "Create Flavor"
-msgstr ""
-
-#: instances/views.py:1497
-msgid "Flavor Updated"
-msgstr ""
-
-#: instances/views.py:1503
-msgid "Update Flavor"
-msgstr ""
-
-#: instances/views.py:1512
-=======
-#: instances/views.py:1096
-msgid "Set VNC password"
-msgstr ""
-
-#: instances/views.py:1104
-msgid "Set VNC keymap"
-msgstr ""
-
-#: instances/views.py:1109
-msgid "Set VNC type"
-msgstr ""
-
-#: instances/views.py:1114
-msgid "Set VNC listen address"
-msgstr ""
-
-#: instances/views.py:1137
-msgid "Edit options"
-msgstr ""
-
-#: instances/views.py:1151
-msgid "Send console.vv file"
-msgstr ""
-
-#: instances/views.py:1206 instances/views.py:1298
-msgid "A virtual machine with this name already exists"
-msgstr ""
-
-#: instances/views.py:1281
-msgid "You haven't defined any storage pools"
-msgstr ""
-
-#: instances/views.py:1283
 msgid "You haven't defined any network pools"
 msgstr ""
 
-#: instances/views.py:1300
+#: instances/views.py:1391
 msgid "There is an instance with same name. Remove it and try again!"
 msgstr ""
 
-#: instances/views.py:1304
+#: instances/views.py:1395
 msgid "No Virtual Machine MAC has been entered"
 msgstr ""
 
-#: instances/views.py:1327
+#: instances/views.py:1426
 msgid "Image has already exist. Please check volumes or change instance name"
 msgstr ""
 
-#: instances/views.py:1347
+#: instances/views.py:1453
 msgid "First you need to create or select an image"
 msgstr ""
 
-#: instances/views.py:1365
+#: instances/views.py:1471
 msgid "Invalid cache mode"
 msgstr ""
 
-#: instances/views.py:1402
+#: instances/views.py:1512
 msgid "Instance is created"
 msgstr ""
 
-#: instances/views.py:1423
+#: instances/views.py:1533
 msgid "Flavor Created"
 msgstr ""
 
-#: instances/views.py:1431
+#: instances/views.py:1539
 msgid "Create Flavor"
 msgstr ""
 
-#: instances/views.py:1442
+#: instances/views.py:1549
 msgid "Flavor Updated"
 msgstr ""
 
-#: instances/views.py:1450
+#: instances/views.py:1555
 msgid "Update Flavor"
 msgstr ""
 
-#: instances/views.py:1460
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1564
 msgid "Flavor Deleted"
 msgstr ""
 
@@ -3335,12 +2963,12 @@ msgstr ""
 
 #: interfaces/templates/create_iface_block.html:44
 #: interfaces/templates/interface.html:76
-#: interfaces/templates/interfaces.html:62
-#: storages/templates/create_stg_block.html:35
-#: storages/templates/create_stg_block.html:64
-#: storages/templates/create_stg_block.html:93
-#: storages/templates/create_stg_block.html:158
-#: storages/templates/storages.html:60
+#: interfaces/templates/interfaces.html:63
+#: storages/templates/create_stg_block.html:49
+#: storages/templates/create_stg_block.html:78
+#: storages/templates/create_stg_block.html:107
+#: storages/templates/create_stg_block.html:172
+#: storages/templates/storages.html:59
 msgid "Type"
 msgstr ""
 
@@ -3368,43 +2996,43 @@ msgstr ""
 msgid "Delay"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:82
+#: interfaces/templates/create_iface_block.html:86
 msgid "IPv4 Mode"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:85
-#: interfaces/templates/create_iface_block.html:112
+#: interfaces/templates/create_iface_block.html:89
+#: interfaces/templates/create_iface_block.html:116
 #: networks/templates/network.html:109 networks/templates/network.html:220
 msgid "DHCP"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:86
-#: interfaces/templates/create_iface_block.html:113
+#: interfaces/templates/create_iface_block.html:90
+#: interfaces/templates/create_iface_block.html:117
 msgid "Static"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:87
-#: interfaces/templates/create_iface_block.html:111
+#: interfaces/templates/create_iface_block.html:91
+#: interfaces/templates/create_iface_block.html:115
 msgid "No configuration"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:92
+#: interfaces/templates/create_iface_block.html:96
 msgid "IPv4 Address"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:98
+#: interfaces/templates/create_iface_block.html:102
 msgid "IPv4 Gateway"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:108
+#: interfaces/templates/create_iface_block.html:112
 msgid "IPv6 Mode"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:118
+#: interfaces/templates/create_iface_block.html:122
 msgid "IPv6 Address"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:124
+#: interfaces/templates/create_iface_block.html:128
 msgid "IPv6 Gateway"
 msgstr ""
 
@@ -3422,12 +3050,12 @@ msgstr ""
 
 #: interfaces/templates/interface.html:55
 #: interfaces/templates/interface.html:78 networks/templates/network.html:45
-#: storages/templates/storage.html:56
+#: storages/templates/storage.html:58
 msgid "State"
 msgstr ""
 
 #: interfaces/templates/interface.html:62 networks/templates/network.html:52
-#: storages/templates/storage.html:64
+#: storages/templates/storage.html:66
 msgid "Stop"
 msgstr ""
 
@@ -3439,7 +3067,7 @@ msgstr ""
 msgid "Speed"
 msgstr ""
 
-#: interfaces/templates/interfaces.html:47
+#: interfaces/templates/interfaces.html:48
 msgid "Hypervisor doesn't have any Interfaces"
 msgstr ""
 
@@ -3448,14 +3076,18 @@ msgid "user"
 msgstr ""
 
 #: logs/models.py:6
-msgid "instance"
+msgid "host"
 msgstr ""
 
 #: logs/models.py:7
-msgid "message"
+msgid "instance"
 msgstr ""
 
 #: logs/models.py:8
+msgid "message"
+msgstr ""
+
+#: logs/models.py:9
 msgid "date"
 msgstr ""
 
@@ -3526,8 +3158,8 @@ msgid "Add New Network"
 msgstr ""
 
 #: networks/templates/create_net_block.html:20
-#: storages/templates/create_stg_block.html:44
-#: storages/templates/create_stg_block.html:73
+#: storages/templates/create_stg_block.html:58
+#: storages/templates/create_stg_block.html:87
 msgid "default"
 msgstr ""
 
@@ -3649,12 +3281,12 @@ msgid "IPv4 Fixed Addresses"
 msgstr ""
 
 #: networks/templates/network.html:158 networks/templates/network.html:268
-#: nwfilters/templates/nwfilters.html:85
+#: nwfilters/templates/nwfilters.html:83
 msgid "Show"
 msgstr ""
 
-#: networks/templates/network.html:166 networks/templates/network.html:276
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:395
+#: networks/templates/network.html:165 networks/templates/network.html:275
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:403
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:377
 msgid "Clear"
 msgstr ""
@@ -3679,11 +3311,11 @@ msgstr ""
 msgid "IPv6 Fixed Addresses"
 msgstr ""
 
-#: networks/templates/networks.html:46
+#: networks/templates/networks.html:45
 msgid "Hypervisor doesn't have any Network"
 msgstr ""
 
-#: networks/templates/networks.html:61
+#: networks/templates/networks.html:60
 msgid "Forward"
 msgstr ""
 
@@ -3695,7 +3327,6 @@ msgstr ""
 msgid "Please enter bridge/dev name"
 msgstr ""
 
-<<<<<<< HEAD
 #: networks/views.py:57
 msgid "For libvirt, the IPv6 network prefix must be /64"
 msgstr ""
@@ -3720,34 +3351,10 @@ msgid "%(family)s DHCP Range is Changed."
 msgstr ""
 
 #: networks/views.py:210
-=======
-#: networks/views.py:56
-msgid "For libvirt, the IPv6 network prefix must be /64"
-msgstr ""
-
-#: networks/views.py:126
-msgid "Unknown Network Family"
-msgstr ""
-
-#: networks/views.py:176
-msgid "{family.upper()} Fixed Address Operation Completed."
-msgstr ""
-
-#: networks/views.py:186
-msgid "{family.upper()} Fixed Address is Deleted."
-msgstr ""
-
-#: networks/views.py:194
-msgid "{family.upper()} DHCP Range is Changed."
-msgstr ""
-
-#: networks/views.py:203
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid ""
 "Network XML is changed. \\Stop and start network to activate new config."
 msgstr ""
 
-<<<<<<< HEAD
 #: networks/views.py:215
 msgid "Network XML is changed."
 msgstr ""
@@ -3764,34 +3371,6 @@ msgstr ""
 msgid ""
 "%(qos_dir)s QoS is deleted. Network XML is changed.                         "
 "Stop and start network to activate new config"
-=======
-#: networks/views.py:205
-msgid "Network XML is changed."
-msgstr ""
-
-#: networks/views.py:218
-msgid "{qos_dir.capitalize()} QoS is set. Network XML is changed."
-msgstr ""
-
-#: networks/views.py:219
-msgid "Stop and start network to activate new config"
-msgstr ""
-
-#: networks/views.py:221
-msgid "{} QoS is set"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
-msgstr ""
-
-#: networks/views.py:232
-msgid "{qos_dir.capitalize()} QoS is deleted. Network XML is changed. "
-msgstr ""
-
-#: networks/views.py:233
-msgid "Stop and start network to activate new config."
-msgstr ""
-
-#: networks/views.py:235
-msgid "{qos_dir.capitalize()} QoS is deleted"
 msgstr ""
 
 #: nwfilters/templates/add_nwf_rule.html:12
@@ -3806,8 +3385,8 @@ msgstr ""
 msgid "Create New NWFilter"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:39 nwfilters/templates/nwfilters.html:55
-#: secrets/templates/secrets.html:59
+#: nwfilters/templates/nwfilter.html:39 nwfilters/templates/nwfilters.html:53
+#: virtsecrets/templates/secrets.html:60
 msgid "UUID"
 msgstr ""
 
@@ -3815,47 +3394,46 @@ msgstr ""
 msgid "Filter References"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:100
+#: nwfilters/templates/nwfilter.html:92
 msgid "Reference"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:125
+#: nwfilters/templates/nwfilter.html:117
 msgid "Rules"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:129
+#: nwfilters/templates/nwfilter.html:121
 msgid "Rule"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:130
+#: nwfilters/templates/nwfilter.html:122
 msgid "Action Type"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:132
+#: nwfilters/templates/nwfilter.html:124
 msgid "Priority"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:133
+#: nwfilters/templates/nwfilter.html:125
 msgid "Statematch"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:134
+#: nwfilters/templates/nwfilter.html:126
 msgid "Directives"
 msgstr ""
 
-#: nwfilters/templates/nwfilters.html:71
+#: nwfilters/templates/nwfilters.html:69
 msgid "Details of NWFilter"
 msgstr ""
 
-#: nwfilters/templates/nwfilters.html:94
+#: nwfilters/templates/nwfilters.html:92
 msgid "Clone NWFilter"
 msgstr ""
 
-#: nwfilters/templates/nwfilters.html:135
+#: nwfilters/templates/nwfilters.html:132
 msgid "Hypervisor doesn't have any NWFilters"
 msgstr ""
 
-<<<<<<< HEAD
 #: nwfilters/views.py:44
 msgid "A network filter with this name already exists"
 msgstr ""
@@ -3865,98 +3443,23 @@ msgid "A network filter with this UUID already exists"
 msgstr ""
 
 #: nwfilters/views.py:51
-=======
-#: nwfilters/views.py:41
-msgid "A network filter with this name already exists"
-msgstr ""
-
-#: nwfilters/views.py:44
-msgid "A network filter with this UUID already exists"
-msgstr ""
-
-#: nwfilters/views.py:48
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid "%(filter)s network filter is created"
 msgstr ""
 
-<<<<<<< HEAD
 #: nwfilters/views.py:60
 #, python-format
 msgid "%(filter)s network filter is deleted"
 msgstr ""
 
-#: nwfilters/views.py:76
+#: nwfilters/views.py:77
 #, python-format
 msgid "NWFilter is in use by %(instance)s. Cannot be deleted."
 msgstr ""
 
-#: nwfilters/views.py:93
+#: nwfilters/views.py:96
 #, python-format
 msgid "Cloning NWFilter %(name)s as %(clone)s"
-=======
-#: nwfilters/views.py:57
-#, python-brace-format
-msgid "Deleting NWFilter: {name}"
-msgstr ""
-
-#: nwfilters/views.py:69
-#, python-brace-format
-msgid "NWFilter is in use by {inst}. Cannot be deleted."
-msgstr ""
-
-#: nwfilters/views.py:86
-#, python-brace-format
-msgid "Cloning NWFilter {name} as {cln_name}"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:12
-msgid "Create New Secret"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:18
-msgid "Ephemeral"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:21
-#: secrets/templates/create_secret_block.html:30
-msgid "no"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:22
-#: secrets/templates/create_secret_block.html:31
-msgid "yes"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:27
-msgid "Private"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:36
-#: storages/templates/storage.html:54
-msgid "Usage"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:46
-#: secrets/templates/secrets.html:61
-msgid "Data"
-msgstr ""
-
-#: secrets/templates/secrets.html:50
-msgid "Hypervisor doesn't have any Secrets"
-msgstr ""
-
-#: secrets/templates/secrets.html:60
-msgid "Usage Type"
-msgstr ""
-
-#: secrets/templates/secrets.html:88
-msgid "Set secret value"
-msgstr ""
-
-#: secrets/templates/secrets.html:94
-msgid "Value"
 msgstr ""
 
 #: storages/forms.py:10 storages/forms.py:37
@@ -3987,64 +3490,64 @@ msgstr ""
 msgid "Create Storage Pool"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:18
+#: storages/templates/create_stg_block.html:19
 msgid "DIR"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:21
+#: storages/templates/create_stg_block.html:24
 msgid "LVM"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:23
+#: storages/templates/create_stg_block.html:29
 msgid "CEPH"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:25
+#: storages/templates/create_stg_block.html:34
 msgid "NETFS"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:27
+#: storages/templates/create_stg_block.html:39
 msgid "ISO"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:48
-#: storages/templates/create_stg_block.html:222
+#: storages/templates/create_stg_block.html:62
+#: storages/templates/create_stg_block.html:236
 msgid "Path"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:106
+#: storages/templates/create_stg_block.html:120
 msgid "Ceph User"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:112
+#: storages/templates/create_stg_block.html:126
 msgid "Ceph Pool"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:118
+#: storages/templates/create_stg_block.html:132
 msgid "Ceph Host"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:177
+#: storages/templates/create_stg_block.html:191
 msgid "Remote Path"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:186
+#: storages/templates/create_stg_block.html:200
 msgid "auto"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:187
+#: storages/templates/create_stg_block.html:201
 msgid "nfs"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:188
+#: storages/templates/create_stg_block.html:202
 msgid "glusterfs"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:189
+#: storages/templates/create_stg_block.html:203
 msgid "cifs"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:194
+#: storages/templates/create_stg_block.html:208
 msgid "Local Path"
 msgstr ""
 
@@ -4060,47 +3563,52 @@ msgstr ""
 msgid "Add New Volume"
 msgstr ""
 
-#: storages/templates/storage.html:44
+#: storages/templates/storage.html:46
 msgid "Pool name"
 msgstr ""
 
-#: storages/templates/storage.html:46
+#: storages/templates/storage.html:48
 msgid "Pool type"
 msgstr ""
 
-#: storages/templates/storage.html:48
+#: storages/templates/storage.html:50
 msgid "Pool path"
 msgstr ""
 
-#: storages/templates/storage.html:50
+#: storages/templates/storage.html:52
 msgid "Pool status"
 msgstr ""
 
-#: storages/templates/storage.html:85 storages/templates/storages.html:64
+#: storages/templates/storage.html:56
+#: virtsecrets/templates/create_secret_block.html:36
+msgid "Usage"
+msgstr ""
+
+#: storages/templates/storage.html:90 storages/templates/storages.html:63
 msgid "Volumes"
 msgstr ""
 
-#: storages/templates/storage.html:97
+#: storages/templates/storage.html:98
 msgid "Allocated"
 msgstr ""
 
-#: storages/templates/storage.html:118
+#: storages/templates/storage.html:119
 msgid "Clone image"
 msgstr ""
 
-#: storages/templates/storage.html:131
+#: storages/templates/storage.html:132
 msgid "Convert"
 msgstr ""
 
-#: storages/templates/storage.html:140
+#: storages/templates/storage.html:141
 msgid "raw"
 msgstr ""
 
-#: storages/templates/storage.html:141
+#: storages/templates/storage.html:142
 msgid "qcow"
 msgstr ""
 
-#: storages/templates/storage.html:142
+#: storages/templates/storage.html:143
 msgid "qcow2"
 msgstr ""
 
@@ -4108,11 +3616,11 @@ msgstr ""
 msgid "Hypervisor doesn't have any Volumes"
 msgstr ""
 
-#: storages/templates/storages.html:46
+#: storages/templates/storages.html:45
 msgid "Hypervisor doesn't have any Storages"
 msgstr ""
 
-#: storages/views.py:39
+#: storages/views.py:40
 msgid "Pool name already use"
 msgstr ""
 
@@ -4120,67 +3628,44 @@ msgstr ""
 msgid "You need create secret for pool"
 msgstr ""
 
-<<<<<<< HEAD
-#: storages/views.py:48
-msgid "You need input all fields for creating ceph pool"
-msgstr ""
-
-#: storages/views.py:144
-#, python-format
-msgid "Volume: %(volume)s is deleted."
-msgstr ""
-
-#: storages/views.py:149
-msgid "ISO image already exist"
-msgstr ""
-
-#: storages/views.py:153
-#, python-format
-msgid "ISO: %(file)s is uploaded."
-msgstr ""
-
-#: storages/views.py:162
-msgid "Name of volume already in use"
-msgstr ""
-
-#: storages/views.py:174
-#, python-format
-msgid "%(image)s image cloned as %(clone)s successfully"
-msgstr ""
-
-#: storages/views.py:220
-#, python-format
-msgid "Image file %(name)s is created successfully"
-=======
 #: storages/views.py:49
 msgid "You need input all fields for creating ceph pool"
 msgstr ""
 
-#: storages/views.py:132
-#, python-brace-format
-msgid "Volume: {volname} is deleted."
+#: storages/views.py:96
+msgid "Security Issues with file uploading"
 msgstr ""
 
-#: storages/views.py:137
-msgid "ISO image already exist"
-msgstr ""
-
-#: storages/views.py:141
-msgid "ISO: {request.FILES['file']} is uploaded."
+#: storages/views.py:103
+msgid "File not found. Check the path variable and filename"
 msgstr ""
 
 #: storages/views.py:150
+#, python-format
+msgid "Volume: %(vol)s is deleted."
+msgstr ""
+
+#: storages/views.py:155
+msgid "ISO image already exist"
+msgstr ""
+
+#: storages/views.py:159
+#, python-format
+msgid "ISO: %(file)s is uploaded."
+msgstr ""
+
+#: storages/views.py:168
 msgid "Name of volume already in use"
 msgstr ""
 
-#: storages/views.py:160
-msgid "{data['image']} image cloned as {name} successfully"
+#: storages/views.py:180
+#, python-format
+msgid "%(image)s image cloned as %(name)s successfully"
 msgstr ""
 
-#: storages/views.py:199
-#, python-brace-format
-msgid "Image file {name} is created successfully"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: storages/views.py:226
+#, python-format
+msgid "Image file %(name)s is created successfully"
 msgstr ""
 
 #: templates/403.html:3
@@ -4241,18 +3726,321 @@ msgstr ""
 msgid "Processing"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/bootstrap4/components.py:17
-#: venv/lib/python3.6/site-packages/bootstrap4/templates/bootstrap4/form_errors.html:3
-#: venv/lib/python3.6/site-packages/bootstrap4/templates/bootstrap4/messages.html:4
-msgid "close"
+#: templates/search_block.html:3
+msgid "Search"
 msgstr ""
 
+#: venv/lib/python3.6/site-packages/click/_termui_impl.py:496
+#, python-brace-format
+msgid "{editor}: Editing failed"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_termui_impl.py:500
+#, python-brace-format
+msgid "{editor}: Editing failed: {e}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:20
+msgid ""
+"Click will abort further execution because Python was configured to use "
+"ASCII as encoding for the environment. Consult https://click.palletsprojects."
+"com/unicode-support/ for mitigation steps."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:56
+msgid ""
+"Additional information: on this system no suitable UTF-8 locales were "
+"discovered. This most likely requires resolving by reconfiguring the locale "
+"system."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:65
+msgid ""
+"This system supports the C.UTF-8 locale which is recommended. You might be "
+"able to resolve your issue by exporting the following environment variables:"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:75
+#, python-brace-format
+msgid ""
+"This system lists some UTF-8 supporting locales that you can pick from. The "
+"following suitable locales were discovered: {locales}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:93
+msgid ""
+"Click discovered that you exported a UTF-8 locale but the locale system "
+"could not pick up from it because it does not exist. The exported locale is "
+"{locale!r} but it is not supported."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1095
+msgid "Aborted!"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1279
+#: venv/lib/python3.6/site-packages/click/decorators.py:434
+msgid "Show this message and exit."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1308
+#: venv/lib/python3.6/site-packages/click/core.py:1334
+#, python-brace-format
+msgid "(Deprecated) {text}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1375
+#, python-brace-format
+msgid "Got unexpected extra argument ({args})"
+msgid_plural "Got unexpected extra arguments ({args})"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1390
+msgid "DeprecationWarning: The command {name!r} is deprecated."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1607
+msgid "Commands"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1639
+msgid "Missing command."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1717
+msgid "No such command {name!r}."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2258
+msgid "Value must be an iterable."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2278
+#, python-brace-format
+msgid "Takes {nargs} values but 1 was given."
+msgid_plural "Takes {nargs} values but {len} were given."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2701
+#, python-brace-format
+msgid "env var: {var}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2724
+msgid "(dynamic)"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2735
+#, python-brace-format
+msgid "default: {default}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2748
+msgid "required"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/decorators.py:339
+#, python-format
+msgid "%(prog)s, version %(version)s"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/decorators.py:403
+msgid "Show the version and exit."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:43
+#: venv/lib/python3.6/site-packages/click/exceptions.py:79
+#, python-brace-format
+msgid "Error: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:71
+#, python-brace-format
+msgid "Try '{command} {option}' for help."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:120
+#, python-brace-format
+msgid "Invalid value: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:122
+#, python-brace-format
+msgid "Invalid value for {param_hint}: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:178
+msgid "Missing argument"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:180
+msgid "Missing option"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:182
+msgid "Missing parameter"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:184
+#, python-brace-format
+msgid "Missing {param_type}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:191
+#, python-brace-format
+msgid "Missing parameter: {param_name}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:211
+#, python-brace-format
+msgid "No such option: {name}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:223
+#, python-brace-format
+msgid "Did you mean {possibility}?"
+msgid_plural "(Possible options: {possibilities})"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:261
+msgid "unknown error"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:268
+msgid "Could not open file {filename!r}: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:231
+msgid "Argument {name!r} takes {nargs} values."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:413
+msgid "Option {name!r} does not take a value."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:474
+msgid "Option {name!r} requires an argument."
+msgid_plural "Option {name!r} requires {nargs} arguments."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/shell_completion.py:316
+msgid "Shell completion is not supported for Bash versions older than 4.4."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/shell_completion.py:322
+msgid "Couldn't detect Bash version, shell completion is not supported."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:161
+msgid "Repeat for confirmation"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:178
+msgid "Error: The value you entered was invalid."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:180
+#, python-brace-format
+msgid "Error: {e.message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:191
+msgid "Error: The two entered values do not match."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:247
+msgid "Error: invalid input"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:798
+msgid "Press any key to continue..."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:258
+#, python-brace-format
+msgid ""
+"Choose from:\n"
+"\t{choices}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:290
+msgid "{value!r} is not {choice}."
+msgid_plural "{value!r} is not one of {choices}."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:380
+msgid "{value!r} does not match the format {format}."
+msgid_plural "{value!r} does not match the formats {formats}."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:402
+msgid "{value!r} is not a valid {number_type}."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:458
+#, python-brace-format
+msgid "{value} is not in the range {range}."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:599
+msgid "{value!r} is not a valid boolean."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:623
+msgid "{value!r} is not a valid UUID."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:801
+msgid "file"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:803
+msgid "directory"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:805
+msgid "path"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:851
+msgid "{name} {filename!r} does not exist."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:860
+msgid "{name} {filename!r} is a file."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:868
+msgid "{name} {filename!r} is a directory."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:876
+msgid "{name} {filename!r} is not writable."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:884
+msgid "{name} {filename!r} is not readable."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:951
+#, python-brace-format
+msgid "{len_type} values are required, but {len_value} was given."
+msgid_plural "{len_type} values are required, but {len_value} were given."
+msgstr[0] ""
+msgstr[1] ""
+
 #: venv/lib/python3.6/site-packages/django/contrib/messages/apps.py:7
 #: venv2/lib/python2.7/site-packages/django/contrib/messages/apps.py:7
 msgid "Messages"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/contrib/sitemaps/apps.py:7
+#: venv/lib/python3.6/site-packages/django/contrib/sitemaps/apps.py:8
 #: venv2/lib/python2.7/site-packages/django/contrib/sitemaps/apps.py:7
 msgid "Site Maps"
 msgstr ""
@@ -4267,103 +4055,108 @@ msgstr ""
 msgid "Syndication"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/paginator.py:45
+#. Translators: String used to replace omitted page numbers in elided page
+#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10].
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:30
+msgid "…"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:51
 #: venv2/lib/python2.7/site-packages/django/core/paginator.py:43
 msgid "That page number is not an integer"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/paginator.py:47
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:53
 #: venv2/lib/python2.7/site-packages/django/core/paginator.py:45
 msgid "That page number is less than 1"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/paginator.py:52
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:58
 #: venv2/lib/python2.7/site-packages/django/core/paginator.py:50
 msgid "That page contains no results"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:31
+#: venv/lib/python3.6/site-packages/django/core/validators.py:22
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:34
 msgid "Enter a valid value."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:102
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:658
+#: venv/lib/python3.6/site-packages/django/core/validators.py:93
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:675
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:107
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:671
 msgid "Enter a valid URL."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:154
+#: venv/lib/python3.6/site-packages/django/core/validators.py:150
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:160
 msgid "Enter a valid integer."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:165
+#: venv/lib/python3.6/site-packages/django/core/validators.py:161
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:171
 msgid "Enter a valid email address."
 msgstr ""
 
 #. Translators: "letters" means latin letters: a-z and A-Z.
-#: venv/lib/python3.6/site-packages/django/core/validators.py:239
-#: venv2/lib/python2.7/site-packages/django/core/validators.py:245
+#: venv/lib/python3.6/site-packages/django/core/validators.py:262
 msgid ""
-"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+"Enter a valid “slug” consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:246
-#: venv2/lib/python2.7/site-packages/django/core/validators.py:252
+#: venv/lib/python3.6/site-packages/django/core/validators.py:269
 msgid ""
-"Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
+"Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:255
-#: venv/lib/python3.6/site-packages/django/core/validators.py:275
+#: venv/lib/python3.6/site-packages/django/core/validators.py:278
+#: venv/lib/python3.6/site-packages/django/core/validators.py:288
+#: venv/lib/python3.6/site-packages/django/core/validators.py:311
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:257
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:277
 msgid "Enter a valid IPv4 address."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:260
-#: venv/lib/python3.6/site-packages/django/core/validators.py:276
+#: venv/lib/python3.6/site-packages/django/core/validators.py:296
+#: venv/lib/python3.6/site-packages/django/core/validators.py:312
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:262
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:278
 msgid "Enter a valid IPv6 address."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:270
-#: venv/lib/python3.6/site-packages/django/core/validators.py:274
+#: venv/lib/python3.6/site-packages/django/core/validators.py:306
+#: venv/lib/python3.6/site-packages/django/core/validators.py:310
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:272
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:276
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:304
+#: venv/lib/python3.6/site-packages/django/core/validators.py:340
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:308
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1131
 msgid "Enter only digits separated by commas."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:310
+#: venv/lib/python3.6/site-packages/django/core/validators.py:346
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:314
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:342
+#: venv/lib/python3.6/site-packages/django/core/validators.py:379
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:345
 #, python-format
 msgid "Ensure this value is less than or equal to %(limit_value)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:351
+#: venv/lib/python3.6/site-packages/django/core/validators.py:388
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:354
 #, python-format
 msgid "Ensure this value is greater than or equal to %(limit_value)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:361
+#: venv/lib/python3.6/site-packages/django/core/validators.py:398
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:364
 #, python-format
 msgid ""
@@ -4375,7 +4168,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:376
+#: venv/lib/python3.6/site-packages/django/core/validators.py:413
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:379
 #, python-format
 msgid ""
@@ -4387,15 +4180,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:395
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:290
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:325
+#: venv/lib/python3.6/site-packages/django/core/validators.py:432
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:292
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:327
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:303
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:340
 msgid "Enter a number."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:397
+#: venv/lib/python3.6/site-packages/django/core/validators.py:434
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:399
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
@@ -4403,7 +4196,7 @@ msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:402
+#: venv/lib/python3.6/site-packages/django/core/validators.py:439
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:404
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
@@ -4411,7 +4204,7 @@ msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:407
+#: venv/lib/python3.6/site-packages/django/core/validators.py:444
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:409
 #, python-format
 msgid ""
@@ -4421,48 +4214,47 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:469
-#: venv2/lib/python2.7/site-packages/django/core/validators.py:463
+#: venv/lib/python3.6/site-packages/django/core/validators.py:506
 #, python-format
 msgid ""
-"File extension '%(extension)s' is not allowed. Allowed extensions are: "
-"'%(allowed_extensions)s'."
+"File extension “%(extension)s” is not allowed. Allowed extensions are: "
+"%(allowed_extensions)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:521
+#: venv/lib/python3.6/site-packages/django/core/validators.py:559
 msgid "Null characters are not allowed."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/base.py:1165
-#: venv/lib/python3.6/site-packages/django/forms/models.py:756
+#: venv/lib/python3.6/site-packages/django/db/models/base.py:1210
+#: venv/lib/python3.6/site-packages/django/forms/models.py:768
 #: venv2/lib/python2.7/site-packages/django/db/models/base.py:1209
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:749
 msgid "and"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/base.py:1167
+#: venv/lib/python3.6/site-packages/django/db/models/base.py:1212
 #: venv2/lib/python2.7/site-packages/django/db/models/base.py:1211
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:104
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:100
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:116
 #, python-format
 msgid "Value %(value)r is not a valid choice."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:105
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:101
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:117
 msgid "This field cannot be null."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:106
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:102
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:118
 msgid "This field cannot be blank."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:107
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:103
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:119
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
@@ -4470,346 +4262,340 @@ msgstr ""
 
 #. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
 #. Eg: "Title must be unique for pub_date year"
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:111
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:107
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:123
 #, python-format
 msgid ""
 "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:128
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:126
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:140
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:905
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1772
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:901
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1809
-msgid "Integer"
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:909
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1770
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:905
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1807
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:958
 #, python-format
-msgid "'%(value)s' value must be an integer."
+msgid "“%(value)s” value must be either True or False."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:984
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1850
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:978
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1878
-msgid "Big (8 byte) integer"
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:996
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:990
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:959
 #, python-format
-msgid "'%(value)s' value must be either True or False."
+msgid "“%(value)s” value must be either True, False, or None."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:997
-#, python-format
-msgid "'%(value)s' value must be either True, False, or None."
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:999
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:961
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:992
 msgid "Boolean (Either True or False)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1040
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1002
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1058
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1104
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1096
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1115
 msgid "Comma-separated integers"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1153
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1172
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1145
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+"“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD "
 "format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1155
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1298
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1174
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1319
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1147
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1290
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
+"“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid "
 "date."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1158
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1150
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1177
 msgid "Date (without time)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1296
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1317
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1288
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ] format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1300
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1321
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1292
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
 "[TZ]) but it is an invalid date/time."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1304
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1296
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1325
 msgid "Date (with time)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1452
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1475
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1444
 #, python-format
-msgid "'%(value)s' value must be a decimal number."
+msgid "“%(value)s” value must be a decimal number."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1454
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1446
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1477
 msgid "Decimal number"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1593
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1628
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1585
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
+"“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[."
 "uuuuuu] format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1596
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1588
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1631
 msgid "Duration"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1646
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1638
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1683
 msgid "Email address"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1669
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1661
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1707
 msgid "File path"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1735
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1773
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1727
 #, python-format
-msgid "'%(value)s' value must be a float."
+msgid "“%(value)s” value must be a float."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1737
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1729
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1775
 msgid "Floating point number"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1866
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1767
+#, python-format
+msgid "“%(value)s” value must be an integer."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1769
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:901
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1809
+msgid "Integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1852
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:978
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1878
+msgid "Big (8 byte) integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1867
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2130
+msgid "Small integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1875
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1893
 msgid "IPv4 address"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1897
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1906
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1924
 msgid "IP address"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1977
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1978
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2006
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1986
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1987
 #, python-format
-msgid "'%(value)s' value must be either None, True or False."
+msgid "“%(value)s” value must be either None, True or False."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1980
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1989
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2008
 msgid "Boolean (Either True, False or None)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2015
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2043
+msgid "Positive big integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2056
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2071
 msgid "Positive integer"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2028
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2069
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2083
 msgid "Positive small integer"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2042
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2083
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2096
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2074
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2130
-msgid "Small integer"
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2081
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2115
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2137
 msgid "Text"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2109
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2163
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2181
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
 "format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2111
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2165
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2183
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
 "invalid time."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2114
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2186
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2168
 msgid "Time"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2240
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2312
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2296
 msgid "URL"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2262
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2334
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2319
 msgid "Raw binary data"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2312
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2366
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2399
 #, python-format
-msgid "'%(value)s' is not a valid UUID."
+msgid "“%(value)s” is not a valid UUID."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2314
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2401
 msgid "Universally unique identifier"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:221
+#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:226
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/files.py:228
 msgid "File"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:778
+#: venv/lib/python3.6/site-packages/django/db/models/fields/json.py:18
+msgid "A JSON object"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/json.py:20
+msgid "Value must be valid JSON."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:790
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:788
 #, python-format
 msgid "%(model)s instance with %(field)s %(value)r does not exist."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:780
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:792
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:790
 msgid "Foreign Key (type determined by related field)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1007
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1045
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1029
 msgid "One-to-one relationship"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1057
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1099
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1104
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1058
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1100
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1105
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1100
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1142
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1147
 msgid "Many-to-many relationship"
 msgstr ""
 
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the label
-#: venv/lib/python3.6/site-packages/django/forms/boundfield.py:146
+#: venv/lib/python3.6/site-packages/django/forms/boundfield.py:150
 #: venv2/lib/python2.7/site-packages/django/forms/boundfield.py:181
 msgid ":?.!"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:53
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:54
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:56
 msgid "This field is required."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:245
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:247
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:258
 msgid "Enter a whole number."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:396
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:1126
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:402
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1143
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:418
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:1149
 msgid "Enter a valid date."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:420
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:1127
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:426
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1144
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:442
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:1150
 msgid "Enter a valid time."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:442
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:454
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:464
 msgid "Enter a valid date/time."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:471
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:488
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:493
 msgid "Enter a valid duration."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:472
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:489
 #, python-brace-format
 msgid "The number of days must be between {min_days} and {max_days}."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:532
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:549
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:547
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:533
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:550
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:548
 msgid "No file was submitted."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:534
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:551
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:549
 msgid "The submitted file is empty."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:536
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:553
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:551
 #, python-format
 msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
@@ -4818,21 +4604,21 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:539
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:556
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:554
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:600
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:617
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:619
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:762
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:852
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1270
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:779
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:869
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1309
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:776
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:872
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1265
@@ -4840,78 +4626,82 @@ msgstr ""
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:853
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:968
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1269
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:870
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:985
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1308
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:873
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:990
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1264
 msgid "Enter a list of values."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:969
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:986
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:991
 msgid "Enter a complete value."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:1185
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1202
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:1208
 msgid "Enter a valid UUID."
 msgstr ""
 
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1232
+msgid "Enter a valid JSON."
+msgstr ""
+
 #. Translators: This is the default suffix added to form field labels
-#: venv/lib/python3.6/site-packages/django/forms/forms.py:86
+#: venv/lib/python3.6/site-packages/django/forms/forms.py:76
 #: venv2/lib/python2.7/site-packages/django/forms/forms.py:87
 msgid ":"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/forms.py:212
+#: venv/lib/python3.6/site-packages/django/forms/forms.py:203
 #: venv2/lib/python2.7/site-packages/django/forms/forms.py:213
 #, python-format
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:91
-#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:97
-msgid "ManagementForm data is missing or has been tampered with"
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:61
+#, python-format
+msgid ""
+"ManagementForm data is missing or has been tampered with. Missing fields: "
+"%(field_names)s. You may need to file a bug report if the issue persists."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:338
-#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:355
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:370
 #, python-format
-msgid "Please submit %d or fewer forms."
-msgid_plural "Please submit %d or fewer forms."
+msgid "Please submit at most %d form."
+msgid_plural "Please submit at most %d forms."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:345
-#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:362
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:377
 #, python-format
-msgid "Please submit %d or more forms."
-msgid_plural "Please submit %d or more forms."
+msgid "Please submit at least %d form."
+msgid_plural "Please submit at least %d forms."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:371
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:373
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:405
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:412
 #: venv2/lib/python2.7/site-packages/django/forms/formsets.py:390
 #: venv2/lib/python2.7/site-packages/django/forms/formsets.py:392
 msgid "Order"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:751
+#: venv/lib/python3.6/site-packages/django/forms/models.py:763
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:744
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:755
+#: venv/lib/python3.6/site-packages/django/forms/models.py:767
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:748
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:761
+#: venv/lib/python3.6/site-packages/django/forms/models.py:773
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:754
 #, python-format
 msgid ""
@@ -4919,55 +4709,55 @@ msgid ""
 "for the %(lookup)s in %(date_field)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:770
+#: venv/lib/python3.6/site-packages/django/forms/models.py:782
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:763
 msgid "Please correct the duplicate values below."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1091
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1109
 msgid "The inline value did not match the parent instance."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1158
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1193
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1154
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1272
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1311
 #, python-format
-msgid "\"%(pk)s\" is not a valid value."
+msgid "“%(pk)s” is not a valid value."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/utils.py:162
-#: venv2/lib/python2.7/site-packages/django/forms/utils.py:172
+#: venv/lib/python3.6/site-packages/django/forms/utils.py:172
 #, python-format
 msgid ""
-"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it "
 "may be ambiguous or it may not exist."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:396
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:404
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:378
 msgid "Currently"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:710
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:715
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:704
 msgid "Yes"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:711
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:716
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:705
 msgid "No"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:788
+#. Translators: Please do not add spaces around commas.
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:805
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:851
 msgid "yes,no,maybe"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:817
 #: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:834
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:851
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:880
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:897
 #, python-format
@@ -4976,62 +4766,62 @@ msgid_plural "%(size)d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:836
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:853
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:899
 #, python-format
 msgid "%s KB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:838
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:855
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:901
 #, python-format
 msgid "%s MB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:840
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:857
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:903
 #, python-format
 msgid "%s GB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:842
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:859
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:905
 #, python-format
 msgid "%s TB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:844
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:861
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:907
 #, python-format
 msgid "%s PB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:62
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:66
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:66
 msgid "p.m."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:63
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:67
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:67
 msgid "a.m."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:68
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:72
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:72
 msgid "PM"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:69
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:73
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:73
 msgid "AM"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:150
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:146
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:158
 msgid "midnight"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:152
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:148
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:160
 msgid "noon"
 msgstr ""
@@ -5375,20 +5165,20 @@ msgstr ""
 msgid "This is not a valid IPv6 address."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/text.py:67
+#: venv/lib/python3.6/site-packages/django/utils/text.py:71
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s…"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/text.py:233
+#: venv/lib/python3.6/site-packages/django/utils/text.py:240
 #: venv2/lib/python2.7/site-packages/django/utils/text.py:251
 msgid "or"
 msgstr ""
 
 #. Translators: This string is used as a separator between list elements
-#: venv/lib/python3.6/site-packages/django/utils/text.py:252
-#: venv/lib/python3.6/site-packages/django/utils/timesince.py:83
+#: venv/lib/python3.6/site-packages/django/utils/text.py:259
+#: venv/lib/python3.6/site-packages/django/utils/timesince.py:94
 #: venv2/lib/python2.7/site-packages/django/utils/text.py:270
 #: venv2/lib/python2.7/site-packages/django/utils/timesince.py:71
 msgid ", "
@@ -5442,11 +5232,6 @@ msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/utils/timesince.py:72
-#: venv2/lib/python2.7/site-packages/django/utils/timesince.py:60
-msgid "0 minutes"
-msgstr ""
-
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:110
 #: venv2/lib/python2.7/site-packages/django/views/csrf.py:109
 msgid "Forbidden"
@@ -5458,29 +5243,27 @@ msgid "CSRF verification failed. Request aborted."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:115
-#: venv2/lib/python2.7/site-packages/django/views/csrf.py:114
 msgid ""
-"You are seeing this message because this HTTPS site requires a 'Referer "
-"header' to be sent by your Web browser, but none was sent. This header is "
+"You are seeing this message because this HTTPS site requires a “Referer "
+"header” to be sent by your Web browser, but none was sent. This header is "
 "required for security reasons, to ensure that your browser is not being "
 "hijacked by third parties."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:120
-#: venv2/lib/python2.7/site-packages/django/views/csrf.py:119
 msgid ""
-"If you have configured your browser to disable 'Referer' headers, please re-"
-"enable them, at least for this site, or for HTTPS connections, or for 'same-"
-"origin' requests."
+"If you have configured your browser to disable “Referer” headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for “same-"
+"origin” requests."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:124
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
-"including the 'Referrer-Policy: no-referrer' header, please remove them. The "
-"CSRF protection requires the 'Referer' header to do strict referer checking. "
-"If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
-"\" ...> for links to third-party sites."
+"including the “Referrer-Policy: no-referrer” header, please remove them. The "
+"CSRF protection requires the “Referer” header to do strict referer checking. "
+"If you’re concerned about privacy, use alternatives like <a rel=\"noreferrer"
+"\" …> for links to third-party sites."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:132
@@ -5492,10 +5275,9 @@ msgid ""
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:137
-#: venv2/lib/python2.7/site-packages/django/views/csrf.py:129
 msgid ""
 "If you have configured your browser to disable cookies, please re-enable "
-"them, at least for this site, or for 'same-origin' requests."
+"them, at least for this site, or for “same-origin” requests."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:142
@@ -5540,7 +5322,7 @@ msgstr ""
 msgid "No %(verbose_name_plural)s available"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:589
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:594
 #: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:669
 #, python-format
 msgid ""
@@ -5548,10 +5330,9 @@ msgid ""
 "allow_future is False."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:623
-#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:703
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:628
 #, python-format
-msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgid "Invalid date string “%(datestr)s” given format “%(format)s”"
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/detail.py:54
@@ -5561,8 +5342,7 @@ msgid "No %(verbose_name)s found matching the query"
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/list.py:67
-#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:77
-msgid "Page is not 'last', nor can it be converted to an int."
+msgid "Page is not “last”, nor can it be converted to an int."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/list.py:72
@@ -5572,9 +5352,8 @@ msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/list.py:154
-#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:172
 #, python-format
-msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgid "Empty list and “%(class_name)s.allow_empty” is False."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/static.py:40
@@ -5583,9 +5362,8 @@ msgid "Directory indexes are not allowed here."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/static.py:42
-#: venv2/lib/python2.7/site-packages/django/views/static.py:46
 #, python-format
-msgid "\"%(path)s\" does not exist"
+msgid "“%(path)s” does not exist"
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/static.py:80
@@ -5594,22 +5372,19 @@ msgstr ""
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:6
-msgid "Django: the Web framework for perfectionists with deadlines."
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:7
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:221
+msgid "The install worked successfully! Congratulations!"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:345
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:207
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:367
-msgid "The install worked successfully! Congratulations!"
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:368
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:222
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
@@ -5618,39 +5393,160 @@ msgid ""
 "URLs."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:383
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:230
 msgid "Django Documentation"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:384
-msgid "Topics, references, &amp; how-to's"
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:231
+msgid "Topics, references, &amp; how-to’s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:395
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:239
 msgid "Tutorial: A Polling App"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:396
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:240
 msgid "Get started with Django"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:407
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:248
 msgid "Django Community"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:408
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:249
 msgid "Connect, get help, or contribute"
 msgstr ""
 
+#: venv/lib/python3.6/site-packages/django_bootstrap5/components.py:20
+msgid "close"
+msgstr ""
+
 #: venv/lib/python3.6/site-packages/django_icons/renderers/image.py:217
 msgid "Icon of {}"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/qr_code/qrcode/utils.py:73
-#, python-format
-msgid "The option '%s' is not a valid option for a QR code."
+#: venv/lib/python3.6/site-packages/isort/main.py:158
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1615
+msgid "show this help message and exit"
 msgstr ""
 
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:245
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:252
+msgid ""
+"Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
+"hyphens."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:463
+#, python-format
+msgid ""
+"File extension '%(extension)s' is not allowed. Allowed extensions are: "
+"'%(allowed_extensions)s'."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:905
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1807
+#, python-format
+msgid "'%(value)s' value must be an integer."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:990
+#, python-format
+msgid "'%(value)s' value must be either True or False."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1172
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+"format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1174
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1319
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
+"date."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1317
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1321
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]) but it is an invalid date/time."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1475
+#, python-format
+msgid "'%(value)s' value must be a decimal number."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1628
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
+"uuuuuu] format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1773
+#, python-format
+msgid "'%(value)s' value must be a float."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2006
+#, python-format
+msgid "'%(value)s' value must be either None, True or False."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2163
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2165
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"invalid time."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2366
+#, python-format
+msgid "'%(value)s' is not a valid UUID."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:97
+msgid "ManagementForm data is missing or has been tampered with"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:355
+#, python-format
+msgid "Please submit %d or fewer forms."
+msgid_plural "Please submit %d or fewer forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:362
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1093
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
@@ -5660,12 +5556,44 @@ msgstr ""
 msgid "\"%(pk)s\" is not a valid value for a primary key."
 msgstr ""
 
+#: venv2/lib/python2.7/site-packages/django/forms/utils.py:172
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
 #: venv2/lib/python2.7/site-packages/django/utils/text.py:81
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
+#: venv2/lib/python2.7/site-packages/django/utils/timesince.py:60
+msgid "0 minutes"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:114
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:119
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:129
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
 #: venv2/lib/python2.7/site-packages/django/views/debug.py:520
 msgid "Welcome to Django"
 msgstr ""
@@ -5690,6 +5618,25 @@ msgid ""
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 
+#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:703
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:77
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:172
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/static.py:46
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
+
 #: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:313
 msgid "usage: "
 msgstr ""
@@ -5749,10 +5696,6 @@ msgstr ""
 msgid "optional arguments"
 msgstr ""
 
-#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1615
-msgid "show this help message and exit"
-msgstr ""
-
 #: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1621
 msgid "show program's version number and exit"
 msgstr ""
@@ -5838,6 +5781,49 @@ msgstr ""
 msgid "%s: error: %s\n"
 msgstr ""
 
+#: virtsecrets/templates/create_secret_block.html:12
+msgid "Create New Secret"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:18
+msgid "Ephemeral"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:21
+#: virtsecrets/templates/create_secret_block.html:30
+msgid "no"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:22
+#: virtsecrets/templates/create_secret_block.html:31
+msgid "yes"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:27
+msgid "Private"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:46
+#: virtsecrets/templates/secrets.html:62
+msgid "Data"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:51
+msgid "Hypervisor doesn't have any Secrets"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:61
+msgid "Usage Type"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:89
+msgid "Set secret value"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:95
+msgid "Value"
+msgstr ""
+
 #: webvirtcloud/middleware.py:18
 #, python-format
 msgid "libvirt Error - %(exception)s"
diff --git a/locale/tr/LC_MESSAGES/django.mo b/locale/tr/LC_MESSAGES/django.mo
index 4d879b1..38d8bc0 100644
Binary files a/locale/tr/LC_MESSAGES/django.mo and b/locale/tr/LC_MESSAGES/django.mo differ
diff --git a/locale/tr/LC_MESSAGES/django.po b/locale/tr/LC_MESSAGES/django.po
index 1288a52..6d3a9fa 100644
--- a/locale/tr/LC_MESSAGES/django.po
+++ b/locale/tr/LC_MESSAGES/django.po
@@ -11,13 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2020-11-05 09:36+0000\n"
+"POT-Creation-Date: 2021-12-20 07:22+0000\n"
 "PO-Revision-Date: 2020-11-04 12:00+0000\n"
-=======
-"POT-Creation-Date: 2020-10-23 07:53+0000\n"
-"PO-Revision-Date: 2020-06-09 12:00+0000\n"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 "Last-Translator: catborise <muhammetalisag@gmail.com>, 2020\n"
 "Language-Team: Turkish (https://www.transifex.com/catborise/teams/110663/"
 "tr/)\n"
@@ -28,11 +23,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: accounts/forms.py:25
-<<<<<<< HEAD
-=======
-#, fuzzy
-#| msgid "Instance owners"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "Instance owned by another user"
 msgstr "Diğer kullanının sanal makineleri"
 
@@ -45,7 +35,6 @@ msgid "Public key already exist"
 msgstr "Açık anahtar zaten mevcut"
 
 #: accounts/forms.py:59
-<<<<<<< HEAD
 msgid "Invalid key"
 msgstr "Geçersiz anahtar"
 
@@ -53,17 +42,6 @@ msgstr "Geçersiz anahtar"
 msgid "Email"
 msgstr "E-posta"
 
-=======
-#, fuzzy
-#| msgid "Invalid cache mode"
-msgid "Invalid key"
-msgstr "Geçersiz anahtar"
-
-#: accounts/forms.py:75
-msgid "Email"
-msgstr "E-posta"
-
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #: accounts/models.py:23
 #, python-format
 msgid "Instance \"%(inst)s\" of user %(user)s"
@@ -103,135 +81,103 @@ msgid "Can change password"
 msgstr "Parola değiştirebilir"
 
 #: accounts/templates/account.html:7 accounts/templates/account.html:8
-<<<<<<< HEAD
-=======
-#, fuzzy
-#| msgid "View Profile"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "User Profile"
 msgstr "Kullanıcı Profili"
 
 #: accounts/templates/account.html:12
 msgid "Email OTP QR code"
 msgstr "OTP QR Kodu e-postası"
-<<<<<<< HEAD
 
 #: accounts/templates/account.html:16
 msgid "Edit user"
 msgstr "Kullanıcı düzenle"
 
 #: accounts/templates/account.html:19
-=======
-
-#: accounts/templates/account.html:16
-#, fuzzy
-#| msgid "Edit user info"
-msgid "Edit user"
-msgstr "Kullanıcı düzenle"
-
-#: accounts/templates/account.html:19
-#, fuzzy
-#| msgid "Create new instance"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "Create user instance"
 msgstr "Yeni sanal makine oluştur"
 
-#: accounts/templates/account.html:27
+#: accounts/templates/account.html:28
 #: computes/templates/computes/instances.html:5
 #: computes/templates/computes/instances.html:9
-#: computes/templates/computes/instances.html:32
-#: computes/templates/overview.html:19 instances/templates/allinstances.html:5
+#: computes/templates/computes/instances.html:30
+#: computes/templates/overview.html:18 instances/templates/allinstances.html:5
 #: instances/templates/allinstances.html:9
 #: instances/templates/bottom_bar.html:17
 #: interfaces/templates/interface.html:16
-#: interfaces/templates/interfaces.html:20 networks/templates/network.html:17
+#: interfaces/templates/interfaces.html:22 networks/templates/network.html:17
 #: networks/templates/networks.html:19 nwfilters/templates/nwfilter.html:17
-#: nwfilters/templates/nwfilters.html:25 secrets/templates/secrets.html:23
-#: storages/templates/storage.html:22 storages/templates/storages.html:19
-#: templates/navbar.html:14
+#: nwfilters/templates/nwfilters.html:23 storages/templates/storage.html:23
+#: storages/templates/storages.html:19 templates/navbar.html:14
+#: virtsecrets/templates/secrets.html:25
 msgid "Instances"
-msgstr "Sanal Makineler"
+msgstr "Sanallar"
 
-#: accounts/templates/account.html:30
-<<<<<<< HEAD
-=======
-#, fuzzy
-#| msgid "Public key"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: accounts/templates/account.html:33
 msgid "Public Keys"
 msgstr "Açık anahtar"
 
-#: accounts/templates/account.html:40 admin/templates/admin/logs.html:27
+#: accounts/templates/account.html:44 admin/templates/admin/logs.html:27
 #: instances/templates/instance.html:5
 msgid "Instance"
 msgstr "Sanal Makine"
 
-#: accounts/templates/account.html:41
+#: accounts/templates/account.html:45
 msgid "VNC"
 msgstr "VNC"
 
-#: accounts/templates/account.html:42 instances/templates/instance.html:87
-#: instances/templates/instances/resize_tab.html:56
-#: instances/templates/instances/resize_tab.html:58
-#: instances/templates/instances/resize_tab.html:85
+#: accounts/templates/account.html:46 instances/templates/instance.html:93
+#: instances/templates/instances/resize_tab.html:55
+#: instances/templates/instances/resize_tab.html:57
+#: instances/templates/instances/resize_tab.html:84
 #: instances/templates/instances/resize_tab.html:121
 #: instances/templates/instances/resize_tab.html:125
 #: instances/templates/instances/resize_tab.html:151
 #: instances/templates/instances/resize_tab.html:153
 #: instances/templates/instances/resize_tab.html:158
 msgid "Resize"
-<<<<<<< HEAD
 msgstr "Boyutlandır"
-=======
-msgstr "Yeniden Boyutlandır"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 
-#: accounts/templates/account.html:43 accounts/templates/account.html:61
-#: accounts/templates/profile.html:51 admin/templates/admin/group_list.html:46
-#: admin/templates/admin/user_list.html:68
-#: computes/templates/computes/list.html:54
-#: instances/templates/instances/settings_tab.html:310
-#: instances/templates/instances/settings_tab.html:314
+#: accounts/templates/account.html:47 accounts/templates/account.html:65
+#: accounts/templates/profile.html:55 admin/templates/admin/group_list.html:43
+#: admin/templates/admin/user_list.html:65
+#: computes/templates/computes/list.html:53
+#: instances/templates/instances/settings_tab.html:325
+#: instances/templates/instances/settings_tab.html:329
 #: interfaces/templates/interface.html:60 networks/templates/network.html:50
-#: nwfilters/templates/nwfilter.html:111 nwfilters/templates/nwfilter.html:151
-#: nwfilters/templates/nwfilters.html:120 secrets/templates/secrets.html:77
-#: storages/templates/storage.html:61 storages/templates/storage.html:174
-#: templates/common/confirm_delete.html:21
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:375
+#: nwfilters/templates/nwfilter.html:103 nwfilters/templates/nwfilter.html:143
+#: nwfilters/templates/nwfilters.html:118 storages/templates/storage.html:63
+#: storages/templates/storage.html:175 templates/common/confirm_delete.html:21
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:417
 #: venv2/lib/python2.7/site-packages/django/forms/formsets.py:394
+#: virtsecrets/templates/secrets.html:78
 msgid "Delete"
 msgstr "Sil"
 
-#: accounts/templates/account.html:44
-#: instances/templates/create_instance_w2.html:81
-#: instances/templates/instances/settings_tab.html:239
-#: instances/templates/instances/snapshots_tab.html:49
-#: nwfilters/templates/nwfilter.html:101 nwfilters/templates/nwfilter.html:135
-#: nwfilters/templates/nwfilters.html:57 secrets/templates/secrets.html:62
-#: storages/templates/storage.html:100
+#: accounts/templates/account.html:48
+#: instances/templates/create_instance_w2.html:80
+#: instances/templates/instances/settings_tab.html:254
+#: instances/templates/instances/snapshots_tab.html:41
+#: nwfilters/templates/nwfilter.html:93 nwfilters/templates/nwfilter.html:127
+#: nwfilters/templates/nwfilters.html:55 storages/templates/storage.html:101
+#: virtsecrets/templates/secrets.html:63
 msgid "Action"
 msgstr "Eylem"
 
-#: accounts/templates/account.html:56
+#: accounts/templates/account.html:60
 msgid "edit"
 msgstr "düzenle"
 
-#: accounts/templates/account.html:74
+#: accounts/templates/account.html:78
 msgid "Key name"
 msgstr "Anahtar adı"
 
-#: accounts/templates/account.html:75
+#: accounts/templates/account.html:79
 msgid "Public key"
 msgstr "Açık anahtar"
 
 #: accounts/templates/accounts/change_password_form.html:7
 #: accounts/templates/accounts/change_password_form.html:14
-#: accounts/templates/profile.html:29
-<<<<<<< HEAD
-=======
-#, fuzzy
-#| msgid "Can change password"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: accounts/templates/profile.html:33
 msgid "Change Password"
 msgstr "Parola Değiştir"
 
@@ -244,11 +190,11 @@ msgid "Cancel"
 msgstr "İptal"
 
 #: accounts/templates/accounts/change_password_form.html:27
-#: instances/templates/instances/settings_tab.html:638
-#: instances/templates/instances/settings_tab.html:642
-#: instances/templates/instances/settings_tab.html:824
-#: instances/templates/instances/settings_tab.html:826
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:397
+#: instances/templates/instances/settings_tab.html:672
+#: instances/templates/instances/settings_tab.html:676
+#: instances/templates/instances/settings_tab.html:853
+#: instances/templates/instances/settings_tab.html:855
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:405
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:379
 msgid "Change"
 msgstr "Değiştir"
@@ -258,13 +204,9 @@ msgstr "Değiştir"
 msgid ""
 "\n"
 "Scan this QR code to get OTP for account '%(user)s'\n"
-<<<<<<< HEAD
 msgstr ""
 "\n"
 "'%(user)s' hesabı için bu OTP QR kodunu tarayin\n"
-=======
-msgstr "'%(user)s' hesabında OTP açmak içim bu QR kodunu tara\n"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 
 #: accounts/templates/accounts/email_otp_form.html:12
 msgid ""
@@ -273,7 +215,6 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-<<<<<<< HEAD
 "   OTP QR kodunun gönderileceği e-posta adresini giriniz.\n"
 "    "
 
@@ -281,22 +222,13 @@ msgstr ""
 msgid "Send"
 msgstr "Gönder"
 
-=======
-"    OTP QR kodunun gönderileceği e-posta adresini giriniz.\n"
-"    "
-
-#: accounts/templates/accounts/email_otp_form.html:27
-msgid "Send"
-msgstr "Gönder"
-
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #: accounts/templates/accounts/otp_login.html:23
 msgid "I do not have/lost my OTP!"
 msgstr "OTP mevcut değil/kaybettim!"
 
 #: accounts/templates/accounts/otp_login.html:24
 #: accounts/templates/login.html:5 accounts/templates/login.html:23
-#: accounts/templates/login.html:27
+#: accounts/templates/login.html:28
 msgid "Sign In"
 msgstr "Oturum Aç"
 
@@ -308,12 +240,12 @@ msgstr "WebVirtCloud"
 msgid "Incorrect username or password."
 msgstr "Kullanıcı adı veya parola hatalı."
 
-#: accounts/templates/login.html:24 admin/templates/admin/logs.html:26
-#: computes/templates/computes/instances.html:67
+#: accounts/templates/login.html:24 admin/templates/admin/logs.html:25
+#: computes/templates/computes/instances.html:64
 #: instances/templates/add_instance_owner_block.html:18
 #: instances/templates/allinstances_index_grouped.html:8
 #: instances/templates/allinstances_index_nongrouped.html:7
-#: instances/templates/instances/stats_tab.html:84
+#: instances/templates/instances/stats_tab.html:87
 msgid "User"
 msgstr "Kullanıcı"
 
@@ -337,38 +269,26 @@ msgstr "Oturumdan başarıyla çıkıldı"
 msgid "Profile"
 msgstr "Profil"
 
-#: accounts/templates/profile.html:14
+#: accounts/templates/profile.html:15
 msgid "Edit Profile"
 msgstr "Profil Düzenle"
 
-#: accounts/templates/profile.html:17
-#: instances/templates/instances/access_tab.html:23
+#: accounts/templates/profile.html:20
+#: instances/templates/instances/access_tab.html:20
 msgid "SSH Keys"
 msgstr "SSH Anahtarları"
 
-#: accounts/templates/profile.html:34
-#: instances/templates/instances/settings_tab.html:686
-#: instances/templates/instances/settings_tab.html:688
-<<<<<<< HEAD
-=======
-#, fuzzy
-#| msgid "date"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: accounts/templates/profile.html:38
+#: instances/templates/instances/settings_tab.html:720
+#: instances/templates/instances/settings_tab.html:722
 msgid "Update"
 msgstr "Güncelle"
 
-#: accounts/templates/profile.html:64
-<<<<<<< HEAD
+#: accounts/templates/profile.html:68
 msgid "Add SSH Key"
 msgstr "SSH Anahtarı Ekle"
-=======
-#, fuzzy
-#| msgid "SSH Keys"
-msgid "Add SSH Key"
-msgstr "Ekle SSH Anahtarı"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 
-#: accounts/templates/profile.html:72
+#: accounts/templates/profile.html:76
 #: instances/templates/add_instance_network_block.html:50
 #: instances/templates/add_instance_owner_block.html:31
 #: instances/templates/create_flav_block.html:28
@@ -383,7 +303,6 @@ msgstr "OTP QR Kodu"
 #: accounts/utils.py:51
 msgid "Please view HTML version of this message."
 msgstr "Lütfen bu mesajın HTML sürümünü görüntüleyin."
-<<<<<<< HEAD
 
 #: accounts/views.py:26
 msgid "Profile updated"
@@ -432,70 +351,6 @@ msgid "OTP QR code was emailed to user %(user)s"
 msgstr "OTP QR kodu %(user)s kullanıcısına gönderildi"
 
 #: accounts/views.py:196
-=======
-
-#: accounts/views.py:26
-#, fuzzy
-#| msgid "Profile"
-msgid "Profile updated"
-msgstr "Profil güncellendi"
-
-#: accounts/views.py:40
-msgid "SSH key added"
-msgstr "SSH anahtarı eklendi"
-
-#: accounts/views.py:45
-#, fuzzy
-#| msgid "SSH Keys"
-msgid "Add SSH key"
-msgstr "SSH Anahtarı Ekle"
-
-#: accounts/views.py:53
-msgid "SSH key deleted"
-msgstr "SSH anahtarı silindi"
-
-#: accounts/views.py:58
-#, fuzzy
-#| msgid "Delete entry"
-msgid "Delete SSH key"
-msgstr "SSH anahtarı sil"
-
-#: accounts/views.py:86
-#, fuzzy
-#| msgid "Password"
-msgid "Password Changed"
-msgstr "Parola Değişti"
-
-#: accounts/views.py:106
-#, fuzzy
-#| msgid "Create new instance"
-msgid "Create User Instance"
-msgstr "Yeni Kullanıcı Sanal Makinesi Oluştur"
-
-#: accounts/views.py:124
-#, fuzzy
-#| msgid "Update User"
-msgid "Update User Instance"
-msgstr "Kullanıcı Sanal Makinesini Güncelle"
-
-#: accounts/views.py:160
-#, python-format
-msgid "OTP Sent to %s"
-msgstr "OTP %s ye gönderildi"
-
-#: accounts/views.py:165
-#, fuzzy
-#| msgid "Email"
-msgid "Email OTP"
-msgstr "OTP e-posta"
-
-#: accounts/views.py:175
-#, python-format
-msgid "OTP QR code was emailed to user %s"
-msgstr "OTP QR kodu %s kullanıcısına gönderildi"
-
-#: accounts/views.py:177
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "User email not set, failed to send QR code"
 msgstr "Kullanıcı e-postası girilmemiş, QR kod gönderimi başarısız"
 
@@ -503,12 +358,11 @@ msgstr "Kullanıcı e-postası girilmemiş, QR kod gönderimi başarısız"
 msgid "Permissions"
 msgstr "İzinler"
 
-#: admin/forms.py:56 admin/templates/admin/group_list.html:15
+#: admin/forms.py:56 admin/templates/admin/group_list.html:13
 #: templates/navbar.html:30
 msgid "Groups"
 msgstr "Gruplar"
 
-<<<<<<< HEAD
 #: admin/forms.py:81
 #, fuzzy
 #| msgid ""
@@ -520,147 +374,137 @@ msgid ""
 "password, \n"
 "                    but you can change the password using <a href='{}'>this "
 "form</a>."
-=======
-#: admin/forms.py:79
-msgid ""
-"Raw passwords are not stored, so there is no way to see\n"
-"                this user's password, but you can change the password using "
-"<a href='{}'>this form</a>."
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgstr ""
 "Açık parolalar saklanmadığından bu kullanıcının parolasını\n"
 "                görme imkanı yok. Faka parolayı <a href='{}'>bu formu</a> "
 "kullanarak değiştirebilirsiniz."
 
 #: admin/templates/admin/group_list.html:5 admin/views.py:87
-#: instances/templates/instances/settings_tab.html:63 templates/navbar.html:29
+#: instances/templates/instances/settings_tab.html:69 templates/navbar.html:29
 msgid "Users"
 msgstr "Kullanıcılar"
 
-#: admin/templates/admin/group_list.html:13
-#: admin/templates/admin/user_list.html:16
-#: computes/templates/computes/instances.html:18
-#: instances/templates/allinstances.html:16
-#: nwfilters/templates/nwfilters.html:12 storages/templates/storage.html:87
-#: templates/search_block.html:3
-msgid "Search"
-msgstr "Ara"
-
-#: admin/templates/admin/group_list.html:23 admin/templates/admin/logs.html:16
-#: admin/templates/admin/user_list.html:26
-#: computes/templates/computes/instances.html:57
-#: computes/templates/computes/list.html:20
-#: instances/templates/create_instance_w2.html:66
-#: interfaces/templates/interfaces.html:47 networks/templates/networks.html:46
-#: nwfilters/templates/nwfilters.html:135 secrets/templates/secrets.html:50
-#: storages/templates/storage.html:187 storages/templates/storages.html:46
+#: admin/templates/admin/group_list.html:20 admin/templates/admin/logs.html:15
+#: admin/templates/admin/user_list.html:23
+#: computes/templates/computes/instances.html:55
+#: computes/templates/computes/list.html:19
+#: instances/templates/create_instance_w2.html:67
+#: interfaces/templates/interfaces.html:48 networks/templates/networks.html:45
+#: nwfilters/templates/nwfilters.html:132 storages/templates/storage.html:187
+#: storages/templates/storages.html:45 virtsecrets/templates/secrets.html:51
 msgid "Warning"
 msgstr "Uyarı"
 
-#: admin/templates/admin/group_list.html:23
+#: admin/templates/admin/group_list.html:20
 msgid "You don't have any groups"
 msgstr "Hiç grubunuz yok"
 
-#: admin/templates/admin/group_list.html:31
+#: admin/templates/admin/group_list.html:28
 msgid "Group Name"
 msgstr "Grup Adı"
 
-#: admin/templates/admin/group_list.html:32
-#: admin/templates/admin/user_list.html:39
-#: computes/templates/computes/instances.html:71
-#: computes/templates/computes/list.html:31
+#: admin/templates/admin/group_list.html:29
+#: admin/templates/admin/user_list.html:36
+#: computes/templates/computes/instances.html:68
+#: computes/templates/computes/list.html:30
 #: instances/templates/allinstances_index_grouped.html:12
 #: instances/templates/allinstances_index_nongrouped.html:12
-#: instances/templates/instances/settings_tab.html:343
-#: instances/templates/instances/settings_tab.html:491
+#: instances/templates/instances/settings_tab.html:355
+#: instances/templates/instances/settings_tab.html:525
 #: networks/templates/network.html:175 networks/templates/network.html:284
 #: networks/templates/network.html:332
 msgid "Actions"
 msgstr "Eylemler"
 
-#: admin/templates/admin/group_list.html:43
-#: admin/templates/admin/user_list.html:62
-#: computes/templates/computes/list.html:53 networks/templates/network.html:82
-#: nwfilters/templates/nwfilter.html:59 secrets/templates/secrets.html:74
+#: admin/templates/admin/group_list.html:40
+#: admin/templates/admin/user_list.html:59
+#: computes/templates/computes/list.html:52 networks/templates/network.html:82
+#: nwfilters/templates/nwfilter.html:59 virtsecrets/templates/secrets.html:75
 msgid "Edit"
 msgstr "Düzenle"
 
 #: admin/templates/admin/logs.html:5 admin/templates/admin/logs.html:7
-#: instances/templates/instances/stats_tab.html:13 templates/navbar.html:31
+#: instances/templates/instances/stats_tab.html:12 templates/navbar.html:31
 msgid "Logs"
 msgstr "Loglar"
 
-#: admin/templates/admin/logs.html:16
+#: admin/templates/admin/logs.html:15
 msgid "You don't have any Logs"
 msgstr "Hiç Log kaydınız yok"
 
-#: admin/templates/admin/logs.html:25
-#: instances/templates/instances/snapshots_tab.html:48
-#: instances/templates/instances/stats_tab.html:83
+#: admin/templates/admin/logs.html:24
+#: instances/templates/instances/snapshots_tab.html:40
+#: instances/templates/instances/stats_tab.html:86
 msgid "Date"
 msgstr "Tarih"
 
+#: admin/templates/admin/logs.html:26
+#: console/templates/console-spice-full.html:202
+#: instances/templates/allinstances_index_nongrouped.html:7
+msgid "Host"
+msgstr "Sunucu"
+
 #: admin/templates/admin/logs.html:28
-#: instances/templates/instances/stats_tab.html:85
+#: instances/templates/instances/stats_tab.html:88
 msgid "Message"
 msgstr "Mesaj"
 
 #: admin/templates/admin/user_form.html:21
 #: computes/templates/computes/form.html:23
-#: instances/templates/edit_instance_volume.html:124
+#: instances/templates/instances/edit_instance_volume.html:111
 #: networks/templates/add_network_qos.html:51 templates/common/form.html:22
 msgid "Save"
 msgstr "Kaydet"
 
-#: admin/templates/admin/user_list.html:26
+#: admin/templates/admin/user_list.html:23
 msgid "You don't have any user"
 msgstr "Hiç kullanıcınız yok"
 
-#: admin/templates/admin/user_list.html:34
+#: admin/templates/admin/user_list.html:31
 msgid "Username"
 msgstr "Kullanıcı Adı"
 
-#: admin/templates/admin/user_list.html:35
-#: computes/templates/computes/instances.html:68
-#: computes/templates/computes/list.html:29
+#: admin/templates/admin/user_list.html:32
+#: computes/templates/computes/instances.html:65
+#: computes/templates/computes/list.html:28
 #: instances/templates/allinstances_index_grouped.html:9
 #: instances/templates/allinstances_index_nongrouped.html:9
 msgid "Status"
 msgstr "Durum"
 
-#: admin/templates/admin/user_list.html:36
+#: admin/templates/admin/user_list.html:33
 msgid "Staff"
 msgstr "Görevli"
 
-#: admin/templates/admin/user_list.html:37
+#: admin/templates/admin/user_list.html:34
 msgid "Superuser"
 msgstr "Süperkullanıcı"
 
-#: admin/templates/admin/user_list.html:38
+#: admin/templates/admin/user_list.html:35
 msgid "Can Clone"
 msgstr "Klonlayabilir"
 
-#: admin/templates/admin/user_list.html:51
-#: computes/templates/computes/instances.html:94
-#: instances/templates/allinstances_index_grouped.html:57
-#: instances/templates/allinstances_index_nongrouped.html:40
+#: admin/templates/admin/user_list.html:48
+#: computes/templates/computes/instances.html:91
+#: instances/templates/allinstances_index_grouped.html:59
+#: instances/templates/allinstances_index_nongrouped.html:41
 #: instances/templates/instance.html:19
 msgid "Active"
 msgstr "Aktif"
 
-#: admin/templates/admin/user_list.html:53
+#: admin/templates/admin/user_list.html:50
 msgid "Blocked"
 msgstr "Engelli"
 
-#: admin/templates/admin/user_list.html:61
+#: admin/templates/admin/user_list.html:58
 msgid "View Profile"
 msgstr "Profil Görüntüle"
 
-#: admin/templates/admin/user_list.html:64
+#: admin/templates/admin/user_list.html:61
 msgid "Block"
 msgstr "Engelle"
 
-#: admin/templates/admin/user_list.html:66
+#: admin/templates/admin/user_list.html:63
 msgid "Unblock"
 msgstr "Engeli Kaldır"
 
@@ -672,11 +516,10 @@ msgstr "Grup Oluştur"
 msgid "Update Group"
 msgstr "Grubu Güncelle"
 
-#: admin/views.py:113
+#: admin/views.py:110
 msgid "Create User"
 msgstr "Kullanıcı Oluştur"
 
-<<<<<<< HEAD
 #: admin/views.py:129
 msgid "Update User"
 msgstr "Kullanıcı Güncelle"
@@ -690,22 +533,6 @@ msgstr "%(user)s parolası değiştirildi"
 msgid "Wrong Data Provided"
 msgstr "Hatalı Veri"
 
-=======
-#: admin/views.py:136
-msgid "Update User"
-msgstr "Kullanıcı Güncelle"
-
-#: admin/views.py:149
-#, fuzzy
-#| msgid "Password"
-msgid "User password changed: {}"
-msgstr "Kullanıcı parolası değişti: {}"
-
-#: admin/views.py:152
-msgid "Wrong Data Provided"
-msgstr "Hatalı Veri"
-
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #: appsettings/migrations/0002_auto_20200527_1603.py:11
 msgid "Theme"
 msgstr "Tema"
@@ -920,11 +747,7 @@ msgstr "SSH Erişim Anahtarlarını Göster"
 
 #: appsettings/migrations/0004_auto_20200716_0637.py:11
 msgid "Console Scale"
-<<<<<<< HEAD
 msgstr "Konsolu Ölçekle"
-=======
-msgstr "Konsol Ölçekle"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 
 #: appsettings/migrations/0004_auto_20200716_0637.py:11
 msgid "Allow console to scaling view"
@@ -940,11 +763,7 @@ msgstr "Sadece görüntülemeye izin ver düzenlemeye izin verme"
 
 #: appsettings/migrations/0004_auto_20200716_0637.py:13
 msgid "Console Resize Session"
-<<<<<<< HEAD
 msgstr "Konsol Oturumunu Boyutlandır"
-=======
-msgstr "Konsol Oturum Boyutlandır"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 
 #: appsettings/migrations/0004_auto_20200716_0637.py:13
 msgid "Allow to resize session for console"
@@ -1000,35 +819,19 @@ msgid "Other Settings"
 msgstr "Diğer Ayarlar"
 
 #: appsettings/views.py:38
-<<<<<<< HEAD
 #, python-format
 msgid "SASS directory path is changed. Now: %(dir)s"
 msgstr "SASS dizin yolu değiştirildi. Şimdi: %(dir)s"
 
-#: appsettings/views.py:67
+#: appsettings/views.py:70
 #, python-format
 msgid "Theme is changed. Now: %(theme)s"
 msgstr "Tema değiştirildi. Şimdi: %(theme)s"
 
-#: appsettings/views.py:82
+#: appsettings/views.py:85
 #, python-format
 msgid "%(setting)s is changed. Now: %(value)s"
 msgstr "%(setting)s değiştirildi. Şimdi: %(value)s"
-=======
-#, python-brace-format
-msgid "SASS directory path is changed. Now: {sass_dir.value}"
-msgstr "SASS dizin yolu değiştirildi. Şimdi: {sass_dir.value}"
-
-#: appsettings/views.py:65
-#, python-brace-format
-msgid "Theme changed. Now: {theme}"
-msgstr "Tema değiştirildi. Şimdi: {theme}"
-
-#: appsettings/views.py:80
-#, python-brace-format
-msgid "{setting.name} is changed. Now: {setting.value}"
-msgstr "{setting.name} değiştirildi. Şimdi: {setting.value}"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 
 #: computes/forms.py:21
 msgid "FQDN/IP"
@@ -1058,144 +861,144 @@ msgstr "Sunucu Ekle"
 msgid "Create Compute"
 msgstr "Sunucu Oluştur"
 
-#: computes/templates/computes/instances.html:29
-#: computes/templates/computes/list.html:49
-#: computes/templates/computes/list.html:51 computes/templates/overview.html:6
-#: computes/templates/overview.html:16 interfaces/templates/interface.html:13
-#: interfaces/templates/interfaces.html:17 networks/templates/network.html:14
+#: computes/templates/computes/instances.html:27
+#: computes/templates/computes/list.html:48
+#: computes/templates/computes/list.html:50 computes/templates/overview.html:6
+#: computes/templates/overview.html:15 interfaces/templates/interface.html:13
+#: interfaces/templates/interfaces.html:19 networks/templates/network.html:14
 #: networks/templates/networks.html:16 nwfilters/templates/nwfilter.html:14
-#: nwfilters/templates/nwfilters.html:22 secrets/templates/secrets.html:20
-#: storages/templates/storage.html:19 storages/templates/storages.html:16
+#: nwfilters/templates/nwfilters.html:20 storages/templates/storage.html:20
+#: storages/templates/storages.html:16 virtsecrets/templates/secrets.html:22
 msgid "Overview"
-msgstr "Genel Görünüm"
+msgstr "Genel Bakış"
 
-#: computes/templates/computes/instances.html:35
-#: computes/templates/overview.html:22 interfaces/templates/interface.html:19
-#: interfaces/templates/interfaces.html:23 networks/templates/network.html:20
+#: computes/templates/computes/instances.html:33
+#: computes/templates/overview.html:21 interfaces/templates/interface.html:19
+#: interfaces/templates/interfaces.html:25 networks/templates/network.html:20
 #: networks/templates/networks.html:22 nwfilters/templates/nwfilter.html:20
-#: nwfilters/templates/nwfilters.html:28 secrets/templates/secrets.html:26
-#: storages/templates/storage.html:25 storages/templates/storages.html:4
-#: storages/templates/storages.html:6 storages/templates/storages.html:22
+#: nwfilters/templates/nwfilters.html:26 storages/templates/storage.html:26
+#: storages/templates/storages.html:4 storages/templates/storages.html:6
+#: storages/templates/storages.html:22 virtsecrets/templates/secrets.html:28
 msgid "Storages"
 msgstr "Depolamalar"
 
-#: computes/templates/computes/instances.html:38
-#: computes/templates/overview.html:25 interfaces/templates/interface.html:22
-#: interfaces/templates/interfaces.html:26 networks/templates/network.html:23
+#: computes/templates/computes/instances.html:36
+#: computes/templates/overview.html:24 interfaces/templates/interface.html:22
+#: interfaces/templates/interfaces.html:28 networks/templates/network.html:23
 #: networks/templates/networks.html:4 networks/templates/networks.html:6
 #: networks/templates/networks.html:25 nwfilters/templates/nwfilter.html:23
-#: nwfilters/templates/nwfilters.html:31 secrets/templates/secrets.html:29
-#: storages/templates/storage.html:28 storages/templates/storages.html:25
+#: nwfilters/templates/nwfilters.html:29 storages/templates/storage.html:29
+#: storages/templates/storages.html:25 virtsecrets/templates/secrets.html:31
 msgid "Networks"
 msgstr "Ağlar"
 
-#: computes/templates/computes/instances.html:41
-#: computes/templates/overview.html:28 interfaces/templates/interface.html:25
+#: computes/templates/computes/instances.html:39
+#: computes/templates/overview.html:27 interfaces/templates/interface.html:25
 #: interfaces/templates/interfaces.html:5
 #: interfaces/templates/interfaces.html:7
-#: interfaces/templates/interfaces.html:29 networks/templates/network.html:26
+#: interfaces/templates/interfaces.html:31 networks/templates/network.html:26
 #: networks/templates/networks.html:28 nwfilters/templates/nwfilter.html:26
-#: nwfilters/templates/nwfilters.html:34 secrets/templates/secrets.html:32
-#: storages/templates/storage.html:31 storages/templates/storages.html:28
+#: nwfilters/templates/nwfilters.html:32 storages/templates/storage.html:32
+#: storages/templates/storages.html:28 virtsecrets/templates/secrets.html:34
 msgid "Interfaces"
 msgstr "Arabirimler"
 
-#: computes/templates/computes/instances.html:44
-#: computes/templates/overview.html:31 interfaces/templates/interface.html:28
-#: interfaces/templates/interfaces.html:32 networks/templates/network.html:29
+#: computes/templates/computes/instances.html:42
+#: computes/templates/overview.html:30 interfaces/templates/interface.html:28
+#: interfaces/templates/interfaces.html:34 networks/templates/network.html:29
 #: networks/templates/networks.html:31 nwfilters/templates/nwfilter.html:29
 #: nwfilters/templates/nwfilters.html:5 nwfilters/templates/nwfilters.html:7
-#: nwfilters/templates/nwfilters.html:37 secrets/templates/secrets.html:35
-#: storages/templates/storage.html:34 storages/templates/storages.html:31
+#: nwfilters/templates/nwfilters.html:35 storages/templates/storage.html:35
+#: storages/templates/storages.html:31 virtsecrets/templates/secrets.html:37
 msgid "NWFilters"
 msgstr "AğFiltreleri"
 
-#: computes/templates/computes/instances.html:47
-#: computes/templates/overview.html:34 interfaces/templates/interface.html:31
-#: interfaces/templates/interfaces.html:35 networks/templates/network.html:32
+#: computes/templates/computes/instances.html:45
+#: computes/templates/overview.html:33 interfaces/templates/interface.html:31
+#: interfaces/templates/interfaces.html:37 networks/templates/network.html:32
 #: networks/templates/networks.html:34 nwfilters/templates/nwfilter.html:32
-#: nwfilters/templates/nwfilters.html:40 secrets/templates/secrets.html:4
-#: secrets/templates/secrets.html:10 secrets/templates/secrets.html:38
-#: storages/templates/create_stg_block.html:124
-#: storages/templates/storage.html:37 storages/templates/storages.html:34
+#: nwfilters/templates/nwfilters.html:38
+#: storages/templates/create_stg_block.html:138
+#: storages/templates/storage.html:38 storages/templates/storages.html:34
+#: virtsecrets/templates/secrets.html:4 virtsecrets/templates/secrets.html:10
+#: virtsecrets/templates/secrets.html:40
 msgid "Secrets"
 msgstr "Parolalar"
 
-#: computes/templates/computes/instances.html:58
+#: computes/templates/computes/instances.html:56
 msgid "Hypervisor doesn't have any Instances"
 msgstr "Hipervizör üzerinde hiç sanal makine yok"
 
-#: computes/templates/computes/instances.html:66
-#: computes/templates/computes/list.html:28
-#: instances/templates/add_instance_volume.html:40
-#: instances/templates/add_instance_volume.html:42
+#: computes/templates/computes/instances.html:63
+#: computes/templates/computes/list.html:27
+#: instances/templates/add_instance_volume.html:44
+#: instances/templates/add_instance_volume.html:46
 #: instances/templates/allinstances_index_grouped.html:7
 #: instances/templates/allinstances_index_nongrouped.html:5
-#: instances/templates/create_instance_w2.html:77
-#: instances/templates/create_instance_w2.html:103
-#: instances/templates/create_instance_w2.html:106
-#: instances/templates/create_instance_w2.html:305
-#: instances/templates/create_instance_w2.html:307
+#: instances/templates/create_instance_w2.html:76
+#: instances/templates/create_instance_w2.html:102
+#: instances/templates/create_instance_w2.html:105
+#: instances/templates/create_instance_w2.html:304
+#: instances/templates/create_instance_w2.html:306
 #: instances/templates/create_instance_w2.html:518
 #: instances/templates/create_instance_w2.html:520
-#: instances/templates/instances/settings_tab.html:340
-#: instances/templates/instances/snapshots_tab.html:47
+#: instances/templates/instances/settings_tab.html:353
+#: instances/templates/instances/snapshots_tab.html:39
 #: interfaces/templates/create_iface_block.html:18
 #: interfaces/templates/interface.html:75
 #: networks/templates/create_net_block.html:18
 #: networks/templates/modify_ipv4_fixed_address.html:30
 #: networks/templates/modify_ipv6_fixed_address.html:30
 #: networks/templates/network.html:174 networks/templates/network.html:283
-#: nwfilters/templates/nwfilter.html:41 nwfilters/templates/nwfilters.html:56
-#: nwfilters/templates/nwfilters.html:100
-#: nwfilters/templates/nwfilters.html:102
-#: storages/templates/create_stg_block.html:42
-#: storages/templates/create_stg_block.html:71
-#: storages/templates/create_stg_block.html:100
-#: storages/templates/create_stg_block.html:165
-#: storages/templates/create_stg_block.html:214
+#: nwfilters/templates/nwfilter.html:41 nwfilters/templates/nwfilters.html:54
+#: nwfilters/templates/nwfilters.html:98 nwfilters/templates/nwfilters.html:100
+#: storages/templates/create_stg_block.html:56
+#: storages/templates/create_stg_block.html:85
+#: storages/templates/create_stg_block.html:114
+#: storages/templates/create_stg_block.html:179
+#: storages/templates/create_stg_block.html:228
 #: storages/templates/create_stg_vol_block.html:21
-#: storages/templates/storage.html:96 storages/templates/storage.html:124
-#: storages/templates/storage.html:126
+#: storages/templates/storage.html:97 storages/templates/storage.html:125
+#: storages/templates/storage.html:127
 msgid "Name"
 msgstr "Ad"
 
-#: computes/templates/computes/instances.html:66
+#: computes/templates/computes/instances.html:63
 #: instances/templates/allinstances_index_grouped.html:7
 #: instances/templates/allinstances_index_nongrouped.html:5
-#: instances/templates/instances/settings_tab.html:782
-#: instances/templates/instances/settings_tab.html:805
+#: instances/templates/instances/settings_tab.html:811
+#: instances/templates/instances/settings_tab.html:834
 msgid "Description"
 msgstr "Tanım"
 
-#: computes/templates/computes/instances.html:69
+#: computes/templates/computes/instances.html:66
 #: instances/templates/allinstances_index_grouped.html:10
 #: instances/templates/allinstances_index_nongrouped.html:10
-#: instances/templates/create_instance_w2.html:78
-#: instances/templates/create_instance_w2.html:323
+#: instances/templates/create_instance_w2.html:77
+#: instances/templates/create_instance_w2.html:322
 #: instances/templates/create_instance_w2.html:536
-#: instances/templates/instance.html:42 instances/templates/instance.html:44
+#: instances/templates/instance.html:43 instances/templates/instance.html:45
 msgid "VCPU"
 msgstr "VCPU"
 
-#: computes/templates/computes/instances.html:70
-#: computes/templates/overview.html:82
+#: computes/templates/computes/instances.html:67
+#: computes/templates/overview.html:80
 #: instances/templates/allinstances_index_grouped.html:11
 #: instances/templates/allinstances_index_nongrouped.html:11
-#: instances/templates/instances/resize_tab.html:13
+#: instances/templates/instances/resize_tab.html:12
 msgid "Memory"
 msgstr "Bellek"
 
-#: computes/templates/computes/instances.html:96
-#: instances/templates/allinstances_index_grouped.html:58
-#: instances/templates/allinstances_index_nongrouped.html:42
+#: computes/templates/computes/instances.html:93
+#: instances/templates/allinstances_index_grouped.html:60
+#: instances/templates/allinstances_index_nongrouped.html:43
 #: instances/templates/instance.html:16
 msgid "Off"
 msgstr "Kapalı"
 
-#: computes/templates/computes/instances.html:98
-#: instances/templates/allinstances_index_grouped.html:60
-#: instances/templates/allinstances_index_nongrouped.html:44
+#: computes/templates/computes/instances.html:95
+#: instances/templates/allinstances_index_grouped.html:62
+#: instances/templates/allinstances_index_nongrouped.html:45
 msgid "Suspended"
 msgstr "Duraklatılmış"
 
@@ -1204,28 +1007,24 @@ msgstr "Duraklatılmış"
 msgid "Computes"
 msgstr "Sunucular"
 
-#: computes/templates/computes/list.html:20
-<<<<<<< HEAD
-=======
-#, fuzzy
-#| msgid "You don't have any groups"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: computes/templates/computes/list.html:19
 msgid "You don't have any computes"
 msgstr "Hiç sunucunuz yok"
 
-#: computes/templates/computes/list.html:30 computes/templates/overview.html:92
-#: instances/templates/instances/settings_tab.html:163
-#: instances/templates/instances/settings_tab.html:248
+#: computes/templates/computes/list.html:29 computes/templates/overview.html:90
+#: instances/templates/instances/settings_tab.html:176
+#: instances/templates/instances/settings_tab.html:215
+#: instances/templates/instances/settings_tab.html:263
 msgid "Details"
 msgstr "Ayrıntılar"
 
-#: computes/templates/computes/list.html:41
+#: computes/templates/computes/list.html:40
 #: instances/templates/allinstances_index_grouped.html:28
-#: instances/templates/instances/settings_tab.html:881
+#: instances/templates/instances/settings_tab.html:906
 msgid "Connected"
 msgstr "Bağlı"
 
-#: computes/templates/computes/list.html:41
+#: computes/templates/computes/list.html:40
 msgid "Not Connected"
 msgstr "Bağlı değil"
 
@@ -1249,67 +1048,69 @@ msgstr "Yerel"
 msgid "Add new host"
 msgstr "Yeni sunucu ekle"
 
-#: computes/templates/overview.html:42
+#: computes/templates/overview.html:40
 msgid "Basic details"
 msgstr "Temel ayrıntılar"
 
-#: computes/templates/overview.html:44
-#: storages/templates/create_stg_block.html:171
+#: computes/templates/overview.html:42
+#: instances/templates/instances/info_tab.html:5
+#: storages/templates/create_stg_block.html:185
 msgid "Hostname"
 msgstr "Sunucuadı"
 
-#: computes/templates/overview.html:46
+#: computes/templates/overview.html:44
 msgid "Hypervisors"
 msgstr "Hipervizörler"
 
-#: computes/templates/overview.html:63
+#: computes/templates/overview.html:61
 msgid "more"
 msgstr "daha"
 
-#: computes/templates/overview.html:73
+#: computes/templates/overview.html:71
 msgid "Emulator"
 msgstr "Emülatör"
 
-#: computes/templates/overview.html:75
+#: computes/templates/overview.html:73
+#: instances/templates/instances/info_tab.html:11
 msgid "Version"
 msgstr "Sürüm"
 
-#: computes/templates/overview.html:77
+#: computes/templates/overview.html:75
 msgid "Qemu"
 msgstr "Qemu"
 
-#: computes/templates/overview.html:79
+#: computes/templates/overview.html:77
 msgid "Libvirt"
 msgstr "Libvirt"
 
-#: computes/templates/overview.html:84
+#: computes/templates/overview.html:82
 #: instances/templates/create_instance_w1.html:36
-#: instances/templates/create_instance_w1.html:52
+#: instances/templates/create_instance_w1.html:50
 msgid "Architecture"
 msgstr "Mimari"
 
-#: computes/templates/overview.html:86
+#: computes/templates/overview.html:84
 msgid "Logical CPUs"
 msgstr "Mantıksal CPUlar"
 
-#: computes/templates/overview.html:88
+#: computes/templates/overview.html:86
 msgid "Processor"
 msgstr "İşlemci"
 
-#: computes/templates/overview.html:90
+#: computes/templates/overview.html:88
 msgid "Connection"
 msgstr "Bağlantı"
 
-#: computes/templates/overview.html:96
-#: instances/templates/edit_instance_volume.html:22
+#: computes/templates/overview.html:94
+#: instances/templates/instances/edit_instance_volume.html:25
 msgid "Performance"
 msgstr "Başarım"
 
-#: computes/templates/overview.html:102
+#: computes/templates/overview.html:100
 msgid "CPU Utilization"
 msgstr "CPU Kullanımı"
 
-#: computes/templates/overview.html:111
+#: computes/templates/overview.html:109
 msgid "RAM Utilization"
 msgstr "RAM Kullanımı"
 
@@ -1351,11 +1152,6 @@ msgstr "bağlantı kes"
 msgid "File API is not supported"
 msgstr "Dosya API desteklenmiyor"
 
-#: console/templates/console-spice-full.html:202
-#: instances/templates/allinstances_index_nongrouped.html:7
-msgid "Host"
-msgstr "Sunucu"
-
 #: console/templates/console-spice-full.html:204
 msgid "Port"
 msgstr "Bağlantı Noktası"
@@ -1368,7 +1164,7 @@ msgstr "Konsol göster"
 #: interfaces/templates/interface.html:59 networks/templates/network.html:49
 #: networks/templates/network.html:119 networks/templates/network.html:125
 #: networks/templates/network.html:231 networks/templates/network.html:237
-#: storages/templates/storage.html:60
+#: storages/templates/storage.html:62
 msgid "Start"
 msgstr "Başlat"
 
@@ -1384,6 +1180,24 @@ msgstr "noVNC bir hatayla karşılaştı"
 msgid "Loading"
 msgstr "Yükleniyor"
 
+#: console/views.py:52
+#, fuzzy
+#| msgid "You do not have permission to access this page."
+msgid ""
+"User does not have permission to access console or host/instance not exist"
+msgstr "Bu sayfaya erişme izniniz yok."
+
+#: console/views.py:84
+msgid "Fail to get console. Please check the console configuration of your VM."
+msgstr ""
+"Konsola erişim başarısız. Lütfen sanal makinenizin konsol yapılandırmasını "
+"kontrol ediniz."
+
+#: console/views.py:86
+#, python-format
+msgid "Console type '%(type)s' has not support"
+msgstr "'%(type)s' tipi konsol desteklenmiyor"
+
 #: instances/forms.py:37
 msgid "No Virtual Machine name has been entered"
 msgstr "Sanal makine adı girilmedi"
@@ -1444,12 +1258,7 @@ msgstr "şablon mu"
 msgid "created"
 msgstr "oluşturuldu"
 
-#: instances/models.py:220
-<<<<<<< HEAD
-=======
-#, fuzzy
-#| msgid "Show access root password"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/models.py:216
 msgid "Can access console without password"
 msgstr "Parolasız konsol erişimi yapabilir"
 
@@ -1458,87 +1267,86 @@ msgid "Add Instance Network"
 msgstr "Sanal makine ağı ekle"
 
 #: instances/templates/add_instance_network_block.html:18
-#: instances/templates/create_instance_w2.html:205
-#: instances/templates/instances/settings_tab.html:359
-#: instances/templates/instances/settings_tab.html:382
-#: instances/templates/instances/settings_tab.html:487
+#: instances/templates/create_instance_w2.html:182
+#: instances/templates/instances/settings_tab.html:373
+#: instances/templates/instances/settings_tab.html:409
+#: instances/templates/instances/settings_tab.html:521
 #: interfaces/templates/interface.html:45
 #: interfaces/templates/interface.html:74
-#: interfaces/templates/interfaces.html:63
+#: interfaces/templates/interfaces.html:64
 #: networks/templates/modify_ipv4_fixed_address.html:24
 #: networks/templates/network.html:172
 msgid "MAC"
 msgstr "MAC"
 
 #: instances/templates/add_instance_network_block.html:24
-#: instances/templates/create_instance_w2.html:164
-#: instances/templates/create_instance_w2.html:388
-#: instances/templates/create_instance_w2.html:605
-#: instances/templates/instances/settings_tab.html:30
-#: instances/templates/instances/settings_tab.html:394
+#: instances/templates/create_instance_w2.html:163
+#: instances/templates/create_instance_w2.html:387
+#: instances/templates/instances/settings_tab.html:36
+#: instances/templates/instances/settings_tab.html:421
 #: networks/templates/network.html:5 networks/templates/network.html:7
 #: networks/templates/network.html:107 networks/templates/network.html:218
 msgid "Network"
 msgstr "Ağ"
 
 #: instances/templates/add_instance_network_block.html:37
-#: instances/templates/create_instance_w2.html:183
+#: instances/templates/create_instance_w2.html:188
 #: instances/templates/create_instance_w2.html:429
-#: instances/templates/create_instance_w2.html:642
-#: instances/templates/instances/settings_tab.html:403
+#: instances/templates/create_instance_w2.html:645
+#: instances/templates/instances/settings_tab.html:430
 #: nwfilters/templates/nwfilter.html:5 nwfilters/templates/nwfilter.html:7
 msgid "NWFilter"
 msgstr "AğFiltresi"
 
 #: instances/templates/add_instance_network_block.html:40
-#: instances/templates/add_instance_volume.html:117
+#: instances/templates/add_instance_volume.html:121
 #: instances/templates/create_inst_block.html:25
-#: instances/templates/create_instance_w2.html:158
-#: instances/templates/create_instance_w2.html:186
-#: instances/templates/create_instance_w2.html:377
+#: instances/templates/create_instance_w2.html:157
+#: instances/templates/create_instance_w2.html:191
+#: instances/templates/create_instance_w2.html:376
 #: instances/templates/create_instance_w2.html:432
 #: instances/templates/create_instance_w2.html:580
 #: instances/templates/create_instance_w2.html:599
-#: instances/templates/create_instance_w2.html:645
-#: instances/templates/instances/access_tab.html:135
-#: instances/templates/instances/settings_tab.html:183
-#: instances/templates/instances/settings_tab.html:407
-#: instances/templates/instances/stats_tab.html:90
+#: instances/templates/create_instance_w2.html:648
+#: instances/templates/instances/access_tab.html:123
+#: instances/templates/instances/settings_tab.html:191
+#: instances/templates/instances/settings_tab.html:434
+#: instances/templates/instances/stats_tab.html:93
 #: interfaces/templates/interface.html:41
-#: interfaces/templates/interface.html:43 nwfilters/templates/nwfilter.html:78
-#: storages/templates/create_stg_block.html:132
-#: storages/templates/storage.html:47 storages/templates/storage.html:49
-#: storages/templates/storage.html:51
+#: interfaces/templates/interface.html:43 nwfilters/templates/nwfilter.html:73
+#: storages/templates/create_stg_block.html:146
+#: storages/templates/storage.html:49 storages/templates/storage.html:51
+#: storages/templates/storage.html:53
 msgid "None"
 msgstr "Hiçbiri"
 
 #: instances/templates/add_instance_network_block.html:49
 #: instances/templates/add_instance_owner_block.html:30
-#: instances/templates/add_instance_volume.html:89
-#: instances/templates/add_instance_volume.html:144
+#: instances/templates/add_instance_volume.html:93
+#: instances/templates/add_instance_volume.html:148
 #: instances/templates/create_flav_block.html:25
 #: instances/templates/create_inst_block.html:34
-#: instances/templates/create_instance_w2.html:269
-#: instances/templates/edit_instance_volume.html:123
-#: instances/templates/instances/settings_tab.html:428
-#: interfaces/templates/create_iface_block.html:135
+#: instances/templates/create_instance_w2.html:268
+#: instances/templates/instances/edit_instance_volume.html:110
+#: instances/templates/instances/settings_tab.html:455
+#: interfaces/templates/create_iface_block.html:139
 #: networks/templates/add_network_qos.html:50
 #: networks/templates/create_net_block.html:85
 #: networks/templates/modify_ipv4_fixed_address.html:44
 #: networks/templates/modify_ipv6_fixed_address.html:44
 #: nwfilters/templates/add_nwf_rule.html:25
-#: nwfilters/templates/create_nwfilter_block.html:23
-#: nwfilters/templates/nwfilters.html:80 nwfilters/templates/nwfilters.html:108
-#: secrets/templates/create_secret_block.html:54
-#: secrets/templates/secrets.html:102
-#: storages/templates/create_stg_block.html:55
-#: storages/templates/create_stg_block.html:84
-#: storages/templates/create_stg_block.html:140
-#: storages/templates/create_stg_block.html:202
-#: storages/templates/create_stg_block.html:230
+#: nwfilters/templates/create_nwfilter_block.html:25
+#: nwfilters/templates/nwfilters.html:78 nwfilters/templates/nwfilters.html:106
+#: storages/templates/create_stg_block.html:69
+#: storages/templates/create_stg_block.html:98
+#: storages/templates/create_stg_block.html:154
+#: storages/templates/create_stg_block.html:216
+#: storages/templates/create_stg_block.html:244
 #: storages/templates/create_stg_vol_block.html:28
 #: storages/templates/create_stg_vol_block.html:56
-#: storages/templates/storage.html:154
+#: storages/templates/storage.html:155
+#: virtsecrets/templates/create_secret_block.html:54
+#: virtsecrets/templates/secrets.html:103
 msgid "Close"
 msgstr "Kapat"
 
@@ -1547,8 +1355,8 @@ msgid "Add Instance Owner"
 msgstr "Sanal makine sahibi ekle"
 
 #: instances/templates/add_instance_volume.html:3
-#: instances/templates/add_instance_volume.html:90
-#: instances/templates/add_instance_volume.html:145
+#: instances/templates/add_instance_volume.html:94
+#: instances/templates/add_instance_volume.html:149
 msgid "Add Volume"
 msgstr "Birim Ekle"
 
@@ -1556,72 +1364,73 @@ msgstr "Birim Ekle"
 msgid "Add Instance Volume"
 msgstr "Sanal makine birimi ekle"
 
-#: instances/templates/add_instance_volume.html:18
+#: instances/templates/add_instance_volume.html:19
 msgid "New Disk"
 msgstr "Yeni Disk"
 
-#: instances/templates/add_instance_volume.html:21
+#: instances/templates/add_instance_volume.html:24
 msgid "Existing Disk"
 msgstr "Mevcut Disk"
 
-#: instances/templates/add_instance_volume.html:28
-#: instances/templates/add_instance_volume.html:98
+#: instances/templates/add_instance_volume.html:32
+#: instances/templates/add_instance_volume.html:102
 msgid "Volume parameters"
 msgstr "Birim parametreleri"
 
-#: instances/templates/add_instance_volume.html:30
-#: instances/templates/add_instance_volume.html:100
-#: instances/templates/create_instance_w2.html:149
+#: instances/templates/add_instance_volume.html:34
+#: instances/templates/add_instance_volume.html:104
+#: instances/templates/create_instance_w2.html:148
 #: instances/templates/create_instance_w2.html:591
-#: instances/templates/instances/settings_tab.html:237
+#: instances/templates/instances/settings_tab.html:252
 #: storages/templates/storage.html:4 storages/templates/storage.html:9
 msgid "Storage"
 msgstr "Depolama"
 
-#: instances/templates/add_instance_volume.html:46
-#: storages/templates/create_stg_block.html:183
-#: storages/templates/storage.html:99 storages/templates/storage.html:137
+#: instances/templates/add_instance_volume.html:50
+#: storages/templates/create_stg_block.html:197
+#: storages/templates/storage.html:100 storages/templates/storage.html:138
 msgid "Format"
 msgstr "Biçem"
 
-#: instances/templates/add_instance_volume.html:56
-#: storages/templates/storage.html:52 storages/templates/storage.html:98
-#: storages/templates/storages.html:62
+#: instances/templates/add_instance_volume.html:60
+#: storages/templates/storage.html:54 storages/templates/storage.html:99
+#: storages/templates/storages.html:61
 msgid "Size"
 msgstr "Boyut"
 
-#: instances/templates/add_instance_volume.html:60
-#: instances/templates/create_instance_w2.html:91
+#: instances/templates/add_instance_volume.html:64
+#: instances/templates/create_instance_w2.html:90
 msgid "GB"
 msgstr "GB"
 
-#: instances/templates/add_instance_volume.html:63
-#: instances/templates/add_instance_volume.html:123
-#: instances/templates/edit_instance_volume.html:53
-#: instances/templates/instances/settings_tab.html:168
+#: instances/templates/add_instance_volume.html:67
+#: instances/templates/add_instance_volume.html:127
+#: instances/templates/instances/edit_instance_volume.html:89
+#: instances/templates/instances/settings_tab.html:181
+#: instances/templates/instances/settings_tab.html:220
 msgid "Bus"
 msgstr "Veriyolu"
 
-#: instances/templates/add_instance_volume.html:73
-#: instances/templates/add_instance_volume.html:133
+#: instances/templates/add_instance_volume.html:77
+#: instances/templates/add_instance_volume.html:137
 msgid "Cache"
 msgstr "Önbellek"
 
-#: instances/templates/add_instance_volume.html:83
-#: instances/templates/instances/settings_tab.html:760
-#: storages/templates/storage.html:147
+#: instances/templates/add_instance_volume.html:87
+#: instances/templates/instances/settings_tab.html:789
+#: storages/templates/storage.html:148
 msgid "Metadata"
 msgstr "Metaveri"
 
-#: instances/templates/add_instance_volume.html:103
+#: instances/templates/add_instance_volume.html:107
 msgid "Select Pool"
 msgstr "Havuz seç"
 
-#: instances/templates/add_instance_volume.html:114
+#: instances/templates/add_instance_volume.html:118
 msgid "Volume"
 msgstr "Birim"
 
-#: instances/templates/allinstances.html:24
+#: instances/templates/allinstances.html:22
 msgid "Problem occurred with host"
 msgstr "Sunucu ile ilgili bir problem meydana geldi"
 
@@ -1670,39 +1479,39 @@ msgid "New instance on %(host)s "
 msgstr "%(host)s üzerinde yeni sanal makine"
 
 #: instances/templates/create_instance_w1.html:41
-#: instances/templates/instances/settings_tab.html:49
+#: instances/templates/instances/settings_tab.html:55
 #: networks/templates/network.html:72 nwfilters/templates/nwfilter.html:49
 msgid "XML"
 msgstr "XML"
 
-#: instances/templates/create_instance_w1.html:62
+#: instances/templates/create_instance_w1.html:60
 msgid "Chipset"
 msgstr "Yonga"
 
-#: instances/templates/create_instance_w1.html:72
+#: instances/templates/create_instance_w1.html:70
 msgid "Next"
 msgstr "İleri"
 
-#: instances/templates/create_instance_w1.html:89
-#: instances/templates/create_instance_w2.html:271
-#: instances/templates/create_instance_w2.html:273
+#: instances/templates/create_instance_w1.html:85
+#: instances/templates/create_instance_w2.html:270
+#: instances/templates/create_instance_w2.html:272
 #: instances/templates/create_instance_w2.html:500
 #: instances/templates/create_instance_w2.html:504
-#: instances/templates/create_instance_w2.html:713
-#: instances/templates/create_instance_w2.html:717
-#: interfaces/templates/create_iface_block.html:138
+#: instances/templates/create_instance_w2.html:716
+#: instances/templates/create_instance_w2.html:720
+#: interfaces/templates/create_iface_block.html:142
 #: networks/templates/create_net_block.html:86
 #: networks/templates/modify_ipv4_fixed_address.html:45
 #: networks/templates/modify_ipv6_fixed_address.html:45
-#: nwfilters/templates/create_nwfilter_block.html:24
-#: secrets/templates/create_secret_block.html:55
-#: storages/templates/create_stg_block.html:56
-#: storages/templates/create_stg_block.html:85
-#: storages/templates/create_stg_block.html:144
-#: storages/templates/create_stg_block.html:148
-#: storages/templates/create_stg_block.html:205
-#: storages/templates/create_stg_block.html:233
+#: nwfilters/templates/create_nwfilter_block.html:26
+#: storages/templates/create_stg_block.html:70
+#: storages/templates/create_stg_block.html:99
+#: storages/templates/create_stg_block.html:158
+#: storages/templates/create_stg_block.html:162
+#: storages/templates/create_stg_block.html:219
+#: storages/templates/create_stg_block.html:247
 #: storages/templates/create_stg_vol_block.html:57
+#: virtsecrets/templates/create_secret_block.html:55
 msgid "Create"
 msgstr "Oluştur"
 
@@ -1718,113 +1527,113 @@ msgstr "Özel"
 msgid "Template"
 msgstr "Şablon"
 
-#: instances/templates/create_instance_w2.html:66
-msgid "Hypervisor doesn't have any Flavors"
-msgstr ""
-
-#: instances/templates/create_instance_w2.html:71
+#: instances/templates/create_instance_w2.html:63
 msgid "Create from flavor"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:79
-#: instances/templates/create_instance_w2.html:352
+#: instances/templates/create_instance_w2.html:67
+msgid "Hypervisor doesn't have any Flavors"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:78
+#: instances/templates/create_instance_w2.html:351
 #: instances/templates/create_instance_w2.html:563
-#: instances/templates/instance.html:47
+#: instances/templates/instance.html:48
 msgid "RAM"
 msgstr "RAM"
 
-#: instances/templates/create_instance_w2.html:80
-#: instances/templates/create_instance_w2.html:367
+#: instances/templates/create_instance_w2.html:79
+#: instances/templates/create_instance_w2.html:366
 msgid "HDD"
 msgstr "HDD"
 
-#: instances/templates/create_instance_w2.html:90
-#: instances/templates/create_instance_w2.html:356
+#: instances/templates/create_instance_w2.html:89
+#: instances/templates/create_instance_w2.html:355
 #: instances/templates/create_instance_w2.html:567
-#: instances/templates/instance.html:47
+#: instances/templates/instance.html:48
 #: instances/templates/instances/resize_tab.html:95
-#: instances/templates/instances/resize_tab.html:108
+#: instances/templates/instances/resize_tab.html:109
 msgid "MB"
 msgstr "MB"
 
-#: instances/templates/create_instance_w2.html:97
+#: instances/templates/create_instance_w2.html:96
 msgid "Create Virtual Machine"
 msgstr "Sanal Makine Oluştur"
 
-#: instances/templates/create_instance_w2.html:115
-#: instances/templates/create_instance_w2.html:312
+#: instances/templates/create_instance_w2.html:114
+#: instances/templates/create_instance_w2.html:311
 #: instances/templates/create_instance_w2.html:525
 msgid "Firmware"
 msgstr "Üretici yazılımı"
 
-#: instances/templates/create_instance_w2.html:127
-#: instances/templates/create_instance_w2.html:330
+#: instances/templates/create_instance_w2.html:126
+#: instances/templates/create_instance_w2.html:329
 #: instances/templates/create_instance_w2.html:542
 msgid "VCPU Config"
 msgstr "VCPU Konfigi"
 
-#: instances/templates/create_instance_w2.html:130
-#: instances/templates/create_instance_w2.html:333
+#: instances/templates/create_instance_w2.html:129
+#: instances/templates/create_instance_w2.html:332
 #: instances/templates/create_instance_w2.html:545
 msgid "no-mode"
 msgstr "mod-yok"
 
-#: instances/templates/create_instance_w2.html:174
+#: instances/templates/create_instance_w2.html:173
 #: instances/templates/create_instance_w2.html:402
-#: instances/templates/create_instance_w2.html:615
-#: instances/templates/edit_instance_volume.html:25
+#: instances/templates/create_instance_w2.html:618
+#: instances/templates/instances/edit_instance_volume.html:30
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: instances/templates/create_instance_w2.html:194
-#: instances/templates/create_instance_w2.html:631
+#: instances/templates/create_instance_w2.html:199
+#: instances/templates/create_instance_w2.html:634
 msgid "HDD cache mode"
 msgstr "HDD önbellek modu"
 
-#: instances/templates/create_instance_w2.html:212
+#: instances/templates/create_instance_w2.html:211
 #: instances/templates/create_instance_w2.html:441
-#: instances/templates/create_instance_w2.html:654
+#: instances/templates/create_instance_w2.html:657
 msgid "Graphics"
 msgstr "Grafikler"
 
-#: instances/templates/create_instance_w2.html:223
+#: instances/templates/create_instance_w2.html:222
 #: instances/templates/create_instance_w2.html:452
-#: instances/templates/create_instance_w2.html:665
+#: instances/templates/create_instance_w2.html:668
 msgid "Video"
 msgstr "Video"
 
-#: instances/templates/create_instance_w2.html:237
+#: instances/templates/create_instance_w2.html:236
 #: instances/templates/create_instance_w2.html:466
-#: instances/templates/create_instance_w2.html:679
+#: instances/templates/create_instance_w2.html:682
 msgid "Console Access"
 msgstr "Konsol Erişimi"
 
-#: instances/templates/create_instance_w2.html:247
-#: instances/templates/create_instance_w2.html:249
+#: instances/templates/create_instance_w2.html:246
+#: instances/templates/create_instance_w2.html:248
 #: instances/templates/create_instance_w2.html:476
 #: instances/templates/create_instance_w2.html:478
-#: instances/templates/create_instance_w2.html:689
-#: instances/templates/create_instance_w2.html:691
+#: instances/templates/create_instance_w2.html:692
+#: instances/templates/create_instance_w2.html:694
 msgid "Console Password"
 msgstr "Konsol Parolası"
 
-#: instances/templates/create_instance_w2.html:253
+#: instances/templates/create_instance_w2.html:252
 #: instances/templates/create_instance_w2.html:482
-#: instances/templates/create_instance_w2.html:695
+#: instances/templates/create_instance_w2.html:698
 msgid "Guest Agent"
 msgstr "Misafir Aracı"
 
-#: instances/templates/create_instance_w2.html:260
+#: instances/templates/create_instance_w2.html:259
 #: instances/templates/create_instance_w2.html:489
-#: instances/templates/create_instance_w2.html:702
+#: instances/templates/create_instance_w2.html:705
 msgid "VirtIO"
 msgstr "VirtIO"
 
-#: instances/templates/create_instance_w2.html:287
-#: instances/templates/instances/settings_tab.html:439
-#: instances/templates/instances/settings_tab.html:515
-#: instances/templates/instances/settings_tab.html:525
-#: instances/templates/instances/snapshots_tab.html:75
+#: instances/templates/create_instance_w2.html:286
+#: instances/templates/instances/settings_tab.html:473
+#: instances/templates/instances/settings_tab.html:549
+#: instances/templates/instances/settings_tab.html:559
+#: instances/templates/instances/snapshots_tab.html:67
 #: interfaces/templates/interface.html:60
 #: interfaces/templates/interface.html:62 networks/templates/network.html:50
 #: networks/templates/network.html:52 networks/templates/network.html:62
@@ -1832,35 +1641,35 @@ msgstr "VirtIO"
 #: networks/templates/network.html:194 networks/templates/network.html:249
 #: networks/templates/network.html:298 networks/templates/network.html:303
 #: networks/templates/network.html:353 networks/templates/network.html:358
-#: nwfilters/templates/nwfilter.html:111 nwfilters/templates/nwfilter.html:151
-#: nwfilters/templates/nwfilters.html:120 secrets/templates/secrets.html:77
-#: storages/templates/storage.html:62 storages/templates/storage.html:65
-#: storages/templates/storage.html:77 storages/templates/storage.html:174
+#: nwfilters/templates/nwfilter.html:103 nwfilters/templates/nwfilter.html:143
+#: nwfilters/templates/nwfilters.html:118 storages/templates/storage.html:64
+#: storages/templates/storage.html:67 storages/templates/storage.html:79
+#: storages/templates/storage.html:175 virtsecrets/templates/secrets.html:78
 msgid "Are you sure?"
 msgstr "Emin misiniz?"
 
-#: instances/templates/create_instance_w2.html:359
+#: instances/templates/create_instance_w2.html:358
 msgid "Added Disks"
 msgstr "Eklenen Diskler"
 
-#: instances/templates/create_instance_w2.html:372
+#: instances/templates/create_instance_w2.html:371
 #: instances/templates/create_instance_w2.html:575
 msgid "Select pool"
 msgstr "Havuz seçin"
 
 #: instances/templates/create_instance_w2.html:411
-#: instances/templates/create_instance_w2.html:624
+#: instances/templates/create_instance_w2.html:627
 msgid "Disk Metadata"
 msgstr "Disk Metadata"
 
 #: instances/templates/create_instance_w2.html:413
-#: instances/templates/create_instance_w2.html:626
+#: instances/templates/create_instance_w2.html:629
 msgid "Metadata preallocation"
 msgstr "Metadata öntahsis"
 
 #: instances/templates/create_instance_w2.html:415
-#: instances/templates/create_instance_w2.html:628
-#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:360
+#: instances/templates/create_instance_w2.html:631
+#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:375
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/files.py:391
 msgid "Image"
 msgstr "İmaj"
@@ -1873,64 +1682,18 @@ msgstr "HDD Önbellek Modu"
 msgid "Template Disk"
 msgstr "Şablon Disk"
 
-#: instances/templates/edit_instance_volume.html:3
-msgid "Edit Volume"
-msgstr "Birim Düzenle"
-
-#: instances/templates/edit_instance_volume.html:12
-msgid "Edit Instance Volume"
-msgstr "Sanal makine birimi düzenle"
-
-#: instances/templates/edit_instance_volume.html:19
-msgid "Virtual Disk"
-msgstr "Sanal Disk"
-
-#: instances/templates/edit_instance_volume.html:32
-msgid "Volume Path"
-msgstr "Birim Yolu"
-
-#: instances/templates/edit_instance_volume.html:38
-msgid "Readonly"
-msgstr "Sadece okunur"
-
-#: instances/templates/edit_instance_volume.html:44
-msgid "Shareable"
-msgstr "Paylaşılabilir"
-
-#: instances/templates/edit_instance_volume.html:63
-msgid "Serial Number"
-msgstr "Seri Numarası"
-
-#: instances/templates/edit_instance_volume.html:69
-msgid "Storage Format"
-msgstr "Depolama biçemi"
-
-#: instances/templates/edit_instance_volume.html:78
-msgid "Cache mode"
-msgstr "Önbellek modu"
-
-#: instances/templates/edit_instance_volume.html:88
-msgid "IO mode"
-msgstr "IO modu"
-
-#: instances/templates/edit_instance_volume.html:98
-msgid "Discard mode"
-msgstr "Diskard modu"
-
-#: instances/templates/edit_instance_volume.html:108
-msgid "Detect zeroes"
-msgstr "Sıfırları yakala"
+#: instances/templates/create_instance_w2.html:605
+#, fuzzy
+#| msgid "Network"
+msgid "Network/MAC"
+msgstr "Ağ"
 
 #: instances/templates/instance.html:22
 #: instances/templates/instance_actions.html:14
 #: instances/templates/instance_actions.html:25
 #: instances/templates/instance_actions.html:37
-#: instances/templates/instances/power_tab.html:25
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:82 instances/views.py:270
-=======
-#: instances/templates/instances/power_tab.html:82 instances/views.py:264
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:24
+#: instances/templates/instances/power_tab.html:81 instances/views.py:277
 msgid "Suspend"
 msgstr "Duraklat"
 
@@ -1946,92 +1709,82 @@ msgstr "Misafir Aracı Etkin fakat bağlı değil"
 msgid "Guest Agent Not Enabled & Not Connected"
 msgstr "Misafir Aracı etkin değil & Bağlanmamış"
 
-#: instances/templates/instance.html:50
-#: instances/templates/instances/resize_tab.html:18
-#: instances/templates/instances/settings_tab.html:16
+#: instances/templates/instance.html:51
+#: instances/templates/instances/resize_tab.html:17
+#: instances/templates/instances/settings_tab.html:22
 msgid "Disk"
 msgstr "Disk"
 
-#: instances/templates/instance.html:57
+#: instances/templates/instance.html:59
+#, fuzzy
+#| msgid "Remove Instance's data"
+msgid "Show Instance OS details"
+msgstr "Sanal makinenin verisini sil"
+
+#: instances/templates/instance.html:63
 msgid "Refresh instance info"
 msgstr "Sanal makine bilgilerini yenile"
 
-#: instances/templates/instance.html:61
+#: instances/templates/instance.html:69
 msgid "quota reached"
 msgstr "kotaya erişildi"
 
-#: instances/templates/instance.html:75
+#: instances/templates/instance.html:81
 msgid "Power"
 msgstr "Güç"
 
-#: instances/templates/instance.html:81
+#: instances/templates/instance.html:87
 msgid "Access"
 msgstr "Erişim"
 
-#: instances/templates/instance.html:94
+#: instances/templates/instance.html:100
 msgid "Snapshot"
 msgstr "Anlık Görüntü"
 
-#: instances/templates/instance.html:101 templates/navbar.html:32
+#: instances/templates/instance.html:107 templates/navbar.html:32
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: instances/templates/instance.html:107
+#: instances/templates/instance.html:113
 msgid "Stats"
 msgstr "İstatistikler"
 
-#: instances/templates/instance.html:113
-#: instances/templates/instances/destroy_instance_form.html:40
-#: instances/templates/instances/destroy_tab.html:18
-#: instances/templates/instances/destroy_tab.html:20
-<<<<<<< HEAD
-#: instances/templates/instances/destroy_tab.html:23 instances/views.py:312
-=======
-#: instances/templates/instances/destroy_tab.html:23 instances/views.py:306
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instance.html:119
+#: instances/templates/instances/destroy_instance_form.html:35
+#: instances/templates/instances/destroy_tab.html:17
+#: instances/templates/instances/destroy_tab.html:19
+#: instances/templates/instances/destroy_tab.html:22 instances/views.py:319
 msgid "Destroy"
 msgstr "Sil"
 
 #: instances/templates/instance_actions.html:6
-#: instances/templates/instances/settings_tab.html:37
-#: instances/templates/instances/settings_tab.html:788
-#: instances/templates/instances/settings_tab.html:790
-#: nwfilters/templates/nwfilters.html:109
-#: nwfilters/templates/nwfilters.html:115 storages/templates/storage.html:155
-#: storages/templates/storage.html:162
+#: instances/templates/instances/settings_tab.html:43
+#: instances/templates/instances/settings_tab.html:817
+#: instances/templates/instances/settings_tab.html:819
+#: nwfilters/templates/nwfilters.html:107
+#: nwfilters/templates/nwfilters.html:113 storages/templates/storage.html:156
+#: storages/templates/storage.html:163
 msgid "Clone"
 msgstr "Klonla"
 
 #: instances/templates/instance_actions.html:10
 #: instances/templates/instance_actions.html:35
-#: instances/templates/instances/power_tab.html:47
-#: instances/templates/instances/power_tab.html:121
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:123 instances/views.py:245
-=======
-#: instances/templates/instances/power_tab.html:123 instances/views.py:239
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:46
+#: instances/templates/instances/power_tab.html:120
+#: instances/templates/instances/power_tab.html:122 instances/views.py:252
 msgid "Power On"
 msgstr "Başlat"
 
 #: instances/templates/instance_actions.html:15
-#: instances/templates/instances/power_tab.html:9
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:59 instances/views.py:261
-=======
-#: instances/templates/instances/power_tab.html:59 instances/views.py:255
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:8
+#: instances/templates/instances/power_tab.html:58 instances/views.py:268
 msgid "Power Off"
 msgstr "Kapat"
 
 #: instances/templates/instance_actions.html:16
 #: instances/templates/instance_actions.html:29
-#: instances/templates/instances/power_tab.html:14
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:66 instances/views.py:254
-=======
-#: instances/templates/instances/power_tab.html:66 instances/views.py:248
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:13
+#: instances/templates/instances/power_tab.html:65 instances/views.py:261
 msgid "Power Cycle"
 msgstr "Yeniden başlat"
 
@@ -2041,48 +1794,40 @@ msgid "VNC Console"
 msgstr "VNC Konsol"
 
 #: instances/templates/instance_actions.html:22
-#: instances/templates/instances/power_tab.html:34
-#: instances/templates/instances/power_tab.html:93
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:108 instances/views.py:278
-=======
-#: instances/templates/instances/power_tab.html:108 instances/views.py:272
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:33
+#: instances/templates/instances/power_tab.html:92
+#: instances/templates/instances/power_tab.html:107 instances/views.py:285
 msgid "Resume"
 msgstr "Devam ettir"
 
 #: instances/templates/instance_actions.html:26
-#: instances/templates/instances/power_tab.html:19
-#: instances/templates/instances/power_tab.html:39
-#: instances/templates/instances/power_tab.html:74
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:100 instances/views.py:285
-=======
-#: instances/templates/instances/power_tab.html:100 instances/views.py:279
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:18
+#: instances/templates/instances/power_tab.html:38
+#: instances/templates/instances/power_tab.html:73
+#: instances/templates/instances/power_tab.html:99 instances/views.py:292
 msgid "Force Off"
 msgstr "Zorla Kapat"
 
 #: instances/templates/instance_actions.html:41
-#: instances/templates/instances/access_tab.html:9
-#: instances/templates/instances/access_tab.html:79
-#: instances/templates/instances/access_tab.html:87
-#: instances/templates/instances/access_tab.html:90
-#: instances/templates/instances/access_tab.html:94
-#: instances/templates/instances/settings_tab.html:23
+#: instances/templates/instances/access_tab.html:7
+#: instances/templates/instances/access_tab.html:67
+#: instances/templates/instances/access_tab.html:75
+#: instances/templates/instances/access_tab.html:78
+#: instances/templates/instances/access_tab.html:82
+#: instances/templates/instances/settings_tab.html:29
 msgid "Console"
 msgstr "Konsol"
 
-#: instances/templates/instances/access_tab.html:16
+#: instances/templates/instances/access_tab.html:13
 msgid "Root Password"
 msgstr "Kök Parola"
 
-#: instances/templates/instances/access_tab.html:31
-#: instances/templates/instances/access_tab.html:156
+#: instances/templates/instances/access_tab.html:27
+#: instances/templates/instances/access_tab.html:143
 msgid "VDI"
 msgstr "VDI"
 
-#: instances/templates/instances/access_tab.html:39
+#: instances/templates/instances/access_tab.html:35
 #, python-format
 msgid ""
 " This action opens a new window with a %(type)s connection to the console of "
@@ -2090,62 +1835,62 @@ msgid ""
 msgstr ""
 "Bu eylem sanal makinenin konsoluna bir %(type)s bağlantısı penceresi açar."
 
-#: instances/templates/instances/access_tab.html:47
+#: instances/templates/instances/access_tab.html:42
 msgid "Scale"
 msgstr "Ölçekle"
 
-#: instances/templates/instances/access_tab.html:55
+#: instances/templates/instances/access_tab.html:48
 msgid "View Only"
 msgstr "Sadece Görüntüle"
 
-#: instances/templates/instances/access_tab.html:63
+#: instances/templates/instances/access_tab.html:54
 msgid "Resize Session"
 msgstr "Oturumu Boyutlandır"
 
-#: instances/templates/instances/access_tab.html:71
+#: instances/templates/instances/access_tab.html:60
 msgid "View Clipboard"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:82
+#: instances/templates/instances/access_tab.html:70
 msgid "Toggle Dropdown"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:86
-#: instances/templates/instances/access_tab.html:89
+#: instances/templates/instances/access_tab.html:74
+#: instances/templates/instances/access_tab.html:77
 msgid "Console port"
 msgstr "Konsol bağlantı noktası"
 
-#: instances/templates/instances/access_tab.html:87
+#: instances/templates/instances/access_tab.html:75
 msgid "Lite"
 msgstr "Hafif"
 
-#: instances/templates/instances/access_tab.html:90
+#: instances/templates/instances/access_tab.html:78
 msgid "Full"
 msgstr "Tam"
 
-#: instances/templates/instances/access_tab.html:100
+#: instances/templates/instances/access_tab.html:88
 msgid "You need shut down your instance and enter a new root password."
 msgstr "Sanal makinenizi kapatmalı ve yeni kök parolanızı girmelisiniz."
 
-#: instances/templates/instances/access_tab.html:107
+#: instances/templates/instances/access_tab.html:95
 msgid "Enter Password"
 msgstr "Parola Gir"
 
-#: instances/templates/instances/access_tab.html:112
-#: instances/templates/instances/access_tab.html:115
+#: instances/templates/instances/access_tab.html:100
+#: instances/templates/instances/access_tab.html:103
 msgid "Reset Root Password"
 msgstr "Kök parola sıfırla"
 
-#: instances/templates/instances/access_tab.html:123
+#: instances/templates/instances/access_tab.html:111
 msgid "You need shut down your instance and choose your public key."
 msgstr "Sanal makinenizi kapatmalı ve açık anahtarınızı seçmelisiniz."
 
-#: instances/templates/instances/access_tab.html:142
-#: instances/templates/instances/access_tab.html:144
+#: instances/templates/instances/access_tab.html:130
+#: instances/templates/instances/access_tab.html:132
 msgid "Add Public Key"
 msgstr "Açık Anahtar Ekle"
 
-#: instances/templates/instances/access_tab.html:152
+#: instances/templates/instances/access_tab.html:140
 msgid ""
 "This action opens a remote viewer with a connection to the console of the "
 "instance."
@@ -2153,20 +1898,13 @@ msgstr ""
 "Bu eylem sanal makinenin konsoluna bir bağlantı ile uzak görüntüleyiciyi "
 "açar."
 
-#: instances/templates/instances/access_tab.html:159
+#: instances/templates/instances/access_tab.html:145
 msgid "To download console.vv file for virt-viewer."
 msgstr "virt-viewer için console.vv dosyasını indir."
 
-#: instances/templates/instances/access_tab.html:160
-<<<<<<< HEAD
+#: instances/templates/instances/access_tab.html:146
 msgid "Get console.vv"
 msgstr "console.vv dosyası al"
-=======
-#, fuzzy
-#| msgid "Send console.vv file"
-msgid "Get console.vv"
-msgstr "console.vv dosyası gönder"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 
 #: instances/templates/instances/destroy_instance_form.html:4
 msgid "Confirm Destroy"
@@ -2184,31 +1922,115 @@ msgstr "Sanal makine duraklatılmış, makine yok edilemez!"
 msgid "This action is irreversible!"
 msgstr "Bu eylem geri döndürülemez!"
 
-#: instances/templates/instances/destroy_instance_form.html:26
+#: instances/templates/instances/destroy_instance_form.html:24
 msgid "Remove Instance's data"
 msgstr "Sanal makinenin verisini sil"
 
-#: instances/templates/instances/destroy_instance_form.html:34
+#: instances/templates/instances/destroy_instance_form.html:30
 msgid "Remove Instance's NVRAM"
 msgstr "Sanal makine NVRAM'ini sil"
 
-#: instances/templates/instances/destroy_instance_form.html:46
+#: instances/templates/instances/destroy_instance_form.html:41
 msgid "You cannot destroy instance!"
 msgstr "Sanal makineyi silemezsiniz!"
 
-#: instances/templates/instances/destroy_tab.html:8
+#: instances/templates/instances/destroy_tab.html:7
 msgid "Destroy Instance"
 msgstr "Sanal makineyi sil"
 
-#: instances/templates/instances/destroy_tab.html:15
+#: instances/templates/instances/destroy_tab.html:14
 msgid "This action starts remove instance process"
 msgstr "Bu eylem sanal makine silme işlemini başlatır."
 
-#: instances/templates/instances/power_tab.html:56
+#: instances/templates/instances/edit_instance_volume.html:3
+msgid "Edit Volume"
+msgstr "Birim Düzenle"
+
+#: instances/templates/instances/edit_instance_volume.html:12
+msgid "Edit Instance Volume"
+msgstr "Sanal makine birimi düzenle"
+
+#: instances/templates/instances/edit_instance_volume.html:20
+msgid "Virtual Disk"
+msgstr "Sanal Disk"
+
+#: instances/templates/instances/edit_instance_volume.html:38
+msgid "Volume Path"
+msgstr "Birim Yolu"
+
+#: instances/templates/instances/edit_instance_volume.html:42
+msgid "Readonly"
+msgstr "Sadece okunur"
+
+#: instances/templates/instances/edit_instance_volume.html:46
+msgid "Shareable"
+msgstr "Paylaşılabilir"
+
+#: instances/templates/instances/edit_instance_volume.html:53
+msgid "Cache mode"
+msgstr "Önbellek modu"
+
+#: instances/templates/instances/edit_instance_volume.html:61
+msgid "IO mode"
+msgstr "IO modu"
+
+#: instances/templates/instances/edit_instance_volume.html:69
+msgid "Discard mode"
+msgstr "Diskard modu"
+
+#: instances/templates/instances/edit_instance_volume.html:77
+msgid "Detect zeroes"
+msgstr "Sıfırları yakala"
+
+#: instances/templates/instances/edit_instance_volume.html:97
+msgid "Serial Number"
+msgstr "Seri Numarası"
+
+#: instances/templates/instances/edit_instance_volume.html:101
+msgid "Storage Format"
+msgstr "Depolama biçemi"
+
+#: instances/templates/instances/edit_instance_volume.html:111
+#, fuzzy
+#| msgid "Are you sure to detach volume?"
+msgid "Are you sure to change volume properties?"
+msgstr "Birimi ayırmak istediğinize emin misiniz?"
+
+#: instances/templates/instances/info_tab.html:3
+#, fuzzy
+#| msgid "Guest Agent"
+msgid "Guest Info"
+msgstr "Misafir Aracı"
+
+#: instances/templates/instances/info_tab.html:7
+#, fuzzy
+#| msgid "Name"
+msgid "OS Name"
+msgstr "Ad"
+
+#: instances/templates/instances/info_tab.html:9
+msgid "OS Pretty-Name"
+msgstr "OS Kısa adı"
+
+#: instances/templates/instances/info_tab.html:13
+msgid "Kernel Release"
+msgstr "Çekirdek Sürümü"
+
+#: instances/templates/instances/info_tab.html:15
+#, fuzzy
+#| msgid "Version"
+msgid "Kernel Version"
+msgstr "Sürüm"
+
+#: instances/templates/instances/info_tab.html:17
+msgid "Timezone / Offset"
+msgstr "Saat Dilimi / Ofset"
+
+#: instances/templates/instances/power_tab.html:55
 msgid "This action sends an ACPI shutdown signal to the instance."
 msgstr "Bu eylem sanal makineye bir ACPI kapatma sinyali gönderir."
 
-#: instances/templates/instances/power_tab.html:64
+#: instances/templates/instances/power_tab.html:63
 msgid ""
 "This action forcibly powers off and start the instance and may cause data "
 "corruption."
@@ -2216,85 +2038,85 @@ msgstr ""
 "Bu eylem sanal makineyi zorla kapatır ve yeniden başlatır ve bu eylem veri "
 "bozulmasına yol açabilir."
 
-#: instances/templates/instances/power_tab.html:71
-#: instances/templates/instances/power_tab.html:98
+#: instances/templates/instances/power_tab.html:70
+#: instances/templates/instances/power_tab.html:97
 msgid ""
 "This action forcibly powers off the instance and may cause data corruption."
 msgstr ""
 "Bu eylem sanal makineyi zorla kapatır ve bu veri bozulmasına yol açabilir."
 
-#: instances/templates/instances/power_tab.html:80
+#: instances/templates/instances/power_tab.html:79
 msgid "This action suspends the instance."
 msgstr "Bu eylem sanal makineyi duraklatır."
 
-#: instances/templates/instances/power_tab.html:91
+#: instances/templates/instances/power_tab.html:90
 msgid "This action restore the instance after suspend."
 msgstr "Bu eylem sanal makineyi sürdürmeye döndürür."
 
-#: instances/templates/instances/power_tab.html:106
+#: instances/templates/instances/power_tab.html:105
 msgid "Administrator blocked your instance."
 msgstr "Yönetici sizin sanal makinenizi blokladı."
 
-#: instances/templates/instances/power_tab.html:116
+#: instances/templates/instances/power_tab.html:115
 msgid "Click on Power On button to start this instance."
 msgstr "Sanal makineyi başlatmak için Başlat tuşuna tıklayın"
 
-#: instances/templates/instances/power_tab.html:120
+#: instances/templates/instances/power_tab.html:119
 msgid "Template instance cannot be started."
 msgstr "Şablon sanal makine başlatılamaz"
 
-#: instances/templates/instances/resize_tab.html:8
+#: instances/templates/instances/resize_tab.html:7
 msgid "CPU"
 msgstr "CPU"
 
-#: instances/templates/instances/resize_tab.html:29
+#: instances/templates/instances/resize_tab.html:28
 msgid "Logical host CPUs"
 msgstr "Mantıksal Sunucu CPUları"
 
-#: instances/templates/instances/resize_tab.html:31
+#: instances/templates/instances/resize_tab.html:30
 #: instances/templates/instances/resize_tab.html:95
 #: instances/templates/instances/resize_tab.html:136
 msgid "Current Allocation"
 msgstr "Mevcut Tahsis"
 
-#: instances/templates/instances/resize_tab.html:45
-#: instances/templates/instances/resize_tab.html:108
+#: instances/templates/instances/resize_tab.html:44
+#: instances/templates/instances/resize_tab.html:109
 msgid "Maximum Allocation"
 msgstr "Maksimum Tahsis"
 
-#: instances/templates/instances/resize_tab.html:63
+#: instances/templates/instances/resize_tab.html:62
 msgid "Logical Instance Active/Maximum CPUs"
 msgstr "Mantıksal sanal makine Aktif/Maksimum CPUları"
 
-#: instances/templates/instances/resize_tab.html:71
-#: instances/templates/instances/settings_tab.html:79
-#: instances/templates/instances/settings_tab.html:95
-#: networks/templates/network.html:62 storages/templates/storage.html:77
+#: instances/templates/instances/resize_tab.html:70
+#: instances/templates/instances/settings_tab.html:86
+#: instances/templates/instances/settings_tab.html:102
+#: networks/templates/network.html:62 storages/templates/storage.html:79
 msgid "Disable"
 msgstr "Devredışı"
 
-#: instances/templates/instances/resize_tab.html:73
+#: instances/templates/instances/resize_tab.html:72
 msgid "Constant"
 msgstr "Sabit"
 
-#: instances/templates/instances/resize_tab.html:75
-#: instances/templates/instances/settings_tab.html:77
-#: instances/templates/instances/settings_tab.html:91
-#: networks/templates/network.html:60 storages/templates/storage.html:74
+#: instances/templates/instances/resize_tab.html:74
+#: instances/templates/instances/settings_tab.html:84
+#: instances/templates/instances/settings_tab.html:98
+#: networks/templates/network.html:60 storages/templates/storage.html:76
 msgid "Enable"
 msgstr "Etkin"
 
-#: instances/templates/instances/resize_tab.html:84
+#: instances/templates/instances/resize_tab.html:83
 #: instances/templates/instances/resize_tab.html:124
 #: instances/templates/instances/resize_tab.html:157
 msgid "You don't have permission for resizing instance"
 msgstr "Sanal makineyi yeniden boyutlandırma iznine sahip değilsiniz"
 
-#: instances/templates/instances/resize_tab.html:93
+#: instances/templates/instances/resize_tab.html:92
 msgid "Total host memory"
 msgstr "Toplam sunucu belleği"
 
-#: instances/templates/instances/resize_tab.html:103
+#: instances/templates/instances/resize_tab.html:104
 #: instances/templates/instances/resize_tab.html:118
 msgid "Custom value"
 msgstr "Özel değer"
@@ -2304,472 +2126,461 @@ msgid "Disk allocation (GB)"
 msgstr "Disk Tahsisi (GB)"
 
 #: instances/templates/instances/resize_tab.html:140
-#: instances/templates/instances/settings_tab.html:269
+#: instances/templates/instances/settings_tab.html:284
 msgid "Error getting disk info"
 msgstr "Disk bilgisi elde edilirken hata"
 
-#: instances/templates/instances/settings_tab.html:11
+#: instances/templates/instances/settings_tab.html:17
 msgid "Boot"
 msgstr "Ön Yükleme"
 
-#: instances/templates/instances/settings_tab.html:44
-#: instances/templates/instances/settings_tab.html:621
-#: instances/templates/instances/settings_tab.html:623
+#: instances/templates/instances/settings_tab.html:50
+#: instances/templates/instances/settings_tab.html:655
+#: instances/templates/instances/settings_tab.html:657
 msgid "Migrate"
 msgstr "Taşı"
 
-#: instances/templates/instances/settings_tab.html:56
+#: instances/templates/instances/settings_tab.html:62
+#: venv/lib/python3.6/site-packages/click/core.py:1351
 msgid "Options"
 msgstr "Seçenekler"
 
-#: instances/templates/instances/settings_tab.html:72
-#: networks/templates/network.html:56 storages/templates/storage.html:69
+#: instances/templates/instances/settings_tab.html:79
+#: networks/templates/network.html:56 storages/templates/storage.html:71
 msgid "Autostart"
 msgstr "Otomatik başlat"
 
-#: instances/templates/instances/settings_tab.html:75
+#: instances/templates/instances/settings_tab.html:82
 msgid "Autostart your instance when host server is power on "
 msgstr "Sunucu başlatıldığında sanal makineyi de otomatik başlat"
 
-#: instances/templates/instances/settings_tab.html:84
+#: instances/templates/instances/settings_tab.html:91
 msgid "Boot Order"
 msgstr "Boot sırası"
 
-#: instances/templates/instances/settings_tab.html:88
+#: instances/templates/instances/settings_tab.html:95
 msgid "Enable Boot Menu for your instance when it starts up "
 msgstr "Sanal makinenizin ön yükleme menüsünü başlangıçta etkinleştir"
 
-#: instances/templates/instances/settings_tab.html:91
+#: instances/templates/instances/settings_tab.html:98
 msgid "Show boot menu"
 msgstr "Ön yükleme menüsünü göster"
 
-#: instances/templates/instances/settings_tab.html:95
+#: instances/templates/instances/settings_tab.html:102
 msgid "Hide boot menu"
 msgstr "Ön yükleme menüsünü gizle"
 
-#: instances/templates/instances/settings_tab.html:100
+#: instances/templates/instances/settings_tab.html:107
 msgid "Please shutdown instance to modify boot menu"
 msgstr "Ön yükleme menüsünü düzenlemek için lütfen sanal makineyi kapatın"
 
-#: instances/templates/instances/settings_tab.html:130
+#: instances/templates/instances/settings_tab.html:137
 msgid "up: move selected devices"
 msgstr "yukarı: seçili aygıtları taşı"
 
-#: instances/templates/instances/settings_tab.html:133
+#: instances/templates/instances/settings_tab.html:140
 msgid "down: move selected devices"
 msgstr "aşağı: seçili aygıtları taşı"
 
-#: instances/templates/instances/settings_tab.html:139
-#: instances/templates/instances/settings_tab.html:429
+#: instances/templates/instances/settings_tab.html:146
+#: instances/templates/instances/settings_tab.html:456
 msgid "Apply"
 msgstr "Uygula"
 
-#: instances/templates/instances/settings_tab.html:149
+#: instances/templates/instances/settings_tab.html:156
 msgid "Instance Media"
 msgstr "Sanal Makine Medyası"
 
-#: instances/templates/instances/settings_tab.html:152
+#: instances/templates/instances/settings_tab.html:159
 msgid "Add CD-ROM"
 msgstr "CD-ROM Ekle"
 
-#: instances/templates/instances/settings_tab.html:169
-#: instances/templates/instances/settings_tab.html:234
+#: instances/templates/instances/settings_tab.html:182
+#: instances/templates/instances/settings_tab.html:221
+#: instances/templates/instances/settings_tab.html:249
 #: interfaces/templates/create_iface_block.html:34
-#: networks/templates/network.html:43 networks/templates/networks.html:59
-#: storages/templates/create_stg_block.html:77
+#: networks/templates/network.html:43 networks/templates/networks.html:58
+#: storages/templates/create_stg_block.html:91
 msgid "Device"
 msgstr "Aygıt"
 
-#: instances/templates/instances/settings_tab.html:170
+#: instances/templates/instances/settings_tab.html:183
+#: instances/templates/instances/settings_tab.html:222
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: instances/templates/instances/settings_tab.html:188
-#: instances/templates/instances/settings_tab.html:190
+#: instances/templates/instances/settings_tab.html:196
+#: instances/templates/instances/settings_tab.html:198
 msgid "Mount"
 msgstr "Bağla"
 
-#: instances/templates/instances/settings_tab.html:193
+#: instances/templates/instances/settings_tab.html:201
 msgid "Detach CD-ROM (remove device)"
 msgstr "CD-ROM ayır (cihazi sil)"
 
-#: instances/templates/instances/settings_tab.html:208
-#: instances/templates/instances/settings_tab.html:210
+#: instances/templates/instances/settings_tab.html:227
+#: instances/templates/instances/settings_tab.html:229
 msgid "Unmount"
 msgstr "Ayır"
 
-#: instances/templates/instances/settings_tab.html:220
+#: instances/templates/instances/settings_tab.html:238
 msgid "There is not any CD-ROM device."
 msgstr "Hiçbir CD-ROM aygıtı mevcut değil."
 
-#: instances/templates/instances/settings_tab.html:225
+#: instances/templates/instances/settings_tab.html:243
 msgid "Instance Volume"
 msgstr "Sanal Makine Birimi"
 
-#: instances/templates/instances/settings_tab.html:235
+#: instances/templates/instances/settings_tab.html:250
 msgid "Used"
 msgstr "Kullanılan"
 
-#: instances/templates/instances/settings_tab.html:236
+#: instances/templates/instances/settings_tab.html:251
 msgid "Capacity"
 msgstr "Kapasite"
 
-#: instances/templates/instances/settings_tab.html:238
-#: instances/templates/instances/settings_tab.html:363
+#: instances/templates/instances/settings_tab.html:253
+#: instances/templates/instances/settings_tab.html:385
 msgid "Source"
 msgstr "Kaynak"
 
-#: instances/templates/instances/settings_tab.html:294
-#: instances/templates/instances/settings_tab.html:298
+#: instances/templates/instances/settings_tab.html:309
+#: instances/templates/instances/settings_tab.html:313
 msgid "Detach"
 msgstr "Ayır"
 
-#: instances/templates/instances/settings_tab.html:294
+#: instances/templates/instances/settings_tab.html:309
 msgid "Are you sure to detach volume?"
 msgstr "Birimi ayırmak istediğinize emin misiniz?"
 
-#: instances/templates/instances/settings_tab.html:298
-#: instances/templates/instances/settings_tab.html:314
+#: instances/templates/instances/settings_tab.html:313
+#: instances/templates/instances/settings_tab.html:329
 msgid "Are you sure? This may lead data corruption!"
 msgstr "Emin misiniz? Bu veri bozulmasına yol açabilir!"
 
-#: instances/templates/instances/settings_tab.html:310
+#: instances/templates/instances/settings_tab.html:325
 msgid "Are you sure to delete volume?"
 msgstr "Birimi silmek istediğinize emin misiniz?"
 
-#: instances/templates/instances/settings_tab.html:330
+#: instances/templates/instances/settings_tab.html:343
 msgid "Add a network device"
 msgstr "Bir ağ aygıtı ekle"
 
-#: instances/templates/instances/settings_tab.html:336
+#: instances/templates/instances/settings_tab.html:349
 msgid "Network Devices"
 msgstr "Ağ Aygıtları"
 
-#: instances/templates/instances/settings_tab.html:341
-#: instances/templates/instances/settings_tab.html:342
+#: instances/templates/instances/settings_tab.html:354
 msgid "Info"
 msgstr "Bilgi"
 
-#: instances/templates/instances/settings_tab.html:355
+#: instances/templates/instances/settings_tab.html:367
 msgid "active"
 msgstr "aktif"
 
-#: instances/templates/instances/settings_tab.html:361
-#: nwfilters/templates/nwfilter.html:75
+#: instances/templates/instances/settings_tab.html:379
+#: nwfilters/templates/nwfilter.html:71
 msgid "Filter"
 msgstr "Filtre"
 
-#: instances/templates/instances/settings_tab.html:368
+#: instances/templates/instances/settings_tab.html:393
 msgid "Edit NIC"
 msgstr "NIC Düzenle"
 
-#: instances/templates/instances/settings_tab.html:376
+#: instances/templates/instances/settings_tab.html:403
 msgid "Edit Instance Network"
 msgstr "Sanal Makine Ağını Düzenle"
 
-#: instances/templates/instances/settings_tab.html:389
+#: instances/templates/instances/settings_tab.html:416
 msgid "Net Source"
 msgstr "Ağ Kaynağı"
 
-#: instances/templates/instances/settings_tab.html:397
+#: instances/templates/instances/settings_tab.html:424
 #: interfaces/templates/interface.html:4 interfaces/templates/interface.html:6
 #: interfaces/templates/interface.html:39
 msgid "Interface"
 msgstr "Arabirim"
 
-#: instances/templates/instances/settings_tab.html:415
-#: instances/templates/instances/settings_tab.html:454
+#: instances/templates/instances/settings_tab.html:442
+#: instances/templates/instances/settings_tab.html:494
 msgid "Model"
 msgstr "Model"
 
-#: instances/templates/instances/settings_tab.html:429
+#: instances/templates/instances/settings_tab.html:456
 msgid "Apply network changes"
 msgstr "Ağ değişikliklerini uygula"
 
-#: instances/templates/instances/settings_tab.html:438
+#: instances/templates/instances/settings_tab.html:472
 msgid "Delete Device"
 msgstr "Aygıt Sil"
 
-#: instances/templates/instances/settings_tab.html:446
-#: interfaces/templates/create_iface_block.html:71
+#: instances/templates/instances/settings_tab.html:482
+#: interfaces/templates/create_iface_block.html:72
 #: interfaces/templates/interface.html:41
 msgid "IPv4"
 msgstr "IPv4"
 
-#: instances/templates/instances/settings_tab.html:450
-#: interfaces/templates/create_iface_block.html:74
+#: instances/templates/instances/settings_tab.html:488
+#: interfaces/templates/create_iface_block.html:77
 #: interfaces/templates/interface.html:43
 msgid "IPv6"
 msgstr "IPv6"
 
-#: instances/templates/instances/settings_tab.html:456
-msgid "QoS"
-msgstr "QoS"
-
-#: instances/templates/instances/settings_tab.html:468
+#: instances/templates/instances/settings_tab.html:502
 msgid ""
 "In most configurations, macvtap does not work for host to guest network "
 "communication"
 msgstr ""
-<<<<<<< HEAD
 "macvtap bir çok yapılandırmada sunucu ile sanal makine ağı arasındaki "
 "iletişimde çalışmaz"
-=======
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 
-#: instances/templates/instances/settings_tab.html:481
+#: instances/templates/instances/settings_tab.html:515
 #: networks/templates/network.html:322
 msgid "QoS Configuration"
 msgstr "QoS Yapılandırması"
 
-#: instances/templates/instances/settings_tab.html:487
+#: instances/templates/instances/settings_tab.html:521
 #: networks/templates/add_network_qos.html:18
-#: networks/templates/network.html:328 nwfilters/templates/nwfilter.html:131
+#: networks/templates/network.html:328 nwfilters/templates/nwfilter.html:123
 msgid "Direction"
 msgstr "Yön"
 
-#: instances/templates/instances/settings_tab.html:488
+#: instances/templates/instances/settings_tab.html:522
 #: networks/templates/add_network_qos.html:27
 #: networks/templates/network.html:329
 msgid "Average"
 msgstr "Ortalama"
 
-#: instances/templates/instances/settings_tab.html:489
+#: instances/templates/instances/settings_tab.html:523
 #: networks/templates/add_network_qos.html:34
 #: networks/templates/network.html:330
 msgid "Peak"
 msgstr "Tepe"
 
-#: instances/templates/instances/settings_tab.html:490
+#: instances/templates/instances/settings_tab.html:524
 #: networks/templates/add_network_qos.html:41
 #: networks/templates/network.html:331
 msgid "Burst"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:515
+#: instances/templates/instances/settings_tab.html:549
 #: networks/templates/network.html:353
 msgid "Edit QoS"
 msgstr "QoS Düzenle"
 
-#: instances/templates/instances/settings_tab.html:525
+#: instances/templates/instances/settings_tab.html:559
 #: networks/templates/network.html:358
 msgid "Delete QoS"
 msgstr "QoS Sil"
 
-#: instances/templates/instances/settings_tab.html:541
+#: instances/templates/instances/settings_tab.html:575
 msgid "For migration both host servers must have equal settings and OS type"
 msgstr ""
 "Taşıma için iki sunucu da eşlenik ayarlara ve OS tipine sahip olmalıdır"
 
-#: instances/templates/instances/settings_tab.html:545
+#: instances/templates/instances/settings_tab.html:579
 msgid "Original host"
 msgstr "Orijinal Sunucu"
 
-#: instances/templates/instances/settings_tab.html:551
+#: instances/templates/instances/settings_tab.html:585
 msgid "Host migration"
 msgstr "Sunucu taşıma"
 
-#: instances/templates/instances/settings_tab.html:568
+#: instances/templates/instances/settings_tab.html:602
 msgid "Live migration"
 msgstr "Canlı olarak taşı"
 
-#: instances/templates/instances/settings_tab.html:576
+#: instances/templates/instances/settings_tab.html:610
 msgid "Unsafe migration"
 msgstr "Güvensiz taşıma"
 
-#: instances/templates/instances/settings_tab.html:584
+#: instances/templates/instances/settings_tab.html:618
 msgid "Delete original"
 msgstr "Orjinali sil"
 
-#: instances/templates/instances/settings_tab.html:592
+#: instances/templates/instances/settings_tab.html:626
 msgid "Offline migration"
 msgstr "Çevrimdışı olarak taşı"
 
-#: instances/templates/instances/settings_tab.html:600
+#: instances/templates/instances/settings_tab.html:634
 msgid "Post copy"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:608
+#: instances/templates/instances/settings_tab.html:642
 msgid "Forces CPU convergence during live migration"
 msgstr "Canlı göç esnasında CPU yu yavaşlamaya zorlar"
 
-#: instances/templates/instances/settings_tab.html:608
+#: instances/templates/instances/settings_tab.html:642
 msgid "Auto converge"
 msgstr "Otomatik yavaşlat"
 
-#: instances/templates/instances/settings_tab.html:616
+#: instances/templates/instances/settings_tab.html:650
 msgid "Compress instance memory for fast migration"
 msgstr "Hızlı taşıma için sanal makine belleğini sıkıştır"
 
-#: instances/templates/instances/settings_tab.html:616
+#: instances/templates/instances/settings_tab.html:650
 msgid "Compressed"
 msgstr "Sıkıştırılmış"
 
-#: instances/templates/instances/settings_tab.html:629
+#: instances/templates/instances/settings_tab.html:663
 msgid "If you need to edit XML please Power Off the instance"
 msgstr ""
 "XML üzerinden ayarları değiştirmek istiyorsanız sanal makineyi kapatmalısınız"
 
-#: instances/templates/instances/settings_tab.html:651
+#: instances/templates/instances/settings_tab.html:685
 msgid "Instance owners"
 msgstr "Sanal makine sahipleri"
 
-#: instances/templates/instances/settings_tab.html:680
-<<<<<<< HEAD
-=======
-#, fuzzy
-#| msgid "To create console password, shutdown the instance."
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/settings_tab.html:714
 msgid "To change console settings, shutdown the instance."
 msgstr "Konsol ayarlarını değiştirmek için sanal makineyi kapatın"
 
-#: instances/templates/instances/settings_tab.html:697
+#: instances/templates/instances/settings_tab.html:731
 msgid "Create a clone"
 msgstr "Bir klon oluştur"
 
-#: instances/templates/instances/settings_tab.html:700
+#: instances/templates/instances/settings_tab.html:734
 msgid "Clone Name"
 msgstr "Klon Adı"
 
-#: instances/templates/instances/settings_tab.html:707
-#: instances/templates/instances/settings_tab.html:738
+#: instances/templates/instances/settings_tab.html:740
+#: instances/templates/instances/settings_tab.html:769
 msgid "Guess"
 msgstr "Tahmin"
 
-#: instances/templates/instances/settings_tab.html:726
+#: instances/templates/instances/settings_tab.html:758
 msgid "Network devices"
 msgstr "Ağ aygıtları"
 
-#: instances/templates/instances/settings_tab.html:736
+#: instances/templates/instances/settings_tab.html:767
 msgid "Random"
 msgstr "Rastgele"
 
-#: instances/templates/instances/settings_tab.html:751
+#: instances/templates/instances/settings_tab.html:781
 msgid "Storage devices"
 msgstr "Depolama aygıtları"
 
-#: instances/templates/instances/settings_tab.html:776
-#: instances/templates/instances/settings_tab.html:799
+#: instances/templates/instances/settings_tab.html:805
+#: instances/templates/instances/settings_tab.html:828
 msgid "Title"
 msgstr "Başlık"
 
-#: instances/templates/instances/settings_tab.html:796
+#: instances/templates/instances/settings_tab.html:825
 msgid "To set instance template name description, shutdown the instance."
 msgstr ""
 "Sanal makine şablon adını ve tanımını ayarlamak için sanal makineyi kapatın."
 
-#: instances/templates/instances/settings_tab.html:811
+#: instances/templates/instances/settings_tab.html:840
 msgid "Is template"
 msgstr "Şablon?"
 
-#: instances/templates/instances/settings_tab.html:832
+#: instances/templates/instances/settings_tab.html:861
 msgid "To set instance video model, shutdown the instance."
 msgstr "Sanal makine video modelini ayarlamak için sanal makineyi kapatın."
 
-#: instances/templates/instances/settings_tab.html:835
+#: instances/templates/instances/settings_tab.html:864
 msgid "Primary Video Model"
 msgstr "Birincil Video Model"
 
-#: instances/templates/instances/settings_tab.html:839
+#: instances/templates/instances/settings_tab.html:868
 msgid "please choose"
 msgstr "lütfen seçiniz"
 
-#: instances/templates/instances/settings_tab.html:846
-#: instances/templates/instances/settings_tab.html:848
-#: instances/templates/instances/settings_tab.html:868
-#: instances/templates/instances/settings_tab.html:870
-#: instances/templates/instances/settings_tab.html:898
-#: secrets/templates/secrets.html:103
+#: instances/templates/instances/settings_tab.html:874
+#: instances/templates/instances/settings_tab.html:876
+#: instances/templates/instances/settings_tab.html:894
+#: instances/templates/instances/settings_tab.html:896
+#: instances/templates/instances/settings_tab.html:922
+#: virtsecrets/templates/secrets.html:104
 msgid "Set"
 msgstr "Ayarla"
 
-#: instances/templates/instances/settings_tab.html:856
+#: instances/templates/instances/settings_tab.html:883
 msgid "To set instance vCPUs hotpluggable"
 msgstr "Sanal makinenin vCPUlarını hotpluggable yapmak için"
 
-#: instances/templates/instances/settings_tab.html:859
+#: instances/templates/instances/settings_tab.html:886
 msgid "vCPU Hot Plug"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:863
-#: instances/templates/instances/settings_tab.html:894
+#: instances/templates/instances/settings_tab.html:890
+#: instances/templates/instances/settings_tab.html:919
 msgid "Enabled"
 msgstr "Etkin"
 
-#: instances/templates/instances/settings_tab.html:864
-#: instances/templates/instances/settings_tab.html:895
+#: instances/templates/instances/settings_tab.html:891
+#: instances/templates/instances/settings_tab.html:920
 msgid "Disabled"
 msgstr "Devredışı"
 
-#: instances/templates/instances/settings_tab.html:878
+#: instances/templates/instances/settings_tab.html:903
 msgid "To Enable/Disable Qemu Guest Agent. Status"
 msgstr "Misafir Aracıyı Etkilenleştirme/Devredışı bırakmak için. Durum"
 
-#: instances/templates/instances/settings_tab.html:883
+#: instances/templates/instances/settings_tab.html:908
 msgid "Disconnected"
 msgstr "Bağlantı yok"
 
-#: instances/templates/instances/settings_tab.html:886
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:709
+#: instances/templates/instances/settings_tab.html:911
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:714
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:703
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: instances/templates/instances/settings_tab.html:890
+#: instances/templates/instances/settings_tab.html:915
 msgid "Qemu Guest Agent"
 msgstr "Qemu Misafir Aracısı"
 
-#: instances/templates/instances/snapshots_tab.html:9
-#: instances/templates/instances/snapshots_tab.html:31
-#: instances/templates/instances/snapshots_tab.html:33
+#: instances/templates/instances/snapshots_tab.html:8
+#: instances/templates/instances/snapshots_tab.html:26
 msgid "Take Snapshot"
 msgstr "Anlık Görüntü Oluştur"
 
-#: instances/templates/instances/snapshots_tab.html:14
+#: instances/templates/instances/snapshots_tab.html:13
 msgid "Manage Snapshots"
 msgstr "Anlık Görüntüleri Yönet"
 
-#: instances/templates/instances/snapshots_tab.html:22
+#: instances/templates/instances/snapshots_tab.html:20
+#, fuzzy
+#| msgid ""
+#| "This may take more than an hour, depending on how much content is on your "
+#| "instance and how large the disk is."
 msgid ""
 "This may take more than an hour, depending on how much content is on your "
-"instance and how large the disk is."
+"instance and how large the disk is. It could cause web server timeout.."
 msgstr ""
 "Bu işlem diskinizin büyüklüğüne ve sanal makinenizin boyutuna göre bir "
 "saatten fazla sürebilir"
 
-#: instances/templates/instances/snapshots_tab.html:27
+#: instances/templates/instances/snapshots_tab.html:25
 msgid "Enter Snapshot Name"
 msgstr "Anlık görüntü adı girin"
 
-#: instances/templates/instances/snapshots_tab.html:38
-msgid "To take a snapshot please Power Off the instance."
-msgstr "Anlık görüntü oluşturmak için lütfen sanal makinenizi kapatınız."
-
-#: instances/templates/instances/snapshots_tab.html:43
+#: instances/templates/instances/snapshots_tab.html:35
 msgid "Choose a snapshot for restore/delete"
 msgstr "Geri yükleme/Silmek için bir anlık görüntü seçin"
 
-#: instances/templates/instances/snapshots_tab.html:61
+#: instances/templates/instances/snapshots_tab.html:53
 msgid "Revert to this Snapshot"
 msgstr "Bu anlık görüntüye dön"
 
-#: instances/templates/instances/snapshots_tab.html:66
+#: instances/templates/instances/snapshots_tab.html:58
 msgid "To restore snapshots you need Power Off the instance."
 msgstr "Anlık görüntüye dönmek için lütfen sanal makineyi kapatınız."
 
-#: instances/templates/instances/snapshots_tab.html:75
+#: instances/templates/instances/snapshots_tab.html:67
 msgid "Delete Snapshot"
 msgstr "Anlık Görüntü Sil"
 
-#: instances/templates/instances/snapshots_tab.html:86
+#: instances/templates/instances/snapshots_tab.html:78
 msgid "You do not have any snapshots"
 msgstr "Hiç anlık görüntünüz yok"
 
-#: instances/templates/instances/stats_tab.html:8
+#: instances/templates/instances/stats_tab.html:7
 msgid "Real Time"
 msgstr "Gerçek Zamanlı"
 
-#: instances/templates/instances/stats_tab.html:23
+#: instances/templates/instances/stats_tab.html:22
 msgid "CPU Usage"
 msgstr "CPU Kullanımı"
 
@@ -2777,11 +2588,11 @@ msgstr "CPU Kullanımı"
 msgid "Memory Usage"
 msgstr "Bellek Kullanımı"
 
-#: instances/templates/instances/stats_tab.html:50
+#: instances/templates/instances/stats_tab.html:51
 msgid "Bandwidth Device"
 msgstr "Bant Genişliği Aygıtı"
 
-#: instances/templates/instances/stats_tab.html:65
+#: instances/templates/instances/stats_tab.html:67
 msgid "Disk I/O device"
 msgstr "Disk I/O aygıtı"
 
@@ -2789,53 +2600,30 @@ msgstr "Disk I/O aygıtı"
 msgid "None available device name"
 msgstr "Hiçbiri uygun aygıt adı değil"
 
-<<<<<<< HEAD
-#: instances/views.py:242
+#: instances/views.py:249
 msgid "Templates cannot be started."
 msgstr "Şablon makineler başlatılamaz."
 
-#: instances/views.py:345
+#: instances/views.py:352
 #, fuzzy, python-format
 #| msgid "Instance is migrated to %(hostname)s"
 msgid "Instance is migrated to %(hostname)s"
 msgstr "Sanal makine %(hostname)% ya taşındı"
 
-#: instances/views.py:368
+#: instances/views.py:375
 msgid "Reset root password"
 msgstr "Kök parolayı sıfırla"
 
-#: instances/views.py:374 instances/views.py:403
+#: instances/views.py:381 instances/views.py:410
 msgid "Please shutdown down your instance and then try again"
 msgstr "Lütfen sanal makinenizi kapatın ve yeniden deneyin"
 
-#: instances/views.py:395
-=======
-#: instances/views.py:236
-msgid "Templates cannot be started."
-msgstr "Şablon makineler başlatılamaz."
-
-#: instances/views.py:339
-#, fuzzy, python-format
-#| msgid "Migrate to {new_compute.hostname}"
-msgid "Migrate to %(hostname)%"
-msgstr "%(hostname)% ya taşı"
-
-#: instances/views.py:362
-msgid "Reset root password"
-msgstr "Kök parolayı sıfırla"
-
-#: instances/views.py:368 instances/views.py:397
-msgid "Please shutdown down your instance and then try again"
-msgstr "Lütfen sanal makinenizi kapatın ve yeniden deneyin"
-
-#: instances/views.py:389
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:402
 #, python-format
 msgid "Installed new SSH public key %(keyname)s"
 msgstr "Yeni %(keyname)s SSH açık anahtarı kuruldu"
 
-<<<<<<< HEAD
-#: instances/views.py:422
+#: instances/views.py:429
 #, python-format
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize CPU of '%(instance_name)s'!"
@@ -2843,33 +2631,13 @@ msgstr ""
 "%(quota_msg)s kullanıcısı kotası doldu, '%(instance_name)s' in CPU su "
 "yeniden boyutlandırılamıyor!"
 
-#: instances/views.py:431
+#: instances/views.py:438
 #, python-format
 msgid "CPU is resized:  %(old)s to %(new)s"
 msgstr "CPU sayısı değiştirildi: %(old)s -> %(new)s"
 
-#: instances/views.py:459
+#: instances/views.py:466
 #, python-format
-=======
-#: instances/views.py:416
-#, fuzzy, python-format
-#| msgid ""
-#| "User {quota_msg} quota reached, cannot resize CPU of '{instance.name}'!"
-msgid ""
-"User %(quota_msg)s quota reached, cannot resize CPU of '%(instance_name)s'!"
-msgstr ""
-"%(quota_msg)s kullanıcısı kotası doldu, '%(instance_name)s' in CPU su yeniden "
-"boyutlandırılamıyor!"
-
-#: instances/views.py:425
-msgid "Resize CPU"
-msgstr "CPU Boyutlandır"
-
-#: instances/views.py:453
-#, fuzzy, python-format
-#| msgid ""
-#| "User {quota_msg} quota reached, cannot resize memory of '{instance.name}'!"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize memory of "
 "'%(instance_name)s'!"
@@ -2877,8 +2645,7 @@ msgstr ""
 "%(quota_msg)s kullanıcı kotası doldu, '%(instance_name)s' in belleği yeniden "
 "boyutlandırılamıyor!"
 
-<<<<<<< HEAD
-#: instances/views.py:466
+#: instances/views.py:473
 #, fuzzy, python-format
 #| msgid "Memory is resized"
 msgid ""
@@ -2888,349 +2655,186 @@ msgstr ""
 "Bellek kapasitesi değiştirildi: current/max: %(old_cur)s/%(old_max)s/"
 "%(new_max)s"
 
-#: instances/views.py:500
+#: instances/views.py:507
 #, python-format
-=======
-#: instances/views.py:462
-msgid "Resize Memory"
-msgstr "Bellek Boyutlandır"
-
-#: instances/views.py:491
-#, fuzzy, python-format
-#| msgid ""
-#| "User {quota_msg} quota reached, cannot resize disks of '{instance.name}'!"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize disks of '%(instance_name)s'!"
 msgstr ""
 "%(quota_msg)s kullanıcı kotası doldu, '%(instance_name)s' in diski yeniden "
 "boyutlandırılamıyor!"
 
-<<<<<<< HEAD
-#: instances/views.py:507
+#: instances/views.py:514
 #, python-format
 msgid "Disk is resized: %(dev)s"
 msgstr "Disk boyutu değiştirildi: %(dev)s"
 
-#: instances/views.py:546
+#: instances/views.py:570
 #, fuzzy, python-format
 #| msgid "Attach new disk %(name)s (%(format)s)"
 msgid "Attach new disk: %(name)s (%(format)s)"
 msgstr "Yeni disk tak %(name)s (%(format)s)"
 
-#: instances/views.py:577
+#: instances/views.py:609
 #, python-format
 msgid "Attach Existing disk: %(target_dev)s"
 msgstr "Takılan mevcut disk: %(target_dev)s"
 
-#: instances/views.py:635
-=======
-#: instances/views.py:498
-msgid "Disk resize"
-msgstr "Disk Boyutlandır"
-
-#: instances/views.py:537
-#, fuzzy, python-format
-#| msgid "Attach new disk {name} ({format})"
-msgid "Attach new disk %(name)s (%(format)s)"
-msgstr "Yeni disk tak %(name)s (%(format)s)"
-
-#: instances/views.py:568
-#, fuzzy, python-format
-#| msgid "Attach Existing disk: {target_dev}"
-msgid "Attach Existing disk: %(target_dev)s"
-msgstr "Takılan mevcut disk: %(target_dev)s"
-
-#: instances/views.py:624
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:667
 msgid "Volume changes are applied. But it will be activated after shutdown"
 msgstr ""
 "Birim değişiklikleri uygulandı. Ama yeniden başlatıldıktan sonra uygulanacak"
 
-#: instances/views.py:626
+#: instances/views.py:670
 msgid "Volume is changed successfully."
 msgstr "Birim başarıyla değiştirildi."
 
-<<<<<<< HEAD
-#: instances/views.py:639
+#: instances/views.py:671
 #, python-format
 msgid "Edit disk: %(target_dev)s"
 msgstr "Disk düzenle: %(target_dev)s"
 
-#: instances/views.py:661
+#: instances/views.py:693
 #, python-format
 msgid "Delete disk: %(dev)s"
 msgstr "Disk sil: %(dev)s"
 
-#: instances/views.py:677
+#: instances/views.py:709
 #, python-format
 msgid "Detach disk: %(dev)s"
 msgstr "Diski ayır: %(dev)s"
 
-#: instances/views.py:690
+#: instances/views.py:722
 #, python-format
 msgid "Add CD-ROM: %(target)s"
 msgstr "CD-ROM Ekle: %(target)s"
 
-#: instances/views.py:703
+#: instances/views.py:735
 #, python-format
 msgid "Detach CD-ROM: %(dev)s"
 msgstr "CD-ROM ayır: %(dev)s"
 
-#: instances/views.py:716
+#: instances/views.py:748
 #, python-format
 msgid "Mount media: %(dev)s"
 msgstr "Medya tak: %(dev)s"
 
-#: instances/views.py:729
+#: instances/views.py:761
 #, python-format
 msgid "Unmount media: %(dev)s"
 msgstr "Medyayı ayır: %(dev)s"
 
-#: instances/views.py:742
+#: instances/views.py:774
 #, fuzzy, python-format
 #| msgid "Create snapshot: %(snap)s"
 msgid "Create snapshot: %(snap)s"
 msgstr "Anlık görüntü oluştur: %(snap_name)s"
 
-#: instances/views.py:753
+#: instances/views.py:785
 #, fuzzy, python-format
 #| msgid "Delete snapshot: %(snap)s"
 msgid "Delete snapshot: %(snap)s"
-=======
-#: instances/views.py:627
-#, fuzzy, python-format
-#| msgid "Edit disk: {target_dev}"
-msgid "Edit disk: %(target_dev)s"
-msgstr "Disk düzenle: %(target_dev)s"
-
-#: instances/views.py:649
-#, fuzzy, python-format
-#| msgid "Delete disk: {dev}"
-msgid "Delete disk: %(dev)s"
-msgstr "Disk sil: %(dev)s"
-
-#: instances/views.py:665
-#, fuzzy, python-format
-#| msgid "Detach disk: {dev}"
-msgid "Detach disk: %(dev)s"
-msgstr "Diski ayır: %(dev)s"
-
-#: instances/views.py:678
-#, fuzzy, python-format
-#| msgid "Add CD-ROM: {target}"
-msgid "Add CD-ROM: %(target)s"
-msgstr "CD-ROM Ekle: %(target)s"
-
-#: instances/views.py:691
-#, fuzzy, python-format
-#| msgid "Detach CD-ROM: {dev}"
-msgid "Detach CD-ROM: %(dev)s"
-msgstr "CD-ROM ayır: %(dev)s"
-
-#: instances/views.py:704
-#, fuzzy, python-format
-#| msgid "Mount media: {dev}"
-msgid "Mount media: %(dev)s"
-msgstr "Medya tak: %(dev)s"
-
-#: instances/views.py:717
-#, fuzzy, python-format
-#| msgid "Umount media: {dev}"
-msgid "Unmount media: %(dev)s"
-msgstr "Medyayı ayır: %(dev)s"
-
-#: instances/views.py:730
-#, fuzzy, python-format
-#| msgid "New snapshot : {name}"
-msgid "New snapshot: %(name)s"
-msgstr "Yeni anlık görüntü: %(name)s"
-
-#: instances/views.py:741
-#, fuzzy, python-format
-#| msgid "Delete snapshot : {snap_name}"
-msgid "Delete snapshot: %(snap_name)s"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgstr "Anlık görüntü sil: %(snap_name)s"
 
-#: instances/views.py:752
+#: instances/views.py:796
 msgid "Successful revert snapshot: "
 msgstr "Anlık görüntü geri dönüş başarılı:"
 
-<<<<<<< HEAD
-#: instances/views.py:767
-#, fuzzy
+#: instances/views.py:799
+#, fuzzy, python-format
 #| msgid "Delete snapshot: %(snap_name)s"
-msgid "Revert snapshot: %(snap)"
+msgid "Revert snapshot: %(snap)s"
 msgstr "Anlık görüntüye dönüldü: %(snap_name)s"
 
-#: instances/views.py:781
-=======
-#: instances/views.py:755
-msgid "Revert snapshot"
-msgstr "Snapshota dön"
-
-#: instances/views.py:769
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:813
 #, python-format
 msgid "VCPU %(id)s is enabled=%(enabled)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:790
-=======
-#: instances/views.py:780
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:822
 #, python-format
 msgid "VCPU Hot-plug is enabled=%(status)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:800
+#: instances/views.py:832
 msgid "Set autostart"
 msgstr "Otomatik başlatmayı ayarla"
 
-#: instances/views.py:809
+#: instances/views.py:841
 msgid "Unset autostart"
 msgstr "Otomatik başlatmayı iptal et"
 
-#: instances/views.py:818
+#: instances/views.py:850
 msgid "Enable boot menu"
 msgstr "Ön yükleme menüsünü etkinleştir"
 
-#: instances/views.py:827
+#: instances/views.py:859
 msgid "Disable boot menu"
 msgstr "Ön yükleme menüsünü devredışı bırak"
 
-#: instances/views.py:842
+#: instances/views.py:874
 msgid "Set boot order"
 msgstr "Ön yükleme sırasını ayarla"
 
-#: instances/views.py:847
-=======
-#: instances/views.py:791
-msgid "Set autostart"
-msgstr "Otomatik başlatmayı ayarla"
-
-#: instances/views.py:800
-msgid "Unset autostart"
-msgstr "Otomatik başlatmayı iptal et"
-
-#: instances/views.py:809
-msgid "Enable boot menu"
-msgstr "Ön yükleme menüsünü etkinleştir"
-
-#: instances/views.py:818
-msgid "Disable boot menu"
-msgstr "Ön yükleme menüsünü devredışı bırak"
-
-#: instances/views.py:833
-msgid "Set boot order"
-msgstr "Ön yükleme sırasını ayarla"
-
-#: instances/views.py:836
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:879
 msgid "Boot menu changes applied. But it will be activated after shutdown"
 msgstr ""
 "Ön yükleme menüsü değişiklikleri uygulandı. Fakat yeniden başlatılınca "
 "uygulanacak"
 
-#: instances/views.py:838
+#: instances/views.py:882
 msgid "Boot order changed successfully."
 msgstr "Ön yükleme sırası başarıyla değiştirildi."
 
-<<<<<<< HEAD
-#: instances/views.py:861
+#: instances/views.py:893
 #, fuzzy
 #| msgid "Can clone instances"
 msgid "Change instance XML"
 msgstr "Sanal makineleri klonlayabilir"
 
-#: instances/views.py:875
+#: instances/views.py:907
 #, python-format
 msgid "Set Guest Agent: %(status)s"
 msgstr "Misafir Ajanını Ayarla: %(status)s"
 
-#: instances/views.py:885
-#, fuzzy
-#| msgid "Set Video Model"
-msgid "Set Video Model: %(model)"
-=======
-#: instances/views.py:849
-msgid "Edit XML"
-msgstr "XML Düzenle"
-
-#: instances/views.py:863
+#: instances/views.py:917
 #, fuzzy, python-format
-#| msgid "Set Quest Agent {status}"
-msgid "Set Guest Agent %(status)s"
-msgstr "Misafir Aracı Ayarla {status}"
-
-#: instances/views.py:873
-msgid "Set Video Model"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#| msgid "Set Video Model"
+msgid "Set Video Model: %(model)s"
 msgstr "Video Modeli Ayarla"
 
-#: instances/views.py:882
+#: instances/views.py:926
 msgid "Change network"
 msgstr "Ağ değiştir"
 
-#: instances/views.py:895
+#: instances/views.py:949
 msgid "Network Device Config is changed. Please shutdown instance to activate."
 msgstr ""
 "Ağ aygıtı yapılandırması değiştirildi. Aktifleştirmek için lütfen sanal "
 "makineyi kapatın."
 
-<<<<<<< HEAD
-#: instances/views.py:922
+#: instances/views.py:974
 #, fuzzy, python-format
 #| msgid "Add network"
 msgid "Add network: %(mac)s"
 msgstr "Ağ ekle: %(mac)s"
 
-#: instances/views.py:933
+#: instances/views.py:985
 #, python-format
 msgid "Delete Network: %(mac)s"
 msgstr "Ağ sil: %(mac)s"
 
-#: instances/views.py:946
+#: instances/views.py:998
 #, python-format
 msgid "Set Link State: %(state)s"
 msgstr "Bağlantı durumunu ayarla: %(state)s"
 
-#: instances/views.py:966 networks/views.py:231
+#: instances/views.py:1018 networks/views.py:231
 #, python-format
 msgid "%(qos_dir)s QoS is set"
 msgstr "%(qos_dir)s QoS ayarlandı"
 
-#: instances/views.py:971
+#: instances/views.py:1023
 #, python-format
-=======
-#: instances/views.py:903
-msgid "Add network"
-msgstr "Ağ ekle"
-
-#: instances/views.py:917
-msgid "Delete network"
-msgstr "Ağ sil"
-
-#: instances/views.py:933
-#, fuzzy, python-format
-#| msgid "Set Link State: {state}"
-msgid "Set Link State: %(state)s"
-msgstr "Bağlantı durumunu ayarla: %(state)s"
-
-#: instances/views.py:952
-#, fuzzy, python-format
-#| msgid "{qos_dir.capitalize()} QoS is set"
-msgid "%(qos_dir)s QoS is set"
-msgstr "%(qos_dir)s QoS ayarlandı"
-
-#: instances/views.py:956
-#, fuzzy, python-format
-#| msgid ""
-#| "Network XML is changed. \\Stop and start network to activate new config."
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid ""
 "%(qos_dir)s QoS is set. Network XML is changed.                 Stop and "
 "start network to activate new config."
@@ -3238,26 +2842,13 @@ msgstr ""
 "%(qos_dir)s QoS ayarlandı. Ağ XML i değiştirildi. \\ Aktifleştirmek için "
 "durdurun ve yeniden başlatın."
 
-<<<<<<< HEAD
-#: instances/views.py:988 networks/views.py:246
+#: instances/views.py:1040 networks/views.py:246
 #, python-format
 msgid "%(qos_dir)s QoS is deleted"
 msgstr "%(qos_dir)s QoS silindi"
 
-#: instances/views.py:993
+#: instances/views.py:1045
 #, python-format
-=======
-#: instances/views.py:970
-#, fuzzy, python-format
-#| msgid "{qos_dir.capitalize()} QoS is deleted"
-msgid "%(qos_dir)s QoS is deleted"
-msgstr "%(qos_dir)s QoS silindi"
-
-#: instances/views.py:974
-#, fuzzy, python-format
-#| msgid ""
-#| "Network XML is changed. \\Stop and start network to activate new config."
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid ""
 "%(qos_dir)s QoS is deleted. Network XML is changed.                 Stop and "
 "start network to activate new config."
@@ -3265,99 +2856,48 @@ msgstr ""
 "%(qos_dir)s QoS silindi. Ağ XML i değiştirildi. \\ Aktifleştirmek için "
 "durdurun ve yeniden başlatın."
 
-<<<<<<< HEAD
-#: instances/views.py:1012
+#: instances/views.py:1064
 msgid "Only one owner is allowed and the one already added"
 msgstr "Sadece bir sahibe izin verilmiştir ve bir sahip zaten eklenmiş"
 
-#: instances/views.py:1017
+#: instances/views.py:1069
 #, python-format
 msgid "Add owner: %(user)s"
 msgstr "Sahip ekle: %(user)s"
 
-#: instances/views.py:1028
+#: instances/views.py:1080
 #, python-format
 msgid "Delete owner: %(userinstance_id)s "
 msgstr "Sahip sil: %(userinstance_id)s"
 
-#: instances/views.py:1060
+#: instances/views.py:1112
 #, python-format
-=======
-#: instances/views.py:990
-msgid "Only one owner is allowed and the one already added"
-msgstr "Sadece bir sahibe izin verilmiştir ve bir sahip zaten eklenmiş"
-
-#: instances/views.py:995
-#, fuzzy, python-format
-#| msgid "Added owner {user_id}"
-msgid "Added owner %(user)s"
-msgstr "Eklenmiş sahip %(user)s"
-
-#: instances/views.py:1006
-#, fuzzy, python-format
-#| msgid "Deleted owner {userinstance_id}"
-msgid "Deleted owner %(userinstance_id)s"
-msgstr "Silinmiş sahip %(userinstance_id)s"
-
-#: instances/views.py:1038
-#, fuzzy, python-format
-#| msgid ""
-#| "User {quota_msg} quota reached, cannot resize CPU of '{instance.name}'!"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "User '%(quota_msg)s' quota reached, cannot create '%(clone_name)s'!"
 msgstr ""
 "%(quota_msg)s' Kullanıcı kotası doldu, '%(clone_name)s' in CPU su yeniden "
 "boyutlandırılamıyor!"
 
-<<<<<<< HEAD
-#: instances/views.py:1066
+#: instances/views.py:1118
 #, python-format
 msgid "Instance '%(clone_name)s' already exists!"
 msgstr "'%(clone_name)s' sanal makinesi zaten mevcut!"
 
-#: instances/views.py:1069
+#: instances/views.py:1121
 #, python-format
 msgid "Instance name '%(clone_name)s' contains invalid characters!"
 msgstr "Sanal makine adı '%(clone_name)s' geçersiz karakterler içermektedir!"
 
-#: instances/views.py:1072
+#: instances/views.py:1124
 #, python-format
 msgid "Instance MAC '%(clone_mac)s' invalid format!"
 msgstr "Sanal makine MAC adresi '%(clone_mac)s' geçersiz biçemde belirtilmiş!"
 
-#: instances/views.py:1082
+#: instances/views.py:1134
 #, python-format
 msgid "Create a clone of '%(instance_name)s'"
 msgstr "'%(instance_name)s' un klonu oluştur"
 
-#: instances/views.py:1121
-=======
-#: instances/views.py:1044
-#, fuzzy
-#| msgid "Instance '{clone_data['name']}' already exists!"
-msgid "Instance '%(clone_name)s' already exists!"
-msgstr "'%(clone_name)s' sanal makinesi zaten mevcut!"
-
-#: instances/views.py:1047
-#, fuzzy, python-format
-#| msgid "Instance name '{clone_data['name']}' contains invalid characters!"
-msgid "Instance name '%(clone_name)s' contains invalid characters!"
-msgstr "Sanal makine adı '%(clone_name)s' geçersiz karakterler içermektedir!"
-
-#: instances/views.py:1050
-#, fuzzy, python-format
-#| msgid "Instance MAC '{clone_data['clone-net-mac-0']}' invalid format!"
-msgid "Instance MAC '%(clone_mac)s' invalid format!"
-msgstr "Sanal makine MAC adresi '%(clone_mac)s' geçersiz biçemde belirtilmiş!"
-
-#: instances/views.py:1060
-#, fuzzy, python-format
-#| msgid "Clone of '{instance.name}'"
-msgid "Clone of '%(instance_name)s'"
-msgstr "'%(instance_name)s' un klonu"
-
-#: instances/views.py:1093
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1173
 msgid ""
 "Error setting console password. You should check that your instance have an "
 "graphic device."
@@ -3365,175 +2905,85 @@ msgstr ""
 "Konsol parolası ayarlanırken hata oluştu. Sanal makinenin bir grafik "
 "aygıtına sahip olduğundan emin olunuz."
 
-<<<<<<< HEAD
-#: instances/views.py:1126
+#: instances/views.py:1178
 msgid "Set VNC password"
 msgstr "VNC parolası ayarlar"
 
-#: instances/views.py:1135
+#: instances/views.py:1187
 msgid "Set VNC keymap"
 msgstr "VNC Keymapi ayarla"
 
-#: instances/views.py:1140
+#: instances/views.py:1192
 msgid "Set VNC type"
 msgstr "VNC tipini ayarla"
 
-#: instances/views.py:1145
+#: instances/views.py:1197
 msgid "Set VNC listen address"
 msgstr "VNC dinleme adresini ayarla"
 
-#: instances/views.py:1168
+#: instances/views.py:1220
 msgid "Edit options"
 msgstr "Seçenekleri düzenle"
 
-#: instances/views.py:1182
+#: instances/views.py:1234
 msgid "Send console.vv file"
 msgstr "console.vv dosyası gönder"
 
-#: instances/views.py:1243 instances/views.py:1337
+#: instances/views.py:1295 instances/views.py:1389
 msgid "A virtual machine with this name already exists"
 msgstr "Bu isimde bir sanal makine mevcut"
 
-#: instances/views.py:1320
+#: instances/views.py:1372
 msgid "You haven't defined any storage pools"
 msgstr "Hiç bir depolama havuzu tanımlamadınız"
 
-#: instances/views.py:1322
-msgid "You haven't defined any network pools"
-msgstr "Hiç bir ağ havuzu tanımlamadınız"
-
-#: instances/views.py:1339
-msgid "There is an instance with same name. Remove it and try again!"
-msgstr "Aynı isimde başka bir sanal makine var. Onu silip yeniden deneyin!"
-
-#: instances/views.py:1343
-msgid "No Virtual Machine MAC has been entered"
-msgstr "Sanal makine için MAC adresi belirtmediniz"
-
 #: instances/views.py:1374
-=======
-#: instances/views.py:1096
-msgid "Set VNC password"
-msgstr "VNC parolası ayarlar"
-
-#: instances/views.py:1104
-msgid "Set VNC keymap"
-msgstr "VNC Keymapi ayarla"
-
-#: instances/views.py:1109
-msgid "Set VNC type"
-msgstr "VNC tipini ayarla"
-
-#: instances/views.py:1114
-msgid "Set VNC listen address"
-msgstr "VNC dinleme adresini ayarla"
-
-#: instances/views.py:1137
-msgid "Edit options"
-msgstr "Seçenekleri düzenle"
-
-#: instances/views.py:1151
-msgid "Send console.vv file"
-msgstr "console.vv dosyası gönder"
-
-#: instances/views.py:1206 instances/views.py:1298
-msgid "A virtual machine with this name already exists"
-msgstr "Bu isimde bir sanal makine mevcut"
-
-#: instances/views.py:1281
-msgid "You haven't defined any storage pools"
-msgstr "Hiç bir depolama havuzu tanımlamadınız"
-
-#: instances/views.py:1283
 msgid "You haven't defined any network pools"
 msgstr "Hiç bir ağ havuzu tanımlamadınız"
 
-#: instances/views.py:1300
-#, fuzzy
-#| msgid "There is an instance with same name. Are you sure?"
+#: instances/views.py:1391
 msgid "There is an instance with same name. Remove it and try again!"
 msgstr "Aynı isimde başka bir sanal makine var. Onu silip yeniden deneyin!"
 
-#: instances/views.py:1304
+#: instances/views.py:1395
 msgid "No Virtual Machine MAC has been entered"
 msgstr "Sanal makine için MAC adresi belirtmediniz"
 
-#: instances/views.py:1327
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1426
 msgid "Image has already exist. Please check volumes or change instance name"
 msgstr ""
 "İmaj zaten mevcut. Lütfen ya makine adını değişin ya da disk alanlarını "
 "kontrol edin"
 
-<<<<<<< HEAD
-#: instances/views.py:1401
+#: instances/views.py:1453
 msgid "First you need to create or select an image"
 msgstr "Ya daha önce oluşturun ya da bir imaj seçin"
 
-#: instances/views.py:1419
+#: instances/views.py:1471
 msgid "Invalid cache mode"
 msgstr "Geçersiz önbellek modu"
 
-#: instances/views.py:1460
-msgid "Instance is created"
-msgstr "Sanal makine oluşturuldu"
-
-#: instances/views.py:1481
-msgid "Flavor Created"
-msgstr "Flavor Oluşturuldu"
-
-#: instances/views.py:1487
-msgid "Create Flavor"
-msgstr "Kullanıcı Oluştur"
-
-#: instances/views.py:1497
-msgid "Flavor Updated"
-msgstr "Flavor Güncellendi"
-
-#: instances/views.py:1503
-msgid "Update Flavor"
-msgstr "Flavor Güncelle"
-
 #: instances/views.py:1512
-=======
-#: instances/views.py:1347
-msgid "First you need to create or select an image"
-msgstr "Ya daha önce oluşturun ya da bir imaj seçin"
-
-#: instances/views.py:1365
-msgid "Invalid cache mode"
-msgstr "Geçersiz önbellek modu"
-
-#: instances/views.py:1402
 msgid "Instance is created"
 msgstr "Sanal makine oluşturuldu"
 
-#: instances/views.py:1423
-#, fuzzy
-#| msgid "Create"
+#: instances/views.py:1533
 msgid "Flavor Created"
 msgstr "Flavor Oluşturuldu"
 
-#: instances/views.py:1431
-#, fuzzy
-#| msgid "Create User"
+#: instances/views.py:1539
 msgid "Create Flavor"
 msgstr "Kullanıcı Oluştur"
 
-#: instances/views.py:1442
+#: instances/views.py:1549
 msgid "Flavor Updated"
 msgstr "Flavor Güncellendi"
 
-#: instances/views.py:1450
-#, fuzzy
-#| msgid "Update User"
+#: instances/views.py:1555
 msgid "Update Flavor"
 msgstr "Flavor Güncelle"
 
-#: instances/views.py:1460
-#, fuzzy
-#| msgid "Delete"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1564
 msgid "Flavor Deleted"
 msgstr "Flavor Silindi"
 
@@ -3599,12 +3049,12 @@ msgstr ""
 
 #: interfaces/templates/create_iface_block.html:44
 #: interfaces/templates/interface.html:76
-#: interfaces/templates/interfaces.html:62
-#: storages/templates/create_stg_block.html:35
-#: storages/templates/create_stg_block.html:64
-#: storages/templates/create_stg_block.html:93
-#: storages/templates/create_stg_block.html:158
-#: storages/templates/storages.html:60
+#: interfaces/templates/interfaces.html:63
+#: storages/templates/create_stg_block.html:49
+#: storages/templates/create_stg_block.html:78
+#: storages/templates/create_stg_block.html:107
+#: storages/templates/create_stg_block.html:172
+#: storages/templates/storages.html:59
 msgid "Type"
 msgstr "Tip"
 
@@ -3632,43 +3082,43 @@ msgstr "kapalı"
 msgid "Delay"
 msgstr "Geçikme"
 
-#: interfaces/templates/create_iface_block.html:82
+#: interfaces/templates/create_iface_block.html:86
 msgid "IPv4 Mode"
 msgstr "IPv4 Modu"
 
-#: interfaces/templates/create_iface_block.html:85
-#: interfaces/templates/create_iface_block.html:112
+#: interfaces/templates/create_iface_block.html:89
+#: interfaces/templates/create_iface_block.html:116
 #: networks/templates/network.html:109 networks/templates/network.html:220
 msgid "DHCP"
 msgstr "DHCP"
 
-#: interfaces/templates/create_iface_block.html:86
-#: interfaces/templates/create_iface_block.html:113
+#: interfaces/templates/create_iface_block.html:90
+#: interfaces/templates/create_iface_block.html:117
 msgid "Static"
 msgstr "Statik"
 
-#: interfaces/templates/create_iface_block.html:87
-#: interfaces/templates/create_iface_block.html:111
+#: interfaces/templates/create_iface_block.html:91
+#: interfaces/templates/create_iface_block.html:115
 msgid "No configuration"
 msgstr "Yapılandırma yok"
 
-#: interfaces/templates/create_iface_block.html:92
+#: interfaces/templates/create_iface_block.html:96
 msgid "IPv4 Address"
 msgstr "IPv4 Adresi"
 
-#: interfaces/templates/create_iface_block.html:98
+#: interfaces/templates/create_iface_block.html:102
 msgid "IPv4 Gateway"
 msgstr "IPv4 Ağ Geçidi"
 
-#: interfaces/templates/create_iface_block.html:108
+#: interfaces/templates/create_iface_block.html:112
 msgid "IPv6 Mode"
 msgstr "IPv6 Modu"
 
-#: interfaces/templates/create_iface_block.html:118
+#: interfaces/templates/create_iface_block.html:122
 msgid "IPv6 Address"
 msgstr "IPv6 Adresi"
 
-#: interfaces/templates/create_iface_block.html:124
+#: interfaces/templates/create_iface_block.html:128
 msgid "IPv6 Gateway"
 msgstr "IPv6 Ağ Geçidi"
 
@@ -3686,12 +3136,12 @@ msgstr "Ön yükleme Modu"
 
 #: interfaces/templates/interface.html:55
 #: interfaces/templates/interface.html:78 networks/templates/network.html:45
-#: storages/templates/storage.html:56
+#: storages/templates/storage.html:58
 msgid "State"
 msgstr "Durum"
 
 #: interfaces/templates/interface.html:62 networks/templates/network.html:52
-#: storages/templates/storage.html:64
+#: storages/templates/storage.html:66
 msgid "Stop"
 msgstr "Durdur"
 
@@ -3703,7 +3153,7 @@ msgstr "Köleler"
 msgid "Speed"
 msgstr "Hız"
 
-#: interfaces/templates/interfaces.html:47
+#: interfaces/templates/interfaces.html:48
 msgid "Hypervisor doesn't have any Interfaces"
 msgstr "Hipervizör hiçbir arabirime sahip değil"
 
@@ -3712,14 +3162,20 @@ msgid "user"
 msgstr "kullanıcı"
 
 #: logs/models.py:6
+#, fuzzy
+#| msgid "hostname"
+msgid "host"
+msgstr "sunucuadı"
+
+#: logs/models.py:7
 msgid "instance"
 msgstr "sanal makine"
 
-#: logs/models.py:7
+#: logs/models.py:8
 msgid "message"
 msgstr "mesaj"
 
-#: logs/models.py:8
+#: logs/models.py:9
 msgid "date"
 msgstr "tarih"
 
@@ -3790,8 +3246,8 @@ msgid "Add New Network"
 msgstr "Yeni Ağ Ekle"
 
 #: networks/templates/create_net_block.html:20
-#: storages/templates/create_stg_block.html:44
-#: storages/templates/create_stg_block.html:73
+#: storages/templates/create_stg_block.html:58
+#: storages/templates/create_stg_block.html:87
 msgid "default"
 msgstr "varsayılan"
 
@@ -3913,12 +3369,12 @@ msgid "IPv4 Fixed Addresses"
 msgstr "IPv4 Sabit Adresleri"
 
 #: networks/templates/network.html:158 networks/templates/network.html:268
-#: nwfilters/templates/nwfilters.html:85
+#: nwfilters/templates/nwfilters.html:83
 msgid "Show"
 msgstr "Göster"
 
-#: networks/templates/network.html:166 networks/templates/network.html:276
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:395
+#: networks/templates/network.html:165 networks/templates/network.html:275
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:403
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:377
 msgid "Clear"
 msgstr "Temizle"
@@ -3943,11 +3399,11 @@ msgstr "IPv6 Yönlendirme"
 msgid "IPv6 Fixed Addresses"
 msgstr "IPv6 Sabit Adresleri"
 
-#: networks/templates/networks.html:46
+#: networks/templates/networks.html:45
 msgid "Hypervisor doesn't have any Network"
 msgstr "Hipervizör hiçbir Ağa sahip değil"
 
-#: networks/templates/networks.html:61
+#: networks/templates/networks.html:60
 msgid "Forward"
 msgstr "Yönledirme"
 
@@ -3956,7 +3412,6 @@ msgid "Network pool name already in use"
 msgstr "Ağ havuzu adı zaten kullanımda"
 
 #: networks/views.py:47
-<<<<<<< HEAD
 msgid "Please enter bridge/dev name"
 msgstr "Lütfen köprü/aygıt adı giriniz"
 
@@ -3984,40 +3439,11 @@ msgid "%(family)s DHCP Range is Changed."
 msgstr "%(family)s DHCP aralığı değiştirildi."
 
 #: networks/views.py:210
-=======
-#, fuzzy
-#| msgid "Please enter bridge name"
-msgid "Please enter bridge/dev name"
-msgstr "Lütfen köprü/aygıt adı giriniz"
-
-#: networks/views.py:56
-msgid "For libvirt, the IPv6 network prefix must be /64"
-msgstr "Libvirt için IPv6 ağ prefixi /64 olmak zorundadır"
-
-#: networks/views.py:126
-msgid "Unknown Network Family"
-msgstr "Bilinmeyen Ağ Ailesi"
-
-#: networks/views.py:176
-msgid "{family.upper()} Fixed Address Operation Completed."
-msgstr "{family.upper()} sabit adres operasyonu tamamlandı."
-
-#: networks/views.py:186
-msgid "{family.upper()} Fixed Address is Deleted."
-msgstr "{family.upper()} sabit adresi silindi."
-
-#: networks/views.py:194
-msgid "{family.upper()} DHCP Range is Changed."
-msgstr "{family.upper()} DHCP aralığı değiştirildi."
-
-#: networks/views.py:203
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid ""
 "Network XML is changed. \\Stop and start network to activate new config."
 msgstr ""
 "Ağ XML i değiştirildi. \\ Aktifleştirmek için durdurun ve yeniden başlatın."
 
-<<<<<<< HEAD
 #: networks/views.py:215
 msgid "Network XML is changed."
 msgstr "Ağ XML i değiştirildi."
@@ -4042,37 +3468,6 @@ msgid ""
 msgstr ""
 "%(qos_dir)s QoS silindi. Ağ XML i değiştirildi. \\ Aktifleştirmek için "
 "durdurun ve yeniden başlatın."
-=======
-#: networks/views.py:205
-msgid "Network XML is changed."
-msgstr "Ağ XML i değiştirildi."
-
-#: networks/views.py:218
-msgid "{qos_dir.capitalize()} QoS is set. Network XML is changed."
-msgstr ""
-"{qos_dir.capitalize()} QoS ayarlandı. Ağ ayarları XML ile değiştirildi."
-
-#: networks/views.py:219
-msgid "Stop and start network to activate new config"
-msgstr "Yeni yapılandırmayı aktifleştirmek için ağı durdurun ve başlatın"
-
-#: networks/views.py:221
-msgid "{} QoS is set"
-msgstr "{} QoS ayarlandı"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
-
-#: networks/views.py:232
-msgid "{qos_dir.capitalize()} QoS is deleted. Network XML is changed. "
-msgstr "{qos_dir.capitalize()} QoS silindi. Ağ XML'i değiştirildi."
-
-#: networks/views.py:233
-msgid "Stop and start network to activate new config."
-msgstr ""
-"Yeni yapılandırmayı aktifleştirmek için ağı durdurun ve yeniden başlatın."
-
-#: networks/views.py:235
-msgid "{qos_dir.capitalize()} QoS is deleted"
-msgstr "{qos_dir.capitalize()} QoS silindi"
 
 #: nwfilters/templates/add_nwf_rule.html:12
 msgid "Add New NWFilter Rule"
@@ -4086,8 +3481,8 @@ msgstr "Eğer aynı niteliklerde bir kural varsa bu kuralla değiştirilecektir"
 msgid "Create New NWFilter"
 msgstr "Yeni AğFiltresi Oluştur"
 
-#: nwfilters/templates/nwfilter.html:39 nwfilters/templates/nwfilters.html:55
-#: secrets/templates/secrets.html:59
+#: nwfilters/templates/nwfilter.html:39 nwfilters/templates/nwfilters.html:53
+#: virtsecrets/templates/secrets.html:60
 msgid "UUID"
 msgstr "UUID"
 
@@ -4095,47 +3490,46 @@ msgstr "UUID"
 msgid "Filter References"
 msgstr "Filtre Referansları"
 
-#: nwfilters/templates/nwfilter.html:100
+#: nwfilters/templates/nwfilter.html:92
 msgid "Reference"
 msgstr "Referans"
 
-#: nwfilters/templates/nwfilter.html:125
+#: nwfilters/templates/nwfilter.html:117
 msgid "Rules"
 msgstr "Kurallar"
 
-#: nwfilters/templates/nwfilter.html:129
+#: nwfilters/templates/nwfilter.html:121
 msgid "Rule"
 msgstr "Kural"
 
-#: nwfilters/templates/nwfilter.html:130
+#: nwfilters/templates/nwfilter.html:122
 msgid "Action Type"
 msgstr "Eylem Tipi"
 
-#: nwfilters/templates/nwfilter.html:132
+#: nwfilters/templates/nwfilter.html:124
 msgid "Priority"
 msgstr "Öncelik"
 
-#: nwfilters/templates/nwfilter.html:133
+#: nwfilters/templates/nwfilter.html:125
 msgid "Statematch"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:134
+#: nwfilters/templates/nwfilter.html:126
 msgid "Directives"
 msgstr "Direktifler"
 
-#: nwfilters/templates/nwfilters.html:71
+#: nwfilters/templates/nwfilters.html:69
 msgid "Details of NWFilter"
 msgstr "AğFiltresi Ayrıntıları"
 
-#: nwfilters/templates/nwfilters.html:94
+#: nwfilters/templates/nwfilters.html:92
 msgid "Clone NWFilter"
 msgstr "AğFiltresi Klonla"
 
-#: nwfilters/templates/nwfilters.html:135
+#: nwfilters/templates/nwfilters.html:132
 msgid "Hypervisor doesn't have any NWFilters"
 msgstr "Hipervizör hiç bir AğFiltresine sahip değil"
 
-<<<<<<< HEAD
 #: nwfilters/views.py:44
 msgid "A network filter with this name already exists"
 msgstr "Bu isimde bir ağ filtresi zaten mevcut"
@@ -4145,100 +3539,24 @@ msgid "A network filter with this UUID already exists"
 msgstr "Bu UUID ye sahip bir ağ filtresi zaten mevcut"
 
 #: nwfilters/views.py:51
-=======
-#: nwfilters/views.py:41
-msgid "A network filter with this name already exists"
-msgstr "Bu isimde bir ağ filtresi zaten mevcut"
-
-#: nwfilters/views.py:44
-msgid "A network filter with this UUID already exists"
-msgstr "Bu UUID ye sahip bir ağ filtresi zaten mevcut"
-
-#: nwfilters/views.py:48
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid "%(filter)s network filter is created"
 msgstr "%(filter)s ağ filtresi oluşturuldu"
 
-<<<<<<< HEAD
 #: nwfilters/views.py:60
 #, python-format
 msgid "%(filter)s network filter is deleted"
 msgstr "%(filter)s ağ filtresi silindi"
 
-#: nwfilters/views.py:76
+#: nwfilters/views.py:77
 #, python-format
 msgid "NWFilter is in use by %(instance)s. Cannot be deleted."
 msgstr "AğFiltresi, %(instance)s tarafından kullanımda. Silinemiyor."
 
-#: nwfilters/views.py:93
+#: nwfilters/views.py:96
 #, python-format
 msgid "Cloning NWFilter %(name)s as %(clone)s"
 msgstr "Ağfiltresi  %(name)s , %(clone)s olarak klonlanıyor"
-=======
-#: nwfilters/views.py:57
-#, python-brace-format
-msgid "Deleting NWFilter: {name}"
-msgstr "AğFiltresi Siliniyor: {name}"
-
-#: nwfilters/views.py:69
-#, python-brace-format
-msgid "NWFilter is in use by {inst}. Cannot be deleted."
-msgstr "AğFiltresi, {inst} tarafından kullanımda. Silinemiyor."
-
-#: nwfilters/views.py:86
-#, python-brace-format
-msgid "Cloning NWFilter {name} as {cln_name}"
-msgstr "Ağfiltresi  {name} , {cln_name} olarak klonlanıyor"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
-
-#: secrets/templates/create_secret_block.html:12
-msgid "Create New Secret"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:18
-msgid "Ephemeral"
-msgstr "Geçici"
-
-#: secrets/templates/create_secret_block.html:21
-#: secrets/templates/create_secret_block.html:30
-msgid "no"
-msgstr "hayır"
-
-#: secrets/templates/create_secret_block.html:22
-#: secrets/templates/create_secret_block.html:31
-msgid "yes"
-msgstr "evet"
-
-#: secrets/templates/create_secret_block.html:27
-msgid "Private"
-msgstr "Özel"
-
-#: secrets/templates/create_secret_block.html:36
-#: storages/templates/storage.html:54
-msgid "Usage"
-msgstr "Kullanım"
-
-#: secrets/templates/create_secret_block.html:46
-#: secrets/templates/secrets.html:61
-msgid "Data"
-msgstr "Veri"
-
-#: secrets/templates/secrets.html:50
-msgid "Hypervisor doesn't have any Secrets"
-msgstr ""
-
-#: secrets/templates/secrets.html:60
-msgid "Usage Type"
-msgstr "Kullanım Tipi"
-
-#: secrets/templates/secrets.html:88
-msgid "Set secret value"
-msgstr ""
-
-#: secrets/templates/secrets.html:94
-msgid "Value"
-msgstr "Değer"
 
 #: storages/forms.py:10 storages/forms.py:37
 msgid "No path has been entered"
@@ -4268,64 +3586,64 @@ msgstr "İmaj adı 120 karakterden fazla olamaz"
 msgid "Create Storage Pool"
 msgstr "Depolama Havuzu Oluştur"
 
-#: storages/templates/create_stg_block.html:18
+#: storages/templates/create_stg_block.html:19
 msgid "DIR"
 msgstr "DIR"
 
-#: storages/templates/create_stg_block.html:21
+#: storages/templates/create_stg_block.html:24
 msgid "LVM"
 msgstr "LVM"
 
-#: storages/templates/create_stg_block.html:23
+#: storages/templates/create_stg_block.html:29
 msgid "CEPH"
 msgstr "CEPH"
 
-#: storages/templates/create_stg_block.html:25
+#: storages/templates/create_stg_block.html:34
 msgid "NETFS"
 msgstr "NETFS"
 
-#: storages/templates/create_stg_block.html:27
+#: storages/templates/create_stg_block.html:39
 msgid "ISO"
 msgstr "ISO"
 
-#: storages/templates/create_stg_block.html:48
-#: storages/templates/create_stg_block.html:222
+#: storages/templates/create_stg_block.html:62
+#: storages/templates/create_stg_block.html:236
 msgid "Path"
 msgstr "Yol"
 
-#: storages/templates/create_stg_block.html:106
+#: storages/templates/create_stg_block.html:120
 msgid "Ceph User"
 msgstr "Ceph Kullanıcısı"
 
-#: storages/templates/create_stg_block.html:112
+#: storages/templates/create_stg_block.html:126
 msgid "Ceph Pool"
 msgstr "Ceph Havuzu"
 
-#: storages/templates/create_stg_block.html:118
+#: storages/templates/create_stg_block.html:132
 msgid "Ceph Host"
 msgstr "Ceph Sunucusu"
 
-#: storages/templates/create_stg_block.html:177
+#: storages/templates/create_stg_block.html:191
 msgid "Remote Path"
 msgstr "Uzak Yol"
 
-#: storages/templates/create_stg_block.html:186
+#: storages/templates/create_stg_block.html:200
 msgid "auto"
 msgstr "otomatik"
 
-#: storages/templates/create_stg_block.html:187
+#: storages/templates/create_stg_block.html:201
 msgid "nfs"
 msgstr "nfs"
 
-#: storages/templates/create_stg_block.html:188
+#: storages/templates/create_stg_block.html:202
 msgid "glusterfs"
 msgstr "glusterfs"
 
-#: storages/templates/create_stg_block.html:189
+#: storages/templates/create_stg_block.html:203
 msgid "cifs"
 msgstr "cifs"
 
-#: storages/templates/create_stg_block.html:194
+#: storages/templates/create_stg_block.html:208
 msgid "Local Path"
 msgstr "Yerel Yol"
 
@@ -4341,47 +3659,52 @@ msgstr "Yükleme"
 msgid "Add New Volume"
 msgstr "Yeni Birim Ekle"
 
-#: storages/templates/storage.html:44
+#: storages/templates/storage.html:46
 msgid "Pool name"
 msgstr "Havuz adı"
 
-#: storages/templates/storage.html:46
+#: storages/templates/storage.html:48
 msgid "Pool type"
 msgstr "Havuz tipi"
 
-#: storages/templates/storage.html:48
+#: storages/templates/storage.html:50
 msgid "Pool path"
 msgstr "Havuz yolu"
 
-#: storages/templates/storage.html:50
+#: storages/templates/storage.html:52
 msgid "Pool status"
 msgstr "Havuz durumu"
 
-#: storages/templates/storage.html:85 storages/templates/storages.html:64
+#: storages/templates/storage.html:56
+#: virtsecrets/templates/create_secret_block.html:36
+msgid "Usage"
+msgstr "Kullanım"
+
+#: storages/templates/storage.html:90 storages/templates/storages.html:63
 msgid "Volumes"
 msgstr "Birimler"
 
-#: storages/templates/storage.html:97
+#: storages/templates/storage.html:98
 msgid "Allocated"
 msgstr "Tahsis Edilmiş"
 
-#: storages/templates/storage.html:118
+#: storages/templates/storage.html:119
 msgid "Clone image"
 msgstr "İmaj Klonla"
 
-#: storages/templates/storage.html:131
+#: storages/templates/storage.html:132
 msgid "Convert"
 msgstr "Dönüştür"
 
-#: storages/templates/storage.html:140
+#: storages/templates/storage.html:141
 msgid "raw"
 msgstr "raw"
 
-#: storages/templates/storage.html:141
+#: storages/templates/storage.html:142
 msgid "qcow"
 msgstr "qcow"
 
-#: storages/templates/storage.html:142
+#: storages/templates/storage.html:143
 msgid "qcow2"
 msgstr "qcow2"
 
@@ -4389,81 +3712,59 @@ msgstr "qcow2"
 msgid "Hypervisor doesn't have any Volumes"
 msgstr "Hipervizör hiçbir birime sahip değil"
 
-#: storages/templates/storages.html:46
+#: storages/templates/storages.html:45
 msgid "Hypervisor doesn't have any Storages"
 msgstr "Hipervizör hiç bir depolama alanına sahip değil"
 
-#: storages/views.py:39
+#: storages/views.py:40
 msgid "Pool name already use"
 msgstr "Havuz adı zaten kullanılıyor"
 
 #: storages/views.py:45
 msgid "You need create secret for pool"
-msgstr ""
+msgstr "Havuz için "
 
-<<<<<<< HEAD
-#: storages/views.py:48
-=======
 #: storages/views.py:49
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "You need input all fields for creating ceph pool"
 msgstr "CEPH havuzu oluşturmak için tüm alanların doldurulmasına ihtiyaç var"
 
-<<<<<<< HEAD
-#: storages/views.py:144
-#, python-format
-msgid "Volume: %(volume)s is deleted."
+#: storages/views.py:96
+msgid "Security Issues with file uploading"
+msgstr ""
+
+#: storages/views.py:103
+msgid "File not found. Check the path variable and filename"
+msgstr ""
+
+#: storages/views.py:150
+#, fuzzy, python-format
+#| msgid "Volume: %(volume)s is deleted."
+msgid "Volume: %(vol)s is deleted."
 msgstr "Birim: %(volume)s silindi."
 
-#: storages/views.py:149
+#: storages/views.py:155
 msgid "ISO image already exist"
 msgstr "ISO imajı zaten mevcut"
 
-#: storages/views.py:153
+#: storages/views.py:159
 #, python-format
 msgid "ISO: %(file)s is uploaded."
 msgstr "ISO: %(file)s  yüklendi."
 
-#: storages/views.py:162
+#: storages/views.py:168
 msgid "Name of volume already in use"
 msgstr "Birim adı zaten kullanımda"
 
-#: storages/views.py:174
-#, python-format
-msgid "%(image)s image cloned as %(clone)s successfully"
+#: storages/views.py:180
+#, fuzzy, python-format
+#| msgid "%(image)s image cloned as %(clone)s successfully"
+msgid "%(image)s image cloned as %(name)s successfully"
 msgstr "%(image)s imajı %(clone)s olarak başarıyla klonlandı"
 
-#: storages/views.py:220
+#: storages/views.py:226
 #, python-format
 msgid "Image file %(name)s is created successfully"
 msgstr "İmaj dosyası %(name)s başarıyla oluşturuldu"
-=======
-#: storages/views.py:132
-#, python-brace-format
-msgid "Volume: {volname} is deleted."
-msgstr "Birim: {volname} silindi."
-
-#: storages/views.py:137
-msgid "ISO image already exist"
-msgstr "ISO imajı zaten mevcut"
-
-#: storages/views.py:141
-msgid "ISO: {request.FILES['file']} is uploaded."
-msgstr "ISO: {request.FILES['file']}  yüklendi."
-
-#: storages/views.py:150
-msgid "Name of volume already in use"
-msgstr "Birim adı zaten kullanımda"
-
-#: storages/views.py:160
-msgid "{data['image']} image cloned as {name} successfully"
-msgstr "{data['image']} imajı {name} olarak başarıyla klonlandı"
-
-#: storages/views.py:199
-#, python-brace-format
-msgid "Image file {name} is created successfully"
-msgstr "İmaj dosyası {name} başarıyla oluşturuldu"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 
 #: templates/403.html:3
 msgid "403"
@@ -4525,18 +3826,348 @@ msgstr "Oturumu Kapat"
 msgid "Processing"
 msgstr "İşleniyor"
 
-#: venv/lib/python3.6/site-packages/bootstrap4/components.py:17
-#: venv/lib/python3.6/site-packages/bootstrap4/templates/bootstrap4/form_errors.html:3
-#: venv/lib/python3.6/site-packages/bootstrap4/templates/bootstrap4/messages.html:4
-msgid "close"
-msgstr "kapat"
+#: templates/search_block.html:3
+msgid "Search"
+msgstr "Ara"
+
+#: venv/lib/python3.6/site-packages/click/_termui_impl.py:496
+#, python-brace-format
+msgid "{editor}: Editing failed"
+msgstr "{editor}: Düzenleme başarısız"
+
+#: venv/lib/python3.6/site-packages/click/_termui_impl.py:500
+#, python-brace-format
+msgid "{editor}: Editing failed: {e}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:20
+msgid ""
+"Click will abort further execution because Python was configured to use "
+"ASCII as encoding for the environment. Consult https://click.palletsprojects."
+"com/unicode-support/ for mitigation steps."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:56
+msgid ""
+"Additional information: on this system no suitable UTF-8 locales were "
+"discovered. This most likely requires resolving by reconfiguring the locale "
+"system."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:65
+msgid ""
+"This system supports the C.UTF-8 locale which is recommended. You might be "
+"able to resolve your issue by exporting the following environment variables:"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:75
+#, python-brace-format
+msgid ""
+"This system lists some UTF-8 supporting locales that you can pick from. The "
+"following suitable locales were discovered: {locales}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:93
+msgid ""
+"Click discovered that you exported a UTF-8 locale but the locale system "
+"could not pick up from it because it does not exist. The exported locale is "
+"{locale!r} but it is not supported."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1095
+msgid "Aborted!"
+msgstr "İptal edildi!"
+
+#: venv/lib/python3.6/site-packages/click/core.py:1279
+#: venv/lib/python3.6/site-packages/click/decorators.py:434
+#, fuzzy
+#| msgid "ISO image already exist"
+msgid "Show this message and exit."
+msgstr "ISO imajı zaten mevcut"
+
+#: venv/lib/python3.6/site-packages/click/core.py:1308
+#: venv/lib/python3.6/site-packages/click/core.py:1334
+#, python-brace-format
+msgid "(Deprecated) {text}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1375
+#, fuzzy, python-brace-format
+#| msgid "expected %s argument(s)"
+msgid "Got unexpected extra argument ({args})"
+msgid_plural "Got unexpected extra arguments ({args})"
+msgstr[0] "beklenen parametre(ler) %s"
+msgstr[1] "beklenen parametre(ler) %s"
+
+#: venv/lib/python3.6/site-packages/click/core.py:1390
+msgid "DeprecationWarning: The command {name!r} is deprecated."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1607
+msgid "Commands"
+msgstr "Komutlar"
+
+#: venv/lib/python3.6/site-packages/click/core.py:1639
+msgid "Missing command."
+msgstr "Eksik komut."
+
+#: venv/lib/python3.6/site-packages/click/core.py:1717
+msgid "No such command {name!r}."
+msgstr "{name!r} böyle bir komut yok."
+
+#: venv/lib/python3.6/site-packages/click/core.py:2258
+#, fuzzy
+#| msgid "'%(value)s' value must be an integer."
+msgid "Value must be an iterable."
+msgstr "'%(value)s' değeri bir sayısal değer olmalıdır"
+
+#: venv/lib/python3.6/site-packages/click/core.py:2278
+#, python-brace-format
+msgid "Takes {nargs} values but 1 was given."
+msgid_plural "Takes {nargs} values but {len} were given."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2701
+#, python-brace-format
+msgid "env var: {var}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2724
+msgid "(dynamic)"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2735
+#, python-brace-format
+msgid "default: {default}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2748
+msgid "required"
+msgstr "gerekli"
+
+#: venv/lib/python3.6/site-packages/click/decorators.py:339
+#, python-format
+msgid "%(prog)s, version %(version)s"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/decorators.py:403
+msgid "Show the version and exit."
+msgstr "Sürümünü göster ve çık."
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:43
+#: venv/lib/python3.6/site-packages/click/exceptions.py:79
+#, fuzzy, python-brace-format
+#| msgid "message"
+msgid "Error: {message}"
+msgstr "mesaj"
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:71
+#, python-brace-format
+msgid "Try '{command} {option}' for help."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:120
+#, fuzzy, python-brace-format
+#| msgid "Enter a valid value."
+msgid "Invalid value: {message}"
+msgstr "Geçerli bir değer girin."
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:122
+#, python-brace-format
+msgid "Invalid value for {param_hint}: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:178
+msgid "Missing argument"
+msgstr "Eksik parametre"
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:180
+#, fuzzy
+#| msgid "Edit options"
+msgid "Missing option"
+msgstr "Seçenekleri düzenle"
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:182
+msgid "Missing parameter"
+msgstr "Eksik parametre"
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:184
+#, python-brace-format
+msgid "Missing {param_type}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:191
+#, python-brace-format
+msgid "Missing parameter: {param_name}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:211
+#, python-brace-format
+msgid "No such option: {name}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:223
+#, python-brace-format
+msgid "Did you mean {possibility}?"
+msgid_plural "(Possible options: {possibilities})"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:261
+#, fuzzy
+#| msgid "Unknown"
+msgid "unknown error"
+msgstr "Bilinmeyen"
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:268
+msgid "Could not open file {filename!r}: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:231
+msgid "Argument {name!r} takes {nargs} values."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:413
+msgid "Option {name!r} does not take a value."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:474
+msgid "Option {name!r} requires an argument."
+msgid_plural "Option {name!r} requires {nargs} arguments."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/shell_completion.py:316
+msgid "Shell completion is not supported for Bash versions older than 4.4."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/shell_completion.py:322
+msgid "Couldn't detect Bash version, shell completion is not supported."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:161
+#, fuzzy
+#| msgid "No configuration"
+msgid "Repeat for confirmation"
+msgstr "Yapılandırma yok"
+
+#: venv/lib/python3.6/site-packages/click/termui.py:178
+msgid "Error: The value you entered was invalid."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:180
+#, python-brace-format
+msgid "Error: {e.message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:191
+msgid "Error: The two entered values do not match."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:247
+msgid "Error: invalid input"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:798
+msgid "Press any key to continue..."
+msgstr "Devam etmek için bir tuşa basın..."
+
+#: venv/lib/python3.6/site-packages/click/types.py:258
+#, python-brace-format
+msgid ""
+"Choose from:\n"
+"\t{choices}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:290
+#, fuzzy
+#| msgid "Value %(value)r is not a valid choice."
+msgid "{value!r} is not {choice}."
+msgid_plural "{value!r} is not one of {choices}."
+msgstr[0] "%(value)r değeri geçerli bir seçenek değil."
+msgstr[1] "%(value)r değeri geçerli bir seçenek değil."
+
+#: venv/lib/python3.6/site-packages/click/types.py:380
+msgid "{value!r} does not match the format {format}."
+msgid_plural "{value!r} does not match the formats {formats}."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:402
+#, fuzzy
+#| msgid "Value %(value)r is not a valid choice."
+msgid "{value!r} is not a valid {number_type}."
+msgstr "%(value)r değeri geçerli bir seçenek değil."
+
+#: venv/lib/python3.6/site-packages/click/types.py:458
+#, python-brace-format
+msgid "{value} is not in the range {range}."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:599
+#, fuzzy
+#| msgid "Value %(value)r is not a valid choice."
+msgid "{value!r} is not a valid boolean."
+msgstr "%(value)r değeri geçerli bir seçenek değil."
+
+#: venv/lib/python3.6/site-packages/click/types.py:623
+#, fuzzy
+#| msgid "'%(value)s' is not a valid UUID."
+msgid "{value!r} is not a valid UUID."
+msgstr "'%(value)s' geçerli bir UUID değil."
+
+#: venv/lib/python3.6/site-packages/click/types.py:801
+#, fuzzy
+#| msgid "Profile"
+msgid "file"
+msgstr "Profil"
+
+#: venv/lib/python3.6/site-packages/click/types.py:803
+#, fuzzy
+#| msgid "Direction"
+msgid "directory"
+msgstr "Yön"
+
+#: venv/lib/python3.6/site-packages/click/types.py:805
+#, fuzzy
+#| msgid "Pool path"
+msgid "path"
+msgstr "Havuz yolu"
+
+#: venv/lib/python3.6/site-packages/click/types.py:851
+msgid "{name} {filename!r} does not exist."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:860
+msgid "{name} {filename!r} is a file."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:868
+msgid "{name} {filename!r} is a directory."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:876
+msgid "{name} {filename!r} is not writable."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:884
+msgid "{name} {filename!r} is not readable."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:951
+#, python-brace-format
+msgid "{len_type} values are required, but {len_value} was given."
+msgid_plural "{len_type} values are required, but {len_value} were given."
+msgstr[0] ""
+msgstr[1] ""
 
 #: venv/lib/python3.6/site-packages/django/contrib/messages/apps.py:7
 #: venv2/lib/python2.7/site-packages/django/contrib/messages/apps.py:7
 msgid "Messages"
 msgstr "Mesajlar"
 
-#: venv/lib/python3.6/site-packages/django/contrib/sitemaps/apps.py:7
+#: venv/lib/python3.6/site-packages/django/contrib/sitemaps/apps.py:8
 #: venv2/lib/python2.7/site-packages/django/contrib/sitemaps/apps.py:7
 msgid "Site Maps"
 msgstr "Site Haritası"
@@ -4551,103 +4182,108 @@ msgstr "Statik Dosyalar"
 msgid "Syndication"
 msgstr "Sendika"
 
-#: venv/lib/python3.6/site-packages/django/core/paginator.py:45
+#. Translators: String used to replace omitted page numbers in elided page
+#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10].
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:30
+msgid "…"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:51
 #: venv2/lib/python2.7/site-packages/django/core/paginator.py:43
 msgid "That page number is not an integer"
 msgstr "Bu sayfa numarası bir tam sayı değil"
 
-#: venv/lib/python3.6/site-packages/django/core/paginator.py:47
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:53
 #: venv2/lib/python2.7/site-packages/django/core/paginator.py:45
 msgid "That page number is less than 1"
 msgstr "Sayfa numarası 1'den daha küçük"
 
-#: venv/lib/python3.6/site-packages/django/core/paginator.py:52
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:58
 #: venv2/lib/python2.7/site-packages/django/core/paginator.py:50
 msgid "That page contains no results"
 msgstr "Bu sayfada hiç sonuç yok"
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:31
+#: venv/lib/python3.6/site-packages/django/core/validators.py:22
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:34
 msgid "Enter a valid value."
 msgstr "Geçerli bir değer girin."
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:102
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:658
+#: venv/lib/python3.6/site-packages/django/core/validators.py:93
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:675
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:107
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:671
 msgid "Enter a valid URL."
 msgstr "Geçerli bir URL girin."
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:154
+#: venv/lib/python3.6/site-packages/django/core/validators.py:150
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:160
 msgid "Enter a valid integer."
 msgstr "Geçerli bir tam sayı girin."
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:165
+#: venv/lib/python3.6/site-packages/django/core/validators.py:161
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:171
 msgid "Enter a valid email address."
 msgstr "Geçerli bir e-posta adresi girin."
 
 #. Translators: "letters" means latin letters: a-z and A-Z.
-#: venv/lib/python3.6/site-packages/django/core/validators.py:239
-#: venv2/lib/python2.7/site-packages/django/core/validators.py:245
+#: venv/lib/python3.6/site-packages/django/core/validators.py:262
 msgid ""
-"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+"Enter a valid “slug” consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:246
-#: venv2/lib/python2.7/site-packages/django/core/validators.py:252
+#: venv/lib/python3.6/site-packages/django/core/validators.py:269
 msgid ""
-"Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
+"Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:255
-#: venv/lib/python3.6/site-packages/django/core/validators.py:275
+#: venv/lib/python3.6/site-packages/django/core/validators.py:278
+#: venv/lib/python3.6/site-packages/django/core/validators.py:288
+#: venv/lib/python3.6/site-packages/django/core/validators.py:311
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:257
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:277
 msgid "Enter a valid IPv4 address."
 msgstr "Geçerli bir IPv4 adresi girin."
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:260
-#: venv/lib/python3.6/site-packages/django/core/validators.py:276
+#: venv/lib/python3.6/site-packages/django/core/validators.py:296
+#: venv/lib/python3.6/site-packages/django/core/validators.py:312
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:262
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:278
 msgid "Enter a valid IPv6 address."
 msgstr "Geçerli bir IPv6 adresi girin."
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:270
-#: venv/lib/python3.6/site-packages/django/core/validators.py:274
+#: venv/lib/python3.6/site-packages/django/core/validators.py:306
+#: venv/lib/python3.6/site-packages/django/core/validators.py:310
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:272
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:276
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Geçerli bir IPv4 veya IPv6 adresi girin."
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:304
+#: venv/lib/python3.6/site-packages/django/core/validators.py:340
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:308
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1131
 msgid "Enter only digits separated by commas."
 msgstr "Sadece virgüllerle ayrılmış sayılar girin."
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:310
+#: venv/lib/python3.6/site-packages/django/core/validators.py:346
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:314
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:342
+#: venv/lib/python3.6/site-packages/django/core/validators.py:379
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:345
 #, python-format
 msgid "Ensure this value is less than or equal to %(limit_value)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:351
+#: venv/lib/python3.6/site-packages/django/core/validators.py:388
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:354
 #, python-format
 msgid "Ensure this value is greater than or equal to %(limit_value)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:361
+#: venv/lib/python3.6/site-packages/django/core/validators.py:398
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:364
 #, python-format
 msgid ""
@@ -4659,7 +4295,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:376
+#: venv/lib/python3.6/site-packages/django/core/validators.py:413
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:379
 #, python-format
 msgid ""
@@ -4671,15 +4307,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:395
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:290
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:325
+#: venv/lib/python3.6/site-packages/django/core/validators.py:432
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:292
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:327
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:303
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:340
 msgid "Enter a number."
 msgstr "Bir sayı girin."
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:397
+#: venv/lib/python3.6/site-packages/django/core/validators.py:434
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:399
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
@@ -4687,7 +4323,7 @@ msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:402
+#: venv/lib/python3.6/site-packages/django/core/validators.py:439
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:404
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
@@ -4695,7 +4331,7 @@ msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:407
+#: venv/lib/python3.6/site-packages/django/core/validators.py:444
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:409
 #, python-format
 msgid ""
@@ -4705,48 +4341,47 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:469
-#: venv2/lib/python2.7/site-packages/django/core/validators.py:463
+#: venv/lib/python3.6/site-packages/django/core/validators.py:506
 #, python-format
 msgid ""
-"File extension '%(extension)s' is not allowed. Allowed extensions are: "
-"'%(allowed_extensions)s'."
+"File extension “%(extension)s” is not allowed. Allowed extensions are: "
+"%(allowed_extensions)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:521
+#: venv/lib/python3.6/site-packages/django/core/validators.py:559
 msgid "Null characters are not allowed."
 msgstr "Null karakterlere izin verilmiyor."
 
-#: venv/lib/python3.6/site-packages/django/db/models/base.py:1165
-#: venv/lib/python3.6/site-packages/django/forms/models.py:756
+#: venv/lib/python3.6/site-packages/django/db/models/base.py:1210
+#: venv/lib/python3.6/site-packages/django/forms/models.py:768
 #: venv2/lib/python2.7/site-packages/django/db/models/base.py:1209
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:749
 msgid "and"
 msgstr "ve"
 
-#: venv/lib/python3.6/site-packages/django/db/models/base.py:1167
+#: venv/lib/python3.6/site-packages/django/db/models/base.py:1212
 #: venv2/lib/python2.7/site-packages/django/db/models/base.py:1211
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:104
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:100
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:116
 #, python-format
 msgid "Value %(value)r is not a valid choice."
 msgstr "%(value)r değeri geçerli bir seçenek değil."
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:105
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:101
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:117
 msgid "This field cannot be null."
 msgstr "Bu alan null olamaz"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:106
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:102
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:118
 msgid "This field cannot be blank."
 msgstr "Bu alan boş bırakılamaz."
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:107
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:103
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:119
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
@@ -4754,346 +4389,349 @@ msgstr ""
 
 #. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
 #. Eg: "Title must be unique for pub_date year"
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:111
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:107
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:123
 #, python-format
 msgid ""
 "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:128
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:126
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:140
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Alan tipi: %(field_type)s"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:905
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1772
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:901
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1809
-msgid "Integer"
-msgstr "Tam sayı"
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:909
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1770
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:905
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1807
-#, python-format
-msgid "'%(value)s' value must be an integer."
-msgstr "'%(value)s' değeri bir sayısal değer olmalıdır"
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:984
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1850
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:978
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1878
-msgid "Big (8 byte) integer"
-msgstr "Büyük (8 bayt) sayı"
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:996
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:990
-#, python-format
-msgid "'%(value)s' value must be either True or False."
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:958
+#, fuzzy, python-format
+#| msgid "'%(value)s' value must be either True or False."
+msgid "“%(value)s” value must be either True or False."
 msgstr "'%(value)s' değeri ya True ya da False olmalıdır."
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:997
-#, python-format
-msgid "'%(value)s' value must be either True, False, or None."
-msgstr ""
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:959
+#, fuzzy, python-format
+#| msgid "'%(value)s' value must be either True or False."
+msgid "“%(value)s” value must be either True, False, or None."
+msgstr "'%(value)s' değeri ya True ya da False olmalıdır."
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:999
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:961
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:992
 msgid "Boolean (Either True or False)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1040
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1002
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1058
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1104
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1096
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1115
 msgid "Comma-separated integers"
 msgstr "Virgülle ayrılmış tam sayılar"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1153
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1172
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1145
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+"“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD "
 "format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1155
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1298
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1174
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1319
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1147
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1290
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
+"“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid "
 "date."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1158
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1150
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1177
 msgid "Date (without time)"
 msgstr "Tarih (zaman yok)"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1296
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1317
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1288
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ] format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1300
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1321
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1292
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
 "[TZ]) but it is an invalid date/time."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1304
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1296
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1325
 msgid "Date (with time)"
 msgstr "Tarih (zamanlı)"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1452
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1475
-#, python-format
-msgid "'%(value)s' value must be a decimal number."
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1444
+#, fuzzy, python-format
+#| msgid "'%(value)s' value must be a decimal number."
+msgid "“%(value)s” value must be a decimal number."
 msgstr "'%(value)s' değeri bir tam sayı olmalıdır."
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1454
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1446
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1477
 msgid "Decimal number"
 msgstr "Ondalık sayı"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1593
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1628
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1585
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
+"“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[."
 "uuuuuu] format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1596
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1588
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1631
 msgid "Duration"
 msgstr "Süre"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1646
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1638
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1683
 msgid "Email address"
 msgstr "E-posta adresi"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1669
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1661
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1707
 msgid "File path"
 msgstr "Dosya yolu"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1735
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1773
-#, python-format
-msgid "'%(value)s' value must be a float."
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1727
+#, fuzzy, python-format
+#| msgid "'%(value)s' value must be a float."
+msgid "“%(value)s” value must be a float."
 msgstr "'%(value)s' değeri kayan noktalı bir sayı olmalıdır."
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1737
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1729
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1775
 msgid "Floating point number"
 msgstr "Kayan noktalı sayı"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1866
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1767
+#, fuzzy, python-format
+#| msgid "'%(value)s' value must be an integer."
+msgid "“%(value)s” value must be an integer."
+msgstr "'%(value)s' değeri bir sayısal değer olmalıdır"
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1769
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:901
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1809
+msgid "Integer"
+msgstr "Tam sayı"
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1852
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:978
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1878
+msgid "Big (8 byte) integer"
+msgstr "Büyük (8 bayt) sayı"
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1867
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2130
+msgid "Small integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1875
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1893
 msgid "IPv4 address"
 msgstr "IPv4 adresi"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1897
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1906
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1924
 msgid "IP address"
 msgstr "IP Adresi"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1977
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1978
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2006
-#, python-format
-msgid "'%(value)s' value must be either None, True or False."
-msgstr ""
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1986
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1987
+#, fuzzy, python-format
+#| msgid "'%(value)s' value must be either True or False."
+msgid "“%(value)s” value must be either None, True or False."
+msgstr "'%(value)s' değeri ya True ya da False olmalıdır."
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1980
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1989
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2008
 msgid "Boolean (Either True, False or None)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2015
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2043
+#, fuzzy
+#| msgid "Positive integer"
+msgid "Positive big integer"
+msgstr "Pozitif sayı"
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2056
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2071
 msgid "Positive integer"
 msgstr "Pozitif sayı"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2028
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2069
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2083
 msgid "Positive small integer"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2042
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2083
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2096
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2074
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2130
-msgid "Small integer"
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2081
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2115
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2137
 msgid "Text"
 msgstr "Metin"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2109
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2163
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2181
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
 "format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2111
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2165
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2183
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
 "invalid time."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2114
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2186
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2168
 msgid "Time"
 msgstr "Zaman"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2240
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2312
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2296
 msgid "URL"
 msgstr "URL"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2262
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2334
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2319
 msgid "Raw binary data"
 msgstr "Ham ikili veri"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2312
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2366
-#, python-format
-msgid "'%(value)s' is not a valid UUID."
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2399
+#, fuzzy, python-format
+#| msgid "'%(value)s' is not a valid UUID."
+msgid "“%(value)s” is not a valid UUID."
 msgstr "'%(value)s' geçerli bir UUID değil."
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2314
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2401
 msgid "Universally unique identifier"
 msgstr "Evrensel eşsiz betimleyici"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:221
+#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:226
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/files.py:228
 msgid "File"
 msgstr "Dosya"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:778
+#: venv/lib/python3.6/site-packages/django/db/models/fields/json.py:18
+msgid "A JSON object"
+msgstr "Bir JSON nesnesi"
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/json.py:20
+msgid "Value must be valid JSON."
+msgstr "Değer geçerli bir JSON olmalı"
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:790
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:788
 #, python-format
 msgid "%(model)s instance with %(field)s %(value)r does not exist."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:780
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:792
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:790
 msgid "Foreign Key (type determined by related field)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1007
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1045
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1029
 msgid "One-to-one relationship"
 msgstr "Bire-bir ilişki"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1057
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1099
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1104
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr "%(from)s'den %(to)s ye ilişki"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1058
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1100
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1105
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr "%(from)s'den %(to)s ye ilişkiler"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1100
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1142
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1147
 msgid "Many-to-many relationship"
 msgstr "Çoktan-çoğa ilişki"
 
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the label
-#: venv/lib/python3.6/site-packages/django/forms/boundfield.py:146
+#: venv/lib/python3.6/site-packages/django/forms/boundfield.py:150
 #: venv2/lib/python2.7/site-packages/django/forms/boundfield.py:181
 msgid ":?.!"
 msgstr ":?.!"
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:53
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:54
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:56
 msgid "This field is required."
 msgstr "Bu alan gerekli."
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:245
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:247
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:258
 msgid "Enter a whole number."
 msgstr "Bir tüm sayı girin."
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:396
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:1126
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:402
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1143
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:418
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:1149
 msgid "Enter a valid date."
 msgstr "Geçerli bir tarih girin."
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:420
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:1127
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:426
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1144
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:442
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:1150
 msgid "Enter a valid time."
 msgstr "Geçerli bir zaman girin."
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:442
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:454
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:464
 msgid "Enter a valid date/time."
 msgstr "Geçerli bir tarih/saat girin."
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:471
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:488
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:493
 msgid "Enter a valid duration."
 msgstr "Geçerli bir süre girin."
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:472
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:489
 #, python-brace-format
 msgid "The number of days must be between {min_days} and {max_days}."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:532
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:549
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:547
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Dosya submit edilmedi. Formdaki encoding tipini kontrol ediniz."
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:533
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:550
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:548
 msgid "No file was submitted."
 msgstr "Gönderilen dosya yok"
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:534
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:551
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:549
 msgid "The submitted file is empty."
 msgstr "Gönderilen dosya boş"
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:536
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:553
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:551
 #, python-format
 msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
@@ -5102,12 +4740,12 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:539
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:556
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:554
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:600
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:617
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:619
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
@@ -5116,9 +4754,9 @@ msgstr ""
 "Geçerli bir imaj yükleyin. Yüklediğiniz imaj ya geçersiz ya da bir bozulmuş "
 "imaj"
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:762
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:852
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1270
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:779
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:869
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1309
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:776
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:872
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1265
@@ -5127,78 +4765,84 @@ msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr ""
 "Geçerli bir seçenek seçin. Seçeneklerden %(value)s tanesi uygun değil. "
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:853
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:968
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1269
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:870
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:985
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1308
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:873
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:990
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1264
 msgid "Enter a list of values."
 msgstr "Bir değer listesi girin."
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:969
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:986
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:991
 msgid "Enter a complete value."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:1185
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1202
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:1208
 msgid "Enter a valid UUID."
 msgstr "Geçerli bir UUID girin."
 
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1232
+#, fuzzy
+#| msgid "Enter a valid URL."
+msgid "Enter a valid JSON."
+msgstr "Geçerli bir URL girin."
+
 #. Translators: This is the default suffix added to form field labels
-#: venv/lib/python3.6/site-packages/django/forms/forms.py:86
+#: venv/lib/python3.6/site-packages/django/forms/forms.py:76
 #: venv2/lib/python2.7/site-packages/django/forms/forms.py:87
 msgid ":"
 msgstr ":"
 
-#: venv/lib/python3.6/site-packages/django/forms/forms.py:212
+#: venv/lib/python3.6/site-packages/django/forms/forms.py:203
 #: venv2/lib/python2.7/site-packages/django/forms/forms.py:213
 #, python-format
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr "(Gizli alan %(name)s) %(error)s"
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:91
-#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:97
-msgid "ManagementForm data is missing or has been tampered with"
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:61
+#, python-format
+msgid ""
+"ManagementForm data is missing or has been tampered with. Missing fields: "
+"%(field_names)s. You may need to file a bug report if the issue persists."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:338
-#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:355
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:370
 #, python-format
-msgid "Please submit %d or fewer forms."
-msgid_plural "Please submit %d or fewer forms."
+msgid "Please submit at most %d form."
+msgid_plural "Please submit at most %d forms."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:345
-#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:362
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:377
 #, python-format
-msgid "Please submit %d or more forms."
-msgid_plural "Please submit %d or more forms."
+msgid "Please submit at least %d form."
+msgid_plural "Please submit at least %d forms."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:371
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:373
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:405
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:412
 #: venv2/lib/python2.7/site-packages/django/forms/formsets.py:390
 #: venv2/lib/python2.7/site-packages/django/forms/formsets.py:392
 msgid "Order"
 msgstr "Sıra"
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:751
+#: venv/lib/python3.6/site-packages/django/forms/models.py:763
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:744
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:755
+#: venv/lib/python3.6/site-packages/django/forms/models.py:767
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:748
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:761
+#: venv/lib/python3.6/site-packages/django/forms/models.py:773
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:754
 #, python-format
 msgid ""
@@ -5206,55 +4850,56 @@ msgid ""
 "for the %(lookup)s in %(date_field)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:770
+#: venv/lib/python3.6/site-packages/django/forms/models.py:782
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:763
 msgid "Please correct the duplicate values below."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1091
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1109
 msgid "The inline value did not match the parent instance."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1158
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1193
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1154
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1272
-#, python-format
-msgid "\"%(pk)s\" is not a valid value."
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1311
+#, fuzzy, python-format
+#| msgid "\"%(pk)s\" is not a valid value."
+msgid "“%(pk)s” is not a valid value."
 msgstr "'%(pk)s' bir geçerli değer değil."
 
-#: venv/lib/python3.6/site-packages/django/forms/utils.py:162
-#: venv2/lib/python2.7/site-packages/django/forms/utils.py:172
+#: venv/lib/python3.6/site-packages/django/forms/utils.py:172
 #, python-format
 msgid ""
-"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it "
 "may be ambiguous or it may not exist."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:396
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:404
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:378
 msgid "Currently"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:710
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:715
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:704
 msgid "Yes"
 msgstr "Evet"
 
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:711
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:716
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:705
 msgid "No"
 msgstr "Hayır"
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:788
+#. Translators: Please do not add spaces around commas.
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:805
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:851
 msgid "yes,no,maybe"
 msgstr "evet,hayır,belki"
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:817
 #: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:834
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:851
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:880
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:897
 #, python-format
@@ -5263,62 +4908,62 @@ msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d byte"
 msgstr[1] "%(size)d byte"
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:836
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:853
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:899
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:838
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:855
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:901
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:840
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:857
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:903
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:842
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:859
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:905
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:844
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:861
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:907
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:62
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:66
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:66
 msgid "p.m."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:63
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:67
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:67
 msgid "a.m."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:68
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:72
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:72
 msgid "PM"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:69
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:73
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:73
 msgid "AM"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:150
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:146
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:158
 msgid "midnight"
 msgstr "gece yarısı"
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:152
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:148
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:160
 msgid "noon"
 msgstr "öğle"
@@ -5662,20 +5307,20 @@ msgstr "Aralık"
 msgid "This is not a valid IPv6 address."
 msgstr "Bu bir geçerli IPv6 adresi değil."
 
-#: venv/lib/python3.6/site-packages/django/utils/text.py:67
+#: venv/lib/python3.6/site-packages/django/utils/text.py:71
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s…"
 msgstr "%(truncated_text)s..."
 
-#: venv/lib/python3.6/site-packages/django/utils/text.py:233
+#: venv/lib/python3.6/site-packages/django/utils/text.py:240
 #: venv2/lib/python2.7/site-packages/django/utils/text.py:251
 msgid "or"
 msgstr "veya"
 
 #. Translators: This string is used as a separator between list elements
-#: venv/lib/python3.6/site-packages/django/utils/text.py:252
-#: venv/lib/python3.6/site-packages/django/utils/timesince.py:83
+#: venv/lib/python3.6/site-packages/django/utils/text.py:259
+#: venv/lib/python3.6/site-packages/django/utils/timesince.py:94
 #: venv2/lib/python2.7/site-packages/django/utils/text.py:270
 #: venv2/lib/python2.7/site-packages/django/utils/timesince.py:71
 msgid ", "
@@ -5729,11 +5374,6 @@ msgid_plural "%d minutes"
 msgstr[0] "%d dakika"
 msgstr[1] "%ddakika"
 
-#: venv/lib/python3.6/site-packages/django/utils/timesince.py:72
-#: venv2/lib/python2.7/site-packages/django/utils/timesince.py:60
-msgid "0 minutes"
-msgstr "0 dakika"
-
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:110
 #: venv2/lib/python2.7/site-packages/django/views/csrf.py:109
 msgid "Forbidden"
@@ -5745,29 +5385,27 @@ msgid "CSRF verification failed. Request aborted."
 msgstr "CSRF doğrulama başarısız. İstek iptal edildi."
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:115
-#: venv2/lib/python2.7/site-packages/django/views/csrf.py:114
 msgid ""
-"You are seeing this message because this HTTPS site requires a 'Referer "
-"header' to be sent by your Web browser, but none was sent. This header is "
+"You are seeing this message because this HTTPS site requires a “Referer "
+"header” to be sent by your Web browser, but none was sent. This header is "
 "required for security reasons, to ensure that your browser is not being "
 "hijacked by third parties."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:120
-#: venv2/lib/python2.7/site-packages/django/views/csrf.py:119
 msgid ""
-"If you have configured your browser to disable 'Referer' headers, please re-"
-"enable them, at least for this site, or for HTTPS connections, or for 'same-"
-"origin' requests."
+"If you have configured your browser to disable “Referer” headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for “same-"
+"origin” requests."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:124
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
-"including the 'Referrer-Policy: no-referrer' header, please remove them. The "
-"CSRF protection requires the 'Referer' header to do strict referer checking. "
-"If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
-"\" ...> for links to third-party sites."
+"including the “Referrer-Policy: no-referrer” header, please remove them. The "
+"CSRF protection requires the “Referer” header to do strict referer checking. "
+"If you’re concerned about privacy, use alternatives like <a rel=\"noreferrer"
+"\" …> for links to third-party sites."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:132
@@ -5779,10 +5417,9 @@ msgid ""
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:137
-#: venv2/lib/python2.7/site-packages/django/views/csrf.py:129
 msgid ""
 "If you have configured your browser to disable cookies, please re-enable "
-"them, at least for this site, or for 'same-origin' requests."
+"them, at least for this site, or for “same-origin” requests."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:142
@@ -5827,7 +5464,7 @@ msgstr "Hafta belirtilmedi"
 msgid "No %(verbose_name_plural)s available"
 msgstr "%(verbose_name_plural)s uygun olmayan"
 
-#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:589
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:594
 #: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:669
 #, python-format
 msgid ""
@@ -5835,10 +5472,9 @@ msgid ""
 "allow_future is False."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:623
-#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:703
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:628
 #, python-format
-msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgid "Invalid date string “%(datestr)s” given format “%(format)s”"
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/detail.py:54
@@ -5848,8 +5484,7 @@ msgid "No %(verbose_name)s found matching the query"
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/list.py:67
-#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:77
-msgid "Page is not 'last', nor can it be converted to an int."
+msgid "Page is not “last”, nor can it be converted to an int."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/list.py:72
@@ -5859,9 +5494,8 @@ msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr "Geçersiz sayfa (%(page_number)s): %(message)s"
 
 #: venv/lib/python3.6/site-packages/django/views/generic/list.py:154
-#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:172
 #, python-format
-msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgid "Empty list and “%(class_name)s.allow_empty” is False."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/static.py:40
@@ -5870,9 +5504,9 @@ msgid "Directory indexes are not allowed here."
 msgstr "Dizin indekslerine burada izin verilmişyor."
 
 #: venv/lib/python3.6/site-packages/django/views/static.py:42
-#: venv2/lib/python2.7/site-packages/django/views/static.py:46
-#, python-format
-msgid "\"%(path)s\" does not exist"
+#, fuzzy, python-format
+#| msgid "\"%(path)s\" does not exist"
+msgid "“%(path)s” does not exist"
 msgstr "\"%(path)s\" mevcut değil"
 
 #: venv/lib/python3.6/site-packages/django/views/static.py:80
@@ -5881,11 +5515,12 @@ msgstr "\"%(path)s\" mevcut değil"
 msgid "Index of %(directory)s"
 msgstr "%(directory)s indeksi"
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:6
-msgid "Django: the Web framework for perfectionists with deadlines."
-msgstr ""
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:7
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:221
+msgid "The install worked successfully! Congratulations!"
+msgstr "Bu kurulum başarıyla çalıştırıldı! Tebrikler!"
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:345
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:207
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
@@ -5895,11 +5530,7 @@ msgstr ""
 "%(version)s/releases/\" target=\"_blank\" rel=\"noopener\">sürüm notlarını</"
 "a> görüntüle"
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:367
-msgid "The install worked successfully! Congratulations!"
-msgstr "Bu kurulum başarıyla çalıştırıldı! Tebrikler!"
-
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:368
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:222
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
@@ -5912,46 +5543,161 @@ msgstr ""
 "\">DEBUG=True</a> olduğu için bu sayfayı görüyorsunuz ve hiçbir URL "
 "ayarlamamışsınız."
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:383
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:230
 msgid "Django Documentation"
 msgstr "Django Dökümanları"
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:384
-msgid "Topics, references, &amp; how-to's"
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:231
+#, fuzzy
+#| msgid "Topics, references, &amp; how-to's"
+msgid "Topics, references, &amp; how-to’s"
 msgstr "Başlıklar, referanslar, &amp; Nasıl yapılırlar"
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:395
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:239
 msgid "Tutorial: A Polling App"
 msgstr "Eğitsel: Bir Yoklama Uygulaması"
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:396
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:240
 msgid "Get started with Django"
 msgstr "Django ile Tanışın"
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:407
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:248
 msgid "Django Community"
 msgstr "Django Topluluğu"
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:408
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:249
 msgid "Connect, get help, or contribute"
 msgstr "Bağlan, yardım al veya katkıda bulun"
 
+#: venv/lib/python3.6/site-packages/django_bootstrap5/components.py:20
+msgid "close"
+msgstr "kapat"
+
 #: venv/lib/python3.6/site-packages/django_icons/renderers/image.py:217
 msgid "Icon of {}"
-<<<<<<< HEAD
 msgstr "{} ikonu"
-=======
-msgstr ""
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 
-#: venv/lib/python3.6/site-packages/qr_code/qrcode/utils.py:73
-#, python-format
-msgid "The option '%s' is not a valid option for a QR code."
-<<<<<<< HEAD
-msgstr "'%s' seçeneği QR kodu için geçerli bir seçenek değil."
-=======
+#: venv/lib/python3.6/site-packages/isort/main.py:158
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1615
+msgid "show this help message and exit"
+msgstr "bu yardım mesajını göster ve çık"
+
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:245
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:252
+msgid ""
+"Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
+"hyphens."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:463
+#, python-format
+msgid ""
+"File extension '%(extension)s' is not allowed. Allowed extensions are: "
+"'%(allowed_extensions)s'."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:905
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1807
+#, python-format
+msgid "'%(value)s' value must be an integer."
+msgstr "'%(value)s' değeri bir sayısal değer olmalıdır"
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:990
+#, python-format
+msgid "'%(value)s' value must be either True or False."
+msgstr "'%(value)s' değeri ya True ya da False olmalıdır."
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1172
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+"format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1174
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1319
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
+"date."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1317
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1321
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]) but it is an invalid date/time."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1475
+#, python-format
+msgid "'%(value)s' value must be a decimal number."
+msgstr "'%(value)s' değeri bir tam sayı olmalıdır."
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1628
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
+"uuuuuu] format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1773
+#, python-format
+msgid "'%(value)s' value must be a float."
+msgstr "'%(value)s' değeri kayan noktalı bir sayı olmalıdır."
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2006
+#, python-format
+msgid "'%(value)s' value must be either None, True or False."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2163
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2165
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"invalid time."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2366
+#, python-format
+msgid "'%(value)s' is not a valid UUID."
+msgstr "'%(value)s' geçerli bir UUID değil."
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:97
+msgid "ManagementForm data is missing or has been tampered with"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:355
+#, python-format
+msgid "Please submit %d or fewer forms."
+msgid_plural "Please submit %d or fewer forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:362
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
 
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1093
 msgid "The inline foreign key did not match the parent instance primary key."
@@ -5963,6 +5709,13 @@ msgstr ""
 msgid "\"%(pk)s\" is not a valid value for a primary key."
 msgstr "'%(pk)s' bir geçerli değer değil."
 
+#: venv2/lib/python2.7/site-packages/django/forms/utils.py:172
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
 #: venv2/lib/python2.7/site-packages/django/utils/text.py:81
 #, fuzzy, python-format
 #| msgctxt "String to return when truncating text"
@@ -5971,6 +5724,31 @@ msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
+#: venv2/lib/python2.7/site-packages/django/utils/timesince.py:60
+msgid "0 minutes"
+msgstr "0 dakika"
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:114
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:119
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:129
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
 #: venv2/lib/python2.7/site-packages/django/views/debug.py:520
 msgid "Welcome to Django"
 msgstr "Djangoya Hoşgeldiniz"
@@ -6005,6 +5783,25 @@ msgstr ""
 "\">DEBUG=True</a> olduğu için bu sayfayı görüyorsunuz ve hiçbir URL "
 "ayarlamamışsınız."
 
+#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:703
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:77
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:172
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/static.py:46
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" mevcut değil"
+
 #: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:313
 msgid "usage: "
 msgstr "kullanım:"
@@ -6064,10 +5861,6 @@ msgstr ""
 msgid "optional arguments"
 msgstr ""
 
-#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1615
-msgid "show this help message and exit"
-msgstr ""
-
 #: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1621
 msgid "show program's version number and exit"
 msgstr ""
@@ -6154,12 +5947,73 @@ msgstr ""
 msgid "%s: error: %s\n"
 msgstr "%s hata: %s\n"
 
+#: virtsecrets/templates/create_secret_block.html:12
+msgid "Create New Secret"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:18
+msgid "Ephemeral"
+msgstr "Geçici"
+
+#: virtsecrets/templates/create_secret_block.html:21
+#: virtsecrets/templates/create_secret_block.html:30
+msgid "no"
+msgstr "hayır"
+
+#: virtsecrets/templates/create_secret_block.html:22
+#: virtsecrets/templates/create_secret_block.html:31
+msgid "yes"
+msgstr "evet"
+
+#: virtsecrets/templates/create_secret_block.html:27
+msgid "Private"
+msgstr "Özel"
+
+#: virtsecrets/templates/create_secret_block.html:46
+#: virtsecrets/templates/secrets.html:62
+msgid "Data"
+msgstr "Veri"
+
+#: virtsecrets/templates/secrets.html:51
+msgid "Hypervisor doesn't have any Secrets"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:61
+msgid "Usage Type"
+msgstr "Kullanım Tipi"
+
+#: virtsecrets/templates/secrets.html:89
+msgid "Set secret value"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:95
+msgid "Value"
+msgstr "Değer"
+
 #: webvirtcloud/middleware.py:18
 #, python-format
 msgid "libvirt Error - %(exception)s"
 msgstr "libvirt Hatası - %(exception)s"
 
-<<<<<<< HEAD
+#~ msgid "QoS"
+#~ msgstr "QoS"
+
+#~ msgid "To take a snapshot please Power Off the instance."
+#~ msgstr "Anlık görüntü oluşturmak için lütfen sanal makinenizi kapatınız."
+
+#~ msgid "{qos_dir.capitalize()} QoS is deleted. Network XML is changed. "
+#~ msgstr "{qos_dir.capitalize()} QoS silindi. Ağ XML'i değiştirildi."
+
+#~ msgid "Stop and start network to activate new config."
+#~ msgstr ""
+#~ "Yeni yapılandırmayı aktifleştirmek için ağı durdurun ve yeniden başlatın."
+
+#~ msgid "{qos_dir.capitalize()} QoS is deleted"
+#~ msgstr "{qos_dir.capitalize()} QoS silindi"
+
+#~ msgid "The option '%s' is not a valid option for a QR code."
+#~ msgstr "'%s' seçeneği QR kodu için geçerli bir seçenek değil."
+
 #~ msgid ""
 #~ "%(qos_dir)s QoS is deleted. Network XML is changed. Stop and start "
 #~ "network to activate new config"
@@ -6167,10 +6021,6 @@ msgstr "libvirt Hatası - %(exception)s"
 #~ "Ağ XML i değiştirildi. \\ Aktifleştirmek için durdurun ve yeniden "
 #~ "başlatın."
 
-#~ msgid "Stop and start network to activate new config."
-#~ msgstr ""
-#~ "Yeni yapılandırmayı aktifleştirmek için ağı durdurun ve yeniden başlatın."
-
 #~ msgid "CPU is resized"
 #~ msgstr "Disk yeniden boyutlandırıldı"
 
@@ -6222,26 +6072,12 @@ msgstr "libvirt Hatası - %(exception)s"
 #~ msgid "Stop and start network to activate new config"
 #~ msgstr "Yeni yapılandırmayı aktifleştirmek için ağı durdurun ve başlatın"
 
-#~ msgid "{qos_dir.capitalize()} QoS is deleted. Network XML is changed. "
-#~ msgstr "{qos_dir.capitalize()} QoS silindi. Ağ XML'i değiştirildi."
-
-=======
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #~ msgid "Login"
 #~ msgstr "Bağlan"
 
-#~ msgid "Is staff"
-#~ msgstr "Görevli mi"
-
 #~ msgid "Is superuser"
 #~ msgstr "Süperkullanıcı mı"
 
-<<<<<<< HEAD
-=======
-#~ msgid "Can clone instances"
-#~ msgstr "Sanal makineleri klonlayabilir"
-
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #~ msgid "Max instances"
 #~ msgstr "Maksimum sanal makine"
 
diff --git a/locale/uk/LC_MESSAGES/django.po b/locale/uk/LC_MESSAGES/django.po
index 5a318c7..4bb0e4c 100644
--- a/locale/uk/LC_MESSAGES/django.po
+++ b/locale/uk/LC_MESSAGES/django.po
@@ -8,11 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2020-11-05 09:36+0000\n"
-=======
-"POT-Creation-Date: 2020-10-23 07:53+0000\n"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+"POT-Creation-Date: 2021-12-20 07:56+0000\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"
@@ -99,39 +95,39 @@ msgstr ""
 msgid "Create user instance"
 msgstr ""
 
-#: accounts/templates/account.html:27
+#: accounts/templates/account.html:28
 #: computes/templates/computes/instances.html:5
 #: computes/templates/computes/instances.html:9
-#: computes/templates/computes/instances.html:32
-#: computes/templates/overview.html:19 instances/templates/allinstances.html:5
+#: computes/templates/computes/instances.html:30
+#: computes/templates/overview.html:18 instances/templates/allinstances.html:5
 #: instances/templates/allinstances.html:9
 #: instances/templates/bottom_bar.html:17
 #: interfaces/templates/interface.html:16
-#: interfaces/templates/interfaces.html:20 networks/templates/network.html:17
+#: interfaces/templates/interfaces.html:22 networks/templates/network.html:17
 #: networks/templates/networks.html:19 nwfilters/templates/nwfilter.html:17
-#: nwfilters/templates/nwfilters.html:25 secrets/templates/secrets.html:23
-#: storages/templates/storage.html:22 storages/templates/storages.html:19
-#: templates/navbar.html:14
+#: nwfilters/templates/nwfilters.html:23 storages/templates/storage.html:23
+#: storages/templates/storages.html:19 templates/navbar.html:14
+#: virtsecrets/templates/secrets.html:25
 msgid "Instances"
 msgstr ""
 
-#: accounts/templates/account.html:30
+#: accounts/templates/account.html:33
 msgid "Public Keys"
 msgstr ""
 
-#: accounts/templates/account.html:40 admin/templates/admin/logs.html:27
+#: accounts/templates/account.html:44 admin/templates/admin/logs.html:27
 #: instances/templates/instance.html:5
 msgid "Instance"
 msgstr ""
 
-#: accounts/templates/account.html:41
+#: accounts/templates/account.html:45
 msgid "VNC"
 msgstr ""
 
-#: accounts/templates/account.html:42 instances/templates/instance.html:87
-#: instances/templates/instances/resize_tab.html:56
-#: instances/templates/instances/resize_tab.html:58
-#: instances/templates/instances/resize_tab.html:85
+#: accounts/templates/account.html:46 instances/templates/instance.html:93
+#: instances/templates/instances/resize_tab.html:55
+#: instances/templates/instances/resize_tab.html:57
+#: instances/templates/instances/resize_tab.html:84
 #: instances/templates/instances/resize_tab.html:121
 #: instances/templates/instances/resize_tab.html:125
 #: instances/templates/instances/resize_tab.html:151
@@ -140,47 +136,47 @@ msgstr ""
 msgid "Resize"
 msgstr ""
 
-#: accounts/templates/account.html:43 accounts/templates/account.html:61
-#: accounts/templates/profile.html:51 admin/templates/admin/group_list.html:46
-#: admin/templates/admin/user_list.html:68
-#: computes/templates/computes/list.html:54
-#: instances/templates/instances/settings_tab.html:310
-#: instances/templates/instances/settings_tab.html:314
+#: accounts/templates/account.html:47 accounts/templates/account.html:65
+#: accounts/templates/profile.html:55 admin/templates/admin/group_list.html:43
+#: admin/templates/admin/user_list.html:65
+#: computes/templates/computes/list.html:53
+#: instances/templates/instances/settings_tab.html:325
+#: instances/templates/instances/settings_tab.html:329
 #: interfaces/templates/interface.html:60 networks/templates/network.html:50
-#: nwfilters/templates/nwfilter.html:111 nwfilters/templates/nwfilter.html:151
-#: nwfilters/templates/nwfilters.html:120 secrets/templates/secrets.html:77
-#: storages/templates/storage.html:61 storages/templates/storage.html:174
-#: templates/common/confirm_delete.html:21
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:375
+#: nwfilters/templates/nwfilter.html:103 nwfilters/templates/nwfilter.html:143
+#: nwfilters/templates/nwfilters.html:118 storages/templates/storage.html:63
+#: storages/templates/storage.html:175 templates/common/confirm_delete.html:21
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:417
 #: venv2/lib/python2.7/site-packages/django/forms/formsets.py:394
+#: virtsecrets/templates/secrets.html:78
 msgid "Delete"
 msgstr ""
 
-#: accounts/templates/account.html:44
-#: instances/templates/create_instance_w2.html:81
-#: instances/templates/instances/settings_tab.html:239
-#: instances/templates/instances/snapshots_tab.html:49
-#: nwfilters/templates/nwfilter.html:101 nwfilters/templates/nwfilter.html:135
-#: nwfilters/templates/nwfilters.html:57 secrets/templates/secrets.html:62
-#: storages/templates/storage.html:100
+#: accounts/templates/account.html:48
+#: instances/templates/create_instance_w2.html:80
+#: instances/templates/instances/settings_tab.html:254
+#: instances/templates/instances/snapshots_tab.html:41
+#: nwfilters/templates/nwfilter.html:93 nwfilters/templates/nwfilter.html:127
+#: nwfilters/templates/nwfilters.html:55 storages/templates/storage.html:101
+#: virtsecrets/templates/secrets.html:63
 msgid "Action"
 msgstr ""
 
-#: accounts/templates/account.html:56
+#: accounts/templates/account.html:60
 msgid "edit"
 msgstr ""
 
-#: accounts/templates/account.html:74
+#: accounts/templates/account.html:78
 msgid "Key name"
 msgstr ""
 
-#: accounts/templates/account.html:75
+#: accounts/templates/account.html:79
 msgid "Public key"
 msgstr ""
 
 #: accounts/templates/accounts/change_password_form.html:7
 #: accounts/templates/accounts/change_password_form.html:14
-#: accounts/templates/profile.html:29
+#: accounts/templates/profile.html:33
 msgid "Change Password"
 msgstr ""
 
@@ -193,11 +189,11 @@ msgid "Cancel"
 msgstr ""
 
 #: accounts/templates/accounts/change_password_form.html:27
-#: instances/templates/instances/settings_tab.html:638
-#: instances/templates/instances/settings_tab.html:642
-#: instances/templates/instances/settings_tab.html:824
-#: instances/templates/instances/settings_tab.html:826
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:397
+#: instances/templates/instances/settings_tab.html:672
+#: instances/templates/instances/settings_tab.html:676
+#: instances/templates/instances/settings_tab.html:853
+#: instances/templates/instances/settings_tab.html:855
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:405
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:379
 msgid "Change"
 msgstr ""
@@ -226,7 +222,7 @@ msgstr ""
 
 #: accounts/templates/accounts/otp_login.html:24
 #: accounts/templates/login.html:5 accounts/templates/login.html:23
-#: accounts/templates/login.html:27
+#: accounts/templates/login.html:28
 msgid "Sign In"
 msgstr ""
 
@@ -238,12 +234,12 @@ msgstr ""
 msgid "Incorrect username or password."
 msgstr ""
 
-#: accounts/templates/login.html:24 admin/templates/admin/logs.html:26
-#: computes/templates/computes/instances.html:67
+#: accounts/templates/login.html:24 admin/templates/admin/logs.html:25
+#: computes/templates/computes/instances.html:64
 #: instances/templates/add_instance_owner_block.html:18
 #: instances/templates/allinstances_index_grouped.html:8
 #: instances/templates/allinstances_index_nongrouped.html:7
-#: instances/templates/instances/stats_tab.html:84
+#: instances/templates/instances/stats_tab.html:87
 msgid "User"
 msgstr ""
 
@@ -267,26 +263,26 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: accounts/templates/profile.html:14
+#: accounts/templates/profile.html:15
 msgid "Edit Profile"
 msgstr ""
 
-#: accounts/templates/profile.html:17
-#: instances/templates/instances/access_tab.html:23
+#: accounts/templates/profile.html:20
+#: instances/templates/instances/access_tab.html:20
 msgid "SSH Keys"
 msgstr ""
 
-#: accounts/templates/profile.html:34
-#: instances/templates/instances/settings_tab.html:686
-#: instances/templates/instances/settings_tab.html:688
+#: accounts/templates/profile.html:38
+#: instances/templates/instances/settings_tab.html:720
+#: instances/templates/instances/settings_tab.html:722
 msgid "Update"
 msgstr ""
 
-#: accounts/templates/profile.html:64
+#: accounts/templates/profile.html:68
 msgid "Add SSH Key"
 msgstr ""
 
-#: accounts/templates/profile.html:72
+#: accounts/templates/profile.html:76
 #: instances/templates/add_instance_network_block.html:50
 #: instances/templates/add_instance_owner_block.html:31
 #: instances/templates/create_flav_block.html:28
@@ -300,7 +296,6 @@ msgstr ""
 
 #: accounts/utils.py:51
 msgid "Please view HTML version of this message."
-<<<<<<< HEAD
 msgstr ""
 
 #: accounts/views.py:26
@@ -350,57 +345,6 @@ msgid "OTP QR code was emailed to user %(user)s"
 msgstr ""
 
 #: accounts/views.py:196
-=======
-msgstr ""
-
-#: accounts/views.py:26
-msgid "Profile updated"
-msgstr ""
-
-#: accounts/views.py:40
-msgid "SSH key added"
-msgstr ""
-
-#: accounts/views.py:45
-msgid "Add SSH key"
-msgstr ""
-
-#: accounts/views.py:53
-msgid "SSH key deleted"
-msgstr ""
-
-#: accounts/views.py:58
-msgid "Delete SSH key"
-msgstr ""
-
-#: accounts/views.py:86
-msgid "Password Changed"
-msgstr ""
-
-#: accounts/views.py:106
-msgid "Create User Instance"
-msgstr ""
-
-#: accounts/views.py:124
-msgid "Update User Instance"
-msgstr ""
-
-#: accounts/views.py:160
-#, python-format
-msgid "OTP Sent to %s"
-msgstr ""
-
-#: accounts/views.py:165
-msgid "Email OTP"
-msgstr ""
-
-#: accounts/views.py:175
-#, python-format
-msgid "OTP QR code was emailed to user %s"
-msgstr ""
-
-#: accounts/views.py:177
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "User email not set, failed to send QR code"
 msgstr ""
 
@@ -408,156 +352,145 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: admin/forms.py:56 admin/templates/admin/group_list.html:15
+#: admin/forms.py:56 admin/templates/admin/group_list.html:13
 #: templates/navbar.html:30
 msgid "Groups"
 msgstr ""
 
-<<<<<<< HEAD
 #: admin/forms.py:81
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, \n"
 "                    but you can change the password using <a href='{}'>this "
 "form</a>."
-=======
-#: admin/forms.py:79
-msgid ""
-"Raw passwords are not stored, so there is no way to see\n"
-"                this user's password, but you can change the password using "
-"<a href='{}'>this form</a>."
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgstr ""
 
 #: admin/templates/admin/group_list.html:5 admin/views.py:87
-#: instances/templates/instances/settings_tab.html:63 templates/navbar.html:29
+#: instances/templates/instances/settings_tab.html:69 templates/navbar.html:29
 msgid "Users"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:13
-#: admin/templates/admin/user_list.html:16
-#: computes/templates/computes/instances.html:18
-#: instances/templates/allinstances.html:16
-#: nwfilters/templates/nwfilters.html:12 storages/templates/storage.html:87
-#: templates/search_block.html:3
-msgid "Search"
-msgstr ""
-
-#: admin/templates/admin/group_list.html:23 admin/templates/admin/logs.html:16
-#: admin/templates/admin/user_list.html:26
-#: computes/templates/computes/instances.html:57
-#: computes/templates/computes/list.html:20
-#: instances/templates/create_instance_w2.html:66
-#: interfaces/templates/interfaces.html:47 networks/templates/networks.html:46
-#: nwfilters/templates/nwfilters.html:135 secrets/templates/secrets.html:50
-#: storages/templates/storage.html:187 storages/templates/storages.html:46
+#: admin/templates/admin/group_list.html:20 admin/templates/admin/logs.html:15
+#: admin/templates/admin/user_list.html:23
+#: computes/templates/computes/instances.html:55
+#: computes/templates/computes/list.html:19
+#: instances/templates/create_instance_w2.html:67
+#: interfaces/templates/interfaces.html:48 networks/templates/networks.html:45
+#: nwfilters/templates/nwfilters.html:132 storages/templates/storage.html:187
+#: storages/templates/storages.html:45 virtsecrets/templates/secrets.html:51
 msgid "Warning"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:23
+#: admin/templates/admin/group_list.html:20
 msgid "You don't have any groups"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:31
+#: admin/templates/admin/group_list.html:28
 msgid "Group Name"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:32
-#: admin/templates/admin/user_list.html:39
-#: computes/templates/computes/instances.html:71
-#: computes/templates/computes/list.html:31
+#: admin/templates/admin/group_list.html:29
+#: admin/templates/admin/user_list.html:36
+#: computes/templates/computes/instances.html:68
+#: computes/templates/computes/list.html:30
 #: instances/templates/allinstances_index_grouped.html:12
 #: instances/templates/allinstances_index_nongrouped.html:12
-#: instances/templates/instances/settings_tab.html:343
-#: instances/templates/instances/settings_tab.html:491
+#: instances/templates/instances/settings_tab.html:355
+#: instances/templates/instances/settings_tab.html:525
 #: networks/templates/network.html:175 networks/templates/network.html:284
 #: networks/templates/network.html:332
 msgid "Actions"
 msgstr ""
 
-#: admin/templates/admin/group_list.html:43
-#: admin/templates/admin/user_list.html:62
-#: computes/templates/computes/list.html:53 networks/templates/network.html:82
-#: nwfilters/templates/nwfilter.html:59 secrets/templates/secrets.html:74
+#: admin/templates/admin/group_list.html:40
+#: admin/templates/admin/user_list.html:59
+#: computes/templates/computes/list.html:52 networks/templates/network.html:82
+#: nwfilters/templates/nwfilter.html:59 virtsecrets/templates/secrets.html:75
 msgid "Edit"
 msgstr ""
 
 #: admin/templates/admin/logs.html:5 admin/templates/admin/logs.html:7
-#: instances/templates/instances/stats_tab.html:13 templates/navbar.html:31
+#: instances/templates/instances/stats_tab.html:12 templates/navbar.html:31
 msgid "Logs"
 msgstr ""
 
-#: admin/templates/admin/logs.html:16
+#: admin/templates/admin/logs.html:15
 msgid "You don't have any Logs"
 msgstr ""
 
-#: admin/templates/admin/logs.html:25
-#: instances/templates/instances/snapshots_tab.html:48
-#: instances/templates/instances/stats_tab.html:83
+#: admin/templates/admin/logs.html:24
+#: instances/templates/instances/snapshots_tab.html:40
+#: instances/templates/instances/stats_tab.html:86
 msgid "Date"
 msgstr ""
 
+#: admin/templates/admin/logs.html:26
+#: console/templates/console-spice-full.html:202
+#: instances/templates/allinstances_index_nongrouped.html:7
+msgid "Host"
+msgstr ""
+
 #: admin/templates/admin/logs.html:28
-#: instances/templates/instances/stats_tab.html:85
+#: instances/templates/instances/stats_tab.html:88
 msgid "Message"
 msgstr ""
 
 #: admin/templates/admin/user_form.html:21
 #: computes/templates/computes/form.html:23
-#: instances/templates/edit_instance_volume.html:124
+#: instances/templates/instances/edit_instance_volume.html:111
 #: networks/templates/add_network_qos.html:51 templates/common/form.html:22
 msgid "Save"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:26
+#: admin/templates/admin/user_list.html:23
 msgid "You don't have any user"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:34
+#: admin/templates/admin/user_list.html:31
 msgid "Username"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:35
-#: computes/templates/computes/instances.html:68
-#: computes/templates/computes/list.html:29
+#: admin/templates/admin/user_list.html:32
+#: computes/templates/computes/instances.html:65
+#: computes/templates/computes/list.html:28
 #: instances/templates/allinstances_index_grouped.html:9
 #: instances/templates/allinstances_index_nongrouped.html:9
 msgid "Status"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:36
+#: admin/templates/admin/user_list.html:33
 msgid "Staff"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:37
+#: admin/templates/admin/user_list.html:34
 msgid "Superuser"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:38
+#: admin/templates/admin/user_list.html:35
 msgid "Can Clone"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:51
-#: computes/templates/computes/instances.html:94
-#: instances/templates/allinstances_index_grouped.html:57
-#: instances/templates/allinstances_index_nongrouped.html:40
+#: admin/templates/admin/user_list.html:48
+#: computes/templates/computes/instances.html:91
+#: instances/templates/allinstances_index_grouped.html:59
+#: instances/templates/allinstances_index_nongrouped.html:41
 #: instances/templates/instance.html:19
 msgid "Active"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:53
+#: admin/templates/admin/user_list.html:50
 msgid "Blocked"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:61
+#: admin/templates/admin/user_list.html:58
 msgid "View Profile"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:64
+#: admin/templates/admin/user_list.html:61
 msgid "Block"
 msgstr ""
 
-#: admin/templates/admin/user_list.html:66
+#: admin/templates/admin/user_list.html:63
 msgid "Unblock"
 msgstr ""
 
@@ -569,11 +502,10 @@ msgstr ""
 msgid "Update Group"
 msgstr ""
 
-#: admin/views.py:113
+#: admin/views.py:110
 msgid "Create User"
 msgstr ""
 
-<<<<<<< HEAD
 #: admin/views.py:129
 msgid "Update User"
 msgstr ""
@@ -584,17 +516,6 @@ msgid "Password changed for %(user)s"
 msgstr ""
 
 #: admin/views.py:144
-=======
-#: admin/views.py:136
-msgid "Update User"
-msgstr ""
-
-#: admin/views.py:149
-msgid "User password changed: {}"
-msgstr ""
-
-#: admin/views.py:152
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid "Wrong Data Provided"
 msgstr ""
 
@@ -880,33 +801,18 @@ msgid "Other Settings"
 msgstr ""
 
 #: appsettings/views.py:38
-<<<<<<< HEAD
 #, python-format
 msgid "SASS directory path is changed. Now: %(dir)s"
 msgstr ""
 
-#: appsettings/views.py:67
+#: appsettings/views.py:70
 #, python-format
 msgid "Theme is changed. Now: %(theme)s"
 msgstr ""
 
-#: appsettings/views.py:82
+#: appsettings/views.py:85
 #, python-format
 msgid "%(setting)s is changed. Now: %(value)s"
-=======
-#, python-brace-format
-msgid "SASS directory path is changed. Now: {sass_dir.value}"
-msgstr ""
-
-#: appsettings/views.py:65
-#, python-brace-format
-msgid "Theme changed. Now: {theme}"
-msgstr ""
-
-#: appsettings/views.py:80
-#, python-brace-format
-msgid "{setting.name} is changed. Now: {setting.value}"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgstr ""
 
 #: computes/forms.py:21
@@ -937,144 +843,144 @@ msgstr ""
 msgid "Create Compute"
 msgstr ""
 
-#: computes/templates/computes/instances.html:29
-#: computes/templates/computes/list.html:49
-#: computes/templates/computes/list.html:51 computes/templates/overview.html:6
-#: computes/templates/overview.html:16 interfaces/templates/interface.html:13
-#: interfaces/templates/interfaces.html:17 networks/templates/network.html:14
+#: computes/templates/computes/instances.html:27
+#: computes/templates/computes/list.html:48
+#: computes/templates/computes/list.html:50 computes/templates/overview.html:6
+#: computes/templates/overview.html:15 interfaces/templates/interface.html:13
+#: interfaces/templates/interfaces.html:19 networks/templates/network.html:14
 #: networks/templates/networks.html:16 nwfilters/templates/nwfilter.html:14
-#: nwfilters/templates/nwfilters.html:22 secrets/templates/secrets.html:20
-#: storages/templates/storage.html:19 storages/templates/storages.html:16
+#: nwfilters/templates/nwfilters.html:20 storages/templates/storage.html:20
+#: storages/templates/storages.html:16 virtsecrets/templates/secrets.html:22
 msgid "Overview"
 msgstr ""
 
-#: computes/templates/computes/instances.html:35
-#: computes/templates/overview.html:22 interfaces/templates/interface.html:19
-#: interfaces/templates/interfaces.html:23 networks/templates/network.html:20
+#: computes/templates/computes/instances.html:33
+#: computes/templates/overview.html:21 interfaces/templates/interface.html:19
+#: interfaces/templates/interfaces.html:25 networks/templates/network.html:20
 #: networks/templates/networks.html:22 nwfilters/templates/nwfilter.html:20
-#: nwfilters/templates/nwfilters.html:28 secrets/templates/secrets.html:26
-#: storages/templates/storage.html:25 storages/templates/storages.html:4
-#: storages/templates/storages.html:6 storages/templates/storages.html:22
+#: nwfilters/templates/nwfilters.html:26 storages/templates/storage.html:26
+#: storages/templates/storages.html:4 storages/templates/storages.html:6
+#: storages/templates/storages.html:22 virtsecrets/templates/secrets.html:28
 msgid "Storages"
 msgstr ""
 
-#: computes/templates/computes/instances.html:38
-#: computes/templates/overview.html:25 interfaces/templates/interface.html:22
-#: interfaces/templates/interfaces.html:26 networks/templates/network.html:23
+#: computes/templates/computes/instances.html:36
+#: computes/templates/overview.html:24 interfaces/templates/interface.html:22
+#: interfaces/templates/interfaces.html:28 networks/templates/network.html:23
 #: networks/templates/networks.html:4 networks/templates/networks.html:6
 #: networks/templates/networks.html:25 nwfilters/templates/nwfilter.html:23
-#: nwfilters/templates/nwfilters.html:31 secrets/templates/secrets.html:29
-#: storages/templates/storage.html:28 storages/templates/storages.html:25
+#: nwfilters/templates/nwfilters.html:29 storages/templates/storage.html:29
+#: storages/templates/storages.html:25 virtsecrets/templates/secrets.html:31
 msgid "Networks"
 msgstr ""
 
-#: computes/templates/computes/instances.html:41
-#: computes/templates/overview.html:28 interfaces/templates/interface.html:25
+#: computes/templates/computes/instances.html:39
+#: computes/templates/overview.html:27 interfaces/templates/interface.html:25
 #: interfaces/templates/interfaces.html:5
 #: interfaces/templates/interfaces.html:7
-#: interfaces/templates/interfaces.html:29 networks/templates/network.html:26
+#: interfaces/templates/interfaces.html:31 networks/templates/network.html:26
 #: networks/templates/networks.html:28 nwfilters/templates/nwfilter.html:26
-#: nwfilters/templates/nwfilters.html:34 secrets/templates/secrets.html:32
-#: storages/templates/storage.html:31 storages/templates/storages.html:28
+#: nwfilters/templates/nwfilters.html:32 storages/templates/storage.html:32
+#: storages/templates/storages.html:28 virtsecrets/templates/secrets.html:34
 msgid "Interfaces"
 msgstr ""
 
-#: computes/templates/computes/instances.html:44
-#: computes/templates/overview.html:31 interfaces/templates/interface.html:28
-#: interfaces/templates/interfaces.html:32 networks/templates/network.html:29
+#: computes/templates/computes/instances.html:42
+#: computes/templates/overview.html:30 interfaces/templates/interface.html:28
+#: interfaces/templates/interfaces.html:34 networks/templates/network.html:29
 #: networks/templates/networks.html:31 nwfilters/templates/nwfilter.html:29
 #: nwfilters/templates/nwfilters.html:5 nwfilters/templates/nwfilters.html:7
-#: nwfilters/templates/nwfilters.html:37 secrets/templates/secrets.html:35
-#: storages/templates/storage.html:34 storages/templates/storages.html:31
+#: nwfilters/templates/nwfilters.html:35 storages/templates/storage.html:35
+#: storages/templates/storages.html:31 virtsecrets/templates/secrets.html:37
 msgid "NWFilters"
 msgstr ""
 
-#: computes/templates/computes/instances.html:47
-#: computes/templates/overview.html:34 interfaces/templates/interface.html:31
-#: interfaces/templates/interfaces.html:35 networks/templates/network.html:32
+#: computes/templates/computes/instances.html:45
+#: computes/templates/overview.html:33 interfaces/templates/interface.html:31
+#: interfaces/templates/interfaces.html:37 networks/templates/network.html:32
 #: networks/templates/networks.html:34 nwfilters/templates/nwfilter.html:32
-#: nwfilters/templates/nwfilters.html:40 secrets/templates/secrets.html:4
-#: secrets/templates/secrets.html:10 secrets/templates/secrets.html:38
-#: storages/templates/create_stg_block.html:124
-#: storages/templates/storage.html:37 storages/templates/storages.html:34
+#: nwfilters/templates/nwfilters.html:38
+#: storages/templates/create_stg_block.html:138
+#: storages/templates/storage.html:38 storages/templates/storages.html:34
+#: virtsecrets/templates/secrets.html:4 virtsecrets/templates/secrets.html:10
+#: virtsecrets/templates/secrets.html:40
 msgid "Secrets"
 msgstr ""
 
-#: computes/templates/computes/instances.html:58
+#: computes/templates/computes/instances.html:56
 msgid "Hypervisor doesn't have any Instances"
 msgstr ""
 
-#: computes/templates/computes/instances.html:66
-#: computes/templates/computes/list.html:28
-#: instances/templates/add_instance_volume.html:40
-#: instances/templates/add_instance_volume.html:42
+#: computes/templates/computes/instances.html:63
+#: computes/templates/computes/list.html:27
+#: instances/templates/add_instance_volume.html:44
+#: instances/templates/add_instance_volume.html:46
 #: instances/templates/allinstances_index_grouped.html:7
 #: instances/templates/allinstances_index_nongrouped.html:5
-#: instances/templates/create_instance_w2.html:77
-#: instances/templates/create_instance_w2.html:103
-#: instances/templates/create_instance_w2.html:106
-#: instances/templates/create_instance_w2.html:305
-#: instances/templates/create_instance_w2.html:307
+#: instances/templates/create_instance_w2.html:76
+#: instances/templates/create_instance_w2.html:102
+#: instances/templates/create_instance_w2.html:105
+#: instances/templates/create_instance_w2.html:304
+#: instances/templates/create_instance_w2.html:306
 #: instances/templates/create_instance_w2.html:518
 #: instances/templates/create_instance_w2.html:520
-#: instances/templates/instances/settings_tab.html:340
-#: instances/templates/instances/snapshots_tab.html:47
+#: instances/templates/instances/settings_tab.html:353
+#: instances/templates/instances/snapshots_tab.html:39
 #: interfaces/templates/create_iface_block.html:18
 #: interfaces/templates/interface.html:75
 #: networks/templates/create_net_block.html:18
 #: networks/templates/modify_ipv4_fixed_address.html:30
 #: networks/templates/modify_ipv6_fixed_address.html:30
 #: networks/templates/network.html:174 networks/templates/network.html:283
-#: nwfilters/templates/nwfilter.html:41 nwfilters/templates/nwfilters.html:56
-#: nwfilters/templates/nwfilters.html:100
-#: nwfilters/templates/nwfilters.html:102
-#: storages/templates/create_stg_block.html:42
-#: storages/templates/create_stg_block.html:71
-#: storages/templates/create_stg_block.html:100
-#: storages/templates/create_stg_block.html:165
-#: storages/templates/create_stg_block.html:214
+#: nwfilters/templates/nwfilter.html:41 nwfilters/templates/nwfilters.html:54
+#: nwfilters/templates/nwfilters.html:98 nwfilters/templates/nwfilters.html:100
+#: storages/templates/create_stg_block.html:56
+#: storages/templates/create_stg_block.html:85
+#: storages/templates/create_stg_block.html:114
+#: storages/templates/create_stg_block.html:179
+#: storages/templates/create_stg_block.html:228
 #: storages/templates/create_stg_vol_block.html:21
-#: storages/templates/storage.html:96 storages/templates/storage.html:124
-#: storages/templates/storage.html:126
+#: storages/templates/storage.html:97 storages/templates/storage.html:125
+#: storages/templates/storage.html:127
 msgid "Name"
 msgstr ""
 
-#: computes/templates/computes/instances.html:66
+#: computes/templates/computes/instances.html:63
 #: instances/templates/allinstances_index_grouped.html:7
 #: instances/templates/allinstances_index_nongrouped.html:5
-#: instances/templates/instances/settings_tab.html:782
-#: instances/templates/instances/settings_tab.html:805
+#: instances/templates/instances/settings_tab.html:811
+#: instances/templates/instances/settings_tab.html:834
 msgid "Description"
 msgstr ""
 
-#: computes/templates/computes/instances.html:69
+#: computes/templates/computes/instances.html:66
 #: instances/templates/allinstances_index_grouped.html:10
 #: instances/templates/allinstances_index_nongrouped.html:10
-#: instances/templates/create_instance_w2.html:78
-#: instances/templates/create_instance_w2.html:323
+#: instances/templates/create_instance_w2.html:77
+#: instances/templates/create_instance_w2.html:322
 #: instances/templates/create_instance_w2.html:536
-#: instances/templates/instance.html:42 instances/templates/instance.html:44
+#: instances/templates/instance.html:43 instances/templates/instance.html:45
 msgid "VCPU"
 msgstr ""
 
-#: computes/templates/computes/instances.html:70
-#: computes/templates/overview.html:82
+#: computes/templates/computes/instances.html:67
+#: computes/templates/overview.html:80
 #: instances/templates/allinstances_index_grouped.html:11
 #: instances/templates/allinstances_index_nongrouped.html:11
-#: instances/templates/instances/resize_tab.html:13
+#: instances/templates/instances/resize_tab.html:12
 msgid "Memory"
 msgstr ""
 
-#: computes/templates/computes/instances.html:96
-#: instances/templates/allinstances_index_grouped.html:58
-#: instances/templates/allinstances_index_nongrouped.html:42
+#: computes/templates/computes/instances.html:93
+#: instances/templates/allinstances_index_grouped.html:60
+#: instances/templates/allinstances_index_nongrouped.html:43
 #: instances/templates/instance.html:16
 msgid "Off"
 msgstr ""
 
-#: computes/templates/computes/instances.html:98
-#: instances/templates/allinstances_index_grouped.html:60
-#: instances/templates/allinstances_index_nongrouped.html:44
+#: computes/templates/computes/instances.html:95
+#: instances/templates/allinstances_index_grouped.html:62
+#: instances/templates/allinstances_index_nongrouped.html:45
 msgid "Suspended"
 msgstr ""
 
@@ -1083,23 +989,24 @@ msgstr ""
 msgid "Computes"
 msgstr ""
 
-#: computes/templates/computes/list.html:20
+#: computes/templates/computes/list.html:19
 msgid "You don't have any computes"
 msgstr ""
 
-#: computes/templates/computes/list.html:30 computes/templates/overview.html:92
-#: instances/templates/instances/settings_tab.html:163
-#: instances/templates/instances/settings_tab.html:248
+#: computes/templates/computes/list.html:29 computes/templates/overview.html:90
+#: instances/templates/instances/settings_tab.html:176
+#: instances/templates/instances/settings_tab.html:215
+#: instances/templates/instances/settings_tab.html:263
 msgid "Details"
 msgstr ""
 
-#: computes/templates/computes/list.html:41
+#: computes/templates/computes/list.html:40
 #: instances/templates/allinstances_index_grouped.html:28
-#: instances/templates/instances/settings_tab.html:881
+#: instances/templates/instances/settings_tab.html:906
 msgid "Connected"
 msgstr ""
 
-#: computes/templates/computes/list.html:41
+#: computes/templates/computes/list.html:40
 msgid "Not Connected"
 msgstr ""
 
@@ -1123,67 +1030,69 @@ msgstr ""
 msgid "Add new host"
 msgstr ""
 
-#: computes/templates/overview.html:42
+#: computes/templates/overview.html:40
 msgid "Basic details"
 msgstr ""
 
-#: computes/templates/overview.html:44
-#: storages/templates/create_stg_block.html:171
+#: computes/templates/overview.html:42
+#: instances/templates/instances/info_tab.html:5
+#: storages/templates/create_stg_block.html:185
 msgid "Hostname"
 msgstr ""
 
-#: computes/templates/overview.html:46
+#: computes/templates/overview.html:44
 msgid "Hypervisors"
 msgstr ""
 
-#: computes/templates/overview.html:63
+#: computes/templates/overview.html:61
 msgid "more"
 msgstr ""
 
-#: computes/templates/overview.html:73
+#: computes/templates/overview.html:71
 msgid "Emulator"
 msgstr ""
 
-#: computes/templates/overview.html:75
+#: computes/templates/overview.html:73
+#: instances/templates/instances/info_tab.html:11
 msgid "Version"
 msgstr ""
 
-#: computes/templates/overview.html:77
+#: computes/templates/overview.html:75
 msgid "Qemu"
 msgstr ""
 
-#: computes/templates/overview.html:79
+#: computes/templates/overview.html:77
 msgid "Libvirt"
 msgstr ""
 
-#: computes/templates/overview.html:84
+#: computes/templates/overview.html:82
 #: instances/templates/create_instance_w1.html:36
-#: instances/templates/create_instance_w1.html:52
+#: instances/templates/create_instance_w1.html:50
 msgid "Architecture"
 msgstr ""
 
-#: computes/templates/overview.html:86
+#: computes/templates/overview.html:84
 msgid "Logical CPUs"
 msgstr ""
 
-#: computes/templates/overview.html:88
+#: computes/templates/overview.html:86
 msgid "Processor"
 msgstr ""
 
-#: computes/templates/overview.html:90
+#: computes/templates/overview.html:88
 msgid "Connection"
 msgstr ""
 
-#: computes/templates/overview.html:96
-#: instances/templates/edit_instance_volume.html:22
+#: computes/templates/overview.html:94
+#: instances/templates/instances/edit_instance_volume.html:25
 msgid "Performance"
 msgstr ""
 
-#: computes/templates/overview.html:102
+#: computes/templates/overview.html:100
 msgid "CPU Utilization"
 msgstr ""
 
-#: computes/templates/overview.html:111
+#: computes/templates/overview.html:109
 msgid "RAM Utilization"
 msgstr ""
 
@@ -1224,11 +1133,6 @@ msgstr ""
 msgid "File API is not supported"
 msgstr ""
 
-#: console/templates/console-spice-full.html:202
-#: instances/templates/allinstances_index_nongrouped.html:7
-msgid "Host"
-msgstr ""
-
 #: console/templates/console-spice-full.html:204
 msgid "Port"
 msgstr ""
@@ -1241,7 +1145,7 @@ msgstr ""
 #: interfaces/templates/interface.html:59 networks/templates/network.html:49
 #: networks/templates/network.html:119 networks/templates/network.html:125
 #: networks/templates/network.html:231 networks/templates/network.html:237
-#: storages/templates/storage.html:60
+#: storages/templates/storage.html:62
 msgid "Start"
 msgstr ""
 
@@ -1257,6 +1161,20 @@ msgstr ""
 msgid "Loading"
 msgstr ""
 
+#: console/views.py:52
+msgid ""
+"User does not have permission to access console or host/instance not exist"
+msgstr ""
+
+#: console/views.py:84
+msgid "Fail to get console. Please check the console configuration of your VM."
+msgstr ""
+
+#: console/views.py:86
+#, python-format
+msgid "Console type '%(type)s' has not support"
+msgstr ""
+
 #: instances/forms.py:37
 msgid "No Virtual Machine name has been entered"
 msgstr ""
@@ -1317,7 +1235,7 @@ msgstr ""
 msgid "created"
 msgstr ""
 
-#: instances/models.py:220
+#: instances/models.py:216
 msgid "Can access console without password"
 msgstr ""
 
@@ -1326,87 +1244,86 @@ msgid "Add Instance Network"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:18
-#: instances/templates/create_instance_w2.html:205
-#: instances/templates/instances/settings_tab.html:359
-#: instances/templates/instances/settings_tab.html:382
-#: instances/templates/instances/settings_tab.html:487
+#: instances/templates/create_instance_w2.html:182
+#: instances/templates/instances/settings_tab.html:373
+#: instances/templates/instances/settings_tab.html:409
+#: instances/templates/instances/settings_tab.html:521
 #: interfaces/templates/interface.html:45
 #: interfaces/templates/interface.html:74
-#: interfaces/templates/interfaces.html:63
+#: interfaces/templates/interfaces.html:64
 #: networks/templates/modify_ipv4_fixed_address.html:24
 #: networks/templates/network.html:172
 msgid "MAC"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:24
-#: instances/templates/create_instance_w2.html:164
-#: instances/templates/create_instance_w2.html:388
-#: instances/templates/create_instance_w2.html:605
-#: instances/templates/instances/settings_tab.html:30
-#: instances/templates/instances/settings_tab.html:394
+#: instances/templates/create_instance_w2.html:163
+#: instances/templates/create_instance_w2.html:387
+#: instances/templates/instances/settings_tab.html:36
+#: instances/templates/instances/settings_tab.html:421
 #: networks/templates/network.html:5 networks/templates/network.html:7
 #: networks/templates/network.html:107 networks/templates/network.html:218
 msgid "Network"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:37
-#: instances/templates/create_instance_w2.html:183
+#: instances/templates/create_instance_w2.html:188
 #: instances/templates/create_instance_w2.html:429
-#: instances/templates/create_instance_w2.html:642
-#: instances/templates/instances/settings_tab.html:403
+#: instances/templates/create_instance_w2.html:645
+#: instances/templates/instances/settings_tab.html:430
 #: nwfilters/templates/nwfilter.html:5 nwfilters/templates/nwfilter.html:7
 msgid "NWFilter"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:40
-#: instances/templates/add_instance_volume.html:117
+#: instances/templates/add_instance_volume.html:121
 #: instances/templates/create_inst_block.html:25
-#: instances/templates/create_instance_w2.html:158
-#: instances/templates/create_instance_w2.html:186
-#: instances/templates/create_instance_w2.html:377
+#: instances/templates/create_instance_w2.html:157
+#: instances/templates/create_instance_w2.html:191
+#: instances/templates/create_instance_w2.html:376
 #: instances/templates/create_instance_w2.html:432
 #: instances/templates/create_instance_w2.html:580
 #: instances/templates/create_instance_w2.html:599
-#: instances/templates/create_instance_w2.html:645
-#: instances/templates/instances/access_tab.html:135
-#: instances/templates/instances/settings_tab.html:183
-#: instances/templates/instances/settings_tab.html:407
-#: instances/templates/instances/stats_tab.html:90
+#: instances/templates/create_instance_w2.html:648
+#: instances/templates/instances/access_tab.html:123
+#: instances/templates/instances/settings_tab.html:191
+#: instances/templates/instances/settings_tab.html:434
+#: instances/templates/instances/stats_tab.html:93
 #: interfaces/templates/interface.html:41
-#: interfaces/templates/interface.html:43 nwfilters/templates/nwfilter.html:78
-#: storages/templates/create_stg_block.html:132
-#: storages/templates/storage.html:47 storages/templates/storage.html:49
-#: storages/templates/storage.html:51
+#: interfaces/templates/interface.html:43 nwfilters/templates/nwfilter.html:73
+#: storages/templates/create_stg_block.html:146
+#: storages/templates/storage.html:49 storages/templates/storage.html:51
+#: storages/templates/storage.html:53
 msgid "None"
 msgstr ""
 
 #: instances/templates/add_instance_network_block.html:49
 #: instances/templates/add_instance_owner_block.html:30
-#: instances/templates/add_instance_volume.html:89
-#: instances/templates/add_instance_volume.html:144
+#: instances/templates/add_instance_volume.html:93
+#: instances/templates/add_instance_volume.html:148
 #: instances/templates/create_flav_block.html:25
 #: instances/templates/create_inst_block.html:34
-#: instances/templates/create_instance_w2.html:269
-#: instances/templates/edit_instance_volume.html:123
-#: instances/templates/instances/settings_tab.html:428
-#: interfaces/templates/create_iface_block.html:135
+#: instances/templates/create_instance_w2.html:268
+#: instances/templates/instances/edit_instance_volume.html:110
+#: instances/templates/instances/settings_tab.html:455
+#: interfaces/templates/create_iface_block.html:139
 #: networks/templates/add_network_qos.html:50
 #: networks/templates/create_net_block.html:85
 #: networks/templates/modify_ipv4_fixed_address.html:44
 #: networks/templates/modify_ipv6_fixed_address.html:44
 #: nwfilters/templates/add_nwf_rule.html:25
-#: nwfilters/templates/create_nwfilter_block.html:23
-#: nwfilters/templates/nwfilters.html:80 nwfilters/templates/nwfilters.html:108
-#: secrets/templates/create_secret_block.html:54
-#: secrets/templates/secrets.html:102
-#: storages/templates/create_stg_block.html:55
-#: storages/templates/create_stg_block.html:84
-#: storages/templates/create_stg_block.html:140
-#: storages/templates/create_stg_block.html:202
-#: storages/templates/create_stg_block.html:230
+#: nwfilters/templates/create_nwfilter_block.html:25
+#: nwfilters/templates/nwfilters.html:78 nwfilters/templates/nwfilters.html:106
+#: storages/templates/create_stg_block.html:69
+#: storages/templates/create_stg_block.html:98
+#: storages/templates/create_stg_block.html:154
+#: storages/templates/create_stg_block.html:216
+#: storages/templates/create_stg_block.html:244
 #: storages/templates/create_stg_vol_block.html:28
 #: storages/templates/create_stg_vol_block.html:56
-#: storages/templates/storage.html:154
+#: storages/templates/storage.html:155
+#: virtsecrets/templates/create_secret_block.html:54
+#: virtsecrets/templates/secrets.html:103
 msgid "Close"
 msgstr ""
 
@@ -1415,8 +1332,8 @@ msgid "Add Instance Owner"
 msgstr ""
 
 #: instances/templates/add_instance_volume.html:3
-#: instances/templates/add_instance_volume.html:90
-#: instances/templates/add_instance_volume.html:145
+#: instances/templates/add_instance_volume.html:94
+#: instances/templates/add_instance_volume.html:149
 msgid "Add Volume"
 msgstr ""
 
@@ -1424,72 +1341,73 @@ msgstr ""
 msgid "Add Instance Volume"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:18
+#: instances/templates/add_instance_volume.html:19
 msgid "New Disk"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:21
+#: instances/templates/add_instance_volume.html:24
 msgid "Existing Disk"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:28
-#: instances/templates/add_instance_volume.html:98
+#: instances/templates/add_instance_volume.html:32
+#: instances/templates/add_instance_volume.html:102
 msgid "Volume parameters"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:30
-#: instances/templates/add_instance_volume.html:100
-#: instances/templates/create_instance_w2.html:149
+#: instances/templates/add_instance_volume.html:34
+#: instances/templates/add_instance_volume.html:104
+#: instances/templates/create_instance_w2.html:148
 #: instances/templates/create_instance_w2.html:591
-#: instances/templates/instances/settings_tab.html:237
+#: instances/templates/instances/settings_tab.html:252
 #: storages/templates/storage.html:4 storages/templates/storage.html:9
 msgid "Storage"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:46
-#: storages/templates/create_stg_block.html:183
-#: storages/templates/storage.html:99 storages/templates/storage.html:137
+#: instances/templates/add_instance_volume.html:50
+#: storages/templates/create_stg_block.html:197
+#: storages/templates/storage.html:100 storages/templates/storage.html:138
 msgid "Format"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:56
-#: storages/templates/storage.html:52 storages/templates/storage.html:98
-#: storages/templates/storages.html:62
+#: instances/templates/add_instance_volume.html:60
+#: storages/templates/storage.html:54 storages/templates/storage.html:99
+#: storages/templates/storages.html:61
 msgid "Size"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:60
-#: instances/templates/create_instance_w2.html:91
+#: instances/templates/add_instance_volume.html:64
+#: instances/templates/create_instance_w2.html:90
 msgid "GB"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:63
-#: instances/templates/add_instance_volume.html:123
-#: instances/templates/edit_instance_volume.html:53
-#: instances/templates/instances/settings_tab.html:168
+#: instances/templates/add_instance_volume.html:67
+#: instances/templates/add_instance_volume.html:127
+#: instances/templates/instances/edit_instance_volume.html:89
+#: instances/templates/instances/settings_tab.html:181
+#: instances/templates/instances/settings_tab.html:220
 msgid "Bus"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:73
-#: instances/templates/add_instance_volume.html:133
+#: instances/templates/add_instance_volume.html:77
+#: instances/templates/add_instance_volume.html:137
 msgid "Cache"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:83
-#: instances/templates/instances/settings_tab.html:760
-#: storages/templates/storage.html:147
+#: instances/templates/add_instance_volume.html:87
+#: instances/templates/instances/settings_tab.html:789
+#: storages/templates/storage.html:148
 msgid "Metadata"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:103
+#: instances/templates/add_instance_volume.html:107
 msgid "Select Pool"
 msgstr ""
 
-#: instances/templates/add_instance_volume.html:114
+#: instances/templates/add_instance_volume.html:118
 msgid "Volume"
 msgstr ""
 
-#: instances/templates/allinstances.html:24
+#: instances/templates/allinstances.html:22
 msgid "Problem occurred with host"
 msgstr ""
 
@@ -1538,39 +1456,39 @@ msgid "New instance on %(host)s "
 msgstr ""
 
 #: instances/templates/create_instance_w1.html:41
-#: instances/templates/instances/settings_tab.html:49
+#: instances/templates/instances/settings_tab.html:55
 #: networks/templates/network.html:72 nwfilters/templates/nwfilter.html:49
 msgid "XML"
 msgstr ""
 
-#: instances/templates/create_instance_w1.html:62
+#: instances/templates/create_instance_w1.html:60
 msgid "Chipset"
 msgstr ""
 
-#: instances/templates/create_instance_w1.html:72
+#: instances/templates/create_instance_w1.html:70
 msgid "Next"
 msgstr ""
 
-#: instances/templates/create_instance_w1.html:89
-#: instances/templates/create_instance_w2.html:271
-#: instances/templates/create_instance_w2.html:273
+#: instances/templates/create_instance_w1.html:85
+#: instances/templates/create_instance_w2.html:270
+#: instances/templates/create_instance_w2.html:272
 #: instances/templates/create_instance_w2.html:500
 #: instances/templates/create_instance_w2.html:504
-#: instances/templates/create_instance_w2.html:713
-#: instances/templates/create_instance_w2.html:717
-#: interfaces/templates/create_iface_block.html:138
+#: instances/templates/create_instance_w2.html:716
+#: instances/templates/create_instance_w2.html:720
+#: interfaces/templates/create_iface_block.html:142
 #: networks/templates/create_net_block.html:86
 #: networks/templates/modify_ipv4_fixed_address.html:45
 #: networks/templates/modify_ipv6_fixed_address.html:45
-#: nwfilters/templates/create_nwfilter_block.html:24
-#: secrets/templates/create_secret_block.html:55
-#: storages/templates/create_stg_block.html:56
-#: storages/templates/create_stg_block.html:85
-#: storages/templates/create_stg_block.html:144
-#: storages/templates/create_stg_block.html:148
-#: storages/templates/create_stg_block.html:205
-#: storages/templates/create_stg_block.html:233
+#: nwfilters/templates/create_nwfilter_block.html:26
+#: storages/templates/create_stg_block.html:70
+#: storages/templates/create_stg_block.html:99
+#: storages/templates/create_stg_block.html:158
+#: storages/templates/create_stg_block.html:162
+#: storages/templates/create_stg_block.html:219
+#: storages/templates/create_stg_block.html:247
 #: storages/templates/create_stg_vol_block.html:57
+#: virtsecrets/templates/create_secret_block.html:55
 msgid "Create"
 msgstr ""
 
@@ -1586,113 +1504,113 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:66
-msgid "Hypervisor doesn't have any Flavors"
-msgstr ""
-
-#: instances/templates/create_instance_w2.html:71
+#: instances/templates/create_instance_w2.html:63
 msgid "Create from flavor"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:79
-#: instances/templates/create_instance_w2.html:352
+#: instances/templates/create_instance_w2.html:67
+msgid "Hypervisor doesn't have any Flavors"
+msgstr ""
+
+#: instances/templates/create_instance_w2.html:78
+#: instances/templates/create_instance_w2.html:351
 #: instances/templates/create_instance_w2.html:563
-#: instances/templates/instance.html:47
+#: instances/templates/instance.html:48
 msgid "RAM"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:80
-#: instances/templates/create_instance_w2.html:367
+#: instances/templates/create_instance_w2.html:79
+#: instances/templates/create_instance_w2.html:366
 msgid "HDD"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:90
-#: instances/templates/create_instance_w2.html:356
+#: instances/templates/create_instance_w2.html:89
+#: instances/templates/create_instance_w2.html:355
 #: instances/templates/create_instance_w2.html:567
-#: instances/templates/instance.html:47
+#: instances/templates/instance.html:48
 #: instances/templates/instances/resize_tab.html:95
-#: instances/templates/instances/resize_tab.html:108
+#: instances/templates/instances/resize_tab.html:109
 msgid "MB"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:97
+#: instances/templates/create_instance_w2.html:96
 msgid "Create Virtual Machine"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:115
-#: instances/templates/create_instance_w2.html:312
+#: instances/templates/create_instance_w2.html:114
+#: instances/templates/create_instance_w2.html:311
 #: instances/templates/create_instance_w2.html:525
 msgid "Firmware"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:127
-#: instances/templates/create_instance_w2.html:330
+#: instances/templates/create_instance_w2.html:126
+#: instances/templates/create_instance_w2.html:329
 #: instances/templates/create_instance_w2.html:542
 msgid "VCPU Config"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:130
-#: instances/templates/create_instance_w2.html:333
+#: instances/templates/create_instance_w2.html:129
+#: instances/templates/create_instance_w2.html:332
 #: instances/templates/create_instance_w2.html:545
 msgid "no-mode"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:174
+#: instances/templates/create_instance_w2.html:173
 #: instances/templates/create_instance_w2.html:402
-#: instances/templates/create_instance_w2.html:615
-#: instances/templates/edit_instance_volume.html:25
+#: instances/templates/create_instance_w2.html:618
+#: instances/templates/instances/edit_instance_volume.html:30
 msgid "Advanced"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:194
-#: instances/templates/create_instance_w2.html:631
+#: instances/templates/create_instance_w2.html:199
+#: instances/templates/create_instance_w2.html:634
 msgid "HDD cache mode"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:212
+#: instances/templates/create_instance_w2.html:211
 #: instances/templates/create_instance_w2.html:441
-#: instances/templates/create_instance_w2.html:654
+#: instances/templates/create_instance_w2.html:657
 msgid "Graphics"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:223
+#: instances/templates/create_instance_w2.html:222
 #: instances/templates/create_instance_w2.html:452
-#: instances/templates/create_instance_w2.html:665
+#: instances/templates/create_instance_w2.html:668
 msgid "Video"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:237
+#: instances/templates/create_instance_w2.html:236
 #: instances/templates/create_instance_w2.html:466
-#: instances/templates/create_instance_w2.html:679
+#: instances/templates/create_instance_w2.html:682
 msgid "Console Access"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:247
-#: instances/templates/create_instance_w2.html:249
+#: instances/templates/create_instance_w2.html:246
+#: instances/templates/create_instance_w2.html:248
 #: instances/templates/create_instance_w2.html:476
 #: instances/templates/create_instance_w2.html:478
-#: instances/templates/create_instance_w2.html:689
-#: instances/templates/create_instance_w2.html:691
+#: instances/templates/create_instance_w2.html:692
+#: instances/templates/create_instance_w2.html:694
 msgid "Console Password"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:253
+#: instances/templates/create_instance_w2.html:252
 #: instances/templates/create_instance_w2.html:482
-#: instances/templates/create_instance_w2.html:695
+#: instances/templates/create_instance_w2.html:698
 msgid "Guest Agent"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:260
+#: instances/templates/create_instance_w2.html:259
 #: instances/templates/create_instance_w2.html:489
-#: instances/templates/create_instance_w2.html:702
+#: instances/templates/create_instance_w2.html:705
 msgid "VirtIO"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:287
-#: instances/templates/instances/settings_tab.html:439
-#: instances/templates/instances/settings_tab.html:515
-#: instances/templates/instances/settings_tab.html:525
-#: instances/templates/instances/snapshots_tab.html:75
+#: instances/templates/create_instance_w2.html:286
+#: instances/templates/instances/settings_tab.html:473
+#: instances/templates/instances/settings_tab.html:549
+#: instances/templates/instances/settings_tab.html:559
+#: instances/templates/instances/snapshots_tab.html:67
 #: interfaces/templates/interface.html:60
 #: interfaces/templates/interface.html:62 networks/templates/network.html:50
 #: networks/templates/network.html:52 networks/templates/network.html:62
@@ -1700,35 +1618,35 @@ msgstr ""
 #: networks/templates/network.html:194 networks/templates/network.html:249
 #: networks/templates/network.html:298 networks/templates/network.html:303
 #: networks/templates/network.html:353 networks/templates/network.html:358
-#: nwfilters/templates/nwfilter.html:111 nwfilters/templates/nwfilter.html:151
-#: nwfilters/templates/nwfilters.html:120 secrets/templates/secrets.html:77
-#: storages/templates/storage.html:62 storages/templates/storage.html:65
-#: storages/templates/storage.html:77 storages/templates/storage.html:174
+#: nwfilters/templates/nwfilter.html:103 nwfilters/templates/nwfilter.html:143
+#: nwfilters/templates/nwfilters.html:118 storages/templates/storage.html:64
+#: storages/templates/storage.html:67 storages/templates/storage.html:79
+#: storages/templates/storage.html:175 virtsecrets/templates/secrets.html:78
 msgid "Are you sure?"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:359
+#: instances/templates/create_instance_w2.html:358
 msgid "Added Disks"
 msgstr ""
 
-#: instances/templates/create_instance_w2.html:372
+#: instances/templates/create_instance_w2.html:371
 #: instances/templates/create_instance_w2.html:575
 msgid "Select pool"
 msgstr ""
 
 #: instances/templates/create_instance_w2.html:411
-#: instances/templates/create_instance_w2.html:624
+#: instances/templates/create_instance_w2.html:627
 msgid "Disk Metadata"
 msgstr ""
 
 #: instances/templates/create_instance_w2.html:413
-#: instances/templates/create_instance_w2.html:626
+#: instances/templates/create_instance_w2.html:629
 msgid "Metadata preallocation"
 msgstr ""
 
 #: instances/templates/create_instance_w2.html:415
-#: instances/templates/create_instance_w2.html:628
-#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:360
+#: instances/templates/create_instance_w2.html:631
+#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:375
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/files.py:391
 msgid "Image"
 msgstr ""
@@ -1741,64 +1659,16 @@ msgstr ""
 msgid "Template Disk"
 msgstr ""
 
-#: instances/templates/edit_instance_volume.html:3
-msgid "Edit Volume"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:12
-msgid "Edit Instance Volume"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:19
-msgid "Virtual Disk"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:32
-msgid "Volume Path"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:38
-msgid "Readonly"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:44
-msgid "Shareable"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:63
-msgid "Serial Number"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:69
-msgid "Storage Format"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:78
-msgid "Cache mode"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:88
-msgid "IO mode"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:98
-msgid "Discard mode"
-msgstr ""
-
-#: instances/templates/edit_instance_volume.html:108
-msgid "Detect zeroes"
+#: instances/templates/create_instance_w2.html:605
+msgid "Network/MAC"
 msgstr ""
 
 #: instances/templates/instance.html:22
 #: instances/templates/instance_actions.html:14
 #: instances/templates/instance_actions.html:25
 #: instances/templates/instance_actions.html:37
-#: instances/templates/instances/power_tab.html:25
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:82 instances/views.py:270
-=======
-#: instances/templates/instances/power_tab.html:82 instances/views.py:264
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:24
+#: instances/templates/instances/power_tab.html:81 instances/views.py:277
 msgid "Suspend"
 msgstr ""
 
@@ -1814,92 +1684,80 @@ msgstr ""
 msgid "Guest Agent Not Enabled & Not Connected"
 msgstr ""
 
-#: instances/templates/instance.html:50
-#: instances/templates/instances/resize_tab.html:18
-#: instances/templates/instances/settings_tab.html:16
+#: instances/templates/instance.html:51
+#: instances/templates/instances/resize_tab.html:17
+#: instances/templates/instances/settings_tab.html:22
 msgid "Disk"
 msgstr ""
 
-#: instances/templates/instance.html:57
+#: instances/templates/instance.html:59
+msgid "Show Instance OS details"
+msgstr ""
+
+#: instances/templates/instance.html:63
 msgid "Refresh instance info"
 msgstr ""
 
-#: instances/templates/instance.html:61
+#: instances/templates/instance.html:69
 msgid "quota reached"
 msgstr ""
 
-#: instances/templates/instance.html:75
+#: instances/templates/instance.html:81
 msgid "Power"
 msgstr ""
 
-#: instances/templates/instance.html:81
+#: instances/templates/instance.html:87
 msgid "Access"
 msgstr ""
 
-#: instances/templates/instance.html:94
+#: instances/templates/instance.html:100
 msgid "Snapshot"
 msgstr ""
 
-#: instances/templates/instance.html:101 templates/navbar.html:32
+#: instances/templates/instance.html:107 templates/navbar.html:32
 msgid "Settings"
 msgstr ""
 
-#: instances/templates/instance.html:107
+#: instances/templates/instance.html:113
 msgid "Stats"
 msgstr ""
 
-#: instances/templates/instance.html:113
-#: instances/templates/instances/destroy_instance_form.html:40
-#: instances/templates/instances/destroy_tab.html:18
-#: instances/templates/instances/destroy_tab.html:20
-<<<<<<< HEAD
-#: instances/templates/instances/destroy_tab.html:23 instances/views.py:312
-=======
-#: instances/templates/instances/destroy_tab.html:23 instances/views.py:306
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instance.html:119
+#: instances/templates/instances/destroy_instance_form.html:35
+#: instances/templates/instances/destroy_tab.html:17
+#: instances/templates/instances/destroy_tab.html:19
+#: instances/templates/instances/destroy_tab.html:22 instances/views.py:319
 msgid "Destroy"
 msgstr ""
 
 #: instances/templates/instance_actions.html:6
-#: instances/templates/instances/settings_tab.html:37
-#: instances/templates/instances/settings_tab.html:788
-#: instances/templates/instances/settings_tab.html:790
-#: nwfilters/templates/nwfilters.html:109
-#: nwfilters/templates/nwfilters.html:115 storages/templates/storage.html:155
-#: storages/templates/storage.html:162
+#: instances/templates/instances/settings_tab.html:43
+#: instances/templates/instances/settings_tab.html:817
+#: instances/templates/instances/settings_tab.html:819
+#: nwfilters/templates/nwfilters.html:107
+#: nwfilters/templates/nwfilters.html:113 storages/templates/storage.html:156
+#: storages/templates/storage.html:163
 msgid "Clone"
 msgstr ""
 
 #: instances/templates/instance_actions.html:10
 #: instances/templates/instance_actions.html:35
-#: instances/templates/instances/power_tab.html:47
-#: instances/templates/instances/power_tab.html:121
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:123 instances/views.py:245
-=======
-#: instances/templates/instances/power_tab.html:123 instances/views.py:239
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:46
+#: instances/templates/instances/power_tab.html:120
+#: instances/templates/instances/power_tab.html:122 instances/views.py:252
 msgid "Power On"
 msgstr ""
 
 #: instances/templates/instance_actions.html:15
-#: instances/templates/instances/power_tab.html:9
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:59 instances/views.py:261
-=======
-#: instances/templates/instances/power_tab.html:59 instances/views.py:255
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:8
+#: instances/templates/instances/power_tab.html:58 instances/views.py:268
 msgid "Power Off"
 msgstr ""
 
 #: instances/templates/instance_actions.html:16
 #: instances/templates/instance_actions.html:29
-#: instances/templates/instances/power_tab.html:14
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:66 instances/views.py:254
-=======
-#: instances/templates/instances/power_tab.html:66 instances/views.py:248
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:13
+#: instances/templates/instances/power_tab.html:65 instances/views.py:261
 msgid "Power Cycle"
 msgstr ""
 
@@ -1909,120 +1767,112 @@ msgid "VNC Console"
 msgstr ""
 
 #: instances/templates/instance_actions.html:22
-#: instances/templates/instances/power_tab.html:34
-#: instances/templates/instances/power_tab.html:93
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:108 instances/views.py:278
-=======
-#: instances/templates/instances/power_tab.html:108 instances/views.py:272
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:33
+#: instances/templates/instances/power_tab.html:92
+#: instances/templates/instances/power_tab.html:107 instances/views.py:285
 msgid "Resume"
 msgstr ""
 
 #: instances/templates/instance_actions.html:26
-#: instances/templates/instances/power_tab.html:19
-#: instances/templates/instances/power_tab.html:39
-#: instances/templates/instances/power_tab.html:74
-<<<<<<< HEAD
-#: instances/templates/instances/power_tab.html:100 instances/views.py:285
-=======
-#: instances/templates/instances/power_tab.html:100 instances/views.py:279
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/templates/instances/power_tab.html:18
+#: instances/templates/instances/power_tab.html:38
+#: instances/templates/instances/power_tab.html:73
+#: instances/templates/instances/power_tab.html:99 instances/views.py:292
 msgid "Force Off"
 msgstr ""
 
 #: instances/templates/instance_actions.html:41
-#: instances/templates/instances/access_tab.html:9
-#: instances/templates/instances/access_tab.html:79
-#: instances/templates/instances/access_tab.html:87
-#: instances/templates/instances/access_tab.html:90
-#: instances/templates/instances/access_tab.html:94
-#: instances/templates/instances/settings_tab.html:23
+#: instances/templates/instances/access_tab.html:7
+#: instances/templates/instances/access_tab.html:67
+#: instances/templates/instances/access_tab.html:75
+#: instances/templates/instances/access_tab.html:78
+#: instances/templates/instances/access_tab.html:82
+#: instances/templates/instances/settings_tab.html:29
 msgid "Console"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:16
+#: instances/templates/instances/access_tab.html:13
 msgid "Root Password"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:31
-#: instances/templates/instances/access_tab.html:156
+#: instances/templates/instances/access_tab.html:27
+#: instances/templates/instances/access_tab.html:143
 msgid "VDI"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:39
+#: instances/templates/instances/access_tab.html:35
 #, python-format
 msgid ""
 " This action opens a new window with a %(type)s connection to the console of "
 "the instance."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:47
+#: instances/templates/instances/access_tab.html:42
 msgid "Scale"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:55
+#: instances/templates/instances/access_tab.html:48
 msgid "View Only"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:63
+#: instances/templates/instances/access_tab.html:54
 msgid "Resize Session"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:71
+#: instances/templates/instances/access_tab.html:60
 msgid "View Clipboard"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:82
+#: instances/templates/instances/access_tab.html:70
 msgid "Toggle Dropdown"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:86
-#: instances/templates/instances/access_tab.html:89
+#: instances/templates/instances/access_tab.html:74
+#: instances/templates/instances/access_tab.html:77
 msgid "Console port"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:87
+#: instances/templates/instances/access_tab.html:75
 msgid "Lite"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:90
+#: instances/templates/instances/access_tab.html:78
 msgid "Full"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:100
+#: instances/templates/instances/access_tab.html:88
 msgid "You need shut down your instance and enter a new root password."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:107
+#: instances/templates/instances/access_tab.html:95
 msgid "Enter Password"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:112
-#: instances/templates/instances/access_tab.html:115
+#: instances/templates/instances/access_tab.html:100
+#: instances/templates/instances/access_tab.html:103
 msgid "Reset Root Password"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:123
+#: instances/templates/instances/access_tab.html:111
 msgid "You need shut down your instance and choose your public key."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:142
-#: instances/templates/instances/access_tab.html:144
+#: instances/templates/instances/access_tab.html:130
+#: instances/templates/instances/access_tab.html:132
 msgid "Add Public Key"
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:152
+#: instances/templates/instances/access_tab.html:140
 msgid ""
 "This action opens a remote viewer with a connection to the console of the "
 "instance."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:159
+#: instances/templates/instances/access_tab.html:145
 msgid "To download console.vv file for virt-viewer."
 msgstr ""
 
-#: instances/templates/instances/access_tab.html:160
+#: instances/templates/instances/access_tab.html:146
 msgid "Get console.vv"
 msgstr ""
 
@@ -2042,114 +1892,190 @@ msgstr ""
 msgid "This action is irreversible!"
 msgstr ""
 
-#: instances/templates/instances/destroy_instance_form.html:26
+#: instances/templates/instances/destroy_instance_form.html:24
 msgid "Remove Instance's data"
 msgstr ""
 
-#: instances/templates/instances/destroy_instance_form.html:34
+#: instances/templates/instances/destroy_instance_form.html:30
 msgid "Remove Instance's NVRAM"
 msgstr ""
 
-#: instances/templates/instances/destroy_instance_form.html:46
+#: instances/templates/instances/destroy_instance_form.html:41
 msgid "You cannot destroy instance!"
 msgstr ""
 
-#: instances/templates/instances/destroy_tab.html:8
+#: instances/templates/instances/destroy_tab.html:7
 msgid "Destroy Instance"
 msgstr ""
 
-#: instances/templates/instances/destroy_tab.html:15
+#: instances/templates/instances/destroy_tab.html:14
 msgid "This action starts remove instance process"
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:56
+#: instances/templates/instances/edit_instance_volume.html:3
+msgid "Edit Volume"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:12
+msgid "Edit Instance Volume"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:20
+msgid "Virtual Disk"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:38
+msgid "Volume Path"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:42
+msgid "Readonly"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:46
+msgid "Shareable"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:53
+msgid "Cache mode"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:61
+msgid "IO mode"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:69
+msgid "Discard mode"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:77
+msgid "Detect zeroes"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:97
+msgid "Serial Number"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:101
+msgid "Storage Format"
+msgstr ""
+
+#: instances/templates/instances/edit_instance_volume.html:111
+msgid "Are you sure to change volume properties?"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:3
+msgid "Guest Info"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:7
+msgid "OS Name"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:9
+msgid "OS Pretty-Name"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:13
+msgid "Kernel Release"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:15
+msgid "Kernel Version"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:17
+msgid "Timezone / Offset"
+msgstr ""
+
+#: instances/templates/instances/power_tab.html:55
 msgid "This action sends an ACPI shutdown signal to the instance."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:64
+#: instances/templates/instances/power_tab.html:63
 msgid ""
 "This action forcibly powers off and start the instance and may cause data "
 "corruption."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:71
-#: instances/templates/instances/power_tab.html:98
+#: instances/templates/instances/power_tab.html:70
+#: instances/templates/instances/power_tab.html:97
 msgid ""
 "This action forcibly powers off the instance and may cause data corruption."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:80
+#: instances/templates/instances/power_tab.html:79
 msgid "This action suspends the instance."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:91
+#: instances/templates/instances/power_tab.html:90
 msgid "This action restore the instance after suspend."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:106
+#: instances/templates/instances/power_tab.html:105
 msgid "Administrator blocked your instance."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:116
+#: instances/templates/instances/power_tab.html:115
 msgid "Click on Power On button to start this instance."
 msgstr ""
 
-#: instances/templates/instances/power_tab.html:120
+#: instances/templates/instances/power_tab.html:119
 msgid "Template instance cannot be started."
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:8
+#: instances/templates/instances/resize_tab.html:7
 msgid "CPU"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:29
+#: instances/templates/instances/resize_tab.html:28
 msgid "Logical host CPUs"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:31
+#: instances/templates/instances/resize_tab.html:30
 #: instances/templates/instances/resize_tab.html:95
 #: instances/templates/instances/resize_tab.html:136
 msgid "Current Allocation"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:45
-#: instances/templates/instances/resize_tab.html:108
+#: instances/templates/instances/resize_tab.html:44
+#: instances/templates/instances/resize_tab.html:109
 msgid "Maximum Allocation"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:63
+#: instances/templates/instances/resize_tab.html:62
 msgid "Logical Instance Active/Maximum CPUs"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:71
-#: instances/templates/instances/settings_tab.html:79
-#: instances/templates/instances/settings_tab.html:95
-#: networks/templates/network.html:62 storages/templates/storage.html:77
+#: instances/templates/instances/resize_tab.html:70
+#: instances/templates/instances/settings_tab.html:86
+#: instances/templates/instances/settings_tab.html:102
+#: networks/templates/network.html:62 storages/templates/storage.html:79
 msgid "Disable"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:73
+#: instances/templates/instances/resize_tab.html:72
 msgid "Constant"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:75
-#: instances/templates/instances/settings_tab.html:77
-#: instances/templates/instances/settings_tab.html:91
-#: networks/templates/network.html:60 storages/templates/storage.html:74
+#: instances/templates/instances/resize_tab.html:74
+#: instances/templates/instances/settings_tab.html:84
+#: instances/templates/instances/settings_tab.html:98
+#: networks/templates/network.html:60 storages/templates/storage.html:76
 msgid "Enable"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:84
+#: instances/templates/instances/resize_tab.html:83
 #: instances/templates/instances/resize_tab.html:124
 #: instances/templates/instances/resize_tab.html:157
 msgid "You don't have permission for resizing instance"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:93
+#: instances/templates/instances/resize_tab.html:92
 msgid "Total host memory"
 msgstr ""
 
-#: instances/templates/instances/resize_tab.html:103
+#: instances/templates/instances/resize_tab.html:104
 #: instances/templates/instances/resize_tab.html:118
 msgid "Custom value"
 msgstr ""
@@ -2159,457 +2085,450 @@ msgid "Disk allocation (GB)"
 msgstr ""
 
 #: instances/templates/instances/resize_tab.html:140
-#: instances/templates/instances/settings_tab.html:269
+#: instances/templates/instances/settings_tab.html:284
 msgid "Error getting disk info"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:11
+#: instances/templates/instances/settings_tab.html:17
 msgid "Boot"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:44
-#: instances/templates/instances/settings_tab.html:621
-#: instances/templates/instances/settings_tab.html:623
+#: instances/templates/instances/settings_tab.html:50
+#: instances/templates/instances/settings_tab.html:655
+#: instances/templates/instances/settings_tab.html:657
 msgid "Migrate"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:56
+#: instances/templates/instances/settings_tab.html:62
+#: venv/lib/python3.6/site-packages/click/core.py:1351
 msgid "Options"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:72
-#: networks/templates/network.html:56 storages/templates/storage.html:69
+#: instances/templates/instances/settings_tab.html:79
+#: networks/templates/network.html:56 storages/templates/storage.html:71
 msgid "Autostart"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:75
+#: instances/templates/instances/settings_tab.html:82
 msgid "Autostart your instance when host server is power on "
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:84
+#: instances/templates/instances/settings_tab.html:91
 msgid "Boot Order"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:88
+#: instances/templates/instances/settings_tab.html:95
 msgid "Enable Boot Menu for your instance when it starts up "
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:91
+#: instances/templates/instances/settings_tab.html:98
 msgid "Show boot menu"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:95
+#: instances/templates/instances/settings_tab.html:102
 msgid "Hide boot menu"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:100
+#: instances/templates/instances/settings_tab.html:107
 msgid "Please shutdown instance to modify boot menu"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:130
+#: instances/templates/instances/settings_tab.html:137
 msgid "up: move selected devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:133
+#: instances/templates/instances/settings_tab.html:140
 msgid "down: move selected devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:139
-#: instances/templates/instances/settings_tab.html:429
+#: instances/templates/instances/settings_tab.html:146
+#: instances/templates/instances/settings_tab.html:456
 msgid "Apply"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:149
+#: instances/templates/instances/settings_tab.html:156
 msgid "Instance Media"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:152
+#: instances/templates/instances/settings_tab.html:159
 msgid "Add CD-ROM"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:169
-#: instances/templates/instances/settings_tab.html:234
+#: instances/templates/instances/settings_tab.html:182
+#: instances/templates/instances/settings_tab.html:221
+#: instances/templates/instances/settings_tab.html:249
 #: interfaces/templates/create_iface_block.html:34
-#: networks/templates/network.html:43 networks/templates/networks.html:59
-#: storages/templates/create_stg_block.html:77
+#: networks/templates/network.html:43 networks/templates/networks.html:58
+#: storages/templates/create_stg_block.html:91
 msgid "Device"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:170
+#: instances/templates/instances/settings_tab.html:183
+#: instances/templates/instances/settings_tab.html:222
 msgid "CD-ROM"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:188
-#: instances/templates/instances/settings_tab.html:190
+#: instances/templates/instances/settings_tab.html:196
+#: instances/templates/instances/settings_tab.html:198
 msgid "Mount"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:193
+#: instances/templates/instances/settings_tab.html:201
 msgid "Detach CD-ROM (remove device)"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:208
-#: instances/templates/instances/settings_tab.html:210
+#: instances/templates/instances/settings_tab.html:227
+#: instances/templates/instances/settings_tab.html:229
 msgid "Unmount"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:220
+#: instances/templates/instances/settings_tab.html:238
 msgid "There is not any CD-ROM device."
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:225
+#: instances/templates/instances/settings_tab.html:243
 msgid "Instance Volume"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:235
+#: instances/templates/instances/settings_tab.html:250
 msgid "Used"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:236
+#: instances/templates/instances/settings_tab.html:251
 msgid "Capacity"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:238
-#: instances/templates/instances/settings_tab.html:363
+#: instances/templates/instances/settings_tab.html:253
+#: instances/templates/instances/settings_tab.html:385
 msgid "Source"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:294
-#: instances/templates/instances/settings_tab.html:298
+#: instances/templates/instances/settings_tab.html:309
+#: instances/templates/instances/settings_tab.html:313
 msgid "Detach"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:294
+#: instances/templates/instances/settings_tab.html:309
 msgid "Are you sure to detach volume?"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:298
-#: instances/templates/instances/settings_tab.html:314
+#: instances/templates/instances/settings_tab.html:313
+#: instances/templates/instances/settings_tab.html:329
 msgid "Are you sure? This may lead data corruption!"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:310
+#: instances/templates/instances/settings_tab.html:325
 msgid "Are you sure to delete volume?"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:330
+#: instances/templates/instances/settings_tab.html:343
 msgid "Add a network device"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:336
+#: instances/templates/instances/settings_tab.html:349
 msgid "Network Devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:341
-#: instances/templates/instances/settings_tab.html:342
+#: instances/templates/instances/settings_tab.html:354
 msgid "Info"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:355
+#: instances/templates/instances/settings_tab.html:367
 msgid "active"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:361
-#: nwfilters/templates/nwfilter.html:75
+#: instances/templates/instances/settings_tab.html:379
+#: nwfilters/templates/nwfilter.html:71
 msgid "Filter"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:368
+#: instances/templates/instances/settings_tab.html:393
 msgid "Edit NIC"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:376
+#: instances/templates/instances/settings_tab.html:403
 msgid "Edit Instance Network"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:389
+#: instances/templates/instances/settings_tab.html:416
 msgid "Net Source"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:397
+#: instances/templates/instances/settings_tab.html:424
 #: interfaces/templates/interface.html:4 interfaces/templates/interface.html:6
 #: interfaces/templates/interface.html:39
 msgid "Interface"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:415
-#: instances/templates/instances/settings_tab.html:454
+#: instances/templates/instances/settings_tab.html:442
+#: instances/templates/instances/settings_tab.html:494
 msgid "Model"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:429
+#: instances/templates/instances/settings_tab.html:456
 msgid "Apply network changes"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:438
+#: instances/templates/instances/settings_tab.html:472
 msgid "Delete Device"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:446
-#: interfaces/templates/create_iface_block.html:71
+#: instances/templates/instances/settings_tab.html:482
+#: interfaces/templates/create_iface_block.html:72
 #: interfaces/templates/interface.html:41
 msgid "IPv4"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:450
-#: interfaces/templates/create_iface_block.html:74
+#: instances/templates/instances/settings_tab.html:488
+#: interfaces/templates/create_iface_block.html:77
 #: interfaces/templates/interface.html:43
 msgid "IPv6"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:456
-msgid "QoS"
-msgstr ""
-
-#: instances/templates/instances/settings_tab.html:468
+#: instances/templates/instances/settings_tab.html:502
 msgid ""
 "In most configurations, macvtap does not work for host to guest network "
 "communication"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:481
+#: instances/templates/instances/settings_tab.html:515
 #: networks/templates/network.html:322
 msgid "QoS Configuration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:487
+#: instances/templates/instances/settings_tab.html:521
 #: networks/templates/add_network_qos.html:18
-#: networks/templates/network.html:328 nwfilters/templates/nwfilter.html:131
+#: networks/templates/network.html:328 nwfilters/templates/nwfilter.html:123
 msgid "Direction"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:488
+#: instances/templates/instances/settings_tab.html:522
 #: networks/templates/add_network_qos.html:27
 #: networks/templates/network.html:329
 msgid "Average"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:489
+#: instances/templates/instances/settings_tab.html:523
 #: networks/templates/add_network_qos.html:34
 #: networks/templates/network.html:330
 msgid "Peak"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:490
+#: instances/templates/instances/settings_tab.html:524
 #: networks/templates/add_network_qos.html:41
 #: networks/templates/network.html:331
 msgid "Burst"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:515
+#: instances/templates/instances/settings_tab.html:549
 #: networks/templates/network.html:353
 msgid "Edit QoS"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:525
+#: instances/templates/instances/settings_tab.html:559
 #: networks/templates/network.html:358
 msgid "Delete QoS"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:541
+#: instances/templates/instances/settings_tab.html:575
 msgid "For migration both host servers must have equal settings and OS type"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:545
+#: instances/templates/instances/settings_tab.html:579
 msgid "Original host"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:551
+#: instances/templates/instances/settings_tab.html:585
 msgid "Host migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:568
+#: instances/templates/instances/settings_tab.html:602
 msgid "Live migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:576
+#: instances/templates/instances/settings_tab.html:610
 msgid "Unsafe migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:584
+#: instances/templates/instances/settings_tab.html:618
 msgid "Delete original"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:592
+#: instances/templates/instances/settings_tab.html:626
 msgid "Offline migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:600
+#: instances/templates/instances/settings_tab.html:634
 msgid "Post copy"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:608
+#: instances/templates/instances/settings_tab.html:642
 msgid "Forces CPU convergence during live migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:608
+#: instances/templates/instances/settings_tab.html:642
 msgid "Auto converge"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:616
+#: instances/templates/instances/settings_tab.html:650
 msgid "Compress instance memory for fast migration"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:616
+#: instances/templates/instances/settings_tab.html:650
 msgid "Compressed"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:629
+#: instances/templates/instances/settings_tab.html:663
 msgid "If you need to edit XML please Power Off the instance"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:651
+#: instances/templates/instances/settings_tab.html:685
 msgid "Instance owners"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:680
+#: instances/templates/instances/settings_tab.html:714
 msgid "To change console settings, shutdown the instance."
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:697
+#: instances/templates/instances/settings_tab.html:731
 msgid "Create a clone"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:700
+#: instances/templates/instances/settings_tab.html:734
 msgid "Clone Name"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:707
-#: instances/templates/instances/settings_tab.html:738
+#: instances/templates/instances/settings_tab.html:740
+#: instances/templates/instances/settings_tab.html:769
 msgid "Guess"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:726
+#: instances/templates/instances/settings_tab.html:758
 msgid "Network devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:736
+#: instances/templates/instances/settings_tab.html:767
 msgid "Random"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:751
+#: instances/templates/instances/settings_tab.html:781
 msgid "Storage devices"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:776
-#: instances/templates/instances/settings_tab.html:799
+#: instances/templates/instances/settings_tab.html:805
+#: instances/templates/instances/settings_tab.html:828
 msgid "Title"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:796
+#: instances/templates/instances/settings_tab.html:825
 msgid "To set instance template name description, shutdown the instance."
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:811
+#: instances/templates/instances/settings_tab.html:840
 msgid "Is template"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:832
+#: instances/templates/instances/settings_tab.html:861
 msgid "To set instance video model, shutdown the instance."
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:835
+#: instances/templates/instances/settings_tab.html:864
 msgid "Primary Video Model"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:839
+#: instances/templates/instances/settings_tab.html:868
 msgid "please choose"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:846
-#: instances/templates/instances/settings_tab.html:848
-#: instances/templates/instances/settings_tab.html:868
-#: instances/templates/instances/settings_tab.html:870
-#: instances/templates/instances/settings_tab.html:898
-#: secrets/templates/secrets.html:103
+#: instances/templates/instances/settings_tab.html:874
+#: instances/templates/instances/settings_tab.html:876
+#: instances/templates/instances/settings_tab.html:894
+#: instances/templates/instances/settings_tab.html:896
+#: instances/templates/instances/settings_tab.html:922
+#: virtsecrets/templates/secrets.html:104
 msgid "Set"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:856
+#: instances/templates/instances/settings_tab.html:883
 msgid "To set instance vCPUs hotpluggable"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:859
+#: instances/templates/instances/settings_tab.html:886
 msgid "vCPU Hot Plug"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:863
-#: instances/templates/instances/settings_tab.html:894
+#: instances/templates/instances/settings_tab.html:890
+#: instances/templates/instances/settings_tab.html:919
 msgid "Enabled"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:864
-#: instances/templates/instances/settings_tab.html:895
+#: instances/templates/instances/settings_tab.html:891
+#: instances/templates/instances/settings_tab.html:920
 msgid "Disabled"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:878
+#: instances/templates/instances/settings_tab.html:903
 msgid "To Enable/Disable Qemu Guest Agent. Status"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:883
+#: instances/templates/instances/settings_tab.html:908
 msgid "Disconnected"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:886
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:709
+#: instances/templates/instances/settings_tab.html:911
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:714
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:703
 msgid "Unknown"
 msgstr ""
 
-#: instances/templates/instances/settings_tab.html:890
+#: instances/templates/instances/settings_tab.html:915
 msgid "Qemu Guest Agent"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:9
-#: instances/templates/instances/snapshots_tab.html:31
-#: instances/templates/instances/snapshots_tab.html:33
+#: instances/templates/instances/snapshots_tab.html:8
+#: instances/templates/instances/snapshots_tab.html:26
 msgid "Take Snapshot"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:14
+#: instances/templates/instances/snapshots_tab.html:13
 msgid "Manage Snapshots"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:22
+#: instances/templates/instances/snapshots_tab.html:20
 msgid ""
 "This may take more than an hour, depending on how much content is on your "
-"instance and how large the disk is."
+"instance and how large the disk is. It could cause web server timeout.."
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:27
+#: instances/templates/instances/snapshots_tab.html:25
 msgid "Enter Snapshot Name"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:38
-msgid "To take a snapshot please Power Off the instance."
-msgstr ""
-
-#: instances/templates/instances/snapshots_tab.html:43
+#: instances/templates/instances/snapshots_tab.html:35
 msgid "Choose a snapshot for restore/delete"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:61
+#: instances/templates/instances/snapshots_tab.html:53
 msgid "Revert to this Snapshot"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:66
+#: instances/templates/instances/snapshots_tab.html:58
 msgid "To restore snapshots you need Power Off the instance."
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:75
+#: instances/templates/instances/snapshots_tab.html:67
 msgid "Delete Snapshot"
 msgstr ""
 
-#: instances/templates/instances/snapshots_tab.html:86
+#: instances/templates/instances/snapshots_tab.html:78
 msgid "You do not have any snapshots"
 msgstr ""
 
-#: instances/templates/instances/stats_tab.html:8
+#: instances/templates/instances/stats_tab.html:7
 msgid "Real Time"
 msgstr ""
 
-#: instances/templates/instances/stats_tab.html:23
+#: instances/templates/instances/stats_tab.html:22
 msgid "CPU Usage"
 msgstr ""
 
@@ -2617,11 +2536,11 @@ msgstr ""
 msgid "Memory Usage"
 msgstr ""
 
-#: instances/templates/instances/stats_tab.html:50
+#: instances/templates/instances/stats_tab.html:51
 msgid "Bandwidth Device"
 msgstr ""
 
-#: instances/templates/instances/stats_tab.html:65
+#: instances/templates/instances/stats_tab.html:67
 msgid "Disk I/O device"
 msgstr ""
 
@@ -2629,648 +2548,357 @@ msgstr ""
 msgid "None available device name"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:242
+#: instances/views.py:249
 msgid "Templates cannot be started."
 msgstr ""
 
-#: instances/views.py:345
+#: instances/views.py:352
 #, python-format
 msgid "Instance is migrated to %(hostname)s"
 msgstr ""
 
-#: instances/views.py:368
+#: instances/views.py:375
 msgid "Reset root password"
 msgstr ""
 
-#: instances/views.py:374 instances/views.py:403
+#: instances/views.py:381 instances/views.py:410
 msgid "Please shutdown down your instance and then try again"
 msgstr ""
 
-#: instances/views.py:395
-=======
-#: instances/views.py:236
-msgid "Templates cannot be started."
-msgstr ""
-
-#: instances/views.py:339
-#, python-format
-msgid "Migrate to %(hostname)%"
-msgstr ""
-
-#: instances/views.py:362
-msgid "Reset root password"
-msgstr ""
-
-#: instances/views.py:368 instances/views.py:397
-msgid "Please shutdown down your instance and then try again"
-msgstr ""
-
-#: instances/views.py:389
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:402
 #, python-format
 msgid "Installed new SSH public key %(keyname)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:422
-=======
-#: instances/views.py:416
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:429
 #, python-format
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize CPU of '%(instance_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:431
+#: instances/views.py:438
 #, python-format
 msgid "CPU is resized:  %(old)s to %(new)s"
 msgstr ""
 
-#: instances/views.py:459
-=======
-#: instances/views.py:425
-msgid "Resize CPU"
-msgstr ""
-
-#: instances/views.py:453
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:466
 #, python-format
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize memory of "
 "'%(instance_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:466
+#: instances/views.py:473
 #, python-format
 msgid ""
 "Memory is resized: current/max: %(old_cur)s/%(old_max)s to %(new_cur)s/"
 "%(new_max)s"
 msgstr ""
 
-#: instances/views.py:500
-=======
-#: instances/views.py:462
-msgid "Resize Memory"
-msgstr ""
-
-#: instances/views.py:491
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:507
 #, python-format
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize disks of '%(instance_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:507
+#: instances/views.py:514
 #, python-format
 msgid "Disk is resized: %(dev)s"
 msgstr ""
 
-#: instances/views.py:546
+#: instances/views.py:570
 #, python-format
 msgid "Attach new disk: %(name)s (%(format)s)"
 msgstr ""
 
-#: instances/views.py:577
-=======
-#: instances/views.py:498
-msgid "Disk resize"
-msgstr ""
-
-#: instances/views.py:537
-#, python-format
-msgid "Attach new disk %(name)s (%(format)s)"
-msgstr ""
-
-#: instances/views.py:568
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:609
 #, python-format
 msgid "Attach Existing disk: %(target_dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:635
-=======
-#: instances/views.py:624
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:667
 msgid "Volume changes are applied. But it will be activated after shutdown"
 msgstr ""
 
-#: instances/views.py:626
+#: instances/views.py:670
 msgid "Volume is changed successfully."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:639
-=======
-#: instances/views.py:627
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:671
 #, python-format
 msgid "Edit disk: %(target_dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:661
-=======
-#: instances/views.py:649
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:693
 #, python-format
 msgid "Delete disk: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:677
-=======
-#: instances/views.py:665
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:709
 #, python-format
 msgid "Detach disk: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:690
-=======
-#: instances/views.py:678
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:722
 #, python-format
 msgid "Add CD-ROM: %(target)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:703
-=======
-#: instances/views.py:691
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:735
 #, python-format
 msgid "Detach CD-ROM: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:716
-=======
-#: instances/views.py:704
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:748
 #, python-format
 msgid "Mount media: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:729
-=======
-#: instances/views.py:717
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:761
 #, python-format
 msgid "Unmount media: %(dev)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:742
+#: instances/views.py:774
 #, python-format
 msgid "Create snapshot: %(snap)s"
 msgstr ""
 
-#: instances/views.py:753
+#: instances/views.py:785
 #, python-format
 msgid "Delete snapshot: %(snap)s"
-=======
-#: instances/views.py:730
-#, python-format
-msgid "New snapshot: %(name)s"
 msgstr ""
 
-#: instances/views.py:741
-#, python-format
-msgid "Delete snapshot: %(snap_name)s"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
-msgstr ""
-
-#: instances/views.py:752
+#: instances/views.py:796
 msgid "Successful revert snapshot: "
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:767
-msgid "Revert snapshot: %(snap)"
+#: instances/views.py:799
+#, python-format
+msgid "Revert snapshot: %(snap)s"
 msgstr ""
 
-#: instances/views.py:781
-=======
-#: instances/views.py:755
-msgid "Revert snapshot"
-msgstr ""
-
-#: instances/views.py:769
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:813
 #, python-format
 msgid "VCPU %(id)s is enabled=%(enabled)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:790
-=======
-#: instances/views.py:780
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:822
 #, python-format
 msgid "VCPU Hot-plug is enabled=%(status)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:800
+#: instances/views.py:832
 msgid "Set autostart"
 msgstr ""
 
-#: instances/views.py:809
+#: instances/views.py:841
 msgid "Unset autostart"
 msgstr ""
 
-#: instances/views.py:818
+#: instances/views.py:850
 msgid "Enable boot menu"
 msgstr ""
 
-#: instances/views.py:827
+#: instances/views.py:859
 msgid "Disable boot menu"
 msgstr ""
 
-#: instances/views.py:842
+#: instances/views.py:874
 msgid "Set boot order"
 msgstr ""
 
-#: instances/views.py:847
-=======
-#: instances/views.py:791
-msgid "Set autostart"
-msgstr ""
-
-#: instances/views.py:800
-msgid "Unset autostart"
-msgstr ""
-
-#: instances/views.py:809
-msgid "Enable boot menu"
-msgstr ""
-
-#: instances/views.py:818
-msgid "Disable boot menu"
-msgstr ""
-
-#: instances/views.py:833
-msgid "Set boot order"
-msgstr ""
-
-#: instances/views.py:836
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:879
 msgid "Boot menu changes applied. But it will be activated after shutdown"
 msgstr ""
 
-#: instances/views.py:838
+#: instances/views.py:882
 msgid "Boot order changed successfully."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:861
+#: instances/views.py:893
 msgid "Change instance XML"
 msgstr ""
 
-#: instances/views.py:875
+#: instances/views.py:907
 #, python-format
 msgid "Set Guest Agent: %(status)s"
 msgstr ""
 
-#: instances/views.py:885
-msgid "Set Video Model: %(model)"
-=======
-#: instances/views.py:849
-msgid "Edit XML"
-msgstr ""
-
-#: instances/views.py:863
+#: instances/views.py:917
 #, python-format
-msgid "Set Guest Agent %(status)s"
+msgid "Set Video Model: %(model)s"
 msgstr ""
 
-#: instances/views.py:873
-msgid "Set Video Model"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
-msgstr ""
-
-#: instances/views.py:882
+#: instances/views.py:926
 msgid "Change network"
 msgstr ""
 
-#: instances/views.py:895
+#: instances/views.py:949
 msgid "Network Device Config is changed. Please shutdown instance to activate."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:922
+#: instances/views.py:974
 #, python-format
 msgid "Add network: %(mac)s"
 msgstr ""
 
-#: instances/views.py:933
+#: instances/views.py:985
 #, python-format
 msgid "Delete Network: %(mac)s"
 msgstr ""
 
-#: instances/views.py:946
-=======
-#: instances/views.py:903
-msgid "Add network"
-msgstr ""
-
-#: instances/views.py:917
-msgid "Delete network"
-msgstr ""
-
-#: instances/views.py:933
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:998
 #, python-format
 msgid "Set Link State: %(state)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:966 networks/views.py:231
-=======
-#: instances/views.py:952
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1018 networks/views.py:231
 #, python-format
 msgid "%(qos_dir)s QoS is set"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:971
-=======
-#: instances/views.py:956
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1023
 #, python-format
 msgid ""
 "%(qos_dir)s QoS is set. Network XML is changed.                 Stop and "
 "start network to activate new config."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:988 networks/views.py:246
-=======
-#: instances/views.py:970
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1040 networks/views.py:246
 #, python-format
 msgid "%(qos_dir)s QoS is deleted"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:993
-=======
-#: instances/views.py:974
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1045
 #, python-format
 msgid ""
 "%(qos_dir)s QoS is deleted. Network XML is changed.                 Stop and "
 "start network to activate new config."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1012
+#: instances/views.py:1064
 msgid "Only one owner is allowed and the one already added"
 msgstr ""
 
-#: instances/views.py:1017
-=======
-#: instances/views.py:990
-msgid "Only one owner is allowed and the one already added"
-msgstr ""
-
-#: instances/views.py:995
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1069
 #, python-format
 msgid "Add owner: %(user)s"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1028
+#: instances/views.py:1080
 #, python-format
 msgid "Delete owner: %(userinstance_id)s "
 msgstr ""
 
-#: instances/views.py:1060
-=======
-#: instances/views.py:1006
-#, python-format
-msgid "Deleted owner %(userinstance_id)s"
-msgstr ""
-
-#: instances/views.py:1038
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1112
 #, python-format
 msgid "User '%(quota_msg)s' quota reached, cannot create '%(clone_name)s'!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1066
+#: instances/views.py:1118
 #, python-format
 msgid "Instance '%(clone_name)s' already exists!"
 msgstr ""
 
-#: instances/views.py:1069
-=======
-#: instances/views.py:1044
-msgid "Instance 'clone_name' already exists!"
-msgstr ""
-
-#: instances/views.py:1047
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1121
 #, python-format
 msgid "Instance name '%(clone_name)s' contains invalid characters!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1072
-=======
-#: instances/views.py:1050
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1124
 #, python-format
 msgid "Instance MAC '%(clone_mac)s' invalid format!"
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1082
+#: instances/views.py:1134
 #, python-format
 msgid "Create a clone of '%(instance_name)s'"
 msgstr ""
 
-#: instances/views.py:1121
-=======
-#: instances/views.py:1060
-#, python-format
-msgid "Clone of '%(instance_name)s'"
-msgstr ""
-
-#: instances/views.py:1093
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1173
 msgid ""
 "Error setting console password. You should check that your instance have an "
 "graphic device."
 msgstr ""
 
-<<<<<<< HEAD
-#: instances/views.py:1126
+#: instances/views.py:1178
 msgid "Set VNC password"
 msgstr ""
 
-#: instances/views.py:1135
+#: instances/views.py:1187
 msgid "Set VNC keymap"
 msgstr ""
 
-#: instances/views.py:1140
+#: instances/views.py:1192
 msgid "Set VNC type"
 msgstr ""
 
-#: instances/views.py:1145
+#: instances/views.py:1197
 msgid "Set VNC listen address"
 msgstr ""
 
-#: instances/views.py:1168
+#: instances/views.py:1220
 msgid "Edit options"
 msgstr ""
 
-#: instances/views.py:1182
+#: instances/views.py:1234
 msgid "Send console.vv file"
 msgstr ""
 
-#: instances/views.py:1243 instances/views.py:1337
+#: instances/views.py:1295 instances/views.py:1389
 msgid "A virtual machine with this name already exists"
 msgstr ""
 
-#: instances/views.py:1320
+#: instances/views.py:1372
 msgid "You haven't defined any storage pools"
 msgstr ""
 
-#: instances/views.py:1322
-msgid "You haven't defined any network pools"
-msgstr ""
-
-#: instances/views.py:1339
-msgid "There is an instance with same name. Remove it and try again!"
-msgstr ""
-
-#: instances/views.py:1343
-msgid "No Virtual Machine MAC has been entered"
-msgstr ""
-
 #: instances/views.py:1374
-msgid "Image has already exist. Please check volumes or change instance name"
-msgstr ""
-
-#: instances/views.py:1401
-msgid "First you need to create or select an image"
-msgstr ""
-
-#: instances/views.py:1419
-msgid "Invalid cache mode"
-msgstr ""
-
-#: instances/views.py:1460
-msgid "Instance is created"
-msgstr ""
-
-#: instances/views.py:1481
-msgid "Flavor Created"
-msgstr ""
-
-#: instances/views.py:1487
-msgid "Create Flavor"
-msgstr ""
-
-#: instances/views.py:1497
-msgid "Flavor Updated"
-msgstr ""
-
-#: instances/views.py:1503
-msgid "Update Flavor"
-msgstr ""
-
-#: instances/views.py:1512
-=======
-#: instances/views.py:1096
-msgid "Set VNC password"
-msgstr ""
-
-#: instances/views.py:1104
-msgid "Set VNC keymap"
-msgstr ""
-
-#: instances/views.py:1109
-msgid "Set VNC type"
-msgstr ""
-
-#: instances/views.py:1114
-msgid "Set VNC listen address"
-msgstr ""
-
-#: instances/views.py:1137
-msgid "Edit options"
-msgstr ""
-
-#: instances/views.py:1151
-msgid "Send console.vv file"
-msgstr ""
-
-#: instances/views.py:1206 instances/views.py:1298
-msgid "A virtual machine with this name already exists"
-msgstr ""
-
-#: instances/views.py:1281
-msgid "You haven't defined any storage pools"
-msgstr ""
-
-#: instances/views.py:1283
 msgid "You haven't defined any network pools"
 msgstr ""
 
-#: instances/views.py:1300
+#: instances/views.py:1391
 msgid "There is an instance with same name. Remove it and try again!"
 msgstr ""
 
-#: instances/views.py:1304
+#: instances/views.py:1395
 msgid "No Virtual Machine MAC has been entered"
 msgstr ""
 
-#: instances/views.py:1327
+#: instances/views.py:1426
 msgid "Image has already exist. Please check volumes or change instance name"
 msgstr ""
 
-#: instances/views.py:1347
+#: instances/views.py:1453
 msgid "First you need to create or select an image"
 msgstr ""
 
-#: instances/views.py:1365
+#: instances/views.py:1471
 msgid "Invalid cache mode"
 msgstr ""
 
-#: instances/views.py:1402
+#: instances/views.py:1512
 msgid "Instance is created"
 msgstr ""
 
-#: instances/views.py:1423
+#: instances/views.py:1533
 msgid "Flavor Created"
 msgstr ""
 
-#: instances/views.py:1431
+#: instances/views.py:1539
 msgid "Create Flavor"
 msgstr ""
 
-#: instances/views.py:1442
+#: instances/views.py:1549
 msgid "Flavor Updated"
 msgstr ""
 
-#: instances/views.py:1450
+#: instances/views.py:1555
 msgid "Update Flavor"
 msgstr ""
 
-#: instances/views.py:1460
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: instances/views.py:1564
 msgid "Flavor Deleted"
 msgstr ""
 
@@ -3336,12 +2964,12 @@ msgstr ""
 
 #: interfaces/templates/create_iface_block.html:44
 #: interfaces/templates/interface.html:76
-#: interfaces/templates/interfaces.html:62
-#: storages/templates/create_stg_block.html:35
-#: storages/templates/create_stg_block.html:64
-#: storages/templates/create_stg_block.html:93
-#: storages/templates/create_stg_block.html:158
-#: storages/templates/storages.html:60
+#: interfaces/templates/interfaces.html:63
+#: storages/templates/create_stg_block.html:49
+#: storages/templates/create_stg_block.html:78
+#: storages/templates/create_stg_block.html:107
+#: storages/templates/create_stg_block.html:172
+#: storages/templates/storages.html:59
 msgid "Type"
 msgstr ""
 
@@ -3369,43 +2997,43 @@ msgstr ""
 msgid "Delay"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:82
+#: interfaces/templates/create_iface_block.html:86
 msgid "IPv4 Mode"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:85
-#: interfaces/templates/create_iface_block.html:112
+#: interfaces/templates/create_iface_block.html:89
+#: interfaces/templates/create_iface_block.html:116
 #: networks/templates/network.html:109 networks/templates/network.html:220
 msgid "DHCP"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:86
-#: interfaces/templates/create_iface_block.html:113
+#: interfaces/templates/create_iface_block.html:90
+#: interfaces/templates/create_iface_block.html:117
 msgid "Static"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:87
-#: interfaces/templates/create_iface_block.html:111
+#: interfaces/templates/create_iface_block.html:91
+#: interfaces/templates/create_iface_block.html:115
 msgid "No configuration"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:92
+#: interfaces/templates/create_iface_block.html:96
 msgid "IPv4 Address"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:98
+#: interfaces/templates/create_iface_block.html:102
 msgid "IPv4 Gateway"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:108
+#: interfaces/templates/create_iface_block.html:112
 msgid "IPv6 Mode"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:118
+#: interfaces/templates/create_iface_block.html:122
 msgid "IPv6 Address"
 msgstr ""
 
-#: interfaces/templates/create_iface_block.html:124
+#: interfaces/templates/create_iface_block.html:128
 msgid "IPv6 Gateway"
 msgstr ""
 
@@ -3423,12 +3051,12 @@ msgstr ""
 
 #: interfaces/templates/interface.html:55
 #: interfaces/templates/interface.html:78 networks/templates/network.html:45
-#: storages/templates/storage.html:56
+#: storages/templates/storage.html:58
 msgid "State"
 msgstr ""
 
 #: interfaces/templates/interface.html:62 networks/templates/network.html:52
-#: storages/templates/storage.html:64
+#: storages/templates/storage.html:66
 msgid "Stop"
 msgstr ""
 
@@ -3440,7 +3068,7 @@ msgstr ""
 msgid "Speed"
 msgstr ""
 
-#: interfaces/templates/interfaces.html:47
+#: interfaces/templates/interfaces.html:48
 msgid "Hypervisor doesn't have any Interfaces"
 msgstr ""
 
@@ -3449,14 +3077,18 @@ msgid "user"
 msgstr ""
 
 #: logs/models.py:6
-msgid "instance"
+msgid "host"
 msgstr ""
 
 #: logs/models.py:7
-msgid "message"
+msgid "instance"
 msgstr ""
 
 #: logs/models.py:8
+msgid "message"
+msgstr ""
+
+#: logs/models.py:9
 msgid "date"
 msgstr ""
 
@@ -3527,8 +3159,8 @@ msgid "Add New Network"
 msgstr ""
 
 #: networks/templates/create_net_block.html:20
-#: storages/templates/create_stg_block.html:44
-#: storages/templates/create_stg_block.html:73
+#: storages/templates/create_stg_block.html:58
+#: storages/templates/create_stg_block.html:87
 msgid "default"
 msgstr ""
 
@@ -3650,12 +3282,12 @@ msgid "IPv4 Fixed Addresses"
 msgstr ""
 
 #: networks/templates/network.html:158 networks/templates/network.html:268
-#: nwfilters/templates/nwfilters.html:85
+#: nwfilters/templates/nwfilters.html:83
 msgid "Show"
 msgstr ""
 
-#: networks/templates/network.html:166 networks/templates/network.html:276
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:395
+#: networks/templates/network.html:165 networks/templates/network.html:275
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:403
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:377
 msgid "Clear"
 msgstr ""
@@ -3680,11 +3312,11 @@ msgstr ""
 msgid "IPv6 Fixed Addresses"
 msgstr ""
 
-#: networks/templates/networks.html:46
+#: networks/templates/networks.html:45
 msgid "Hypervisor doesn't have any Network"
 msgstr ""
 
-#: networks/templates/networks.html:61
+#: networks/templates/networks.html:60
 msgid "Forward"
 msgstr ""
 
@@ -3696,7 +3328,6 @@ msgstr ""
 msgid "Please enter bridge/dev name"
 msgstr ""
 
-<<<<<<< HEAD
 #: networks/views.py:57
 msgid "For libvirt, the IPv6 network prefix must be /64"
 msgstr ""
@@ -3721,34 +3352,10 @@ msgid "%(family)s DHCP Range is Changed."
 msgstr ""
 
 #: networks/views.py:210
-=======
-#: networks/views.py:56
-msgid "For libvirt, the IPv6 network prefix must be /64"
-msgstr ""
-
-#: networks/views.py:126
-msgid "Unknown Network Family"
-msgstr ""
-
-#: networks/views.py:176
-msgid "{family.upper()} Fixed Address Operation Completed."
-msgstr ""
-
-#: networks/views.py:186
-msgid "{family.upper()} Fixed Address is Deleted."
-msgstr ""
-
-#: networks/views.py:194
-msgid "{family.upper()} DHCP Range is Changed."
-msgstr ""
-
-#: networks/views.py:203
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 msgid ""
 "Network XML is changed. \\Stop and start network to activate new config."
 msgstr ""
 
-<<<<<<< HEAD
 #: networks/views.py:215
 msgid "Network XML is changed."
 msgstr ""
@@ -3765,34 +3372,6 @@ msgstr ""
 msgid ""
 "%(qos_dir)s QoS is deleted. Network XML is changed.                         "
 "Stop and start network to activate new config"
-=======
-#: networks/views.py:205
-msgid "Network XML is changed."
-msgstr ""
-
-#: networks/views.py:218
-msgid "{qos_dir.capitalize()} QoS is set. Network XML is changed."
-msgstr ""
-
-#: networks/views.py:219
-msgid "Stop and start network to activate new config"
-msgstr ""
-
-#: networks/views.py:221
-msgid "{} QoS is set"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
-msgstr ""
-
-#: networks/views.py:232
-msgid "{qos_dir.capitalize()} QoS is deleted. Network XML is changed. "
-msgstr ""
-
-#: networks/views.py:233
-msgid "Stop and start network to activate new config."
-msgstr ""
-
-#: networks/views.py:235
-msgid "{qos_dir.capitalize()} QoS is deleted"
 msgstr ""
 
 #: nwfilters/templates/add_nwf_rule.html:12
@@ -3807,8 +3386,8 @@ msgstr ""
 msgid "Create New NWFilter"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:39 nwfilters/templates/nwfilters.html:55
-#: secrets/templates/secrets.html:59
+#: nwfilters/templates/nwfilter.html:39 nwfilters/templates/nwfilters.html:53
+#: virtsecrets/templates/secrets.html:60
 msgid "UUID"
 msgstr ""
 
@@ -3816,47 +3395,46 @@ msgstr ""
 msgid "Filter References"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:100
+#: nwfilters/templates/nwfilter.html:92
 msgid "Reference"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:125
+#: nwfilters/templates/nwfilter.html:117
 msgid "Rules"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:129
+#: nwfilters/templates/nwfilter.html:121
 msgid "Rule"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:130
+#: nwfilters/templates/nwfilter.html:122
 msgid "Action Type"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:132
+#: nwfilters/templates/nwfilter.html:124
 msgid "Priority"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:133
+#: nwfilters/templates/nwfilter.html:125
 msgid "Statematch"
 msgstr ""
 
-#: nwfilters/templates/nwfilter.html:134
+#: nwfilters/templates/nwfilter.html:126
 msgid "Directives"
 msgstr ""
 
-#: nwfilters/templates/nwfilters.html:71
+#: nwfilters/templates/nwfilters.html:69
 msgid "Details of NWFilter"
 msgstr ""
 
-#: nwfilters/templates/nwfilters.html:94
+#: nwfilters/templates/nwfilters.html:92
 msgid "Clone NWFilter"
 msgstr ""
 
-#: nwfilters/templates/nwfilters.html:135
+#: nwfilters/templates/nwfilters.html:132
 msgid "Hypervisor doesn't have any NWFilters"
 msgstr ""
 
-<<<<<<< HEAD
 #: nwfilters/views.py:44
 msgid "A network filter with this name already exists"
 msgstr ""
@@ -3866,98 +3444,23 @@ msgid "A network filter with this UUID already exists"
 msgstr ""
 
 #: nwfilters/views.py:51
-=======
-#: nwfilters/views.py:41
-msgid "A network filter with this name already exists"
-msgstr ""
-
-#: nwfilters/views.py:44
-msgid "A network filter with this UUID already exists"
-msgstr ""
-
-#: nwfilters/views.py:48
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
 #, python-format
 msgid "%(filter)s network filter is created"
 msgstr ""
 
-<<<<<<< HEAD
 #: nwfilters/views.py:60
 #, python-format
 msgid "%(filter)s network filter is deleted"
 msgstr ""
 
-#: nwfilters/views.py:76
+#: nwfilters/views.py:77
 #, python-format
 msgid "NWFilter is in use by %(instance)s. Cannot be deleted."
 msgstr ""
 
-#: nwfilters/views.py:93
+#: nwfilters/views.py:96
 #, python-format
 msgid "Cloning NWFilter %(name)s as %(clone)s"
-=======
-#: nwfilters/views.py:57
-#, python-brace-format
-msgid "Deleting NWFilter: {name}"
-msgstr ""
-
-#: nwfilters/views.py:69
-#, python-brace-format
-msgid "NWFilter is in use by {inst}. Cannot be deleted."
-msgstr ""
-
-#: nwfilters/views.py:86
-#, python-brace-format
-msgid "Cloning NWFilter {name} as {cln_name}"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:12
-msgid "Create New Secret"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:18
-msgid "Ephemeral"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:21
-#: secrets/templates/create_secret_block.html:30
-msgid "no"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:22
-#: secrets/templates/create_secret_block.html:31
-msgid "yes"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:27
-msgid "Private"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:36
-#: storages/templates/storage.html:54
-msgid "Usage"
-msgstr ""
-
-#: secrets/templates/create_secret_block.html:46
-#: secrets/templates/secrets.html:61
-msgid "Data"
-msgstr ""
-
-#: secrets/templates/secrets.html:50
-msgid "Hypervisor doesn't have any Secrets"
-msgstr ""
-
-#: secrets/templates/secrets.html:60
-msgid "Usage Type"
-msgstr ""
-
-#: secrets/templates/secrets.html:88
-msgid "Set secret value"
-msgstr ""
-
-#: secrets/templates/secrets.html:94
-msgid "Value"
 msgstr ""
 
 #: storages/forms.py:10 storages/forms.py:37
@@ -3988,64 +3491,64 @@ msgstr ""
 msgid "Create Storage Pool"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:18
+#: storages/templates/create_stg_block.html:19
 msgid "DIR"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:21
+#: storages/templates/create_stg_block.html:24
 msgid "LVM"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:23
+#: storages/templates/create_stg_block.html:29
 msgid "CEPH"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:25
+#: storages/templates/create_stg_block.html:34
 msgid "NETFS"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:27
+#: storages/templates/create_stg_block.html:39
 msgid "ISO"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:48
-#: storages/templates/create_stg_block.html:222
+#: storages/templates/create_stg_block.html:62
+#: storages/templates/create_stg_block.html:236
 msgid "Path"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:106
+#: storages/templates/create_stg_block.html:120
 msgid "Ceph User"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:112
+#: storages/templates/create_stg_block.html:126
 msgid "Ceph Pool"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:118
+#: storages/templates/create_stg_block.html:132
 msgid "Ceph Host"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:177
+#: storages/templates/create_stg_block.html:191
 msgid "Remote Path"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:186
+#: storages/templates/create_stg_block.html:200
 msgid "auto"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:187
+#: storages/templates/create_stg_block.html:201
 msgid "nfs"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:188
+#: storages/templates/create_stg_block.html:202
 msgid "glusterfs"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:189
+#: storages/templates/create_stg_block.html:203
 msgid "cifs"
 msgstr ""
 
-#: storages/templates/create_stg_block.html:194
+#: storages/templates/create_stg_block.html:208
 msgid "Local Path"
 msgstr ""
 
@@ -4061,47 +3564,52 @@ msgstr ""
 msgid "Add New Volume"
 msgstr ""
 
-#: storages/templates/storage.html:44
+#: storages/templates/storage.html:46
 msgid "Pool name"
 msgstr ""
 
-#: storages/templates/storage.html:46
+#: storages/templates/storage.html:48
 msgid "Pool type"
 msgstr ""
 
-#: storages/templates/storage.html:48
+#: storages/templates/storage.html:50
 msgid "Pool path"
 msgstr ""
 
-#: storages/templates/storage.html:50
+#: storages/templates/storage.html:52
 msgid "Pool status"
 msgstr ""
 
-#: storages/templates/storage.html:85 storages/templates/storages.html:64
+#: storages/templates/storage.html:56
+#: virtsecrets/templates/create_secret_block.html:36
+msgid "Usage"
+msgstr ""
+
+#: storages/templates/storage.html:90 storages/templates/storages.html:63
 msgid "Volumes"
 msgstr ""
 
-#: storages/templates/storage.html:97
+#: storages/templates/storage.html:98
 msgid "Allocated"
 msgstr ""
 
-#: storages/templates/storage.html:118
+#: storages/templates/storage.html:119
 msgid "Clone image"
 msgstr ""
 
-#: storages/templates/storage.html:131
+#: storages/templates/storage.html:132
 msgid "Convert"
 msgstr ""
 
-#: storages/templates/storage.html:140
+#: storages/templates/storage.html:141
 msgid "raw"
 msgstr ""
 
-#: storages/templates/storage.html:141
+#: storages/templates/storage.html:142
 msgid "qcow"
 msgstr ""
 
-#: storages/templates/storage.html:142
+#: storages/templates/storage.html:143
 msgid "qcow2"
 msgstr ""
 
@@ -4109,11 +3617,11 @@ msgstr ""
 msgid "Hypervisor doesn't have any Volumes"
 msgstr ""
 
-#: storages/templates/storages.html:46
+#: storages/templates/storages.html:45
 msgid "Hypervisor doesn't have any Storages"
 msgstr ""
 
-#: storages/views.py:39
+#: storages/views.py:40
 msgid "Pool name already use"
 msgstr ""
 
@@ -4121,67 +3629,44 @@ msgstr ""
 msgid "You need create secret for pool"
 msgstr ""
 
-<<<<<<< HEAD
-#: storages/views.py:48
-msgid "You need input all fields for creating ceph pool"
-msgstr ""
-
-#: storages/views.py:144
-#, python-format
-msgid "Volume: %(volume)s is deleted."
-msgstr ""
-
-#: storages/views.py:149
-msgid "ISO image already exist"
-msgstr ""
-
-#: storages/views.py:153
-#, python-format
-msgid "ISO: %(file)s is uploaded."
-msgstr ""
-
-#: storages/views.py:162
-msgid "Name of volume already in use"
-msgstr ""
-
-#: storages/views.py:174
-#, python-format
-msgid "%(image)s image cloned as %(clone)s successfully"
-msgstr ""
-
-#: storages/views.py:220
-#, python-format
-msgid "Image file %(name)s is created successfully"
-=======
 #: storages/views.py:49
 msgid "You need input all fields for creating ceph pool"
 msgstr ""
 
-#: storages/views.py:132
-#, python-brace-format
-msgid "Volume: {volname} is deleted."
+#: storages/views.py:96
+msgid "Security Issues with file uploading"
 msgstr ""
 
-#: storages/views.py:137
-msgid "ISO image already exist"
-msgstr ""
-
-#: storages/views.py:141
-msgid "ISO: {request.FILES['file']} is uploaded."
+#: storages/views.py:103
+msgid "File not found. Check the path variable and filename"
 msgstr ""
 
 #: storages/views.py:150
+#, python-format
+msgid "Volume: %(vol)s is deleted."
+msgstr ""
+
+#: storages/views.py:155
+msgid "ISO image already exist"
+msgstr ""
+
+#: storages/views.py:159
+#, python-format
+msgid "ISO: %(file)s is uploaded."
+msgstr ""
+
+#: storages/views.py:168
 msgid "Name of volume already in use"
 msgstr ""
 
-#: storages/views.py:160
-msgid "{data['image']} image cloned as {name} successfully"
+#: storages/views.py:180
+#, python-format
+msgid "%(image)s image cloned as %(name)s successfully"
 msgstr ""
 
-#: storages/views.py:199
-#, python-brace-format
-msgid "Image file {name} is created successfully"
->>>>>>> 159e06221af435700047a8e5ababe758a12d7579
+#: storages/views.py:226
+#, python-format
+msgid "Image file %(name)s is created successfully"
 msgstr ""
 
 #: templates/403.html:3
@@ -4242,18 +3727,321 @@ msgstr ""
 msgid "Processing"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/bootstrap4/components.py:17
-#: venv/lib/python3.6/site-packages/bootstrap4/templates/bootstrap4/form_errors.html:3
-#: venv/lib/python3.6/site-packages/bootstrap4/templates/bootstrap4/messages.html:4
-msgid "close"
+#: templates/search_block.html:3
+msgid "Search"
 msgstr ""
 
+#: venv/lib/python3.6/site-packages/click/_termui_impl.py:496
+#, python-brace-format
+msgid "{editor}: Editing failed"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_termui_impl.py:500
+#, python-brace-format
+msgid "{editor}: Editing failed: {e}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:20
+msgid ""
+"Click will abort further execution because Python was configured to use "
+"ASCII as encoding for the environment. Consult https://click.palletsprojects."
+"com/unicode-support/ for mitigation steps."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:56
+msgid ""
+"Additional information: on this system no suitable UTF-8 locales were "
+"discovered. This most likely requires resolving by reconfiguring the locale "
+"system."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:65
+msgid ""
+"This system supports the C.UTF-8 locale which is recommended. You might be "
+"able to resolve your issue by exporting the following environment variables:"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:75
+#, python-brace-format
+msgid ""
+"This system lists some UTF-8 supporting locales that you can pick from. The "
+"following suitable locales were discovered: {locales}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:93
+msgid ""
+"Click discovered that you exported a UTF-8 locale but the locale system "
+"could not pick up from it because it does not exist. The exported locale is "
+"{locale!r} but it is not supported."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1095
+msgid "Aborted!"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1279
+#: venv/lib/python3.6/site-packages/click/decorators.py:434
+msgid "Show this message and exit."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1308
+#: venv/lib/python3.6/site-packages/click/core.py:1334
+#, python-brace-format
+msgid "(Deprecated) {text}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1375
+#, python-brace-format
+msgid "Got unexpected extra argument ({args})"
+msgid_plural "Got unexpected extra arguments ({args})"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1390
+msgid "DeprecationWarning: The command {name!r} is deprecated."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1607
+msgid "Commands"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1639
+msgid "Missing command."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1717
+msgid "No such command {name!r}."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2258
+msgid "Value must be an iterable."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2278
+#, python-brace-format
+msgid "Takes {nargs} values but 1 was given."
+msgid_plural "Takes {nargs} values but {len} were given."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2701
+#, python-brace-format
+msgid "env var: {var}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2724
+msgid "(dynamic)"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2735
+#, python-brace-format
+msgid "default: {default}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2748
+msgid "required"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/decorators.py:339
+#, python-format
+msgid "%(prog)s, version %(version)s"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/decorators.py:403
+msgid "Show the version and exit."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:43
+#: venv/lib/python3.6/site-packages/click/exceptions.py:79
+#, python-brace-format
+msgid "Error: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:71
+#, python-brace-format
+msgid "Try '{command} {option}' for help."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:120
+#, python-brace-format
+msgid "Invalid value: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:122
+#, python-brace-format
+msgid "Invalid value for {param_hint}: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:178
+msgid "Missing argument"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:180
+msgid "Missing option"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:182
+msgid "Missing parameter"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:184
+#, python-brace-format
+msgid "Missing {param_type}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:191
+#, python-brace-format
+msgid "Missing parameter: {param_name}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:211
+#, python-brace-format
+msgid "No such option: {name}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:223
+#, python-brace-format
+msgid "Did you mean {possibility}?"
+msgid_plural "(Possible options: {possibilities})"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:261
+msgid "unknown error"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:268
+msgid "Could not open file {filename!r}: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:231
+msgid "Argument {name!r} takes {nargs} values."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:413
+msgid "Option {name!r} does not take a value."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:474
+msgid "Option {name!r} requires an argument."
+msgid_plural "Option {name!r} requires {nargs} arguments."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/shell_completion.py:316
+msgid "Shell completion is not supported for Bash versions older than 4.4."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/shell_completion.py:322
+msgid "Couldn't detect Bash version, shell completion is not supported."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:161
+msgid "Repeat for confirmation"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:178
+msgid "Error: The value you entered was invalid."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:180
+#, python-brace-format
+msgid "Error: {e.message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:191
+msgid "Error: The two entered values do not match."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:247
+msgid "Error: invalid input"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:798
+msgid "Press any key to continue..."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:258
+#, python-brace-format
+msgid ""
+"Choose from:\n"
+"\t{choices}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:290
+msgid "{value!r} is not {choice}."
+msgid_plural "{value!r} is not one of {choices}."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:380
+msgid "{value!r} does not match the format {format}."
+msgid_plural "{value!r} does not match the formats {formats}."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:402
+msgid "{value!r} is not a valid {number_type}."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:458
+#, python-brace-format
+msgid "{value} is not in the range {range}."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:599
+msgid "{value!r} is not a valid boolean."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:623
+msgid "{value!r} is not a valid UUID."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:801
+msgid "file"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:803
+msgid "directory"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:805
+msgid "path"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:851
+msgid "{name} {filename!r} does not exist."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:860
+msgid "{name} {filename!r} is a file."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:868
+msgid "{name} {filename!r} is a directory."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:876
+msgid "{name} {filename!r} is not writable."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:884
+msgid "{name} {filename!r} is not readable."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:951
+#, python-brace-format
+msgid "{len_type} values are required, but {len_value} was given."
+msgid_plural "{len_type} values are required, but {len_value} were given."
+msgstr[0] ""
+msgstr[1] ""
+
 #: venv/lib/python3.6/site-packages/django/contrib/messages/apps.py:7
 #: venv2/lib/python2.7/site-packages/django/contrib/messages/apps.py:7
 msgid "Messages"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/contrib/sitemaps/apps.py:7
+#: venv/lib/python3.6/site-packages/django/contrib/sitemaps/apps.py:8
 #: venv2/lib/python2.7/site-packages/django/contrib/sitemaps/apps.py:7
 msgid "Site Maps"
 msgstr ""
@@ -4268,103 +4056,108 @@ msgstr ""
 msgid "Syndication"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/paginator.py:45
+#. Translators: String used to replace omitted page numbers in elided page
+#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10].
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:30
+msgid "…"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:51
 #: venv2/lib/python2.7/site-packages/django/core/paginator.py:43
 msgid "That page number is not an integer"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/paginator.py:47
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:53
 #: venv2/lib/python2.7/site-packages/django/core/paginator.py:45
 msgid "That page number is less than 1"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/paginator.py:52
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:58
 #: venv2/lib/python2.7/site-packages/django/core/paginator.py:50
 msgid "That page contains no results"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:31
+#: venv/lib/python3.6/site-packages/django/core/validators.py:22
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:34
 msgid "Enter a valid value."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:102
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:658
+#: venv/lib/python3.6/site-packages/django/core/validators.py:93
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:675
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:107
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:671
 msgid "Enter a valid URL."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:154
+#: venv/lib/python3.6/site-packages/django/core/validators.py:150
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:160
 msgid "Enter a valid integer."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:165
+#: venv/lib/python3.6/site-packages/django/core/validators.py:161
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:171
 msgid "Enter a valid email address."
 msgstr ""
 
 #. Translators: "letters" means latin letters: a-z and A-Z.
-#: venv/lib/python3.6/site-packages/django/core/validators.py:239
-#: venv2/lib/python2.7/site-packages/django/core/validators.py:245
+#: venv/lib/python3.6/site-packages/django/core/validators.py:262
 msgid ""
-"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+"Enter a valid “slug” consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:246
-#: venv2/lib/python2.7/site-packages/django/core/validators.py:252
+#: venv/lib/python3.6/site-packages/django/core/validators.py:269
 msgid ""
-"Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
+"Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:255
-#: venv/lib/python3.6/site-packages/django/core/validators.py:275
+#: venv/lib/python3.6/site-packages/django/core/validators.py:278
+#: venv/lib/python3.6/site-packages/django/core/validators.py:288
+#: venv/lib/python3.6/site-packages/django/core/validators.py:311
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:257
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:277
 msgid "Enter a valid IPv4 address."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:260
-#: venv/lib/python3.6/site-packages/django/core/validators.py:276
+#: venv/lib/python3.6/site-packages/django/core/validators.py:296
+#: venv/lib/python3.6/site-packages/django/core/validators.py:312
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:262
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:278
 msgid "Enter a valid IPv6 address."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:270
-#: venv/lib/python3.6/site-packages/django/core/validators.py:274
+#: venv/lib/python3.6/site-packages/django/core/validators.py:306
+#: venv/lib/python3.6/site-packages/django/core/validators.py:310
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:272
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:276
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:304
+#: venv/lib/python3.6/site-packages/django/core/validators.py:340
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:308
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1131
 msgid "Enter only digits separated by commas."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:310
+#: venv/lib/python3.6/site-packages/django/core/validators.py:346
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:314
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:342
+#: venv/lib/python3.6/site-packages/django/core/validators.py:379
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:345
 #, python-format
 msgid "Ensure this value is less than or equal to %(limit_value)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:351
+#: venv/lib/python3.6/site-packages/django/core/validators.py:388
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:354
 #, python-format
 msgid "Ensure this value is greater than or equal to %(limit_value)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:361
+#: venv/lib/python3.6/site-packages/django/core/validators.py:398
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:364
 #, python-format
 msgid ""
@@ -4376,7 +4169,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:376
+#: venv/lib/python3.6/site-packages/django/core/validators.py:413
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:379
 #, python-format
 msgid ""
@@ -4388,15 +4181,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:395
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:290
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:325
+#: venv/lib/python3.6/site-packages/django/core/validators.py:432
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:292
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:327
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:303
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:340
 msgid "Enter a number."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:397
+#: venv/lib/python3.6/site-packages/django/core/validators.py:434
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:399
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
@@ -4404,7 +4197,7 @@ msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:402
+#: venv/lib/python3.6/site-packages/django/core/validators.py:439
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:404
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
@@ -4412,7 +4205,7 @@ msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:407
+#: venv/lib/python3.6/site-packages/django/core/validators.py:444
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:409
 #, python-format
 msgid ""
@@ -4422,48 +4215,47 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:469
-#: venv2/lib/python2.7/site-packages/django/core/validators.py:463
+#: venv/lib/python3.6/site-packages/django/core/validators.py:506
 #, python-format
 msgid ""
-"File extension '%(extension)s' is not allowed. Allowed extensions are: "
-"'%(allowed_extensions)s'."
+"File extension “%(extension)s” is not allowed. Allowed extensions are: "
+"%(allowed_extensions)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:521
+#: venv/lib/python3.6/site-packages/django/core/validators.py:559
 msgid "Null characters are not allowed."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/base.py:1165
-#: venv/lib/python3.6/site-packages/django/forms/models.py:756
+#: venv/lib/python3.6/site-packages/django/db/models/base.py:1210
+#: venv/lib/python3.6/site-packages/django/forms/models.py:768
 #: venv2/lib/python2.7/site-packages/django/db/models/base.py:1209
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:749
 msgid "and"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/base.py:1167
+#: venv/lib/python3.6/site-packages/django/db/models/base.py:1212
 #: venv2/lib/python2.7/site-packages/django/db/models/base.py:1211
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:104
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:100
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:116
 #, python-format
 msgid "Value %(value)r is not a valid choice."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:105
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:101
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:117
 msgid "This field cannot be null."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:106
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:102
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:118
 msgid "This field cannot be blank."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:107
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:103
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:119
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
@@ -4471,346 +4263,340 @@ msgstr ""
 
 #. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
 #. Eg: "Title must be unique for pub_date year"
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:111
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:107
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:123
 #, python-format
 msgid ""
 "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:128
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:126
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:140
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:905
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1772
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:901
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1809
-msgid "Integer"
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:909
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1770
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:905
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1807
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:958
 #, python-format
-msgid "'%(value)s' value must be an integer."
+msgid "“%(value)s” value must be either True or False."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:984
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1850
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:978
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1878
-msgid "Big (8 byte) integer"
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:996
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:990
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:959
 #, python-format
-msgid "'%(value)s' value must be either True or False."
+msgid "“%(value)s” value must be either True, False, or None."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:997
-#, python-format
-msgid "'%(value)s' value must be either True, False, or None."
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:999
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:961
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:992
 msgid "Boolean (Either True or False)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1040
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1002
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1058
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1104
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1096
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1115
 msgid "Comma-separated integers"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1153
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1172
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1145
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+"“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD "
 "format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1155
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1298
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1174
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1319
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1147
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1290
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
+"“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid "
 "date."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1158
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1150
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1177
 msgid "Date (without time)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1296
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1317
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1288
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ] format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1300
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1321
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1292
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
 "[TZ]) but it is an invalid date/time."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1304
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1296
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1325
 msgid "Date (with time)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1452
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1475
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1444
 #, python-format
-msgid "'%(value)s' value must be a decimal number."
+msgid "“%(value)s” value must be a decimal number."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1454
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1446
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1477
 msgid "Decimal number"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1593
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1628
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1585
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
+"“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[."
 "uuuuuu] format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1596
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1588
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1631
 msgid "Duration"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1646
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1638
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1683
 msgid "Email address"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1669
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1661
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1707
 msgid "File path"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1735
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1773
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1727
 #, python-format
-msgid "'%(value)s' value must be a float."
+msgid "“%(value)s” value must be a float."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1737
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1729
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1775
 msgid "Floating point number"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1866
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1767
+#, python-format
+msgid "“%(value)s” value must be an integer."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1769
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:901
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1809
+msgid "Integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1852
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:978
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1878
+msgid "Big (8 byte) integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1867
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2130
+msgid "Small integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1875
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1893
 msgid "IPv4 address"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1897
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1906
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1924
 msgid "IP address"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1977
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1978
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2006
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1986
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1987
 #, python-format
-msgid "'%(value)s' value must be either None, True or False."
+msgid "“%(value)s” value must be either None, True or False."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1980
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1989
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2008
 msgid "Boolean (Either True, False or None)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2015
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2043
+msgid "Positive big integer"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2056
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2071
 msgid "Positive integer"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2028
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2069
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2083
 msgid "Positive small integer"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2042
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2083
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2096
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2074
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2130
-msgid "Small integer"
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2081
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2115
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2137
 msgid "Text"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2109
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2163
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2181
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
 "format."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2111
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2165
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2183
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
 "invalid time."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2114
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2186
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2168
 msgid "Time"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2240
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2312
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2296
 msgid "URL"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2262
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2334
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2319
 msgid "Raw binary data"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2312
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2366
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2399
 #, python-format
-msgid "'%(value)s' is not a valid UUID."
+msgid "“%(value)s” is not a valid UUID."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2314
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2401
 msgid "Universally unique identifier"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:221
+#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:226
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/files.py:228
 msgid "File"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:778
+#: venv/lib/python3.6/site-packages/django/db/models/fields/json.py:18
+msgid "A JSON object"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/json.py:20
+msgid "Value must be valid JSON."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:790
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:788
 #, python-format
 msgid "%(model)s instance with %(field)s %(value)r does not exist."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:780
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:792
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:790
 msgid "Foreign Key (type determined by related field)"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1007
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1045
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1029
 msgid "One-to-one relationship"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1057
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1099
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1104
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1058
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1100
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1105
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1100
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1142
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1147
 msgid "Many-to-many relationship"
 msgstr ""
 
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the label
-#: venv/lib/python3.6/site-packages/django/forms/boundfield.py:146
+#: venv/lib/python3.6/site-packages/django/forms/boundfield.py:150
 #: venv2/lib/python2.7/site-packages/django/forms/boundfield.py:181
 msgid ":?.!"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:53
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:54
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:56
 msgid "This field is required."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:245
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:247
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:258
 msgid "Enter a whole number."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:396
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:1126
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:402
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1143
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:418
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:1149
 msgid "Enter a valid date."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:420
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:1127
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:426
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1144
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:442
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:1150
 msgid "Enter a valid time."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:442
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:454
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:464
 msgid "Enter a valid date/time."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:471
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:488
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:493
 msgid "Enter a valid duration."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:472
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:489
 #, python-brace-format
 msgid "The number of days must be between {min_days} and {max_days}."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:532
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:549
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:547
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:533
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:550
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:548
 msgid "No file was submitted."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:534
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:551
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:549
 msgid "The submitted file is empty."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:536
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:553
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:551
 #, python-format
 msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
@@ -4819,21 +4605,21 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:539
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:556
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:554
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:600
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:617
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:619
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:762
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:852
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1270
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:779
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:869
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1309
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:776
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:872
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1265
@@ -4841,78 +4627,82 @@ msgstr ""
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:853
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:968
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1269
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:870
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:985
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1308
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:873
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:990
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1264
 msgid "Enter a list of values."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:969
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:986
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:991
 msgid "Enter a complete value."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:1185
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1202
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:1208
 msgid "Enter a valid UUID."
 msgstr ""
 
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1232
+msgid "Enter a valid JSON."
+msgstr ""
+
 #. Translators: This is the default suffix added to form field labels
-#: venv/lib/python3.6/site-packages/django/forms/forms.py:86
+#: venv/lib/python3.6/site-packages/django/forms/forms.py:76
 #: venv2/lib/python2.7/site-packages/django/forms/forms.py:87
 msgid ":"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/forms.py:212
+#: venv/lib/python3.6/site-packages/django/forms/forms.py:203
 #: venv2/lib/python2.7/site-packages/django/forms/forms.py:213
 #, python-format
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:91
-#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:97
-msgid "ManagementForm data is missing or has been tampered with"
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:61
+#, python-format
+msgid ""
+"ManagementForm data is missing or has been tampered with. Missing fields: "
+"%(field_names)s. You may need to file a bug report if the issue persists."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:338
-#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:355
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:370
 #, python-format
-msgid "Please submit %d or fewer forms."
-msgid_plural "Please submit %d or fewer forms."
+msgid "Please submit at most %d form."
+msgid_plural "Please submit at most %d forms."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:345
-#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:362
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:377
 #, python-format
-msgid "Please submit %d or more forms."
-msgid_plural "Please submit %d or more forms."
+msgid "Please submit at least %d form."
+msgid_plural "Please submit at least %d forms."
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:371
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:373
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:405
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:412
 #: venv2/lib/python2.7/site-packages/django/forms/formsets.py:390
 #: venv2/lib/python2.7/site-packages/django/forms/formsets.py:392
 msgid "Order"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:751
+#: venv/lib/python3.6/site-packages/django/forms/models.py:763
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:744
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:755
+#: venv/lib/python3.6/site-packages/django/forms/models.py:767
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:748
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:761
+#: venv/lib/python3.6/site-packages/django/forms/models.py:773
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:754
 #, python-format
 msgid ""
@@ -4920,55 +4710,55 @@ msgid ""
 "for the %(lookup)s in %(date_field)s."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:770
+#: venv/lib/python3.6/site-packages/django/forms/models.py:782
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:763
 msgid "Please correct the duplicate values below."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1091
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1109
 msgid "The inline value did not match the parent instance."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1158
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1193
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1154
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1272
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1311
 #, python-format
-msgid "\"%(pk)s\" is not a valid value."
+msgid "“%(pk)s” is not a valid value."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/utils.py:162
-#: venv2/lib/python2.7/site-packages/django/forms/utils.py:172
+#: venv/lib/python3.6/site-packages/django/forms/utils.py:172
 #, python-format
 msgid ""
-"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it "
 "may be ambiguous or it may not exist."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:396
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:404
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:378
 msgid "Currently"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:710
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:715
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:704
 msgid "Yes"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:711
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:716
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:705
 msgid "No"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:788
+#. Translators: Please do not add spaces around commas.
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:805
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:851
 msgid "yes,no,maybe"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:817
 #: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:834
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:851
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:880
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:897
 #, python-format
@@ -4977,62 +4767,62 @@ msgid_plural "%(size)d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:836
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:853
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:899
 #, python-format
 msgid "%s KB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:838
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:855
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:901
 #, python-format
 msgid "%s MB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:840
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:857
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:903
 #, python-format
 msgid "%s GB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:842
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:859
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:905
 #, python-format
 msgid "%s TB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:844
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:861
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:907
 #, python-format
 msgid "%s PB"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:62
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:66
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:66
 msgid "p.m."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:63
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:67
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:67
 msgid "a.m."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:68
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:72
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:72
 msgid "PM"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:69
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:73
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:73
 msgid "AM"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:150
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:146
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:158
 msgid "midnight"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:152
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:148
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:160
 msgid "noon"
 msgstr ""
@@ -5376,20 +5166,20 @@ msgstr ""
 msgid "This is not a valid IPv6 address."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/text.py:67
+#: venv/lib/python3.6/site-packages/django/utils/text.py:71
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s…"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/utils/text.py:233
+#: venv/lib/python3.6/site-packages/django/utils/text.py:240
 #: venv2/lib/python2.7/site-packages/django/utils/text.py:251
 msgid "or"
 msgstr ""
 
 #. Translators: This string is used as a separator between list elements
-#: venv/lib/python3.6/site-packages/django/utils/text.py:252
-#: venv/lib/python3.6/site-packages/django/utils/timesince.py:83
+#: venv/lib/python3.6/site-packages/django/utils/text.py:259
+#: venv/lib/python3.6/site-packages/django/utils/timesince.py:94
 #: venv2/lib/python2.7/site-packages/django/utils/text.py:270
 #: venv2/lib/python2.7/site-packages/django/utils/timesince.py:71
 msgid ", "
@@ -5443,11 +5233,6 @@ msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: venv/lib/python3.6/site-packages/django/utils/timesince.py:72
-#: venv2/lib/python2.7/site-packages/django/utils/timesince.py:60
-msgid "0 minutes"
-msgstr ""
-
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:110
 #: venv2/lib/python2.7/site-packages/django/views/csrf.py:109
 msgid "Forbidden"
@@ -5459,29 +5244,27 @@ msgid "CSRF verification failed. Request aborted."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:115
-#: venv2/lib/python2.7/site-packages/django/views/csrf.py:114
 msgid ""
-"You are seeing this message because this HTTPS site requires a 'Referer "
-"header' to be sent by your Web browser, but none was sent. This header is "
+"You are seeing this message because this HTTPS site requires a “Referer "
+"header” to be sent by your Web browser, but none was sent. This header is "
 "required for security reasons, to ensure that your browser is not being "
 "hijacked by third parties."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:120
-#: venv2/lib/python2.7/site-packages/django/views/csrf.py:119
 msgid ""
-"If you have configured your browser to disable 'Referer' headers, please re-"
-"enable them, at least for this site, or for HTTPS connections, or for 'same-"
-"origin' requests."
+"If you have configured your browser to disable “Referer” headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for “same-"
+"origin” requests."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:124
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
-"including the 'Referrer-Policy: no-referrer' header, please remove them. The "
-"CSRF protection requires the 'Referer' header to do strict referer checking. "
-"If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
-"\" ...> for links to third-party sites."
+"including the “Referrer-Policy: no-referrer” header, please remove them. The "
+"CSRF protection requires the “Referer” header to do strict referer checking. "
+"If you’re concerned about privacy, use alternatives like <a rel=\"noreferrer"
+"\" …> for links to third-party sites."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:132
@@ -5493,10 +5276,9 @@ msgid ""
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:137
-#: venv2/lib/python2.7/site-packages/django/views/csrf.py:129
 msgid ""
 "If you have configured your browser to disable cookies, please re-enable "
-"them, at least for this site, or for 'same-origin' requests."
+"them, at least for this site, or for “same-origin” requests."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:142
@@ -5541,7 +5323,7 @@ msgstr ""
 msgid "No %(verbose_name_plural)s available"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:589
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:594
 #: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:669
 #, python-format
 msgid ""
@@ -5549,10 +5331,9 @@ msgid ""
 "allow_future is False."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:623
-#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:703
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:628
 #, python-format
-msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgid "Invalid date string “%(datestr)s” given format “%(format)s”"
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/detail.py:54
@@ -5562,8 +5343,7 @@ msgid "No %(verbose_name)s found matching the query"
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/list.py:67
-#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:77
-msgid "Page is not 'last', nor can it be converted to an int."
+msgid "Page is not “last”, nor can it be converted to an int."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/list.py:72
@@ -5573,9 +5353,8 @@ msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/generic/list.py:154
-#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:172
 #, python-format
-msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgid "Empty list and “%(class_name)s.allow_empty” is False."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/static.py:40
@@ -5584,9 +5363,8 @@ msgid "Directory indexes are not allowed here."
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/static.py:42
-#: venv2/lib/python2.7/site-packages/django/views/static.py:46
 #, python-format
-msgid "\"%(path)s\" does not exist"
+msgid "“%(path)s” does not exist"
 msgstr ""
 
 #: venv/lib/python3.6/site-packages/django/views/static.py:80
@@ -5595,22 +5373,19 @@ msgstr ""
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:6
-msgid "Django: the Web framework for perfectionists with deadlines."
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:7
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:221
+msgid "The install worked successfully! Congratulations!"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:345
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:207
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:367
-msgid "The install worked successfully! Congratulations!"
-msgstr ""
-
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:368
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:222
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
@@ -5619,39 +5394,160 @@ msgid ""
 "URLs."
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:383
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:230
 msgid "Django Documentation"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:384
-msgid "Topics, references, &amp; how-to's"
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:231
+msgid "Topics, references, &amp; how-to’s"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:395
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:239
 msgid "Tutorial: A Polling App"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:396
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:240
 msgid "Get started with Django"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:407
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:248
 msgid "Django Community"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:408
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:249
 msgid "Connect, get help, or contribute"
 msgstr ""
 
+#: venv/lib/python3.6/site-packages/django_bootstrap5/components.py:20
+msgid "close"
+msgstr ""
+
 #: venv/lib/python3.6/site-packages/django_icons/renderers/image.py:217
 msgid "Icon of {}"
 msgstr ""
 
-#: venv/lib/python3.6/site-packages/qr_code/qrcode/utils.py:73
-#, python-format
-msgid "The option '%s' is not a valid option for a QR code."
+#: venv/lib/python3.6/site-packages/isort/main.py:158
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1615
+msgid "show this help message and exit"
 msgstr ""
 
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:245
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:252
+msgid ""
+"Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
+"hyphens."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:463
+#, python-format
+msgid ""
+"File extension '%(extension)s' is not allowed. Allowed extensions are: "
+"'%(allowed_extensions)s'."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:905
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1807
+#, python-format
+msgid "'%(value)s' value must be an integer."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:990
+#, python-format
+msgid "'%(value)s' value must be either True or False."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1172
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+"format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1174
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1319
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
+"date."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1317
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1321
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]) but it is an invalid date/time."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1475
+#, python-format
+msgid "'%(value)s' value must be a decimal number."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1628
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
+"uuuuuu] format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1773
+#, python-format
+msgid "'%(value)s' value must be a float."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2006
+#, python-format
+msgid "'%(value)s' value must be either None, True or False."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2163
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"format."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2165
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"invalid time."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2366
+#, python-format
+msgid "'%(value)s' is not a valid UUID."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:97
+msgid "ManagementForm data is missing or has been tampered with"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:355
+#, python-format
+msgid "Please submit %d or fewer forms."
+msgid_plural "Please submit %d or fewer forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:362
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1093
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
@@ -5661,12 +5557,44 @@ msgstr ""
 msgid "\"%(pk)s\" is not a valid value for a primary key."
 msgstr ""
 
+#: venv2/lib/python2.7/site-packages/django/forms/utils.py:172
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
 #: venv2/lib/python2.7/site-packages/django/utils/text.py:81
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
+#: venv2/lib/python2.7/site-packages/django/utils/timesince.py:60
+msgid "0 minutes"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:114
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:119
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:129
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+
 #: venv2/lib/python2.7/site-packages/django/views/debug.py:520
 msgid "Welcome to Django"
 msgstr ""
@@ -5691,6 +5619,25 @@ msgid ""
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 
+#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:703
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:77
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:172
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
+
+#: venv2/lib/python2.7/site-packages/django/views/static.py:46
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
+
 #: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:313
 msgid "usage: "
 msgstr ""
@@ -5750,10 +5697,6 @@ msgstr ""
 msgid "optional arguments"
 msgstr ""
 
-#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1615
-msgid "show this help message and exit"
-msgstr ""
-
 #: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1621
 msgid "show program's version number and exit"
 msgstr ""
@@ -5839,6 +5782,49 @@ msgstr ""
 msgid "%s: error: %s\n"
 msgstr ""
 
+#: virtsecrets/templates/create_secret_block.html:12
+msgid "Create New Secret"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:18
+msgid "Ephemeral"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:21
+#: virtsecrets/templates/create_secret_block.html:30
+msgid "no"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:22
+#: virtsecrets/templates/create_secret_block.html:31
+msgid "yes"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:27
+msgid "Private"
+msgstr ""
+
+#: virtsecrets/templates/create_secret_block.html:46
+#: virtsecrets/templates/secrets.html:62
+msgid "Data"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:51
+msgid "Hypervisor doesn't have any Secrets"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:61
+msgid "Usage Type"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:89
+msgid "Set secret value"
+msgstr ""
+
+#: virtsecrets/templates/secrets.html:95
+msgid "Value"
+msgstr ""
+
 #: webvirtcloud/middleware.py:18
 #, python-format
 msgid "libvirt Error - %(exception)s"
diff --git a/locale/zh/LC_MESSAGES/django.mo b/locale/zh/LC_MESSAGES/django.mo
index 855067e..b084aa4 100644
Binary files a/locale/zh/LC_MESSAGES/django.mo and b/locale/zh/LC_MESSAGES/django.mo differ
diff --git a/locale/zh/LC_MESSAGES/django.po b/locale/zh/LC_MESSAGES/django.po
index 50b31dc..4ae541e 100644
--- a/locale/zh/LC_MESSAGES/django.po
+++ b/locale/zh/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: \n"
+"POT-Creation-Date: 2021-12-20 07:58+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.4.2\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"Language: zh_CN\n"
 
 #: accounts/forms.py:25
 msgid "Instance owned by another user"
@@ -92,39 +92,39 @@ msgstr "编辑用户"
 msgid "Create user instance"
 msgstr "创建用户实例"
 
-#: accounts/templates/account.html:27
+#: accounts/templates/account.html:28
 #: computes/templates/computes/instances.html:5
 #: computes/templates/computes/instances.html:9
-#: computes/templates/computes/instances.html:32
-#: computes/templates/overview.html:19 instances/templates/allinstances.html:5
+#: computes/templates/computes/instances.html:30
+#: computes/templates/overview.html:18 instances/templates/allinstances.html:5
 #: instances/templates/allinstances.html:9
 #: instances/templates/bottom_bar.html:17
 #: interfaces/templates/interface.html:16
-#: interfaces/templates/interfaces.html:20 networks/templates/network.html:17
+#: interfaces/templates/interfaces.html:22 networks/templates/network.html:17
 #: networks/templates/networks.html:19 nwfilters/templates/nwfilter.html:17
-#: nwfilters/templates/nwfilters.html:25 secrets/templates/secrets.html:23
-#: storages/templates/storage.html:22 storages/templates/storages.html:19
-#: templates/navbar.html:14
+#: nwfilters/templates/nwfilters.html:23 storages/templates/storage.html:23
+#: storages/templates/storages.html:19 templates/navbar.html:14
+#: virtsecrets/templates/secrets.html:25
 msgid "Instances"
 msgstr "实例"
 
-#: accounts/templates/account.html:30
+#: accounts/templates/account.html:33
 msgid "Public Keys"
 msgstr "公钥"
 
-#: accounts/templates/account.html:40 admin/templates/admin/logs.html:27
+#: accounts/templates/account.html:44 admin/templates/admin/logs.html:27
 #: instances/templates/instance.html:5
 msgid "Instance"
 msgstr "实例"
 
-#: accounts/templates/account.html:41
+#: accounts/templates/account.html:45
 msgid "VNC"
 msgstr "VNC"
 
-#: accounts/templates/account.html:42 instances/templates/instance.html:87
-#: instances/templates/instances/resize_tab.html:56
-#: instances/templates/instances/resize_tab.html:58
-#: instances/templates/instances/resize_tab.html:85
+#: accounts/templates/account.html:46 instances/templates/instance.html:93
+#: instances/templates/instances/resize_tab.html:55
+#: instances/templates/instances/resize_tab.html:57
+#: instances/templates/instances/resize_tab.html:84
 #: instances/templates/instances/resize_tab.html:121
 #: instances/templates/instances/resize_tab.html:125
 #: instances/templates/instances/resize_tab.html:151
@@ -133,47 +133,47 @@ msgstr "VNC"
 msgid "Resize"
 msgstr "调整配置"
 
-#: accounts/templates/account.html:43 accounts/templates/account.html:61
-#: accounts/templates/profile.html:51 admin/templates/admin/group_list.html:46
-#: admin/templates/admin/user_list.html:68
-#: computes/templates/computes/list.html:54
-#: instances/templates/instances/settings_tab.html:310
-#: instances/templates/instances/settings_tab.html:314
+#: accounts/templates/account.html:47 accounts/templates/account.html:65
+#: accounts/templates/profile.html:55 admin/templates/admin/group_list.html:43
+#: admin/templates/admin/user_list.html:65
+#: computes/templates/computes/list.html:53
+#: instances/templates/instances/settings_tab.html:325
+#: instances/templates/instances/settings_tab.html:329
 #: interfaces/templates/interface.html:60 networks/templates/network.html:50
-#: nwfilters/templates/nwfilter.html:111 nwfilters/templates/nwfilter.html:151
-#: nwfilters/templates/nwfilters.html:120 secrets/templates/secrets.html:77
-#: storages/templates/storage.html:61 storages/templates/storage.html:174
-#: templates/common/confirm_delete.html:21
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:375
+#: nwfilters/templates/nwfilter.html:103 nwfilters/templates/nwfilter.html:143
+#: nwfilters/templates/nwfilters.html:118 storages/templates/storage.html:63
+#: storages/templates/storage.html:175 templates/common/confirm_delete.html:21
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:417
 #: venv2/lib/python2.7/site-packages/django/forms/formsets.py:394
+#: virtsecrets/templates/secrets.html:78
 msgid "Delete"
 msgstr "删除"
 
-#: accounts/templates/account.html:44
-#: instances/templates/create_instance_w2.html:81
-#: instances/templates/instances/settings_tab.html:239
-#: instances/templates/instances/snapshots_tab.html:49
-#: nwfilters/templates/nwfilter.html:101 nwfilters/templates/nwfilter.html:135
-#: nwfilters/templates/nwfilters.html:57 secrets/templates/secrets.html:62
-#: storages/templates/storage.html:100
+#: accounts/templates/account.html:48
+#: instances/templates/create_instance_w2.html:80
+#: instances/templates/instances/settings_tab.html:254
+#: instances/templates/instances/snapshots_tab.html:41
+#: nwfilters/templates/nwfilter.html:93 nwfilters/templates/nwfilter.html:127
+#: nwfilters/templates/nwfilters.html:55 storages/templates/storage.html:101
+#: virtsecrets/templates/secrets.html:63
 msgid "Action"
 msgstr "应用"
 
-#: accounts/templates/account.html:56
+#: accounts/templates/account.html:60
 msgid "edit"
 msgstr "编辑"
 
-#: accounts/templates/account.html:74
+#: accounts/templates/account.html:78
 msgid "Key name"
 msgstr "密钥名称"
 
-#: accounts/templates/account.html:75
+#: accounts/templates/account.html:79
 msgid "Public key"
 msgstr "公钥"
 
 #: accounts/templates/accounts/change_password_form.html:7
 #: accounts/templates/accounts/change_password_form.html:14
-#: accounts/templates/profile.html:29
+#: accounts/templates/profile.html:33
 msgid "Change Password"
 msgstr "更改密码"
 
@@ -186,11 +186,11 @@ msgid "Cancel"
 msgstr "退出"
 
 #: accounts/templates/accounts/change_password_form.html:27
-#: instances/templates/instances/settings_tab.html:638
-#: instances/templates/instances/settings_tab.html:642
-#: instances/templates/instances/settings_tab.html:824
-#: instances/templates/instances/settings_tab.html:826
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:397
+#: instances/templates/instances/settings_tab.html:672
+#: instances/templates/instances/settings_tab.html:676
+#: instances/templates/instances/settings_tab.html:853
+#: instances/templates/instances/settings_tab.html:855
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:405
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:379
 msgid "Change"
 msgstr "变更"
@@ -224,7 +224,7 @@ msgstr "我没有或失去了我的 OTP！"
 
 #: accounts/templates/accounts/otp_login.html:24
 #: accounts/templates/login.html:5 accounts/templates/login.html:23
-#: accounts/templates/login.html:27
+#: accounts/templates/login.html:28
 msgid "Sign In"
 msgstr "登录"
 
@@ -236,12 +236,12 @@ msgstr "私有云平台"
 msgid "Incorrect username or password."
 msgstr "用户名或密码错误。"
 
-#: accounts/templates/login.html:24 admin/templates/admin/logs.html:26
-#: computes/templates/computes/instances.html:67
+#: accounts/templates/login.html:24 admin/templates/admin/logs.html:25
+#: computes/templates/computes/instances.html:64
 #: instances/templates/add_instance_owner_block.html:18
 #: instances/templates/allinstances_index_grouped.html:8
 #: instances/templates/allinstances_index_nongrouped.html:7
-#: instances/templates/instances/stats_tab.html:84
+#: instances/templates/instances/stats_tab.html:87
 msgid "User"
 msgstr "用户"
 
@@ -265,26 +265,26 @@ msgstr "已成功注销"
 msgid "Profile"
 msgstr "个人资料"
 
-#: accounts/templates/profile.html:14
+#: accounts/templates/profile.html:15
 msgid "Edit Profile"
 msgstr "编辑个人资料"
 
-#: accounts/templates/profile.html:17
-#: instances/templates/instances/access_tab.html:23
+#: accounts/templates/profile.html:20
+#: instances/templates/instances/access_tab.html:20
 msgid "SSH Keys"
 msgstr "SSH 密钥"
 
-#: accounts/templates/profile.html:34
-#: instances/templates/instances/settings_tab.html:686
-#: instances/templates/instances/settings_tab.html:688
+#: accounts/templates/profile.html:38
+#: instances/templates/instances/settings_tab.html:720
+#: instances/templates/instances/settings_tab.html:722
 msgid "Update"
 msgstr "更新"
 
-#: accounts/templates/profile.html:64
+#: accounts/templates/profile.html:68
 msgid "Add SSH Key"
 msgstr "添加 SSH 密钥"
 
-#: accounts/templates/profile.html:72
+#: accounts/templates/profile.html:76
 #: instances/templates/add_instance_network_block.html:50
 #: instances/templates/add_instance_owner_block.html:31
 #: instances/templates/create_flav_block.html:28
@@ -304,31 +304,31 @@ msgstr "请查看此消息的 HTML 版本内容。"
 msgid "Profile updated"
 msgstr "个人资料已更新"
 
-#: accounts/views.py:44 accounts/views.py:40
+#: accounts/views.py:44
 msgid "SSH key added"
 msgstr "SSH 密钥已添加"
 
-#: accounts/views.py:52 accounts/views.py:45
+#: accounts/views.py:52
 msgid "Add SSH key"
 msgstr "添加 SSH 密钥"
 
-#: accounts/views.py:61 accounts/views.py:53
+#: accounts/views.py:61
 msgid "SSH key deleted"
 msgstr "SSH 密钥已删除"
 
-#: accounts/views.py:69 accounts/views.py:58
+#: accounts/views.py:69
 msgid "Delete SSH key"
 msgstr "删除 SSH 密钥"
 
-#: accounts/views.py:101 accounts/views.py:86
+#: accounts/views.py:101
 msgid "Password Changed"
 msgstr "密码已更改"
 
-#: accounts/views.py:121 accounts/views.py:106
+#: accounts/views.py:121
 msgid "Create User Instance"
 msgstr "创建用户实例"
 
-#: accounts/views.py:139 accounts/views.py:124
+#: accounts/views.py:139
 msgid "Update User Instance"
 msgstr "更新用户实例"
 
@@ -337,7 +337,7 @@ msgstr "更新用户实例"
 msgid "OTP Sent to %(email)s"
 msgstr "OTP 发送到 %(email)s"
 
-#: accounts/views.py:183 accounts/views.py:165
+#: accounts/views.py:183
 msgid "Email OTP"
 msgstr "Email OTP"
 
@@ -346,17 +346,7 @@ msgstr "Email OTP"
 msgid "OTP QR code was emailed to user %(user)s"
 msgstr "OTP QR 码已通过电子邮件发送给用户 %(user)s"
 
-#: accounts/views.py:160
-#, python-format
-msgid "OTP Sent to %s"
-msgstr "OTP 发送到 %s"
-
-#: accounts/views.py:175
-#, python-format
-msgid "OTP QR code was emailed to user %s"
-msgstr "OTP QR 码已通过电子邮件发送给用户 %s"
-
-#: accounts/views.py:177
+#: accounts/views.py:196
 msgid "User email not set, failed to send QR code"
 msgstr "未设置用户电子邮件，无法发送 QR 码"
 
@@ -364,150 +354,153 @@ msgstr "未设置用户电子邮件，无法发送 QR 码"
 msgid "Permissions"
 msgstr "权限"
 
-#: admin/forms.py:56 admin/templates/admin/group_list.html:15
+#: admin/forms.py:56 admin/templates/admin/group_list.html:13
 #: templates/navbar.html:30
 msgid "Groups"
 msgstr "用户组"
 
-#: admin/forms.py:81 admin/forms.py:79
+#: admin/forms.py:81
+#, fuzzy
+#| msgid ""
+#| "Raw passwords are not stored, so there is no way to see\n"
+#| "                this user's password, but you can change the password "
+#| "using <a href='{}'>this form</a>."
 msgid ""
-"Raw passwords are not stored, so there is no way to see\n"
-"                this user's password, but you can change the password using "
-"<a href='{}'>this form</a>."
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, \n"
+"                    but you can change the password using <a href='{}'>this "
+"form</a>."
 msgstr ""
 "原始密码未存储，因此无法查看\n"
 "                该用户的密码，但是您可以使用 <a href='{}'>此表单</a>更改密"
 "码。"
 
 #: admin/templates/admin/group_list.html:5 admin/views.py:87
-#: instances/templates/instances/settings_tab.html:63 templates/navbar.html:29
+#: instances/templates/instances/settings_tab.html:69 templates/navbar.html:29
 msgid "Users"
 msgstr "用户"
 
-#: admin/templates/admin/group_list.html:13
-#: admin/templates/admin/user_list.html:16
-#: computes/templates/computes/instances.html:18
-#: instances/templates/allinstances.html:16
-#: nwfilters/templates/nwfilters.html:12 storages/templates/storage.html:87
-#: templates/search_block.html:3
-msgid "Search"
-msgstr "搜索"
-
-#: admin/templates/admin/group_list.html:23 admin/templates/admin/logs.html:16
-#: admin/templates/admin/user_list.html:26
-#: computes/templates/computes/instances.html:57
-#: computes/templates/computes/list.html:20
-#: instances/templates/create_instance_w2.html:66
-#: interfaces/templates/interfaces.html:47 networks/templates/networks.html:46
-#: nwfilters/templates/nwfilters.html:135 secrets/templates/secrets.html:50
-#: storages/templates/storage.html:187 storages/templates/storages.html:46
+#: admin/templates/admin/group_list.html:20 admin/templates/admin/logs.html:15
+#: admin/templates/admin/user_list.html:23
+#: computes/templates/computes/instances.html:55
+#: computes/templates/computes/list.html:19
+#: instances/templates/create_instance_w2.html:67
+#: interfaces/templates/interfaces.html:48 networks/templates/networks.html:45
+#: nwfilters/templates/nwfilters.html:132 storages/templates/storage.html:187
+#: storages/templates/storages.html:45 virtsecrets/templates/secrets.html:51
 msgid "Warning"
 msgstr "警告"
 
-#: admin/templates/admin/group_list.html:23
+#: admin/templates/admin/group_list.html:20
 msgid "You don't have any groups"
 msgstr "您还没有任何用户组"
 
-#: admin/templates/admin/group_list.html:31
+#: admin/templates/admin/group_list.html:28
 msgid "Group Name"
 msgstr "用户组名称"
 
-#: admin/templates/admin/group_list.html:32
-#: admin/templates/admin/user_list.html:39
-#: computes/templates/computes/instances.html:71
-#: computes/templates/computes/list.html:31
+#: admin/templates/admin/group_list.html:29
+#: admin/templates/admin/user_list.html:36
+#: computes/templates/computes/instances.html:68
+#: computes/templates/computes/list.html:30
 #: instances/templates/allinstances_index_grouped.html:12
 #: instances/templates/allinstances_index_nongrouped.html:12
-#: instances/templates/instances/settings_tab.html:343
-#: instances/templates/instances/settings_tab.html:491
+#: instances/templates/instances/settings_tab.html:355
+#: instances/templates/instances/settings_tab.html:525
 #: networks/templates/network.html:175 networks/templates/network.html:284
 #: networks/templates/network.html:332
 msgid "Actions"
 msgstr "应用"
 
-#: admin/templates/admin/group_list.html:43
-#: admin/templates/admin/user_list.html:62
-#: computes/templates/computes/list.html:53 networks/templates/network.html:82
-#: nwfilters/templates/nwfilter.html:59 secrets/templates/secrets.html:74
+#: admin/templates/admin/group_list.html:40
+#: admin/templates/admin/user_list.html:59
+#: computes/templates/computes/list.html:52 networks/templates/network.html:82
+#: nwfilters/templates/nwfilter.html:59 virtsecrets/templates/secrets.html:75
 msgid "Edit"
 msgstr "编辑"
 
 #: admin/templates/admin/logs.html:5 admin/templates/admin/logs.html:7
-#: instances/templates/instances/stats_tab.html:13 templates/navbar.html:31
+#: instances/templates/instances/stats_tab.html:12 templates/navbar.html:31
 msgid "Logs"
 msgstr "日志"
 
-#: admin/templates/admin/logs.html:16
+#: admin/templates/admin/logs.html:15
 msgid "You don't have any Logs"
 msgstr "您还没有任何日志"
 
-#: admin/templates/admin/logs.html:25
-#: instances/templates/instances/snapshots_tab.html:48
-#: instances/templates/instances/stats_tab.html:83
+#: admin/templates/admin/logs.html:24
+#: instances/templates/instances/snapshots_tab.html:40
+#: instances/templates/instances/stats_tab.html:86
 msgid "Date"
 msgstr "日期"
 
+#: admin/templates/admin/logs.html:26
+#: console/templates/console-spice-full.html:202
+#: instances/templates/allinstances_index_nongrouped.html:7
+msgid "Host"
+msgstr "主机"
+
 #: admin/templates/admin/logs.html:28
-#: instances/templates/instances/stats_tab.html:85
+#: instances/templates/instances/stats_tab.html:88
 msgid "Message"
 msgstr "消息"
 
 #: admin/templates/admin/user_form.html:21
 #: computes/templates/computes/form.html:23
-#: instances/templates/edit_instance_volume.html:124
+#: instances/templates/instances/edit_instance_volume.html:111
 #: networks/templates/add_network_qos.html:51 templates/common/form.html:22
 msgid "Save"
 msgstr "保存"
 
-#: admin/templates/admin/user_list.html:26
+#: admin/templates/admin/user_list.html:23
 msgid "You don't have any user"
 msgstr "您还没有任何用户"
 
-#: admin/templates/admin/user_list.html:34
+#: admin/templates/admin/user_list.html:31
 msgid "Username"
 msgstr "用户名"
 
-#: admin/templates/admin/user_list.html:35
-#: computes/templates/computes/instances.html:68
-#: computes/templates/computes/list.html:29
+#: admin/templates/admin/user_list.html:32
+#: computes/templates/computes/instances.html:65
+#: computes/templates/computes/list.html:28
 #: instances/templates/allinstances_index_grouped.html:9
 #: instances/templates/allinstances_index_nongrouped.html:9
 msgid "Status"
 msgstr "状态"
 
-#: admin/templates/admin/user_list.html:36
+#: admin/templates/admin/user_list.html:33
 msgid "Staff"
 msgstr "普通用户"
 
-#: admin/templates/admin/user_list.html:37
+#: admin/templates/admin/user_list.html:34
 msgid "Superuser"
 msgstr "超级用户"
 
-#: admin/templates/admin/user_list.html:38
+#: admin/templates/admin/user_list.html:35
 msgid "Can Clone"
 msgstr "可以克隆"
 
-#: admin/templates/admin/user_list.html:51
-#: computes/templates/computes/instances.html:94
-#: instances/templates/allinstances_index_grouped.html:57
-#: instances/templates/allinstances_index_nongrouped.html:40
+#: admin/templates/admin/user_list.html:48
+#: computes/templates/computes/instances.html:91
+#: instances/templates/allinstances_index_grouped.html:59
+#: instances/templates/allinstances_index_nongrouped.html:41
 #: instances/templates/instance.html:19
 msgid "Active"
 msgstr "激活"
 
-#: admin/templates/admin/user_list.html:53
+#: admin/templates/admin/user_list.html:50
 msgid "Blocked"
 msgstr "锁定"
 
-#: admin/templates/admin/user_list.html:61
+#: admin/templates/admin/user_list.html:58
 msgid "View Profile"
 msgstr "查看用户资料"
 
-#: admin/templates/admin/user_list.html:64
+#: admin/templates/admin/user_list.html:61
 msgid "Block"
 msgstr "锁定"
 
-#: admin/templates/admin/user_list.html:66
+#: admin/templates/admin/user_list.html:63
 msgid "Unblock"
 msgstr "解锁"
 
@@ -519,11 +512,11 @@ msgstr "创建用户组"
 msgid "Update Group"
 msgstr "更新用户组"
 
-#: admin/views.py:113
+#: admin/views.py:110
 msgid "Create User"
 msgstr "创建用户"
 
-#: admin/views.py:129 admin/views.py:144 admin/views.py:136
+#: admin/views.py:129
 msgid "Update User"
 msgstr "更新用户"
 
@@ -532,11 +525,7 @@ msgstr "更新用户"
 msgid "Password changed for %(user)s"
 msgstr "%(user)s 的密码已更改"
 
-#: admin/views.py:149
-msgid "User password changed: {}"
-msgstr "用户密码已更改： {}"
-
-#: admin/views.py:152
+#: admin/views.py:144
 msgid "Wrong Data Provided"
 msgstr "提供的数据有误"
 
@@ -826,24 +815,15 @@ msgstr "其他设置"
 msgid "SASS directory path is changed. Now: %(dir)s"
 msgstr "SASS 目录路径已更改。现在是：%(dir)s"
 
-#: appsettings/views.py:67
+#: appsettings/views.py:70
 #, python-format
 msgid "Theme is changed. Now: %(theme)s"
 msgstr "主题已更改。现在是： %(theme)s"
 
-#: appsettings/views.py:82
-#, python-brace-format
-msgid "SASS directory path is changed. Now: {sass_dir.value}"
-msgstr "SASS 目录路径已更改。现在是： {sass_dir.value}"
-
-#: appsettings/views.py:65
-#, python-brace-format
-msgid "Theme changed. Now: {theme}"
-msgstr "主题已更改。现在是： {theme}"
-
-#: appsettings/views.py:80
-#, python-brace-format
-msgid "{setting.name} is changed. Now: {setting.value}"
+#: appsettings/views.py:85
+#, fuzzy, python-format
+#| msgid "{setting.name} is changed. Now: {setting.value}"
+msgid "%(setting)s is changed. Now: %(value)s"
 msgstr "{setting.name} 已改变。现在是： {setting.value}"
 
 #: computes/forms.py:21
@@ -874,144 +854,144 @@ msgstr "添加计算节点"
 msgid "Create Compute"
 msgstr "创建计算节点"
 
-#: computes/templates/computes/instances.html:29
-#: computes/templates/computes/list.html:49
-#: computes/templates/computes/list.html:51 computes/templates/overview.html:6
-#: computes/templates/overview.html:16 interfaces/templates/interface.html:13
-#: interfaces/templates/interfaces.html:17 networks/templates/network.html:14
+#: computes/templates/computes/instances.html:27
+#: computes/templates/computes/list.html:48
+#: computes/templates/computes/list.html:50 computes/templates/overview.html:6
+#: computes/templates/overview.html:15 interfaces/templates/interface.html:13
+#: interfaces/templates/interfaces.html:19 networks/templates/network.html:14
 #: networks/templates/networks.html:16 nwfilters/templates/nwfilter.html:14
-#: nwfilters/templates/nwfilters.html:22 secrets/templates/secrets.html:20
-#: storages/templates/storage.html:19 storages/templates/storages.html:16
+#: nwfilters/templates/nwfilters.html:20 storages/templates/storage.html:20
+#: storages/templates/storages.html:16 virtsecrets/templates/secrets.html:22
 msgid "Overview"
 msgstr "概览"
 
-#: computes/templates/computes/instances.html:35
-#: computes/templates/overview.html:22 interfaces/templates/interface.html:19
-#: interfaces/templates/interfaces.html:23 networks/templates/network.html:20
+#: computes/templates/computes/instances.html:33
+#: computes/templates/overview.html:21 interfaces/templates/interface.html:19
+#: interfaces/templates/interfaces.html:25 networks/templates/network.html:20
 #: networks/templates/networks.html:22 nwfilters/templates/nwfilter.html:20
-#: nwfilters/templates/nwfilters.html:28 secrets/templates/secrets.html:26
-#: storages/templates/storage.html:25 storages/templates/storages.html:4
-#: storages/templates/storages.html:6 storages/templates/storages.html:22
+#: nwfilters/templates/nwfilters.html:26 storages/templates/storage.html:26
+#: storages/templates/storages.html:4 storages/templates/storages.html:6
+#: storages/templates/storages.html:22 virtsecrets/templates/secrets.html:28
 msgid "Storages"
 msgstr "存储"
 
-#: computes/templates/computes/instances.html:38
-#: computes/templates/overview.html:25 interfaces/templates/interface.html:22
-#: interfaces/templates/interfaces.html:26 networks/templates/network.html:23
+#: computes/templates/computes/instances.html:36
+#: computes/templates/overview.html:24 interfaces/templates/interface.html:22
+#: interfaces/templates/interfaces.html:28 networks/templates/network.html:23
 #: networks/templates/networks.html:4 networks/templates/networks.html:6
 #: networks/templates/networks.html:25 nwfilters/templates/nwfilter.html:23
-#: nwfilters/templates/nwfilters.html:31 secrets/templates/secrets.html:29
-#: storages/templates/storage.html:28 storages/templates/storages.html:25
+#: nwfilters/templates/nwfilters.html:29 storages/templates/storage.html:29
+#: storages/templates/storages.html:25 virtsecrets/templates/secrets.html:31
 msgid "Networks"
 msgstr "网络"
 
-#: computes/templates/computes/instances.html:41
-#: computes/templates/overview.html:28 interfaces/templates/interface.html:25
+#: computes/templates/computes/instances.html:39
+#: computes/templates/overview.html:27 interfaces/templates/interface.html:25
 #: interfaces/templates/interfaces.html:5
 #: interfaces/templates/interfaces.html:7
-#: interfaces/templates/interfaces.html:29 networks/templates/network.html:26
+#: interfaces/templates/interfaces.html:31 networks/templates/network.html:26
 #: networks/templates/networks.html:28 nwfilters/templates/nwfilter.html:26
-#: nwfilters/templates/nwfilters.html:34 secrets/templates/secrets.html:32
-#: storages/templates/storage.html:31 storages/templates/storages.html:28
+#: nwfilters/templates/nwfilters.html:32 storages/templates/storage.html:32
+#: storages/templates/storages.html:28 virtsecrets/templates/secrets.html:34
 msgid "Interfaces"
 msgstr "接口"
 
-#: computes/templates/computes/instances.html:44
-#: computes/templates/overview.html:31 interfaces/templates/interface.html:28
-#: interfaces/templates/interfaces.html:32 networks/templates/network.html:29
+#: computes/templates/computes/instances.html:42
+#: computes/templates/overview.html:30 interfaces/templates/interface.html:28
+#: interfaces/templates/interfaces.html:34 networks/templates/network.html:29
 #: networks/templates/networks.html:31 nwfilters/templates/nwfilter.html:29
 #: nwfilters/templates/nwfilters.html:5 nwfilters/templates/nwfilters.html:7
-#: nwfilters/templates/nwfilters.html:37 secrets/templates/secrets.html:35
-#: storages/templates/storage.html:34 storages/templates/storages.html:31
+#: nwfilters/templates/nwfilters.html:35 storages/templates/storage.html:35
+#: storages/templates/storages.html:31 virtsecrets/templates/secrets.html:37
 msgid "NWFilters"
 msgstr "NWFilter规则"
 
-#: computes/templates/computes/instances.html:47
-#: computes/templates/overview.html:34 interfaces/templates/interface.html:31
-#: interfaces/templates/interfaces.html:35 networks/templates/network.html:32
+#: computes/templates/computes/instances.html:45
+#: computes/templates/overview.html:33 interfaces/templates/interface.html:31
+#: interfaces/templates/interfaces.html:37 networks/templates/network.html:32
 #: networks/templates/networks.html:34 nwfilters/templates/nwfilter.html:32
-#: nwfilters/templates/nwfilters.html:40 secrets/templates/secrets.html:4
-#: secrets/templates/secrets.html:10 secrets/templates/secrets.html:38
-#: storages/templates/create_stg_block.html:124
-#: storages/templates/storage.html:37 storages/templates/storages.html:34
+#: nwfilters/templates/nwfilters.html:38
+#: storages/templates/create_stg_block.html:138
+#: storages/templates/storage.html:38 storages/templates/storages.html:34
+#: virtsecrets/templates/secrets.html:4 virtsecrets/templates/secrets.html:10
+#: virtsecrets/templates/secrets.html:40
 msgid "Secrets"
 msgstr "密码/密钥"
 
-#: computes/templates/computes/instances.html:58
+#: computes/templates/computes/instances.html:56
 msgid "Hypervisor doesn't have any Instances"
 msgstr "虚拟机监控程序没有检测到任何实例"
 
-#: computes/templates/computes/instances.html:66
-#: computes/templates/computes/list.html:28
-#: instances/templates/add_instance_volume.html:40
-#: instances/templates/add_instance_volume.html:42
+#: computes/templates/computes/instances.html:63
+#: computes/templates/computes/list.html:27
+#: instances/templates/add_instance_volume.html:44
+#: instances/templates/add_instance_volume.html:46
 #: instances/templates/allinstances_index_grouped.html:7
 #: instances/templates/allinstances_index_nongrouped.html:5
-#: instances/templates/create_instance_w2.html:77
-#: instances/templates/create_instance_w2.html:103
-#: instances/templates/create_instance_w2.html:106
-#: instances/templates/create_instance_w2.html:305
-#: instances/templates/create_instance_w2.html:307
+#: instances/templates/create_instance_w2.html:76
+#: instances/templates/create_instance_w2.html:102
+#: instances/templates/create_instance_w2.html:105
+#: instances/templates/create_instance_w2.html:304
+#: instances/templates/create_instance_w2.html:306
 #: instances/templates/create_instance_w2.html:518
 #: instances/templates/create_instance_w2.html:520
-#: instances/templates/instances/settings_tab.html:340
-#: instances/templates/instances/snapshots_tab.html:47
+#: instances/templates/instances/settings_tab.html:353
+#: instances/templates/instances/snapshots_tab.html:39
 #: interfaces/templates/create_iface_block.html:18
 #: interfaces/templates/interface.html:75
 #: networks/templates/create_net_block.html:18
 #: networks/templates/modify_ipv4_fixed_address.html:30
 #: networks/templates/modify_ipv6_fixed_address.html:30
 #: networks/templates/network.html:174 networks/templates/network.html:283
-#: nwfilters/templates/nwfilter.html:41 nwfilters/templates/nwfilters.html:56
-#: nwfilters/templates/nwfilters.html:100
-#: nwfilters/templates/nwfilters.html:102
-#: storages/templates/create_stg_block.html:42
-#: storages/templates/create_stg_block.html:71
-#: storages/templates/create_stg_block.html:100
-#: storages/templates/create_stg_block.html:165
-#: storages/templates/create_stg_block.html:214
+#: nwfilters/templates/nwfilter.html:41 nwfilters/templates/nwfilters.html:54
+#: nwfilters/templates/nwfilters.html:98 nwfilters/templates/nwfilters.html:100
+#: storages/templates/create_stg_block.html:56
+#: storages/templates/create_stg_block.html:85
+#: storages/templates/create_stg_block.html:114
+#: storages/templates/create_stg_block.html:179
+#: storages/templates/create_stg_block.html:228
 #: storages/templates/create_stg_vol_block.html:21
-#: storages/templates/storage.html:96 storages/templates/storage.html:124
-#: storages/templates/storage.html:126
+#: storages/templates/storage.html:97 storages/templates/storage.html:125
+#: storages/templates/storage.html:127
 msgid "Name"
 msgstr "名称"
 
-#: computes/templates/computes/instances.html:66
+#: computes/templates/computes/instances.html:63
 #: instances/templates/allinstances_index_grouped.html:7
 #: instances/templates/allinstances_index_nongrouped.html:5
-#: instances/templates/instances/settings_tab.html:782
-#: instances/templates/instances/settings_tab.html:805
+#: instances/templates/instances/settings_tab.html:811
+#: instances/templates/instances/settings_tab.html:834
 msgid "Description"
 msgstr "描述"
 
-#: computes/templates/computes/instances.html:69
+#: computes/templates/computes/instances.html:66
 #: instances/templates/allinstances_index_grouped.html:10
 #: instances/templates/allinstances_index_nongrouped.html:10
-#: instances/templates/create_instance_w2.html:78
-#: instances/templates/create_instance_w2.html:323
+#: instances/templates/create_instance_w2.html:77
+#: instances/templates/create_instance_w2.html:322
 #: instances/templates/create_instance_w2.html:536
-#: instances/templates/instance.html:42 instances/templates/instance.html:44
+#: instances/templates/instance.html:43 instances/templates/instance.html:45
 msgid "VCPU"
 msgstr "VCPU"
 
-#: computes/templates/computes/instances.html:70
-#: computes/templates/overview.html:82
+#: computes/templates/computes/instances.html:67
+#: computes/templates/overview.html:80
 #: instances/templates/allinstances_index_grouped.html:11
 #: instances/templates/allinstances_index_nongrouped.html:11
-#: instances/templates/instances/resize_tab.html:13
+#: instances/templates/instances/resize_tab.html:12
 msgid "Memory"
 msgstr "内存"
 
-#: computes/templates/computes/instances.html:96
-#: instances/templates/allinstances_index_grouped.html:58
-#: instances/templates/allinstances_index_nongrouped.html:42
+#: computes/templates/computes/instances.html:93
+#: instances/templates/allinstances_index_grouped.html:60
+#: instances/templates/allinstances_index_nongrouped.html:43
 #: instances/templates/instance.html:16
 msgid "Off"
 msgstr "关闭"
 
-#: computes/templates/computes/instances.html:98
-#: instances/templates/allinstances_index_grouped.html:60
-#: instances/templates/allinstances_index_nongrouped.html:44
+#: computes/templates/computes/instances.html:95
+#: instances/templates/allinstances_index_grouped.html:62
+#: instances/templates/allinstances_index_nongrouped.html:45
 msgid "Suspended"
 msgstr "暂停"
 
@@ -1020,23 +1000,24 @@ msgstr "暂停"
 msgid "Computes"
 msgstr "计算节点"
 
-#: computes/templates/computes/list.html:20
+#: computes/templates/computes/list.html:19
 msgid "You don't have any computes"
 msgstr "您还没有添加任何的计算节点"
 
-#: computes/templates/computes/list.html:30 computes/templates/overview.html:92
-#: instances/templates/instances/settings_tab.html:163
-#: instances/templates/instances/settings_tab.html:248
+#: computes/templates/computes/list.html:29 computes/templates/overview.html:90
+#: instances/templates/instances/settings_tab.html:176
+#: instances/templates/instances/settings_tab.html:215
+#: instances/templates/instances/settings_tab.html:263
 msgid "Details"
 msgstr "细节 (描述)"
 
-#: computes/templates/computes/list.html:41
+#: computes/templates/computes/list.html:40
 #: instances/templates/allinstances_index_grouped.html:28
-#: instances/templates/instances/settings_tab.html:881
+#: instances/templates/instances/settings_tab.html:906
 msgid "Connected"
 msgstr "已连接"
 
-#: computes/templates/computes/list.html:41
+#: computes/templates/computes/list.html:40
 msgid "Not Connected"
 msgstr "未连接"
 
@@ -1060,67 +1041,69 @@ msgstr "本地"
 msgid "Add new host"
 msgstr "添加新主机"
 
-#: computes/templates/overview.html:42
+#: computes/templates/overview.html:40
 msgid "Basic details"
 msgstr "基本细节"
 
-#: computes/templates/overview.html:44
-#: storages/templates/create_stg_block.html:171
+#: computes/templates/overview.html:42
+#: instances/templates/instances/info_tab.html:5
+#: storages/templates/create_stg_block.html:185
 msgid "Hostname"
 msgstr "主机名"
 
-#: computes/templates/overview.html:46
+#: computes/templates/overview.html:44
 msgid "Hypervisors"
 msgstr "虚拟机管理程序"
 
-#: computes/templates/overview.html:63
+#: computes/templates/overview.html:61
 msgid "more"
 msgstr "更多"
 
-#: computes/templates/overview.html:73
+#: computes/templates/overview.html:71
 msgid "Emulator"
 msgstr "模拟器"
 
-#: computes/templates/overview.html:75
+#: computes/templates/overview.html:73
+#: instances/templates/instances/info_tab.html:11
 msgid "Version"
 msgstr "版本"
 
-#: computes/templates/overview.html:77
+#: computes/templates/overview.html:75
 msgid "Qemu"
 msgstr "Qemu"
 
-#: computes/templates/overview.html:79
+#: computes/templates/overview.html:77
 msgid "Libvirt"
 msgstr "Libvirt"
 
-#: computes/templates/overview.html:84
+#: computes/templates/overview.html:82
 #: instances/templates/create_instance_w1.html:36
-#: instances/templates/create_instance_w1.html:52
+#: instances/templates/create_instance_w1.html:50
 msgid "Architecture"
 msgstr "架构"
 
-#: computes/templates/overview.html:86
+#: computes/templates/overview.html:84
 msgid "Logical CPUs"
 msgstr "逻辑CPU"
 
-#: computes/templates/overview.html:88
+#: computes/templates/overview.html:86
 msgid "Processor"
 msgstr "处理器"
 
-#: computes/templates/overview.html:90
+#: computes/templates/overview.html:88
 msgid "Connection"
 msgstr "连接"
 
-#: computes/templates/overview.html:96
-#: instances/templates/edit_instance_volume.html:22
+#: computes/templates/overview.html:94
+#: instances/templates/instances/edit_instance_volume.html:25
 msgid "Performance"
 msgstr "性能"
 
-#: computes/templates/overview.html:102
+#: computes/templates/overview.html:100
 msgid "CPU Utilization"
 msgstr "CPU 利用率"
 
-#: computes/templates/overview.html:111
+#: computes/templates/overview.html:109
 msgid "RAM Utilization"
 msgstr "内存利用率"
 
@@ -1161,11 +1144,6 @@ msgstr "断开连接"
 msgid "File API is not supported"
 msgstr "文件API不支持"
 
-#: console/templates/console-spice-full.html:202
-#: instances/templates/allinstances_index_nongrouped.html:7
-msgid "Host"
-msgstr "主机"
-
 #: console/templates/console-spice-full.html:204
 msgid "Port"
 msgstr "端口"
@@ -1178,7 +1156,7 @@ msgstr "显示控制台"
 #: interfaces/templates/interface.html:59 networks/templates/network.html:49
 #: networks/templates/network.html:119 networks/templates/network.html:125
 #: networks/templates/network.html:231 networks/templates/network.html:237
-#: storages/templates/storage.html:60
+#: storages/templates/storage.html:62
 msgid "Start"
 msgstr "启动"
 
@@ -1194,6 +1172,22 @@ msgstr "noVNC 遇到错误"
 msgid "Loading"
 msgstr "载入中"
 
+#: console/views.py:52
+#, fuzzy
+#| msgid "You do not have permission to access this page."
+msgid ""
+"User does not have permission to access console or host/instance not exist"
+msgstr "您没有权限访问此页面。"
+
+#: console/views.py:84
+msgid "Fail to get console. Please check the console configuration of your VM."
+msgstr ""
+
+#: console/views.py:86
+#, python-format
+msgid "Console type '%(type)s' has not support"
+msgstr ""
+
 #: instances/forms.py:37
 msgid "No Virtual Machine name has been entered"
 msgstr "没有输入虚拟机的名称"
@@ -1254,7 +1248,7 @@ msgstr "设置为模板"
 msgid "created"
 msgstr "已创建"
 
-#: instances/models.py:220
+#: instances/models.py:216
 msgid "Can access console without password"
 msgstr "无需密码即可访问控制台"
 
@@ -1263,87 +1257,86 @@ msgid "Add Instance Network"
 msgstr "添加实例网络"
 
 #: instances/templates/add_instance_network_block.html:18
-#: instances/templates/create_instance_w2.html:205
-#: instances/templates/instances/settings_tab.html:359
-#: instances/templates/instances/settings_tab.html:382
-#: instances/templates/instances/settings_tab.html:487
+#: instances/templates/create_instance_w2.html:182
+#: instances/templates/instances/settings_tab.html:373
+#: instances/templates/instances/settings_tab.html:409
+#: instances/templates/instances/settings_tab.html:521
 #: interfaces/templates/interface.html:45
 #: interfaces/templates/interface.html:74
-#: interfaces/templates/interfaces.html:63
+#: interfaces/templates/interfaces.html:64
 #: networks/templates/modify_ipv4_fixed_address.html:24
 #: networks/templates/network.html:172
 msgid "MAC"
 msgstr "MAC 地址"
 
 #: instances/templates/add_instance_network_block.html:24
-#: instances/templates/create_instance_w2.html:164
-#: instances/templates/create_instance_w2.html:388
-#: instances/templates/create_instance_w2.html:605
-#: instances/templates/instances/settings_tab.html:30
-#: instances/templates/instances/settings_tab.html:394
+#: instances/templates/create_instance_w2.html:163
+#: instances/templates/create_instance_w2.html:387
+#: instances/templates/instances/settings_tab.html:36
+#: instances/templates/instances/settings_tab.html:421
 #: networks/templates/network.html:5 networks/templates/network.html:7
 #: networks/templates/network.html:107 networks/templates/network.html:218
 msgid "Network"
 msgstr "网络"
 
 #: instances/templates/add_instance_network_block.html:37
-#: instances/templates/create_instance_w2.html:183
+#: instances/templates/create_instance_w2.html:188
 #: instances/templates/create_instance_w2.html:429
-#: instances/templates/create_instance_w2.html:642
-#: instances/templates/instances/settings_tab.html:403
+#: instances/templates/create_instance_w2.html:645
+#: instances/templates/instances/settings_tab.html:430
 #: nwfilters/templates/nwfilter.html:5 nwfilters/templates/nwfilter.html:7
 msgid "NWFilter"
 msgstr "NWFilter 过滤规则列表"
 
 #: instances/templates/add_instance_network_block.html:40
-#: instances/templates/add_instance_volume.html:117
+#: instances/templates/add_instance_volume.html:121
 #: instances/templates/create_inst_block.html:25
-#: instances/templates/create_instance_w2.html:158
-#: instances/templates/create_instance_w2.html:186
-#: instances/templates/create_instance_w2.html:377
+#: instances/templates/create_instance_w2.html:157
+#: instances/templates/create_instance_w2.html:191
+#: instances/templates/create_instance_w2.html:376
 #: instances/templates/create_instance_w2.html:432
 #: instances/templates/create_instance_w2.html:580
 #: instances/templates/create_instance_w2.html:599
-#: instances/templates/create_instance_w2.html:645
-#: instances/templates/instances/access_tab.html:135
-#: instances/templates/instances/settings_tab.html:183
-#: instances/templates/instances/settings_tab.html:407
-#: instances/templates/instances/stats_tab.html:90
+#: instances/templates/create_instance_w2.html:648
+#: instances/templates/instances/access_tab.html:123
+#: instances/templates/instances/settings_tab.html:191
+#: instances/templates/instances/settings_tab.html:434
+#: instances/templates/instances/stats_tab.html:93
 #: interfaces/templates/interface.html:41
-#: interfaces/templates/interface.html:43 nwfilters/templates/nwfilter.html:78
-#: storages/templates/create_stg_block.html:132
-#: storages/templates/storage.html:47 storages/templates/storage.html:49
-#: storages/templates/storage.html:51
+#: interfaces/templates/interface.html:43 nwfilters/templates/nwfilter.html:73
+#: storages/templates/create_stg_block.html:146
+#: storages/templates/storage.html:49 storages/templates/storage.html:51
+#: storages/templates/storage.html:53
 msgid "None"
 msgstr "空"
 
 #: instances/templates/add_instance_network_block.html:49
 #: instances/templates/add_instance_owner_block.html:30
-#: instances/templates/add_instance_volume.html:89
-#: instances/templates/add_instance_volume.html:144
+#: instances/templates/add_instance_volume.html:93
+#: instances/templates/add_instance_volume.html:148
 #: instances/templates/create_flav_block.html:25
 #: instances/templates/create_inst_block.html:34
-#: instances/templates/create_instance_w2.html:269
-#: instances/templates/edit_instance_volume.html:123
-#: instances/templates/instances/settings_tab.html:428
-#: interfaces/templates/create_iface_block.html:135
+#: instances/templates/create_instance_w2.html:268
+#: instances/templates/instances/edit_instance_volume.html:110
+#: instances/templates/instances/settings_tab.html:455
+#: interfaces/templates/create_iface_block.html:139
 #: networks/templates/add_network_qos.html:50
 #: networks/templates/create_net_block.html:85
 #: networks/templates/modify_ipv4_fixed_address.html:44
 #: networks/templates/modify_ipv6_fixed_address.html:44
 #: nwfilters/templates/add_nwf_rule.html:25
-#: nwfilters/templates/create_nwfilter_block.html:23
-#: nwfilters/templates/nwfilters.html:80 nwfilters/templates/nwfilters.html:108
-#: secrets/templates/create_secret_block.html:54
-#: secrets/templates/secrets.html:102
-#: storages/templates/create_stg_block.html:55
-#: storages/templates/create_stg_block.html:84
-#: storages/templates/create_stg_block.html:140
-#: storages/templates/create_stg_block.html:202
-#: storages/templates/create_stg_block.html:230
+#: nwfilters/templates/create_nwfilter_block.html:25
+#: nwfilters/templates/nwfilters.html:78 nwfilters/templates/nwfilters.html:106
+#: storages/templates/create_stg_block.html:69
+#: storages/templates/create_stg_block.html:98
+#: storages/templates/create_stg_block.html:154
+#: storages/templates/create_stg_block.html:216
+#: storages/templates/create_stg_block.html:244
 #: storages/templates/create_stg_vol_block.html:28
 #: storages/templates/create_stg_vol_block.html:56
-#: storages/templates/storage.html:154
+#: storages/templates/storage.html:155
+#: virtsecrets/templates/create_secret_block.html:54
+#: virtsecrets/templates/secrets.html:103
 msgid "Close"
 msgstr "关闭"
 
@@ -1352,8 +1345,8 @@ msgid "Add Instance Owner"
 msgstr "添加实例所有者"
 
 #: instances/templates/add_instance_volume.html:3
-#: instances/templates/add_instance_volume.html:90
-#: instances/templates/add_instance_volume.html:145
+#: instances/templates/add_instance_volume.html:94
+#: instances/templates/add_instance_volume.html:149
 msgid "Add Volume"
 msgstr "添加卷"
 
@@ -1361,72 +1354,73 @@ msgstr "添加卷"
 msgid "Add Instance Volume"
 msgstr "添加实例卷"
 
-#: instances/templates/add_instance_volume.html:18
+#: instances/templates/add_instance_volume.html:19
 msgid "New Disk"
 msgstr "新磁盘"
 
-#: instances/templates/add_instance_volume.html:21
+#: instances/templates/add_instance_volume.html:24
 msgid "Existing Disk"
 msgstr "现有磁盘"
 
-#: instances/templates/add_instance_volume.html:28
-#: instances/templates/add_instance_volume.html:98
+#: instances/templates/add_instance_volume.html:32
+#: instances/templates/add_instance_volume.html:102
 msgid "Volume parameters"
 msgstr "卷参数"
 
-#: instances/templates/add_instance_volume.html:30
-#: instances/templates/add_instance_volume.html:100
-#: instances/templates/create_instance_w2.html:149
+#: instances/templates/add_instance_volume.html:34
+#: instances/templates/add_instance_volume.html:104
+#: instances/templates/create_instance_w2.html:148
 #: instances/templates/create_instance_w2.html:591
-#: instances/templates/instances/settings_tab.html:237
+#: instances/templates/instances/settings_tab.html:252
 #: storages/templates/storage.html:4 storages/templates/storage.html:9
 msgid "Storage"
 msgstr "存储"
 
-#: instances/templates/add_instance_volume.html:46
-#: storages/templates/create_stg_block.html:183
-#: storages/templates/storage.html:99 storages/templates/storage.html:137
+#: instances/templates/add_instance_volume.html:50
+#: storages/templates/create_stg_block.html:197
+#: storages/templates/storage.html:100 storages/templates/storage.html:138
 msgid "Format"
 msgstr "格式"
 
-#: instances/templates/add_instance_volume.html:56
-#: storages/templates/storage.html:52 storages/templates/storage.html:98
-#: storages/templates/storages.html:62
+#: instances/templates/add_instance_volume.html:60
+#: storages/templates/storage.html:54 storages/templates/storage.html:99
+#: storages/templates/storages.html:61
 msgid "Size"
 msgstr "大小"
 
-#: instances/templates/add_instance_volume.html:60
-#: instances/templates/create_instance_w2.html:91
+#: instances/templates/add_instance_volume.html:64
+#: instances/templates/create_instance_w2.html:90
 msgid "GB"
 msgstr "GB"
 
-#: instances/templates/add_instance_volume.html:63
-#: instances/templates/add_instance_volume.html:123
-#: instances/templates/edit_instance_volume.html:53
-#: instances/templates/instances/settings_tab.html:168
+#: instances/templates/add_instance_volume.html:67
+#: instances/templates/add_instance_volume.html:127
+#: instances/templates/instances/edit_instance_volume.html:89
+#: instances/templates/instances/settings_tab.html:181
+#: instances/templates/instances/settings_tab.html:220
 msgid "Bus"
 msgstr "总线"
 
-#: instances/templates/add_instance_volume.html:73
-#: instances/templates/add_instance_volume.html:133
+#: instances/templates/add_instance_volume.html:77
+#: instances/templates/add_instance_volume.html:137
 msgid "Cache"
 msgstr "缓存"
 
-#: instances/templates/add_instance_volume.html:83
-#: instances/templates/instances/settings_tab.html:760
-#: storages/templates/storage.html:147
+#: instances/templates/add_instance_volume.html:87
+#: instances/templates/instances/settings_tab.html:789
+#: storages/templates/storage.html:148
 msgid "Metadata"
 msgstr "元数据"
 
-#: instances/templates/add_instance_volume.html:103
+#: instances/templates/add_instance_volume.html:107
 msgid "Select Pool"
 msgstr "选择池"
 
-#: instances/templates/add_instance_volume.html:114
+#: instances/templates/add_instance_volume.html:118
 msgid "Volume"
 msgstr "卷"
 
-#: instances/templates/allinstances.html:24
+#: instances/templates/allinstances.html:22
 msgid "Problem occurred with host"
 msgstr "主机发生问题"
 
@@ -1475,39 +1469,39 @@ msgid "New instance on %(host)s "
 msgstr "在主机 %(host)s 上的新实例 "
 
 #: instances/templates/create_instance_w1.html:41
-#: instances/templates/instances/settings_tab.html:49
+#: instances/templates/instances/settings_tab.html:55
 #: networks/templates/network.html:72 nwfilters/templates/nwfilter.html:49
 msgid "XML"
 msgstr "XML"
 
-#: instances/templates/create_instance_w1.html:62
+#: instances/templates/create_instance_w1.html:60
 msgid "Chipset"
 msgstr "芯片组"
 
-#: instances/templates/create_instance_w1.html:72
+#: instances/templates/create_instance_w1.html:70
 msgid "Next"
 msgstr "下一个"
 
-#: instances/templates/create_instance_w1.html:89
-#: instances/templates/create_instance_w2.html:271
-#: instances/templates/create_instance_w2.html:273
+#: instances/templates/create_instance_w1.html:85
+#: instances/templates/create_instance_w2.html:270
+#: instances/templates/create_instance_w2.html:272
 #: instances/templates/create_instance_w2.html:500
 #: instances/templates/create_instance_w2.html:504
-#: instances/templates/create_instance_w2.html:713
-#: instances/templates/create_instance_w2.html:717
-#: interfaces/templates/create_iface_block.html:138
+#: instances/templates/create_instance_w2.html:716
+#: instances/templates/create_instance_w2.html:720
+#: interfaces/templates/create_iface_block.html:142
 #: networks/templates/create_net_block.html:86
 #: networks/templates/modify_ipv4_fixed_address.html:45
 #: networks/templates/modify_ipv6_fixed_address.html:45
-#: nwfilters/templates/create_nwfilter_block.html:24
-#: secrets/templates/create_secret_block.html:55
-#: storages/templates/create_stg_block.html:56
-#: storages/templates/create_stg_block.html:85
-#: storages/templates/create_stg_block.html:144
-#: storages/templates/create_stg_block.html:148
-#: storages/templates/create_stg_block.html:205
-#: storages/templates/create_stg_block.html:233
+#: nwfilters/templates/create_nwfilter_block.html:26
+#: storages/templates/create_stg_block.html:70
+#: storages/templates/create_stg_block.html:99
+#: storages/templates/create_stg_block.html:158
+#: storages/templates/create_stg_block.html:162
+#: storages/templates/create_stg_block.html:219
+#: storages/templates/create_stg_block.html:247
 #: storages/templates/create_stg_vol_block.html:57
+#: virtsecrets/templates/create_secret_block.html:55
 msgid "Create"
 msgstr "创建"
 
@@ -1523,113 +1517,113 @@ msgstr "自定义"
 msgid "Template"
 msgstr "模板"
 
-#: instances/templates/create_instance_w2.html:66
-msgid "Hypervisor doesn't have any Flavors"
-msgstr "虚拟机监控程序还没有任何的实例规格定义"
-
-#: instances/templates/create_instance_w2.html:71
+#: instances/templates/create_instance_w2.html:63
 msgid "Create from flavor"
 msgstr "选择一个规格来创建虚拟机"
 
-#: instances/templates/create_instance_w2.html:79
-#: instances/templates/create_instance_w2.html:352
+#: instances/templates/create_instance_w2.html:67
+msgid "Hypervisor doesn't have any Flavors"
+msgstr "虚拟机监控程序还没有任何的实例规格定义"
+
+#: instances/templates/create_instance_w2.html:78
+#: instances/templates/create_instance_w2.html:351
 #: instances/templates/create_instance_w2.html:563
-#: instances/templates/instance.html:47
+#: instances/templates/instance.html:48
 msgid "RAM"
 msgstr "内存"
 
-#: instances/templates/create_instance_w2.html:80
-#: instances/templates/create_instance_w2.html:367
+#: instances/templates/create_instance_w2.html:79
+#: instances/templates/create_instance_w2.html:366
 msgid "HDD"
 msgstr "磁盘"
 
-#: instances/templates/create_instance_w2.html:90
-#: instances/templates/create_instance_w2.html:356
+#: instances/templates/create_instance_w2.html:89
+#: instances/templates/create_instance_w2.html:355
 #: instances/templates/create_instance_w2.html:567
-#: instances/templates/instance.html:47
+#: instances/templates/instance.html:48
 #: instances/templates/instances/resize_tab.html:95
-#: instances/templates/instances/resize_tab.html:108
+#: instances/templates/instances/resize_tab.html:109
 msgid "MB"
 msgstr "MB"
 
-#: instances/templates/create_instance_w2.html:97
+#: instances/templates/create_instance_w2.html:96
 msgid "Create Virtual Machine"
 msgstr "创建虚拟机"
 
-#: instances/templates/create_instance_w2.html:115
-#: instances/templates/create_instance_w2.html:312
+#: instances/templates/create_instance_w2.html:114
+#: instances/templates/create_instance_w2.html:311
 #: instances/templates/create_instance_w2.html:525
 msgid "Firmware"
 msgstr "固件"
 
-#: instances/templates/create_instance_w2.html:127
-#: instances/templates/create_instance_w2.html:330
+#: instances/templates/create_instance_w2.html:126
+#: instances/templates/create_instance_w2.html:329
 #: instances/templates/create_instance_w2.html:542
 msgid "VCPU Config"
 msgstr "VCPU 配置"
 
-#: instances/templates/create_instance_w2.html:130
-#: instances/templates/create_instance_w2.html:333
+#: instances/templates/create_instance_w2.html:129
+#: instances/templates/create_instance_w2.html:332
 #: instances/templates/create_instance_w2.html:545
 msgid "no-mode"
 msgstr "没有指定任何模式"
 
-#: instances/templates/create_instance_w2.html:174
+#: instances/templates/create_instance_w2.html:173
 #: instances/templates/create_instance_w2.html:402
-#: instances/templates/create_instance_w2.html:615
-#: instances/templates/edit_instance_volume.html:25
+#: instances/templates/create_instance_w2.html:618
+#: instances/templates/instances/edit_instance_volume.html:30
 msgid "Advanced"
 msgstr "高级"
 
-#: instances/templates/create_instance_w2.html:194
-#: instances/templates/create_instance_w2.html:631
+#: instances/templates/create_instance_w2.html:199
+#: instances/templates/create_instance_w2.html:634
 msgid "HDD cache mode"
 msgstr "磁盘缓存模式"
 
-#: instances/templates/create_instance_w2.html:212
+#: instances/templates/create_instance_w2.html:211
 #: instances/templates/create_instance_w2.html:441
-#: instances/templates/create_instance_w2.html:654
+#: instances/templates/create_instance_w2.html:657
 msgid "Graphics"
 msgstr "图形"
 
-#: instances/templates/create_instance_w2.html:223
+#: instances/templates/create_instance_w2.html:222
 #: instances/templates/create_instance_w2.html:452
-#: instances/templates/create_instance_w2.html:665
+#: instances/templates/create_instance_w2.html:668
 msgid "Video"
 msgstr "视频"
 
-#: instances/templates/create_instance_w2.html:237
+#: instances/templates/create_instance_w2.html:236
 #: instances/templates/create_instance_w2.html:466
-#: instances/templates/create_instance_w2.html:679
+#: instances/templates/create_instance_w2.html:682
 msgid "Console Access"
 msgstr "控制台访问"
 
-#: instances/templates/create_instance_w2.html:247
-#: instances/templates/create_instance_w2.html:249
+#: instances/templates/create_instance_w2.html:246
+#: instances/templates/create_instance_w2.html:248
 #: instances/templates/create_instance_w2.html:476
 #: instances/templates/create_instance_w2.html:478
-#: instances/templates/create_instance_w2.html:689
-#: instances/templates/create_instance_w2.html:691
+#: instances/templates/create_instance_w2.html:692
+#: instances/templates/create_instance_w2.html:694
 msgid "Console Password"
 msgstr "控制台密码"
 
-#: instances/templates/create_instance_w2.html:253
+#: instances/templates/create_instance_w2.html:252
 #: instances/templates/create_instance_w2.html:482
-#: instances/templates/create_instance_w2.html:695
+#: instances/templates/create_instance_w2.html:698
 msgid "Guest Agent"
 msgstr "客户机代理"
 
-#: instances/templates/create_instance_w2.html:260
+#: instances/templates/create_instance_w2.html:259
 #: instances/templates/create_instance_w2.html:489
-#: instances/templates/create_instance_w2.html:702
+#: instances/templates/create_instance_w2.html:705
 msgid "VirtIO"
 msgstr "VirtIO"
 
-#: instances/templates/create_instance_w2.html:287
-#: instances/templates/instances/settings_tab.html:439
-#: instances/templates/instances/settings_tab.html:515
-#: instances/templates/instances/settings_tab.html:525
-#: instances/templates/instances/snapshots_tab.html:75
+#: instances/templates/create_instance_w2.html:286
+#: instances/templates/instances/settings_tab.html:473
+#: instances/templates/instances/settings_tab.html:549
+#: instances/templates/instances/settings_tab.html:559
+#: instances/templates/instances/snapshots_tab.html:67
 #: interfaces/templates/interface.html:60
 #: interfaces/templates/interface.html:62 networks/templates/network.html:50
 #: networks/templates/network.html:52 networks/templates/network.html:62
@@ -1637,35 +1631,35 @@ msgstr "VirtIO"
 #: networks/templates/network.html:194 networks/templates/network.html:249
 #: networks/templates/network.html:298 networks/templates/network.html:303
 #: networks/templates/network.html:353 networks/templates/network.html:358
-#: nwfilters/templates/nwfilter.html:111 nwfilters/templates/nwfilter.html:151
-#: nwfilters/templates/nwfilters.html:120 secrets/templates/secrets.html:77
-#: storages/templates/storage.html:62 storages/templates/storage.html:65
-#: storages/templates/storage.html:77 storages/templates/storage.html:174
+#: nwfilters/templates/nwfilter.html:103 nwfilters/templates/nwfilter.html:143
+#: nwfilters/templates/nwfilters.html:118 storages/templates/storage.html:64
+#: storages/templates/storage.html:67 storages/templates/storage.html:79
+#: storages/templates/storage.html:175 virtsecrets/templates/secrets.html:78
 msgid "Are you sure?"
 msgstr "您确定 ？"
 
-#: instances/templates/create_instance_w2.html:359
+#: instances/templates/create_instance_w2.html:358
 msgid "Added Disks"
 msgstr "添加磁盘"
 
-#: instances/templates/create_instance_w2.html:372
+#: instances/templates/create_instance_w2.html:371
 #: instances/templates/create_instance_w2.html:575
 msgid "Select pool"
 msgstr "选择池"
 
 #: instances/templates/create_instance_w2.html:411
-#: instances/templates/create_instance_w2.html:624
+#: instances/templates/create_instance_w2.html:627
 msgid "Disk Metadata"
 msgstr "磁盘元数据"
 
 #: instances/templates/create_instance_w2.html:413
-#: instances/templates/create_instance_w2.html:626
+#: instances/templates/create_instance_w2.html:629
 msgid "Metadata preallocation"
 msgstr "预分配元数据"
 
 #: instances/templates/create_instance_w2.html:415
-#: instances/templates/create_instance_w2.html:628
-#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:360
+#: instances/templates/create_instance_w2.html:631
+#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:375
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/files.py:391
 msgid "Image"
 msgstr "镜像"
@@ -1678,61 +1672,18 @@ msgstr "磁盘缓存模式"
 msgid "Template Disk"
 msgstr "模板磁盘"
 
-#: instances/templates/edit_instance_volume.html:3
-msgid "Edit Volume"
-msgstr "编辑卷"
-
-#: instances/templates/edit_instance_volume.html:12
-msgid "Edit Instance Volume"
-msgstr "编辑实例卷"
-
-#: instances/templates/edit_instance_volume.html:19
-msgid "Virtual Disk"
-msgstr "虚拟磁盘"
-
-#: instances/templates/edit_instance_volume.html:32
-msgid "Volume Path"
-msgstr "卷路径"
-
-#: instances/templates/edit_instance_volume.html:38
-msgid "Readonly"
-msgstr "只读"
-
-#: instances/templates/edit_instance_volume.html:44
-msgid "Shareable"
-msgstr "可共享"
-
-#: instances/templates/edit_instance_volume.html:63
-msgid "Serial Number"
-msgstr "序列号"
-
-#: instances/templates/edit_instance_volume.html:69
-msgid "Storage Format"
-msgstr "储存格式"
-
-#: instances/templates/edit_instance_volume.html:78
-msgid "Cache mode"
-msgstr "缓存模式"
-
-#: instances/templates/edit_instance_volume.html:88
-msgid "IO mode"
-msgstr "IO 模式"
-
-#: instances/templates/edit_instance_volume.html:98
-msgid "Discard mode"
-msgstr "删除模式"
-
-#: instances/templates/edit_instance_volume.html:108
-msgid "Detect zeroes"
-msgstr "零写入检测"
+#: instances/templates/create_instance_w2.html:605
+#, fuzzy
+#| msgid "Network"
+msgid "Network/MAC"
+msgstr "网络"
 
 #: instances/templates/instance.html:22
 #: instances/templates/instance_actions.html:14
 #: instances/templates/instance_actions.html:25
 #: instances/templates/instance_actions.html:37
-#: instances/templates/instances/power_tab.html:25
-#: instances/templates/instances/power_tab.html:82 instances/views.py:270
-#: instances/views.py:264
+#: instances/templates/instances/power_tab.html:24
+#: instances/templates/instances/power_tab.html:81 instances/views.py:277
 msgid "Suspend"
 msgstr "暂停"
 
@@ -1748,80 +1699,82 @@ msgstr "客户机代理 已启用但并未连接"
 msgid "Guest Agent Not Enabled & Not Connected"
 msgstr "未启用也未连接到客户机代理"
 
-#: instances/templates/instance.html:50
-#: instances/templates/instances/resize_tab.html:18
-#: instances/templates/instances/settings_tab.html:16
+#: instances/templates/instance.html:51
+#: instances/templates/instances/resize_tab.html:17
+#: instances/templates/instances/settings_tab.html:22
 msgid "Disk"
 msgstr "磁盘"
 
-#: instances/templates/instance.html:57
+#: instances/templates/instance.html:59
+#, fuzzy
+#| msgid "Remove Instance's data"
+msgid "Show Instance OS details"
+msgstr "删除实例数据"
+
+#: instances/templates/instance.html:63
 msgid "Refresh instance info"
 msgstr "刷新实例信息"
 
-#: instances/templates/instance.html:61
+#: instances/templates/instance.html:69
 msgid "quota reached"
 msgstr "达到配额限制"
 
-#: instances/templates/instance.html:75
+#: instances/templates/instance.html:81
 msgid "Power"
 msgstr "电源"
 
-#: instances/templates/instance.html:81
+#: instances/templates/instance.html:87
 msgid "Access"
 msgstr "访问"
 
-#: instances/templates/instance.html:94
+#: instances/templates/instance.html:100
 msgid "Snapshot"
 msgstr "快照"
 
-#: instances/templates/instance.html:101 templates/navbar.html:32
+#: instances/templates/instance.html:107 templates/navbar.html:32
 msgid "Settings"
 msgstr "设置"
 
-#: instances/templates/instance.html:107
+#: instances/templates/instance.html:113
 msgid "Stats"
 msgstr "状态"
 
-#: instances/templates/instance.html:113
-#: instances/templates/instances/destroy_instance_form.html:40
-#: instances/templates/instances/destroy_tab.html:18
-#: instances/templates/instances/destroy_tab.html:20
-#: instances/templates/instances/destroy_tab.html:23 instances/views.py:312
-#: instances/views.py:306
+#: instances/templates/instance.html:119
+#: instances/templates/instances/destroy_instance_form.html:35
+#: instances/templates/instances/destroy_tab.html:17
+#: instances/templates/instances/destroy_tab.html:19
+#: instances/templates/instances/destroy_tab.html:22 instances/views.py:319
 msgid "Destroy"
 msgstr "销毁"
 
 #: instances/templates/instance_actions.html:6
-#: instances/templates/instances/settings_tab.html:37
-#: instances/templates/instances/settings_tab.html:788
-#: instances/templates/instances/settings_tab.html:790
-#: nwfilters/templates/nwfilters.html:109
-#: nwfilters/templates/nwfilters.html:115 storages/templates/storage.html:155
-#: storages/templates/storage.html:162
+#: instances/templates/instances/settings_tab.html:43
+#: instances/templates/instances/settings_tab.html:817
+#: instances/templates/instances/settings_tab.html:819
+#: nwfilters/templates/nwfilters.html:107
+#: nwfilters/templates/nwfilters.html:113 storages/templates/storage.html:156
+#: storages/templates/storage.html:163
 msgid "Clone"
 msgstr "克隆"
 
 #: instances/templates/instance_actions.html:10
 #: instances/templates/instance_actions.html:35
-#: instances/templates/instances/power_tab.html:47
-#: instances/templates/instances/power_tab.html:121
-#: instances/templates/instances/power_tab.html:123 instances/views.py:245
-#: instances/views.py:239
+#: instances/templates/instances/power_tab.html:46
+#: instances/templates/instances/power_tab.html:120
+#: instances/templates/instances/power_tab.html:122 instances/views.py:252
 msgid "Power On"
 msgstr "开机"
 
 #: instances/templates/instance_actions.html:15
-#: instances/templates/instances/power_tab.html:9
-#: instances/templates/instances/power_tab.html:59 instances/views.py:261
-#: instances/views.py:255
+#: instances/templates/instances/power_tab.html:8
+#: instances/templates/instances/power_tab.html:58 instances/views.py:268
 msgid "Power Off"
 msgstr "关机"
 
 #: instances/templates/instance_actions.html:16
 #: instances/templates/instance_actions.html:29
-#: instances/templates/instances/power_tab.html:14
-#: instances/templates/instances/power_tab.html:66 instances/views.py:254
-#: instances/views.py:248
+#: instances/templates/instances/power_tab.html:13
+#: instances/templates/instances/power_tab.html:65 instances/views.py:261
 msgid "Power Cycle"
 msgstr "电源重置"
 
@@ -1831,114 +1784,112 @@ msgid "VNC Console"
 msgstr "VNC控制台"
 
 #: instances/templates/instance_actions.html:22
-#: instances/templates/instances/power_tab.html:34
-#: instances/templates/instances/power_tab.html:93
-#: instances/templates/instances/power_tab.html:108 instances/views.py:278
-#: instances/views.py:272
+#: instances/templates/instances/power_tab.html:33
+#: instances/templates/instances/power_tab.html:92
+#: instances/templates/instances/power_tab.html:107 instances/views.py:285
 msgid "Resume"
 msgstr "恢复"
 
 #: instances/templates/instance_actions.html:26
-#: instances/templates/instances/power_tab.html:19
-#: instances/templates/instances/power_tab.html:39
-#: instances/templates/instances/power_tab.html:74
-#: instances/templates/instances/power_tab.html:100 instances/views.py:285
-#: instances/views.py:279
+#: instances/templates/instances/power_tab.html:18
+#: instances/templates/instances/power_tab.html:38
+#: instances/templates/instances/power_tab.html:73
+#: instances/templates/instances/power_tab.html:99 instances/views.py:292
 msgid "Force Off"
 msgstr "强制关闭"
 
 #: instances/templates/instance_actions.html:41
-#: instances/templates/instances/access_tab.html:9
-#: instances/templates/instances/access_tab.html:79
-#: instances/templates/instances/access_tab.html:87
-#: instances/templates/instances/access_tab.html:90
-#: instances/templates/instances/access_tab.html:94
-#: instances/templates/instances/settings_tab.html:23
+#: instances/templates/instances/access_tab.html:7
+#: instances/templates/instances/access_tab.html:67
+#: instances/templates/instances/access_tab.html:75
+#: instances/templates/instances/access_tab.html:78
+#: instances/templates/instances/access_tab.html:82
+#: instances/templates/instances/settings_tab.html:29
 msgid "Console"
 msgstr "控制台"
 
-#: instances/templates/instances/access_tab.html:16
+#: instances/templates/instances/access_tab.html:13
 msgid "Root Password"
 msgstr "Root 密码"
 
-#: instances/templates/instances/access_tab.html:31
-#: instances/templates/instances/access_tab.html:156
+#: instances/templates/instances/access_tab.html:27
+#: instances/templates/instances/access_tab.html:143
 msgid "VDI"
 msgstr "VDI"
 
-#: instances/templates/instances/access_tab.html:39
+#: instances/templates/instances/access_tab.html:35
 #, python-format
 msgid ""
 " This action opens a new window with a %(type)s connection to the console of "
 "the instance."
 msgstr " 该操作将打开一个新窗口，并使用 %(type)s 类型的控制台连接到实例。"
 
-#: instances/templates/instances/access_tab.html:47
+#: instances/templates/instances/access_tab.html:42
 msgid "Scale"
 msgstr "缩放"
 
-#: instances/templates/instances/access_tab.html:55
+#: instances/templates/instances/access_tab.html:48
 msgid "View Only"
 msgstr "仅查看"
 
-#: instances/templates/instances/access_tab.html:63
+#: instances/templates/instances/access_tab.html:54
 msgid "Resize Session"
 msgstr "调整会话大小"
 
-#: instances/templates/instances/access_tab.html:71
+#: instances/templates/instances/access_tab.html:60
 msgid "View Clipboard"
 msgstr "查看剪切板"
 
-#: instances/templates/instances/access_tab.html:82
+#: instances/templates/instances/access_tab.html:70
 msgid "Toggle Dropdown"
 msgstr "下拉切换"
 
-#: instances/templates/instances/access_tab.html:86
-#: instances/templates/instances/access_tab.html:89
+#: instances/templates/instances/access_tab.html:74
+#: instances/templates/instances/access_tab.html:77
 msgid "Console port"
 msgstr "控制台端口"
 
-#: instances/templates/instances/access_tab.html:87
+#: instances/templates/instances/access_tab.html:75
 msgid "Lite"
 msgstr "标准"
 
-#: instances/templates/instances/access_tab.html:90
+#: instances/templates/instances/access_tab.html:78
 msgid "Full"
 msgstr "全功能"
 
-#: instances/templates/instances/access_tab.html:100
+#: instances/templates/instances/access_tab.html:88
 msgid "You need shut down your instance and enter a new root password."
 msgstr "您需要关闭您的实例并输入新的root密码。"
 
-#: instances/templates/instances/access_tab.html:107
+#: instances/templates/instances/access_tab.html:95
 msgid "Enter Password"
 msgstr "输入密码"
 
-#: instances/templates/instances/access_tab.html:112
-#: instances/templates/instances/access_tab.html:115
+#: instances/templates/instances/access_tab.html:100
+#: instances/templates/instances/access_tab.html:103
 msgid "Reset Root Password"
 msgstr "重置 Root 密码"
 
-#: instances/templates/instances/access_tab.html:123
+#: instances/templates/instances/access_tab.html:111
 msgid "You need shut down your instance and choose your public key."
 msgstr "您需要关闭您的实例并选择您的公钥。"
 
-#: instances/templates/instances/access_tab.html:142
-#: instances/templates/instances/access_tab.html:144
+#: instances/templates/instances/access_tab.html:130
+#: instances/templates/instances/access_tab.html:132
 msgid "Add Public Key"
 msgstr "添加公钥"
 
-#: instances/templates/instances/access_tab.html:152
+#: instances/templates/instances/access_tab.html:140
 msgid ""
 "This action opens a remote viewer with a connection to the console of the "
 "instance."
 msgstr "该操作将打开一个远程查看器来连接到实例控制台。"
 
-#: instances/templates/instances/access_tab.html:159
+#: instances/templates/instances/access_tab.html:145
 msgid "To download console.vv file for virt-viewer."
 msgstr "为virt-viewer下载console.vv文件。"
 
-#: instances/templates/instances/access_tab.html:160
+#: instances/templates/instances/access_tab.html:146
 msgid "Get console.vv"
 msgstr "获取 console.vv"
 
@@ -1958,114 +1909,198 @@ msgstr "实例已暂停，无法销毁！"
 msgid "This action is irreversible!"
 msgstr "这个操作是不可逆的！"
 
-#: instances/templates/instances/destroy_instance_form.html:26
+#: instances/templates/instances/destroy_instance_form.html:24
 msgid "Remove Instance's data"
 msgstr "删除实例数据"
 
-#: instances/templates/instances/destroy_instance_form.html:34
+#: instances/templates/instances/destroy_instance_form.html:30
 msgid "Remove Instance's NVRAM"
 msgstr "删除实例 NVRAM 数据"
 
-#: instances/templates/instances/destroy_instance_form.html:46
+#: instances/templates/instances/destroy_instance_form.html:41
 msgid "You cannot destroy instance!"
 msgstr "您无法销毁实例！"
 
-#: instances/templates/instances/destroy_tab.html:8
+#: instances/templates/instances/destroy_tab.html:7
 msgid "Destroy Instance"
 msgstr "销毁实例"
 
-#: instances/templates/instances/destroy_tab.html:15
+#: instances/templates/instances/destroy_tab.html:14
 msgid "This action starts remove instance process"
 msgstr "此操作开始删除实例进程"
 
-#: instances/templates/instances/power_tab.html:56
+#: instances/templates/instances/edit_instance_volume.html:3
+msgid "Edit Volume"
+msgstr "编辑卷"
+
+#: instances/templates/instances/edit_instance_volume.html:12
+msgid "Edit Instance Volume"
+msgstr "编辑实例卷"
+
+#: instances/templates/instances/edit_instance_volume.html:20
+msgid "Virtual Disk"
+msgstr "虚拟磁盘"
+
+#: instances/templates/instances/edit_instance_volume.html:38
+msgid "Volume Path"
+msgstr "卷路径"
+
+#: instances/templates/instances/edit_instance_volume.html:42
+msgid "Readonly"
+msgstr "只读"
+
+#: instances/templates/instances/edit_instance_volume.html:46
+msgid "Shareable"
+msgstr "可共享"
+
+#: instances/templates/instances/edit_instance_volume.html:53
+msgid "Cache mode"
+msgstr "缓存模式"
+
+#: instances/templates/instances/edit_instance_volume.html:61
+msgid "IO mode"
+msgstr "IO 模式"
+
+#: instances/templates/instances/edit_instance_volume.html:69
+msgid "Discard mode"
+msgstr "删除模式"
+
+#: instances/templates/instances/edit_instance_volume.html:77
+msgid "Detect zeroes"
+msgstr "零写入检测"
+
+#: instances/templates/instances/edit_instance_volume.html:97
+msgid "Serial Number"
+msgstr "序列号"
+
+#: instances/templates/instances/edit_instance_volume.html:101
+msgid "Storage Format"
+msgstr "储存格式"
+
+#: instances/templates/instances/edit_instance_volume.html:111
+#, fuzzy
+#| msgid "Are you sure to detach volume?"
+msgid "Are you sure to change volume properties?"
+msgstr "您确定要分离卷吗？"
+
+#: instances/templates/instances/info_tab.html:3
+#, fuzzy
+#| msgid "Guest Agent"
+msgid "Guest Info"
+msgstr "客户机代理"
+
+#: instances/templates/instances/info_tab.html:7
+#, fuzzy
+#| msgid "Name"
+msgid "OS Name"
+msgstr "名称"
+
+#: instances/templates/instances/info_tab.html:9
+msgid "OS Pretty-Name"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:13
+msgid "Kernel Release"
+msgstr ""
+
+#: instances/templates/instances/info_tab.html:15
+#, fuzzy
+#| msgid "Version"
+msgid "Kernel Version"
+msgstr "版本"
+
+#: instances/templates/instances/info_tab.html:17
+msgid "Timezone / Offset"
+msgstr ""
+
+#: instances/templates/instances/power_tab.html:55
 msgid "This action sends an ACPI shutdown signal to the instance."
 msgstr "此操作将ACPI关闭信号发送到实例。"
 
-#: instances/templates/instances/power_tab.html:64
+#: instances/templates/instances/power_tab.html:63
 msgid ""
 "This action forcibly powers off and start the instance and may cause data "
 "corruption."
 msgstr "该操作将强制关闭电源并启动实例，并可能导致数据损坏。"
 
-#: instances/templates/instances/power_tab.html:71
-#: instances/templates/instances/power_tab.html:98
+#: instances/templates/instances/power_tab.html:70
+#: instances/templates/instances/power_tab.html:97
 msgid ""
 "This action forcibly powers off the instance and may cause data corruption."
 msgstr "该操作将强制关闭实例电源，并可能导致数据损坏。"
 
-#: instances/templates/instances/power_tab.html:80
+#: instances/templates/instances/power_tab.html:79
 msgid "This action suspends the instance."
 msgstr "此操作将暂停实例。"
 
-#: instances/templates/instances/power_tab.html:91
+#: instances/templates/instances/power_tab.html:90
 msgid "This action restore the instance after suspend."
 msgstr "此操作在暂停后还原实例。"
 
-#: instances/templates/instances/power_tab.html:106
+#: instances/templates/instances/power_tab.html:105
 msgid "Administrator blocked your instance."
 msgstr "管理员锁定了您的实例。"
 
-#: instances/templates/instances/power_tab.html:116
+#: instances/templates/instances/power_tab.html:115
 msgid "Click on Power On button to start this instance."
 msgstr "单击开机按钮以启动该实例。"
 
-#: instances/templates/instances/power_tab.html:120
+#: instances/templates/instances/power_tab.html:119
 msgid "Template instance cannot be started."
 msgstr "模板实例无法启动。"
 
-#: instances/templates/instances/resize_tab.html:8
+#: instances/templates/instances/resize_tab.html:7
 msgid "CPU"
 msgstr "CPU"
 
-#: instances/templates/instances/resize_tab.html:29
+#: instances/templates/instances/resize_tab.html:28
 msgid "Logical host CPUs"
 msgstr "逻辑主机CPU"
 
-#: instances/templates/instances/resize_tab.html:31
+#: instances/templates/instances/resize_tab.html:30
 #: instances/templates/instances/resize_tab.html:95
 #: instances/templates/instances/resize_tab.html:136
 msgid "Current Allocation"
 msgstr "当前分配"
 
-#: instances/templates/instances/resize_tab.html:45
-#: instances/templates/instances/resize_tab.html:108
+#: instances/templates/instances/resize_tab.html:44
+#: instances/templates/instances/resize_tab.html:109
 msgid "Maximum Allocation"
 msgstr "最大分配"
 
-#: instances/templates/instances/resize_tab.html:63
+#: instances/templates/instances/resize_tab.html:62
 msgid "Logical Instance Active/Maximum CPUs"
 msgstr "逻辑实例 活动/最大 CPU"
 
-#: instances/templates/instances/resize_tab.html:71
-#: instances/templates/instances/settings_tab.html:79
-#: instances/templates/instances/settings_tab.html:95
-#: networks/templates/network.html:62 storages/templates/storage.html:77
+#: instances/templates/instances/resize_tab.html:70
+#: instances/templates/instances/settings_tab.html:86
+#: instances/templates/instances/settings_tab.html:102
+#: networks/templates/network.html:62 storages/templates/storage.html:79
 msgid "Disable"
 msgstr "禁用"
 
-#: instances/templates/instances/resize_tab.html:73
+#: instances/templates/instances/resize_tab.html:72
 msgid "Constant"
 msgstr "常量"
 
-#: instances/templates/instances/resize_tab.html:75
-#: instances/templates/instances/settings_tab.html:77
-#: instances/templates/instances/settings_tab.html:91
-#: networks/templates/network.html:60 storages/templates/storage.html:74
+#: instances/templates/instances/resize_tab.html:74
+#: instances/templates/instances/settings_tab.html:84
+#: instances/templates/instances/settings_tab.html:98
+#: networks/templates/network.html:60 storages/templates/storage.html:76
 msgid "Enable"
 msgstr "启用"
 
-#: instances/templates/instances/resize_tab.html:84
+#: instances/templates/instances/resize_tab.html:83
 #: instances/templates/instances/resize_tab.html:124
 #: instances/templates/instances/resize_tab.html:157
 msgid "You don't have permission for resizing instance"
 msgstr "您没有调整实例大小的权限"
 
-#: instances/templates/instances/resize_tab.html:93
+#: instances/templates/instances/resize_tab.html:92
 msgid "Total host memory"
 msgstr "主机总内存"
 
-#: instances/templates/instances/resize_tab.html:103
+#: instances/templates/instances/resize_tab.html:104
 #: instances/templates/instances/resize_tab.html:118
 msgid "Custom value"
 msgstr "自定义数值"
@@ -2075,457 +2110,454 @@ msgid "Disk allocation (GB)"
 msgstr "磁盘分配 (GB)"
 
 #: instances/templates/instances/resize_tab.html:140
-#: instances/templates/instances/settings_tab.html:269
+#: instances/templates/instances/settings_tab.html:284
 msgid "Error getting disk info"
 msgstr "获取磁盘信息时出错"
 
-#: instances/templates/instances/settings_tab.html:11
+#: instances/templates/instances/settings_tab.html:17
 msgid "Boot"
 msgstr "启动"
 
-#: instances/templates/instances/settings_tab.html:44
-#: instances/templates/instances/settings_tab.html:621
-#: instances/templates/instances/settings_tab.html:623
+#: instances/templates/instances/settings_tab.html:50
+#: instances/templates/instances/settings_tab.html:655
+#: instances/templates/instances/settings_tab.html:657
 msgid "Migrate"
 msgstr "迁移"
 
-#: instances/templates/instances/settings_tab.html:56
+#: instances/templates/instances/settings_tab.html:62
+#: venv/lib/python3.6/site-packages/click/core.py:1351
 msgid "Options"
 msgstr "选项"
 
-#: instances/templates/instances/settings_tab.html:72
-#: networks/templates/network.html:56 storages/templates/storage.html:69
+#: instances/templates/instances/settings_tab.html:79
+#: networks/templates/network.html:56 storages/templates/storage.html:71
 msgid "Autostart"
 msgstr "自动启动"
 
-#: instances/templates/instances/settings_tab.html:75
+#: instances/templates/instances/settings_tab.html:82
 msgid "Autostart your instance when host server is power on "
 msgstr "主机服务器开机时自动启动实例 "
 
-#: instances/templates/instances/settings_tab.html:84
+#: instances/templates/instances/settings_tab.html:91
 msgid "Boot Order"
 msgstr "启动顺序"
 
-#: instances/templates/instances/settings_tab.html:88
+#: instances/templates/instances/settings_tab.html:95
 msgid "Enable Boot Menu for your instance when it starts up "
 msgstr "在实例启动时为其启用启动菜单 "
 
-#: instances/templates/instances/settings_tab.html:91
+#: instances/templates/instances/settings_tab.html:98
 msgid "Show boot menu"
 msgstr "显示启动菜单"
 
-#: instances/templates/instances/settings_tab.html:95
+#: instances/templates/instances/settings_tab.html:102
 msgid "Hide boot menu"
 msgstr "隐藏启动菜单"
 
-#: instances/templates/instances/settings_tab.html:100
+#: instances/templates/instances/settings_tab.html:107
 msgid "Please shutdown instance to modify boot menu"
 msgstr "请关闭实例以修改启动菜单"
 
-#: instances/templates/instances/settings_tab.html:130
+#: instances/templates/instances/settings_tab.html:137
 msgid "up: move selected devices"
 msgstr "向上：移动所选设备"
 
-#: instances/templates/instances/settings_tab.html:133
+#: instances/templates/instances/settings_tab.html:140
 msgid "down: move selected devices"
 msgstr "向下：移动所选设备"
 
-#: instances/templates/instances/settings_tab.html:139
-#: instances/templates/instances/settings_tab.html:429
+#: instances/templates/instances/settings_tab.html:146
+#: instances/templates/instances/settings_tab.html:456
 msgid "Apply"
 msgstr "应用"
 
-#: instances/templates/instances/settings_tab.html:149
+#: instances/templates/instances/settings_tab.html:156
 msgid "Instance Media"
 msgstr "实例媒体"
 
-#: instances/templates/instances/settings_tab.html:152
+#: instances/templates/instances/settings_tab.html:159
 msgid "Add CD-ROM"
 msgstr "添加 CD-ROM"
 
-#: instances/templates/instances/settings_tab.html:169
-#: instances/templates/instances/settings_tab.html:234
+#: instances/templates/instances/settings_tab.html:182
+#: instances/templates/instances/settings_tab.html:221
+#: instances/templates/instances/settings_tab.html:249
 #: interfaces/templates/create_iface_block.html:34
-#: networks/templates/network.html:43 networks/templates/networks.html:59
-#: storages/templates/create_stg_block.html:77
+#: networks/templates/network.html:43 networks/templates/networks.html:58
+#: storages/templates/create_stg_block.html:91
 msgid "Device"
 msgstr "设备"
 
-#: instances/templates/instances/settings_tab.html:170
+#: instances/templates/instances/settings_tab.html:183
+#: instances/templates/instances/settings_tab.html:222
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: instances/templates/instances/settings_tab.html:188
-#: instances/templates/instances/settings_tab.html:190
+#: instances/templates/instances/settings_tab.html:196
+#: instances/templates/instances/settings_tab.html:198
 msgid "Mount"
 msgstr "挂载"
 
-#: instances/templates/instances/settings_tab.html:193
+#: instances/templates/instances/settings_tab.html:201
 msgid "Detach CD-ROM (remove device)"
 msgstr "分离 CD-ROM (删除设备)"
 
-#: instances/templates/instances/settings_tab.html:208
-#: instances/templates/instances/settings_tab.html:210
+#: instances/templates/instances/settings_tab.html:227
+#: instances/templates/instances/settings_tab.html:229
 msgid "Unmount"
 msgstr "卸载"
 
-#: instances/templates/instances/settings_tab.html:220
+#: instances/templates/instances/settings_tab.html:238
 msgid "There is not any CD-ROM device."
 msgstr "没有任何CD-ROM设备。"
 
-#: instances/templates/instances/settings_tab.html:225
+#: instances/templates/instances/settings_tab.html:243
 msgid "Instance Volume"
 msgstr "实例卷"
 
-#: instances/templates/instances/settings_tab.html:235
+#: instances/templates/instances/settings_tab.html:250
 msgid "Used"
 msgstr "已使用"
 
-#: instances/templates/instances/settings_tab.html:236
+#: instances/templates/instances/settings_tab.html:251
 msgid "Capacity"
 msgstr "容量"
 
-#: instances/templates/instances/settings_tab.html:238
-#: instances/templates/instances/settings_tab.html:363
+#: instances/templates/instances/settings_tab.html:253
+#: instances/templates/instances/settings_tab.html:385
 msgid "Source"
 msgstr "源"
 
-#: instances/templates/instances/settings_tab.html:294
-#: instances/templates/instances/settings_tab.html:298
+#: instances/templates/instances/settings_tab.html:309
+#: instances/templates/instances/settings_tab.html:313
 msgid "Detach"
 msgstr "分离"
 
-#: instances/templates/instances/settings_tab.html:294
+#: instances/templates/instances/settings_tab.html:309
 msgid "Are you sure to detach volume?"
 msgstr "您确定要分离卷吗？"
 
-#: instances/templates/instances/settings_tab.html:298
-#: instances/templates/instances/settings_tab.html:314
+#: instances/templates/instances/settings_tab.html:313
+#: instances/templates/instances/settings_tab.html:329
 msgid "Are you sure? This may lead data corruption!"
 msgstr "您确定吗？ 这可能导致数据损坏！"
 
-#: instances/templates/instances/settings_tab.html:310
+#: instances/templates/instances/settings_tab.html:325
 msgid "Are you sure to delete volume?"
 msgstr "您确定要删除音卷吗？"
 
-#: instances/templates/instances/settings_tab.html:330
+#: instances/templates/instances/settings_tab.html:343
 msgid "Add a network device"
 msgstr "添加一个网络设备"
 
-#: instances/templates/instances/settings_tab.html:336
+#: instances/templates/instances/settings_tab.html:349
 msgid "Network Devices"
 msgstr "网络设备"
 
-#: instances/templates/instances/settings_tab.html:341
-#: instances/templates/instances/settings_tab.html:342
+#: instances/templates/instances/settings_tab.html:354
 msgid "Info"
 msgstr "信息"
 
-#: instances/templates/instances/settings_tab.html:355
+#: instances/templates/instances/settings_tab.html:367
 msgid "active"
 msgstr "激活"
 
-#: instances/templates/instances/settings_tab.html:361
-#: nwfilters/templates/nwfilter.html:75
+#: instances/templates/instances/settings_tab.html:379
+#: nwfilters/templates/nwfilter.html:71
 msgid "Filter"
 msgstr "过滤器"
 
-#: instances/templates/instances/settings_tab.html:368
+#: instances/templates/instances/settings_tab.html:393
 msgid "Edit NIC"
 msgstr "编辑网卡"
 
-#: instances/templates/instances/settings_tab.html:376
+#: instances/templates/instances/settings_tab.html:403
 msgid "Edit Instance Network"
 msgstr "编辑实例网络"
 
-#: instances/templates/instances/settings_tab.html:389
+#: instances/templates/instances/settings_tab.html:416
 msgid "Net Source"
 msgstr "源网络"
 
-#: instances/templates/instances/settings_tab.html:397
+#: instances/templates/instances/settings_tab.html:424
 #: interfaces/templates/interface.html:4 interfaces/templates/interface.html:6
 #: interfaces/templates/interface.html:39
 msgid "Interface"
 msgstr "接口"
 
-#: instances/templates/instances/settings_tab.html:415
-#: instances/templates/instances/settings_tab.html:454
+#: instances/templates/instances/settings_tab.html:442
+#: instances/templates/instances/settings_tab.html:494
 msgid "Model"
 msgstr "模式"
 
-#: instances/templates/instances/settings_tab.html:429
+#: instances/templates/instances/settings_tab.html:456
 msgid "Apply network changes"
 msgstr "应用网络更改"
 
-#: instances/templates/instances/settings_tab.html:438
+#: instances/templates/instances/settings_tab.html:472
 msgid "Delete Device"
 msgstr "删除设备"
 
-#: instances/templates/instances/settings_tab.html:446
-#: interfaces/templates/create_iface_block.html:71
+#: instances/templates/instances/settings_tab.html:482
+#: interfaces/templates/create_iface_block.html:72
 #: interfaces/templates/interface.html:41
 msgid "IPv4"
 msgstr "IPv4"
 
-#: instances/templates/instances/settings_tab.html:450
-#: interfaces/templates/create_iface_block.html:74
+#: instances/templates/instances/settings_tab.html:488
+#: interfaces/templates/create_iface_block.html:77
 #: interfaces/templates/interface.html:43
 msgid "IPv6"
 msgstr "IPv6"
 
-#: instances/templates/instances/settings_tab.html:456
-msgid "QoS"
-msgstr "QoS 流量控制"
-
-#: instances/templates/instances/settings_tab.html:468
+#: instances/templates/instances/settings_tab.html:502
 msgid ""
 "In most configurations, macvtap does not work for host to guest network "
 "communication"
 msgstr "在大多数配置中，macvtap不适用于主机与客户机之间的网络通信"
 
-#: instances/templates/instances/settings_tab.html:481
+#: instances/templates/instances/settings_tab.html:515
 #: networks/templates/network.html:322
 msgid "QoS Configuration"
 msgstr "QoS 配置"
 
-#: instances/templates/instances/settings_tab.html:487
+#: instances/templates/instances/settings_tab.html:521
 #: networks/templates/add_network_qos.html:18
-#: networks/templates/network.html:328 nwfilters/templates/nwfilter.html:131
+#: networks/templates/network.html:328 nwfilters/templates/nwfilter.html:123
 msgid "Direction"
 msgstr "目的"
 
-#: instances/templates/instances/settings_tab.html:488
+#: instances/templates/instances/settings_tab.html:522
 #: networks/templates/add_network_qos.html:27
 #: networks/templates/network.html:329
 msgid "Average"
 msgstr "平均值"
 
-#: instances/templates/instances/settings_tab.html:489
+#: instances/templates/instances/settings_tab.html:523
 #: networks/templates/add_network_qos.html:34
 #: networks/templates/network.html:330
 msgid "Peak"
 msgstr "峰值"
 
-#: instances/templates/instances/settings_tab.html:490
+#: instances/templates/instances/settings_tab.html:524
 #: networks/templates/add_network_qos.html:41
 #: networks/templates/network.html:331
 msgid "Burst"
 msgstr "突发"
 
-#: instances/templates/instances/settings_tab.html:515
+#: instances/templates/instances/settings_tab.html:549
 #: networks/templates/network.html:353
 msgid "Edit QoS"
 msgstr "编辑 QoS"
 
-#: instances/templates/instances/settings_tab.html:525
+#: instances/templates/instances/settings_tab.html:559
 #: networks/templates/network.html:358
 msgid "Delete QoS"
 msgstr "删除 QoS"
 
-#: instances/templates/instances/settings_tab.html:541
+#: instances/templates/instances/settings_tab.html:575
 msgid "For migration both host servers must have equal settings and OS type"
 msgstr "为了进行迁移，两台主机服务器必须具有相同的设置和操作系统类型"
 
-#: instances/templates/instances/settings_tab.html:545
+#: instances/templates/instances/settings_tab.html:579
 msgid "Original host"
 msgstr "原始主机"
 
-#: instances/templates/instances/settings_tab.html:551
+#: instances/templates/instances/settings_tab.html:585
 msgid "Host migration"
 msgstr "主机迁移"
 
-#: instances/templates/instances/settings_tab.html:568
+#: instances/templates/instances/settings_tab.html:602
 msgid "Live migration"
 msgstr "实时（在线）迁移"
 
-#: instances/templates/instances/settings_tab.html:576
+#: instances/templates/instances/settings_tab.html:610
 msgid "Unsafe migration"
 msgstr "不安全的迁移"
 
-#: instances/templates/instances/settings_tab.html:584
+#: instances/templates/instances/settings_tab.html:618
 msgid "Delete original"
 msgstr "删除原始"
 
-#: instances/templates/instances/settings_tab.html:592
+#: instances/templates/instances/settings_tab.html:626
 msgid "Offline migration"
 msgstr "离线迁移"
 
-#: instances/templates/instances/settings_tab.html:600
+#: instances/templates/instances/settings_tab.html:634
 msgid "Post copy"
 msgstr "发布副本"
 
-#: instances/templates/instances/settings_tab.html:608
+#: instances/templates/instances/settings_tab.html:642
 msgid "Forces CPU convergence during live migration"
 msgstr "在实时迁移期间强制CPU收敛"
 
-#: instances/templates/instances/settings_tab.html:608
+#: instances/templates/instances/settings_tab.html:642
 msgid "Auto converge"
 msgstr "自动收敛"
 
-#: instances/templates/instances/settings_tab.html:616
+#: instances/templates/instances/settings_tab.html:650
 msgid "Compress instance memory for fast migration"
 msgstr "压缩实例内存以快速迁移"
 
-#: instances/templates/instances/settings_tab.html:616
+#: instances/templates/instances/settings_tab.html:650
 msgid "Compressed"
 msgstr "已压缩"
 
-#: instances/templates/instances/settings_tab.html:629
+#: instances/templates/instances/settings_tab.html:663
 msgid "If you need to edit XML please Power Off the instance"
 msgstr "如果您需要编辑XML，请关闭实例电源"
 
-#: instances/templates/instances/settings_tab.html:651
+#: instances/templates/instances/settings_tab.html:685
 msgid "Instance owners"
 msgstr "实例所有者"
 
-#: instances/templates/instances/settings_tab.html:680
+#: instances/templates/instances/settings_tab.html:714
 msgid "To change console settings, shutdown the instance."
 msgstr "要更改控制台设置，请关闭实例。"
 
-#: instances/templates/instances/settings_tab.html:697
+#: instances/templates/instances/settings_tab.html:731
 msgid "Create a clone"
 msgstr "创建一个克隆"
 
-#: instances/templates/instances/settings_tab.html:700
+#: instances/templates/instances/settings_tab.html:734
 msgid "Clone Name"
 msgstr "克隆名称"
 
-#: instances/templates/instances/settings_tab.html:707
-#: instances/templates/instances/settings_tab.html:738
+#: instances/templates/instances/settings_tab.html:740
+#: instances/templates/instances/settings_tab.html:769
 msgid "Guess"
 msgstr "猜测"
 
-#: instances/templates/instances/settings_tab.html:726
+#: instances/templates/instances/settings_tab.html:758
 msgid "Network devices"
 msgstr "网络设备"
 
-#: instances/templates/instances/settings_tab.html:736
+#: instances/templates/instances/settings_tab.html:767
 msgid "Random"
 msgstr "随机"
 
-#: instances/templates/instances/settings_tab.html:751
+#: instances/templates/instances/settings_tab.html:781
 msgid "Storage devices"
 msgstr "存储设备"
 
-#: instances/templates/instances/settings_tab.html:776
-#: instances/templates/instances/settings_tab.html:799
+#: instances/templates/instances/settings_tab.html:805
+#: instances/templates/instances/settings_tab.html:828
 msgid "Title"
 msgstr "标题"
 
-#: instances/templates/instances/settings_tab.html:796
+#: instances/templates/instances/settings_tab.html:825
 msgid "To set instance template name description, shutdown the instance."
 msgstr "要设置实例模板名称描述，请关闭实例。"
 
-#: instances/templates/instances/settings_tab.html:811
+#: instances/templates/instances/settings_tab.html:840
 msgid "Is template"
 msgstr "设置为模板"
 
-#: instances/templates/instances/settings_tab.html:832
+#: instances/templates/instances/settings_tab.html:861
 msgid "To set instance video model, shutdown the instance."
 msgstr "要设置实例视频模式，请关闭实例。"
 
-#: instances/templates/instances/settings_tab.html:835
+#: instances/templates/instances/settings_tab.html:864
 msgid "Primary Video Model"
 msgstr "主视频模式"
 
-#: instances/templates/instances/settings_tab.html:839
+#: instances/templates/instances/settings_tab.html:868
 msgid "please choose"
 msgstr "请选择"
 
-#: instances/templates/instances/settings_tab.html:846
-#: instances/templates/instances/settings_tab.html:848
-#: instances/templates/instances/settings_tab.html:868
-#: instances/templates/instances/settings_tab.html:870
-#: instances/templates/instances/settings_tab.html:898
-#: secrets/templates/secrets.html:103
+#: instances/templates/instances/settings_tab.html:874
+#: instances/templates/instances/settings_tab.html:876
+#: instances/templates/instances/settings_tab.html:894
+#: instances/templates/instances/settings_tab.html:896
+#: instances/templates/instances/settings_tab.html:922
+#: virtsecrets/templates/secrets.html:104
 msgid "Set"
 msgstr "设置"
 
-#: instances/templates/instances/settings_tab.html:856
+#: instances/templates/instances/settings_tab.html:883
 msgid "To set instance vCPUs hotpluggable"
 msgstr "设置实例 vCPU 热插拔"
 
-#: instances/templates/instances/settings_tab.html:859
+#: instances/templates/instances/settings_tab.html:886
 msgid "vCPU Hot Plug"
 msgstr "vCPU 热插拔"
 
-#: instances/templates/instances/settings_tab.html:863
-#: instances/templates/instances/settings_tab.html:894
+#: instances/templates/instances/settings_tab.html:890
+#: instances/templates/instances/settings_tab.html:919
 msgid "Enabled"
 msgstr "启用"
 
-#: instances/templates/instances/settings_tab.html:864
-#: instances/templates/instances/settings_tab.html:895
+#: instances/templates/instances/settings_tab.html:891
+#: instances/templates/instances/settings_tab.html:920
 msgid "Disabled"
 msgstr "禁用"
 
-#: instances/templates/instances/settings_tab.html:878
+#: instances/templates/instances/settings_tab.html:903
 msgid "To Enable/Disable Qemu Guest Agent. Status"
 msgstr "启用/禁用 Qemu 客户机代理。 状态"
 
-#: instances/templates/instances/settings_tab.html:883
+#: instances/templates/instances/settings_tab.html:908
 msgid "Disconnected"
 msgstr "断开连接"
 
-#: instances/templates/instances/settings_tab.html:886
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:709
+#: instances/templates/instances/settings_tab.html:911
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:714
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:703
 msgid "Unknown"
 msgstr "未知"
 
-#: instances/templates/instances/settings_tab.html:890
+#: instances/templates/instances/settings_tab.html:915
 msgid "Qemu Guest Agent"
 msgstr "Qemu 客户机代理"
 
-#: instances/templates/instances/snapshots_tab.html:9
-#: instances/templates/instances/snapshots_tab.html:31
-#: instances/templates/instances/snapshots_tab.html:33
+#: instances/templates/instances/snapshots_tab.html:8
+#: instances/templates/instances/snapshots_tab.html:26
 msgid "Take Snapshot"
 msgstr "创建快照"
 
-#: instances/templates/instances/snapshots_tab.html:14
+#: instances/templates/instances/snapshots_tab.html:13
 msgid "Manage Snapshots"
 msgstr "管理快照"
 
-#: instances/templates/instances/snapshots_tab.html:22
+#: instances/templates/instances/snapshots_tab.html:20
+#, fuzzy
+#| msgid ""
+#| "This may take more than an hour, depending on how much content is on your "
+#| "instance and how large the disk is."
 msgid ""
 "This may take more than an hour, depending on how much content is on your "
-"instance and how large the disk is."
+"instance and how large the disk is. It could cause web server timeout.."
 msgstr "这可能需要一个多小时，具体取决于实例上已使用的容量和磁盘大小。"
 
-#: instances/templates/instances/snapshots_tab.html:27
+#: instances/templates/instances/snapshots_tab.html:25
 msgid "Enter Snapshot Name"
 msgstr "输入快照名称"
 
-#: instances/templates/instances/snapshots_tab.html:38
-msgid "To take a snapshot please Power Off the instance."
-msgstr "要创建快照，请关闭实例电源。"
-
-#: instances/templates/instances/snapshots_tab.html:43
+#: instances/templates/instances/snapshots_tab.html:35
 msgid "Choose a snapshot for restore/delete"
 msgstr "选择要 还原/删除 的快照"
 
-#: instances/templates/instances/snapshots_tab.html:61
+#: instances/templates/instances/snapshots_tab.html:53
 msgid "Revert to this Snapshot"
 msgstr "还原到此快照"
 
-#: instances/templates/instances/snapshots_tab.html:66
+#: instances/templates/instances/snapshots_tab.html:58
 msgid "To restore snapshots you need Power Off the instance."
 msgstr "要还原快照，您需要关闭实例电源。"
 
-#: instances/templates/instances/snapshots_tab.html:75
+#: instances/templates/instances/snapshots_tab.html:67
 msgid "Delete Snapshot"
 msgstr "删除快照"
 
-#: instances/templates/instances/snapshots_tab.html:86
+#: instances/templates/instances/snapshots_tab.html:78
 msgid "You do not have any snapshots"
 msgstr "您还没有创建任何快照"
 
-#: instances/templates/instances/stats_tab.html:8
+#: instances/templates/instances/stats_tab.html:7
 msgid "Real Time"
 msgstr "实时时间"
 
-#: instances/templates/instances/stats_tab.html:23
+#: instances/templates/instances/stats_tab.html:22
 msgid "CPU Usage"
 msgstr "CPU 使用率"
 
@@ -2533,11 +2565,11 @@ msgstr "CPU 使用率"
 msgid "Memory Usage"
 msgstr "内存使用量"
 
-#: instances/templates/instances/stats_tab.html:50
+#: instances/templates/instances/stats_tab.html:51
 msgid "Bandwidth Device"
 msgstr "带宽设备"
 
-#: instances/templates/instances/stats_tab.html:65
+#: instances/templates/instances/stats_tab.html:67
 msgid "Disk I/O device"
 msgstr "磁盘 I/O 设备"
 
@@ -2545,51 +2577,41 @@ msgstr "磁盘 I/O 设备"
 msgid "None available device name"
 msgstr "没有可用的设备名称"
 
-#: instances/views.py:242 instances/views.py:395 instances/views.py:236
+#: instances/views.py:249
 msgid "Templates cannot be started."
 msgstr "模板无法启动。"
 
-#: instances/views.py:345
+#: instances/views.py:352
 #, python-format
 msgid "Instance is migrated to %(hostname)s"
 msgstr "实例已迁移到 %(hostname)s"
 
-#: instances/views.py:368 instances/views.py:362
+#: instances/views.py:375
 msgid "Reset root password"
 msgstr "重置 Root 密码"
 
-#: instances/views.py:374 instances/views.py:403 instances/views.py:368
-#: instances/views.py:397
+#: instances/views.py:381 instances/views.py:410
 msgid "Please shutdown down your instance and then try again"
 msgstr "请关闭您的实例，然后重试"
 
-#: instances/views.py:339
-#, python-format
-msgid "Migrate to %(hostname)%"
-msgstr "迁移到 %(hostname)%"
-
-#: instances/views.py:389
+#: instances/views.py:402
 #, python-format
 msgid "Installed new SSH public key %(keyname)s"
 msgstr "安装了新的 SSH 公钥 %(keyname)s"
 
-#: instances/views.py:422 instances/views.py:416
+#: instances/views.py:429
 #, python-format
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize CPU of '%(instance_name)s'!"
 msgstr ""
 "已达到用户 %(quota_msg)s 的配额，无法调整 '%(instance_name)s' 的 CPU 大小！"
 
-#: instances/views.py:431
+#: instances/views.py:438
 #, python-format
 msgid "CPU is resized:  %(old)s to %(new)s"
 msgstr "CPU已调整大小： %(old)s 至 %(new)s"
 
-#: instances/views.py:459 instances/views.py:425
-msgid "Resize CPU"
-msgstr "调整 CPU"
-
-#: instances/views.py:453
+#: instances/views.py:466
 #, python-format
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize memory of "
@@ -2597,7 +2619,7 @@ msgid ""
 msgstr ""
 "已达到用户 %(quota_msg)s 的配额，无法调整 '%(instance_name)s' 的内存大小！"
 
-#: instances/views.py:466
+#: instances/views.py:473
 #, python-format
 msgid ""
 "Memory is resized: current/max: %(old_cur)s/%(old_max)s to %(new_cur)s/"
@@ -2606,208 +2628,174 @@ msgstr ""
 "内存大小已调整：当前/最大值: %(old_cur)s/%(old_max)s 至 %(new_cur)s/"
 "%(new_max)s"
 
-#: instances/views.py:500 instances/views.py:462
-msgid "Resize Memory"
-msgstr "调整内存"
-
-#: instances/views.py:491
+#: instances/views.py:507
 #, python-format
 msgid ""
 "User %(quota_msg)s quota reached, cannot resize disks of '%(instance_name)s'!"
 msgstr ""
 "已达到用户 %(quota_msg)s 的配额，无法调整 '%(instance_name)s' 的磁盘大小！"
 
-#: instances/views.py:507
+#: instances/views.py:514
 #, python-format
 msgid "Disk is resized: %(dev)s"
 msgstr "磁盘大小已调整：%(dev)s"
 
-#: instances/views.py:546
+#: instances/views.py:570
 #, python-format
 msgid "Attach new disk: %(name)s (%(format)s)"
 msgstr "附加新磁盘：%(name)s (%(format)s)"
 
-#: instances/views.py:577 instances/views.py:498
-msgid "Disk resize"
-msgstr "调整磁盘"
-
-#: instances/views.py:537
-#, python-format
-msgid "Attach new disk %(name)s (%(format)s)"
-msgstr "附加新磁盘 %(name)s (%(format)s)"
-
-#: instances/views.py:568
+#: instances/views.py:609
 #, python-format
 msgid "Attach Existing disk: %(target_dev)s"
 msgstr "附加现有磁盘：%(target_dev)s"
 
-#: instances/views.py:635 instances/views.py:624
+#: instances/views.py:667
 msgid "Volume changes are applied. But it will be activated after shutdown"
 msgstr "卷的更改已应用。它将在关机后被激活"
 
-#: instances/views.py:626
+#: instances/views.py:670
 msgid "Volume is changed successfully."
 msgstr "已成功更改卷。"
 
-#: instances/views.py:639 instances/views.py:627
+#: instances/views.py:671
 #, python-format
 msgid "Edit disk: %(target_dev)s"
 msgstr "编辑磁盘：%(target_dev)s"
 
-#: instances/views.py:661 instances/views.py:649
+#: instances/views.py:693
 #, python-format
 msgid "Delete disk: %(dev)s"
 msgstr "删除磁盘：%(dev)s"
 
-#: instances/views.py:677 instances/views.py:665
+#: instances/views.py:709
 #, python-format
 msgid "Detach disk: %(dev)s"
 msgstr "分离磁盘：%(dev)s"
 
-#: instances/views.py:690 instances/views.py:678
+#: instances/views.py:722
 #, python-format
 msgid "Add CD-ROM: %(target)s"
 msgstr "添加 CD-ROM：%(target)s"
 
-#: instances/views.py:703 instances/views.py:691
+#: instances/views.py:735
 #, python-format
 msgid "Detach CD-ROM: %(dev)s"
 msgstr "分离 CD-ROM：%(dev)s"
 
-#: instances/views.py:716 instances/views.py:704
+#: instances/views.py:748
 #, python-format
 msgid "Mount media: %(dev)s"
 msgstr "挂在媒体：%(dev)s"
 
-#: instances/views.py:729 instances/views.py:717
+#: instances/views.py:761
 #, python-format
 msgid "Unmount media: %(dev)s"
 msgstr "卸载媒体：%(dev)s"
 
-#: instances/views.py:742
+#: instances/views.py:774
 #, python-format
 msgid "Create snapshot: %(snap)s"
 msgstr "创建快照：%(snap)s"
 
-#: instances/views.py:753 instances/views.py:730
-#, python-format
-msgid "New snapshot: %(name)s"
-msgstr "新快照：%(name)s"
-
-#: instances/views.py:741
-#, python-format
-msgid "Delete snapshot: %(snap_name)s"
+#: instances/views.py:785
+#, fuzzy, python-format
+#| msgid "Delete snapshot: %(snap_name)s"
+msgid "Delete snapshot: %(snap)s"
 msgstr "删除快照：%(snap_name)s"
 
-#: instances/views.py:752
+#: instances/views.py:796
 msgid "Successful revert snapshot: "
 msgstr "成功还原快照： "
 
-#: instances/views.py:767
-msgid "Revert snapshot: %(snap)"
+#: instances/views.py:799
+#, fuzzy, python-format
+#| msgid "Revert snapshot: %(snap)"
+msgid "Revert snapshot: %(snap)s"
 msgstr "还原快照：%(snap)"
 
-#: instances/views.py:781 instances/views.py:755
-msgid "Revert snapshot"
-msgstr "还原快照"
-
-#: instances/views.py:769
+#: instances/views.py:813
 #, python-format
 msgid "VCPU %(id)s is enabled=%(enabled)s"
 msgstr "VCPU %(id)s 已启用=%(enabled)s"
 
-#: instances/views.py:790 instances/views.py:780
+#: instances/views.py:822
 #, python-format
 msgid "VCPU Hot-plug is enabled=%(status)s"
 msgstr "VCPU 热插拔 已启用=%(status)s"
 
-#: instances/views.py:800 instances/views.py:847 instances/views.py:791
+#: instances/views.py:832
 msgid "Set autostart"
 msgstr "设置自动启动"
 
-#: instances/views.py:809 instances/views.py:800
+#: instances/views.py:841
 msgid "Unset autostart"
 msgstr "取消自动启动"
 
-#: instances/views.py:818 instances/views.py:809
+#: instances/views.py:850
 msgid "Enable boot menu"
 msgstr "启用引导菜单"
 
-#: instances/views.py:827 instances/views.py:818
+#: instances/views.py:859
 msgid "Disable boot menu"
 msgstr "关闭引导菜单"
 
-#: instances/views.py:842 instances/views.py:833
+#: instances/views.py:874
 msgid "Set boot order"
 msgstr "设置启动顺序"
 
-#: instances/views.py:836
+#: instances/views.py:879
 msgid "Boot menu changes applied. But it will be activated after shutdown"
 msgstr "引导菜单的更改已应用。 但是它将在关机后被激活"
 
-#: instances/views.py:838
+#: instances/views.py:882
 msgid "Boot order changed successfully."
 msgstr "启动顺序已成功更改。"
 
-#: instances/views.py:861
+#: instances/views.py:893
 msgid "Change instance XML"
 msgstr "更改实例XML"
 
-#: instances/views.py:875
+#: instances/views.py:907
 #, python-format
 msgid "Set Guest Agent: %(status)s"
 msgstr "设置客户机代理：%(status)s"
 
-#: instances/views.py:885 instances/views.py:849
-msgid "Edit XML"
-msgstr "编辑XML"
-
-#: instances/views.py:863
-#, python-format
-msgid "Set Guest Agent %(status)s"
-msgstr "设置客户机代理 %(status)s"
-
-#: instances/views.py:873
-msgid "Set Video Model"
+#: instances/views.py:917
+#, fuzzy, python-format
+#| msgid "Set Video Model"
+msgid "Set Video Model: %(model)s"
 msgstr "设置视频模式"
 
-#: instances/views.py:882
+#: instances/views.py:926
 msgid "Change network"
 msgstr "修改网络"
 
-#: instances/views.py:895
+#: instances/views.py:949
 msgid "Network Device Config is changed. Please shutdown instance to activate."
 msgstr "网络设备配置已更改。 请关闭实例以激活。"
 
-#: instances/views.py:922
+#: instances/views.py:974
 #, python-format
 msgid "Add network: %(mac)s"
 msgstr "添加网络：%(mac)s"
 
-#: instances/views.py:933
+#: instances/views.py:985
 #, python-format
 msgid "Delete Network: %(mac)s"
 msgstr "删除网络：%(mac)s"
 
-#: instances/views.py:946 instances/views.py:903
-msgid "Add network"
-msgstr "添加网络"
-
-#: instances/views.py:917
-msgid "Delete network"
-msgstr "删除网络"
-
-#: instances/views.py:933
+#: instances/views.py:998
 #, python-format
 msgid "Set Link State: %(state)s"
 msgstr "设置链接状态： %(state)s"
 
-#: instances/views.py:966 networks/views.py:231 instances/views.py:952
+#: instances/views.py:1018 networks/views.py:231
 #, python-format
 msgid "%(qos_dir)s QoS is set"
 msgstr "%(qos_dir)s 已设置"
 
-#: instances/views.py:971 instances/views.py:956
+#: instances/views.py:1023
 #, python-format
 msgid ""
 "%(qos_dir)s QoS is set. Network XML is changed.                 Stop and "
@@ -2816,12 +2804,12 @@ msgstr ""
 "%(qos_dir)s QoS 已设置。网络XML已更改。                 停止并启动网络以激活"
 "新的配置。"
 
-#: instances/views.py:988 networks/views.py:246 instances/views.py:970
+#: instances/views.py:1040 networks/views.py:246
 #, python-format
 msgid "%(qos_dir)s QoS is deleted"
 msgstr "%(qos_dir)s QoS 已删除"
 
-#: instances/views.py:993 instances/views.py:974
+#: instances/views.py:1045
 #, python-format
 msgid ""
 "%(qos_dir)s QoS is deleted. Network XML is changed.                 Stop and "
@@ -2830,143 +2818,128 @@ msgstr ""
 "%(qos_dir)s QoS 已删除。网络XML已更改。                 停止并启动网络以激活"
 "新的配置。"
 
-#: instances/views.py:1012 instances/views.py:1017 instances/views.py:990
+#: instances/views.py:1064
 msgid "Only one owner is allowed and the one already added"
 msgstr "只允许存在一个所有者，并且已经添加了一个所有者"
 
-#: instances/views.py:995
+#: instances/views.py:1069
 #, python-format
 msgid "Add owner: %(user)s"
 msgstr "添加所有者：%(user)s"
 
-#: instances/views.py:1028
+#: instances/views.py:1080
 #, python-format
 msgid "Delete owner: %(userinstance_id)s "
 msgstr "删除所有者：%(userinstance_id)s "
 
-#: instances/views.py:1060 instances/views.py:1006
-#, python-format
-msgid "Deleted owner %(userinstance_id)s"
-msgstr "删除所有者 %(userinstance_id)s"
-
-#: instances/views.py:1038
+#: instances/views.py:1112
 #, python-format
 msgid "User '%(quota_msg)s' quota reached, cannot create '%(clone_name)s'!"
 msgstr "达到用户 '%(quota_msg)s' 的配额，无法创建 '%(clone_name)s' ！"
 
-#: instances/views.py:1066
+#: instances/views.py:1118
 #, python-format
 msgid "Instance '%(clone_name)s' already exists!"
 msgstr "实例 '%(clone_name)s' 已存在！"
 
-#: instances/views.py:1069 instances/views.py:1044
-msgid "Instance 'clone_name' already exists!"
-msgstr "实例 'clone_name' 已存在！"
-
-#: instances/views.py:1047
+#: instances/views.py:1121
 #, python-format
 msgid "Instance name '%(clone_name)s' contains invalid characters!"
 msgstr "实例名称 '%(clone_name)s' 包含无效的字符！"
 
-#: instances/views.py:1072 instances/views.py:1050
+#: instances/views.py:1124
 #, python-format
 msgid "Instance MAC '%(clone_mac)s' invalid format!"
 msgstr "实例 MAC '%(clone_mac)s' 无效的格式！"
 
-#: instances/views.py:1082
+#: instances/views.py:1134
 #, python-format
 msgid "Create a clone of '%(instance_name)s'"
 msgstr "创建一个 '%(instance_name)s' 的克隆"
 
-#: instances/views.py:1121 instances/views.py:1060
-#, python-format
-msgid "Clone of '%(instance_name)s'"
-msgstr "'%(instance_name)s' 的克隆"
-
-#: instances/views.py:1093
+#: instances/views.py:1173
 msgid ""
 "Error setting console password. You should check that your instance have an "
 "graphic device."
 msgstr "设置控制台密码时出错。 您应检查实例是否具有图形设备。"
 
-#: instances/views.py:1126 instances/views.py:1512 instances/views.py:1096
+#: instances/views.py:1178
 msgid "Set VNC password"
 msgstr "设置 VNC 密码"
 
-#: instances/views.py:1135 instances/views.py:1104
+#: instances/views.py:1187
 msgid "Set VNC keymap"
 msgstr "设置 VNC 键盘"
 
-#: instances/views.py:1140 instances/views.py:1109
+#: instances/views.py:1192
 msgid "Set VNC type"
 msgstr "设置 VNC 类型"
 
-#: instances/views.py:1145 instances/views.py:1114
+#: instances/views.py:1197
 msgid "Set VNC listen address"
 msgstr "设置 VNC 监听地址"
 
-#: instances/views.py:1168 instances/views.py:1137
+#: instances/views.py:1220
 msgid "Edit options"
 msgstr "编辑选项"
 
-#: instances/views.py:1182 instances/views.py:1151
+#: instances/views.py:1234
 msgid "Send console.vv file"
 msgstr "发送 console.vv 文件"
 
-#: instances/views.py:1243 instances/views.py:1337 instances/views.py:1206
-#: instances/views.py:1298
+#: instances/views.py:1295 instances/views.py:1389
 msgid "A virtual machine with this name already exists"
 msgstr "具有该名称的虚拟机已存在"
 
-#: instances/views.py:1320 instances/views.py:1281
+#: instances/views.py:1372
 msgid "You haven't defined any storage pools"
 msgstr "您尚未定义任何存储资源池"
 
-#: instances/views.py:1322 instances/views.py:1283
+#: instances/views.py:1374
 msgid "You haven't defined any network pools"
 msgstr "您尚未定义任何网络资源池"
 
-#: instances/views.py:1339 instances/views.py:1300
+#: instances/views.py:1391
 msgid "There is an instance with same name. Remove it and try again!"
 msgstr "有一个同名实例。 删除它，然后再试一次！"
 
-#: instances/views.py:1343 instances/views.py:1304
+#: instances/views.py:1395
 msgid "No Virtual Machine MAC has been entered"
 msgstr "没有输入虚拟机 MAC 地址"
 
-#: instances/views.py:1374 instances/views.py:1327
+#: instances/views.py:1426
 msgid "Image has already exist. Please check volumes or change instance name"
 msgstr "镜像已经存在。 请检查卷或更改实例名称"
 
-#: instances/views.py:1401 instances/views.py:1347
+#: instances/views.py:1453
 msgid "First you need to create or select an image"
 msgstr "首先，您需要创建或选择镜像"
 
-#: instances/views.py:1419 instances/views.py:1365
+#: instances/views.py:1471
 msgid "Invalid cache mode"
 msgstr "无效的缓存模式"
 
-#: instances/views.py:1460 instances/views.py:1402
+#: instances/views.py:1512
 msgid "Instance is created"
 msgstr "实例已创建"
 
-#: instances/views.py:1481 instances/views.py:1423
+#: instances/views.py:1533
 msgid "Flavor Created"
 msgstr "规格已创建"
 
-#: instances/views.py:1487 instances/views.py:1431
+#: instances/views.py:1539
 msgid "Create Flavor"
 msgstr "创建规格"
 
-#: instances/views.py:1497 instances/views.py:1442
+#: instances/views.py:1549
 msgid "Flavor Updated"
 msgstr "规格已更新"
 
-#: instances/views.py:1503 instances/views.py:1450
+#: instances/views.py:1555
 msgid "Update Flavor"
 msgstr "更新规格"
 
-#: instances/views.py:1460
+#: instances/views.py:1564
 msgid "Flavor Deleted"
 msgstr "规格已删除"
 
@@ -3032,12 +3005,12 @@ msgstr "热插拔"
 
 #: interfaces/templates/create_iface_block.html:44
 #: interfaces/templates/interface.html:76
-#: interfaces/templates/interfaces.html:62
-#: storages/templates/create_stg_block.html:35
-#: storages/templates/create_stg_block.html:64
-#: storages/templates/create_stg_block.html:93
-#: storages/templates/create_stg_block.html:158
-#: storages/templates/storages.html:60
+#: interfaces/templates/interfaces.html:63
+#: storages/templates/create_stg_block.html:49
+#: storages/templates/create_stg_block.html:78
+#: storages/templates/create_stg_block.html:107
+#: storages/templates/create_stg_block.html:172
+#: storages/templates/storages.html:59
 msgid "Type"
 msgstr "类型"
 
@@ -3065,43 +3038,43 @@ msgstr "关"
 msgid "Delay"
 msgstr "延迟"
 
-#: interfaces/templates/create_iface_block.html:82
+#: interfaces/templates/create_iface_block.html:86
 msgid "IPv4 Mode"
 msgstr "IPv4 模式"
 
-#: interfaces/templates/create_iface_block.html:85
-#: interfaces/templates/create_iface_block.html:112
+#: interfaces/templates/create_iface_block.html:89
+#: interfaces/templates/create_iface_block.html:116
 #: networks/templates/network.html:109 networks/templates/network.html:220
 msgid "DHCP"
 msgstr "动态"
 
-#: interfaces/templates/create_iface_block.html:86
-#: interfaces/templates/create_iface_block.html:113
+#: interfaces/templates/create_iface_block.html:90
+#: interfaces/templates/create_iface_block.html:117
 msgid "Static"
 msgstr "静态"
 
-#: interfaces/templates/create_iface_block.html:87
-#: interfaces/templates/create_iface_block.html:111
+#: interfaces/templates/create_iface_block.html:91
+#: interfaces/templates/create_iface_block.html:115
 msgid "No configuration"
 msgstr "没有配置"
 
-#: interfaces/templates/create_iface_block.html:92
+#: interfaces/templates/create_iface_block.html:96
 msgid "IPv4 Address"
 msgstr "IPv4 地址"
 
-#: interfaces/templates/create_iface_block.html:98
+#: interfaces/templates/create_iface_block.html:102
 msgid "IPv4 Gateway"
 msgstr "IPv4 网关"
 
-#: interfaces/templates/create_iface_block.html:108
+#: interfaces/templates/create_iface_block.html:112
 msgid "IPv6 Mode"
 msgstr "IPv6 类型"
 
-#: interfaces/templates/create_iface_block.html:118
+#: interfaces/templates/create_iface_block.html:122
 msgid "IPv6 Address"
 msgstr "IPv6 地址"
 
-#: interfaces/templates/create_iface_block.html:124
+#: interfaces/templates/create_iface_block.html:128
 msgid "IPv6 Gateway"
 msgstr "IPv6 网关"
 
@@ -3119,12 +3092,12 @@ msgstr "启动模式"
 
 #: interfaces/templates/interface.html:55
 #: interfaces/templates/interface.html:78 networks/templates/network.html:45
-#: storages/templates/storage.html:56
+#: storages/templates/storage.html:58
 msgid "State"
 msgstr "状态"
 
 #: interfaces/templates/interface.html:62 networks/templates/network.html:52
-#: storages/templates/storage.html:64
+#: storages/templates/storage.html:66
 msgid "Stop"
 msgstr "停止"
 
@@ -3136,7 +3109,7 @@ msgstr "从模式"
 msgid "Speed"
 msgstr "速度"
 
-#: interfaces/templates/interfaces.html:47
+#: interfaces/templates/interfaces.html:48
 msgid "Hypervisor doesn't have any Interfaces"
 msgstr "虚拟机监控程序没有检测到任何接口"
 
@@ -3145,14 +3118,20 @@ msgid "user"
 msgstr "用户"
 
 #: logs/models.py:6
+#, fuzzy
+#| msgid "hostname"
+msgid "host"
+msgstr "主机名"
+
+#: logs/models.py:7
 msgid "instance"
 msgstr "实例"
 
-#: logs/models.py:7
+#: logs/models.py:8
 msgid "message"
 msgstr "消息"
 
-#: logs/models.py:8
+#: logs/models.py:9
 msgid "date"
 msgstr "日期"
 
@@ -3223,8 +3202,8 @@ msgid "Add New Network"
 msgstr "添加新的网络"
 
 #: networks/templates/create_net_block.html:20
-#: storages/templates/create_stg_block.html:44
-#: storages/templates/create_stg_block.html:73
+#: storages/templates/create_stg_block.html:58
+#: storages/templates/create_stg_block.html:87
 msgid "default"
 msgstr "默认"
 
@@ -3346,12 +3325,12 @@ msgid "IPv4 Fixed Addresses"
 msgstr "IPv4 固定地址"
 
 #: networks/templates/network.html:158 networks/templates/network.html:268
-#: nwfilters/templates/nwfilters.html:85
+#: nwfilters/templates/nwfilters.html:83
 msgid "Show"
 msgstr "查看"
 
-#: networks/templates/network.html:166 networks/templates/network.html:276
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:395
+#: networks/templates/network.html:165 networks/templates/network.html:275
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:403
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:377
 msgid "Clear"
 msgstr "清除"
@@ -3376,11 +3355,11 @@ msgstr "IPv6 转发"
 msgid "IPv6 Fixed Addresses"
 msgstr "IPv6 固定地址"
 
-#: networks/templates/networks.html:46
+#: networks/templates/networks.html:45
 msgid "Hypervisor doesn't have any Network"
 msgstr "虚拟机监控程序没有检测到任何网络"
 
-#: networks/templates/networks.html:61
+#: networks/templates/networks.html:60
 msgid "Forward"
 msgstr "转发"
 
@@ -3392,11 +3371,11 @@ msgstr "网络资源池名称已被使用"
 msgid "Please enter bridge/dev name"
 msgstr "请输入 网桥/设备 名称"
 
-#: networks/views.py:57 networks/views.py:210 networks/views.py:56
+#: networks/views.py:57
 msgid "For libvirt, the IPv6 network prefix must be /64"
 msgstr "对于 libvirt，IPv6 网络前缀必须为 /64"
 
-#: networks/views.py:130 networks/views.py:126
+#: networks/views.py:130
 msgid "Unknown Network Family"
 msgstr "未知的网络家族"
 
@@ -3415,25 +3394,12 @@ msgstr "%(family)s 固定地址已被删除。"
 msgid "%(family)s DHCP Range is Changed."
 msgstr "%(family)s DHCP 范围已更改。"
 
-#: networks/views.py:176
-msgid "{family.upper()} Fixed Address Operation Completed."
-msgstr "{family.upper()} 固定地址操作已完成。"
-
-#: networks/views.py:186
-msgid "{family.upper()} Fixed Address is Deleted."
-msgstr "{family.upper()} 固定地址已被删除。"
-
-#: networks/views.py:194
-msgid "{family.upper()} DHCP Range is Changed."
-msgstr "{family.upper()} DHCP 范围已更改。"
-
-#: networks/views.py:203
+#: networks/views.py:210
 msgid ""
 "Network XML is changed. \\Stop and start network to activate new config."
 msgstr "网络XML已更改。\\停止并启动网络以激活新配置。"
 
-#: networks/views.py:215 networks/views.py:242 networks/views.py:205
-#, python-format
+#: networks/views.py:215
 msgid "Network XML is changed."
 msgstr "网络XML已更改。"
 
@@ -3444,29 +3410,17 @@ msgid ""
 "to activate new config"
 msgstr "%(qos_dir)s 的 QoS 已更新。 网络XML已更改。 停止并启动网络以激活新配置"
 
-#: networks/views.py:218
-msgid "{qos_dir.capitalize()} QoS is set. Network XML is changed."
-msgstr "{qos_dir.capitalize()} QoS 已设置。 网络XML已更改。"
-
-#: networks/views.py:219
-msgid "Stop and start network to activate new config"
-msgstr "停止并启动网络以激活新配置"
-
-#: networks/views.py:221
-msgid "{} QoS is set"
-msgstr "{} QoS 已设置"
-
-#: networks/views.py:232
-msgid "{qos_dir.capitalize()} QoS is deleted. Network XML is changed. "
-msgstr "{qos_dir.capitalize()} QoS 已删除。网络XML已更改 "
-
-#: networks/views.py:233
-msgid "Stop and start network to activate new config."
-msgstr "停止并启动网络以激活新配置。"
-
-#: networks/views.py:235
-msgid "{qos_dir.capitalize()} QoS is deleted"
-msgstr "{qos_dir.capitalize()} QoS 已删除"
+#: networks/views.py:242
+#, fuzzy, python-format
+#| msgid ""
+#| "%(qos_dir)s QoS is deleted. Network XML is changed.                 Stop "
+#| "and start network to activate new config."
+msgid ""
+"%(qos_dir)s QoS is deleted. Network XML is changed.                         "
+"Stop and start network to activate new config"
+msgstr ""
+"%(qos_dir)s QoS 已删除。网络XML已更改。                 停止并启动网络以激活"
+"新的配置。"
 
 #: nwfilters/templates/add_nwf_rule.html:12
 msgid "Add New NWFilter Rule"
@@ -3480,8 +3434,8 @@ msgstr "如果存在具有相同属性的规则，它将替换该规则"
 msgid "Create New NWFilter"
 msgstr "创建新的 NWFilter"
 
-#: nwfilters/templates/nwfilter.html:39 nwfilters/templates/nwfilters.html:55
-#: secrets/templates/secrets.html:59
+#: nwfilters/templates/nwfilter.html:39 nwfilters/templates/nwfilters.html:53
+#: virtsecrets/templates/secrets.html:60
 msgid "UUID"
 msgstr "UUID"
 
@@ -3489,55 +3443,55 @@ msgstr "UUID"
 msgid "Filter References"
 msgstr "筛选参考"
 
-#: nwfilters/templates/nwfilter.html:100
+#: nwfilters/templates/nwfilter.html:92
 msgid "Reference"
 msgstr "参考"
 
-#: nwfilters/templates/nwfilter.html:125
+#: nwfilters/templates/nwfilter.html:117
 msgid "Rules"
 msgstr "规则"
 
-#: nwfilters/templates/nwfilter.html:129
+#: nwfilters/templates/nwfilter.html:121
 msgid "Rule"
 msgstr "规则"
 
-#: nwfilters/templates/nwfilter.html:130
+#: nwfilters/templates/nwfilter.html:122
 msgid "Action Type"
 msgstr "应用属性"
 
-#: nwfilters/templates/nwfilter.html:132
+#: nwfilters/templates/nwfilter.html:124
 msgid "Priority"
 msgstr "优先"
 
-#: nwfilters/templates/nwfilter.html:133
+#: nwfilters/templates/nwfilter.html:125
 msgid "Statematch"
 msgstr "状态匹配"
 
-#: nwfilters/templates/nwfilter.html:134
+#: nwfilters/templates/nwfilter.html:126
 msgid "Directives"
 msgstr "指令"
 
-#: nwfilters/templates/nwfilters.html:71
+#: nwfilters/templates/nwfilters.html:69
 msgid "Details of NWFilter"
 msgstr "NWFilter 的详细信息"
 
-#: nwfilters/templates/nwfilters.html:94
+#: nwfilters/templates/nwfilters.html:92
 msgid "Clone NWFilter"
 msgstr "克隆 NWFilter"
 
-#: nwfilters/templates/nwfilters.html:135
+#: nwfilters/templates/nwfilters.html:132
 msgid "Hypervisor doesn't have any NWFilters"
 msgstr "虚拟机监控程序没有检测到任何 NWFilter"
 
-#: nwfilters/views.py:44 nwfilters/views.py:51 nwfilters/views.py:41
+#: nwfilters/views.py:44
 msgid "A network filter with this name already exists"
 msgstr "具有该名称的网络过滤器已存在"
 
-#: nwfilters/views.py:47 nwfilters/views.py:44
+#: nwfilters/views.py:47
 msgid "A network filter with this UUID already exists"
 msgstr "具有该 UUID 的网络过滤器已存在"
 
-#: nwfilters/views.py:48
+#: nwfilters/views.py:51
 #, python-format
 msgid "%(filter)s network filter is created"
 msgstr "%(filter)s 网络过滤器已创建"
@@ -3547,74 +3501,17 @@ msgstr "%(filter)s 网络过滤器已创建"
 msgid "%(filter)s network filter is deleted"
 msgstr "%(filter)s 网络过滤器已删除"
 
-#: nwfilters/views.py:76
+#: nwfilters/views.py:77
 #, python-format
 msgid "NWFilter is in use by %(instance)s. Cannot be deleted."
 msgstr "%(instance)s 正在使用NWFilter。无法删除。"
 
-#: nwfilters/views.py:93 nwfilters/views.py:57
-#, python-brace-format
-msgid "Deleting NWFilter: {name}"
-msgstr "删除 NWFilter: {name}"
-
-#: nwfilters/views.py:69
-#, python-brace-format
-msgid "NWFilter is in use by {inst}. Cannot be deleted."
-msgstr "{inst} 正在使用NWFilter。无法删除。"
-
-#: nwfilters/views.py:86
-#, python-brace-format
-msgid "Cloning NWFilter {name} as {cln_name}"
+#: nwfilters/views.py:96
+#, fuzzy, python-format
+#| msgid "Cloning NWFilter {name} as {cln_name}"
+msgid "Cloning NWFilter %(name)s as %(clone)s"
 msgstr "将NWFilter {name} 克隆为 {cln_name}"
 
-#: secrets/templates/create_secret_block.html:12
-msgid "Create New Secret"
-msgstr "创建新的 密码/密钥"
-
-#: secrets/templates/create_secret_block.html:18
-msgid "Ephemeral"
-msgstr "短效的"
-
-#: secrets/templates/create_secret_block.html:21
-#: secrets/templates/create_secret_block.html:30
-msgid "no"
-msgstr "否"
-
-#: secrets/templates/create_secret_block.html:22
-#: secrets/templates/create_secret_block.html:31
-msgid "yes"
-msgstr "是"
-
-#: secrets/templates/create_secret_block.html:27
-msgid "Private"
-msgstr "私有的"
-
-#: secrets/templates/create_secret_block.html:36
-#: storages/templates/storage.html:54
-msgid "Usage"
-msgstr "使用"
-
-#: secrets/templates/create_secret_block.html:46
-#: secrets/templates/secrets.html:61
-msgid "Data"
-msgstr "数据"
-
-#: secrets/templates/secrets.html:50
-msgid "Hypervisor doesn't have any Secrets"
-msgstr "虚拟机监控程序没有检测到任何 密码/密钥"
-
-#: secrets/templates/secrets.html:60
-msgid "Usage Type"
-msgstr "使用类型"
-
-#: secrets/templates/secrets.html:88
-msgid "Set secret value"
-msgstr "设定 密钥/密码 值"
-
-#: secrets/templates/secrets.html:94
-msgid "Value"
-msgstr "数值"
-
 #: storages/forms.py:10 storages/forms.py:37
 msgid "No path has been entered"
 msgstr "没有输入路径"
@@ -3643,64 +3540,64 @@ msgstr "镜像名称不得超过120个字符"
 msgid "Create Storage Pool"
 msgstr "创建存储资源池"
 
-#: storages/templates/create_stg_block.html:18
+#: storages/templates/create_stg_block.html:19
 msgid "DIR"
 msgstr "DIR (文件目录)"
 
-#: storages/templates/create_stg_block.html:21
+#: storages/templates/create_stg_block.html:24
 msgid "LVM"
 msgstr "LVM"
 
-#: storages/templates/create_stg_block.html:23
+#: storages/templates/create_stg_block.html:29
 msgid "CEPH"
 msgstr "CEPH"
 
-#: storages/templates/create_stg_block.html:25
+#: storages/templates/create_stg_block.html:34
 msgid "NETFS"
 msgstr "NETFS"
 
-#: storages/templates/create_stg_block.html:27
+#: storages/templates/create_stg_block.html:39
 msgid "ISO"
 msgstr "ISO"
 
-#: storages/templates/create_stg_block.html:48
-#: storages/templates/create_stg_block.html:222
+#: storages/templates/create_stg_block.html:62
+#: storages/templates/create_stg_block.html:236
 msgid "Path"
 msgstr "路径"
 
-#: storages/templates/create_stg_block.html:106
+#: storages/templates/create_stg_block.html:120
 msgid "Ceph User"
 msgstr "Ceph 用户"
 
-#: storages/templates/create_stg_block.html:112
+#: storages/templates/create_stg_block.html:126
 msgid "Ceph Pool"
 msgstr "Ceph 资源池"
 
-#: storages/templates/create_stg_block.html:118
+#: storages/templates/create_stg_block.html:132
 msgid "Ceph Host"
 msgstr "Ceph 主机"
 
-#: storages/templates/create_stg_block.html:177
+#: storages/templates/create_stg_block.html:191
 msgid "Remote Path"
 msgstr "远程路径"
 
-#: storages/templates/create_stg_block.html:186
+#: storages/templates/create_stg_block.html:200
 msgid "auto"
 msgstr "自动"
 
-#: storages/templates/create_stg_block.html:187
+#: storages/templates/create_stg_block.html:201
 msgid "nfs"
 msgstr "nfs"
 
-#: storages/templates/create_stg_block.html:188
+#: storages/templates/create_stg_block.html:202
 msgid "glusterfs"
 msgstr "glusterfs"
 
-#: storages/templates/create_stg_block.html:189
+#: storages/templates/create_stg_block.html:203
 msgid "cifs"
 msgstr "cifs"
 
-#: storages/templates/create_stg_block.html:194
+#: storages/templates/create_stg_block.html:208
 msgid "Local Path"
 msgstr "本地路径"
 
@@ -3716,47 +3613,52 @@ msgstr "上传"
 msgid "Add New Volume"
 msgstr "添加一个新卷"
 
-#: storages/templates/storage.html:44
+#: storages/templates/storage.html:46
 msgid "Pool name"
 msgstr "资源池名称"
 
-#: storages/templates/storage.html:46
+#: storages/templates/storage.html:48
 msgid "Pool type"
 msgstr "资源池类型"
 
-#: storages/templates/storage.html:48
+#: storages/templates/storage.html:50
 msgid "Pool path"
 msgstr "资源池路径"
 
-#: storages/templates/storage.html:50
+#: storages/templates/storage.html:52
 msgid "Pool status"
 msgstr "资源池状态"
 
-#: storages/templates/storage.html:85 storages/templates/storages.html:64
+#: storages/templates/storage.html:56
+#: virtsecrets/templates/create_secret_block.html:36
+msgid "Usage"
+msgstr "使用"
+
+#: storages/templates/storage.html:90 storages/templates/storages.html:63
 msgid "Volumes"
 msgstr "卷"
 
-#: storages/templates/storage.html:97
+#: storages/templates/storage.html:98
 msgid "Allocated"
 msgstr "已分配"
 
-#: storages/templates/storage.html:118
+#: storages/templates/storage.html:119
 msgid "Clone image"
 msgstr "克隆镜像"
 
-#: storages/templates/storage.html:131
+#: storages/templates/storage.html:132
 msgid "Convert"
 msgstr "转换"
 
-#: storages/templates/storage.html:140
+#: storages/templates/storage.html:141
 msgid "raw"
 msgstr "raw"
 
-#: storages/templates/storage.html:141
+#: storages/templates/storage.html:142
 msgid "qcow"
 msgstr "qcow"
 
-#: storages/templates/storage.html:142
+#: storages/templates/storage.html:143
 msgid "qcow2"
 msgstr "qcow2 (推荐)"
 
@@ -3764,11 +3666,11 @@ msgstr "qcow2 (推荐)"
 msgid "Hypervisor doesn't have any Volumes"
 msgstr "虚拟机监控程序没有检测到任何卷"
 
-#: storages/templates/storages.html:46
+#: storages/templates/storages.html:45
 msgid "Hypervisor doesn't have any Storages"
 msgstr "虚拟机监控程序没有检测到任何存储资源池"
 
-#: storages/views.py:39
+#: storages/views.py:40
 msgid "Pool name already use"
 msgstr "资源池名称已存在"
 
@@ -3776,50 +3678,47 @@ msgstr "资源池名称已存在"
 msgid "You need create secret for pool"
 msgstr "您需要为资源池创建 密钥/密码"
 
-#: storages/views.py:48 storages/views.py:220 storages/views.py:49
-#, python-format
+#: storages/views.py:49
 msgid "You need input all fields for creating ceph pool"
 msgstr "您需要输入所有字段以创建ceph资源池"
 
-#: storages/views.py:144
-#, python-format
-msgid "Volume: %(volume)s is deleted."
+#: storages/views.py:96
+msgid "Security Issues with file uploading"
+msgstr ""
+
+#: storages/views.py:103
+msgid "File not found. Check the path variable and filename"
+msgstr ""
+
+#: storages/views.py:150
+#, fuzzy, python-format
+#| msgid "Volume: %(volume)s is deleted."
+msgid "Volume: %(vol)s is deleted."
 msgstr "卷：%(volume)s 已删除。"
 
-#: storages/views.py:149 storages/views.py:137
+#: storages/views.py:155
 msgid "ISO image already exist"
 msgstr "ISO 镜像已存在"
 
-#: storages/views.py:153
+#: storages/views.py:159
 #, python-format
 msgid "ISO: %(file)s is uploaded."
 msgstr "ISO: %(file)s 已上传。"
 
-#: storages/views.py:162 storages/views.py:150
+#: storages/views.py:168
 msgid "Name of volume already in use"
 msgstr "已使用的卷的名称"
 
-#: storages/views.py:174
-#, python-format
-msgid "%(image)s image cloned as %(clone)s successfully"
+#: storages/views.py:180
+#, fuzzy, python-format
+#| msgid "%(image)s image cloned as %(clone)s successfully"
+msgid "%(image)s image cloned as %(name)s successfully"
 msgstr "镜像 %(image)s 已成功克隆为 %(clone)s"
 
-#: storages/views.py:132
-#, python-brace-format
-msgid "Volume: {volname} is deleted."
-msgstr "卷：{volname} 已删除。"
-
-#: storages/views.py:141
-msgid "ISO: {request.FILES['file']} is uploaded."
-msgstr "ISO：{request.FILES['file']} 已上传。"
-
-#: storages/views.py:160
-msgid "{data['image']} image cloned as {name} successfully"
-msgstr "镜像 {data['image']} 已成功克隆为 {name}"
-
-#: storages/views.py:199
-#, python-brace-format
-msgid "Image file {name} is created successfully"
+#: storages/views.py:226
+#, fuzzy, python-format
+#| msgid "Image file {name} is created successfully"
+msgid "Image file %(name)s is created successfully"
 msgstr "镜像文件 {name} 已成功创建"
 
 #: templates/403.html:3
@@ -3880,18 +3779,345 @@ msgstr "登出"
 msgid "Processing"
 msgstr "处理中"
 
-#: venv/lib/python3.6/site-packages/bootstrap4/components.py:17
-#: venv/lib/python3.6/site-packages/bootstrap4/templates/bootstrap4/form_errors.html:3
-#: venv/lib/python3.6/site-packages/bootstrap4/templates/bootstrap4/messages.html:4
-msgid "close"
-msgstr "关闭"
+#: templates/search_block.html:3
+msgid "Search"
+msgstr "搜索"
+
+#: venv/lib/python3.6/site-packages/click/_termui_impl.py:496
+#, python-brace-format
+msgid "{editor}: Editing failed"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_termui_impl.py:500
+#, python-brace-format
+msgid "{editor}: Editing failed: {e}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:20
+msgid ""
+"Click will abort further execution because Python was configured to use "
+"ASCII as encoding for the environment. Consult https://click.palletsprojects."
+"com/unicode-support/ for mitigation steps."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:56
+msgid ""
+"Additional information: on this system no suitable UTF-8 locales were "
+"discovered. This most likely requires resolving by reconfiguring the locale "
+"system."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:65
+msgid ""
+"This system supports the C.UTF-8 locale which is recommended. You might be "
+"able to resolve your issue by exporting the following environment variables:"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:75
+#, python-brace-format
+msgid ""
+"This system lists some UTF-8 supporting locales that you can pick from. The "
+"following suitable locales were discovered: {locales}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/_unicodefun.py:93
+msgid ""
+"Click discovered that you exported a UTF-8 locale but the locale system "
+"could not pick up from it because it does not exist. The exported locale is "
+"{locale!r} but it is not supported."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1095
+msgid "Aborted!"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1279
+#: venv/lib/python3.6/site-packages/click/decorators.py:434
+#, fuzzy
+#| msgid "show this help message and exit"
+msgid "Show this message and exit."
+msgstr "显示此帮助消息并退出"
+
+#: venv/lib/python3.6/site-packages/click/core.py:1308
+#: venv/lib/python3.6/site-packages/click/core.py:1334
+#, python-brace-format
+msgid "(Deprecated) {text}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1375
+#, fuzzy, python-brace-format
+#| msgid "expected %s argument(s)"
+msgid "Got unexpected extra argument ({args})"
+msgid_plural "Got unexpected extra arguments ({args})"
+msgstr[0] "预期 %s argument(s)"
+
+#: venv/lib/python3.6/site-packages/click/core.py:1390
+msgid "DeprecationWarning: The command {name!r} is deprecated."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1607
+msgid "Commands"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1639
+msgid "Missing command."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:1717
+msgid "No such command {name!r}."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2258
+#, fuzzy
+#| msgid "'%(value)s' value must be an integer."
+msgid "Value must be an iterable."
+msgstr "'%(value)s' 值必须是整数。"
+
+#: venv/lib/python3.6/site-packages/click/core.py:2278
+#, python-brace-format
+msgid "Takes {nargs} values but 1 was given."
+msgid_plural "Takes {nargs} values but {len} were given."
+msgstr[0] ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2701
+#, python-brace-format
+msgid "env var: {var}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2724
+msgid "(dynamic)"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2735
+#, python-brace-format
+msgid "default: {default}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/core.py:2748
+msgid "required"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/decorators.py:339
+#, python-format
+msgid "%(prog)s, version %(version)s"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/decorators.py:403
+#, fuzzy
+#| msgid "show this help message and exit"
+msgid "Show the version and exit."
+msgstr "显示此帮助消息并退出"
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:43
+#: venv/lib/python3.6/site-packages/click/exceptions.py:79
+#, fuzzy, python-brace-format
+#| msgid "message"
+msgid "Error: {message}"
+msgstr "消息"
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:71
+#, python-brace-format
+msgid "Try '{command} {option}' for help."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:120
+#, fuzzy, python-brace-format
+#| msgid "invalid %s value: %r"
+msgid "Invalid value: {message}"
+msgstr "无效的 %s 数值：%r"
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:122
+#, python-brace-format
+msgid "Invalid value for {param_hint}: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:178
+#, fuzzy
+#| msgid "positional arguments"
+msgid "Missing argument"
+msgstr "位置参数"
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:180
+#, fuzzy
+#| msgid "Edit options"
+msgid "Missing option"
+msgstr "编辑选项"
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:182
+msgid "Missing parameter"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:184
+#, python-brace-format
+msgid "Missing {param_type}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:191
+#, python-brace-format
+msgid "Missing parameter: {param_name}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:211
+#, python-brace-format
+msgid "No such option: {name}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:223
+#, python-brace-format
+msgid "Did you mean {possibility}?"
+msgid_plural "(Possible options: {possibilities})"
+msgstr[0] ""
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:261
+#, fuzzy
+#| msgid "Unknown"
+msgid "unknown error"
+msgstr "未知"
+
+#: venv/lib/python3.6/site-packages/click/exceptions.py:268
+msgid "Could not open file {filename!r}: {message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:231
+msgid "Argument {name!r} takes {nargs} values."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:413
+msgid "Option {name!r} does not take a value."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/parser.py:474
+msgid "Option {name!r} requires an argument."
+msgid_plural "Option {name!r} requires {nargs} arguments."
+msgstr[0] ""
+
+#: venv/lib/python3.6/site-packages/click/shell_completion.py:316
+msgid "Shell completion is not supported for Bash versions older than 4.4."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/shell_completion.py:322
+msgid "Couldn't detect Bash version, shell completion is not supported."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:161
+#, fuzzy
+#| msgid "No configuration"
+msgid "Repeat for confirmation"
+msgstr "没有配置"
+
+#: venv/lib/python3.6/site-packages/click/termui.py:178
+msgid "Error: The value you entered was invalid."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:180
+#, python-brace-format
+msgid "Error: {e.message}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:191
+msgid "Error: The two entered values do not match."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:247
+msgid "Error: invalid input"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/termui.py:798
+msgid "Press any key to continue..."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:258
+#, python-brace-format
+msgid ""
+"Choose from:\n"
+"\t{choices}"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:290
+#, fuzzy
+#| msgid "Value %(value)r is not a valid choice."
+msgid "{value!r} is not {choice}."
+msgid_plural "{value!r} is not one of {choices}."
+msgstr[0] "值 %(value)r 不是有效的选择。"
+
+#: venv/lib/python3.6/site-packages/click/types.py:380
+msgid "{value!r} does not match the format {format}."
+msgid_plural "{value!r} does not match the formats {formats}."
+msgstr[0] ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:402
+#, fuzzy
+#| msgid "Value %(value)r is not a valid choice."
+msgid "{value!r} is not a valid {number_type}."
+msgstr "值 %(value)r 不是有效的选择。"
+
+#: venv/lib/python3.6/site-packages/click/types.py:458
+#, python-brace-format
+msgid "{value} is not in the range {range}."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:599
+#, fuzzy
+#| msgid "Value %(value)r is not a valid choice."
+msgid "{value!r} is not a valid boolean."
+msgstr "值 %(value)r 不是有效的选择。"
+
+#: venv/lib/python3.6/site-packages/click/types.py:623
+#, fuzzy
+#| msgid "'%(value)s' is not a valid UUID."
+msgid "{value!r} is not a valid UUID."
+msgstr "'%(value)s' 不是有效的UUID 。"
+
+#: venv/lib/python3.6/site-packages/click/types.py:801
+#, fuzzy
+#| msgid "Profile"
+msgid "file"
+msgstr "个人资料"
+
+#: venv/lib/python3.6/site-packages/click/types.py:803
+#, fuzzy
+#| msgid "Direction"
+msgid "directory"
+msgstr "目的"
+
+#: venv/lib/python3.6/site-packages/click/types.py:805
+#, fuzzy
+#| msgid "Pool path"
+msgid "path"
+msgstr "资源池路径"
+
+#: venv/lib/python3.6/site-packages/click/types.py:851
+msgid "{name} {filename!r} does not exist."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:860
+msgid "{name} {filename!r} is a file."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:868
+msgid "{name} {filename!r} is a directory."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:876
+msgid "{name} {filename!r} is not writable."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:884
+msgid "{name} {filename!r} is not readable."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/click/types.py:951
+#, python-brace-format
+msgid "{len_type} values are required, but {len_value} was given."
+msgid_plural "{len_type} values are required, but {len_value} were given."
+msgstr[0] ""
 
 #: venv/lib/python3.6/site-packages/django/contrib/messages/apps.py:7
 #: venv2/lib/python2.7/site-packages/django/contrib/messages/apps.py:7
 msgid "Messages"
 msgstr "信息"
 
-#: venv/lib/python3.6/site-packages/django/contrib/sitemaps/apps.py:7
+#: venv/lib/python3.6/site-packages/django/contrib/sitemaps/apps.py:8
 #: venv2/lib/python2.7/site-packages/django/contrib/sitemaps/apps.py:7
 msgid "Site Maps"
 msgstr "网站地图"
@@ -3906,103 +4132,116 @@ msgstr "静态文件"
 msgid "Syndication"
 msgstr "联合组织"
 
-#: venv/lib/python3.6/site-packages/django/core/paginator.py:45
+#. Translators: String used to replace omitted page numbers in elided page
+#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10].
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:30
+msgid "…"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:51
 #: venv2/lib/python2.7/site-packages/django/core/paginator.py:43
 msgid "That page number is not an integer"
 msgstr "该页码不是整数"
 
-#: venv/lib/python3.6/site-packages/django/core/paginator.py:47
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:53
 #: venv2/lib/python2.7/site-packages/django/core/paginator.py:45
 msgid "That page number is less than 1"
 msgstr "该页码少于1"
 
-#: venv/lib/python3.6/site-packages/django/core/paginator.py:52
+#: venv/lib/python3.6/site-packages/django/core/paginator.py:58
 #: venv2/lib/python2.7/site-packages/django/core/paginator.py:50
 msgid "That page contains no results"
 msgstr "该页面没有任何结果"
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:31
+#: venv/lib/python3.6/site-packages/django/core/validators.py:22
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:34
 msgid "Enter a valid value."
 msgstr "请输入有效值。"
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:102
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:658
+#: venv/lib/python3.6/site-packages/django/core/validators.py:93
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:675
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:107
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:671
 msgid "Enter a valid URL."
 msgstr "请输入有效的 URL 地址。"
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:154
+#: venv/lib/python3.6/site-packages/django/core/validators.py:150
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:160
 msgid "Enter a valid integer."
 msgstr "请输入有效的整数。"
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:165
+#: venv/lib/python3.6/site-packages/django/core/validators.py:161
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:171
 msgid "Enter a valid email address."
 msgstr "请输入有效的电子邮件地址。"
 
 #. Translators: "letters" means latin letters: a-z and A-Z.
-#: venv/lib/python3.6/site-packages/django/core/validators.py:239
-#: venv2/lib/python2.7/site-packages/django/core/validators.py:245
+#: venv/lib/python3.6/site-packages/django/core/validators.py:262
+#, fuzzy
+#| msgid ""
+#| "Enter a valid 'slug' consisting of letters, numbers, underscores or "
+#| "hyphens."
 msgid ""
-"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+"Enter a valid “slug” consisting of letters, numbers, underscores or hyphens."
 msgstr "请输入由字母，数字，下划线或连字符组成的有效“字段”。"
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:246
-#: venv2/lib/python2.7/site-packages/django/core/validators.py:252
+#: venv/lib/python3.6/site-packages/django/core/validators.py:269
+#, fuzzy
+#| msgid ""
+#| "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, "
+#| "or hyphens."
 msgid ""
-"Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
+"Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr "请输入由 Unicode 字母，数字，下划线或连字符组成的有效“字段”。"
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:255
-#: venv/lib/python3.6/site-packages/django/core/validators.py:275
+#: venv/lib/python3.6/site-packages/django/core/validators.py:278
+#: venv/lib/python3.6/site-packages/django/core/validators.py:288
+#: venv/lib/python3.6/site-packages/django/core/validators.py:311
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:257
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:277
 msgid "Enter a valid IPv4 address."
 msgstr "请输入有效的 IPv4 地址。"
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:260
-#: venv/lib/python3.6/site-packages/django/core/validators.py:276
+#: venv/lib/python3.6/site-packages/django/core/validators.py:296
+#: venv/lib/python3.6/site-packages/django/core/validators.py:312
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:262
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:278
 msgid "Enter a valid IPv6 address."
 msgstr "请输入有效的 IPv6 地址。"
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:270
-#: venv/lib/python3.6/site-packages/django/core/validators.py:274
+#: venv/lib/python3.6/site-packages/django/core/validators.py:306
+#: venv/lib/python3.6/site-packages/django/core/validators.py:310
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:272
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:276
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "请输入有效的 IPv4 或 IPv6 地址。"
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:304
+#: venv/lib/python3.6/site-packages/django/core/validators.py:340
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:308
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1131
 msgid "Enter only digits separated by commas."
 msgstr "仅输入用逗号分隔的数字。"
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:310
+#: venv/lib/python3.6/site-packages/django/core/validators.py:346
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:314
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr "确保此值是 %(limit_value)s（它是 %(show_value)s ）。"
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:342
+#: venv/lib/python3.6/site-packages/django/core/validators.py:379
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:345
 #, python-format
 msgid "Ensure this value is less than or equal to %(limit_value)s."
 msgstr "确保此值小于或等于 %(limit_value)s 。"
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:351
+#: venv/lib/python3.6/site-packages/django/core/validators.py:388
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:354
 #, python-format
 msgid "Ensure this value is greater than or equal to %(limit_value)s."
 msgstr "确保此值大于或等于 %(limit_value)s 。"
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:361
+#: venv/lib/python3.6/site-packages/django/core/validators.py:398
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:364
 #, python-format
 msgid ""
@@ -4013,7 +4252,7 @@ msgid_plural ""
 "%(show_value)d)."
 msgstr[0] "确保此值至少具有 %(limit_value)d 个字符（具有 %(show_value)d 个）。"
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:376
+#: venv/lib/python3.6/site-packages/django/core/validators.py:413
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:379
 #, python-format
 msgid ""
@@ -4024,29 +4263,29 @@ msgid_plural ""
 "%(show_value)d)."
 msgstr[0] "确保此值最多具有 %(limit_value)d 个字符（具有 %(show_value)d 个）。"
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:395
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:290
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:325
+#: venv/lib/python3.6/site-packages/django/core/validators.py:432
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:292
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:327
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:303
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:340
 msgid "Enter a number."
 msgstr "请输入一个数字。"
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:397
+#: venv/lib/python3.6/site-packages/django/core/validators.py:434
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:399
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "确保总数不超过 %(max)s 个数字。"
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:402
+#: venv/lib/python3.6/site-packages/django/core/validators.py:439
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:404
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "确保不超过 %(max)s 个小数位。"
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:407
+#: venv/lib/python3.6/site-packages/django/core/validators.py:444
 #: venv2/lib/python2.7/site-packages/django/core/validators.py:409
 #, python-format
 msgid ""
@@ -4055,50 +4294,52 @@ msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] "确保小数点前的位数不超过 %(max)s 个。"
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:469
-#: venv2/lib/python2.7/site-packages/django/core/validators.py:463
-#, python-format
+#: venv/lib/python3.6/site-packages/django/core/validators.py:506
+#, fuzzy, python-format
+#| msgid ""
+#| "File extension '%(extension)s' is not allowed. Allowed extensions are: "
+#| "'%(allowed_extensions)s'."
 msgid ""
-"File extension '%(extension)s' is not allowed. Allowed extensions are: "
-"'%(allowed_extensions)s'."
+"File extension “%(extension)s” is not allowed. Allowed extensions are: "
+"%(allowed_extensions)s."
 msgstr ""
 "不允许文件扩展名 '%(extension)s' 。 允许的扩展名"
 "是：'%(allowed_extensions)s' 。"
 
-#: venv/lib/python3.6/site-packages/django/core/validators.py:521
+#: venv/lib/python3.6/site-packages/django/core/validators.py:559
 msgid "Null characters are not allowed."
 msgstr "不允许使用空字符。"
 
-#: venv/lib/python3.6/site-packages/django/db/models/base.py:1165
-#: venv/lib/python3.6/site-packages/django/forms/models.py:756
+#: venv/lib/python3.6/site-packages/django/db/models/base.py:1210
+#: venv/lib/python3.6/site-packages/django/forms/models.py:768
 #: venv2/lib/python2.7/site-packages/django/db/models/base.py:1209
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:749
 msgid "and"
 msgstr "和"
 
-#: venv/lib/python3.6/site-packages/django/db/models/base.py:1167
+#: venv/lib/python3.6/site-packages/django/db/models/base.py:1212
 #: venv2/lib/python2.7/site-packages/django/db/models/base.py:1211
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr "具有此 %(field_labels)s 的 %(model_name)s 已存在。"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:104
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:100
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:116
 #, python-format
 msgid "Value %(value)r is not a valid choice."
 msgstr "值 %(value)r 不是有效的选择。"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:105
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:101
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:117
 msgid "This field cannot be null."
 msgstr "该字段不能为空。"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:106
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:102
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:118
 msgid "This field cannot be blank."
 msgstr "该字段不能为空。"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:107
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:103
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:119
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
@@ -4106,7 +4347,7 @@ msgstr "具有此 %(field_label)s 的 %(model_name)s 已存在。"
 
 #. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
 #. Eg: "Title must be unique for pub_date year"
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:111
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:107
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:123
 #, python-format
 msgid ""
@@ -4114,343 +4355,367 @@ msgid ""
 msgstr ""
 "%(field_label)s 对于 %(date_field_label)s %(lookup_type)s 必须是唯一的。"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:128
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:126
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:140
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "类型的字段：%(field_type)s"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:905
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1772
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:901
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1809
-msgid "Integer"
-msgstr "整数"
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:909
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1770
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:905
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1807
-#, python-format
-msgid "'%(value)s' value must be an integer."
-msgstr "'%(value)s' 值必须是整数。"
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:984
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1850
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:978
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1878
-msgid "Big (8 byte) integer"
-msgstr "大(8字节) 整数"
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:996
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:990
-#, python-format
-msgid "'%(value)s' value must be either True or False."
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:958
+#, fuzzy, python-format
+#| msgid "'%(value)s' value must be either True or False."
+msgid "“%(value)s” value must be either True or False."
 msgstr "'%(value)s' 值必须为 True 或 False 。"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:997
-#, python-format
-msgid "'%(value)s' value must be either True, False, or None."
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:959
+#, fuzzy, python-format
+#| msgid "'%(value)s' value must be either True, False, or None."
+msgid "“%(value)s” value must be either True, False, or None."
 msgstr "'%(value)s' 值必须为 True，False 或 None 。"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:999
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:961
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:992
 msgid "Boolean (Either True or False)"
 msgstr "布尔值（True 或 False）"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1040
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1002
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1058
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "字符串 (最多 %(max_length)s)"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1104
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1096
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1115
 msgid "Comma-separated integers"
 msgstr "逗号分隔的整数"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1153
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1172
-#, python-format
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1145
+#, fuzzy, python-format
+#| msgid ""
+#| "'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+#| "format."
 msgid ""
-"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+"“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD "
 "format."
 msgstr "'%(value)s' 值的日期格式无效。 必须为 YYYY-MM-DD 格式。"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1155
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1298
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1174
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1319
-#, python-format
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1147
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1290
+#, fuzzy, python-format
+#| msgid ""
+#| "'%(value)s' value has the correct format (YYYY-MM-DD) but it is an "
+#| "invalid date."
 msgid ""
-"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
+"“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid "
 "date."
 msgstr "'%(value)s' 值具有正确的格式（YYYY-MM-DD），但它是无效的日期。"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1158
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1150
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1177
 msgid "Date (without time)"
 msgstr "日期（不包含时间）"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1296
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1317
-#, python-format
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1288
+#, fuzzy, python-format
+#| msgid ""
+#| "'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:"
+#| "ss[.uuuuuu]][TZ] format."
 msgid ""
-"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ] format."
 msgstr ""
 "'%(value)s' 值的格式无效。 它必须采用 YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ] 格"
 "式。"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1300
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1321
-#, python-format
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1292
+#, fuzzy, python-format
+#| msgid ""
+#| "'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+#| "[TZ]) but it is an invalid date/time."
 msgid ""
-"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
 "[TZ]) but it is an invalid date/time."
 msgstr ""
 "'%(value)s' 值具有正确的格式（YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]），但它是无"
 "效的日期/时间。"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1304
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1296
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1325
 msgid "Date (with time)"
 msgstr "日期（包含时间）"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1452
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1475
-#, python-format
-msgid "'%(value)s' value must be a decimal number."
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1444
+#, fuzzy, python-format
+#| msgid "'%(value)s' value must be a decimal number."
+msgid "“%(value)s” value must be a decimal number."
 msgstr "'%(value)s' 值必须是十进制数字。"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1454
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1446
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1477
 msgid "Decimal number"
 msgstr "小数"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1593
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1628
-#, python-format
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1585
+#, fuzzy, python-format
+#| msgid ""
+#| "'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
+#| "uuuuuu] format."
 msgid ""
-"'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
+"“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[."
 "uuuuuu] format."
 msgstr "'%(value)s' 值的格式无效。 它必须为 [DD] [HH:[MM:]]ss[.uuuuuu] 格式。"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1596
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1588
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1631
 msgid "Duration"
 msgstr "持续时间"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1646
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1638
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1683
 msgid "Email address"
 msgstr "电子邮件地址"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1669
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1661
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1707
 msgid "File path"
 msgstr "文件路径"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1735
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1773
-#, python-format
-msgid "'%(value)s' value must be a float."
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1727
+#, fuzzy, python-format
+#| msgid "'%(value)s' value must be a float."
+msgid "“%(value)s” value must be a float."
 msgstr "'%(value)s' 值必须是浮点数。"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1737
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1729
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1775
 msgid "Floating point number"
 msgstr "浮点数"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1866
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1767
+#, fuzzy, python-format
+#| msgid "'%(value)s' value must be an integer."
+msgid "“%(value)s” value must be an integer."
+msgstr "'%(value)s' 值必须是整数。"
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1769
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:901
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1809
+msgid "Integer"
+msgstr "整数"
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1852
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:978
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1878
+msgid "Big (8 byte) integer"
+msgstr "大(8字节) 整数"
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1867
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2130
+msgid "Small integer"
+msgstr "小整数"
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1875
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1893
 msgid "IPv4 address"
 msgstr "IPv4 地址"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1897
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1906
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1924
 msgid "IP address"
 msgstr "IP 地址"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1977
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1978
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2006
-#, python-format
-msgid "'%(value)s' value must be either None, True or False."
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1986
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1987
+#, fuzzy, python-format
+#| msgid "'%(value)s' value must be either None, True or False."
+msgid "“%(value)s” value must be either None, True or False."
 msgstr "'%(value)s' 值必须为 None，True 或 False 。"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1980
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:1989
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2008
 msgid "Boolean (Either True, False or None)"
 msgstr "布尔值（True，False 或 None）"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2015
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2043
+#, fuzzy
+#| msgid "Positive integer"
+msgid "Positive big integer"
+msgstr "正整数"
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2056
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2071
 msgid "Positive integer"
 msgstr "正整数"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2028
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2069
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2083
 msgid "Positive small integer"
 msgstr "正小整数"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2042
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2083
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2096
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Slug (up to %(max_length)s)"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2074
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2130
-msgid "Small integer"
-msgstr "小整数"
-
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2081
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2115
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2137
 msgid "Text"
 msgstr "文本"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2109
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2163
-#, python-format
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2181
+#, fuzzy, python-format
+#| msgid ""
+#| "'%(value)s' value has an invalid format. It must be in HH:MM[:ss[."
+#| "uuuuuu]] format."
 msgid ""
-"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
 "format."
 msgstr "'%(value)s' 值的格式无效。 它必须为 HH:MM[:ss[.uuuuuu]] 格式。"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2111
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2165
-#, python-format
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2183
+#, fuzzy, python-format
+#| msgid ""
+#| "'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is "
+#| "an invalid time."
 msgid ""
-"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
 "invalid time."
 msgstr "'%(value)s' 值具有正确的格式（HH:MM[:ss[.uuuuuu]]），但时间无效。"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2114
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2186
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2168
 msgid "Time"
 msgstr "时间"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2240
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2312
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2296
 msgid "URL"
 msgstr "URL 地址"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2262
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2334
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2319
 msgid "Raw binary data"
 msgstr "原始二进制数据"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2312
-#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2366
-#, python-format
-msgid "'%(value)s' is not a valid UUID."
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2399
+#, fuzzy, python-format
+#| msgid "'%(value)s' is not a valid UUID."
+msgid "“%(value)s” is not a valid UUID."
 msgstr "'%(value)s' 不是有效的UUID 。"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2314
+#: venv/lib/python3.6/site-packages/django/db/models/fields/__init__.py:2401
 msgid "Universally unique identifier"
 msgstr "通用唯一标识符"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:221
+#: venv/lib/python3.6/site-packages/django/db/models/fields/files.py:226
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/files.py:228
 msgid "File"
 msgstr "文件"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:778
+#: venv/lib/python3.6/site-packages/django/db/models/fields/json.py:18
+msgid "A JSON object"
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/json.py:20
+msgid "Value must be valid JSON."
+msgstr ""
+
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:790
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:788
 #, python-format
 msgid "%(model)s instance with %(field)s %(value)r does not exist."
 msgstr "具有 %(field)s %(value)r 的 %(model)s 实例不存在。"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:780
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:792
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:790
 msgid "Foreign Key (type determined by related field)"
 msgstr "外键（类型由相关字段决定）"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1007
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1045
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1029
 msgid "One-to-one relationship"
 msgstr "一对一关系"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1057
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1099
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1104
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr "%(from)s-%(to)s 关系"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1058
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1100
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1105
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr "%(from)s-%(to)s 关系"
 
-#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1100
+#: venv/lib/python3.6/site-packages/django/db/models/fields/related.py:1142
 #: venv2/lib/python2.7/site-packages/django/db/models/fields/related.py:1147
 msgid "Many-to-many relationship"
 msgstr "多对多关系"
 
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the label
-#: venv/lib/python3.6/site-packages/django/forms/boundfield.py:146
+#: venv/lib/python3.6/site-packages/django/forms/boundfield.py:150
 #: venv2/lib/python2.7/site-packages/django/forms/boundfield.py:181
 msgid ":?.!"
 msgstr ":?.!"
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:53
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:54
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:56
 msgid "This field is required."
 msgstr "这是必填栏。"
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:245
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:247
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:258
 msgid "Enter a whole number."
 msgstr "请输入一个整数。"
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:396
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:1126
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:402
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1143
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:418
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:1149
 msgid "Enter a valid date."
 msgstr "请输入一个有效日期。"
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:420
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:1127
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:426
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1144
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:442
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:1150
 msgid "Enter a valid time."
 msgstr "请输入有效时间。"
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:442
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:454
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:464
 msgid "Enter a valid date/time."
 msgstr "请输入有效的日期/时间。"
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:471
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:488
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:493
 msgid "Enter a valid duration."
 msgstr "请输入有效期限。"
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:472
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:489
 #, python-brace-format
 msgid "The number of days must be between {min_days} and {max_days}."
 msgstr "天数必须在  {min_days}  和 {max_days} 之间。"
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:532
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:549
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:547
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "没有文件被提交。 检查表单上的编码类型。"
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:533
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:550
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:548
 msgid "No file was submitted."
 msgstr "没有文件被提交。"
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:534
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:551
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:549
 msgid "The submitted file is empty."
 msgstr "提交的文件为空。"
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:536
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:553
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:551
 #, python-format
 msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
@@ -4458,21 +4723,21 @@ msgid_plural ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr[0] "确保此文件名最多具有 %(max)d 个字符（具有 %(length)d 个）。"
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:539
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:556
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:554
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "请提交文件或选中清除复选框，不能两者都选。"
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:600
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:617
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:619
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr "上载有效镜像。 您上传的文件不是镜像或镜像已损坏。"
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:762
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:852
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1270
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:779
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:869
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1309
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:776
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:872
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1265
@@ -4480,76 +4745,86 @@ msgstr "上载有效镜像。 您上传的文件不是镜像或镜像已损坏
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr "请选择一个有效的选择。 %(value)s 不是可用的选择之一。"
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:853
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:968
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1269
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:870
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:985
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1308
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:873
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:990
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1264
 msgid "Enter a list of values."
 msgstr "请输入值列表。"
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:969
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:986
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:991
 msgid "Enter a complete value."
 msgstr "请输入一个完整的值。"
 
-#: venv/lib/python3.6/site-packages/django/forms/fields.py:1185
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1202
 #: venv2/lib/python2.7/site-packages/django/forms/fields.py:1208
 msgid "Enter a valid UUID."
 msgstr "请输入有效的UUID。"
 
+#: venv/lib/python3.6/site-packages/django/forms/fields.py:1232
+#, fuzzy
+#| msgid "Enter a valid URL."
+msgid "Enter a valid JSON."
+msgstr "请输入有效的 URL 地址。"
+
 #. Translators: This is the default suffix added to form field labels
-#: venv/lib/python3.6/site-packages/django/forms/forms.py:86
+#: venv/lib/python3.6/site-packages/django/forms/forms.py:76
 #: venv2/lib/python2.7/site-packages/django/forms/forms.py:87
 msgid ":"
 msgstr ":"
 
-#: venv/lib/python3.6/site-packages/django/forms/forms.py:212
+#: venv/lib/python3.6/site-packages/django/forms/forms.py:203
 #: venv2/lib/python2.7/site-packages/django/forms/forms.py:213
 #, python-format
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr "(隐藏字段  %(name)s ) %(error)s"
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:91
-#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:97
-msgid "ManagementForm data is missing or has been tampered with"
-msgstr "ManagementForm 数据丢失或已被篡改"
-
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:338
-#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:355
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:61
 #, python-format
-msgid "Please submit %d or fewer forms."
-msgid_plural "Please submit %d or fewer forms."
-msgstr[0] "请提交 %d 个或更少的表格。"
+msgid ""
+"ManagementForm data is missing or has been tampered with. Missing fields: "
+"%(field_names)s. You may need to file a bug report if the issue persists."
+msgstr ""
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:345
-#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:362
-#, python-format
-msgid "Please submit %d or more forms."
-msgid_plural "Please submit %d or more forms."
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:370
+#, fuzzy, python-format
+#| msgid "Please submit %d or more forms."
+#| msgid_plural "Please submit %d or more forms."
+msgid "Please submit at most %d form."
+msgid_plural "Please submit at most %d forms."
 msgstr[0] "请提交 %d 或更多表格。"
 
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:371
-#: venv/lib/python3.6/site-packages/django/forms/formsets.py:373
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:377
+#, fuzzy, python-format
+#| msgid "Please submit %d or more forms."
+#| msgid_plural "Please submit %d or more forms."
+msgid "Please submit at least %d form."
+msgid_plural "Please submit at least %d forms."
+msgstr[0] "请提交 %d 或更多表格。"
+
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:405
+#: venv/lib/python3.6/site-packages/django/forms/formsets.py:412
 #: venv2/lib/python2.7/site-packages/django/forms/formsets.py:390
 #: venv2/lib/python2.7/site-packages/django/forms/formsets.py:392
 msgid "Order"
 msgstr "顺序"
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:751
+#: venv/lib/python3.6/site-packages/django/forms/models.py:763
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:744
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "请更正 %(field)s 的重复数据。"
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:755
+#: venv/lib/python3.6/site-packages/django/forms/models.py:767
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:748
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "请更正 %(field)s 的重复数据，该数据必须唯一。"
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:761
+#: venv/lib/python3.6/site-packages/django/forms/models.py:773
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:754
 #, python-format
 msgid ""
@@ -4559,57 +4834,61 @@ msgstr ""
 "请更正 %(field_name)s 的重复数据，该数据对于 %(date_field)s 中的 %(lookup)s "
 "必须是唯一的。"
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:770
+#: venv/lib/python3.6/site-packages/django/forms/models.py:782
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:763
 msgid "Please correct the duplicate values below."
 msgstr "请更正以下重复的值。"
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1091
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1109
 msgid "The inline value did not match the parent instance."
 msgstr "内联值与父实例不匹配。"
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1158
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1193
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1154
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "选择一个有效的选择。 该选择不是可用的选择之一。"
 
-#: venv/lib/python3.6/site-packages/django/forms/models.py:1272
-#, python-format
-msgid "\"%(pk)s\" is not a valid value."
+#: venv/lib/python3.6/site-packages/django/forms/models.py:1311
+#, fuzzy, python-format
+#| msgid "\"%(pk)s\" is not a valid value."
+msgid "“%(pk)s” is not a valid value."
 msgstr "\"%(pk)s\" 不是有效值。"
 
-#: venv/lib/python3.6/site-packages/django/forms/utils.py:162
-#: venv2/lib/python2.7/site-packages/django/forms/utils.py:172
-#, python-format
+#: venv/lib/python3.6/site-packages/django/forms/utils.py:172
+#, fuzzy, python-format
+#| msgid ""
+#| "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; "
+#| "it may be ambiguous or it may not exist."
 msgid ""
-"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it "
 "may be ambiguous or it may not exist."
 msgstr ""
 "%(datetime)s 无法在时区 %(current_timezone)s 中解释； 它可能是模棱两可的，也"
 "可能不存在。"
 
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:396
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:404
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:378
 msgid "Currently"
 msgstr "现在"
 
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:710
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:715
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:704
 msgid "Yes"
 msgstr "是"
 
-#: venv/lib/python3.6/site-packages/django/forms/widgets.py:711
+#: venv/lib/python3.6/site-packages/django/forms/widgets.py:716
 #: venv2/lib/python2.7/site-packages/django/forms/widgets.py:705
 msgid "No"
 msgstr "否"
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:788
+#. Translators: Please do not add spaces around commas.
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:805
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:851
 msgid "yes,no,maybe"
 msgstr "是，否，也许"
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:817
 #: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:834
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:851
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:880
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:897
 #, python-format
@@ -4617,62 +4896,62 @@ msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d 个字节"
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:836
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:853
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:899
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:838
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:855
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:901
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:840
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:857
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:903
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:842
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:859
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:905
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:844
+#: venv/lib/python3.6/site-packages/django/template/defaultfilters.py:861
 #: venv2/lib/python2.7/site-packages/django/template/defaultfilters.py:907
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:62
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:66
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:66
 msgid "p.m."
 msgstr "下午."
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:63
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:67
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:67
 msgid "a.m."
 msgstr "上午."
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:68
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:72
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:72
 msgid "PM"
 msgstr "下午"
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:69
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:73
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:73
 msgid "AM"
 msgstr "上午"
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:150
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:146
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:158
 msgid "midnight"
 msgstr "午夜"
 
-#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:152
+#: venv/lib/python3.6/site-packages/django/utils/dateformat.py:148
 #: venv2/lib/python2.7/site-packages/django/utils/dateformat.py:160
 msgid "noon"
 msgstr "中午"
@@ -5016,20 +5295,20 @@ msgstr "十二月"
 msgid "This is not a valid IPv6 address."
 msgstr "这不是有效的 IPv6 地址。"
 
-#: venv/lib/python3.6/site-packages/django/utils/text.py:67
+#: venv/lib/python3.6/site-packages/django/utils/text.py:71
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s…"
 msgstr "%(truncated_text)s…"
 
-#: venv/lib/python3.6/site-packages/django/utils/text.py:233
+#: venv/lib/python3.6/site-packages/django/utils/text.py:240
 #: venv2/lib/python2.7/site-packages/django/utils/text.py:251
 msgid "or"
 msgstr "或"
 
 #. Translators: This string is used as a separator between list elements
-#: venv/lib/python3.6/site-packages/django/utils/text.py:252
-#: venv/lib/python3.6/site-packages/django/utils/timesince.py:83
+#: venv/lib/python3.6/site-packages/django/utils/text.py:259
+#: venv/lib/python3.6/site-packages/django/utils/timesince.py:94
 #: venv2/lib/python2.7/site-packages/django/utils/text.py:270
 #: venv2/lib/python2.7/site-packages/django/utils/timesince.py:71
 msgid ", "
@@ -5077,11 +5356,6 @@ msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分钟"
 
-#: venv/lib/python3.6/site-packages/django/utils/timesince.py:72
-#: venv2/lib/python2.7/site-packages/django/utils/timesince.py:60
-msgid "0 minutes"
-msgstr "0 分钟"
-
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:110
 #: venv2/lib/python2.7/site-packages/django/views/csrf.py:109
 msgid "Forbidden"
@@ -5093,10 +5367,15 @@ msgid "CSRF verification failed. Request aborted."
 msgstr "CSRF验证失败。 请求中止。"
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:115
-#: venv2/lib/python2.7/site-packages/django/views/csrf.py:114
+#, fuzzy
+#| msgid ""
+#| "You are seeing this message because this HTTPS site requires a 'Referer "
+#| "header' to be sent by your Web browser, but none was sent. This header is "
+#| "required for security reasons, to ensure that your browser is not being "
+#| "hijacked by third parties."
 msgid ""
-"You are seeing this message because this HTTPS site requires a 'Referer "
-"header' to be sent by your Web browser, but none was sent. This header is "
+"You are seeing this message because this HTTPS site requires a “Referer "
+"header” to be sent by your Web browser, but none was sent. This header is "
 "required for security reasons, to ensure that your browser is not being "
 "hijacked by third parties."
 msgstr ""
@@ -5104,22 +5383,33 @@ msgstr ""
 "有发送。 出于安全原因，此标头是必需的，以确保您的浏览器不会被第三方劫持。"
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:120
-#: venv2/lib/python2.7/site-packages/django/views/csrf.py:119
+#, fuzzy
+#| msgid ""
+#| "If you have configured your browser to disable 'Referer' headers, please "
+#| "re-enable them, at least for this site, or for HTTPS connections, or for "
+#| "'same-origin' requests."
 msgid ""
-"If you have configured your browser to disable 'Referer' headers, please re-"
-"enable them, at least for this site, or for HTTPS connections, or for 'same-"
-"origin' requests."
+"If you have configured your browser to disable “Referer” headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for “same-"
+"origin” requests."
 msgstr ""
 "如果您已将浏览器配置为禁用 'Referer' 标头，请至少对本站点，HTTPS 连接或 “相同"
 "来源” 请求重新启用标头。"
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:124
+#, fuzzy
+#| msgid ""
+#| "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag "
+#| "or including the 'Referrer-Policy: no-referrer' header, please remove "
+#| "them. The CSRF protection requires the 'Referer' header to do strict "
+#| "referer checking. If you're concerned about privacy, use alternatives "
+#| "like <a rel=\"noreferrer\" ...> for links to third-party sites."
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
-"including the 'Referrer-Policy: no-referrer' header, please remove them. The "
-"CSRF protection requires the 'Referer' header to do strict referer checking. "
-"If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
-"\" ...> for links to third-party sites."
+"including the “Referrer-Policy: no-referrer” header, please remove them. The "
+"CSRF protection requires the “Referer” header to do strict referer checking. "
+"If you’re concerned about privacy, use alternatives like <a rel=\"noreferrer"
+"\" …> for links to third-party sites."
 msgstr ""
 "如果您使用的是 <meta name=\"referrer\" content=\"no-referrer\"> 标记或包含 "
 "'Referrer-Policy: no-referrer' 标头，请删除它们。 CSRF保护要求 'Referer' 标头"
@@ -5137,10 +5427,13 @@ msgstr ""
 "cookie 是必需的，以确保您的浏览器不会被第三方劫持。"
 
 #: venv/lib/python3.6/site-packages/django/views/csrf.py:137
-#: venv2/lib/python2.7/site-packages/django/views/csrf.py:129
+#, fuzzy
+#| msgid ""
+#| "If you have configured your browser to disable cookies, please re-enable "
+#| "them, at least for this site, or for 'same-origin' requests."
 msgid ""
 "If you have configured your browser to disable cookies, please re-enable "
-"them, at least for this site, or for 'same-origin' requests."
+"them, at least for this site, or for “same-origin” requests."
 msgstr ""
 "如果您已将浏览器配置为禁用 Cookie ，请至少针对此站点或“相同来源”请求重新启用"
 "它们。"
@@ -5187,7 +5480,7 @@ msgstr "未指定周"
 msgid "No %(verbose_name_plural)s available"
 msgstr "没有可用的 %(verbose_name_plural)s"
 
-#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:589
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:594
 #: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:669
 #, python-format
 msgid ""
@@ -5197,10 +5490,10 @@ msgstr ""
 "将来的 %(verbose_name_plural)s 不可用，因为 %(class_name)s.allow_future 为"
 "False。"
 
-#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:623
-#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:703
-#, python-format
-msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+#: venv/lib/python3.6/site-packages/django/views/generic/dates.py:628
+#, fuzzy, python-format
+#| msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgid "Invalid date string “%(datestr)s” given format “%(format)s”"
 msgstr "给定格式 '%(format)s' 的日期字符串 '%(datestr)s' 无效"
 
 #: venv/lib/python3.6/site-packages/django/views/generic/detail.py:54
@@ -5210,8 +5503,9 @@ msgid "No %(verbose_name)s found matching the query"
 msgstr "找不到与查询匹配的 %(verbose_name)s"
 
 #: venv/lib/python3.6/site-packages/django/views/generic/list.py:67
-#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:77
-msgid "Page is not 'last', nor can it be converted to an int."
+#, fuzzy
+#| msgid "Page is not 'last', nor can it be converted to an int."
+msgid "Page is not “last”, nor can it be converted to an int."
 msgstr "页面不是 'last' ，也不能转换为 int 。"
 
 #: venv/lib/python3.6/site-packages/django/views/generic/list.py:72
@@ -5221,9 +5515,9 @@ msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr "页面无效 (%(page_number)s): %(message)s"
 
 #: venv/lib/python3.6/site-packages/django/views/generic/list.py:154
-#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:172
-#, python-format
-msgid "Empty list and '%(class_name)s.allow_empty' is False."
+#, fuzzy, python-format
+#| msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgid "Empty list and “%(class_name)s.allow_empty” is False."
 msgstr "空列表，并且  '%(class_name)s.allow_empty' 为False。"
 
 #: venv/lib/python3.6/site-packages/django/views/static.py:40
@@ -5232,9 +5526,9 @@ msgid "Directory indexes are not allowed here."
 msgstr "目录索引在这里是不允许的。"
 
 #: venv/lib/python3.6/site-packages/django/views/static.py:42
-#: venv2/lib/python2.7/site-packages/django/views/static.py:46
-#, python-format
-msgid "\"%(path)s\" does not exist"
+#, fuzzy, python-format
+#| msgid "\"%(path)s\" does not exist"
+msgid "“%(path)s” does not exist"
 msgstr "\"%(path)s\" 不存在"
 
 #: venv/lib/python3.6/site-packages/django/views/static.py:80
@@ -5243,11 +5537,12 @@ msgstr "\"%(path)s\" 不存在"
 msgid "Index of %(directory)s"
 msgstr "%(directory)s 的索引"
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:6
-msgid "Django: the Web framework for perfectionists with deadlines."
-msgstr "Django：完美主义者的Web框架，有最后期限。"
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:7
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:221
+msgid "The install worked successfully! Congratulations!"
+msgstr "安装成功！ 恭喜您！"
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:345
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:207
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
@@ -5256,11 +5551,7 @@ msgstr ""
 "查看 Django %(version)s 的<a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/releases/\" target=\"_blank\" rel=\"noopener\">发行说明</a>"
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:367
-msgid "The install worked successfully! Congratulations!"
-msgstr "安装成功！ 恭喜您！"
-
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:368
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:222
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
@@ -5272,38 +5563,165 @@ msgstr ""
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> 位于您的设置文件中，并且您尚未配置任何URL 。"
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:383
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:230
 msgid "Django Documentation"
 msgstr "Django文档"
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:384
-msgid "Topics, references, &amp; how-to's"
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:231
+#, fuzzy
+#| msgid "Topics, references, &amp; how-to's"
+msgid "Topics, references, &amp; how-to’s"
 msgstr "主题，参考资料，操作方法"
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:395
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:239
 msgid "Tutorial: A Polling App"
 msgstr "教程：轮询应用"
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:396
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:240
 msgid "Get started with Django"
 msgstr "开始使用 Django"
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:407
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:248
 msgid "Django Community"
 msgstr "Django 社区"
 
-#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:408
+#: venv/lib/python3.6/site-packages/django/views/templates/default_urlconf.html:249
 msgid "Connect, get help, or contribute"
 msgstr "连接，获得帮助或贡献"
 
+#: venv/lib/python3.6/site-packages/django_bootstrap5/components.py:20
+msgid "close"
+msgstr "关闭"
+
 #: venv/lib/python3.6/site-packages/django_icons/renderers/image.py:217
 msgid "Icon of {}"
 msgstr "{} 的图标"
 
-#: venv/lib/python3.6/site-packages/qr_code/qrcode/utils.py:73
+#: venv/lib/python3.6/site-packages/isort/main.py:158
+#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1615
+msgid "show this help message and exit"
+msgstr "显示此帮助消息并退出"
+
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:245
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr "请输入由字母，数字，下划线或连字符组成的有效“字段”。"
+
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:252
+msgid ""
+"Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
+"hyphens."
+msgstr "请输入由 Unicode 字母，数字，下划线或连字符组成的有效“字段”。"
+
+#: venv2/lib/python2.7/site-packages/django/core/validators.py:463
 #, python-format
-msgid "The option '%s' is not a valid option for a QR code."
-msgstr "选项 '%s'  对于QR码不是有效的选项。"
+msgid ""
+"File extension '%(extension)s' is not allowed. Allowed extensions are: "
+"'%(allowed_extensions)s'."
+msgstr ""
+"不允许文件扩展名 '%(extension)s' 。 允许的扩展名"
+"是：'%(allowed_extensions)s' 。"
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:905
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1807
+#, python-format
+msgid "'%(value)s' value must be an integer."
+msgstr "'%(value)s' 值必须是整数。"
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:990
+#, python-format
+msgid "'%(value)s' value must be either True or False."
+msgstr "'%(value)s' 值必须为 True 或 False 。"
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1172
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+"format."
+msgstr "'%(value)s' 值的日期格式无效。 必须为 YYYY-MM-DD 格式。"
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1174
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1319
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
+"date."
+msgstr "'%(value)s' 值具有正确的格式（YYYY-MM-DD），但它是无效的日期。"
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1317
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"'%(value)s' 值的格式无效。 它必须采用 YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ] 格"
+"式。"
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1321
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]) but it is an invalid date/time."
+msgstr ""
+"'%(value)s' 值具有正确的格式（YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]），但它是无"
+"效的日期/时间。"
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1475
+#, python-format
+msgid "'%(value)s' value must be a decimal number."
+msgstr "'%(value)s' 值必须是十进制数字。"
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1628
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
+"uuuuuu] format."
+msgstr "'%(value)s' 值的格式无效。 它必须为 [DD] [HH:[MM:]]ss[.uuuuuu] 格式。"
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1773
+#, python-format
+msgid "'%(value)s' value must be a float."
+msgstr "'%(value)s' 值必须是浮点数。"
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2006
+#, python-format
+msgid "'%(value)s' value must be either None, True or False."
+msgstr "'%(value)s' 值必须为 None，True 或 False 。"
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2163
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"format."
+msgstr "'%(value)s' 值的格式无效。 它必须为 HH:MM[:ss[.uuuuuu]] 格式。"
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2165
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"invalid time."
+msgstr "'%(value)s' 值具有正确的格式（HH:MM[:ss[.uuuuuu]]），但时间无效。"
+
+#: venv2/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2366
+#, python-format
+msgid "'%(value)s' is not a valid UUID."
+msgstr "'%(value)s' 不是有效的UUID 。"
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:97
+msgid "ManagementForm data is missing or has been tampered with"
+msgstr "ManagementForm 数据丢失或已被篡改"
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:355
+#, python-format
+msgid "Please submit %d or fewer forms."
+msgid_plural "Please submit %d or fewer forms."
+msgstr[0] "请提交 %d 个或更少的表格。"
+
+#: venv2/lib/python2.7/site-packages/django/forms/formsets.py:362
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] "请提交 %d 或更多表格。"
 
 #: venv2/lib/python2.7/site-packages/django/forms/models.py:1093
 msgid "The inline foreign key did not match the parent instance primary key."
@@ -5314,12 +5732,52 @@ msgstr "内联外键与父实例主键不匹配。"
 msgid "\"%(pk)s\" is not a valid value for a primary key."
 msgstr "\"%(pk)s\" 不是主键的有效值。"
 
+#: venv2/lib/python2.7/site-packages/django/forms/utils.py:172
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"%(datetime)s 无法在时区 %(current_timezone)s 中解释； 它可能是模棱两可的，也"
+"可能不存在。"
+
 #: venv2/lib/python2.7/site-packages/django/utils/text.py:81
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
+#: venv2/lib/python2.7/site-packages/django/utils/timesince.py:60
+msgid "0 minutes"
+msgstr "0 分钟"
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:114
+msgid ""
+"You are seeing this message because this HTTPS site requires a 'Referer "
+"header' to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+"您正在看到此消息，因为此 HTTPS 站点要求 Web 浏览器发送 “ Referer 标头”，但没"
+"有发送。 出于安全原因，此标头是必需的，以确保您的浏览器不会被第三方劫持。"
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:119
+msgid ""
+"If you have configured your browser to disable 'Referer' headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for 'same-"
+"origin' requests."
+msgstr ""
+"如果您已将浏览器配置为禁用 'Referer' 标头，请至少对本站点，HTTPS 连接或 “相同"
+"来源” 请求重新启用标头。"
+
+#: venv2/lib/python2.7/site-packages/django/views/csrf.py:129
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for 'same-origin' requests."
+msgstr ""
+"如果您已将浏览器配置为禁用 Cookie ，请至少针对此站点或“相同来源”请求重新启用"
+"它们。"
+
 #: venv2/lib/python2.7/site-packages/django/views/debug.py:520
 msgid "Welcome to Django"
 msgstr "欢迎使用 Django"
@@ -5348,6 +5806,25 @@ msgstr ""
 "您之所以会看到此消息，是因为Django设置文件中有 <code>DEBUG = True</code>，并"
 "且尚未配置任何URL。 开始工作！"
 
+#: venv2/lib/python2.7/site-packages/django/views/generic/dates.py:703
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr "给定格式 '%(format)s' 的日期字符串 '%(datestr)s' 无效"
+
+#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:77
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr "页面不是 'last' ，也不能转换为 int 。"
+
+#: venv2/lib/python2.7/site-packages/django/views/generic/list.py:172
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr "空列表，并且  '%(class_name)s.allow_empty' 为False。"
+
+#: venv2/lib/python2.7/site-packages/django/views/static.py:46
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" 不存在"
+
 #: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:313
 msgid "usage: "
 msgstr "usage: "
@@ -5407,10 +5884,6 @@ msgstr "位置参数"
 msgid "optional arguments"
 msgstr "可选参数"
 
-#: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1615
-msgid "show this help message and exit"
-msgstr "显示此帮助消息并退出"
-
 #: venv2/lib/python2.7/site-packages/gunicorn/argparse_compat.py:1621
 msgid "show program's version number and exit"
 msgstr "显示程序的版本号并退出"
@@ -5496,7 +5969,161 @@ msgstr "无效的选择：%r（从 %s 中选择）"
 msgid "%s: error: %s\n"
 msgstr "%s: 错误： %s\n"
 
+#: virtsecrets/templates/create_secret_block.html:12
+msgid "Create New Secret"
+msgstr "创建新的 密码/密钥"
+
+#: virtsecrets/templates/create_secret_block.html:18
+msgid "Ephemeral"
+msgstr "短效的"
+
+#: virtsecrets/templates/create_secret_block.html:21
+#: virtsecrets/templates/create_secret_block.html:30
+msgid "no"
+msgstr "否"
+
+#: virtsecrets/templates/create_secret_block.html:22
+#: virtsecrets/templates/create_secret_block.html:31
+msgid "yes"
+msgstr "是"
+
+#: virtsecrets/templates/create_secret_block.html:27
+msgid "Private"
+msgstr "私有的"
+
+#: virtsecrets/templates/create_secret_block.html:46
+#: virtsecrets/templates/secrets.html:62
+msgid "Data"
+msgstr "数据"
+
+#: virtsecrets/templates/secrets.html:51
+msgid "Hypervisor doesn't have any Secrets"
+msgstr "虚拟机监控程序没有检测到任何 密码/密钥"
+
+#: virtsecrets/templates/secrets.html:61
+msgid "Usage Type"
+msgstr "使用类型"
+
+#: virtsecrets/templates/secrets.html:89
+msgid "Set secret value"
+msgstr "设定 密钥/密码 值"
+
+#: virtsecrets/templates/secrets.html:95
+msgid "Value"
+msgstr "数值"
+
 #: webvirtcloud/middleware.py:18
 #, python-format
 msgid "libvirt Error - %(exception)s"
 msgstr "libvirt 错误- %(exception)s"
+
+#~ msgid "OTP Sent to %s"
+#~ msgstr "OTP 发送到 %s"
+
+#~ msgid "OTP QR code was emailed to user %s"
+#~ msgstr "OTP QR 码已通过电子邮件发送给用户 %s"
+
+#~ msgid "User password changed: {}"
+#~ msgstr "用户密码已更改： {}"
+
+#~ msgid "SASS directory path is changed. Now: {sass_dir.value}"
+#~ msgstr "SASS 目录路径已更改。现在是： {sass_dir.value}"
+
+#~ msgid "Theme changed. Now: {theme}"
+#~ msgstr "主题已更改。现在是： {theme}"
+
+#~ msgid "QoS"
+#~ msgstr "QoS 流量控制"
+
+#~ msgid "To take a snapshot please Power Off the instance."
+#~ msgstr "要创建快照，请关闭实例电源。"
+
+#~ msgid "Migrate to %(hostname)%"
+#~ msgstr "迁移到 %(hostname)%"
+
+#~ msgid "Resize CPU"
+#~ msgstr "调整 CPU"
+
+#~ msgid "Resize Memory"
+#~ msgstr "调整内存"
+
+#~ msgid "Disk resize"
+#~ msgstr "调整磁盘"
+
+#~ msgid "Attach new disk %(name)s (%(format)s)"
+#~ msgstr "附加新磁盘 %(name)s (%(format)s)"
+
+#~ msgid "New snapshot: %(name)s"
+#~ msgstr "新快照：%(name)s"
+
+#~ msgid "Revert snapshot"
+#~ msgstr "还原快照"
+
+#~ msgid "Edit XML"
+#~ msgstr "编辑XML"
+
+#~ msgid "Set Guest Agent %(status)s"
+#~ msgstr "设置客户机代理 %(status)s"
+
+#~ msgid "Add network"
+#~ msgstr "添加网络"
+
+#~ msgid "Delete network"
+#~ msgstr "删除网络"
+
+#~ msgid "Deleted owner %(userinstance_id)s"
+#~ msgstr "删除所有者 %(userinstance_id)s"
+
+#~ msgid "Instance 'clone_name' already exists!"
+#~ msgstr "实例 'clone_name' 已存在！"
+
+#~ msgid "Clone of '%(instance_name)s'"
+#~ msgstr "'%(instance_name)s' 的克隆"
+
+#~ msgid "{family.upper()} Fixed Address Operation Completed."
+#~ msgstr "{family.upper()} 固定地址操作已完成。"
+
+#~ msgid "{family.upper()} Fixed Address is Deleted."
+#~ msgstr "{family.upper()} 固定地址已被删除。"
+
+#~ msgid "{family.upper()} DHCP Range is Changed."
+#~ msgstr "{family.upper()} DHCP 范围已更改。"
+
+#~ msgid "{qos_dir.capitalize()} QoS is set. Network XML is changed."
+#~ msgstr "{qos_dir.capitalize()} QoS 已设置。 网络XML已更改。"
+
+#~ msgid "Stop and start network to activate new config"
+#~ msgstr "停止并启动网络以激活新配置"
+
+#~ msgid "{} QoS is set"
+#~ msgstr "{} QoS 已设置"
+
+#~ msgid "{qos_dir.capitalize()} QoS is deleted. Network XML is changed. "
+#~ msgstr "{qos_dir.capitalize()} QoS 已删除。网络XML已更改 "
+
+#~ msgid "Stop and start network to activate new config."
+#~ msgstr "停止并启动网络以激活新配置。"
+
+#~ msgid "{qos_dir.capitalize()} QoS is deleted"
+#~ msgstr "{qos_dir.capitalize()} QoS 已删除"
+
+#~ msgid "Deleting NWFilter: {name}"
+#~ msgstr "删除 NWFilter: {name}"
+
+#~ msgid "NWFilter is in use by {inst}. Cannot be deleted."
+#~ msgstr "{inst} 正在使用NWFilter。无法删除。"
+
+#~ msgid "Volume: {volname} is deleted."
+#~ msgstr "卷：{volname} 已删除。"
+
+#~ msgid "ISO: {request.FILES['file']} is uploaded."
+#~ msgstr "ISO：{request.FILES['file']} 已上传。"
+
+#~ msgid "{data['image']} image cloned as {name} successfully"
+#~ msgstr "镜像 {data['image']} 已成功克隆为 {name}"
+
+#~ msgid "Django: the Web framework for perfectionists with deadlines."
+#~ msgstr "Django：完美主义者的Web框架，有最后期限。"
+
+#~ msgid "The option '%s' is not a valid option for a QR code."
+#~ msgstr "选项 '%s'  对于QR码不是有效的选项。"