From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-9.1 required=3.0 tests=AWL,BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 321792018B for ; Wed, 29 Jun 2016 15:10:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753074AbcF2PKr (ORCPT ); Wed, 29 Jun 2016 11:10:47 -0400 Received: from relay4.ptmail.sapo.pt ([212.55.154.24]:50862 "EHLO sapo.pt" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753032AbcF2PKq (ORCPT ); Wed, 29 Jun 2016 11:10:46 -0400 Received: (qmail 30941 invoked from network); 29 Jun 2016 15:10:40 -0000 Received: (qmail 17341 invoked from network); 29 Jun 2016 15:10:40 -0000 Received: from unknown (HELO catarina.localdomain) (vascomalmeida@sapo.pt@[85.246.157.91]) (envelope-sender ) by ptmail-mta-auth01 (qmail-ptmail-1.0.0) with ESMTPA for ; 29 Jun 2016 15:10:38 -0000 X-PTMail-RemoteIP: 85.246.157.91 X-PTMail-AllowedSender-Action: X-PTMail-Service: default From: Vasco Almeida To: git@vger.kernel.org Cc: Vasco Almeida , Jiang Xin , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= , David Aguilar Subject: [PATCH v2 07/11] i18n: add--interactive: mark edit_hunk_manually message for translation Date: Wed, 29 Jun 2016 15:09:41 +0000 Message-Id: <20160629150945.15015-8-vascomalmeida@sapo.pt> X-Mailer: git-send-email 2.9.0.148.g4ba279b In-Reply-To: <20160629150945.15015-1-vascomalmeida@sapo.pt> References: <20160629150945.15015-1-vascomalmeida@sapo.pt> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Mark message of edit_hunk_manually displayed in the editing file when user chooses 'e' option. The message had to be unfolded to allow translation of the $participle verb. Some messages end up being exactly the same for some uses cases, but left it for easier change in the future, e.g., wanting to change wording of one particular use case. Signed-off-by: Vasco Almeida --- git-add--interactive.perl | 60 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 49 insertions(+), 11 deletions(-) diff --git a/git-add--interactive.perl b/git-add--interactive.perl index acbfa4e..235142c 100755 --- a/git-add--interactive.perl +++ b/git-add--interactive.perl @@ -1057,22 +1057,60 @@ sub edit_hunk_manually { my $fh; open $fh, '>', $hunkfile or die sprintf(__("failed to open hunk edit file for writing: %s"), $!); - print $fh "# Manual hunk edit mode -- see bottom for a quick guide\n"; + print $fh __("# Manual hunk edit mode -- see bottom for a quick guide\n"); print $fh @$oldtext; - my $participle = $patch_mode_flavour{PARTICIPLE}; my $is_reverse = $patch_mode_flavour{IS_REVERSE}; my ($remove_plus, $remove_minus) = $is_reverse ? ('-', '+') : ('+', '-'); - print $fh <