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 2016/09/02 00:41:56 UTC
[1/4] git commit: updated refs/heads/master to 3afc4a1
Repository: cloudstack
Updated Branches:
refs/heads/master 19549f7b0 -> 3afc4a176
Fix a quote issue with Spanish L10N (from transifex translation)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6df5df56
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6df5df56
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6df5df56
Branch: refs/heads/master
Commit: 6df5df569423182fc62bf378dd32166a0ab55c9d
Parents: a54a3b5
Author: Milamber <mi...@apache.org>
Authored: Fri Aug 12 07:13:44 2016 +0100
Committer: Milamber <mi...@apache.org>
Committed: Tue Aug 23 06:36:42 2016 +0100
----------------------------------------------------------------------
client/WEB-INF/classes/resources/messages_es.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6df5df56/client/WEB-INF/classes/resources/messages_es.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_es.properties b/client/WEB-INF/classes/resources/messages_es.properties
index 33fee1f..0982795 100644
--- a/client/WEB-INF/classes/resources/messages_es.properties
+++ b/client/WEB-INF/classes/resources/messages_es.properties
@@ -1141,7 +1141,7 @@ label.number.of.clusters=Cantidad de Clusters
label.number.of.cpu.sockets=Cantidad de Sockets de CPU
label.number.of.hosts=N\u00famero de Servidores
label.number.of.pods=N\u00famero de Pods
-label.number.of.system.vms=Cantidad de VM\\\\'s de Sistema
+label.number.of.system.vms=Cantidad de VM\\'s de Sistema
label.number.of.virtual.routers=N\u00famero de Routers Virtuales
label.number.of.zones=N\u00famero de Zonas
label.num.cpu.cores=n\u00famero de n\u00facleos de CPU
@@ -1695,7 +1695,7 @@ label.vmsnapshot.memory=Instant\u00e1nea de la memoria
label.vmsnapshot.parentname=Padre
label.vmsnapshot.type=Tipo
label.vm.start=Inicio
-label.vm.state=Estado de VM\\\\'s
+label.vm.state=Estado de VM\\'s
label.vm.stop=Detener
label.vms=VM
label.vmware.datacenter.id=VMware datacenter ID
[4/4] git commit: updated refs/heads/master to 3afc4a1
Posted by bh...@apache.org.
Merge branch '4.9'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3afc4a17
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3afc4a17
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3afc4a17
Branch: refs/heads/master
Commit: 3afc4a176f5287c271db4d81293343f242b1c792
Parents: 19549f7 1e00125
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Fri Sep 2 00:41:26 2016 +0000
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Sep 2 00:41:26 2016 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/4] git commit: updated refs/heads/master to 3afc4a1
Posted by bh...@apache.org.
Merge pull request #1636 from milamberspace/L10N-update-4.8-20160812-fix-spanish-quote
Fix a quote issue with Spanish L10N (from transifex translation)This fix is for the 4.8 branch.
* pr/1636:
Fix a quote issue with Spanish L10N (from transifex translation)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9eb8b2e9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9eb8b2e9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9eb8b2e9
Branch: refs/heads/master
Commit: 9eb8b2e90bb63a89f1ff742a53f0c85fa88134a3
Parents: f4ae87c 6df5df5
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Fri Sep 2 00:33:10 2016 +0000
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Sep 2 00:33:10 2016 +0000
----------------------------------------------------------------------
client/WEB-INF/classes/resources/messages_es.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[3/4] git commit: updated refs/heads/master to 3afc4a1
Posted by bh...@apache.org.
Merge branch '4.8' into 4.9
Conflicts:
client/WEB-INF/classes/resources/messages_es.properties
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1e001259
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1e001259
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1e001259
Branch: refs/heads/master
Commit: 1e0012599ce94f1964bd56c286409fede28c4aff
Parents: 8ee418b 9eb8b2e
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Fri Sep 2 00:38:08 2016 +0000
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Sep 2 00:38:08 2016 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------