Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 102CD105D2 for ; Wed, 27 Nov 2013 13:18:10 +0000 (UTC) Received: (qmail 92148 invoked by uid 500); 27 Nov 2013 13:18:09 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 91959 invoked by uid 500); 27 Nov 2013 13:18:04 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 91951 invoked by uid 99); 27 Nov 2013 13:18:03 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Nov 2013 13:18:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BBD9B919B02; Wed, 27 Nov 2013 13:18:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: dahn@apache.org To: commits@cloudstack.apache.org Message-Id: <892ea797e43b4ab4acb996b5cb44bb9a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to de2c4ce Date: Wed, 27 Nov 2013 13:18:02 +0000 (UTC) Updated Branches: refs/heads/master d19688103 -> de2c4ceeb Fixed typo Signed-off-by: Daan Hoogland Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/de2c4cee Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/de2c4cee Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/de2c4cee Branch: refs/heads/master Commit: de2c4ceeb9b1724599979c864cf0c7e7c3ff8b83 Parents: d196881 Author: Jan-Arve Nygård Authored: Wed Nov 27 13:54:22 2013 +0100 Committer: Daan Hoogland Committed: Wed Nov 27 14:16:25 2013 +0100 ---------------------------------------------------------------------- client/WEB-INF/classes/resources/messages.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de2c4cee/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 461aa84..384a077 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -50,7 +50,7 @@ message.action.delete.nic=Please confirm that want to remove this NIC, which wil changed.item.properties=Changed item properties confirm.enable.s3=Please fill in the following information to enable support for S3-backed Secondary Storage confirm.enable.swift=Please fill in the following information to enable support for Swift -error.could.not.change.your.password.because.ldap.is.enabled=Error cloud not change your password because LDAP is enabled. +error.could.not.change.your.password.because.ldap.is.enabled=Error could not change your password because LDAP is enabled. error.could.not.enable.zone=Could not enable zone error.installWizard.message=Something went wrong; you may go back and correct any errors error.invalid.username.password=Invalid username or password