etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cloudstack 3.0 new UI - add more localization labels.

This commit is contained in:
Jessica Wang 2012-02-16 15:35:44 -08:00 committed by Salvatore Orlando
parent f175c273b8
commit 232d31429a
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/WEB-INF/classes/resources/messages.properties
View File

@ -1706,7 +1706,7 @@ label.action.unmanage.cluster=Unmanage Cluster
message.action.unmanage.cluster=Please confirm that you want to unmanage the cluster.
label.action.unmanage.cluster.processing=Unmanaging Cluster....
allocation.state=Allocation State
label.allocation.state=Allocation State
managed.state=Managed State
label.default.use=Default Use

5
client/WEB-INF/classes/resources/messages_ja.properties
View File

@ -843,8 +843,13 @@ label.action.unmanage.cluster=クラスターの非管理対象化
message.action.unmanage.cluster=クラスターを非管理対象にしてもよろしいですか?
label.action.unmanage.cluster.processing=クラスターを非管理対象にしています...
<<<<<<< HEAD
label.allocation.state=割り当て状態
managed.state=管理対象状態
=======
label.allocation.state=アロケーション状態
managed.state=管理された状態
>>>>>>> c05a040... cloudstack 3.0 new UI - add more localization labels.
label.default.use=デフォルト使用
label.host.tags=ホスト タグ

12
ui/scripts/system.js
View File

@ -3511,7 +3511,7 @@
}
},
allocationstate: {
label: 'allocation.state',
label: 'label.allocation.state',
converter: function(str) {
// For localization
return str;
@ -5203,7 +5203,7 @@
},
{
id: { label: 'label.id' },
allocationstate: { label: 'allocation.state' },
allocationstate: { label: 'label.allocation.state' },
dns1: { label: 'label.dns.1', isEditable: true },
dns2: { label: 'label.dns.2', isEditable: true },
internaldns1: { label: 'label.internal.dns.1', isEditable: true },
@ -6517,11 +6517,15 @@
// For localization
return str;
},
<<<<<<< HEAD
<<<<<<< HEAD
label: 'label.allocation.state'
=======
label: 'allocation.state'
>>>>>>> 3536a2e... cloudstack 3.0 new UI - system page - localize host section.
=======
label: 'label.allocation.state'
>>>>>>> c05a040... cloudstack 3.0 new UI - add more localization labels.
}
}
],
@ -7056,11 +7060,15 @@
podname: { label: 'label.pod' },
hypervisortype: { label: 'label.hypervisor' },
clustertype: { label: 'label.cluster.type' },
<<<<<<< HEAD
<<<<<<< HEAD
//allocationstate: { label: 'label.allocation.state' },
=======
//allocationstate: { label: 'allocation.state' },
>>>>>>> 3536a2e... cloudstack 3.0 new UI - system page - localize host section.
=======
//allocationstate: { label: 'label.allocation.state' },
>>>>>>> c05a040... cloudstack 3.0 new UI - add more localization labels.
//managedstate: { label: 'Managed State' },
state: { label: 'label.state' }
}