Merge "Remove the unused i18n fields. Issue-id:GSO-10" into sun

3 files changed, 1 insertions, 429 deletions

diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties b/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties
index 798c0fc8..3de07cbd 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties
@@ -145,219 +145,5 @@ nfv-topology-iui-vnf-tip=Click to view the nested topology
 nfv-topology-iui-btn-return-tip=Return

 nfv-topology-iui-message-error=Query Topology Information failed.

 

-//virtual application table colums

-nfv-virtualApplication-iui-title=Lifecycle

-nfv-virtualApplication-iui-field-name=Name

-nfv-virtualApplication-iui-field-template=Template

-nfv-virtualApplication-iui-field-createDate=Create Time

-nfv-virtualApplication-iui-field-status=Status

-nfv-virtualApplication-iui-field-updateDate=Update Time

-nfv-virtualApplication-iui-field-action=Action

-nfv-virtualApplication-iui-field-operation=Operation

-

-nfv-virtualApplication-iui-scale-field-type=Type

-nfv-virtualApplication-iui-scale-field-num=Number

-nfv-virtualApplication-iui-scale-field-name=Name

-nfv-virtualApplication-iui-scale-field-operation=Operation

-

-nfv-virtualApplication-iui-operation-init=init

-nfv-virtualApplication-iui-operation-conf=configure

-nfv-virtualApplication-iui-operation-start=start

-nfv-virtualApplication-iui-operation-stop=stop

-nfv-virtualApplication-iui-operation-scaleIn=scale-in

-nfv-virtualApplication-iui-operation-scaleOut=scale-out

-nfv-virtualApplication-iui-operation-delete=delete

-

-nfv-virtualApplication-iui-status-normal=Deployed

-nfv-virtualApplication-iui-status-finish=Finish

-nfv-virtualApplication-iui-status-failed=Failed

-

-nfv-virtualApplication-iui-status-processing=Deploying

-nfv-virtualApplication-iui-status-init=Deploying

-nfv-virtualApplication-iui-status-conf=Configuring

-nfv-virtualApplication-iui-status-start=Starting

-nfv-virtualApplication-iui-status-stop=Stoping

-nfv-virtualApplication-iui-status-scaleIn=Scaling in

-nfv-virtualApplication-iui-status-scaleOut=Scaling out

-nfv-virtualApplication-iui-status-execute=Executing

-nfv-virtualApplication-iui-status-delete=Deleting

-

-nfv-virtualApplication-iui-text-title=Create Application

-nfv-virtualApplication-iui-text-createVm=Create

-nfv-virtualApplication-iui-text-name=Name

-nfv-virtualApplication-iui-text-description=Description

-nfv-virtualApplication-iui-text-template=Template

-nfv-virtualApplication-iui-text-templateDes=Template Description

-nfv-virtualApplication-iui-text-vnfm=VNFM

-nfv-virtualApplication-iui-text-tab-basic=Basic Info

-nfv-virtualApplication-iui-text-tab-flavor=Flavor Parameters

-nfv-virtualApplication-iui-text-tab-operationParam=Operation Parameters

-

-nfv-virtualApplication-iui-text-flavor=Flavor

-nfv-virtualApplication-iui-text-flavorDesc=Flavor Description

-nfv-virtualApplication-iui-text-flavor-numberOfInstances=NumberOfInstances

-nfv-virtualApplication-iui-text-flavor-refNodeFlavor=RefNodeFlavor

-nfv-virtualApplication-iui-text-flavor-affinity=Affinity

-nfv-virtualApplication-iui-text-flavor-redundancyModel=RedundancyModel

-nfv-virtualApplication-iui-text-flavor-capability=Capability

-nfv-virtualApplication-iui-text-input-planTitle=Plan

-

-nfv-virtualApplication-iui-text-scale-name=VNF Name

-nfv-virtualApplication-iui-text-scale-oeprationType=Operation Type

-nfv-virtualApplication-iui-text-scale-oeprationType-type=Type

-nfv-virtualApplication-iui-text-scale-oeprationType-instance=Instance

-nfv-virtualApplication-iui-text-scale-vduBtn-title=Add VDU

-nfv-virtualApplication-iui-text-scale-vnf-title=VNF List

-nfv-virtualApplication-iui-text-scale-vnf-name=VNF

