Merge remote-tracking branch 'remotes/origin/cloudstack-globalization'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9b70828e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9b70828e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9b70828e Branch: refs/heads/master Commit: 9b70828e2857004184db1ca8909cb9db59b55a65 Parents: 0c5182d e009560 Author: Pranav Saxena <pranav.sax...@citrix.com> Authored: Fri Jun 21 17:31:45 2013 +0530 Committer: Pranav Saxena <pranav.sax...@citrix.com> Committed: Fri Jun 21 17:31:45 2013 +0530 ---------------------------------------------------------------------- .../classes/resources/messages_ja.properties | 525 +++++++++++-------- .../classes/resources/messages_zh_CN.properties | 418 ++++++++------- 2 files changed, 521 insertions(+), 422 deletions(-) ----------------------------------------------------------------------
