You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/08/14 10:41:34 UTC
git commit: updated refs/heads/4.5 to 9866e97
Repository: cloudstack
Updated Branches:
refs/heads/4.5 cc63611cc -> 9866e9707
Add missing localization for some labels in Web UI - on the zone configuration wizard for the "Next" button - on templates, Shared, extratable and Dynamically Scalable - Improve some French translations ("Téléverser" for "Upload") - update French messages properties from transifex (4.5 branch)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #687
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9866e970
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9866e970
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9866e970
Branch: refs/heads/4.5
Commit: 9866e9707cc5fba95f242720b114b35c2880bceb
Parents: cc63611
Author: Milamber <mi...@apache.org>
Authored: Wed Aug 12 20:43:38 2015 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Aug 14 14:11:11 2015 +0530
----------------------------------------------------------------------
.../classes/resources/messages_fr_FR.properties | 7 ++++---
ui/scripts/templates.js | 16 ++++++++--------
ui/scripts/ui-custom/zoneWizard.js | 2 +-
3 files changed, 13 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9866e970/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 d8a26e5..04c19d4 100644
--- a/client/WEB-INF/classes/resources/messages_fr_FR.properties
+++ b/client/WEB-INF/classes/resources/messages_fr_FR.properties
@@ -878,7 +878,8 @@ 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=Local
-label.local.storage.enabled=Stockage local activ\u00e9
+label.local.storage.enabled=Activer le stockage local pour les VMs Utilisateurs
+label.local.storage.enabled.system.vms=Activer le stockage local pour les VMs Syst\u00e8mes
label.local.storage=Stockage local
label.login=Connexion
label.logout=D\u00e9connexion
@@ -1448,8 +1449,8 @@ 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=T\u00e9l\u00e9verser
+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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9866e970/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 1cb613b..f0b8103 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'
@@ -435,7 +435,7 @@
},
isExtractable: {
- label: "extractable",
+ label: "label.extractable",
docID: 'helpRegisterTemplateExtractable',
isBoolean: true
},
@@ -1318,7 +1318,7 @@
}
},
isextractable: {
- label: 'extractable',
+ label: 'label.extractable',
isBoolean: true,
isEditable: function() {
if (isAdmin())
@@ -1335,7 +1335,7 @@
converter: cloudStack.converters.toBooleanText
},
isdynamicallyscalable: {
- label: 'Dynamically Scalable',
+ label: 'label.dynamically.scalable',
isBoolean: true,
isEditable: true,
converter: cloudStack.converters.toBooleanText
@@ -1469,7 +1469,7 @@
label: 'ui.listView.filters.mine'
},
shared: {
- label: 'Shared'
+ label: 'label.shared'
},
featured: {
label: 'label.featured'
@@ -1600,7 +1600,7 @@
},
isExtractable: {
- label: "extractable",
+ label: "label.extractable",
docID: 'helpRegisterISOExtractable',
isBoolean: true
},
@@ -2228,7 +2228,7 @@
}
}, {
id: {
- label: 'ID'
+ label: 'label.id'
},
zonename: {
label: 'label.zone.name'
@@ -2261,7 +2261,7 @@
}
},
isextractable: {
- label: 'extractable',
+ label: 'label.extractable',
isBoolean: true,
isEditable: function() {
if (isAdmin())
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9866e970/ui/scripts/ui-custom/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js
index 2c17f60..58ae3ff 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