-nfv-virtualApplication-iui-text-scale-vnf-vduType=VDU Type

-nfv-virtualApplication-iui-text-scale-vnf-num=Number

-nfv-virtualApplication-iui-text-scale-vnf-vduInstance=VDU Instance

-nfv-virtualApplication-iui-text-scale-vnf-numTip=Number

-nfv-virtualApplication-iui-text-scale-vnf-nameTip=Name

-nfv-virtualApplication-iui-text-scale-type-title=VDU Type

-nfv-virtualApplication-iui-text-scale-instance-title=VDU Instance

-nfv-virtualApplication-iui-text-scale-instance-cancelBtn=Cancel

-nfv-virtualApplication-iui-text-scale-instance-confirmBtn=Confirm

-nfv-virtualApplication-iui-text-scale-validate-message=The VNF is already selected

-nfv-virtualApplication-iui-text-scale-out-modal-title=ScaleOut Parameters

-nfv-virtualApplication-iui-text-scale-in-modal-title=ScaleIn Parameters

-

-nfv-virtualApplication-iui-text-createBtn=Create

-nfv-virtualApplication-iui-text-cancelBtn=Cancel

-nfv-virtualApplication-iui-text-confirmBtn=Confirm

-nfv-virtualApplication-iui-text-previousBtn=Previous

-nfv-virtualApplication-iui-text-nextBtn=Next

-nfv-virtualApplication-iui-text-params=Parameters

-

-nfv-virtualApplication-iui-message-delete-confirm=Do you want to delete the current application?

-nfv-virtualApplication-iui-message-delete-success=Application deleted successfully.

-nfv-virtualApplication-iui-message-delete-fail = Application deleted failed.

-nfv-virtualApplication-iui-message-create-success=Application created successfully.

-nfv-virtualApplication-iui-message-create-fail=Application created failed.

-

-nfv-virtualApplication-iui-validate-instanceName=Please enter a name

-nfv-virtualApplication-iui-validate-serviceTemplateName=Please select a service tempalte

-nfv-virtualApplication-iui-validate-flavor=Please select a flavor

-nfv-virtualApplication-iui-validate-vimId=Please select a VIM

-nfv-virtualApplication-iui-validate-vnfmId=Please select a VNFM

-nfv-virtualApplication-iui-validate-inputParam=This field is required

-nfv-virtualApplication-iui-validate-noinputParam=Don't need to input parameters

-nfv-virtualApplication-iui-validate-digits=Please enter only digits

-nfv-virtualApplication-iui-validate-range=Please enter a value between {0} and {1}

-

-//virtual application detail table colums

-nfv-virtualApplicationDetail-iui-field-nodeId=ID

-nfv-virtualApplicationDetail-iui-field-nodeName=Name

-nfv-virtualApplicationDetail-iui-field-nodeType=Node Type

-nfv-virtualApplicationDetail-iui-field-templateType=Template Type

-nfv-virtualApplicationDetail-iui-field-host=IP

-nfv-virtualApplicationDetail-iui-field-createTime=Create Time

-

-nfv-virtualApplicationDetail-iui-field-currentStepName=Name

-nfv-virtualApplicationDetail-iui-field-currentStepStatus=Status

-nfv-virtualApplicationDetail-iui-field-percent=Progress

-nfv-virtualApplicationDetail-iui-field-currentStepDesc=Description

-nfv-virtualApplicationDetail-iui-field-executionTime=Execution Time

-

-nfv-virtualApplicationDetail-iui-text-events=Events

-nfv-virtualApplicationDetail-iui-text-nodeDetail=Node Detail

-nfv-virtualApplicationDetail-iui-btn-close=Close

-

-//host image table colums

-nfv-host-iui-title=Image

-nfv-host-iui-field-name=Name

-nfv-host-iui-field-size=Size

-nfv-host-iui-field-vimUser=Tenant

-nfv-host-iui-field-createTime=Create Time

-nfv-host-iui-field-status=Status

-nfv-host-iui-field-progress=Progress

-nfv-host-iui-field-operation=Operation

-

-nfv-host-iui-operation-delete=Delete

-

-nfv-host-iui-text-title=Upload Image

-nfv-host-iui-text-uploadImage=Upload

-nfv-host-iui-text-local=Local

-nfv-host-iui-text-url=Url

-nfv-host-iui-text-image=Image File

-nfv-host-iui-text-imageurl=Image Url

