From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiang Xin Subject: [PATCH v5 0/7] i18n for git-am, git-rebase and git-merge Date: Wed, 25 Jul 2012 22:44:00 +0800 Message-ID: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Git List , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= , Jonathan Nieder , Stefano Lattarini , Martin von Zweigbergk , Jiang Xin To: Junio C Hamano X-From: git-owner@vger.kernel.org Wed Jul 25 16:44:39 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 1Su2pJ-0007wP-WD for gcvg-git-2@plane.gmane.org; Wed, 25 Jul 2012 16:44:38 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933362Ab2GYOoc (ORCPT ); Wed, 25 Jul 2012 10:44:32 -0400 Received: from mail-gh0-f174.google.com ([209.85.160.174]:36947 "EHLO mail-gh0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933279Ab2GYOoa (ORCPT ); Wed, 25 Jul 2012 10:44:30 -0400 Received: by ghrr11 with SMTP id r11so786362ghr.19 for ; Wed, 25 Jul 2012 07:44:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; bh=z5v1HtX06nG6DyNod6oIeLEXkqhXHWmWgRu0na17QoE=; b=yRXFYflsFPmL0KUA0nBu2OR70o1n/Aq7Ka8x5/jIgueku0wSEpVk0ShB61lFv4lP5r 0U4pHy8c6amup5F/glAos+6Z0R3XPb1jRs/xzhj8j2d/i50dct73BJ5G9bMg1HOBNvv7 TvPOoY94ANNTDgiaDRiul0ZC03+vv7gt3Yv65cLo0UkH4Me4oTWYdQBYG7bEddEtGAo6 r6eVuhFNeSkybC9Nuu7sit0OKcw6ro8XnzILUypAqNYywFBExOT1Nm+RKSwvAeBfrXcM 6rSwIvWVoKRWKWha3tneWlS9KqGc1DmUR6YYW0Y0mEQnhQ9Yu9cyC6OsCqcqg9aGzwOR 1/Og== Received: by 10.66.88.131 with SMTP id bg3mr13184827pab.16.1343227469715; Wed, 25 Jul 2012 07:44:29 -0700 (PDT) Received: from localhost.foo.bar ([123.116.228.123]) by mx.google.com with ESMTPS id op10sm14492740pbc.75.2012.07.25.07.44.21 (version=SSLv3 cipher=OTHER); Wed, 25 Jul 2012 07:44:28 -0700 (PDT) X-Mailer: git-send-email 1.7.12.rc0.16.gf4916ac Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Marked messages for translation in git-am, git-rebase, and git-merge. Also fixed suffered tests when turning GETTEXT_POISON switch on. Jiang Xin (7): i18n: New keywords for xgettext extraction from sh i18n: rebase: mark messages for translation i18n: Rewrite gettext messages start with dash Remove obsolete LONG_USAGE which breaks xgettext i18n: am: mark more strings for translation Remove dead code which contains bad gettext block i18n: merge-recursive: mark strings for translation Makefile | 3 +- git-am.sh | 20 ++--- git-rebase.sh | 89 ++++++++------------- git-submodule.sh | 2 +- merge-recursive.c | 148 +++++++++++++++++++---------------- t/t0201-gettext-fallbacks.sh | 8 +- t/t3400-rebase.sh | 8 +- t/t3404-rebase-interactive.sh | 2 +- t/t3406-rebase-message.sh | 9 ++- t/t6022-merge-rename.sh | 16 ++-- t/t6042-merge-rename-corner-cases.sh | 2 +- 11 files changed, 150 insertions(+), 157 deletions(-) -- 1.7.12.rc0.16.gf4916ac