You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/08/14 22:12:46 UTC
[1/2] git commit: updated refs/heads/master to ca9d246
Repository: cloudstack
Updated Branches:
refs/heads/master 64ff67da5 -> ca9d24687
Add missing localization for some labels in Web UI
- on new functionnality: upload volume/template from Local
- on the zone configuration wizard for the "Next" button
- update French messages properties from transifex
- Improve some French translations ("Téléverser" for "Upload")
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4be622e4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4be622e4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4be622e4
Branch: refs/heads/master
Commit: 4be622e4ffa71c03f75c4f5671c9600deed9ac4b
Parents: fa56b3f
Author: Milamber <mi...@apache.org>
Authored: Wed Aug 12 17:30:15 2015 +0100
Committer: Milamber <mi...@apache.org>
Committed: Wed Aug 12 17:30:15 2015 +0100
----------------------------------------------------------------------
.../classes/resources/messages.properties | 6 ++++++
.../classes/resources/messages_fr_FR.properties | 22 +++++++++++++-------
ui/dictionary2.jsp | 7 +++++++
ui/scripts/storage.js | 18 ++++++++--------
ui/scripts/templates.js | 16 +++++++-------
ui/scripts/ui-custom/zoneWizard.js | 2 +-
6 files changed, 45 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4be622e4/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index f81a196..82f3083 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -461,6 +461,7 @@ label.cluster.type=Cluster Type
label.cluster=Cluster
label.clusters=Clusters
label.clvm=CLVM
+label.custom.disk.offering=Custom Disk Offering
label.rbd=RBD
label.rbd.monitor=Ceph monitor
label.rbd.pool=Ceph pool
@@ -762,6 +763,7 @@ label.local.storage.enabled=Enable local storage for User VMs
label.local.storage.enabled.system.vms=Enable local storage for System VMs
label.local.storage=Local Storage
label.local=Local
+label.local.file=Local file
label.login=Login
label.logout=Logout
label.saml.enable=Authorize SAML SSO
@@ -1214,7 +1216,11 @@ label.update.project.resources=Update project resources
label.update.ssl.cert= SSL Certificate
label.update.ssl= SSL Certificate
label.updating=Updating
+label.upload.from.local=Upload from Local
+label.upload.template.from.local=Upload Template from Local
label.upload.volume=Upload volume
+label.upload.volume.from.local=Upload Volume from Local
+label.upload.volume.from.url=Upload volume from URL
label.upload=Upload
label.url=URL
label.usage.interface=Usage Interface
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4be622e4/client/WEB-INF/classes/resources/messages_fr_FR.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_fr_FR.properties b/client/WEB-INF/classes/resources/messages_fr_FR.properties
index 1b0ccfb..66584fd 100644
--- a/client/WEB-INF/classes/resources/messages_fr_FR.properties
+++ b/client/WEB-INF/classes/resources/messages_fr_FR.properties
@@ -521,6 +521,7 @@ label.create.template=Cr\u00e9er un mod\u00e8le
label.create.VPN.connection=Cr\u00e9er une connexion VPN
label.cross.zones=Multi Zones
label.custom.disk.iops=IOPS personnalis\u00e9
+label.custom.disk.offering=Offre de disque personnalis\u00e9e
label.custom.disk.size=Taille de disque personnalis\u00e9e
label.custom=Personnalis\u00e9
label.daily=Quotidien
@@ -694,7 +695,7 @@ label.every=Tous
label.example=Exemple
label.expunge=Purger
label.external.link=Lien externe
-label.extractable.lower=t\u00e9l\u00e9chargeable
+label.extractable.lower=T\u00e9l\u00e9chargeable
label.extractable=T\u00e9l\u00e9chargeable
label.f5.details=D\u00e9tails F5
label.f5=F5
@@ -906,6 +907,7 @@ label.load.balancer.type=Type R\u00e9partiteur de charge
label.load.balancing.policies=R\u00e8gles de r\u00e9partition de charge
label.load.balancing=R\u00e9partition de charge
label.loading=Chargement en cours
+label.local.file=Fichier local
label.local=Local
label.local.storage.enabled=Activer le stockage local pour les VMs Utilisateurs
label.local.storage.enabled.system.vms=Active le stockage local pour les VMs Syst\u00e8mes
@@ -1338,8 +1340,8 @@ label.session.expired=Session expir\u00e9e
label.set.default.NIC=D\u00e9finir NIC par d\u00e9faut
label.settings=Param\u00e8tres
label.setup=Configuration
-label.setup.network=Configurer le r\u00e9seau
-label.setup.zone=Configurer la zone
+label.setup.network=Configurer R\u00e9seau
+label.setup.zone=Configurer Zone
label.set.up.zone.type=Configurer le type de zone
label.shared=En partage
label.SharedMountPoint=Point de montage partag\u00e9
@@ -1357,7 +1359,7 @@ label.snapshot=Instantan\u00e9
label.snapshot.limits=Limites d\\'instantan\u00e9s
label.snapshot.name=Nom Instantan\u00e9
label.snapshot.schedule=Configurer un instantan\u00e9 r\u00e9current
-label.snapshot.s=Instantan\u00e9(s)
+label.snapshot.s=Instantan\u00e9s
label.snapshots=Instantan\u00e9s
label.SNMP.community=Communaut\u00e9 SNMP
label.SNMP.port=Port SNMP
@@ -1494,8 +1496,12 @@ label.update.ssl= Certificat SSL
label.updating=Mise \u00e0 jour
label.upgrade.required=Une mise \u00e0 jour est n\u00e9cessaire
label.upgrade.router.newer.template=Mette \u00e0 jour le routeur pour utiliser le mod\u00e8le le plus r\u00e9cent
-label.upload=Charger
-label.upload.volume=Charger un volume
+label.upload.from.local=T\u00e9l\u00e9verser depuis Local
+label.upload.template.from.local=T\u00e9l\u00e9verser Mod\u00e8le depuis Local
+label.upload=T\u00e9l\u00e9verser
+label.upload.volume.from.local=T\u00e9l\u00e9verser Volume depuis Local
+label.upload.volume.from.url=T\u00e9l\u00e9verser volume depuis URL
+label.upload.volume=T\u00e9l\u00e9verser un volume
label.url=URL
label.usage.interface=Interface Utilisation
label.usage.sanity.result=R\u00e9sultat de sant\u00e9 Usage
@@ -2013,7 +2019,7 @@ message.set.default.NIC.manual=Veuillez mettre \u00e0 jour manuellement la NIC p
message.setup.physical.network.during.zone.creation.basic=Quand vous ajoutez une zone basique, vous pouvez param\u00e9trer un seul r\u00e9seau physique, correspondant \u00e0 une carte r\u00e9seau sur l\\'hyperviseur. Ce r\u00e9seau comportera plusieurs types de trafic.<br/><br/>Vous pouvez \u00e9galement <strong>glisser et d\u00e9poser</strong> d\\'autres types de trafic sur le r\u00e9seau physique.
message.setup.physical.network.during.zone.creation=Lorsque vous ajoutez une zone avanc\u00e9e, vous avez besoin de d\u00e9finir un ou plusieurs r\u00e9seaux physiques. Chaque r\u00e9seau correspond \u00e0 une carte r\u00e9seau sur l\\'hyperviseur. Chaque r\u00e9seau physique peut supporter un ou plusieurs types de trafic, avec certaines restrictions sur la fa\u00e7on dont ils peuvent \u00eatre combin\u00e9s.<br/><br/><strong>Glisser et d\u00e9poser un ou plusieurs types de trafic</strong> sur chaque r\u00e9seau physique.
message.setup.successful=Installation du Cloud r\u00e9ussie \!
-message.snapshot.schedule=Vous pouvez mettre en place les politiques de g\u00e9n\u00e9ration d\\'instantan\u00e9s en s\u00e9lectionnant les options disponibles ci-dessous et en appliquant votre politique.
+message.snapshot.schedule=Vous pouvez configurer des plannings d\\'instantan\u00e9s r\u00e9currents en s\u00e9lectionnant les options disponibles ci-dessous et en appliquant votre politique pr\u00e9f\u00e9r\u00e9e.
message.specifiy.tag.key.value=Sp\u00e9cifier une cl\u00e9 et valeur de tag
message.specify.url=Renseigner l\\'URL
message.step.1.continue=S\u00e9lectionnez un mod\u00e8le ou une image ISO pour continuer
@@ -2107,6 +2113,6 @@ state.Starting=D\u00e9marrage en cours
state.Stopped=Arr\u00eat\u00e9e
state.Stopping=Arr\u00eat en cours
state.Suspended=Suspendu
-title.upload.volume=Charger Volume
+title.upload.volume=T\u00e9l\u00e9verser Volume
ui.listView.filters.all=Tous
ui.listView.filters.mine=Les miennes
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4be622e4/ui/dictionary2.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary2.jsp b/ui/dictionary2.jsp
index 12518be..b7b3939 100644
--- a/ui/dictionary2.jsp
+++ b/ui/dictionary2.jsp
@@ -182,7 +182,11 @@ under the License.
'label.update.ssl': '<fmt:message key="label.update.ssl" />',
'label.updating': '<fmt:message key="label.updating" />',
'label.upload': '<fmt:message key="label.upload" />',
+'label.upload.from.local': '<fmt:message key="label.upload.from.local" />',
+'label.upload.template.from.local': '<fmt:message key="label.upload.template.from.local" />',
'label.upload.volume': '<fmt:message key="label.upload.volume" />',
+'label.upload.volume.from.local': '<fmt:message key="label.upload.volume.from.local" />',
+'label.upload.volume.from.url': '<fmt:message key="label.upload.volume.from.url" />',
'label.url': '<fmt:message key="label.url" />',
'label.usage.interface': '<fmt:message key="label.usage.interface" />',
'label.used': '<fmt:message key="label.used" />',
@@ -279,6 +283,7 @@ under the License.
'label.password.reset.confirm': '<fmt:message key="label.password.reset.confirm" />',
'label.openDaylight': '<fmt:message key="label.openDaylight" />',
'label.change.affinity': '<fmt:message key="label.change.affinity" />',
+'label.custom.disk.offering': '<fmt:message key="label.custom.disk.offering" />',
'label.assign.instance.another': '<fmt:message key="label.assign.instance.another" />',
'label.network.addVM': '<fmt:message key="label.network.addVM" />',
'label.set.default.NIC': '<fmt:message key="label.set.default.NIC" />',
@@ -817,6 +822,7 @@ under the License.
'label.type.lower': '<fmt:message key="label.type.lower" />',
'label.rule.number': '<fmt:message key="label.rule.number" />',
'label.action': '<fmt:message key="label.action" />',
+'label.action.register.template': '<fmt:message key="label.action.register.template" />',
'label.name.lower': '<fmt:message key="label.name.lower" />',
'label.ucs': '<fmt:message key="label.ucs" />',
'label.persistent': '<fmt:message key="label.persistent" />',
@@ -1058,6 +1064,7 @@ under the License.
'label.ovm3.pool': '<fmt:message key="label.ovm3.pool" />',
'label.ovm3.cluster': '<fmt:message key="label.ovm3.cluster" />',
'label.ovm3.vip': '<fmt:message key="label.ovm3.vip" />',
+'label.local.file': '<fmt:message key="label.local.file" />',
'label.local.storage.enabled.system.vms': '<fmt:message key="label.local.storage.enabled.system.vms" />'
});
</script>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4be622e4/ui/scripts/storage.js
----------------------------------------------------------------------
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index b7c71a4..ce4f077 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -247,17 +247,17 @@
uploadVolume: {
isHeader: true,
- label: 'Upload',
+ label: 'label.upload',
preFilter: function(args) {
return !args.context.instances;
},
messages: {
notification: function() {
- return 'Upload Volume from URL';
+ return 'label.upload.volume.from.url';
}
},
createForm: {
- title: 'Upload Volume from URL',
+ title: 'label.upload.volume.from.url',
fields: {
url: {
label: 'label.url',
@@ -323,7 +323,7 @@
},
diskOffering: {
- label: 'Custom Disk Offering',
+ label: 'label.custom.disk.offering',
docID: 'helpVolumeDiskOffering',
select: function(args) {
var diskofferingObjs;
@@ -353,7 +353,7 @@
}
},
diskOffering: {
- label: 'Custom Disk Offering',
+ label: 'label.custom.disk.offering',
docID: 'helpVolumeDiskOffering',
select: function(args) {
var diskofferingObjs;
@@ -439,17 +439,17 @@
uploadVolumefromLocal: {
isHeader: true,
- label: 'Upload from Local',
+ label: 'label.upload.from.local',
preFilter: function(args) {
return !args.context.instances;
},
messages: {
notification: function() {
- return 'Upload Volume from Local';
+ return 'label.upload.volume.from.local';
}
},
createForm: {
- title: 'Upload Volume from Local',
+ title: 'label.upload.volume.from.local',
fileUpload: {
getURL: function(args) {
args.data = args.formData;
@@ -500,7 +500,7 @@
},
fields: {
volumeFileUpload: {
- label: 'local file',
+ label: 'label.local.file',
isFileUpload: true,
validation: {
required: true
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4be622e4/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 298f48b..225a0c3 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -44,7 +44,7 @@
label: 'ui.listView.filters.mine'
},
shared: {
- label: 'Shared'
+ label: 'label.shared'
},
featured: {
label: 'label.featured'
@@ -100,10 +100,10 @@
reorder: cloudStack.api.actions.sort('updateTemplate', 'templates'),
actions: {
add: {
- label: 'Add',
+ label: 'label.add',
messages: {
notification: function(args) {
- return 'Register Template from URL';
+ return 'label.action.register.template';
}
},
createForm: {
@@ -570,14 +570,14 @@
uploadTemplateFromLocal: {
isHeader: true,
- label: 'Upload from Local',
+ label: 'label.upload.from.local',
messages: {
notification: function(args) {
- return 'Upload Template from Local';
+ return 'label.upload.template.from.local';
}
},
createForm: {
- title: 'Upload Template from Local',
+ title: 'label.upload.template.from.local',
preFilter: cloudStack.preFilter.createTemplate,
fileUpload: {
getURL: function(args) {
@@ -652,7 +652,7 @@
},
fields: {
templateFileUpload: {
- label: 'local file',
+ label: 'label.local.file',
isFileUpload: true,
validation: {
required: true
@@ -1766,7 +1766,7 @@
label: 'ui.listView.filters.mine'
},
shared: {
- label: 'Shared'
+ label: 'label.shared'
},
featured: {
label: 'label.featured'
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4be622e4/ui/scripts/ui-custom/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js
index 6ebc1b0..e71118f 100644
--- a/ui/scripts/ui-custom/zoneWizard.js
+++ b/ui/scripts/ui-custom/zoneWizard.js
@@ -1206,7 +1206,7 @@
}
var $nextButton = $wizard.find('.button.next');
- $nextButton.find('span').html('Next');
+ $nextButton.find('span').html(_l('label.next'));
$nextButton.removeClass('final post-launch');
// Show launch button if last step
[2/2] git commit: updated refs/heads/master to ca9d246
Posted by re...@apache.org.
Merge pull request #686 from milamberspace/MissingSomesL10N
[CLOUDSTACK-8427] Add missing localization for some labels in Web UI- on new functionnality: upload volume/template from Local
- on the zone configuration wizard for the "Next" button
- update French messages properties from transifex
- Improve some French translations ("Tlverser" for "Upload")
* pr/686:
Add missing localization for some labels in Web UI - on new functionnality: upload volume/template from Local - on the zone configuration wizard for the "Next" button - update French messages properties from transifex - Improve some French translations ("Téléverser" for "Upload")
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ca9d2468
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ca9d2468
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ca9d2468
Branch: refs/heads/master
Commit: ca9d246876266a9a9a41448187673856cb245660
Parents: 64ff67d 4be622e
Author: Remi Bergsma <gi...@remi.nl>
Authored: Fri Aug 14 22:11:27 2015 +0200
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Fri Aug 14 22:11:28 2015 +0200
----------------------------------------------------------------------
.../classes/resources/messages.properties | 6 ++++++
.../classes/resources/messages_fr_FR.properties | 22 +++++++++++++-------
ui/dictionary2.jsp | 7 +++++++
ui/scripts/storage.js | 18 ++++++++--------
ui/scripts/templates.js | 16 +++++++-------
ui/scripts/ui-custom/zoneWizard.js | 2 +-
6 files changed, 45 insertions(+), 26 deletions(-)
----------------------------------------------------------------------