-nfv-host-iui-text-name=Image Name

-nfv-host-iui-text-tenant=Tenant

-nfv-host-iui-btn-upload=Upload

-nfv-host-iui-btn-cancel=Cancel

-

-nfv-host-iui-validate-file=Please select a host file

-nfv-host-iui-validate-hosturl-required=Please enter a url

-nfv-host-iui-validate-hosturl-url=Please enter the right url

-nfv-host-iui-validate-hostName=Please enter a host name

-nfv-host-iui-validate-vim=Please select a vim

-

-nfv-host-iui-message-upload-success=Image upload successfully.

-nfv-host-iui-message-upload-failed=Image upload fails.

-nfv-host-iui-message-delete-confirm=Do you want to delete the current image?

-nfv-host-iui-message-delete-success=Image deleted successfully.

-nfv-host-iui-message-delete-failed=Image deleted fails.

-

-nfv-host-iui-progress-uploading=uploading

-nfv-host-iui-progress-success=upload success

-nfv-host-iui-progress-fail=upload failed

-

-//software image table colums

-nfv-software-iui-title=Software Image

-nfv-software-iui-field-name=Name

-nfv-software-iui-field-size=Size

-nfv-software-iui-field-type=Type

-nfv-software-iui-field-version=Version

-nfv-software-iui-field-location=Location

-nfv-software-iui-field-createTime=Create Time

-nfv-software-iui-field-operation=Operation

-

 nfv-software-iui-action-delete=Delete

 nfv-software-iui-action-onboard=Onboard

-

-nfv-software-iui-text-title=Upload Image

-nfv-software-iui-text-uploadImage=Upload

-nfv-software-iui-text-image=Image File

-nfv-software-iui-text-image-select=Browse

-nfv-software-iui-text-image-remove=Remove

-nfv-software-iui-text-type=Type

-nfv-software-iui-text-version=Version

-nfv-software-iui-btn-upload=Upload

-nfv-software-iui-btn-cancel=Cancel

-

-nfv-software-iui-message-delete-confirm=Do you want to delete the current image?

-nfv-software-iui-message-delete-success=Image deleted successfully.

-

-//vnfm

-nfv-vnfm-iui-title=VNFM Manage

-nfv-vnfm-iui-message-title=vnfm info

-nfv-vnfm-iui-message-query-fail=Query vnfm failed.

-nfv-vnfm-iui-message-save-success=Save successfully.

-nfv-vnfm-iui-message-save-fail=Save failed.

-nfv-vnfm-iui-message-update-success=Update successfully.

-nfv-vnfm-iui-message-update-fail=Update failed.

-nfv-vnfm-iui-message-delete-confirm=Do you want to delete the current vnfm?

-nfv-vnfm-iui-message-delete-success=Vnfm deleted successfully.

-nfv-vnfm-iui-message-delete-fail=Vnfm deleted failed.

-

-nfv-vnfm-iui-test-update=Modify vnfm info

-nfv-vnfm-iui-text-register=Register vnfm info

-nfv-vnfm-iui-text-name=Name

-nfv-vnfm-iui-text-moc=Type

-nfv-vnfm-iui-text-vendor=Vendor

-nfv-vnfm-iui-text-userName=Username

-nfv-vnfm-iui-text-password=Password

-nfv-vnfm-iui-text-cancelBtn=cancel

-nfv-vnfm-iui-text-saveBtn=save

-nfv-vnfm-iui-text-registerBtn=Register

-nfv-vnfm-iui-text-status-normal=Normal

-nfv-vnfm-iui-text-status-fail=Alarm

-nfv-vnfm-iui-text-total=Total

-nfv-vnfm-iui-text-total-vnfm= of vnfm

-

-nfv-vnfm-iui-validate-name=Please enter a name

-nfv-vnfm-iui-validate-moc=Please enter the vnfm type

-nfv-vnfm-iui-validate-vim=Please select a VIM

-nfv-vnfm-iui-validate-url-required=Please enter the URL

-nfv-vnfm-iui-validate-url=Please enter the right URL

-nfv-vnfm-iui-text-url-tip=Example: http://10.0.0.1
\ No newline at end of file
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties b/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties
index ae379c34..478289f9 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties
@@ -147,219 +147,5 @@ nfv-topology-iui-vnf-tip=点击查看嵌套拓扑图
 nfv-topology-iui-btn-return-tip=返回

 nfv-topology-iui-message-error=查询拓扑图模板信息失败

 

