mirror of
https://github.com/retspen/webvirtcloud
synced 2024-12-25 15:45:23 +00:00
fix merge conflicts for locale files
This commit is contained in:
catborise
commit
c83e26c797
9 changed files with 4475 additions and 56 deletions
|
|
@ -1063,7 +1063,11 @@ def clone(request, pk):
|
||||||
}
|
}
|
||||||
messages.error(request, msg)
|
messages.error(request, msg)
|
||||||
elif check_instance:
|
elif check_instance:
|
||||||
|
<<<<<<< HEAD
|
||||||
msg = _("Instance '%(clone_name)s' already exists!") % {"clone_name": clone_data["name"]}
|
msg = _("Instance '%(clone_name)s' already exists!") % {"clone_name": clone_data["name"]}
|
||||||
|
=======
|
||||||
|
msg = _("Instance '%(clone_name)s' already exists!") % {'clone_name': clone_data['name']}
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
messages.error(request, msg)
|
messages.error(request, msg)
|
||||||
elif not re.match(r"^[a-zA-Z0-9-]+$", clone_data["name"]):
|
elif not re.match(r"^[a-zA-Z0-9-]+$", clone_data["name"]):
|
||||||
msg = _("Instance name '%(clone_name)s' contains invalid characters!") % {"clone_name": clone_data["name"]}
|
msg = _("Instance name '%(clone_name)s' contains invalid characters!") % {"clone_name": clone_data["name"]}
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2020-11-05 09:36+0000\n"
|
"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"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
|
@ -293,6 +297,7 @@ msgstr ""
|
||||||
|
|
||||||
#: accounts/utils.py:51
|
#: accounts/utils.py:51
|
||||||
msgid "Please view HTML version of this message."
|
msgid "Please view HTML version of this message."
|
||||||
|
<<<<<<< HEAD
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: accounts/views.py:26
|
#: accounts/views.py:26
|
||||||
|
|
@ -342,6 +347,57 @@ msgid "OTP QR code was emailed to user %(user)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: accounts/views.py:196
|
#: 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"
|
msgid "User email not set, failed to send QR code"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -354,12 +410,20 @@ msgstr ""
|
||||||
msgid "Groups"
|
msgid "Groups"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: admin/forms.py:81
|
#: admin/forms.py:81
|
||||||
msgid ""
|
msgid ""
|
||||||
"Raw passwords are not stored, so there is no way to see this user's "
|
"Raw passwords are not stored, so there is no way to see this user's "
|
||||||
"password, \n"
|
"password, \n"
|
||||||
" but you can change the password using <a href='{}'>this "
|
" but you can change the password using <a href='{}'>this "
|
||||||
"form</a>."
|
"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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: admin/templates/admin/group_list.html:5 admin/views.py:87
|
#: admin/templates/admin/group_list.html:5 admin/views.py:87
|
||||||
|
|
@ -502,10 +566,11 @@ msgstr ""
|
||||||
msgid "Update Group"
|
msgid "Update Group"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: admin/views.py:110
|
#: admin/views.py:113
|
||||||
msgid "Create User"
|
msgid "Create User"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: admin/views.py:129
|
#: admin/views.py:129
|
||||||
msgid "Update User"
|
msgid "Update User"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -516,6 +581,17 @@ msgid "Password changed for %(user)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: admin/views.py:144
|
#: 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"
|
msgid "Wrong Data Provided"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -801,6 +877,7 @@ msgid "Other Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: appsettings/views.py:38
|
#: appsettings/views.py:38
|
||||||
|
<<<<<<< HEAD
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "SASS directory path is changed. Now: %(dir)s"
|
msgid "SASS directory path is changed. Now: %(dir)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -813,6 +890,20 @@ msgstr ""
|
||||||
#: appsettings/views.py:82
|
#: appsettings/views.py:82
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(setting)s is changed. Now: %(value)s"
|
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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: computes/forms.py:21
|
#: computes/forms.py:21
|
||||||
|
|
@ -1700,7 +1791,11 @@ msgstr ""
|
||||||
#: instances/templates/instance_actions.html:25
|
#: instances/templates/instance_actions.html:25
|
||||||
#: instances/templates/instance_actions.html:37
|
#: instances/templates/instance_actions.html:37
|
||||||
#: instances/templates/instances/power_tab.html:25
|
#: 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:270
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:82 instances/views.py:264
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Suspend"
|
msgid "Suspend"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1754,7 +1849,11 @@ msgstr ""
|
||||||
#: instances/templates/instances/destroy_instance_form.html:40
|
#: instances/templates/instances/destroy_instance_form.html:40
|
||||||
#: instances/templates/instances/destroy_tab.html:18
|
#: instances/templates/instances/destroy_tab.html:18
|
||||||
#: instances/templates/instances/destroy_tab.html:20
|
#: 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:312
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/destroy_tab.html:23 instances/views.py:306
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Destroy"
|
msgid "Destroy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1772,20 +1871,32 @@ msgstr ""
|
||||||
#: instances/templates/instance_actions.html:35
|
#: instances/templates/instance_actions.html:35
|
||||||
#: instances/templates/instances/power_tab.html:47
|
#: instances/templates/instances/power_tab.html:47
|
||||||
#: instances/templates/instances/power_tab.html:121
|
#: 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:245
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:123 instances/views.py:239
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Power On"
|
msgid "Power On"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/templates/instance_actions.html:15
|
#: instances/templates/instance_actions.html:15
|
||||||
#: instances/templates/instances/power_tab.html:9
|
#: 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:261
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:59 instances/views.py:255
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Power Off"
|
msgid "Power Off"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/templates/instance_actions.html:16
|
#: instances/templates/instance_actions.html:16
|
||||||
#: instances/templates/instance_actions.html:29
|
#: instances/templates/instance_actions.html:29
|
||||||
#: instances/templates/instances/power_tab.html:14
|
#: 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:254
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:66 instances/views.py:248
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Power Cycle"
|
msgid "Power Cycle"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1797,7 +1908,11 @@ msgstr ""
|
||||||
#: instances/templates/instance_actions.html:22
|
#: instances/templates/instance_actions.html:22
|
||||||
#: instances/templates/instances/power_tab.html:34
|
#: instances/templates/instances/power_tab.html:34
|
||||||
#: instances/templates/instances/power_tab.html:93
|
#: 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:278
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:108 instances/views.py:272
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Resume"
|
msgid "Resume"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1805,7 +1920,11 @@ msgstr ""
|
||||||
#: instances/templates/instances/power_tab.html:19
|
#: instances/templates/instances/power_tab.html:19
|
||||||
#: instances/templates/instances/power_tab.html:39
|
#: instances/templates/instances/power_tab.html:39
|
||||||
#: instances/templates/instances/power_tab.html:74
|
#: 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:285
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:100 instances/views.py:279
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Force Off"
|
msgid "Force Off"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2507,6 +2626,7 @@ msgstr ""
|
||||||
msgid "None available device name"
|
msgid "None available device name"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:242
|
#: instances/views.py:242
|
||||||
msgid "Templates cannot be started."
|
msgid "Templates cannot be started."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2525,28 +2645,61 @@ msgid "Please shutdown down your instance and then try again"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:395
|
#: 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
|
#, python-format
|
||||||
msgid "Installed new SSH public key %(keyname)s"
|
msgid "Installed new SSH public key %(keyname)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:422
|
#: instances/views.py:422
|
||||||
|
=======
|
||||||
|
#: instances/views.py:416
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"User %(quota_msg)s quota reached, cannot resize CPU of '%(instance_name)s'!"
|
"User %(quota_msg)s quota reached, cannot resize CPU of '%(instance_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:431
|
#: instances/views.py:431
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "CPU is resized: %(old)s to %(new)s"
|
msgid "CPU is resized: %(old)s to %(new)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:459
|
#: instances/views.py:459
|
||||||
|
=======
|
||||||
|
#: instances/views.py:425
|
||||||
|
msgid "Resize CPU"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:453
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"User %(quota_msg)s quota reached, cannot resize memory of "
|
"User %(quota_msg)s quota reached, cannot resize memory of "
|
||||||
"'%(instance_name)s'!"
|
"'%(instance_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:466
|
#: instances/views.py:466
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
|
|
@ -2555,11 +2708,19 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:500
|
#: instances/views.py:500
|
||||||
|
=======
|
||||||
|
#: instances/views.py:462
|
||||||
|
msgid "Resize Memory"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:491
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"User %(quota_msg)s quota reached, cannot resize disks of '%(instance_name)s'!"
|
"User %(quota_msg)s quota reached, cannot resize disks of '%(instance_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:507
|
#: instances/views.py:507
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Disk is resized: %(dev)s"
|
msgid "Disk is resized: %(dev)s"
|
||||||
|
|
@ -2571,53 +2732,98 @@ msgid "Attach new disk: %(name)s (%(format)s)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:577
|
#: 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
|
#, python-format
|
||||||
msgid "Attach Existing disk: %(target_dev)s"
|
msgid "Attach Existing disk: %(target_dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:635
|
#: instances/views.py:635
|
||||||
|
=======
|
||||||
|
#: instances/views.py:624
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Volume changes are applied. But it will be activated after shutdown"
|
msgid "Volume changes are applied. But it will be activated after shutdown"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:638
|
#: instances/views.py:626
|
||||||
msgid "Volume is changed successfully."
|
msgid "Volume is changed successfully."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:639
|
#: instances/views.py:639
|
||||||
|
=======
|
||||||
|
#: instances/views.py:627
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Edit disk: %(target_dev)s"
|
msgid "Edit disk: %(target_dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:661
|
#: instances/views.py:661
|
||||||
|
=======
|
||||||
|
#: instances/views.py:649
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Delete disk: %(dev)s"
|
msgid "Delete disk: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:677
|
#: instances/views.py:677
|
||||||
|
=======
|
||||||
|
#: instances/views.py:665
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Detach disk: %(dev)s"
|
msgid "Detach disk: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:690
|
#: instances/views.py:690
|
||||||
|
=======
|
||||||
|
#: instances/views.py:678
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Add CD-ROM: %(target)s"
|
msgid "Add CD-ROM: %(target)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:703
|
#: instances/views.py:703
|
||||||
|
=======
|
||||||
|
#: instances/views.py:691
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Detach CD-ROM: %(dev)s"
|
msgid "Detach CD-ROM: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:716
|
#: instances/views.py:716
|
||||||
|
=======
|
||||||
|
#: instances/views.py:704
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Mount media: %(dev)s"
|
msgid "Mount media: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:729
|
#: instances/views.py:729
|
||||||
|
=======
|
||||||
|
#: instances/views.py:717
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Unmount media: %(dev)s"
|
msgid "Unmount media: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:742
|
#: instances/views.py:742
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Create snapshot: %(snap)s"
|
msgid "Create snapshot: %(snap)s"
|
||||||
|
|
@ -2626,26 +2832,49 @@ msgstr ""
|
||||||
#: instances/views.py:753
|
#: instances/views.py:753
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Delete snapshot: %(snap)s"
|
msgid "Delete snapshot: %(snap)s"
|
||||||
|
=======
|
||||||
|
#: instances/views.py:730
|
||||||
|
#, python-format
|
||||||
|
msgid "New snapshot: %(name)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:764
|
#: instances/views.py:741
|
||||||
|
#, python-format
|
||||||
|
msgid "Delete snapshot: %(snap_name)s"
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:752
|
||||||
msgid "Successful revert snapshot: "
|
msgid "Successful revert snapshot: "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:767
|
#: instances/views.py:767
|
||||||
msgid "Revert snapshot: %(snap)"
|
msgid "Revert snapshot: %(snap)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:781
|
#: instances/views.py:781
|
||||||
|
=======
|
||||||
|
#: instances/views.py:755
|
||||||
|
msgid "Revert snapshot"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:769
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "VCPU %(id)s is enabled=%(enabled)s"
|
msgid "VCPU %(id)s is enabled=%(enabled)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:790
|
#: instances/views.py:790
|
||||||
|
=======
|
||||||
|
#: instances/views.py:780
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "VCPU Hot-plug is enabled=%(status)s"
|
msgid "VCPU Hot-plug is enabled=%(status)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:800
|
#: instances/views.py:800
|
||||||
msgid "Set autostart"
|
msgid "Set autostart"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2667,13 +2896,37 @@ msgid "Set boot order"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:847
|
#: 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"
|
msgid "Boot menu changes applied. But it will be activated after shutdown"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:850
|
#: instances/views.py:838
|
||||||
msgid "Boot order changed successfully."
|
msgid "Boot order changed successfully."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:861
|
#: instances/views.py:861
|
||||||
msgid "Change instance XML"
|
msgid "Change instance XML"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2685,16 +2938,30 @@ msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:885
|
#: instances/views.py:885
|
||||||
msgid "Set Video Model: %(model)"
|
msgid "Set Video Model: %(model)"
|
||||||
|
=======
|
||||||
|
#: instances/views.py:849
|
||||||
|
msgid "Edit XML"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:894
|
#: 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
|
||||||
msgid "Change network"
|
msgid "Change network"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:907
|
#: instances/views.py:895
|
||||||
msgid "Network Device Config is changed. Please shutdown instance to activate."
|
msgid "Network Device Config is changed. Please shutdown instance to activate."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:922
|
#: instances/views.py:922
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Add network: %(mac)s"
|
msgid "Add network: %(mac)s"
|
||||||
|
|
@ -2706,79 +2973,145 @@ msgid "Delete Network: %(mac)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:946
|
#: 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
|
#, python-format
|
||||||
msgid "Set Link State: %(state)s"
|
msgid "Set Link State: %(state)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:966 networks/views.py:231
|
#: instances/views.py:966 networks/views.py:231
|
||||||
|
=======
|
||||||
|
#: instances/views.py:952
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(qos_dir)s QoS is set"
|
msgid "%(qos_dir)s QoS is set"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:971
|
#: instances/views.py:971
|
||||||
|
=======
|
||||||
|
#: instances/views.py:956
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"%(qos_dir)s QoS is set. Network XML is changed. Stop and "
|
"%(qos_dir)s QoS is set. Network XML is changed. Stop and "
|
||||||
"start network to activate new config."
|
"start network to activate new config."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:988 networks/views.py:246
|
#: instances/views.py:988 networks/views.py:246
|
||||||
|
=======
|
||||||
|
#: instances/views.py:970
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(qos_dir)s QoS is deleted"
|
msgid "%(qos_dir)s QoS is deleted"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:993
|
#: instances/views.py:993
|
||||||
|
=======
|
||||||
|
#: instances/views.py:974
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"%(qos_dir)s QoS is deleted. Network XML is changed. Stop and "
|
"%(qos_dir)s QoS is deleted. Network XML is changed. Stop and "
|
||||||
"start network to activate new config."
|
"start network to activate new config."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1012
|
#: instances/views.py:1012
|
||||||
msgid "Only one owner is allowed and the one already added"
|
msgid "Only one owner is allowed and the one already added"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1017
|
#: 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
|
#, python-format
|
||||||
msgid "Add owner: %(user)s"
|
msgid "Add owner: %(user)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1028
|
#: instances/views.py:1028
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Delete owner: %(userinstance_id)s "
|
msgid "Delete owner: %(userinstance_id)s "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1060
|
#: instances/views.py:1060
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1006
|
||||||
|
#, python-format
|
||||||
|
msgid "Deleted owner %(userinstance_id)s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:1038
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "User '%(quota_msg)s' quota reached, cannot create '%(clone_name)s'!"
|
msgid "User '%(quota_msg)s' quota reached, cannot create '%(clone_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1066
|
#: instances/views.py:1066
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Instance '%(clone_name)s' already exists!"
|
msgid "Instance '%(clone_name)s' already exists!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1069
|
#: instances/views.py:1069
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1044
|
||||||
|
msgid "Instance 'clone_name' already exists!"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:1047
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Instance name '%(clone_name)s' contains invalid characters!"
|
msgid "Instance name '%(clone_name)s' contains invalid characters!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1072
|
#: instances/views.py:1072
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1050
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Instance MAC '%(clone_mac)s' invalid format!"
|
msgid "Instance MAC '%(clone_mac)s' invalid format!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1082
|
#: instances/views.py:1082
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Create a clone of '%(instance_name)s'"
|
msgid "Create a clone of '%(instance_name)s'"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1121
|
#: instances/views.py:1121
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1060
|
||||||
|
#, python-format
|
||||||
|
msgid "Clone of '%(instance_name)s'"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:1093
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid ""
|
msgid ""
|
||||||
"Error setting console password. You should check that your instance have an "
|
"Error setting console password. You should check that your instance have an "
|
||||||
"graphic device."
|
"graphic device."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1126
|
#: instances/views.py:1126
|
||||||
msgid "Set VNC password"
|
msgid "Set VNC password"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2856,6 +3189,85 @@ msgid "Update Flavor"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1512
|
#: 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"
|
msgid "Flavor Deleted"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3281,6 +3693,7 @@ msgstr ""
|
||||||
msgid "Please enter bridge/dev name"
|
msgid "Please enter bridge/dev name"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: networks/views.py:57
|
#: networks/views.py:57
|
||||||
msgid "For libvirt, the IPv6 network prefix must be /64"
|
msgid "For libvirt, the IPv6 network prefix must be /64"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3305,10 +3718,34 @@ msgid "%(family)s DHCP Range is Changed."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: networks/views.py:210
|
#: 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 ""
|
msgid ""
|
||||||
"Network XML is changed. \\Stop and start network to activate new config."
|
"Network XML is changed. \\Stop and start network to activate new config."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: networks/views.py:215
|
#: networks/views.py:215
|
||||||
msgid "Network XML is changed."
|
msgid "Network XML is changed."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3325,6 +3762,34 @@ msgstr ""
|
||||||
msgid ""
|
msgid ""
|
||||||
"%(qos_dir)s QoS is deleted. Network XML is changed. "
|
"%(qos_dir)s QoS is deleted. Network XML is changed. "
|
||||||
"Stop and start network to activate new config"
|
"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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: nwfilters/templates/add_nwf_rule.html:12
|
#: nwfilters/templates/add_nwf_rule.html:12
|
||||||
|
|
@ -3388,6 +3853,7 @@ msgstr ""
|
||||||
msgid "Hypervisor doesn't have any NWFilters"
|
msgid "Hypervisor doesn't have any NWFilters"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: nwfilters/views.py:44
|
#: nwfilters/views.py:44
|
||||||
msgid "A network filter with this name already exists"
|
msgid "A network filter with this name already exists"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3397,10 +3863,22 @@ msgid "A network filter with this UUID already exists"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: nwfilters/views.py:51
|
#: 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
|
#, python-format
|
||||||
msgid "%(filter)s network filter is created"
|
msgid "%(filter)s network filter is created"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: nwfilters/views.py:60
|
#: nwfilters/views.py:60
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(filter)s network filter is deleted"
|
msgid "%(filter)s network filter is deleted"
|
||||||
|
|
@ -3414,6 +3892,21 @@ msgstr ""
|
||||||
#: nwfilters/views.py:93
|
#: nwfilters/views.py:93
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Cloning NWFilter %(name)s as %(clone)s"
|
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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: secrets/templates/create_secret_block.html:12
|
#: secrets/templates/create_secret_block.html:12
|
||||||
|
|
@ -3621,10 +4114,11 @@ msgstr ""
|
||||||
msgid "Pool name already use"
|
msgid "Pool name already use"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: storages/views.py:44
|
#: storages/views.py:45
|
||||||
msgid "You need create secret for pool"
|
msgid "You need create secret for pool"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: storages/views.py:48
|
#: storages/views.py:48
|
||||||
msgid "You need input all fields for creating ceph pool"
|
msgid "You need input all fields for creating ceph pool"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3655,6 +4149,36 @@ msgstr ""
|
||||||
#: storages/views.py:220
|
#: storages/views.py:220
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Image file %(name)s is created successfully"
|
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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: templates/403.html:3
|
#: templates/403.html:3
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2020-11-05 09:36+0000\n"
|
"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"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
|
@ -293,6 +297,7 @@ msgstr ""
|
||||||
|
|
||||||
#: accounts/utils.py:51
|
#: accounts/utils.py:51
|
||||||
msgid "Please view HTML version of this message."
|
msgid "Please view HTML version of this message."
|
||||||
|
<<<<<<< HEAD
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: accounts/views.py:26
|
#: accounts/views.py:26
|
||||||
|
|
@ -342,6 +347,57 @@ msgid "OTP QR code was emailed to user %(user)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: accounts/views.py:196
|
#: 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"
|
msgid "User email not set, failed to send QR code"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -354,12 +410,20 @@ msgstr ""
|
||||||
msgid "Groups"
|
msgid "Groups"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: admin/forms.py:81
|
#: admin/forms.py:81
|
||||||
msgid ""
|
msgid ""
|
||||||
"Raw passwords are not stored, so there is no way to see this user's "
|
"Raw passwords are not stored, so there is no way to see this user's "
|
||||||
"password, \n"
|
"password, \n"
|
||||||
" but you can change the password using <a href='{}'>this "
|
" but you can change the password using <a href='{}'>this "
|
||||||
"form</a>."
|
"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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: admin/templates/admin/group_list.html:5 admin/views.py:87
|
#: admin/templates/admin/group_list.html:5 admin/views.py:87
|
||||||
|
|
@ -502,10 +566,11 @@ msgstr ""
|
||||||
msgid "Update Group"
|
msgid "Update Group"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: admin/views.py:110
|
#: admin/views.py:113
|
||||||
msgid "Create User"
|
msgid "Create User"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: admin/views.py:129
|
#: admin/views.py:129
|
||||||
msgid "Update User"
|
msgid "Update User"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -516,6 +581,17 @@ msgid "Password changed for %(user)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: admin/views.py:144
|
#: 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"
|
msgid "Wrong Data Provided"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -801,6 +877,7 @@ msgid "Other Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: appsettings/views.py:38
|
#: appsettings/views.py:38
|
||||||
|
<<<<<<< HEAD
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "SASS directory path is changed. Now: %(dir)s"
|
msgid "SASS directory path is changed. Now: %(dir)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -813,6 +890,20 @@ msgstr ""
|
||||||
#: appsettings/views.py:82
|
#: appsettings/views.py:82
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(setting)s is changed. Now: %(value)s"
|
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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: computes/forms.py:21
|
#: computes/forms.py:21
|
||||||
|
|
@ -1700,7 +1791,11 @@ msgstr ""
|
||||||
#: instances/templates/instance_actions.html:25
|
#: instances/templates/instance_actions.html:25
|
||||||
#: instances/templates/instance_actions.html:37
|
#: instances/templates/instance_actions.html:37
|
||||||
#: instances/templates/instances/power_tab.html:25
|
#: 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:270
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:82 instances/views.py:264
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Suspend"
|
msgid "Suspend"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1754,7 +1849,11 @@ msgstr ""
|
||||||
#: instances/templates/instances/destroy_instance_form.html:40
|
#: instances/templates/instances/destroy_instance_form.html:40
|
||||||
#: instances/templates/instances/destroy_tab.html:18
|
#: instances/templates/instances/destroy_tab.html:18
|
||||||
#: instances/templates/instances/destroy_tab.html:20
|
#: 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:312
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/destroy_tab.html:23 instances/views.py:306
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Destroy"
|
msgid "Destroy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1772,20 +1871,32 @@ msgstr ""
|
||||||
#: instances/templates/instance_actions.html:35
|
#: instances/templates/instance_actions.html:35
|
||||||
#: instances/templates/instances/power_tab.html:47
|
#: instances/templates/instances/power_tab.html:47
|
||||||
#: instances/templates/instances/power_tab.html:121
|
#: 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:245
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:123 instances/views.py:239
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Power On"
|
msgid "Power On"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/templates/instance_actions.html:15
|
#: instances/templates/instance_actions.html:15
|
||||||
#: instances/templates/instances/power_tab.html:9
|
#: 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:261
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:59 instances/views.py:255
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Power Off"
|
msgid "Power Off"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/templates/instance_actions.html:16
|
#: instances/templates/instance_actions.html:16
|
||||||
#: instances/templates/instance_actions.html:29
|
#: instances/templates/instance_actions.html:29
|
||||||
#: instances/templates/instances/power_tab.html:14
|
#: 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:254
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:66 instances/views.py:248
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Power Cycle"
|
msgid "Power Cycle"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1797,7 +1908,11 @@ msgstr ""
|
||||||
#: instances/templates/instance_actions.html:22
|
#: instances/templates/instance_actions.html:22
|
||||||
#: instances/templates/instances/power_tab.html:34
|
#: instances/templates/instances/power_tab.html:34
|
||||||
#: instances/templates/instances/power_tab.html:93
|
#: 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:278
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:108 instances/views.py:272
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Resume"
|
msgid "Resume"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1805,7 +1920,11 @@ msgstr ""
|
||||||
#: instances/templates/instances/power_tab.html:19
|
#: instances/templates/instances/power_tab.html:19
|
||||||
#: instances/templates/instances/power_tab.html:39
|
#: instances/templates/instances/power_tab.html:39
|
||||||
#: instances/templates/instances/power_tab.html:74
|
#: 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:285
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:100 instances/views.py:279
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Force Off"
|
msgid "Force Off"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2507,6 +2626,7 @@ msgstr ""
|
||||||
msgid "None available device name"
|
msgid "None available device name"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:242
|
#: instances/views.py:242
|
||||||
msgid "Templates cannot be started."
|
msgid "Templates cannot be started."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2525,28 +2645,61 @@ msgid "Please shutdown down your instance and then try again"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:395
|
#: 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
|
#, python-format
|
||||||
msgid "Installed new SSH public key %(keyname)s"
|
msgid "Installed new SSH public key %(keyname)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:422
|
#: instances/views.py:422
|
||||||
|
=======
|
||||||
|
#: instances/views.py:416
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"User %(quota_msg)s quota reached, cannot resize CPU of '%(instance_name)s'!"
|
"User %(quota_msg)s quota reached, cannot resize CPU of '%(instance_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:431
|
#: instances/views.py:431
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "CPU is resized: %(old)s to %(new)s"
|
msgid "CPU is resized: %(old)s to %(new)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:459
|
#: instances/views.py:459
|
||||||
|
=======
|
||||||
|
#: instances/views.py:425
|
||||||
|
msgid "Resize CPU"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:453
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"User %(quota_msg)s quota reached, cannot resize memory of "
|
"User %(quota_msg)s quota reached, cannot resize memory of "
|
||||||
"'%(instance_name)s'!"
|
"'%(instance_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:466
|
#: instances/views.py:466
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
|
|
@ -2555,11 +2708,19 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:500
|
#: instances/views.py:500
|
||||||
|
=======
|
||||||
|
#: instances/views.py:462
|
||||||
|
msgid "Resize Memory"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:491
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"User %(quota_msg)s quota reached, cannot resize disks of '%(instance_name)s'!"
|
"User %(quota_msg)s quota reached, cannot resize disks of '%(instance_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:507
|
#: instances/views.py:507
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Disk is resized: %(dev)s"
|
msgid "Disk is resized: %(dev)s"
|
||||||
|
|
@ -2571,53 +2732,98 @@ msgid "Attach new disk: %(name)s (%(format)s)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:577
|
#: 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
|
#, python-format
|
||||||
msgid "Attach Existing disk: %(target_dev)s"
|
msgid "Attach Existing disk: %(target_dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:635
|
#: instances/views.py:635
|
||||||
|
=======
|
||||||
|
#: instances/views.py:624
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Volume changes are applied. But it will be activated after shutdown"
|
msgid "Volume changes are applied. But it will be activated after shutdown"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:638
|
#: instances/views.py:626
|
||||||
msgid "Volume is changed successfully."
|
msgid "Volume is changed successfully."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:639
|
#: instances/views.py:639
|
||||||
|
=======
|
||||||
|
#: instances/views.py:627
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Edit disk: %(target_dev)s"
|
msgid "Edit disk: %(target_dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:661
|
#: instances/views.py:661
|
||||||
|
=======
|
||||||
|
#: instances/views.py:649
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Delete disk: %(dev)s"
|
msgid "Delete disk: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:677
|
#: instances/views.py:677
|
||||||
|
=======
|
||||||
|
#: instances/views.py:665
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Detach disk: %(dev)s"
|
msgid "Detach disk: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:690
|
#: instances/views.py:690
|
||||||
|
=======
|
||||||
|
#: instances/views.py:678
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Add CD-ROM: %(target)s"
|
msgid "Add CD-ROM: %(target)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:703
|
#: instances/views.py:703
|
||||||
|
=======
|
||||||
|
#: instances/views.py:691
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Detach CD-ROM: %(dev)s"
|
msgid "Detach CD-ROM: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:716
|
#: instances/views.py:716
|
||||||
|
=======
|
||||||
|
#: instances/views.py:704
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Mount media: %(dev)s"
|
msgid "Mount media: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:729
|
#: instances/views.py:729
|
||||||
|
=======
|
||||||
|
#: instances/views.py:717
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Unmount media: %(dev)s"
|
msgid "Unmount media: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:742
|
#: instances/views.py:742
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Create snapshot: %(snap)s"
|
msgid "Create snapshot: %(snap)s"
|
||||||
|
|
@ -2626,26 +2832,49 @@ msgstr ""
|
||||||
#: instances/views.py:753
|
#: instances/views.py:753
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Delete snapshot: %(snap)s"
|
msgid "Delete snapshot: %(snap)s"
|
||||||
|
=======
|
||||||
|
#: instances/views.py:730
|
||||||
|
#, python-format
|
||||||
|
msgid "New snapshot: %(name)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:764
|
#: instances/views.py:741
|
||||||
|
#, python-format
|
||||||
|
msgid "Delete snapshot: %(snap_name)s"
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:752
|
||||||
msgid "Successful revert snapshot: "
|
msgid "Successful revert snapshot: "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:767
|
#: instances/views.py:767
|
||||||
msgid "Revert snapshot: %(snap)"
|
msgid "Revert snapshot: %(snap)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:781
|
#: instances/views.py:781
|
||||||
|
=======
|
||||||
|
#: instances/views.py:755
|
||||||
|
msgid "Revert snapshot"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:769
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "VCPU %(id)s is enabled=%(enabled)s"
|
msgid "VCPU %(id)s is enabled=%(enabled)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:790
|
#: instances/views.py:790
|
||||||
|
=======
|
||||||
|
#: instances/views.py:780
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "VCPU Hot-plug is enabled=%(status)s"
|
msgid "VCPU Hot-plug is enabled=%(status)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:800
|
#: instances/views.py:800
|
||||||
msgid "Set autostart"
|
msgid "Set autostart"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2667,13 +2896,37 @@ msgid "Set boot order"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:847
|
#: 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"
|
msgid "Boot menu changes applied. But it will be activated after shutdown"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:850
|
#: instances/views.py:838
|
||||||
msgid "Boot order changed successfully."
|
msgid "Boot order changed successfully."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:861
|
#: instances/views.py:861
|
||||||
msgid "Change instance XML"
|
msgid "Change instance XML"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2685,16 +2938,30 @@ msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:885
|
#: instances/views.py:885
|
||||||
msgid "Set Video Model: %(model)"
|
msgid "Set Video Model: %(model)"
|
||||||
|
=======
|
||||||
|
#: instances/views.py:849
|
||||||
|
msgid "Edit XML"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:894
|
#: 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
|
||||||
msgid "Change network"
|
msgid "Change network"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:907
|
#: instances/views.py:895
|
||||||
msgid "Network Device Config is changed. Please shutdown instance to activate."
|
msgid "Network Device Config is changed. Please shutdown instance to activate."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:922
|
#: instances/views.py:922
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Add network: %(mac)s"
|
msgid "Add network: %(mac)s"
|
||||||
|
|
@ -2706,79 +2973,145 @@ msgid "Delete Network: %(mac)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:946
|
#: 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
|
#, python-format
|
||||||
msgid "Set Link State: %(state)s"
|
msgid "Set Link State: %(state)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:966 networks/views.py:231
|
#: instances/views.py:966 networks/views.py:231
|
||||||
|
=======
|
||||||
|
#: instances/views.py:952
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(qos_dir)s QoS is set"
|
msgid "%(qos_dir)s QoS is set"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:971
|
#: instances/views.py:971
|
||||||
|
=======
|
||||||
|
#: instances/views.py:956
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"%(qos_dir)s QoS is set. Network XML is changed. Stop and "
|
"%(qos_dir)s QoS is set. Network XML is changed. Stop and "
|
||||||
"start network to activate new config."
|
"start network to activate new config."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:988 networks/views.py:246
|
#: instances/views.py:988 networks/views.py:246
|
||||||
|
=======
|
||||||
|
#: instances/views.py:970
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(qos_dir)s QoS is deleted"
|
msgid "%(qos_dir)s QoS is deleted"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:993
|
#: instances/views.py:993
|
||||||
|
=======
|
||||||
|
#: instances/views.py:974
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"%(qos_dir)s QoS is deleted. Network XML is changed. Stop and "
|
"%(qos_dir)s QoS is deleted. Network XML is changed. Stop and "
|
||||||
"start network to activate new config."
|
"start network to activate new config."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1012
|
#: instances/views.py:1012
|
||||||
msgid "Only one owner is allowed and the one already added"
|
msgid "Only one owner is allowed and the one already added"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1017
|
#: 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
|
#, python-format
|
||||||
msgid "Add owner: %(user)s"
|
msgid "Add owner: %(user)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1028
|
#: instances/views.py:1028
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Delete owner: %(userinstance_id)s "
|
msgid "Delete owner: %(userinstance_id)s "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1060
|
#: instances/views.py:1060
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1006
|
||||||
|
#, python-format
|
||||||
|
msgid "Deleted owner %(userinstance_id)s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:1038
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "User '%(quota_msg)s' quota reached, cannot create '%(clone_name)s'!"
|
msgid "User '%(quota_msg)s' quota reached, cannot create '%(clone_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1066
|
#: instances/views.py:1066
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Instance '%(clone_name)s' already exists!"
|
msgid "Instance '%(clone_name)s' already exists!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1069
|
#: instances/views.py:1069
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1044
|
||||||
|
msgid "Instance 'clone_name' already exists!"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:1047
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Instance name '%(clone_name)s' contains invalid characters!"
|
msgid "Instance name '%(clone_name)s' contains invalid characters!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1072
|
#: instances/views.py:1072
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1050
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Instance MAC '%(clone_mac)s' invalid format!"
|
msgid "Instance MAC '%(clone_mac)s' invalid format!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1082
|
#: instances/views.py:1082
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Create a clone of '%(instance_name)s'"
|
msgid "Create a clone of '%(instance_name)s'"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1121
|
#: instances/views.py:1121
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1060
|
||||||
|
#, python-format
|
||||||
|
msgid "Clone of '%(instance_name)s'"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:1093
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid ""
|
msgid ""
|
||||||
"Error setting console password. You should check that your instance have an "
|
"Error setting console password. You should check that your instance have an "
|
||||||
"graphic device."
|
"graphic device."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1126
|
#: instances/views.py:1126
|
||||||
msgid "Set VNC password"
|
msgid "Set VNC password"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2856,6 +3189,85 @@ msgid "Update Flavor"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1512
|
#: 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"
|
msgid "Flavor Deleted"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3281,6 +3693,7 @@ msgstr ""
|
||||||
msgid "Please enter bridge/dev name"
|
msgid "Please enter bridge/dev name"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: networks/views.py:57
|
#: networks/views.py:57
|
||||||
msgid "For libvirt, the IPv6 network prefix must be /64"
|
msgid "For libvirt, the IPv6 network prefix must be /64"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3305,10 +3718,34 @@ msgid "%(family)s DHCP Range is Changed."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: networks/views.py:210
|
#: 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 ""
|
msgid ""
|
||||||
"Network XML is changed. \\Stop and start network to activate new config."
|
"Network XML is changed. \\Stop and start network to activate new config."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: networks/views.py:215
|
#: networks/views.py:215
|
||||||
msgid "Network XML is changed."
|
msgid "Network XML is changed."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3325,6 +3762,34 @@ msgstr ""
|
||||||
msgid ""
|
msgid ""
|
||||||
"%(qos_dir)s QoS is deleted. Network XML is changed. "
|
"%(qos_dir)s QoS is deleted. Network XML is changed. "
|
||||||
"Stop and start network to activate new config"
|
"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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: nwfilters/templates/add_nwf_rule.html:12
|
#: nwfilters/templates/add_nwf_rule.html:12
|
||||||
|
|
@ -3388,6 +3853,7 @@ msgstr ""
|
||||||
msgid "Hypervisor doesn't have any NWFilters"
|
msgid "Hypervisor doesn't have any NWFilters"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: nwfilters/views.py:44
|
#: nwfilters/views.py:44
|
||||||
msgid "A network filter with this name already exists"
|
msgid "A network filter with this name already exists"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3397,10 +3863,22 @@ msgid "A network filter with this UUID already exists"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: nwfilters/views.py:51
|
#: 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
|
#, python-format
|
||||||
msgid "%(filter)s network filter is created"
|
msgid "%(filter)s network filter is created"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: nwfilters/views.py:60
|
#: nwfilters/views.py:60
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(filter)s network filter is deleted"
|
msgid "%(filter)s network filter is deleted"
|
||||||
|
|
@ -3414,6 +3892,21 @@ msgstr ""
|
||||||
#: nwfilters/views.py:93
|
#: nwfilters/views.py:93
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Cloning NWFilter %(name)s as %(clone)s"
|
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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: secrets/templates/create_secret_block.html:12
|
#: secrets/templates/create_secret_block.html:12
|
||||||
|
|
@ -3621,10 +4114,11 @@ msgstr ""
|
||||||
msgid "Pool name already use"
|
msgid "Pool name already use"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: storages/views.py:44
|
#: storages/views.py:45
|
||||||
msgid "You need create secret for pool"
|
msgid "You need create secret for pool"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: storages/views.py:48
|
#: storages/views.py:48
|
||||||
msgid "You need input all fields for creating ceph pool"
|
msgid "You need input all fields for creating ceph pool"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3655,6 +4149,36 @@ msgstr ""
|
||||||
#: storages/views.py:220
|
#: storages/views.py:220
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Image file %(name)s is created successfully"
|
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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: templates/403.html:3
|
#: templates/403.html:3
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2020-11-05 09:36+0000\n"
|
"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"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
|
@ -293,6 +297,7 @@ msgstr ""
|
||||||
|
|
||||||
#: accounts/utils.py:51
|
#: accounts/utils.py:51
|
||||||
msgid "Please view HTML version of this message."
|
msgid "Please view HTML version of this message."
|
||||||
|
<<<<<<< HEAD
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: accounts/views.py:26
|
#: accounts/views.py:26
|
||||||
|
|
@ -342,6 +347,57 @@ msgid "OTP QR code was emailed to user %(user)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: accounts/views.py:196
|
#: 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"
|
msgid "User email not set, failed to send QR code"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -354,12 +410,20 @@ msgstr ""
|
||||||
msgid "Groups"
|
msgid "Groups"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: admin/forms.py:81
|
#: admin/forms.py:81
|
||||||
msgid ""
|
msgid ""
|
||||||
"Raw passwords are not stored, so there is no way to see this user's "
|
"Raw passwords are not stored, so there is no way to see this user's "
|
||||||
"password, \n"
|
"password, \n"
|
||||||
" but you can change the password using <a href='{}'>this "
|
" but you can change the password using <a href='{}'>this "
|
||||||
"form</a>."
|
"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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: admin/templates/admin/group_list.html:5 admin/views.py:87
|
#: admin/templates/admin/group_list.html:5 admin/views.py:87
|
||||||
|
|
@ -502,10 +566,11 @@ msgstr ""
|
||||||
msgid "Update Group"
|
msgid "Update Group"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: admin/views.py:110
|
#: admin/views.py:113
|
||||||
msgid "Create User"
|
msgid "Create User"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: admin/views.py:129
|
#: admin/views.py:129
|
||||||
msgid "Update User"
|
msgid "Update User"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -516,6 +581,17 @@ msgid "Password changed for %(user)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: admin/views.py:144
|
#: 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"
|
msgid "Wrong Data Provided"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -801,6 +877,7 @@ msgid "Other Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: appsettings/views.py:38
|
#: appsettings/views.py:38
|
||||||
|
<<<<<<< HEAD
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "SASS directory path is changed. Now: %(dir)s"
|
msgid "SASS directory path is changed. Now: %(dir)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -813,6 +890,20 @@ msgstr ""
|
||||||
#: appsettings/views.py:82
|
#: appsettings/views.py:82
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(setting)s is changed. Now: %(value)s"
|
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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: computes/forms.py:21
|
#: computes/forms.py:21
|
||||||
|
|
@ -1700,7 +1791,11 @@ msgstr ""
|
||||||
#: instances/templates/instance_actions.html:25
|
#: instances/templates/instance_actions.html:25
|
||||||
#: instances/templates/instance_actions.html:37
|
#: instances/templates/instance_actions.html:37
|
||||||
#: instances/templates/instances/power_tab.html:25
|
#: 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:270
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:82 instances/views.py:264
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Suspend"
|
msgid "Suspend"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1754,7 +1849,11 @@ msgstr ""
|
||||||
#: instances/templates/instances/destroy_instance_form.html:40
|
#: instances/templates/instances/destroy_instance_form.html:40
|
||||||
#: instances/templates/instances/destroy_tab.html:18
|
#: instances/templates/instances/destroy_tab.html:18
|
||||||
#: instances/templates/instances/destroy_tab.html:20
|
#: 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:312
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/destroy_tab.html:23 instances/views.py:306
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Destroy"
|
msgid "Destroy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1772,20 +1871,32 @@ msgstr ""
|
||||||
#: instances/templates/instance_actions.html:35
|
#: instances/templates/instance_actions.html:35
|
||||||
#: instances/templates/instances/power_tab.html:47
|
#: instances/templates/instances/power_tab.html:47
|
||||||
#: instances/templates/instances/power_tab.html:121
|
#: 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:245
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:123 instances/views.py:239
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Power On"
|
msgid "Power On"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/templates/instance_actions.html:15
|
#: instances/templates/instance_actions.html:15
|
||||||
#: instances/templates/instances/power_tab.html:9
|
#: 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:261
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:59 instances/views.py:255
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Power Off"
|
msgid "Power Off"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/templates/instance_actions.html:16
|
#: instances/templates/instance_actions.html:16
|
||||||
#: instances/templates/instance_actions.html:29
|
#: instances/templates/instance_actions.html:29
|
||||||
#: instances/templates/instances/power_tab.html:14
|
#: 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:254
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:66 instances/views.py:248
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Power Cycle"
|
msgid "Power Cycle"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1797,7 +1908,11 @@ msgstr ""
|
||||||
#: instances/templates/instance_actions.html:22
|
#: instances/templates/instance_actions.html:22
|
||||||
#: instances/templates/instances/power_tab.html:34
|
#: instances/templates/instances/power_tab.html:34
|
||||||
#: instances/templates/instances/power_tab.html:93
|
#: 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:278
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:108 instances/views.py:272
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Resume"
|
msgid "Resume"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1805,7 +1920,11 @@ msgstr ""
|
||||||
#: instances/templates/instances/power_tab.html:19
|
#: instances/templates/instances/power_tab.html:19
|
||||||
#: instances/templates/instances/power_tab.html:39
|
#: instances/templates/instances/power_tab.html:39
|
||||||
#: instances/templates/instances/power_tab.html:74
|
#: 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:285
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:100 instances/views.py:279
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Force Off"
|
msgid "Force Off"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2507,6 +2626,7 @@ msgstr ""
|
||||||
msgid "None available device name"
|
msgid "None available device name"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:242
|
#: instances/views.py:242
|
||||||
msgid "Templates cannot be started."
|
msgid "Templates cannot be started."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2525,28 +2645,61 @@ msgid "Please shutdown down your instance and then try again"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:395
|
#: 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
|
#, python-format
|
||||||
msgid "Installed new SSH public key %(keyname)s"
|
msgid "Installed new SSH public key %(keyname)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:422
|
#: instances/views.py:422
|
||||||
|
=======
|
||||||
|
#: instances/views.py:416
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"User %(quota_msg)s quota reached, cannot resize CPU of '%(instance_name)s'!"
|
"User %(quota_msg)s quota reached, cannot resize CPU of '%(instance_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:431
|
#: instances/views.py:431
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "CPU is resized: %(old)s to %(new)s"
|
msgid "CPU is resized: %(old)s to %(new)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:459
|
#: instances/views.py:459
|
||||||
|
=======
|
||||||
|
#: instances/views.py:425
|
||||||
|
msgid "Resize CPU"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:453
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"User %(quota_msg)s quota reached, cannot resize memory of "
|
"User %(quota_msg)s quota reached, cannot resize memory of "
|
||||||
"'%(instance_name)s'!"
|
"'%(instance_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:466
|
#: instances/views.py:466
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
|
|
@ -2555,11 +2708,19 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:500
|
#: instances/views.py:500
|
||||||
|
=======
|
||||||
|
#: instances/views.py:462
|
||||||
|
msgid "Resize Memory"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:491
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"User %(quota_msg)s quota reached, cannot resize disks of '%(instance_name)s'!"
|
"User %(quota_msg)s quota reached, cannot resize disks of '%(instance_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:507
|
#: instances/views.py:507
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Disk is resized: %(dev)s"
|
msgid "Disk is resized: %(dev)s"
|
||||||
|
|
@ -2571,53 +2732,98 @@ msgid "Attach new disk: %(name)s (%(format)s)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:577
|
#: 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
|
#, python-format
|
||||||
msgid "Attach Existing disk: %(target_dev)s"
|
msgid "Attach Existing disk: %(target_dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:635
|
#: instances/views.py:635
|
||||||
|
=======
|
||||||
|
#: instances/views.py:624
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Volume changes are applied. But it will be activated after shutdown"
|
msgid "Volume changes are applied. But it will be activated after shutdown"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:638
|
#: instances/views.py:626
|
||||||
msgid "Volume is changed successfully."
|
msgid "Volume is changed successfully."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:639
|
#: instances/views.py:639
|
||||||
|
=======
|
||||||
|
#: instances/views.py:627
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Edit disk: %(target_dev)s"
|
msgid "Edit disk: %(target_dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:661
|
#: instances/views.py:661
|
||||||
|
=======
|
||||||
|
#: instances/views.py:649
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Delete disk: %(dev)s"
|
msgid "Delete disk: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:677
|
#: instances/views.py:677
|
||||||
|
=======
|
||||||
|
#: instances/views.py:665
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Detach disk: %(dev)s"
|
msgid "Detach disk: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:690
|
#: instances/views.py:690
|
||||||
|
=======
|
||||||
|
#: instances/views.py:678
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Add CD-ROM: %(target)s"
|
msgid "Add CD-ROM: %(target)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:703
|
#: instances/views.py:703
|
||||||
|
=======
|
||||||
|
#: instances/views.py:691
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Detach CD-ROM: %(dev)s"
|
msgid "Detach CD-ROM: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:716
|
#: instances/views.py:716
|
||||||
|
=======
|
||||||
|
#: instances/views.py:704
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Mount media: %(dev)s"
|
msgid "Mount media: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:729
|
#: instances/views.py:729
|
||||||
|
=======
|
||||||
|
#: instances/views.py:717
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Unmount media: %(dev)s"
|
msgid "Unmount media: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:742
|
#: instances/views.py:742
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Create snapshot: %(snap)s"
|
msgid "Create snapshot: %(snap)s"
|
||||||
|
|
@ -2626,26 +2832,49 @@ msgstr ""
|
||||||
#: instances/views.py:753
|
#: instances/views.py:753
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Delete snapshot: %(snap)s"
|
msgid "Delete snapshot: %(snap)s"
|
||||||
|
=======
|
||||||
|
#: instances/views.py:730
|
||||||
|
#, python-format
|
||||||
|
msgid "New snapshot: %(name)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:764
|
#: instances/views.py:741
|
||||||
|
#, python-format
|
||||||
|
msgid "Delete snapshot: %(snap_name)s"
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:752
|
||||||
msgid "Successful revert snapshot: "
|
msgid "Successful revert snapshot: "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:767
|
#: instances/views.py:767
|
||||||
msgid "Revert snapshot: %(snap)"
|
msgid "Revert snapshot: %(snap)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:781
|
#: instances/views.py:781
|
||||||
|
=======
|
||||||
|
#: instances/views.py:755
|
||||||
|
msgid "Revert snapshot"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:769
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "VCPU %(id)s is enabled=%(enabled)s"
|
msgid "VCPU %(id)s is enabled=%(enabled)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:790
|
#: instances/views.py:790
|
||||||
|
=======
|
||||||
|
#: instances/views.py:780
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "VCPU Hot-plug is enabled=%(status)s"
|
msgid "VCPU Hot-plug is enabled=%(status)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:800
|
#: instances/views.py:800
|
||||||
msgid "Set autostart"
|
msgid "Set autostart"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2667,13 +2896,37 @@ msgid "Set boot order"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:847
|
#: 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"
|
msgid "Boot menu changes applied. But it will be activated after shutdown"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:850
|
#: instances/views.py:838
|
||||||
msgid "Boot order changed successfully."
|
msgid "Boot order changed successfully."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:861
|
#: instances/views.py:861
|
||||||
msgid "Change instance XML"
|
msgid "Change instance XML"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2685,16 +2938,30 @@ msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:885
|
#: instances/views.py:885
|
||||||
msgid "Set Video Model: %(model)"
|
msgid "Set Video Model: %(model)"
|
||||||
|
=======
|
||||||
|
#: instances/views.py:849
|
||||||
|
msgid "Edit XML"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:894
|
#: 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
|
||||||
msgid "Change network"
|
msgid "Change network"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:907
|
#: instances/views.py:895
|
||||||
msgid "Network Device Config is changed. Please shutdown instance to activate."
|
msgid "Network Device Config is changed. Please shutdown instance to activate."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:922
|
#: instances/views.py:922
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Add network: %(mac)s"
|
msgid "Add network: %(mac)s"
|
||||||
|
|
@ -2706,79 +2973,145 @@ msgid "Delete Network: %(mac)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:946
|
#: 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
|
#, python-format
|
||||||
msgid "Set Link State: %(state)s"
|
msgid "Set Link State: %(state)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:966 networks/views.py:231
|
#: instances/views.py:966 networks/views.py:231
|
||||||
|
=======
|
||||||
|
#: instances/views.py:952
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(qos_dir)s QoS is set"
|
msgid "%(qos_dir)s QoS is set"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:971
|
#: instances/views.py:971
|
||||||
|
=======
|
||||||
|
#: instances/views.py:956
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"%(qos_dir)s QoS is set. Network XML is changed. Stop and "
|
"%(qos_dir)s QoS is set. Network XML is changed. Stop and "
|
||||||
"start network to activate new config."
|
"start network to activate new config."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:988 networks/views.py:246
|
#: instances/views.py:988 networks/views.py:246
|
||||||
|
=======
|
||||||
|
#: instances/views.py:970
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(qos_dir)s QoS is deleted"
|
msgid "%(qos_dir)s QoS is deleted"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:993
|
#: instances/views.py:993
|
||||||
|
=======
|
||||||
|
#: instances/views.py:974
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"%(qos_dir)s QoS is deleted. Network XML is changed. Stop and "
|
"%(qos_dir)s QoS is deleted. Network XML is changed. Stop and "
|
||||||
"start network to activate new config."
|
"start network to activate new config."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1012
|
#: instances/views.py:1012
|
||||||
msgid "Only one owner is allowed and the one already added"
|
msgid "Only one owner is allowed and the one already added"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1017
|
#: 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
|
#, python-format
|
||||||
msgid "Add owner: %(user)s"
|
msgid "Add owner: %(user)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1028
|
#: instances/views.py:1028
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Delete owner: %(userinstance_id)s "
|
msgid "Delete owner: %(userinstance_id)s "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1060
|
#: instances/views.py:1060
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1006
|
||||||
|
#, python-format
|
||||||
|
msgid "Deleted owner %(userinstance_id)s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:1038
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "User '%(quota_msg)s' quota reached, cannot create '%(clone_name)s'!"
|
msgid "User '%(quota_msg)s' quota reached, cannot create '%(clone_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1066
|
#: instances/views.py:1066
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Instance '%(clone_name)s' already exists!"
|
msgid "Instance '%(clone_name)s' already exists!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1069
|
#: instances/views.py:1069
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1044
|
||||||
|
msgid "Instance 'clone_name' already exists!"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:1047
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Instance name '%(clone_name)s' contains invalid characters!"
|
msgid "Instance name '%(clone_name)s' contains invalid characters!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1072
|
#: instances/views.py:1072
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1050
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Instance MAC '%(clone_mac)s' invalid format!"
|
msgid "Instance MAC '%(clone_mac)s' invalid format!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1082
|
#: instances/views.py:1082
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Create a clone of '%(instance_name)s'"
|
msgid "Create a clone of '%(instance_name)s'"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1121
|
#: instances/views.py:1121
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1060
|
||||||
|
#, python-format
|
||||||
|
msgid "Clone of '%(instance_name)s'"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:1093
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid ""
|
msgid ""
|
||||||
"Error setting console password. You should check that your instance have an "
|
"Error setting console password. You should check that your instance have an "
|
||||||
"graphic device."
|
"graphic device."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1126
|
#: instances/views.py:1126
|
||||||
msgid "Set VNC password"
|
msgid "Set VNC password"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2856,6 +3189,85 @@ msgid "Update Flavor"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1512
|
#: 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"
|
msgid "Flavor Deleted"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3281,6 +3693,7 @@ msgstr ""
|
||||||
msgid "Please enter bridge/dev name"
|
msgid "Please enter bridge/dev name"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: networks/views.py:57
|
#: networks/views.py:57
|
||||||
msgid "For libvirt, the IPv6 network prefix must be /64"
|
msgid "For libvirt, the IPv6 network prefix must be /64"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3305,10 +3718,34 @@ msgid "%(family)s DHCP Range is Changed."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: networks/views.py:210
|
#: 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 ""
|
msgid ""
|
||||||
"Network XML is changed. \\Stop and start network to activate new config."
|
"Network XML is changed. \\Stop and start network to activate new config."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: networks/views.py:215
|
#: networks/views.py:215
|
||||||
msgid "Network XML is changed."
|
msgid "Network XML is changed."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3325,6 +3762,34 @@ msgstr ""
|
||||||
msgid ""
|
msgid ""
|
||||||
"%(qos_dir)s QoS is deleted. Network XML is changed. "
|
"%(qos_dir)s QoS is deleted. Network XML is changed. "
|
||||||
"Stop and start network to activate new config"
|
"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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: nwfilters/templates/add_nwf_rule.html:12
|
#: nwfilters/templates/add_nwf_rule.html:12
|
||||||
|
|
@ -3388,6 +3853,7 @@ msgstr ""
|
||||||
msgid "Hypervisor doesn't have any NWFilters"
|
msgid "Hypervisor doesn't have any NWFilters"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: nwfilters/views.py:44
|
#: nwfilters/views.py:44
|
||||||
msgid "A network filter with this name already exists"
|
msgid "A network filter with this name already exists"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3397,10 +3863,22 @@ msgid "A network filter with this UUID already exists"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: nwfilters/views.py:51
|
#: 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
|
#, python-format
|
||||||
msgid "%(filter)s network filter is created"
|
msgid "%(filter)s network filter is created"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: nwfilters/views.py:60
|
#: nwfilters/views.py:60
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(filter)s network filter is deleted"
|
msgid "%(filter)s network filter is deleted"
|
||||||
|
|
@ -3414,6 +3892,21 @@ msgstr ""
|
||||||
#: nwfilters/views.py:93
|
#: nwfilters/views.py:93
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Cloning NWFilter %(name)s as %(clone)s"
|
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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: secrets/templates/create_secret_block.html:12
|
#: secrets/templates/create_secret_block.html:12
|
||||||
|
|
@ -3621,10 +4114,11 @@ msgstr ""
|
||||||
msgid "Pool name already use"
|
msgid "Pool name already use"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: storages/views.py:44
|
#: storages/views.py:45
|
||||||
msgid "You need create secret for pool"
|
msgid "You need create secret for pool"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: storages/views.py:48
|
#: storages/views.py:48
|
||||||
msgid "You need input all fields for creating ceph pool"
|
msgid "You need input all fields for creating ceph pool"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3655,6 +4149,36 @@ msgstr ""
|
||||||
#: storages/views.py:220
|
#: storages/views.py:220
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Image file %(name)s is created successfully"
|
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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: templates/403.html:3
|
#: templates/403.html:3
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2020-11-05 09:36+0000\n"
|
"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"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
|
@ -293,6 +297,7 @@ msgstr ""
|
||||||
|
|
||||||
#: accounts/utils.py:51
|
#: accounts/utils.py:51
|
||||||
msgid "Please view HTML version of this message."
|
msgid "Please view HTML version of this message."
|
||||||
|
<<<<<<< HEAD
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: accounts/views.py:26
|
#: accounts/views.py:26
|
||||||
|
|
@ -342,6 +347,57 @@ msgid "OTP QR code was emailed to user %(user)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: accounts/views.py:196
|
#: 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"
|
msgid "User email not set, failed to send QR code"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -354,12 +410,20 @@ msgstr ""
|
||||||
msgid "Groups"
|
msgid "Groups"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: admin/forms.py:81
|
#: admin/forms.py:81
|
||||||
msgid ""
|
msgid ""
|
||||||
"Raw passwords are not stored, so there is no way to see this user's "
|
"Raw passwords are not stored, so there is no way to see this user's "
|
||||||
"password, \n"
|
"password, \n"
|
||||||
" but you can change the password using <a href='{}'>this "
|
" but you can change the password using <a href='{}'>this "
|
||||||
"form</a>."
|
"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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: admin/templates/admin/group_list.html:5 admin/views.py:87
|
#: admin/templates/admin/group_list.html:5 admin/views.py:87
|
||||||
|
|
@ -502,10 +566,11 @@ msgstr ""
|
||||||
msgid "Update Group"
|
msgid "Update Group"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: admin/views.py:110
|
#: admin/views.py:113
|
||||||
msgid "Create User"
|
msgid "Create User"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: admin/views.py:129
|
#: admin/views.py:129
|
||||||
msgid "Update User"
|
msgid "Update User"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -516,6 +581,17 @@ msgid "Password changed for %(user)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: admin/views.py:144
|
#: 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"
|
msgid "Wrong Data Provided"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -801,6 +877,7 @@ msgid "Other Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: appsettings/views.py:38
|
#: appsettings/views.py:38
|
||||||
|
<<<<<<< HEAD
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "SASS directory path is changed. Now: %(dir)s"
|
msgid "SASS directory path is changed. Now: %(dir)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -813,6 +890,20 @@ msgstr ""
|
||||||
#: appsettings/views.py:82
|
#: appsettings/views.py:82
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(setting)s is changed. Now: %(value)s"
|
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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: computes/forms.py:21
|
#: computes/forms.py:21
|
||||||
|
|
@ -1700,7 +1791,11 @@ msgstr ""
|
||||||
#: instances/templates/instance_actions.html:25
|
#: instances/templates/instance_actions.html:25
|
||||||
#: instances/templates/instance_actions.html:37
|
#: instances/templates/instance_actions.html:37
|
||||||
#: instances/templates/instances/power_tab.html:25
|
#: 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:270
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:82 instances/views.py:264
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Suspend"
|
msgid "Suspend"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1754,7 +1849,11 @@ msgstr ""
|
||||||
#: instances/templates/instances/destroy_instance_form.html:40
|
#: instances/templates/instances/destroy_instance_form.html:40
|
||||||
#: instances/templates/instances/destroy_tab.html:18
|
#: instances/templates/instances/destroy_tab.html:18
|
||||||
#: instances/templates/instances/destroy_tab.html:20
|
#: 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:312
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/destroy_tab.html:23 instances/views.py:306
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Destroy"
|
msgid "Destroy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1772,20 +1871,32 @@ msgstr ""
|
||||||
#: instances/templates/instance_actions.html:35
|
#: instances/templates/instance_actions.html:35
|
||||||
#: instances/templates/instances/power_tab.html:47
|
#: instances/templates/instances/power_tab.html:47
|
||||||
#: instances/templates/instances/power_tab.html:121
|
#: 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:245
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:123 instances/views.py:239
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Power On"
|
msgid "Power On"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/templates/instance_actions.html:15
|
#: instances/templates/instance_actions.html:15
|
||||||
#: instances/templates/instances/power_tab.html:9
|
#: 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:261
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:59 instances/views.py:255
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Power Off"
|
msgid "Power Off"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/templates/instance_actions.html:16
|
#: instances/templates/instance_actions.html:16
|
||||||
#: instances/templates/instance_actions.html:29
|
#: instances/templates/instance_actions.html:29
|
||||||
#: instances/templates/instances/power_tab.html:14
|
#: 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:254
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:66 instances/views.py:248
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Power Cycle"
|
msgid "Power Cycle"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1797,7 +1908,11 @@ msgstr ""
|
||||||
#: instances/templates/instance_actions.html:22
|
#: instances/templates/instance_actions.html:22
|
||||||
#: instances/templates/instances/power_tab.html:34
|
#: instances/templates/instances/power_tab.html:34
|
||||||
#: instances/templates/instances/power_tab.html:93
|
#: 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:278
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:108 instances/views.py:272
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Resume"
|
msgid "Resume"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1805,7 +1920,11 @@ msgstr ""
|
||||||
#: instances/templates/instances/power_tab.html:19
|
#: instances/templates/instances/power_tab.html:19
|
||||||
#: instances/templates/instances/power_tab.html:39
|
#: instances/templates/instances/power_tab.html:39
|
||||||
#: instances/templates/instances/power_tab.html:74
|
#: 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:285
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:100 instances/views.py:279
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Force Off"
|
msgid "Force Off"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2507,6 +2626,7 @@ msgstr ""
|
||||||
msgid "None available device name"
|
msgid "None available device name"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:242
|
#: instances/views.py:242
|
||||||
msgid "Templates cannot be started."
|
msgid "Templates cannot be started."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2525,28 +2645,61 @@ msgid "Please shutdown down your instance and then try again"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:395
|
#: 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
|
#, python-format
|
||||||
msgid "Installed new SSH public key %(keyname)s"
|
msgid "Installed new SSH public key %(keyname)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:422
|
#: instances/views.py:422
|
||||||
|
=======
|
||||||
|
#: instances/views.py:416
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"User %(quota_msg)s quota reached, cannot resize CPU of '%(instance_name)s'!"
|
"User %(quota_msg)s quota reached, cannot resize CPU of '%(instance_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:431
|
#: instances/views.py:431
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "CPU is resized: %(old)s to %(new)s"
|
msgid "CPU is resized: %(old)s to %(new)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:459
|
#: instances/views.py:459
|
||||||
|
=======
|
||||||
|
#: instances/views.py:425
|
||||||
|
msgid "Resize CPU"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:453
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"User %(quota_msg)s quota reached, cannot resize memory of "
|
"User %(quota_msg)s quota reached, cannot resize memory of "
|
||||||
"'%(instance_name)s'!"
|
"'%(instance_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:466
|
#: instances/views.py:466
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
|
|
@ -2555,11 +2708,19 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:500
|
#: instances/views.py:500
|
||||||
|
=======
|
||||||
|
#: instances/views.py:462
|
||||||
|
msgid "Resize Memory"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:491
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"User %(quota_msg)s quota reached, cannot resize disks of '%(instance_name)s'!"
|
"User %(quota_msg)s quota reached, cannot resize disks of '%(instance_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:507
|
#: instances/views.py:507
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Disk is resized: %(dev)s"
|
msgid "Disk is resized: %(dev)s"
|
||||||
|
|
@ -2571,53 +2732,98 @@ msgid "Attach new disk: %(name)s (%(format)s)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:577
|
#: 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
|
#, python-format
|
||||||
msgid "Attach Existing disk: %(target_dev)s"
|
msgid "Attach Existing disk: %(target_dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:635
|
#: instances/views.py:635
|
||||||
|
=======
|
||||||
|
#: instances/views.py:624
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Volume changes are applied. But it will be activated after shutdown"
|
msgid "Volume changes are applied. But it will be activated after shutdown"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:638
|
#: instances/views.py:626
|
||||||
msgid "Volume is changed successfully."
|
msgid "Volume is changed successfully."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:639
|
#: instances/views.py:639
|
||||||
|
=======
|
||||||
|
#: instances/views.py:627
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Edit disk: %(target_dev)s"
|
msgid "Edit disk: %(target_dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:661
|
#: instances/views.py:661
|
||||||
|
=======
|
||||||
|
#: instances/views.py:649
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Delete disk: %(dev)s"
|
msgid "Delete disk: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:677
|
#: instances/views.py:677
|
||||||
|
=======
|
||||||
|
#: instances/views.py:665
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Detach disk: %(dev)s"
|
msgid "Detach disk: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:690
|
#: instances/views.py:690
|
||||||
|
=======
|
||||||
|
#: instances/views.py:678
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Add CD-ROM: %(target)s"
|
msgid "Add CD-ROM: %(target)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:703
|
#: instances/views.py:703
|
||||||
|
=======
|
||||||
|
#: instances/views.py:691
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Detach CD-ROM: %(dev)s"
|
msgid "Detach CD-ROM: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:716
|
#: instances/views.py:716
|
||||||
|
=======
|
||||||
|
#: instances/views.py:704
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Mount media: %(dev)s"
|
msgid "Mount media: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:729
|
#: instances/views.py:729
|
||||||
|
=======
|
||||||
|
#: instances/views.py:717
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Unmount media: %(dev)s"
|
msgid "Unmount media: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:742
|
#: instances/views.py:742
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Create snapshot: %(snap)s"
|
msgid "Create snapshot: %(snap)s"
|
||||||
|
|
@ -2626,26 +2832,49 @@ msgstr ""
|
||||||
#: instances/views.py:753
|
#: instances/views.py:753
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Delete snapshot: %(snap)s"
|
msgid "Delete snapshot: %(snap)s"
|
||||||
|
=======
|
||||||
|
#: instances/views.py:730
|
||||||
|
#, python-format
|
||||||
|
msgid "New snapshot: %(name)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:764
|
#: instances/views.py:741
|
||||||
|
#, python-format
|
||||||
|
msgid "Delete snapshot: %(snap_name)s"
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:752
|
||||||
msgid "Successful revert snapshot: "
|
msgid "Successful revert snapshot: "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:767
|
#: instances/views.py:767
|
||||||
msgid "Revert snapshot: %(snap)"
|
msgid "Revert snapshot: %(snap)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:781
|
#: instances/views.py:781
|
||||||
|
=======
|
||||||
|
#: instances/views.py:755
|
||||||
|
msgid "Revert snapshot"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:769
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "VCPU %(id)s is enabled=%(enabled)s"
|
msgid "VCPU %(id)s is enabled=%(enabled)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:790
|
#: instances/views.py:790
|
||||||
|
=======
|
||||||
|
#: instances/views.py:780
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "VCPU Hot-plug is enabled=%(status)s"
|
msgid "VCPU Hot-plug is enabled=%(status)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:800
|
#: instances/views.py:800
|
||||||
msgid "Set autostart"
|
msgid "Set autostart"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2667,13 +2896,37 @@ msgid "Set boot order"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:847
|
#: 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"
|
msgid "Boot menu changes applied. But it will be activated after shutdown"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:850
|
#: instances/views.py:838
|
||||||
msgid "Boot order changed successfully."
|
msgid "Boot order changed successfully."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:861
|
#: instances/views.py:861
|
||||||
msgid "Change instance XML"
|
msgid "Change instance XML"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2685,16 +2938,30 @@ msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:885
|
#: instances/views.py:885
|
||||||
msgid "Set Video Model: %(model)"
|
msgid "Set Video Model: %(model)"
|
||||||
|
=======
|
||||||
|
#: instances/views.py:849
|
||||||
|
msgid "Edit XML"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:894
|
#: 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
|
||||||
msgid "Change network"
|
msgid "Change network"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:907
|
#: instances/views.py:895
|
||||||
msgid "Network Device Config is changed. Please shutdown instance to activate."
|
msgid "Network Device Config is changed. Please shutdown instance to activate."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:922
|
#: instances/views.py:922
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Add network: %(mac)s"
|
msgid "Add network: %(mac)s"
|
||||||
|
|
@ -2706,79 +2973,145 @@ msgid "Delete Network: %(mac)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:946
|
#: 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
|
#, python-format
|
||||||
msgid "Set Link State: %(state)s"
|
msgid "Set Link State: %(state)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:966 networks/views.py:231
|
#: instances/views.py:966 networks/views.py:231
|
||||||
|
=======
|
||||||
|
#: instances/views.py:952
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(qos_dir)s QoS is set"
|
msgid "%(qos_dir)s QoS is set"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:971
|
#: instances/views.py:971
|
||||||
|
=======
|
||||||
|
#: instances/views.py:956
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"%(qos_dir)s QoS is set. Network XML is changed. Stop and "
|
"%(qos_dir)s QoS is set. Network XML is changed. Stop and "
|
||||||
"start network to activate new config."
|
"start network to activate new config."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:988 networks/views.py:246
|
#: instances/views.py:988 networks/views.py:246
|
||||||
|
=======
|
||||||
|
#: instances/views.py:970
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(qos_dir)s QoS is deleted"
|
msgid "%(qos_dir)s QoS is deleted"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:993
|
#: instances/views.py:993
|
||||||
|
=======
|
||||||
|
#: instances/views.py:974
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"%(qos_dir)s QoS is deleted. Network XML is changed. Stop and "
|
"%(qos_dir)s QoS is deleted. Network XML is changed. Stop and "
|
||||||
"start network to activate new config."
|
"start network to activate new config."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1012
|
#: instances/views.py:1012
|
||||||
msgid "Only one owner is allowed and the one already added"
|
msgid "Only one owner is allowed and the one already added"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1017
|
#: 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
|
#, python-format
|
||||||
msgid "Add owner: %(user)s"
|
msgid "Add owner: %(user)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1028
|
#: instances/views.py:1028
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Delete owner: %(userinstance_id)s "
|
msgid "Delete owner: %(userinstance_id)s "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1060
|
#: instances/views.py:1060
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1006
|
||||||
|
#, python-format
|
||||||
|
msgid "Deleted owner %(userinstance_id)s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:1038
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "User '%(quota_msg)s' quota reached, cannot create '%(clone_name)s'!"
|
msgid "User '%(quota_msg)s' quota reached, cannot create '%(clone_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1066
|
#: instances/views.py:1066
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Instance '%(clone_name)s' already exists!"
|
msgid "Instance '%(clone_name)s' already exists!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1069
|
#: instances/views.py:1069
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1044
|
||||||
|
msgid "Instance 'clone_name' already exists!"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:1047
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Instance name '%(clone_name)s' contains invalid characters!"
|
msgid "Instance name '%(clone_name)s' contains invalid characters!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1072
|
#: instances/views.py:1072
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1050
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Instance MAC '%(clone_mac)s' invalid format!"
|
msgid "Instance MAC '%(clone_mac)s' invalid format!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1082
|
#: instances/views.py:1082
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Create a clone of '%(instance_name)s'"
|
msgid "Create a clone of '%(instance_name)s'"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1121
|
#: instances/views.py:1121
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1060
|
||||||
|
#, python-format
|
||||||
|
msgid "Clone of '%(instance_name)s'"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:1093
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid ""
|
msgid ""
|
||||||
"Error setting console password. You should check that your instance have an "
|
"Error setting console password. You should check that your instance have an "
|
||||||
"graphic device."
|
"graphic device."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1126
|
#: instances/views.py:1126
|
||||||
msgid "Set VNC password"
|
msgid "Set VNC password"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2856,6 +3189,85 @@ msgid "Update Flavor"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1512
|
#: 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"
|
msgid "Flavor Deleted"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3281,6 +3693,7 @@ msgstr ""
|
||||||
msgid "Please enter bridge/dev name"
|
msgid "Please enter bridge/dev name"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: networks/views.py:57
|
#: networks/views.py:57
|
||||||
msgid "For libvirt, the IPv6 network prefix must be /64"
|
msgid "For libvirt, the IPv6 network prefix must be /64"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3305,10 +3718,34 @@ msgid "%(family)s DHCP Range is Changed."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: networks/views.py:210
|
#: 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 ""
|
msgid ""
|
||||||
"Network XML is changed. \\Stop and start network to activate new config."
|
"Network XML is changed. \\Stop and start network to activate new config."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: networks/views.py:215
|
#: networks/views.py:215
|
||||||
msgid "Network XML is changed."
|
msgid "Network XML is changed."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3325,6 +3762,34 @@ msgstr ""
|
||||||
msgid ""
|
msgid ""
|
||||||
"%(qos_dir)s QoS is deleted. Network XML is changed. "
|
"%(qos_dir)s QoS is deleted. Network XML is changed. "
|
||||||
"Stop and start network to activate new config"
|
"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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: nwfilters/templates/add_nwf_rule.html:12
|
#: nwfilters/templates/add_nwf_rule.html:12
|
||||||
|
|
@ -3388,6 +3853,7 @@ msgstr ""
|
||||||
msgid "Hypervisor doesn't have any NWFilters"
|
msgid "Hypervisor doesn't have any NWFilters"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: nwfilters/views.py:44
|
#: nwfilters/views.py:44
|
||||||
msgid "A network filter with this name already exists"
|
msgid "A network filter with this name already exists"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3397,10 +3863,22 @@ msgid "A network filter with this UUID already exists"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: nwfilters/views.py:51
|
#: 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
|
#, python-format
|
||||||
msgid "%(filter)s network filter is created"
|
msgid "%(filter)s network filter is created"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: nwfilters/views.py:60
|
#: nwfilters/views.py:60
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(filter)s network filter is deleted"
|
msgid "%(filter)s network filter is deleted"
|
||||||
|
|
@ -3414,6 +3892,21 @@ msgstr ""
|
||||||
#: nwfilters/views.py:93
|
#: nwfilters/views.py:93
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Cloning NWFilter %(name)s as %(clone)s"
|
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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: secrets/templates/create_secret_block.html:12
|
#: secrets/templates/create_secret_block.html:12
|
||||||
|
|
@ -3621,10 +4114,11 @@ msgstr ""
|
||||||
msgid "Pool name already use"
|
msgid "Pool name already use"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: storages/views.py:44
|
#: storages/views.py:45
|
||||||
msgid "You need create secret for pool"
|
msgid "You need create secret for pool"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: storages/views.py:48
|
#: storages/views.py:48
|
||||||
msgid "You need input all fields for creating ceph pool"
|
msgid "You need input all fields for creating ceph pool"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3655,6 +4149,36 @@ msgstr ""
|
||||||
#: storages/views.py:220
|
#: storages/views.py:220
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Image file %(name)s is created successfully"
|
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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: templates/403.html:3
|
#: templates/403.html:3
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2020-11-05 09:36+0000\n"
|
"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"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
|
@ -293,6 +297,7 @@ msgstr ""
|
||||||
|
|
||||||
#: accounts/utils.py:51
|
#: accounts/utils.py:51
|
||||||
msgid "Please view HTML version of this message."
|
msgid "Please view HTML version of this message."
|
||||||
|
<<<<<<< HEAD
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: accounts/views.py:26
|
#: accounts/views.py:26
|
||||||
|
|
@ -342,6 +347,57 @@ msgid "OTP QR code was emailed to user %(user)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: accounts/views.py:196
|
#: 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"
|
msgid "User email not set, failed to send QR code"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -354,12 +410,20 @@ msgstr ""
|
||||||
msgid "Groups"
|
msgid "Groups"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: admin/forms.py:81
|
#: admin/forms.py:81
|
||||||
msgid ""
|
msgid ""
|
||||||
"Raw passwords are not stored, so there is no way to see this user's "
|
"Raw passwords are not stored, so there is no way to see this user's "
|
||||||
"password, \n"
|
"password, \n"
|
||||||
" but you can change the password using <a href='{}'>this "
|
" but you can change the password using <a href='{}'>this "
|
||||||
"form</a>."
|
"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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: admin/templates/admin/group_list.html:5 admin/views.py:87
|
#: admin/templates/admin/group_list.html:5 admin/views.py:87
|
||||||
|
|
@ -502,10 +566,11 @@ msgstr ""
|
||||||
msgid "Update Group"
|
msgid "Update Group"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: admin/views.py:110
|
#: admin/views.py:113
|
||||||
msgid "Create User"
|
msgid "Create User"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: admin/views.py:129
|
#: admin/views.py:129
|
||||||
msgid "Update User"
|
msgid "Update User"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -516,6 +581,17 @@ msgid "Password changed for %(user)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: admin/views.py:144
|
#: 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"
|
msgid "Wrong Data Provided"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -801,6 +877,7 @@ msgid "Other Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: appsettings/views.py:38
|
#: appsettings/views.py:38
|
||||||
|
<<<<<<< HEAD
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "SASS directory path is changed. Now: %(dir)s"
|
msgid "SASS directory path is changed. Now: %(dir)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -813,6 +890,20 @@ msgstr ""
|
||||||
#: appsettings/views.py:82
|
#: appsettings/views.py:82
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(setting)s is changed. Now: %(value)s"
|
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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: computes/forms.py:21
|
#: computes/forms.py:21
|
||||||
|
|
@ -1700,7 +1791,11 @@ msgstr ""
|
||||||
#: instances/templates/instance_actions.html:25
|
#: instances/templates/instance_actions.html:25
|
||||||
#: instances/templates/instance_actions.html:37
|
#: instances/templates/instance_actions.html:37
|
||||||
#: instances/templates/instances/power_tab.html:25
|
#: 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:270
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:82 instances/views.py:264
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Suspend"
|
msgid "Suspend"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1754,7 +1849,11 @@ msgstr ""
|
||||||
#: instances/templates/instances/destroy_instance_form.html:40
|
#: instances/templates/instances/destroy_instance_form.html:40
|
||||||
#: instances/templates/instances/destroy_tab.html:18
|
#: instances/templates/instances/destroy_tab.html:18
|
||||||
#: instances/templates/instances/destroy_tab.html:20
|
#: 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:312
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/destroy_tab.html:23 instances/views.py:306
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Destroy"
|
msgid "Destroy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1772,20 +1871,32 @@ msgstr ""
|
||||||
#: instances/templates/instance_actions.html:35
|
#: instances/templates/instance_actions.html:35
|
||||||
#: instances/templates/instances/power_tab.html:47
|
#: instances/templates/instances/power_tab.html:47
|
||||||
#: instances/templates/instances/power_tab.html:121
|
#: 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:245
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:123 instances/views.py:239
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Power On"
|
msgid "Power On"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/templates/instance_actions.html:15
|
#: instances/templates/instance_actions.html:15
|
||||||
#: instances/templates/instances/power_tab.html:9
|
#: 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:261
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:59 instances/views.py:255
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Power Off"
|
msgid "Power Off"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/templates/instance_actions.html:16
|
#: instances/templates/instance_actions.html:16
|
||||||
#: instances/templates/instance_actions.html:29
|
#: instances/templates/instance_actions.html:29
|
||||||
#: instances/templates/instances/power_tab.html:14
|
#: 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:254
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:66 instances/views.py:248
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Power Cycle"
|
msgid "Power Cycle"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1797,7 +1908,11 @@ msgstr ""
|
||||||
#: instances/templates/instance_actions.html:22
|
#: instances/templates/instance_actions.html:22
|
||||||
#: instances/templates/instances/power_tab.html:34
|
#: instances/templates/instances/power_tab.html:34
|
||||||
#: instances/templates/instances/power_tab.html:93
|
#: 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:278
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:108 instances/views.py:272
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Resume"
|
msgid "Resume"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1805,7 +1920,11 @@ msgstr ""
|
||||||
#: instances/templates/instances/power_tab.html:19
|
#: instances/templates/instances/power_tab.html:19
|
||||||
#: instances/templates/instances/power_tab.html:39
|
#: instances/templates/instances/power_tab.html:39
|
||||||
#: instances/templates/instances/power_tab.html:74
|
#: 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:285
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:100 instances/views.py:279
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Force Off"
|
msgid "Force Off"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2507,6 +2626,7 @@ msgstr ""
|
||||||
msgid "None available device name"
|
msgid "None available device name"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:242
|
#: instances/views.py:242
|
||||||
msgid "Templates cannot be started."
|
msgid "Templates cannot be started."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2525,28 +2645,61 @@ msgid "Please shutdown down your instance and then try again"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:395
|
#: 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
|
#, python-format
|
||||||
msgid "Installed new SSH public key %(keyname)s"
|
msgid "Installed new SSH public key %(keyname)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:422
|
#: instances/views.py:422
|
||||||
|
=======
|
||||||
|
#: instances/views.py:416
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"User %(quota_msg)s quota reached, cannot resize CPU of '%(instance_name)s'!"
|
"User %(quota_msg)s quota reached, cannot resize CPU of '%(instance_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:431
|
#: instances/views.py:431
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "CPU is resized: %(old)s to %(new)s"
|
msgid "CPU is resized: %(old)s to %(new)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:459
|
#: instances/views.py:459
|
||||||
|
=======
|
||||||
|
#: instances/views.py:425
|
||||||
|
msgid "Resize CPU"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:453
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"User %(quota_msg)s quota reached, cannot resize memory of "
|
"User %(quota_msg)s quota reached, cannot resize memory of "
|
||||||
"'%(instance_name)s'!"
|
"'%(instance_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:466
|
#: instances/views.py:466
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
|
|
@ -2555,11 +2708,19 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:500
|
#: instances/views.py:500
|
||||||
|
=======
|
||||||
|
#: instances/views.py:462
|
||||||
|
msgid "Resize Memory"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:491
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"User %(quota_msg)s quota reached, cannot resize disks of '%(instance_name)s'!"
|
"User %(quota_msg)s quota reached, cannot resize disks of '%(instance_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:507
|
#: instances/views.py:507
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Disk is resized: %(dev)s"
|
msgid "Disk is resized: %(dev)s"
|
||||||
|
|
@ -2571,53 +2732,98 @@ msgid "Attach new disk: %(name)s (%(format)s)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:577
|
#: 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
|
#, python-format
|
||||||
msgid "Attach Existing disk: %(target_dev)s"
|
msgid "Attach Existing disk: %(target_dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:635
|
#: instances/views.py:635
|
||||||
|
=======
|
||||||
|
#: instances/views.py:624
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Volume changes are applied. But it will be activated after shutdown"
|
msgid "Volume changes are applied. But it will be activated after shutdown"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:638
|
#: instances/views.py:626
|
||||||
msgid "Volume is changed successfully."
|
msgid "Volume is changed successfully."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:639
|
#: instances/views.py:639
|
||||||
|
=======
|
||||||
|
#: instances/views.py:627
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Edit disk: %(target_dev)s"
|
msgid "Edit disk: %(target_dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:661
|
#: instances/views.py:661
|
||||||
|
=======
|
||||||
|
#: instances/views.py:649
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Delete disk: %(dev)s"
|
msgid "Delete disk: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:677
|
#: instances/views.py:677
|
||||||
|
=======
|
||||||
|
#: instances/views.py:665
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Detach disk: %(dev)s"
|
msgid "Detach disk: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:690
|
#: instances/views.py:690
|
||||||
|
=======
|
||||||
|
#: instances/views.py:678
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Add CD-ROM: %(target)s"
|
msgid "Add CD-ROM: %(target)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:703
|
#: instances/views.py:703
|
||||||
|
=======
|
||||||
|
#: instances/views.py:691
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Detach CD-ROM: %(dev)s"
|
msgid "Detach CD-ROM: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:716
|
#: instances/views.py:716
|
||||||
|
=======
|
||||||
|
#: instances/views.py:704
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Mount media: %(dev)s"
|
msgid "Mount media: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:729
|
#: instances/views.py:729
|
||||||
|
=======
|
||||||
|
#: instances/views.py:717
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Unmount media: %(dev)s"
|
msgid "Unmount media: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:742
|
#: instances/views.py:742
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Create snapshot: %(snap)s"
|
msgid "Create snapshot: %(snap)s"
|
||||||
|
|
@ -2626,26 +2832,49 @@ msgstr ""
|
||||||
#: instances/views.py:753
|
#: instances/views.py:753
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Delete snapshot: %(snap)s"
|
msgid "Delete snapshot: %(snap)s"
|
||||||
|
=======
|
||||||
|
#: instances/views.py:730
|
||||||
|
#, python-format
|
||||||
|
msgid "New snapshot: %(name)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:764
|
#: instances/views.py:741
|
||||||
|
#, python-format
|
||||||
|
msgid "Delete snapshot: %(snap_name)s"
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:752
|
||||||
msgid "Successful revert snapshot: "
|
msgid "Successful revert snapshot: "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:767
|
#: instances/views.py:767
|
||||||
msgid "Revert snapshot: %(snap)"
|
msgid "Revert snapshot: %(snap)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:781
|
#: instances/views.py:781
|
||||||
|
=======
|
||||||
|
#: instances/views.py:755
|
||||||
|
msgid "Revert snapshot"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:769
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "VCPU %(id)s is enabled=%(enabled)s"
|
msgid "VCPU %(id)s is enabled=%(enabled)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:790
|
#: instances/views.py:790
|
||||||
|
=======
|
||||||
|
#: instances/views.py:780
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "VCPU Hot-plug is enabled=%(status)s"
|
msgid "VCPU Hot-plug is enabled=%(status)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:800
|
#: instances/views.py:800
|
||||||
msgid "Set autostart"
|
msgid "Set autostart"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2667,13 +2896,37 @@ msgid "Set boot order"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:847
|
#: 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"
|
msgid "Boot menu changes applied. But it will be activated after shutdown"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:850
|
#: instances/views.py:838
|
||||||
msgid "Boot order changed successfully."
|
msgid "Boot order changed successfully."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:861
|
#: instances/views.py:861
|
||||||
msgid "Change instance XML"
|
msgid "Change instance XML"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2685,16 +2938,30 @@ msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:885
|
#: instances/views.py:885
|
||||||
msgid "Set Video Model: %(model)"
|
msgid "Set Video Model: %(model)"
|
||||||
|
=======
|
||||||
|
#: instances/views.py:849
|
||||||
|
msgid "Edit XML"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:894
|
#: 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
|
||||||
msgid "Change network"
|
msgid "Change network"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:907
|
#: instances/views.py:895
|
||||||
msgid "Network Device Config is changed. Please shutdown instance to activate."
|
msgid "Network Device Config is changed. Please shutdown instance to activate."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:922
|
#: instances/views.py:922
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Add network: %(mac)s"
|
msgid "Add network: %(mac)s"
|
||||||
|
|
@ -2706,79 +2973,145 @@ msgid "Delete Network: %(mac)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:946
|
#: 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
|
#, python-format
|
||||||
msgid "Set Link State: %(state)s"
|
msgid "Set Link State: %(state)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:966 networks/views.py:231
|
#: instances/views.py:966 networks/views.py:231
|
||||||
|
=======
|
||||||
|
#: instances/views.py:952
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(qos_dir)s QoS is set"
|
msgid "%(qos_dir)s QoS is set"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:971
|
#: instances/views.py:971
|
||||||
|
=======
|
||||||
|
#: instances/views.py:956
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"%(qos_dir)s QoS is set. Network XML is changed. Stop and "
|
"%(qos_dir)s QoS is set. Network XML is changed. Stop and "
|
||||||
"start network to activate new config."
|
"start network to activate new config."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:988 networks/views.py:246
|
#: instances/views.py:988 networks/views.py:246
|
||||||
|
=======
|
||||||
|
#: instances/views.py:970
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(qos_dir)s QoS is deleted"
|
msgid "%(qos_dir)s QoS is deleted"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:993
|
#: instances/views.py:993
|
||||||
|
=======
|
||||||
|
#: instances/views.py:974
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"%(qos_dir)s QoS is deleted. Network XML is changed. Stop and "
|
"%(qos_dir)s QoS is deleted. Network XML is changed. Stop and "
|
||||||
"start network to activate new config."
|
"start network to activate new config."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1012
|
#: instances/views.py:1012
|
||||||
msgid "Only one owner is allowed and the one already added"
|
msgid "Only one owner is allowed and the one already added"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1017
|
#: 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
|
#, python-format
|
||||||
msgid "Add owner: %(user)s"
|
msgid "Add owner: %(user)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1028
|
#: instances/views.py:1028
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Delete owner: %(userinstance_id)s "
|
msgid "Delete owner: %(userinstance_id)s "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1060
|
#: instances/views.py:1060
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1006
|
||||||
|
#, python-format
|
||||||
|
msgid "Deleted owner %(userinstance_id)s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:1038
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "User '%(quota_msg)s' quota reached, cannot create '%(clone_name)s'!"
|
msgid "User '%(quota_msg)s' quota reached, cannot create '%(clone_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1066
|
#: instances/views.py:1066
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Instance '%(clone_name)s' already exists!"
|
msgid "Instance '%(clone_name)s' already exists!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1069
|
#: instances/views.py:1069
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1044
|
||||||
|
msgid "Instance 'clone_name' already exists!"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:1047
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Instance name '%(clone_name)s' contains invalid characters!"
|
msgid "Instance name '%(clone_name)s' contains invalid characters!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1072
|
#: instances/views.py:1072
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1050
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Instance MAC '%(clone_mac)s' invalid format!"
|
msgid "Instance MAC '%(clone_mac)s' invalid format!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1082
|
#: instances/views.py:1082
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Create a clone of '%(instance_name)s'"
|
msgid "Create a clone of '%(instance_name)s'"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1121
|
#: instances/views.py:1121
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1060
|
||||||
|
#, python-format
|
||||||
|
msgid "Clone of '%(instance_name)s'"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:1093
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid ""
|
msgid ""
|
||||||
"Error setting console password. You should check that your instance have an "
|
"Error setting console password. You should check that your instance have an "
|
||||||
"graphic device."
|
"graphic device."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1126
|
#: instances/views.py:1126
|
||||||
msgid "Set VNC password"
|
msgid "Set VNC password"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2856,6 +3189,85 @@ msgid "Update Flavor"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1512
|
#: 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"
|
msgid "Flavor Deleted"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3281,6 +3693,7 @@ msgstr ""
|
||||||
msgid "Please enter bridge/dev name"
|
msgid "Please enter bridge/dev name"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: networks/views.py:57
|
#: networks/views.py:57
|
||||||
msgid "For libvirt, the IPv6 network prefix must be /64"
|
msgid "For libvirt, the IPv6 network prefix must be /64"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3305,10 +3718,34 @@ msgid "%(family)s DHCP Range is Changed."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: networks/views.py:210
|
#: 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 ""
|
msgid ""
|
||||||
"Network XML is changed. \\Stop and start network to activate new config."
|
"Network XML is changed. \\Stop and start network to activate new config."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: networks/views.py:215
|
#: networks/views.py:215
|
||||||
msgid "Network XML is changed."
|
msgid "Network XML is changed."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3325,6 +3762,34 @@ msgstr ""
|
||||||
msgid ""
|
msgid ""
|
||||||
"%(qos_dir)s QoS is deleted. Network XML is changed. "
|
"%(qos_dir)s QoS is deleted. Network XML is changed. "
|
||||||
"Stop and start network to activate new config"
|
"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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: nwfilters/templates/add_nwf_rule.html:12
|
#: nwfilters/templates/add_nwf_rule.html:12
|
||||||
|
|
@ -3388,6 +3853,7 @@ msgstr ""
|
||||||
msgid "Hypervisor doesn't have any NWFilters"
|
msgid "Hypervisor doesn't have any NWFilters"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: nwfilters/views.py:44
|
#: nwfilters/views.py:44
|
||||||
msgid "A network filter with this name already exists"
|
msgid "A network filter with this name already exists"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3397,10 +3863,22 @@ msgid "A network filter with this UUID already exists"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: nwfilters/views.py:51
|
#: 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
|
#, python-format
|
||||||
msgid "%(filter)s network filter is created"
|
msgid "%(filter)s network filter is created"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: nwfilters/views.py:60
|
#: nwfilters/views.py:60
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(filter)s network filter is deleted"
|
msgid "%(filter)s network filter is deleted"
|
||||||
|
|
@ -3414,6 +3892,21 @@ msgstr ""
|
||||||
#: nwfilters/views.py:93
|
#: nwfilters/views.py:93
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Cloning NWFilter %(name)s as %(clone)s"
|
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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: secrets/templates/create_secret_block.html:12
|
#: secrets/templates/create_secret_block.html:12
|
||||||
|
|
@ -3621,10 +4114,11 @@ msgstr ""
|
||||||
msgid "Pool name already use"
|
msgid "Pool name already use"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: storages/views.py:44
|
#: storages/views.py:45
|
||||||
msgid "You need create secret for pool"
|
msgid "You need create secret for pool"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: storages/views.py:48
|
#: storages/views.py:48
|
||||||
msgid "You need input all fields for creating ceph pool"
|
msgid "You need input all fields for creating ceph pool"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3655,6 +4149,36 @@ msgstr ""
|
||||||
#: storages/views.py:220
|
#: storages/views.py:220
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Image file %(name)s is created successfully"
|
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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: templates/403.html:3
|
#: templates/403.html:3
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2020-11-05 09:36+0000\n"
|
"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"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
|
@ -295,6 +299,7 @@ msgstr ""
|
||||||
|
|
||||||
#: accounts/utils.py:51
|
#: accounts/utils.py:51
|
||||||
msgid "Please view HTML version of this message."
|
msgid "Please view HTML version of this message."
|
||||||
|
<<<<<<< HEAD
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: accounts/views.py:26
|
#: accounts/views.py:26
|
||||||
|
|
@ -344,6 +349,57 @@ msgid "OTP QR code was emailed to user %(user)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: accounts/views.py:196
|
#: 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"
|
msgid "User email not set, failed to send QR code"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -356,12 +412,20 @@ msgstr ""
|
||||||
msgid "Groups"
|
msgid "Groups"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: admin/forms.py:81
|
#: admin/forms.py:81
|
||||||
msgid ""
|
msgid ""
|
||||||
"Raw passwords are not stored, so there is no way to see this user's "
|
"Raw passwords are not stored, so there is no way to see this user's "
|
||||||
"password, \n"
|
"password, \n"
|
||||||
" but you can change the password using <a href='{}'>this "
|
" but you can change the password using <a href='{}'>this "
|
||||||
"form</a>."
|
"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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: admin/templates/admin/group_list.html:5 admin/views.py:87
|
#: admin/templates/admin/group_list.html:5 admin/views.py:87
|
||||||
|
|
@ -504,10 +568,11 @@ msgstr ""
|
||||||
msgid "Update Group"
|
msgid "Update Group"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: admin/views.py:110
|
#: admin/views.py:113
|
||||||
msgid "Create User"
|
msgid "Create User"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: admin/views.py:129
|
#: admin/views.py:129
|
||||||
msgid "Update User"
|
msgid "Update User"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -518,6 +583,17 @@ msgid "Password changed for %(user)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: admin/views.py:144
|
#: 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"
|
msgid "Wrong Data Provided"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -803,6 +879,7 @@ msgid "Other Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: appsettings/views.py:38
|
#: appsettings/views.py:38
|
||||||
|
<<<<<<< HEAD
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "SASS directory path is changed. Now: %(dir)s"
|
msgid "SASS directory path is changed. Now: %(dir)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -815,6 +892,20 @@ msgstr ""
|
||||||
#: appsettings/views.py:82
|
#: appsettings/views.py:82
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(setting)s is changed. Now: %(value)s"
|
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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: computes/forms.py:21
|
#: computes/forms.py:21
|
||||||
|
|
@ -1702,7 +1793,11 @@ msgstr ""
|
||||||
#: instances/templates/instance_actions.html:25
|
#: instances/templates/instance_actions.html:25
|
||||||
#: instances/templates/instance_actions.html:37
|
#: instances/templates/instance_actions.html:37
|
||||||
#: instances/templates/instances/power_tab.html:25
|
#: 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:270
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:82 instances/views.py:264
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Suspend"
|
msgid "Suspend"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1756,7 +1851,11 @@ msgstr ""
|
||||||
#: instances/templates/instances/destroy_instance_form.html:40
|
#: instances/templates/instances/destroy_instance_form.html:40
|
||||||
#: instances/templates/instances/destroy_tab.html:18
|
#: instances/templates/instances/destroy_tab.html:18
|
||||||
#: instances/templates/instances/destroy_tab.html:20
|
#: 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:312
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/destroy_tab.html:23 instances/views.py:306
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Destroy"
|
msgid "Destroy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1774,20 +1873,32 @@ msgstr ""
|
||||||
#: instances/templates/instance_actions.html:35
|
#: instances/templates/instance_actions.html:35
|
||||||
#: instances/templates/instances/power_tab.html:47
|
#: instances/templates/instances/power_tab.html:47
|
||||||
#: instances/templates/instances/power_tab.html:121
|
#: 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:245
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:123 instances/views.py:239
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Power On"
|
msgid "Power On"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/templates/instance_actions.html:15
|
#: instances/templates/instance_actions.html:15
|
||||||
#: instances/templates/instances/power_tab.html:9
|
#: 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:261
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:59 instances/views.py:255
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Power Off"
|
msgid "Power Off"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/templates/instance_actions.html:16
|
#: instances/templates/instance_actions.html:16
|
||||||
#: instances/templates/instance_actions.html:29
|
#: instances/templates/instance_actions.html:29
|
||||||
#: instances/templates/instances/power_tab.html:14
|
#: 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:254
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:66 instances/views.py:248
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Power Cycle"
|
msgid "Power Cycle"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1799,7 +1910,11 @@ msgstr ""
|
||||||
#: instances/templates/instance_actions.html:22
|
#: instances/templates/instance_actions.html:22
|
||||||
#: instances/templates/instances/power_tab.html:34
|
#: instances/templates/instances/power_tab.html:34
|
||||||
#: instances/templates/instances/power_tab.html:93
|
#: 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:278
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:108 instances/views.py:272
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Resume"
|
msgid "Resume"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1807,7 +1922,11 @@ msgstr ""
|
||||||
#: instances/templates/instances/power_tab.html:19
|
#: instances/templates/instances/power_tab.html:19
|
||||||
#: instances/templates/instances/power_tab.html:39
|
#: instances/templates/instances/power_tab.html:39
|
||||||
#: instances/templates/instances/power_tab.html:74
|
#: 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:285
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:100 instances/views.py:279
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Force Off"
|
msgid "Force Off"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2509,6 +2628,7 @@ msgstr ""
|
||||||
msgid "None available device name"
|
msgid "None available device name"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:242
|
#: instances/views.py:242
|
||||||
msgid "Templates cannot be started."
|
msgid "Templates cannot be started."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2527,28 +2647,61 @@ msgid "Please shutdown down your instance and then try again"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:395
|
#: 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
|
#, python-format
|
||||||
msgid "Installed new SSH public key %(keyname)s"
|
msgid "Installed new SSH public key %(keyname)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:422
|
#: instances/views.py:422
|
||||||
|
=======
|
||||||
|
#: instances/views.py:416
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"User %(quota_msg)s quota reached, cannot resize CPU of '%(instance_name)s'!"
|
"User %(quota_msg)s quota reached, cannot resize CPU of '%(instance_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:431
|
#: instances/views.py:431
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "CPU is resized: %(old)s to %(new)s"
|
msgid "CPU is resized: %(old)s to %(new)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:459
|
#: instances/views.py:459
|
||||||
|
=======
|
||||||
|
#: instances/views.py:425
|
||||||
|
msgid "Resize CPU"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:453
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"User %(quota_msg)s quota reached, cannot resize memory of "
|
"User %(quota_msg)s quota reached, cannot resize memory of "
|
||||||
"'%(instance_name)s'!"
|
"'%(instance_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:466
|
#: instances/views.py:466
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
|
|
@ -2557,11 +2710,19 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:500
|
#: instances/views.py:500
|
||||||
|
=======
|
||||||
|
#: instances/views.py:462
|
||||||
|
msgid "Resize Memory"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:491
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"User %(quota_msg)s quota reached, cannot resize disks of '%(instance_name)s'!"
|
"User %(quota_msg)s quota reached, cannot resize disks of '%(instance_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:507
|
#: instances/views.py:507
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Disk is resized: %(dev)s"
|
msgid "Disk is resized: %(dev)s"
|
||||||
|
|
@ -2573,53 +2734,98 @@ msgid "Attach new disk: %(name)s (%(format)s)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:577
|
#: 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
|
#, python-format
|
||||||
msgid "Attach Existing disk: %(target_dev)s"
|
msgid "Attach Existing disk: %(target_dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:635
|
#: instances/views.py:635
|
||||||
|
=======
|
||||||
|
#: instances/views.py:624
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Volume changes are applied. But it will be activated after shutdown"
|
msgid "Volume changes are applied. But it will be activated after shutdown"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:638
|
#: instances/views.py:626
|
||||||
msgid "Volume is changed successfully."
|
msgid "Volume is changed successfully."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:639
|
#: instances/views.py:639
|
||||||
|
=======
|
||||||
|
#: instances/views.py:627
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Edit disk: %(target_dev)s"
|
msgid "Edit disk: %(target_dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:661
|
#: instances/views.py:661
|
||||||
|
=======
|
||||||
|
#: instances/views.py:649
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Delete disk: %(dev)s"
|
msgid "Delete disk: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:677
|
#: instances/views.py:677
|
||||||
|
=======
|
||||||
|
#: instances/views.py:665
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Detach disk: %(dev)s"
|
msgid "Detach disk: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:690
|
#: instances/views.py:690
|
||||||
|
=======
|
||||||
|
#: instances/views.py:678
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Add CD-ROM: %(target)s"
|
msgid "Add CD-ROM: %(target)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:703
|
#: instances/views.py:703
|
||||||
|
=======
|
||||||
|
#: instances/views.py:691
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Detach CD-ROM: %(dev)s"
|
msgid "Detach CD-ROM: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:716
|
#: instances/views.py:716
|
||||||
|
=======
|
||||||
|
#: instances/views.py:704
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Mount media: %(dev)s"
|
msgid "Mount media: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:729
|
#: instances/views.py:729
|
||||||
|
=======
|
||||||
|
#: instances/views.py:717
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Unmount media: %(dev)s"
|
msgid "Unmount media: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:742
|
#: instances/views.py:742
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Create snapshot: %(snap)s"
|
msgid "Create snapshot: %(snap)s"
|
||||||
|
|
@ -2628,26 +2834,49 @@ msgstr ""
|
||||||
#: instances/views.py:753
|
#: instances/views.py:753
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Delete snapshot: %(snap)s"
|
msgid "Delete snapshot: %(snap)s"
|
||||||
|
=======
|
||||||
|
#: instances/views.py:730
|
||||||
|
#, python-format
|
||||||
|
msgid "New snapshot: %(name)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:764
|
#: instances/views.py:741
|
||||||
|
#, python-format
|
||||||
|
msgid "Delete snapshot: %(snap_name)s"
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:752
|
||||||
msgid "Successful revert snapshot: "
|
msgid "Successful revert snapshot: "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:767
|
#: instances/views.py:767
|
||||||
msgid "Revert snapshot: %(snap)"
|
msgid "Revert snapshot: %(snap)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:781
|
#: instances/views.py:781
|
||||||
|
=======
|
||||||
|
#: instances/views.py:755
|
||||||
|
msgid "Revert snapshot"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:769
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "VCPU %(id)s is enabled=%(enabled)s"
|
msgid "VCPU %(id)s is enabled=%(enabled)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:790
|
#: instances/views.py:790
|
||||||
|
=======
|
||||||
|
#: instances/views.py:780
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "VCPU Hot-plug is enabled=%(status)s"
|
msgid "VCPU Hot-plug is enabled=%(status)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:800
|
#: instances/views.py:800
|
||||||
msgid "Set autostart"
|
msgid "Set autostart"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2669,13 +2898,37 @@ msgid "Set boot order"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:847
|
#: 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"
|
msgid "Boot menu changes applied. But it will be activated after shutdown"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:850
|
#: instances/views.py:838
|
||||||
msgid "Boot order changed successfully."
|
msgid "Boot order changed successfully."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:861
|
#: instances/views.py:861
|
||||||
msgid "Change instance XML"
|
msgid "Change instance XML"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2687,16 +2940,30 @@ msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:885
|
#: instances/views.py:885
|
||||||
msgid "Set Video Model: %(model)"
|
msgid "Set Video Model: %(model)"
|
||||||
|
=======
|
||||||
|
#: instances/views.py:849
|
||||||
|
msgid "Edit XML"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:894
|
#: 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
|
||||||
msgid "Change network"
|
msgid "Change network"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:907
|
#: instances/views.py:895
|
||||||
msgid "Network Device Config is changed. Please shutdown instance to activate."
|
msgid "Network Device Config is changed. Please shutdown instance to activate."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:922
|
#: instances/views.py:922
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Add network: %(mac)s"
|
msgid "Add network: %(mac)s"
|
||||||
|
|
@ -2708,79 +2975,145 @@ msgid "Delete Network: %(mac)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:946
|
#: 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
|
#, python-format
|
||||||
msgid "Set Link State: %(state)s"
|
msgid "Set Link State: %(state)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:966 networks/views.py:231
|
#: instances/views.py:966 networks/views.py:231
|
||||||
|
=======
|
||||||
|
#: instances/views.py:952
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(qos_dir)s QoS is set"
|
msgid "%(qos_dir)s QoS is set"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:971
|
#: instances/views.py:971
|
||||||
|
=======
|
||||||
|
#: instances/views.py:956
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"%(qos_dir)s QoS is set. Network XML is changed. Stop and "
|
"%(qos_dir)s QoS is set. Network XML is changed. Stop and "
|
||||||
"start network to activate new config."
|
"start network to activate new config."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:988 networks/views.py:246
|
#: instances/views.py:988 networks/views.py:246
|
||||||
|
=======
|
||||||
|
#: instances/views.py:970
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(qos_dir)s QoS is deleted"
|
msgid "%(qos_dir)s QoS is deleted"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:993
|
#: instances/views.py:993
|
||||||
|
=======
|
||||||
|
#: instances/views.py:974
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"%(qos_dir)s QoS is deleted. Network XML is changed. Stop and "
|
"%(qos_dir)s QoS is deleted. Network XML is changed. Stop and "
|
||||||
"start network to activate new config."
|
"start network to activate new config."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1012
|
#: instances/views.py:1012
|
||||||
msgid "Only one owner is allowed and the one already added"
|
msgid "Only one owner is allowed and the one already added"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1017
|
#: 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
|
#, python-format
|
||||||
msgid "Add owner: %(user)s"
|
msgid "Add owner: %(user)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1028
|
#: instances/views.py:1028
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Delete owner: %(userinstance_id)s "
|
msgid "Delete owner: %(userinstance_id)s "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1060
|
#: instances/views.py:1060
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1006
|
||||||
|
#, python-format
|
||||||
|
msgid "Deleted owner %(userinstance_id)s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:1038
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "User '%(quota_msg)s' quota reached, cannot create '%(clone_name)s'!"
|
msgid "User '%(quota_msg)s' quota reached, cannot create '%(clone_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1066
|
#: instances/views.py:1066
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Instance '%(clone_name)s' already exists!"
|
msgid "Instance '%(clone_name)s' already exists!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1069
|
#: instances/views.py:1069
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1044
|
||||||
|
msgid "Instance 'clone_name' already exists!"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:1047
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Instance name '%(clone_name)s' contains invalid characters!"
|
msgid "Instance name '%(clone_name)s' contains invalid characters!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1072
|
#: instances/views.py:1072
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1050
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Instance MAC '%(clone_mac)s' invalid format!"
|
msgid "Instance MAC '%(clone_mac)s' invalid format!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1082
|
#: instances/views.py:1082
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Create a clone of '%(instance_name)s'"
|
msgid "Create a clone of '%(instance_name)s'"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1121
|
#: instances/views.py:1121
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1060
|
||||||
|
#, python-format
|
||||||
|
msgid "Clone of '%(instance_name)s'"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:1093
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid ""
|
msgid ""
|
||||||
"Error setting console password. You should check that your instance have an "
|
"Error setting console password. You should check that your instance have an "
|
||||||
"graphic device."
|
"graphic device."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1126
|
#: instances/views.py:1126
|
||||||
msgid "Set VNC password"
|
msgid "Set VNC password"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2858,6 +3191,85 @@ msgid "Update Flavor"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1512
|
#: 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"
|
msgid "Flavor Deleted"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3283,6 +3695,7 @@ msgstr ""
|
||||||
msgid "Please enter bridge/dev name"
|
msgid "Please enter bridge/dev name"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: networks/views.py:57
|
#: networks/views.py:57
|
||||||
msgid "For libvirt, the IPv6 network prefix must be /64"
|
msgid "For libvirt, the IPv6 network prefix must be /64"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3307,10 +3720,34 @@ msgid "%(family)s DHCP Range is Changed."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: networks/views.py:210
|
#: 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 ""
|
msgid ""
|
||||||
"Network XML is changed. \\Stop and start network to activate new config."
|
"Network XML is changed. \\Stop and start network to activate new config."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: networks/views.py:215
|
#: networks/views.py:215
|
||||||
msgid "Network XML is changed."
|
msgid "Network XML is changed."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3327,6 +3764,34 @@ msgstr ""
|
||||||
msgid ""
|
msgid ""
|
||||||
"%(qos_dir)s QoS is deleted. Network XML is changed. "
|
"%(qos_dir)s QoS is deleted. Network XML is changed. "
|
||||||
"Stop and start network to activate new config"
|
"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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: nwfilters/templates/add_nwf_rule.html:12
|
#: nwfilters/templates/add_nwf_rule.html:12
|
||||||
|
|
@ -3390,6 +3855,7 @@ msgstr ""
|
||||||
msgid "Hypervisor doesn't have any NWFilters"
|
msgid "Hypervisor doesn't have any NWFilters"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: nwfilters/views.py:44
|
#: nwfilters/views.py:44
|
||||||
msgid "A network filter with this name already exists"
|
msgid "A network filter with this name already exists"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3399,10 +3865,22 @@ msgid "A network filter with this UUID already exists"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: nwfilters/views.py:51
|
#: 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
|
#, python-format
|
||||||
msgid "%(filter)s network filter is created"
|
msgid "%(filter)s network filter is created"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: nwfilters/views.py:60
|
#: nwfilters/views.py:60
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(filter)s network filter is deleted"
|
msgid "%(filter)s network filter is deleted"
|
||||||
|
|
@ -3416,6 +3894,21 @@ msgstr ""
|
||||||
#: nwfilters/views.py:93
|
#: nwfilters/views.py:93
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Cloning NWFilter %(name)s as %(clone)s"
|
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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: secrets/templates/create_secret_block.html:12
|
#: secrets/templates/create_secret_block.html:12
|
||||||
|
|
@ -3623,10 +4116,11 @@ msgstr ""
|
||||||
msgid "Pool name already use"
|
msgid "Pool name already use"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: storages/views.py:44
|
#: storages/views.py:45
|
||||||
msgid "You need create secret for pool"
|
msgid "You need create secret for pool"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: storages/views.py:48
|
#: storages/views.py:48
|
||||||
msgid "You need input all fields for creating ceph pool"
|
msgid "You need input all fields for creating ceph pool"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3657,6 +4151,36 @@ msgstr ""
|
||||||
#: storages/views.py:220
|
#: storages/views.py:220
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Image file %(name)s is created successfully"
|
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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: templates/403.html:3
|
#: templates/403.html:3
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -8,7 +8,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2020-11-05 09:36+0000\n"
|
"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"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
|
@ -296,6 +300,7 @@ msgstr ""
|
||||||
|
|
||||||
#: accounts/utils.py:51
|
#: accounts/utils.py:51
|
||||||
msgid "Please view HTML version of this message."
|
msgid "Please view HTML version of this message."
|
||||||
|
<<<<<<< HEAD
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: accounts/views.py:26
|
#: accounts/views.py:26
|
||||||
|
|
@ -345,6 +350,57 @@ msgid "OTP QR code was emailed to user %(user)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: accounts/views.py:196
|
#: 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"
|
msgid "User email not set, failed to send QR code"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -357,12 +413,20 @@ msgstr ""
|
||||||
msgid "Groups"
|
msgid "Groups"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: admin/forms.py:81
|
#: admin/forms.py:81
|
||||||
msgid ""
|
msgid ""
|
||||||
"Raw passwords are not stored, so there is no way to see this user's "
|
"Raw passwords are not stored, so there is no way to see this user's "
|
||||||
"password, \n"
|
"password, \n"
|
||||||
" but you can change the password using <a href='{}'>this "
|
" but you can change the password using <a href='{}'>this "
|
||||||
"form</a>."
|
"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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: admin/templates/admin/group_list.html:5 admin/views.py:87
|
#: admin/templates/admin/group_list.html:5 admin/views.py:87
|
||||||
|
|
@ -505,10 +569,11 @@ msgstr ""
|
||||||
msgid "Update Group"
|
msgid "Update Group"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: admin/views.py:110
|
#: admin/views.py:113
|
||||||
msgid "Create User"
|
msgid "Create User"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: admin/views.py:129
|
#: admin/views.py:129
|
||||||
msgid "Update User"
|
msgid "Update User"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -519,6 +584,17 @@ msgid "Password changed for %(user)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: admin/views.py:144
|
#: 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"
|
msgid "Wrong Data Provided"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -804,6 +880,7 @@ msgid "Other Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: appsettings/views.py:38
|
#: appsettings/views.py:38
|
||||||
|
<<<<<<< HEAD
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "SASS directory path is changed. Now: %(dir)s"
|
msgid "SASS directory path is changed. Now: %(dir)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -816,6 +893,20 @@ msgstr ""
|
||||||
#: appsettings/views.py:82
|
#: appsettings/views.py:82
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(setting)s is changed. Now: %(value)s"
|
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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: computes/forms.py:21
|
#: computes/forms.py:21
|
||||||
|
|
@ -1703,7 +1794,11 @@ msgstr ""
|
||||||
#: instances/templates/instance_actions.html:25
|
#: instances/templates/instance_actions.html:25
|
||||||
#: instances/templates/instance_actions.html:37
|
#: instances/templates/instance_actions.html:37
|
||||||
#: instances/templates/instances/power_tab.html:25
|
#: 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:270
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:82 instances/views.py:264
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Suspend"
|
msgid "Suspend"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1757,7 +1852,11 @@ msgstr ""
|
||||||
#: instances/templates/instances/destroy_instance_form.html:40
|
#: instances/templates/instances/destroy_instance_form.html:40
|
||||||
#: instances/templates/instances/destroy_tab.html:18
|
#: instances/templates/instances/destroy_tab.html:18
|
||||||
#: instances/templates/instances/destroy_tab.html:20
|
#: 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:312
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/destroy_tab.html:23 instances/views.py:306
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Destroy"
|
msgid "Destroy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1775,20 +1874,32 @@ msgstr ""
|
||||||
#: instances/templates/instance_actions.html:35
|
#: instances/templates/instance_actions.html:35
|
||||||
#: instances/templates/instances/power_tab.html:47
|
#: instances/templates/instances/power_tab.html:47
|
||||||
#: instances/templates/instances/power_tab.html:121
|
#: 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:245
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:123 instances/views.py:239
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Power On"
|
msgid "Power On"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/templates/instance_actions.html:15
|
#: instances/templates/instance_actions.html:15
|
||||||
#: instances/templates/instances/power_tab.html:9
|
#: 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:261
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:59 instances/views.py:255
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Power Off"
|
msgid "Power Off"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/templates/instance_actions.html:16
|
#: instances/templates/instance_actions.html:16
|
||||||
#: instances/templates/instance_actions.html:29
|
#: instances/templates/instance_actions.html:29
|
||||||
#: instances/templates/instances/power_tab.html:14
|
#: 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:254
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:66 instances/views.py:248
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Power Cycle"
|
msgid "Power Cycle"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1800,7 +1911,11 @@ msgstr ""
|
||||||
#: instances/templates/instance_actions.html:22
|
#: instances/templates/instance_actions.html:22
|
||||||
#: instances/templates/instances/power_tab.html:34
|
#: instances/templates/instances/power_tab.html:34
|
||||||
#: instances/templates/instances/power_tab.html:93
|
#: 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:278
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:108 instances/views.py:272
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Resume"
|
msgid "Resume"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1808,7 +1923,11 @@ msgstr ""
|
||||||
#: instances/templates/instances/power_tab.html:19
|
#: instances/templates/instances/power_tab.html:19
|
||||||
#: instances/templates/instances/power_tab.html:39
|
#: instances/templates/instances/power_tab.html:39
|
||||||
#: instances/templates/instances/power_tab.html:74
|
#: 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:285
|
||||||
|
=======
|
||||||
|
#: instances/templates/instances/power_tab.html:100 instances/views.py:279
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Force Off"
|
msgid "Force Off"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2510,6 +2629,7 @@ msgstr ""
|
||||||
msgid "None available device name"
|
msgid "None available device name"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:242
|
#: instances/views.py:242
|
||||||
msgid "Templates cannot be started."
|
msgid "Templates cannot be started."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2528,28 +2648,61 @@ msgid "Please shutdown down your instance and then try again"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:395
|
#: 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
|
#, python-format
|
||||||
msgid "Installed new SSH public key %(keyname)s"
|
msgid "Installed new SSH public key %(keyname)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:422
|
#: instances/views.py:422
|
||||||
|
=======
|
||||||
|
#: instances/views.py:416
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"User %(quota_msg)s quota reached, cannot resize CPU of '%(instance_name)s'!"
|
"User %(quota_msg)s quota reached, cannot resize CPU of '%(instance_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:431
|
#: instances/views.py:431
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "CPU is resized: %(old)s to %(new)s"
|
msgid "CPU is resized: %(old)s to %(new)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:459
|
#: instances/views.py:459
|
||||||
|
=======
|
||||||
|
#: instances/views.py:425
|
||||||
|
msgid "Resize CPU"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:453
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"User %(quota_msg)s quota reached, cannot resize memory of "
|
"User %(quota_msg)s quota reached, cannot resize memory of "
|
||||||
"'%(instance_name)s'!"
|
"'%(instance_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:466
|
#: instances/views.py:466
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
|
|
@ -2558,11 +2711,19 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:500
|
#: instances/views.py:500
|
||||||
|
=======
|
||||||
|
#: instances/views.py:462
|
||||||
|
msgid "Resize Memory"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:491
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"User %(quota_msg)s quota reached, cannot resize disks of '%(instance_name)s'!"
|
"User %(quota_msg)s quota reached, cannot resize disks of '%(instance_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:507
|
#: instances/views.py:507
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Disk is resized: %(dev)s"
|
msgid "Disk is resized: %(dev)s"
|
||||||
|
|
@ -2574,53 +2735,98 @@ msgid "Attach new disk: %(name)s (%(format)s)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:577
|
#: 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
|
#, python-format
|
||||||
msgid "Attach Existing disk: %(target_dev)s"
|
msgid "Attach Existing disk: %(target_dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:635
|
#: instances/views.py:635
|
||||||
|
=======
|
||||||
|
#: instances/views.py:624
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid "Volume changes are applied. But it will be activated after shutdown"
|
msgid "Volume changes are applied. But it will be activated after shutdown"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:638
|
#: instances/views.py:626
|
||||||
msgid "Volume is changed successfully."
|
msgid "Volume is changed successfully."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:639
|
#: instances/views.py:639
|
||||||
|
=======
|
||||||
|
#: instances/views.py:627
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Edit disk: %(target_dev)s"
|
msgid "Edit disk: %(target_dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:661
|
#: instances/views.py:661
|
||||||
|
=======
|
||||||
|
#: instances/views.py:649
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Delete disk: %(dev)s"
|
msgid "Delete disk: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:677
|
#: instances/views.py:677
|
||||||
|
=======
|
||||||
|
#: instances/views.py:665
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Detach disk: %(dev)s"
|
msgid "Detach disk: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:690
|
#: instances/views.py:690
|
||||||
|
=======
|
||||||
|
#: instances/views.py:678
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Add CD-ROM: %(target)s"
|
msgid "Add CD-ROM: %(target)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:703
|
#: instances/views.py:703
|
||||||
|
=======
|
||||||
|
#: instances/views.py:691
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Detach CD-ROM: %(dev)s"
|
msgid "Detach CD-ROM: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:716
|
#: instances/views.py:716
|
||||||
|
=======
|
||||||
|
#: instances/views.py:704
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Mount media: %(dev)s"
|
msgid "Mount media: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:729
|
#: instances/views.py:729
|
||||||
|
=======
|
||||||
|
#: instances/views.py:717
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Unmount media: %(dev)s"
|
msgid "Unmount media: %(dev)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:742
|
#: instances/views.py:742
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Create snapshot: %(snap)s"
|
msgid "Create snapshot: %(snap)s"
|
||||||
|
|
@ -2629,26 +2835,49 @@ msgstr ""
|
||||||
#: instances/views.py:753
|
#: instances/views.py:753
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Delete snapshot: %(snap)s"
|
msgid "Delete snapshot: %(snap)s"
|
||||||
|
=======
|
||||||
|
#: instances/views.py:730
|
||||||
|
#, python-format
|
||||||
|
msgid "New snapshot: %(name)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:764
|
#: instances/views.py:741
|
||||||
|
#, python-format
|
||||||
|
msgid "Delete snapshot: %(snap_name)s"
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:752
|
||||||
msgid "Successful revert snapshot: "
|
msgid "Successful revert snapshot: "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:767
|
#: instances/views.py:767
|
||||||
msgid "Revert snapshot: %(snap)"
|
msgid "Revert snapshot: %(snap)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:781
|
#: instances/views.py:781
|
||||||
|
=======
|
||||||
|
#: instances/views.py:755
|
||||||
|
msgid "Revert snapshot"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:769
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "VCPU %(id)s is enabled=%(enabled)s"
|
msgid "VCPU %(id)s is enabled=%(enabled)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:790
|
#: instances/views.py:790
|
||||||
|
=======
|
||||||
|
#: instances/views.py:780
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "VCPU Hot-plug is enabled=%(status)s"
|
msgid "VCPU Hot-plug is enabled=%(status)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:800
|
#: instances/views.py:800
|
||||||
msgid "Set autostart"
|
msgid "Set autostart"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2670,13 +2899,37 @@ msgid "Set boot order"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:847
|
#: 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"
|
msgid "Boot menu changes applied. But it will be activated after shutdown"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:850
|
#: instances/views.py:838
|
||||||
msgid "Boot order changed successfully."
|
msgid "Boot order changed successfully."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:861
|
#: instances/views.py:861
|
||||||
msgid "Change instance XML"
|
msgid "Change instance XML"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2688,16 +2941,30 @@ msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:885
|
#: instances/views.py:885
|
||||||
msgid "Set Video Model: %(model)"
|
msgid "Set Video Model: %(model)"
|
||||||
|
=======
|
||||||
|
#: instances/views.py:849
|
||||||
|
msgid "Edit XML"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:894
|
#: 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
|
||||||
msgid "Change network"
|
msgid "Change network"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:907
|
#: instances/views.py:895
|
||||||
msgid "Network Device Config is changed. Please shutdown instance to activate."
|
msgid "Network Device Config is changed. Please shutdown instance to activate."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:922
|
#: instances/views.py:922
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Add network: %(mac)s"
|
msgid "Add network: %(mac)s"
|
||||||
|
|
@ -2709,79 +2976,145 @@ msgid "Delete Network: %(mac)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:946
|
#: 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
|
#, python-format
|
||||||
msgid "Set Link State: %(state)s"
|
msgid "Set Link State: %(state)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:966 networks/views.py:231
|
#: instances/views.py:966 networks/views.py:231
|
||||||
|
=======
|
||||||
|
#: instances/views.py:952
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(qos_dir)s QoS is set"
|
msgid "%(qos_dir)s QoS is set"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:971
|
#: instances/views.py:971
|
||||||
|
=======
|
||||||
|
#: instances/views.py:956
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"%(qos_dir)s QoS is set. Network XML is changed. Stop and "
|
"%(qos_dir)s QoS is set. Network XML is changed. Stop and "
|
||||||
"start network to activate new config."
|
"start network to activate new config."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:988 networks/views.py:246
|
#: instances/views.py:988 networks/views.py:246
|
||||||
|
=======
|
||||||
|
#: instances/views.py:970
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(qos_dir)s QoS is deleted"
|
msgid "%(qos_dir)s QoS is deleted"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:993
|
#: instances/views.py:993
|
||||||
|
=======
|
||||||
|
#: instances/views.py:974
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"%(qos_dir)s QoS is deleted. Network XML is changed. Stop and "
|
"%(qos_dir)s QoS is deleted. Network XML is changed. Stop and "
|
||||||
"start network to activate new config."
|
"start network to activate new config."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1012
|
#: instances/views.py:1012
|
||||||
msgid "Only one owner is allowed and the one already added"
|
msgid "Only one owner is allowed and the one already added"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1017
|
#: 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
|
#, python-format
|
||||||
msgid "Add owner: %(user)s"
|
msgid "Add owner: %(user)s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1028
|
#: instances/views.py:1028
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Delete owner: %(userinstance_id)s "
|
msgid "Delete owner: %(userinstance_id)s "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1060
|
#: instances/views.py:1060
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1006
|
||||||
|
#, python-format
|
||||||
|
msgid "Deleted owner %(userinstance_id)s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:1038
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "User '%(quota_msg)s' quota reached, cannot create '%(clone_name)s'!"
|
msgid "User '%(quota_msg)s' quota reached, cannot create '%(clone_name)s'!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1066
|
#: instances/views.py:1066
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Instance '%(clone_name)s' already exists!"
|
msgid "Instance '%(clone_name)s' already exists!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1069
|
#: instances/views.py:1069
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1044
|
||||||
|
msgid "Instance 'clone_name' already exists!"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:1047
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Instance name '%(clone_name)s' contains invalid characters!"
|
msgid "Instance name '%(clone_name)s' contains invalid characters!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1072
|
#: instances/views.py:1072
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1050
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Instance MAC '%(clone_mac)s' invalid format!"
|
msgid "Instance MAC '%(clone_mac)s' invalid format!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1082
|
#: instances/views.py:1082
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Create a clone of '%(instance_name)s'"
|
msgid "Create a clone of '%(instance_name)s'"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1121
|
#: instances/views.py:1121
|
||||||
|
=======
|
||||||
|
#: instances/views.py:1060
|
||||||
|
#, python-format
|
||||||
|
msgid "Clone of '%(instance_name)s'"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: instances/views.py:1093
|
||||||
|
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
|
||||||
msgid ""
|
msgid ""
|
||||||
"Error setting console password. You should check that your instance have an "
|
"Error setting console password. You should check that your instance have an "
|
||||||
"graphic device."
|
"graphic device."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: instances/views.py:1126
|
#: instances/views.py:1126
|
||||||
msgid "Set VNC password"
|
msgid "Set VNC password"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2859,6 +3192,85 @@ msgid "Update Flavor"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: instances/views.py:1512
|
#: 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"
|
msgid "Flavor Deleted"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3284,6 +3696,7 @@ msgstr ""
|
||||||
msgid "Please enter bridge/dev name"
|
msgid "Please enter bridge/dev name"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: networks/views.py:57
|
#: networks/views.py:57
|
||||||
msgid "For libvirt, the IPv6 network prefix must be /64"
|
msgid "For libvirt, the IPv6 network prefix must be /64"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3308,10 +3721,34 @@ msgid "%(family)s DHCP Range is Changed."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: networks/views.py:210
|
#: 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 ""
|
msgid ""
|
||||||
"Network XML is changed. \\Stop and start network to activate new config."
|
"Network XML is changed. \\Stop and start network to activate new config."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: networks/views.py:215
|
#: networks/views.py:215
|
||||||
msgid "Network XML is changed."
|
msgid "Network XML is changed."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3328,6 +3765,34 @@ msgstr ""
|
||||||
msgid ""
|
msgid ""
|
||||||
"%(qos_dir)s QoS is deleted. Network XML is changed. "
|
"%(qos_dir)s QoS is deleted. Network XML is changed. "
|
||||||
"Stop and start network to activate new config"
|
"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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: nwfilters/templates/add_nwf_rule.html:12
|
#: nwfilters/templates/add_nwf_rule.html:12
|
||||||
|
|
@ -3391,6 +3856,7 @@ msgstr ""
|
||||||
msgid "Hypervisor doesn't have any NWFilters"
|
msgid "Hypervisor doesn't have any NWFilters"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: nwfilters/views.py:44
|
#: nwfilters/views.py:44
|
||||||
msgid "A network filter with this name already exists"
|
msgid "A network filter with this name already exists"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3400,10 +3866,22 @@ msgid "A network filter with this UUID already exists"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: nwfilters/views.py:51
|
#: 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
|
#, python-format
|
||||||
msgid "%(filter)s network filter is created"
|
msgid "%(filter)s network filter is created"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: nwfilters/views.py:60
|
#: nwfilters/views.py:60
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "%(filter)s network filter is deleted"
|
msgid "%(filter)s network filter is deleted"
|
||||||
|
|
@ -3417,6 +3895,21 @@ msgstr ""
|
||||||
#: nwfilters/views.py:93
|
#: nwfilters/views.py:93
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Cloning NWFilter %(name)s as %(clone)s"
|
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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: secrets/templates/create_secret_block.html:12
|
#: secrets/templates/create_secret_block.html:12
|
||||||
|
|
@ -3624,10 +4117,11 @@ msgstr ""
|
||||||
msgid "Pool name already use"
|
msgid "Pool name already use"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: storages/views.py:44
|
#: storages/views.py:45
|
||||||
msgid "You need create secret for pool"
|
msgid "You need create secret for pool"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: storages/views.py:48
|
#: storages/views.py:48
|
||||||
msgid "You need input all fields for creating ceph pool"
|
msgid "You need input all fields for creating ceph pool"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3658,6 +4152,36 @@ msgstr ""
|
||||||
#: storages/views.py:220
|
#: storages/views.py:220
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Image file %(name)s is created successfully"
|
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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: templates/403.html:3
|
#: templates/403.html:3
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue