Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ui/public/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1232,6 +1232,7 @@
"label.fwdeviceid": "ID",
"label.fwdevicestate": "Status",
"label.gateway": "Gateway",
"label.generate.new.mac.if.in.use": "Generate new MAC address if already in use",
"label.global": "Global",
"label.global.settings": "Global Settings",
"label.globo.dns": "GloboDNS",
Expand Down Expand Up @@ -3846,6 +3847,7 @@
"message.failed.to.remove": "Failed to remove",
"message.forgot.password.success": "An email has been sent to your email address with instructions on how to reset your password.",
"message.generate.keys": "Please confirm that you would like to generate new API/Secret keys for this User.",
"message.generate.new.mac.if.in.use": "If a NIC's MAC address is already used by another NIC on the selected network, CloudStack assigns a new MAC address to the imported NIC and the import continues. When this is off, the import fails instead. Guest network settings or licenses tied to the old MAC address may stop working.",
"message.global.setting.updated": "Global Setting updated successfully.",
"message.global.setting.update.failed": "Failed to update Global Setting.",
"message.chart.statistic.info": "The shown charts are self-adjustable, that means, if the value gets close to the limit or overpass it, it will grow to adjust the shown value",
Expand Down
10 changes: 5 additions & 5 deletions ui/src/views/tools/ImportUnmanagedInstance.vue
Original file line number Diff line number Diff line change
Expand Up @@ -365,8 +365,8 @@
<a-form-item name="forced" ref="forced">
<template #label>
<tooltip-label
:title="$t('label.allow.duplicate.macaddresses')"
:tooltip="apiParams.forced.description"/>
:title="$t('label.generate.new.mac.if.in.use')"
:tooltip="$t('message.generate.new.mac.if.in.use')"/>
</template>
<a-switch v-model:checked="form.forced" @change="val => { switches.forced = val }" />
</a-form-item>
Expand Down Expand Up @@ -422,12 +422,12 @@
<a-switch v-model:checked="form.migrateallowed" @change="val => { switches.migrateAllowed = val }" />
</a-form-item>
</a-col>
<a-col>
<a-col v-if="!isExternalImport && !isDiskImport">
<a-form-item name="forced" ref="forced">
<template #label>
<tooltip-label
:title="$t('label.forced')"
:tooltip="apiParams.forced.description"/>
:title="$t('label.generate.new.mac.if.in.use')"
:tooltip="$t('message.generate.new.mac.if.in.use')"/>
</template>
<a-switch v-model:checked="form.forced" @change="val => { switches.forced = val }" />
</a-form-item>
Expand Down
Loading