-//virtual application table colums

-nfv-virtualApplication-iui-title=生命周期管理

-nfv-virtualApplication-iui-field-name=名称

-nfv-virtualApplication-iui-field-template=模板

-nfv-virtualApplication-iui-field-createDate=创建时间

-nfv-virtualApplication-iui-field-status=状态

-nfv-virtualApplication-iui-field-updateDate=更新时间

-nfv-virtualApplication-iui-field-action=动作

-nfv-virtualApplication-iui-field-operation=操作

-

-nfv-virtualApplication-iui-scale-field-type=类型

-nfv-virtualApplication-iui-scale-field-num=数量

-nfv-virtualApplication-iui-scale-field-name=名称

-nfv-virtualApplication-iui-scale-field-operation=操作

-

-nfv-virtualApplication-iui-operation-init=部署

-nfv-virtualApplication-iui-operation-conf=配置

-nfv-virtualApplication-iui-operation-start=启动

-nfv-virtualApplication-iui-operation-stop=停止

-nfv-virtualApplication-iui-operation-scaleIn=缩容

-nfv-virtualApplication-iui-operation-scaleOut=扩容

-nfv-virtualApplication-iui-operation-delete=删除

-

-nfv-virtualApplication-iui-status-normal=已部署

-nfv-virtualApplication-iui-status-finish=执行完成

-nfv-virtualApplication-iui-status-failed=执行失败

-

-nfv-virtualApplication-iui-status-processing=部署中

-nfv-virtualApplication-iui-status-execute=执行中

-nfv-virtualApplication-iui-status-init=部署中

-nfv-virtualApplication-iui-status-conf=配置执行中

-nfv-virtualApplication-iui-status-start=启动执行中

-nfv-virtualApplication-iui-status-stop=停止执行中

-nfv-virtualApplication-iui-status-scaleIn=缩容执行中

-nfv-virtualApplication-iui-status-scaleOut=扩容执行中

-nfv-virtualApplication-iui-status-delete=删除执行中

-

-nfv-virtualApplication-iui-text-title=创建应用

-nfv-virtualApplication-iui-text-createVm=创建应用

-nfv-virtualApplication-iui-text-name=名称

-nfv-virtualApplication-iui-text-description=描述

-nfv-virtualApplication-iui-text-template=模板

-nfv-virtualApplication-iui-text-templateDes=模板描述

-nfv-virtualApplication-iui-text-vnfm=VNFM

-nfv-virtualApplication-iui-text-tab-basic=基本信息

-nfv-virtualApplication-iui-text-tab-flavor=规格参数

-nfv-virtualApplication-iui-text-tab-operationParam=输入参数

-

-nfv-virtualApplication-iui-text-flavor=规格

-nfv-virtualApplication-iui-text-flavorDesc=规格描述

-nfv-virtualApplication-iui-text-flavor-numberOfInstances=实例数

-nfv-virtualApplication-iui-text-flavor-refNodeFlavor=引用规格

-nfv-virtualApplication-iui-text-flavor-affinity=亲和力

-nfv-virtualApplication-iui-text-flavor-redundancyModel=容灾模式

-nfv-virtualApplication-iui-text-flavor-capability=能力

-nfv-virtualApplication-iui-text-input-planTitle=Plan

-

-nfv-virtualApplication-iui-text-scale-name=VNF名称

-nfv-virtualApplication-iui-text-scale-oeprationType=操作类型

-nfv-virtualApplication-iui-text-scale-oeprationType-type=类型

-nfv-virtualApplication-iui-text-scale-oeprationType-instance=实例

-nfv-virtualApplication-iui-text-scale-vduBtn-title=添加VDU

-nfv-virtualApplication-iui-text-scale-vnf-title=已选择的VNF

-nfv-virtualApplication-iui-text-scale-vnf-name=VNF

-nfv-virtualApplication-iui-text-scale-vnf-vduType=VDU类型

-nfv-virtualApplication-iui-text-scale-vnf-num=数量

-nfv-virtualApplication-iui-text-scale-vnf-vduInstance=VDU实例

-nfv-virtualApplication-iui-text-scale-vnf-numTip=实例数

-nfv-virtualApplication-iui-text-scale-vnf-nameTip=名称

