From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Krefting Subject: Re: [PATCH] l10n: Fix to Swedish translation Date: Wed, 3 Oct 2012 08:23:34 +0100 (CET) Organization: /universe/earth/europe/norway/oslo Message-ID: References: <7vlifo7jem.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Git Mailing List , Jiang Xin To: Junio C Hamano X-From: git-owner@vger.kernel.org Wed Oct 03 09:24:30 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TJJJP-000307-OJ for gcvg-git-2@plane.gmane.org; Wed, 03 Oct 2012 09:24:08 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756057Ab2JCHXn (ORCPT ); Wed, 3 Oct 2012 03:23:43 -0400 Received: from upper-gw.cixit.se ([92.43.32.133]:39701 "EHLO mail.cixit.se" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755731Ab2JCHXm (ORCPT ); Wed, 3 Oct 2012 03:23:42 -0400 Received: from ds9.cixit.se (peter@localhost [127.0.0.1]) by mail.cixit.se (8.14.3/8.14.3/Debian-9.4) with ESMTP id q937NZKT020642 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 3 Oct 2012 09:23:35 +0200 Received: from localhost (peter@localhost) by ds9.cixit.se (8.14.3/8.14.3/Submit) with ESMTP id q937NYgq020638; Wed, 3 Oct 2012 09:23:34 +0200 X-Authentication-Warning: ds9.cixit.se: peter owned process doing -bs In-Reply-To: <7vlifo7jem.fsf@alter.siamese.dyndns.org> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) Accept: text/plain X-Warning: Junk / bulk email will be reported X-Rating: This message is not to be eaten by humans X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.3.7 (mail.cixit.se [127.0.0.1]); Wed, 03 Oct 2012 09:23:35 +0200 (CEST) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Junio C Hamano: > I do not think there is any issue with conflicting patch or merge > caused by applying this to maint, but I CC'ed Jiang to let him know > what is going on. You might get a conflict in the header (in the "PO-Revision-Date" line). The fixed message itself is already in the 1.8.0.rc0 release. Thank you. -- \\// Peter - http://www.softwolves.pp.se/