cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [43/50] [abbrv] git commit: updated refs/heads/hotfix/scp-exception to e13d45e
Date Sat, 21 Feb 2015 11:34:19 GMT
fix CLOUDSTACK-8187 and CLOUDSTACK-8232: missing UI labels


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/db9a4f36
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/db9a4f36
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/db9a4f36

Branch: refs/heads/hotfix/scp-exception
Commit: db9a4f3648bdf768fc2437d91fb7befc766c1d9d
Parents: 0c70d11
Author: Pierre-Luc Dion <pdion891@apache.org>
Authored: Thu Feb 19 21:00:33 2015 -0500
Committer: Pierre-Luc Dion <pdion891@apache.org>
Committed: Thu Feb 19 22:39:56 2015 -0500

----------------------------------------------------------------------
 client/WEB-INF/classes/resources/messages.properties       | 2 ++
 client/WEB-INF/classes/resources/messages_fr_FR.properties | 3 ++-
 ui/dictionary2.jsp                                         | 4 ++--
 ui/scripts/network.js                                      | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db9a4f36/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 ddf69b6..b46be06 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -315,6 +315,7 @@ label.add.egress.rule=Add egress rule
 label.add.F5.device=Add F5 device
 label.add.firewall=Add firewall rule
 label.add.guest.network=Add guest network
+label.add.isolated.guest.network=Add Isolated Guest Network
 label.add.host=Add Host
 label.add.ingress.rule=Add Ingress Rule
 label.add.intermediate.certificate=Add intermediate certificate
@@ -850,6 +851,7 @@ label.move.up.row=Move up one row
 label.my.account=My Account
 label.my.network=My network
 label.my.templates=My templates
+label.na=N/A
 label.name.optional=Name (Optional)
 label.name=Name
 label.nat.port.range=NAT Port Range

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db9a4f36/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 1272442..f6a7a95 100644
--- a/client/WEB-INF/classes/resources/messages_fr_FR.properties
+++ b/client/WEB-INF/classes/resources/messages_fr_FR.properties
@@ -975,7 +975,8 @@ label.move.up.row=Monter d\\'un cran
 label.my.account=Mon compte
 label.my.network=Mon r\u00e9seau
 label.my.templates=Mes mod\u00e8les
-label.name.lower=name
+label.na=N/D
+label.name.lower=nom
 label.name=Nom
 label.name.optional=Nom (optionnel)
 label.nat.port.range=Plage de port NAT

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db9a4f36/ui/dictionary2.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary2.jsp b/ui/dictionary2.jsp
index 9e58ee8..c9cb8f0 100644
--- a/ui/dictionary2.jsp
+++ b/ui/dictionary2.jsp
@@ -823,8 +823,8 @@ under the License.
 'label.autoscale': '<fmt:message key="label.autoscale" />',
 'label.health.check': '<fmt:message key="label.health.check" />',
 'label.public.load.balancer.provider': '<fmt:message key="label.public.load.balancer.provider"
/>',
- 'label.add.isolated.network': '<fmt:message key="label.add.isolated.network" />',
- 'label.add.isolated.guest.network': '<fmt:message key="label.add.isolated.guest.network"
/>',
+'label.add.isolated.network': '<fmt:message key="label.add.isolated.network" />',
+'label.add.isolated.guest.network': '<fmt:message key="label.add.isolated.guest.network"
/>',
 'label.secondary.isolated.vlan.id': '<fmt:message key="label.secondary.isolated.vlan.id"
/>',
 'label.ipv4.netmask': '<fmt:message key="label.ipv4.netmask" />',
 'label.custom': '<fmt:message key="label.custom" />',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db9a4f36/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 1d9e490..50d0d59 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1872,7 +1872,7 @@
                             },
                             messages: {
                                 notification: function(args) {
-                                    return 'label.acquire.new.secondary.ip';
+                                    return _l('label.acquire.new.secondary.ip');
                                 }
                             },
                             action: function(args) {


Mime
View raw message