-nfv-virtualApplication-iui-text-scale-type-title=VDU类型

-nfv-virtualApplication-iui-text-scale-instance-title=VDU实例

-nfv-virtualApplication-iui-text-scale-instance-cancelBtn=取消

-nfv-virtualApplication-iui-text-scale-instance-confirmBtn=确定

-nfv-virtualApplication-iui-text-scale-validate-message=该VNF已选择

-nfv-virtualApplication-iui-text-scale-out-modal-title=扩容参数

-nfv-virtualApplication-iui-text-scale-in-modal-title=缩容参数

-

-nfv-virtualApplication-iui-text-createBtn=创建

-nfv-virtualApplication-iui-text-cancelBtn=取消

-nfv-virtualApplication-iui-text-previousBtn=上一步

-nfv-virtualApplication-iui-text-nextBtn=下一步

-nfv-virtualApplication-iui-text-confirmBtn=确定

-nfv-virtualApplication-iui-text-params=参数

-

-nfv-virtualApplication-iui-message-delete-confirm=确定要删除当前应用？

-nfv-virtualApplication-iui-message-delete-success=应用删除成功。

-nfv-virtualApplication-iui-message-delete-fail=应用删除失败。

-nfv-virtualApplication-iui-message-create-success=应用创建成功。

-nfv-virtualApplication-iui-message-create-fail=应用创建失败。

-

-nfv-virtualApplication-iui-validate-instanceName=请输入名称

-nfv-virtualApplication-iui-validate-serviceTemplateName=请选择服务模板

-nfv-virtualApplication-iui-validate-flavor=请选择规格

-nfv-virtualApplication-iui-validate-vimId=请选择VIM

-nfv-virtualApplication-iui-validate-vnfmId=请选择VNFM

-nfv-virtualApplication-iui-validate-inputParam=请输入参数

-nfv-virtualApplication-iui-validate-noinputParam=无需输入参数

-nfv-virtualApplication-iui-validate-digits=只能输入整数

-nfv-virtualApplication-iui-validate-range=请输入在 {0} 和 {1} 之间的值

-

-//virtual application detail table colums

-nfv-virtualApplicationDetail-iui-field-nodeId=ID

-nfv-virtualApplicationDetail-iui-field-nodeName=名称

-nfv-virtualApplicationDetail-iui-field-nodeType=节点类型

-nfv-virtualApplicationDetail-iui-field-templateType=模板类型

-nfv-virtualApplicationDetail-iui-field-host=IP

-nfv-virtualApplicationDetail-iui-field-createTime=创建时间

-

-nfv-virtualApplicationDetail-iui-field-currentStepName=名称

-nfv-virtualApplicationDetail-iui-field-currentStepStatus=状态

-nfv-virtualApplicationDetail-iui-field-percent=当前进度

-nfv-virtualApplicationDetail-iui-field-currentStepDesc=描述

-nfv-virtualApplicationDetail-iui-field-executionTime=执行时间

-

-nfv-virtualApplicationDetail-iui-text-events=事件

-nfv-virtualApplicationDetail-iui-text-nodeDetail=节点详情

-nfv-virtualApplicationDetail-iui-btn-close=关闭

-

-//host image table colums

-nfv-host-iui-title=主机镜像

-nfv-host-iui-field-name=名称

-nfv-host-iui-field-size=大小

-nfv-host-iui-field-vimUser=租户

-nfv-host-iui-field-createTime=创建时间

-nfv-host-iui-field-status=状态

-nfv-host-iui-field-progress=进度

-nfv-host-iui-field-operation=操作

-

-nfv-host-iui-operation-delete=删除

-

-nfv-host-iui-text-title=上传镜像

-nfv-host-iui-text-uploadImage=上传镜像

-nfv-host-iui-text-local=本地上传

-nfv-host-iui-text-url=URL上传

-nfv-host-iui-text-image=镜像文件

-nfv-host-iui-text-imageurl=镜像URL

-nfv-host-iui-text-name=镜像名称

-nfv-host-iui-text-tenant=租户

-nfv-host-iui-btn-upload=上传

-nfv-host-iui-btn-cancel=取消

-

-nfv-host-iui-validate-file=请选择镜像文件

-nfv-host-iui-validate-hosturl-required=请输入URL地址

-nfv-host-iui-validate-hosturl-url=请输入正确的URL地址

