Skip to content

Commit b78ed84

Browse files
committed
json 충돌
1 parent 17eec64 commit b78ed84

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

ui/public/locales/en.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4878,6 +4878,15 @@
48784878
"label.hardware.storage.enclosurelist": "Enclosures",
48794879
"label.switches": "Switches",
48804880
"message.redfishdata.loading": "Query may take some time.",
4881+
"message.migrate.instance.to.host.extraconfig" : "<br>(The virtual machine is using host devices (ExtraConfig) and live migration may fail. Do you want to proceed anyway?)",
4882+
"label.migrationip": "Live Migration IP Address",
4883+
"label.retentionperiod": "Retention Period",
4884+
"label.week": "Week",
4885+
"label.month": "Month",
4886+
"label.years": "Years",
4887+
"label.infinite": "Infinite",
4888+
"label.update.backupoffering": "Update Backup Offering",
4889+
"message.error.import.backup.offering": "For Commvuault backups, only one backup offering can be imported, and the backup offering already exists.",
48814890
"Message.Success.Remove.alloc": "Deallocation of device completed",
48824891
"message.error.remove.alloc": "Unassigning device failed",
48834892
"message.delete.device.alloc": "Unassigning devices in virtual machines",

ui/public/locales/ko_KR.json

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4642,11 +4642,11 @@
46424642
"label.gule.images": "Glue \uc774\ubbf8\uc9c0",
46434643
"label.clonetype": "\ubcf5\uc81c \uc720\ud615",
46444644
"message.clone.vm": "Full \uc720\ud615\uc740 \ud504\ub85c\uc138\uc2a4 \ubc31\uadf8\ub77c\uc6b4\ub4dc\uc5d0\uc11c \uc774\ubbf8\uc9c0 \ubcd1\ud569 \uc791\uc5c5(flatten)\uc774 \uc9c4\ud589\ub418\uba70<br>Linked \uc720\ud615\uc740 \uc774\ubbf8\uc9c0 \ubcd1\ud569 \uc791\uc5c5\uc744 \uc9c4\ud589\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.",
4645-
"label.create.host.devices": "\ud638\uc2a4\ud2b8 \uc7a5\uce58 \ud560\ub2f9",
4645+
"label.create.host.devices": "\ud638\uc2a4\ud2b8 \ub514\ubc14\uc774\uc2a4 \uc774\uad00",
46464646
"message.restart.vm.host.update.settings": "\uac00\uc0c1\uba38\uc2e0\uc744 \uc7ac\ubd80\ud305 \ud574\uc57c \uc801\uc6a9\ub429\ub2c8\ub2e4.",
46474647
"message.success.update.vm": "\ud638\uc2a4\ud2b8 \ub514\ubc14\uc774\uc2a4\uac00 \uc801\uc6a9\ub418\uc5c8\uc2b5\ub2c8\ub2e4.",
46484648
"label.select.vm": "\uac00\uc0c1\uba38\uc2e0\ub97c \uc120\ud0dd\ud574\uc8fc\uc138\uc694.",
4649-
"label.listhostdevices": "\uc7a5\uce58",
4649+
"label.listhostdevices": "\ub514\ubc14\uc774\uc2a4",
46504650
"message.warning.host.devices": "\uac00\uc0c1\uba38\uc2e0\uc744 \uc644\uc804\ud788 \uc815\uc9c0 \ud6c4 \uc2dc\uc791\ud558\uc154\uc57c \uc801\uc6a9\uc774 \ub429\ub2c8\ub2e4. (\uae00\ub85c\ubc8c \uc124\uc815\uc5d0\uc11c enable.additional.vm.configuratio\ub97c true\ub85c \uc124\uc815\ud574\uc57c\ud569\ub2c8\ub2e4.)",
46514651
"label.recent.events": "\ucd5c\uadfc \uc774\ubca4\ud2b8",
46524652
"dr.create": "DR.\uc0dd\uc131",
@@ -4778,7 +4778,7 @@
47784778
"message.success.remove.allocation": "\ub514\ubc14\uc774\uc2a4 \ud560\ub2f9 \ud574\uc81c\uac00 \uc644\ub8cc\ub418\uc5c8\uc2b5\ub2c8\ub2e4.",
47794779
"message.error.remove.allocation": "\ub514\ubc14\uc774\uc2a4 \ud560\ub2f9 \ud574\uc81c\uc5d0 \uc2e4\ud328\ud558\uc600\uc2b5\ub2c8\ub2e4.",
47804780
"message.success.allocate.device": "\ub514\ubc14\uc774\uc2a4 \ud560\ub2f9 \uc644\ub8cc",
4781-
"message.confirm.delete.device": "\uac00\uc0c1\uba38\uc2e0\uc758 \ud560\ub2f9\uc744 \ud574\uc81c\ud569\ub2c8\ub2e4.",
4781+
"message.confirm.delete.device": "\uac00\uc0c1\uba38\uc2e0\uc744 \uc815\uc9c0 \ud55c \ud6c4\uc5d0 \ud560\ub2f9\uc744 \ud574\uc81c\ud574\uc8fc\uc138\uc694.",
47824782
"state.up" :"\uc2e4\ud589 \uc911",
47834783
"state.down" :"\uc911\uc9c0 \ub428",
47844784
"state.maintenance" :"\uc720\uc9c0\ubcf4\uc218 \ubaa8\ub4dc",
@@ -4878,6 +4878,15 @@
48784878
"label.hardware.storage.enclosurelist": "\uc778\ud074\ub85c\uc800",
48794879
"label.switches": "\uc2a4\uc704\uce58",
48804880
"message.redfishdata.loading": "\uc870\ud68c\uc5d0 \uc2dc\uac04\uc774 \uc18c\uc694\ub420 \uc218 \uc788\uc2b5\ub2c8\ub2e4.",
4881+
"message.migrate.instance.to.host.extraconfig" : "<br>(\ud574\ub2f9 \uac00\uc0c1\uba38\uc2e0\uc5d0 \ud638\uc2a4\ud2b8 \uc7a5\uce58\ub97c \uc0ac\uc6a9(ExtraConfig)\ud558\uace0 \uc788\uc73c\uba70 \ub77c\uc774\ube0c \ub9c8\uc774\uadf8\ub808\uc774\uc158\uc774 \uc2e4\ud328\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. \uadf8\ub798\ub3c4 \uc9c4\ud589\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?)",
4882+
"label.migrationip": "\ub77c\uc774\ube0c \ub9c8\uc774\uadf8\ub808\uc774\uc158 \uc804\uc6a9 IP \uc8fc\uc18c",
4883+
"label.retentionperiod": "\ubcf4\uc874 \uae30\uac04",
4884+
"label.week": "\uc8fc",
4885+
"label.month": "\uc6d4",
4886+
"label.years": "\ub144",
4887+
"label.infinite": "\ubb34\ud55c",
4888+
"label.update.backupoffering": "\ubc31\uc5c5 \uc624\ud37c\ub9c1 \ud3b8\uc9d1",
4889+
"message.error.import.backup.offering": "Commvuault \ubc31\uc5c5\uc758 \uacbd\uc6b0 \ud558\ub098\uc758 \ubc31\uc5c5 \uc624\ud37c\ub9c1\ub9cc \uac00\uc838\uc62c \uc218 \uc788\uc73c\uba70 \ubc31\uc5c5 \uc624\ud37c\ub9c1\uc774 \uc774\ubbf8 \uc874\uc7ac\ud569\ub2c8\ub2e4.",
48814890
"label.hba.devices": "HBA \uc7a5\uce58",
48824891
"label.create.vhba": "vHBA \uc0dd\uc131",
48834892
"message.confirm.create.vhba": "vHBA\ub97c \uc0dd\uc131\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",

0 commit comments

Comments
 (0)