Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id DAF982009D9 for ; Mon, 2 May 2016 22:05:10 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D99741609B0; Mon, 2 May 2016 22:05:10 +0200 (CEST) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 247561602C5 for ; Mon, 2 May 2016 22:05:09 +0200 (CEST) Received: (qmail 54630 invoked by uid 500); 2 May 2016 20:05:09 -0000 Mailing-List: contact dev-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 dev@cloudstack.apache.org Received: (qmail 54619 invoked by uid 99); 2 May 2016 20:05:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 May 2016 20:05:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D0983DFB73; Mon, 2 May 2016 20:05:08 +0000 (UTC) From: swill To: dev@cloudstack.apache.org Reply-To: dev@cloudstack.apache.org References: In-Reply-To: Subject: [GitHub] cloudstack pull request: Update L10N resource files with 4.7 strin... Content-Type: text/plain Message-Id: <20160502200508.D0983DFB73@git1-us-west.apache.org> Date: Mon, 2 May 2016 20:05:08 +0000 (UTC) archived-at: Mon, 02 May 2016 20:05:11 -0000 Github user swill commented on the pull request: https://github.com/apache/cloudstack/pull/1374#issuecomment-216347252 @milamberspace I think that is probably the best option. Then I will merge the new one (with these changes) first and forward merge and then merge #1515 and then if no conflicts #1376. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. ---