-nfv-host-iui-validate-hostName=请输入镜像名称

-nfv-host-iui-validate-vim=请选择VIM

-

-nfv-host-iui-message-upload-success=镜像上传成功。

-nfv-host-iui-message-upload-failed=镜像上传失败。

-nfv-host-iui-message-delete-confirm=确定要删除当前镜像？

-nfv-host-iui-message-delete-success=镜像删除成功。

-nfv-host-iui-message-delete-failed=镜像删除失败。

-

-nfv-host-iui-progress-uploading=上传中

-nfv-host-iui-progress-success=上传成功

-nfv-host-iui-progress-fail=上传失败

-

-//software image table colums

-nfv-software-iui-title=软件镜像

-nfv-software-iui-field-name=名称

-nfv-software-iui-field-size=大小

-nfv-software-iui-field-type=类型

-nfv-software-iui-field-version=版本

-nfv-software-iui-field-location=位置

-nfv-software-iui-field-createTime=创建时间

-nfv-software-iui-field-operation=操作

-

 nfv-software-iui-action-delete=删除

 nfv-software-iui-action-onboard=Onboard

-

-nfv-software-iui-text-title=上传镜像

-nfv-software-iui-text-uploadImage=上传镜像

-nfv-software-iui-text-image=镜像文件

-nfv-software-iui-text-image-select=选择

-nfv-software-iui-text-image-remove=移除

-nfv-software-iui-text-type=类型

-nfv-software-iui-text-version=版本

-nfv-software-iui-btn-upload=上传

-nfv-software-iui-btn-cancel=取消

-

-nfv-software-iui-message-delete-confirm=确定要删除当前镜像？

-nfv-software-iui-message-delete-success=镜像删除成功。

-

-//vnfm

-nfv-vnfm-iui-title=VNFM管理

-nfv-vnfm-iui-message-title=vnfm信息

-nfv-vnfm-iui-message-query-fail=查询vnfm失败。

-nfv-vnfm-iui-message-save-success=保存成功。

-nfv-vnfm-iui-message-save-fail=保存失败。

-nfv-vnfm-iui-message-update-success=修改成功。

-nfv-vnfm-iui-message-update-fail=修改失败。

-nfv-vnfm-iui-message-delete-confirm=确定删除所选vnfm信息？

-nfv-vnfm-iui-message-delete-success=删除成功

-nfv-vnfm-iui-message-delete-fail=删除失败

-

-nfv-vnfm-iui-test-update=修改vnfm信息

-nfv-vnfm-iui-text-register=注册vnfm信息

-nfv-vnfm-iui-text-name=名称

-nfv-vnfm-iui-text-moc=类型

-nfv-vnfm-iui-text-vendor=厂商

-nfv-vnfm-iui-text-userName=接入用户

-nfv-vnfm-iui-text-password=接入密码

-nfv-vnfm-iui-text-cancelBtn=取消

-nfv-vnfm-iui-text-saveBtn=保存

-nfv-vnfm-iui-text-registerBtn=注册vnfm

-nfv-vnfm-iui-text-status-normal=正常

-nfv-vnfm-iui-text-status-fail=报警

-nfv-vnfm-iui-text-total=共

-nfv-vnfm-iui-text-total-vnfm= vnfm

-

-nfv-vnfm-iui-validate-name=请输入名称

-nfv-vnfm-iui-validate-moc=请输入vnfm类型

-nfv-vnfm-iui-validate-vim=请选择VIM

-nfv-vnfm-iui-validate-url-required=请输入URL

-nfv-vnfm-iui-validate-url=请输入正确的URL

-nfv-vnfm-iui-text-url-tip=例如：http://10.0.0.1
\ No newline at end of file
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmController.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmController.js
index 974bac61..3170242b 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmController.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmController.js
@@ -267,7 +267,7 @@ var vm = avalon.define({
                 $("#filesubmit").attr("disabled", false);

 

                 $("#filesubmit").remove();

-                $('<button id="filesubmit" class="btn btn-default" type="button"/>').text("上传")

+                $('<button id="filesubmit" class="btn btn-default" type="button"/>').text($.i18n.prop("nfv-package-iui-drop-zone-uploadBtn"))

                     .appendTo($(".input-group-btn")[0])

                     .click(function () {

                         var fileName = data.files[0].name;