From patchwork Tue May 3 13:23:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Xin X-Patchwork-Id: 12835790 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71C73C433EF for ; Tue, 3 May 2022 13:24:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236036AbiECN1l (ORCPT ); Tue, 3 May 2022 09:27:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236016AbiECN1k (ORCPT ); Tue, 3 May 2022 09:27:40 -0400 Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2573377C7 for ; Tue, 3 May 2022 06:24:08 -0700 (PDT) Received: by mail-pg1-x535.google.com with SMTP id a191so1425627pge.2 for ; Tue, 03 May 2022 06:24:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=v4rmeG7xC05SBG4+TLUVFdD8yVUD37TGwPracvTN1GM=; b=jeJ94VMcJ5lL9R1PnmchgNEtjQRVGjw00cy24ISdI7WNP82i1cC+1TUBbU4kHhkLt1 y2o0yaYmwizJtCLa1hXPLoYK6Fpwyfw0PkuX7mESiF3j4y3TRe50FnM/AZs6Ks1240jG Ut82GEx5eMqLLbTRO/EJDnc8GVWc6JR7qDOwayRAU+Q0uPVW1GTCq7mzvR3sGyJjivwT jEgxdbtSY5Kk3NZwe1EIXTmgzJKQ6uyUbhNONNvQLHCU3/8tRVSirhFULXufWXyWmVOW Vx0hVNXFDdnMUlCOQrFx6/DbaHeZQzneAFvcRKpJsVVODDpYp3U1Iu+VaC7YrJzkZCKc 2ZqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=v4rmeG7xC05SBG4+TLUVFdD8yVUD37TGwPracvTN1GM=; b=SVkzMeHLB/2sYDLa0ri7ZTWrfhbwRmsY3lXOBL2+sviFnlGAxYaLOtpdwsIWLbLuDV ABcKtKeWmWnZrHiEXnMkCWVi5jXOOV323DArw8Io0pUYeuUuRhB2//SD0l/WC3hUh7wN tJXQ+i5ppyaIAjVUFZUBmZehzM53g9RuB3zGK7s7ZPCxDzCOrV8oTiGnGAcd9D8CoTyL Sh0hqqvZpXWTiWuA+K/1TOh17Yfk/m12xPd2hpYcunDc6HXDVYuOVyoFXjBN6/EuPdrC F7AjZcfOG1Bomz0f2eaN6qPysc24Ro/bPVLJ5DS0aevATh7EcVEuBHkcNWPrT30cLXlr ZkqQ== X-Gm-Message-State: AOAM530LYk4uikmmYxbrBXIrTBVYXDxs71Hg4jPg8UTqoWsFI2fMdlEy fitbefwc8vgR+kzsUXlklFU= X-Google-Smtp-Source: ABdhPJyG37W27+cPlgfdFsBzoA5LKnq/vrdDdim+TDHvd/O0BFS2V1UIqDjn6j2ygmkGK9uBr4mbnQ== X-Received: by 2002:a63:f749:0:b0:3aa:361c:8827 with SMTP id f9-20020a63f749000000b003aa361c8827mr13752555pgk.361.1651584248308; Tue, 03 May 2022 06:24:08 -0700 (PDT) Received: from tigtog.localdomain.localdomain (144.34.163.219.16clouds.com. [144.34.163.219]) by smtp.gmail.com with ESMTPSA id j8-20020aa78008000000b0050dc76281b3sm6484950pfi.141.2022.05.03.06.24.06 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 May 2022 06:24:07 -0700 (PDT) From: Jiang Xin To: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Junio C Hamano , Git List Cc: Jiang Xin , Alexander Shopov , Jordi Mas , =?utf-8?q?Matthias_R=C3=BCster?= , Jimmy Angelakos , =?utf-8?q?Christopher_D=C3=ADaz?= , =?utf-8?q?Jean-No=C3=ABl_Avila?= , Bagas Sanjaya , Alessandro Menti , Gwan-gyeong Mun , Arusekk , Daniel Santos , Dimitriy Ryazantcev , Peter Krefting , Emir SARI , =?utf-8?b?VHLhuqduIE5n4buNYyBRdcOibg==?= , Fangyi Zhou , Yi-Jyun Pan Subject: [PATCH 1/9] Makefile: sort "po/git.pot" by file location Date: Tue, 3 May 2022 21:23:46 +0800 Message-Id: <20220503132354.9567-2-worldhello.net@gmail.com> X-Mailer: git-send-email 2.32.0.rc3 In-Reply-To: <20220503132354.9567-1-worldhello.net@gmail.com> References: <20220503132354.9567-1-worldhello.net@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Jiang Xin Before feeding xgettext with more C souce files which may be ignored by various compiler conditions, add new option "--sort-by-file" to xgettext program to create stable message template file "po/git.pot". With this update, the newly generated "po/git.pot" will has the same entries while in a different order. We won't checkin the newly generated "po/git.pot", because we will remove it from tree in a later commit. Signed-off-by: Jiang Xin --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index f8bccfab5e..83e968e2a4 100644 --- a/Makefile +++ b/Makefile @@ -2706,6 +2706,7 @@ XGETTEXT_FLAGS = \ --force-po \ --add-comments=TRANSLATORS: \ --msgid-bugs-address="Git Mailing List " \ + --sort-by-file \ --from-code=UTF-8 XGETTEXT_FLAGS_C = $(XGETTEXT_FLAGS) --language=C \ --keyword=_ --keyword=N_ --keyword="Q_:1,2" From patchwork Tue May 3 13:23:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Xin X-Patchwork-Id: 12835792 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA180C433F5 for ; Tue, 3 May 2022 13:24:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236043AbiECN1o (ORCPT ); Tue, 3 May 2022 09:27:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236016AbiECN1n (ORCPT ); Tue, 3 May 2022 09:27:43 -0400 Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AFE7B36E02 for ; Tue, 3 May 2022 06:24:10 -0700 (PDT) Received: by mail-pf1-x42c.google.com with SMTP id v11so5213691pff.6 for ; Tue, 03 May 2022 06:24:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HXw7gyc3T9msHC621RbhjmAnZiaHQhfwHZIa3YrN8t8=; b=nilCOYMYOtK3Ys/iPt5HyNnO2amKaxono/SgeAOwVbFaq5B9Ij8QNVutBJMf4iPo5T YQ+ZD8ppGGftUL3rKM7gIKwinxy1oNU0QYQjAD3RXkKehpVVqVUcyMMNfgBeHaDySFat 1T/MzrBcnIKApE/kGukpmEqpCMrerJZm4wjjGN/Ey68yy6GsoKM4E7PkXPCBkPV34Mf6 WCFMDfx3/4rLpKj0inZm1UXzNN1BE2lU8ATFkvFwrRP8iidha9YZKFEkMvLaPD/ZjTMA mcdyBybLUwThv0LedXYAoSsMKD/TohFHGy7N7jRG0D+pU2S2Lm+UF2LzBQsDmdbC2fnU ldBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HXw7gyc3T9msHC621RbhjmAnZiaHQhfwHZIa3YrN8t8=; b=77nBZls0QikBN04L+0iN/eNQ3hiD0ulzBY7xlkp8pjqEw2aMLGNBTOhoHwe6zS9id7 F7HG9I85Dyp7UKz0IXG44NFjlRWy/5rN5nwmvMhu/jkvI1oBSGl51LmaN0y+KqZxmYXp Ba2AKXQvYs4Bp8GF6qKOwmL1epwSvpq+0/3nAHEbYuq02Xl+G/sN70nWXP38+wYypRDT TXQXjGJFdml07D0D37Q7kjfuDi3g8gY27gVxejbU8MmNg688NYCQwsQjADcevyNs9Tj6 KyUm2RjxBn7XjZPsELTcJ3oz/fCOW22LZETCpW+3TnMY6pO41MI4ZqmFr0Ak+5q1Hbv6 QbrA== X-Gm-Message-State: AOAM531GgeHBJiiVcyZb3EIyKxxP9isHSRDqD5SNiD/lrST+j9I0Xmh3 ABUVevDIDMUiJ/mBTQVHzXk= X-Google-Smtp-Source: ABdhPJwh0vEXYk7OYn442I/Iji5ofMjctu6ml+6e9qVBaEvFmE+9I0PWDU1vVsYqV3ddq79p7DfKfw== X-Received: by 2002:a63:6c0a:0:b0:3ab:8716:3d04 with SMTP id h10-20020a636c0a000000b003ab87163d04mr13509647pgc.507.1651584250228; Tue, 03 May 2022 06:24:10 -0700 (PDT) Received: from tigtog.localdomain.localdomain (144.34.163.219.16clouds.com. [144.34.163.219]) by smtp.gmail.com with ESMTPSA id j8-20020aa78008000000b0050dc76281b3sm6484950pfi.141.2022.05.03.06.24.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 May 2022 06:24:09 -0700 (PDT) From: Jiang Xin To: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Junio C Hamano , Git List Cc: Jiang Xin , Alexander Shopov , Jordi Mas , =?utf-8?q?Matthias_R=C3=BCster?= , Jimmy Angelakos , =?utf-8?q?Christopher_D=C3=ADaz?= , =?utf-8?q?Jean-No=C3=ABl_Avila?= , Bagas Sanjaya , Alessandro Menti , Gwan-gyeong Mun , Arusekk , Daniel Santos , Dimitriy Ryazantcev , Peter Krefting , Emir SARI , =?utf-8?b?VHLhuqduIE5n4buNYyBRdcOibg==?= , Fangyi Zhou , Yi-Jyun Pan Subject: [PATCH 2/9] Makefile: generate "po/git.pot" from stable LOCALIZED_C Date: Tue, 3 May 2022 21:23:47 +0800 Message-Id: <20220503132354.9567-3-worldhello.net@gmail.com> X-Mailer: git-send-email 2.32.0.rc3 In-Reply-To: <20220503132354.9567-1-worldhello.net@gmail.com> References: <20220503132354.9567-1-worldhello.net@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Jiang Xin When running "make pot" on different platform, we may get a different message template file "po/git.pot". This is because the "LOCALIZED_C" variable may have different C source files on different platforms or different compiler conditions. We can make a stable "LOCALIZED_C" variable by applying patch snippets as follows: ifdef NO_LIBGEN_H COMPAT_CFLAGS += -DNO_LIBGEN_H COMPAT_OBJS += compat/basename.o +else + LOCALIZED_C += compat/basename.c endif But it is much simpler to use variables "$(FOUND_C_SOURCES)" and "$(FOUND_C_SOURCES)" to form a stable "LOCALIZED_C". With this update, the newly generated "po/git.pot" will have 30 new entries coming from the following C source files: * compat/fsmonitor/fsm-listen-win32.c * compat/mingw.c * compat/regex/regcomp.c * compat/simple-ipc/ipc-win32.c Signed-off-by: Jiang Xin --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 83e968e2a4..60ca42c268 100644 --- a/Makefile +++ b/Makefile @@ -2714,7 +2714,8 @@ XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \ --keyword=gettextln --keyword=eval_gettextln XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --language=Perl \ --keyword=__ --keyword=N__ --keyword="__n:1,2" -LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H) +LOCALIZED_C = $(FOUND_C_SOURCES) $(SCALAR_SOURCES) \ + $(FOUND_H_SOURCES) $(GENERATED_H) LOCALIZED_SH = $(SCRIPT_SH) LOCALIZED_SH += git-sh-setup.sh LOCALIZED_PERL = $(SCRIPT_PERL) From patchwork Tue May 3 13:23:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jiang Xin X-Patchwork-Id: 12835794 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 64232C433F5 for ; Tue, 3 May 2022 13:24:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236129AbiECN2M (ORCPT ); Tue, 3 May 2022 09:28:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236044AbiECN1p (ORCPT ); Tue, 3 May 2022 09:27:45 -0400 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBB8236E02 for ; Tue, 3 May 2022 06:24:12 -0700 (PDT) Received: by mail-pj1-x1031.google.com with SMTP id a15-20020a17090ad80f00b001dc2e23ad84so2167795pjv.4 for ; Tue, 03 May 2022 06:24:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=opKV/F8fuD1w+A35Yl3PBygP921yYY+NTlXMm1T6els=; b=U+nxCKg1Dj01tCmszTCCUS3DGMJZ5eLZZGzmT7o8nN23CEVQ7Lv9BfAJUTlp7Z6LlG kr9SvXIqs2uPAgnAHN9Vb29FKM2uToQW8pfDImfMl2O7fdMtMkBsZ5dZ8MucrG6uqfja 7hv/j9rv4ABD9rFSW5TFj/5YWVIAQSbmGquhIZc/YrWkPqMCKTF750ngXkcuebkzNQXb wUERXnIX4k4YSEITjIkatjiQno4w/t/X0g7oLVf5n/LyxyM0vtHiKx57DK37Ld8+xXr5 1ydkbeVcGBYYzxozu/cj1NJtsoHNR6NwsD2Z/tpDQRLziqnTegWJkRDIMh0Xq0vB7ys8 qQew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=opKV/F8fuD1w+A35Yl3PBygP921yYY+NTlXMm1T6els=; b=lGMdHUTwF+De4Odhp9Uho6pvccONi1VvfACv6cp9iEjKgxA5DXHwlp3W3xJp7xAYV8 QPxDPj4/jNRDLdpVKVI8gnjE/A3B76ns2m61DvzAVL1UcCejab0Eu2kTdsuZkDo1Jl7s lh74L455NuyjmmxMC851+R8BbW3NL2Ozua6L7xXdn1WnPoFfF6ik9k/uL/20Nw3Jdtf+ YXhlGIpo8dEzSys88/JikgkHSNxK70n2Arh4uKzjkupCyCb849mz5vpOAh7HAOpBdrRc bfJAkH0PLvTYPvjMKKF/qMYlbZJtpiOpCeh6dVfd2n0Kt2KvCK1sqIYSN7iM2DvGLczN iqwg== X-Gm-Message-State: AOAM531X7W+4ZGoxcqAzWe+YBvCrPRGef3TH9gJ9f1dII0S4tUjPGyTE OirQkAPCRIVzdXAwF/n5Ewk= X-Google-Smtp-Source: ABdhPJwXGu+6cWQg/fRoqEAY2ZYgR5jfXl+HoPJ/lahrscjlXdNGj8RfPfzcfht3XPeF2UVoK9aMzw== X-Received: by 2002:a17:90a:ec02:b0:1dc:3b8d:38e5 with SMTP id l2-20020a17090aec0200b001dc3b8d38e5mr4767352pjy.134.1651584252257; Tue, 03 May 2022 06:24:12 -0700 (PDT) Received: from tigtog.localdomain.localdomain (144.34.163.219.16clouds.com. [144.34.163.219]) by smtp.gmail.com with ESMTPSA id j8-20020aa78008000000b0050dc76281b3sm6484950pfi.141.2022.05.03.06.24.10 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 May 2022 06:24:11 -0700 (PDT) From: Jiang Xin To: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Junio C Hamano , Git List Cc: Alexander Shopov , Jordi Mas , =?utf-8?q?Matthias_R=C3=BCster?= , Jimmy Angelakos , =?utf-8?q?Christopher_D=C3=ADaz?= , =?utf-8?q?Jean-No=C3=ABl_Avila?= , Bagas Sanjaya , Alessandro Menti , Gwan-gyeong Mun , Arusekk , Daniel Santos , Dimitriy Ryazantcev , Peter Krefting , Emir SARI , =?utf-8?b?VHLhuqduIE5n4buNYyBRdcOibg==?= , Fangyi Zhou , Yi-Jyun Pan , Jiang Xin Subject: [PATCH 3/9] Makefile: have "make pot" not "reset --hard" Date: Tue, 3 May 2022 21:23:48 +0800 Message-Id: <20220503132354.9567-4-worldhello.net@gmail.com> X-Mailer: git-send-email 2.32.0.rc3 In-Reply-To: <20220503132354.9567-1-worldhello.net@gmail.com> References: <20220503132354.9567-1-worldhello.net@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Ævar Arnfjörð Bjarmason Before commit fc0fd5b23b (Makefile: help gettext tools to cope with our custom PRItime format, 2017-07-20) we'd consider source files as-is with gettext, but because we need to understand PRItime in the same way that gettext itself understands PRIuMAX we'd first check if we had a clean checkout, then munge all of the processed files in-place with "sed", generate "po/git.pot", and then finally "reset --hard" to undo our changes. By generating "pot" snippets in ".build/pot/po" for each source file and rewriting certain source files with PRItime macros to temporary files in ".build/pot/po", we can avoid running "make pot" by altering files in place and doing a "reset --hard" afterwards. This speed of "make pot" is slower than before on an initial run, because we run "xgettext" many times (once per source file), but it can be boosted by parallelization. It is *much* faster for incremental runs, and will allow us to implement related targets in subsequent commits. When the "pot" target was originally added in cd5513a7168 (i18n: Makefile: "pot" target to extract messages marked for translation, 2011-02-22) it behaved like a "normal" target. I.e. we'd skip the re-generation of the po/git.pot if nothing had to be done. Then after po/git.pot was checked in in dce37b66fb0 (l10n: initial git.pot for 1.7.10 upcoming release, 2012-02-13) the target was broken until 1f31963e921 (i18n: treat "make pot" as an explicitly-invoked target, 2014-08-22) when it was made to depend on "FORCE". I.e. the Makefile's dependency resolution inherently can't handle incremental building when the target file may be updated by git (or something else external to "make"). But this case no longer applies, so FORCE is no longer needed. That out of the way, the main logic change here is getting rid of the "reset --hard": We'll generate intermediate .build/pot/po/%.po files from %, which is handy to see at a glance what strings (if any) in a given file are marked for translation: $ make .build/pot/po/pretty.c.po [...] $ cat .build/pot/po/pretty.c.po #: pretty.c:1051 msgid "unable to parse --pretty format" msgstr "" $ For these C source files which contain the PRItime macros, we will create temporary munged *.c files in a tree in ".build/pot/po" corresponding to our source tree, and have "xgettext" consider those. The rule needs to be careful to "(cd .build/pot/po && ...)", because otherwise the comments in the po/git.pot file wouldn't refer to the correct source locations (they'd be prefixed with ".build/pot/po"). This changes the output of the generated po/git.pot file in one minor way: Because we're using msgcat(1) instead of xgettext(1) to concatenate the output we'll now disambiguate where "TRANSLATORS" comments come from, in cases where a message is the same in N files, and either only one has a "TRANSLATORS" comment, or they're different. E.g. for the "Your edited hunk[...]" message we'll now apply this change (comment content elided): +#. #-#-#-#-# add-patch.c.po #-#-#-#-# #. TRANSLATORS: do not translate [y/n] [...] +#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# #. TRANSLATORS: do not translate [y/n] [...] #: add-patch.c:1253 git-add--interactive.perl:1244 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" There are six such changes, and they all make the context more understandable, as msgcat(1) is better at handling these edge cases than xgettext(1)'s previously used "--join-existing" flag. While we could rename the "pot" snippets without the ".po" extention to use more intuitive filenames in the comments, but that will confuse the IDE with lots of invalid C or perl source files in ".build/pot/po" directory. The addition of "--omit-header" option for xgettext makes the "pot" snippets in ".build/pot/po/*.po" smaller. For the pot header of "po/git.pot", we use xgettext to generate a "pot" header file ".build/pot/git.header" from an empty file at runtime, and use this header to assemble "po/git.pot". But as we'll see in a subsequent commit this header behavior has been hiding an encoding-related bug from us, so let's carry it forward instead of re-generating it with xgettext(1). Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Jiang Xin --- .gitignore | 1 + Makefile | 73 ++++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 53 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index e81de1063a..a452215764 100644 --- a/.gitignore +++ b/.gitignore @@ -200,6 +200,7 @@ *.[aos] *.o.json *.py[co] +.build/ .depend/ *.gcda *.gcno diff --git a/Makefile b/Makefile index 60ca42c268..c32ac4ca30 100644 --- a/Makefile +++ b/Makefile @@ -569,6 +569,7 @@ INSTALL = install TCL_PATH = tclsh TCLTK_PATH = wish XGETTEXT = xgettext +MSGCAT = msgcat MSGFMT = msgfmt CURL_CONFIG = curl-config GCOV = gcov @@ -2706,6 +2707,7 @@ XGETTEXT_FLAGS = \ --force-po \ --add-comments=TRANSLATORS: \ --msgid-bugs-address="Git Mailing List " \ + --package-name=Git \ --sort-by-file \ --from-code=UTF-8 XGETTEXT_FLAGS_C = $(XGETTEXT_FLAGS) --language=C \ @@ -2714,6 +2716,7 @@ XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \ --keyword=gettextln --keyword=eval_gettextln XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --language=Perl \ --keyword=__ --keyword=N__ --keyword="__n:1,2" +MSGCAT_FLAGS = --sort-by-file LOCALIZED_C = $(FOUND_C_SOURCES) $(SCALAR_SOURCES) \ $(FOUND_H_SOURCES) $(GENERATED_H) LOCALIZED_SH = $(SCRIPT_SH) @@ -2726,34 +2729,61 @@ LOCALIZED_SH += t/t0200/test.sh LOCALIZED_PERL += t/t0200/test.perl endif -## Note that this is meant to be run only by the localization coordinator -## under a very controlled condition, i.e. (1) it is to be run in a -## Git repository (not a tarball extract), (2) any local modifications -## will be lost. +## We generate intermediate .build/pot/po/%.po files containing a +## extract of the translations we find in each file in the source +## tree. We will assemble them using msgcat to create the final +## "po/git.pot" file. +LOCALIZED_ALL_GEN_PO = + +LOCALIZED_C_GEN_PO = $(LOCALIZED_C:%=.build/pot/po/%.po) +LOCALIZED_ALL_GEN_PO += $(LOCALIZED_C_GEN_PO) + +LOCALIZED_SH_GEN_PO = $(LOCALIZED_SH:%=.build/pot/po/%.po) +LOCALIZED_ALL_GEN_PO += $(LOCALIZED_SH_GEN_PO) + +LOCALIZED_PERL_GEN_PO = $(LOCALIZED_PERL:%=.build/pot/po/%.po) +LOCALIZED_ALL_GEN_PO += $(LOCALIZED_PERL_GEN_PO) + ## Gettext tools cannot work with our own custom PRItime type, so ## we replace PRItime with PRIuMAX. We need to update this to ## PRIdMAX if we switch to a signed type later. +$(LOCALIZED_C_GEN_PO): .build/pot/po/%.po: % + $(call mkdir_p_parent_template) + $(QUIET_XGETTEXT) \ + if grep -q PRItime $<; then \ + (\ + sed -e 's|PRItime|PRIuMAX|g' <$< \ + >.build/pot/po/$< && \ + cd .build/pot/po && \ + $(XGETTEXT) --omit-header \ + -o $(@:.build/pot/po/%=%) \ + $(XGETTEXT_FLAGS_C) $< && \ + rm $<; \ + ); \ + else \ + $(XGETTEXT) --omit-header \ + -o $@ $(XGETTEXT_FLAGS_C) $<; \ + fi -po/git.pot: $(GENERATED_H) FORCE - # All modifications will be reverted at the end, so we do not - # want to have any local change. - git diff --quiet HEAD && git diff --quiet --cached +$(LOCALIZED_SH_GEN_PO): .build/pot/po/%.po: % + $(call mkdir_p_parent_template) + $(QUIET_XGETTEXT)$(XGETTEXT) --omit-header \ + -o$@ $(XGETTEXT_FLAGS_SH) $< - @for s in $(LOCALIZED_C) $(LOCALIZED_SH) $(LOCALIZED_PERL); \ - do \ - sed -e 's|PRItime|PRIuMAX|g' <"$$s" >"$$s+" && \ - cat "$$s+" >"$$s" && rm "$$s+"; \ - done +$(LOCALIZED_PERL_GEN_PO): .build/pot/po/%.po: % + $(call mkdir_p_parent_template) + $(QUIET_XGETTEXT)$(XGETTEXT) --omit-header \ + -o$@ $(XGETTEXT_FLAGS_PERL) $< - $(QUIET_XGETTEXT)$(XGETTEXT) -o$@+ $(XGETTEXT_FLAGS_C) $(LOCALIZED_C) - $(QUIET_XGETTEXT)$(XGETTEXT) -o$@+ --join-existing $(XGETTEXT_FLAGS_SH) \ - $(LOCALIZED_SH) - $(QUIET_XGETTEXT)$(XGETTEXT) -o$@+ --join-existing $(XGETTEXT_FLAGS_PERL) \ - $(LOCALIZED_PERL) +.build/pot/git.header: $(LOCALIZED_ALL_GEN_PO) + $(call mkdir_p_parent_template) + $(QUIET_XGETTEXT)$(XGETTEXT) $(XGETTEXT_FLAGS_C) \ + -o - /dev/null | \ + sed -e 's|charset=CHARSET|charset=UTF-8|g' >$@ && \ + echo '"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\\n"' >>$@ - # Reverting the munged source, leaving only the updated $@ - git reset --hard - mv $@+ $@ +po/git.pot: .build/pot/git.header $(LOCALIZED_ALL_GEN_PO) + $(QUIET_GEN)$(MSGCAT) $(MSGCAT_FLAGS) $^ >$@ .PHONY: pot pot: po/git.pot @@ -3292,6 +3322,7 @@ cocciclean: $(RM) contrib/coccinelle/*.cocci.patch* clean: profile-clean coverage-clean cocciclean + $(RM) -r .build $(RM) *.res $(RM) $(OBJECTS) $(RM) $(LIB_FILE) $(XDIFF_LIB) $(REFTABLE_LIB) $(REFTABLE_TEST_LIB) From patchwork Tue May 3 13:23:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jiang Xin X-Patchwork-Id: 12835798 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 97B35C433EF for ; Tue, 3 May 2022 13:25:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236113AbiECN2E (ORCPT ); Tue, 3 May 2022 09:28:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236048AbiECN1q (ORCPT ); Tue, 3 May 2022 09:27:46 -0400 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B093936E02 for ; Tue, 3 May 2022 06:24:14 -0700 (PDT) Received: by mail-pj1-x1030.google.com with SMTP id e24so15312042pjt.2 for ; Tue, 03 May 2022 06:24:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=N9iTIbDX77gmPMRVwJWwI8SkX7/yLK0p73I4Ev/37A8=; b=KLLNEHKmqJE6JFxAI8bBR8O5Cnk+Wjy1LjQonNmu8nAaFfhcyLOQOExDYd9g42nJts BSmgsWzyYy3YIUjEuZyteBGuBNygrsoAFv5UmcOAG2C9oikWNiS5uxj8XIy/KNctquS4 QWudj1VeZV1XYn8rVNhXRo9S4lMz9Mc/ddo0joRkRQvdy7z+fHfuDmyf5rbRNrmEFYqp UbKjlxgTzuOpa6w6bZxmI96KCcxIvpcTx3YfF4HKYUVobTn34Ckh5Vs+6/B/YqeCOS1C /ZoPYmNf/L7EVjm5Dh68Y2Sy2bAQpPBpPBoyzkbXVheo//JhvAMBG8Ur94EPYs2/+DwD ecTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=N9iTIbDX77gmPMRVwJWwI8SkX7/yLK0p73I4Ev/37A8=; b=cfRET7YJblB6Y7JlUCx09mUF6VfQpAyXTAAn8W5KYUb8f1W/IWmSWAuKAOIcC4cQwd KzlXFqmWAsLGBluPawIvK/JRrxmrTkUWGxXQzBbO0LqE0vyVq87aw3QZflTyPIDHnUyL 4sYKy7L9jCxS/qQ9sokOslTuqFujb/J6o9VIocY2gdgSJQtrnI4TgWKayJ5hKTvcRguy NNrsv/Il414F3TWawpdAYwCBCzfFL9XIBCrGZ3y8aTstvpibaLez/7pA8QEAHqJqCHWR qS8ryORs0N17d/o5/TENcXpbsjiOYQPY/E8e999M1uMVS0Jl1QuOStz3hDLU9ymtn8N7 Y0EA== X-Gm-Message-State: AOAM531dJmvozUhExlN3IlZnHsrYHWtYxZkon2umaT7h9j/OkIuQ853U amltrHY12oDaS5B+04DMTa4= X-Google-Smtp-Source: ABdhPJz/bcwRR8Waa0v/yUOG3Cjsr3pvI6serGa1tqxUwcRSx1BeeNogmVuV4mFKEaeSMrbA3kZ0bw== X-Received: by 2002:a17:90b:33c8:b0:1d9:8cda:fd70 with SMTP id lk8-20020a17090b33c800b001d98cdafd70mr4685548pjb.161.1651584254210; Tue, 03 May 2022 06:24:14 -0700 (PDT) Received: from tigtog.localdomain.localdomain (144.34.163.219.16clouds.com. [144.34.163.219]) by smtp.gmail.com with ESMTPSA id j8-20020aa78008000000b0050dc76281b3sm6484950pfi.141.2022.05.03.06.24.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 May 2022 06:24:13 -0700 (PDT) From: Jiang Xin To: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Junio C Hamano , Git List Cc: Alexander Shopov , Jordi Mas , =?utf-8?q?Matthias_R=C3=BCster?= , Jimmy Angelakos , =?utf-8?q?Christopher_D=C3=ADaz?= , =?utf-8?q?Jean-No=C3=ABl_Avila?= , Bagas Sanjaya , Alessandro Menti , Gwan-gyeong Mun , Arusekk , Daniel Santos , Dimitriy Ryazantcev , Peter Krefting , Emir SARI , =?utf-8?b?VHLhuqduIE5n4buNYyBRdcOibg==?= , Fangyi Zhou , Yi-Jyun Pan , Jiang Xin Subject: [PATCH 4/9] i18n CI: stop allowing non-ASCII source messages in po/git.pot Date: Tue, 3 May 2022 21:23:49 +0800 Message-Id: <20220503132354.9567-5-worldhello.net@gmail.com> X-Mailer: git-send-email 2.32.0.rc3 In-Reply-To: <20220503132354.9567-1-worldhello.net@gmail.com> References: <20220503132354.9567-1-worldhello.net@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Ævar Arnfjörð Bjarmason In the preceding commit we moved away from using xgettext(1) to both generate the po/git.pot, and to merge the incrementally generated po/git.pot+ file as we sourced translations from C, shell and Perl. Doing it this way, which dates back to my initial implementation[1][2][3] was conflating two things: With xgettext(1) the --from-code both controls what encoding is specified in the po/git.pot's header, and what encoding we allow in source messages. We don't ever want to allow non-ASCII in *source messages*, and doing so has hid e.g. a buggy message introduced in a6226fd772b (submodule--helper: convert the bulk of cmd_add() to C, 2021-08-10) from us, we'd warn about it before, but only when running "make pot", but the operation would still succeed. Now we'll error out on it when running "make pot". Since the preceding Makefile changes made this easy: let's add a "make check-pot" target and run it as part of the "static-analysis" CI target, this will ensure that we catch any such issues in the future. 1. cd5513a7168 (i18n: Makefile: "pot" target to extract messages marked for translation, 2011-02-22) 2. adc3b2b2767 (Makefile: add xgettext target for *.sh files, 2011-05-14) 3. 5e9637c6297 (i18n: add infrastructure for translating Git with gettext, 2011-11-18) Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Jiang Xin --- Makefile | 6 ++++-- builtin/submodule--helper.c | 2 +- ci/run-static-analysis.sh | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c32ac4ca30..4b7cb2be65 100644 --- a/Makefile +++ b/Makefile @@ -2708,8 +2708,7 @@ XGETTEXT_FLAGS = \ --add-comments=TRANSLATORS: \ --msgid-bugs-address="Git Mailing List " \ --package-name=Git \ - --sort-by-file \ - --from-code=UTF-8 + --sort-by-file XGETTEXT_FLAGS_C = $(XGETTEXT_FLAGS) --language=C \ --keyword=_ --keyword=N_ --keyword="Q_:1,2" XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \ @@ -2788,6 +2787,9 @@ po/git.pot: .build/pot/git.header $(LOCALIZED_ALL_GEN_PO) .PHONY: pot pot: po/git.pot +.PHONY: check-pot +check-pot: pot + ifdef NO_GETTEXT POFILES := MOFILES := diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 2c87ef9364..b97f02eed5 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -3378,7 +3378,7 @@ static int module_add(int argc, const char **argv, const char *prefix) N_("reference repository")), OPT_BOOL(0, "dissociate", &dissociate, N_("borrow the objects from reference repositories")), OPT_STRING(0, "name", &add_data.sm_name, N_("name"), - N_("sets the submodule’s name to the given string " + N_("sets the submodule's name to the given string " "instead of defaulting to its path")), OPT_INTEGER(0, "depth", &add_data.depth, N_("depth for shallow clones")), OPT_END() diff --git a/ci/run-static-analysis.sh b/ci/run-static-analysis.sh index 65bcebda41..0d51e5ce0e 100755 --- a/ci/run-static-analysis.sh +++ b/ci/run-static-analysis.sh @@ -29,4 +29,6 @@ fi make hdr-check || exit 1 +make check-pot + save_good_tree From patchwork Tue May 3 13:23:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jiang Xin X-Patchwork-Id: 12835793 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 366F0C433F5 for ; Tue, 3 May 2022 13:24:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236105AbiECN2C (ORCPT ); Tue, 3 May 2022 09:28:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236054AbiECN1s (ORCPT ); Tue, 3 May 2022 09:27:48 -0400 Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A050A36E02 for ; Tue, 3 May 2022 06:24:16 -0700 (PDT) Received: by mail-pj1-x1032.google.com with SMTP id cq17-20020a17090af99100b001dc0386cd8fso1978814pjb.5 for ; Tue, 03 May 2022 06:24:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=afudddGVnz4akZ8BjU0LTiYNH4Wl6DS2m4iEQF4MNTk=; b=LS8fAgUvmXEjZFCSsXcYAGVzH5yA7bpis5hCxsk04RCNSlzyCxZH8Yv5z1zl/Y6K39 eJj4xZcWH+CdAR428MZ1TSsCJDewwTZaCGqUXVHPOHRl320XgDu2nomc/10485Zd0KOs m+HAOmly5ACEDg0DFhr9XK6q/iSEuZNPDXLwkkx+wHjXFK1NXOSTMupCvFn8xwyXlKkm zRZFlPMUR0CnOrfKGP5RGBp0sDLU+z1KbsDlziUUPecJ1XMW2wtRq3HldLlqVFJuaBR3 rnNbQUdFZePSoAZMOLXf5SoSgcuHcOWgfQ2n9UG7YfKmk2M6A/fCeUGjUb2w92+TJWXe UtEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=afudddGVnz4akZ8BjU0LTiYNH4Wl6DS2m4iEQF4MNTk=; b=NGgkEIWoTEuhWe0vhVvUd/RsPY0vkXy/QQQpSzg4oDfaVXNMu2PBLhEfI7N2Ucp12p 9iGSuixRTSmkTCHTKrVA1HJ7vEug0Cmgf5W4qxEtEhyLOWDtyqf3JoULyP7tWMSQB2By VyemgMEh/swA899TvlZnYffxYzTLU0OM5rJwBZRNMUQKYt3Og24sCxNE1Ky3r7BLcd4K 7midU1ZGvBIIh1FI/MaFv+tJl3VWBoUnPc1RQjlul1AUajXYWLaxkehHoub3mD6AS3yt HiHMFjzeBfH1AMTMo/nf/i9djPDhbkLp1kk/QeR4EvZB+w1QoYcdpCNuO12m2pCdx+1c Z28A== X-Gm-Message-State: AOAM531DV++Ge6tfvxp26HXZdwyXpxrC9tEIgC7AUH9oRgpbofJ1Cimu Bll6wMlZ3DFaXqAQQTIJyao= X-Google-Smtp-Source: ABdhPJwqrOyacSBU/UDUaf6oT8rM4cy1qjLQOA9wCKE/rdVdFbEyk/Fzo7oRYcgcu9EEhioM8r9fOQ== X-Received: by 2002:a17:90a:1f4f:b0:1d8:23d9:de1e with SMTP id y15-20020a17090a1f4f00b001d823d9de1emr4674986pjy.42.1651584256126; Tue, 03 May 2022 06:24:16 -0700 (PDT) Received: from tigtog.localdomain.localdomain (144.34.163.219.16clouds.com. [144.34.163.219]) by smtp.gmail.com with ESMTPSA id j8-20020aa78008000000b0050dc76281b3sm6484950pfi.141.2022.05.03.06.24.14 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 May 2022 06:24:15 -0700 (PDT) From: Jiang Xin To: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Junio C Hamano , Git List Cc: Alexander Shopov , Jordi Mas , =?utf-8?q?Matthias_R=C3=BCster?= , Jimmy Angelakos , =?utf-8?q?Christopher_D=C3=ADaz?= , =?utf-8?q?Jean-No=C3=ABl_Avila?= , Bagas Sanjaya , Alessandro Menti , Gwan-gyeong Mun , Arusekk , Daniel Santos , Dimitriy Ryazantcev , Peter Krefting , Emir SARI , =?utf-8?b?VHLhuqduIE5n4buNYyBRdcOibg==?= , Fangyi Zhou , Yi-Jyun Pan , Jiang Xin Subject: [PATCH 5/9] po/git.pot: don't check in result of "make pot" Date: Tue, 3 May 2022 21:23:50 +0800 Message-Id: <20220503132354.9567-6-worldhello.net@gmail.com> X-Mailer: git-send-email 2.32.0.rc3 In-Reply-To: <20220503132354.9567-1-worldhello.net@gmail.com> References: <20220503132354.9567-1-worldhello.net@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Ævar Arnfjörð Bjarmason Remove the "po/git.pot" file from being tracked, which started with dce37b66fb0 (l10n: initial git.pot for 1.7.10 upcoming release, 2012-02-13). The reason the po/git.pot started being checked in was because the po/*.po files were changed a schema where we'd generate them from a known-good snapshot of po/git.pot, instead of each translator running "make pot" themselves. This makes sense, but we don't need to carry this file in-tree just to achieve that aim, and doing so has resulted in a significant amount of "diff churn" since this method of doing it was introduced: $ git log -p --oneline -- po/git.pot|wc -l 553743 We can instead let l10n contributors to generate "po/git.pot" in runtime to update their own "po/XX.po", and the l10n coordinator can check pull requests using CI pipeline. This reverts to the schema introduced initially in cd5513a7168 (i18n: Makefile: "pot" target to extract messages marked for translation, 2011-02-22). The actual "git rm" of po/git.pot is deferred until the subsequent commit, to make this change easier to review, and to preempt the mailing list from blocking it due to it being too large. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Jiang Xin --- Makefile | 1 + po/.gitignore | 1 + 2 files changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 4b7cb2be65..2f28648900 100644 --- a/Makefile +++ b/Makefile @@ -3312,6 +3312,7 @@ dist-doc: git$X distclean: clean $(RM) configure + $(RM) po/git.pot $(RM) config.log config.status config.cache $(RM) config.mak.autogen config.mak.append $(RM) -r autom4te.cache diff --git a/po/.gitignore b/po/.gitignore index 796b96d1c4..37d1301b32 100644 --- a/po/.gitignore +++ b/po/.gitignore @@ -1 +1,2 @@ /build +/git.pot From patchwork Tue May 3 13:23:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jiang Xin X-Patchwork-Id: 12841619 Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F2BBC433EF for ; Tue, 3 May 2022 13:25:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236131AbiECN2T (ORCPT ); Tue, 3 May 2022 09:28:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236055AbiECN1z (ORCPT ); Tue, 3 May 2022 09:27:55 -0400 Received: from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com [IPv6:2607:f8b0:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C580336E02 for ; Tue, 3 May 2022 06:24:22 -0700 (PDT) Received: by mail-pg1-x52b.google.com with SMTP id e5so2919425pgc.5 for ; Tue, 03 May 2022 06:24:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ywUKwLVgLk3YdaxUOMeKowsKp/lps06u0AAPWdrTdsk=; b=NdxD9UM7nvJGBlIGHdcBSDTH/0G7TJ0sdPmGz/cgXf2/ZPOn0O/s+SVCnnuUOr3wz5 Ug50iaomuVWUeQQAu+EsELTh0NeWYwZIncKxkE70bgWrAc2dWYhaCRSWMOGlHUKgO2bs 17c3ZNnaMPNmvRNcoxfiHpplC/Llcq4Jwd27idc/i5UPzfte8FXPTle60OzT8B175qjI eGreRzWkAJsCGN8D07gPSJQJtfeLF7Tq2rfvoq2Ayd/s8tGLLRIFdflxTpLltV3hn1nv wqqp0U2u/r/J1dq9y9Gzh4PLNqWz18AszdPwnFkic/6zLWb0i/cWT0XRS+xq+ZKdPtwz uiGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ywUKwLVgLk3YdaxUOMeKowsKp/lps06u0AAPWdrTdsk=; b=si/1Q7GY+dzqnAvfYL5eBkHWFuoWACvQcBHurRhi47E4AqR4xqwKBIca1qCnANSles sK36T/zRjFojeg2D0rWkM1ceDAI+hD62CggYG3xjpLHuqz0IiTf6Ay5i8BxNOSALhkpq FRyuTuO+ygzFf/Mp21xhI1JfDKNCiinjHJ8lxIvqELS0EWo/ZlnEDH398cH9J8a/jHSs w/zZEm4ruZ2Kh5KYYG52cFu7u9ohaRlGHIRvwT2b6lhvs2nk1x20W0AjnAjBr2wOcsT9 DI5jKKj3NHWxgSsnQBTee8m9aMIowvY/2m/0u7Zdwd7G4PFXP4Arq8Pa2TCkNUT4Nt4l N6vg== X-Gm-Message-State: AOAM531AbN2FbWMGqS0Q0Ykbs8DflqRFe127JkAAO7S6m8N3PXWq39XR /h5hhSuoiIgbKY+ro2g6HQA= X-Google-Smtp-Source: ABdhPJx34ZddyENh6KNGh+R2hrL63WgFvDwqyAgc0s2Lh/1ai9KnV+PM2+ZyKXzqbsur4dSzlIXhlQ== X-Received: by 2002:a63:5756:0:b0:36c:67bc:7f3f with SMTP id h22-20020a635756000000b0036c67bc7f3fmr13852353pgm.389.1651584259843; Tue, 03 May 2022 06:24:19 -0700 (PDT) Received: from tigtog.localdomain.localdomain (144.34.163.219.16clouds.com. [144.34.163.219]) by smtp.gmail.com with ESMTPSA id j8-20020aa78008000000b0050dc76281b3sm6484950pfi.141.2022.05.03.06.24.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 May 2022 06:24:18 -0700 (PDT) From: Jiang Xin To: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Junio C Hamano , Git List Cc: Alexander Shopov , Jordi Mas , =?utf-8?q?Matthias_R=C3=BCster?= , Jimmy Angelakos , =?utf-8?q?Christopher_D=C3=ADaz?= , =?utf-8?q?Jean-No=C3=ABl_Avila?= , Bagas Sanjaya , Alessandro Menti , Gwan-gyeong Mun , Arusekk , Daniel Santos , Dimitriy Ryazantcev , Peter Krefting , Emir SARI , =?utf-8?b?VHLhuqduIE5n4buNYyBRdcOibg==?= , Fangyi Zhou , Yi-Jyun Pan Subject: [PATCH 6/9] po/git.pot: remove this now generated file, see preceding commit Date: Tue, 3 May 2022 21:23:51 +0800 Message-Id: <20220503132354.9567-7-worldhello.net@gmail.com> X-Mailer: git-send-email 2.32.0.rc3 In-Reply-To: <20220503132354.9567-1-worldhello.net@gmail.com> References: <20220503132354.9567-1-worldhello.net@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Ævar Arnfjörð Bjarmason Signed-off-by: Ævar Arnfjörð Bjarmason --- po/git.pot | 25151 --------------------------------------------------- 1 file changed, 25151 deletions(-) delete mode 100644 po/git.pot diff --git a/po/git.pot b/po/git.pot deleted file mode 100644 index 054cb99c06..0000000000 --- a/po/git.pot +++ /dev/null @@ -1,25151 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2022-04-13 14:52+0800\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" - -#: add-interactive.c:382 -#, c-format -msgid "Huh (%s)?" -msgstr "" - -#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505 -#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261 -#: builtin/rebase.c:1671 -msgid "could not read index" -msgstr "" - -#: add-interactive.c:590 git-add--interactive.perl:269 -#: git-add--interactive.perl:294 -msgid "binary" -msgstr "" - -#: add-interactive.c:648 git-add--interactive.perl:278 -#: git-add--interactive.perl:332 -msgid "nothing" -msgstr "" - -#: add-interactive.c:649 git-add--interactive.perl:314 -#: git-add--interactive.perl:329 -msgid "unchanged" -msgstr "" - -#: add-interactive.c:686 git-add--interactive.perl:641 -msgid "Update" -msgstr "" - -#: add-interactive.c:703 add-interactive.c:891 -#, c-format -msgid "could not stage '%s'" -msgstr "" - -#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709 -msgid "could not write index" -msgstr "" - -#: add-interactive.c:712 git-add--interactive.perl:626 -#, c-format, perl-format -msgid "updated %d path\n" -msgid_plural "updated %d paths\n" -msgstr[0] "" -msgstr[1] "" - -#: add-interactive.c:730 git-add--interactive.perl:676 -#, c-format, perl-format -msgid "note: %s is untracked now.\n" -msgstr "" - -#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311 -#: builtin/reset.c:167 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "" - -#: add-interactive.c:765 git-add--interactive.perl:653 -msgid "Revert" -msgstr "" - -#: add-interactive.c:781 -msgid "Could not parse HEAD^{tree}" -msgstr "" - -#: add-interactive.c:819 git-add--interactive.perl:629 -#, c-format, perl-format -msgid "reverted %d path\n" -msgid_plural "reverted %d paths\n" -msgstr[0] "" -msgstr[1] "" - -#: add-interactive.c:870 git-add--interactive.perl:693 -#, c-format -msgid "No untracked files.\n" -msgstr "" - -#: add-interactive.c:874 git-add--interactive.perl:687 -msgid "Add untracked" -msgstr "" - -#: add-interactive.c:901 git-add--interactive.perl:623 -#, c-format, perl-format -msgid "added %d path\n" -msgid_plural "added %d paths\n" -msgstr[0] "" -msgstr[1] "" - -#: add-interactive.c:931 -#, c-format -msgid "ignoring unmerged: %s" -msgstr "" - -#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371 -#, c-format -msgid "Only binary files changed.\n" -msgstr "" - -#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373 -#, c-format -msgid "No changes.\n" -msgstr "" - -#: add-interactive.c:949 git-add--interactive.perl:1381 -msgid "Patch update" -msgstr "" - -#: add-interactive.c:988 git-add--interactive.perl:1794 -msgid "Review diff" -msgstr "" - -#: add-interactive.c:1016 -msgid "show paths with changes" -msgstr "" - -#: add-interactive.c:1018 -msgid "add working tree state to the staged set of changes" -msgstr "" - -#: add-interactive.c:1020 -msgid "revert staged set of changes back to the HEAD version" -msgstr "" - -#: add-interactive.c:1022 -msgid "pick hunks and update selectively" -msgstr "" - -#: add-interactive.c:1024 -msgid "view diff between HEAD and index" -msgstr "" - -#: add-interactive.c:1026 -msgid "add contents of untracked files to the staged set of changes" -msgstr "" - -#: add-interactive.c:1034 add-interactive.c:1083 -msgid "Prompt help:" -msgstr "" - -#: add-interactive.c:1036 -msgid "select a single item" -msgstr "" - -#: add-interactive.c:1038 -msgid "select a range of items" -msgstr "" - -#: add-interactive.c:1040 -msgid "select multiple ranges" -msgstr "" - -#: add-interactive.c:1042 add-interactive.c:1087 -msgid "select item based on unique prefix" -msgstr "" - -#: add-interactive.c:1044 -msgid "unselect specified items" -msgstr "" - -#: add-interactive.c:1046 -msgid "choose all items" -msgstr "" - -#: add-interactive.c:1048 -msgid "(empty) finish selecting" -msgstr "" - -#: add-interactive.c:1085 -msgid "select a numbered item" -msgstr "" - -#: add-interactive.c:1089 -msgid "(empty) select nothing" -msgstr "" - -#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898 -msgid "*** Commands ***" -msgstr "" - -#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895 -msgid "What now" -msgstr "" - -#: add-interactive.c:1150 git-add--interactive.perl:213 -msgid "staged" -msgstr "" - -#: add-interactive.c:1150 git-add--interactive.perl:213 -msgid "unstaged" -msgstr "" - -#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370 -#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132 -#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194 -#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872 -#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709 -#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891 -#: git-add--interactive.perl:213 -msgid "path" -msgstr "" - -#: add-interactive.c:1157 -msgid "could not refresh index" -msgstr "" - -#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805 -#, c-format -msgid "Bye.\n" -msgstr "" - -#: add-patch.c:34 git-add--interactive.perl:1433 -#, c-format, perl-format -msgid "Stage mode change [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:35 git-add--interactive.perl:1434 -#, c-format, perl-format -msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:36 git-add--interactive.perl:1435 -#, c-format, perl-format -msgid "Stage addition [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:37 git-add--interactive.perl:1436 -#, c-format, perl-format -msgid "Stage this hunk [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:39 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"staging." -msgstr "" - -#: add-patch.c:42 -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"a - stage this hunk and all later hunks in the file\n" -"d - do not stage this hunk or any of the later hunks in the file\n" -msgstr "" - -#: add-patch.c:56 git-add--interactive.perl:1439 -#, c-format, perl-format -msgid "Stash mode change [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:57 git-add--interactive.perl:1440 -#, c-format, perl-format -msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:58 git-add--interactive.perl:1441 -#, c-format, perl-format -msgid "Stash addition [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:59 git-add--interactive.perl:1442 -#, c-format, perl-format -msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:61 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"stashing." -msgstr "" - -#: add-patch.c:64 -msgid "" -"y - stash this hunk\n" -"n - do not stash this hunk\n" -"q - quit; do not stash this hunk or any of the remaining ones\n" -"a - stash this hunk and all later hunks in the file\n" -"d - do not stash this hunk or any of the later hunks in the file\n" -msgstr "" - -#: add-patch.c:80 git-add--interactive.perl:1445 -#, c-format, perl-format -msgid "Unstage mode change [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:81 git-add--interactive.perl:1446 -#, c-format, perl-format -msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:82 git-add--interactive.perl:1447 -#, c-format, perl-format -msgid "Unstage addition [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:83 git-add--interactive.perl:1448 -#, c-format, perl-format -msgid "Unstage this hunk [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:85 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"unstaging." -msgstr "" - -#: add-patch.c:88 -msgid "" -"y - unstage this hunk\n" -"n - do not unstage this hunk\n" -"q - quit; do not unstage this hunk or any of the remaining ones\n" -"a - unstage this hunk and all later hunks in the file\n" -"d - do not unstage this hunk or any of the later hunks in the file\n" -msgstr "" - -#: add-patch.c:103 git-add--interactive.perl:1451 -#, c-format, perl-format -msgid "Apply mode change to index [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:104 git-add--interactive.perl:1452 -#, c-format, perl-format -msgid "Apply deletion to index [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:105 git-add--interactive.perl:1453 -#, c-format, perl-format -msgid "Apply addition to index [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:106 git-add--interactive.perl:1454 -#, c-format, perl-format -msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:108 add-patch.c:176 add-patch.c:221 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"applying." -msgstr "" - -#: add-patch.c:111 -msgid "" -"y - apply this hunk to index\n" -"n - do not apply this hunk to index\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" - -#: add-patch.c:126 git-add--interactive.perl:1457 -#: git-add--interactive.perl:1475 -#, c-format, perl-format -msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:127 git-add--interactive.perl:1458 -#: git-add--interactive.perl:1476 -#, c-format, perl-format -msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:128 git-add--interactive.perl:1459 -#: git-add--interactive.perl:1477 -#, c-format, perl-format -msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:129 git-add--interactive.perl:1460 -#: git-add--interactive.perl:1478 -#, c-format, perl-format -msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:131 add-patch.c:154 add-patch.c:199 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"discarding." -msgstr "" - -#: add-patch.c:134 add-patch.c:202 -msgid "" -"y - discard this hunk from worktree\n" -"n - do not discard this hunk from worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file\n" -msgstr "" - -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463 -#, c-format, perl-format -msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464 -#, c-format, perl-format -msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465 -#, c-format, perl-format -msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466 -#, c-format, perl-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:157 -msgid "" -"y - discard this hunk from index and worktree\n" -"n - do not discard this hunk from index and worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file\n" -msgstr "" - -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469 -#, c-format, perl-format -msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470 -#, c-format, perl-format -msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471 -#, c-format, perl-format -msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472 -#, c-format, perl-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:179 -msgid "" -"y - apply this hunk to index and worktree\n" -"n - do not apply this hunk to index and worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" - -#: add-patch.c:224 -msgid "" -"y - apply this hunk to worktree\n" -"n - do not apply this hunk to worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" - -#: add-patch.c:343 -#, c-format -msgid "could not parse hunk header '%.*s'" -msgstr "" - -#: add-patch.c:362 add-patch.c:366 -#, c-format -msgid "could not parse colored hunk header '%.*s'" -msgstr "" - -#: add-patch.c:431 -msgid "could not parse diff" -msgstr "" - -#: add-patch.c:450 -msgid "could not parse colored diff" -msgstr "" - -#: add-patch.c:464 -#, c-format -msgid "failed to run '%s'" -msgstr "" - -#: add-patch.c:618 -msgid "mismatched output from interactive.diffFilter" -msgstr "" - -#: add-patch.c:619 -msgid "" -"Your filter must maintain a one-to-one correspondence\n" -"between its input and output lines." -msgstr "" - -#: add-patch.c:797 -#, c-format -msgid "" -"expected context line #%d in\n" -"%.*s" -msgstr "" - -#: add-patch.c:812 -#, c-format -msgid "" -"hunks do not overlap:\n" -"%.*s\n" -"\tdoes not end with:\n" -"%.*s" -msgstr "" - -#: add-patch.c:1088 git-add--interactive.perl:1115 -msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "" - -#: add-patch.c:1092 -#, c-format -msgid "" -"---\n" -"To remove '%c' lines, make them ' ' lines (context).\n" -"To remove '%c' lines, delete them.\n" -"Lines starting with %c will be removed.\n" -msgstr "" - -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1106 git-add--interactive.perl:1129 -msgid "" -"If it does not apply cleanly, you will be given an opportunity to\n" -"edit again. If all lines of the hunk are removed, then the edit is\n" -"aborted and the hunk is left unchanged.\n" -msgstr "" - -#: add-patch.c:1139 -msgid "could not parse hunk header" -msgstr "" - -#: add-patch.c:1184 -msgid "'git apply --cached' failed" -msgstr "" - -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#. -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#: add-patch.c:1253 git-add--interactive.perl:1244 -msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "" - -#: add-patch.c:1296 -msgid "The selected hunks do not apply to the index!" -msgstr "" - -#: add-patch.c:1297 git-add--interactive.perl:1348 -msgid "Apply them to the worktree anyway? " -msgstr "" - -#: add-patch.c:1304 git-add--interactive.perl:1351 -msgid "Nothing was applied.\n" -msgstr "" - -#: add-patch.c:1361 -msgid "" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" -"g - select a hunk to go to\n" -"/ - search for a hunk matching the given regex\n" -"s - split the current hunk into smaller hunks\n" -"e - manually edit the current hunk\n" -"? - print help\n" -msgstr "" - -#: add-patch.c:1523 add-patch.c:1533 -msgid "No previous hunk" -msgstr "" - -#: add-patch.c:1528 add-patch.c:1538 -msgid "No next hunk" -msgstr "" - -#: add-patch.c:1544 -msgid "No other hunks to goto" -msgstr "" - -#: add-patch.c:1555 git-add--interactive.perl:1608 -msgid "go to which hunk ( to see more)? " -msgstr "" - -#: add-patch.c:1556 git-add--interactive.perl:1610 -msgid "go to which hunk? " -msgstr "" - -#: add-patch.c:1567 -#, c-format -msgid "Invalid number: '%s'" -msgstr "" - -#: add-patch.c:1572 -#, c-format -msgid "Sorry, only %d hunk available." -msgid_plural "Sorry, only %d hunks available." -msgstr[0] "" -msgstr[1] "" - -#: add-patch.c:1581 -msgid "No other hunks to search" -msgstr "" - -#: add-patch.c:1587 git-add--interactive.perl:1663 -msgid "search for regex? " -msgstr "" - -#: add-patch.c:1602 -#, c-format -msgid "Malformed search regexp %s: %s" -msgstr "" - -#: add-patch.c:1619 -msgid "No hunk matches the given pattern" -msgstr "" - -#: add-patch.c:1626 -msgid "Sorry, cannot split this hunk" -msgstr "" - -#: add-patch.c:1630 -#, c-format -msgid "Split into %d hunks." -msgstr "" - -#: add-patch.c:1634 -msgid "Sorry, cannot edit this hunk" -msgstr "" - -#: add-patch.c:1686 -msgid "'git apply' failed" -msgstr "" - -#: advice.c:81 -#, c-format -msgid "" -"\n" -"Disable this message with \"git config advice.%s false\"" -msgstr "" - -#: advice.c:97 -#, c-format -msgid "%shint: %.*s%s\n" -msgstr "" - -#: advice.c:181 -msgid "Cherry-picking is not possible because you have unmerged files." -msgstr "" - -#: advice.c:183 -msgid "Committing is not possible because you have unmerged files." -msgstr "" - -#: advice.c:185 -msgid "Merging is not possible because you have unmerged files." -msgstr "" - -#: advice.c:187 -msgid "Pulling is not possible because you have unmerged files." -msgstr "" - -#: advice.c:189 -msgid "Reverting is not possible because you have unmerged files." -msgstr "" - -#: advice.c:191 -#, c-format -msgid "It is not possible to %s because you have unmerged files." -msgstr "" - -#: advice.c:199 -msgid "" -"Fix them up in the work tree, and then use 'git add/rm '\n" -"as appropriate to mark resolution and make a commit." -msgstr "" - -#: advice.c:207 -msgid "Exiting because of an unresolved conflict." -msgstr "" - -#: advice.c:212 builtin/merge.c:1388 -msgid "You have not concluded your merge (MERGE_HEAD exists)." -msgstr "" - -#: advice.c:214 -msgid "Please, commit your changes before merging." -msgstr "" - -#: advice.c:215 -msgid "Exiting because of unfinished merge." -msgstr "" - -#: advice.c:220 -msgid "Not possible to fast-forward, aborting." -msgstr "" - -#: advice.c:230 -#, c-format -msgid "" -"The following paths and/or pathspecs matched paths that exist\n" -"outside of your sparse-checkout definition, so will not be\n" -"updated in the index:\n" -msgstr "" - -#: advice.c:237 -msgid "" -"If you intend to update such entries, try one of the following:\n" -"* Use the --sparse option.\n" -"* Disable or modify the sparsity rules." -msgstr "" - -#: advice.c:245 -#, c-format -msgid "" -"Note: switching to '%s'.\n" -"\n" -"You are in 'detached HEAD' state. You can look around, make experimental\n" -"changes and commit them, and you can discard any commits you make in this\n" -"state without impacting any branches by switching back to a branch.\n" -"\n" -"If you want to create a new branch to retain commits you create, you may\n" -"do so (now or later) by using -c with the switch command. Example:\n" -"\n" -" git switch -c \n" -"\n" -"Or undo this operation with:\n" -"\n" -" git switch -\n" -"\n" -"Turn off this advice by setting config variable advice.detachedHead to " -"false\n" -"\n" -msgstr "" - -#: alias.c:50 -msgid "cmdline ends with \\" -msgstr "" - -#: alias.c:51 -msgid "unclosed quote" -msgstr "" - -#: apply.c:70 -#, c-format -msgid "unrecognized whitespace option '%s'" -msgstr "" - -#: apply.c:86 -#, c-format -msgid "unrecognized whitespace ignore option '%s'" -msgstr "" - -#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555 -#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332 -#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907 -#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509 -#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755 -#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663 -#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921 -#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200 -#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593 -#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245 -#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167 -#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560 -#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778 -#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409 -#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592 -#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641 -#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227 -#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433 -#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711 -#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328 -#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573 -#: builtin/worktree.c:779 -#, c-format -msgid "options '%s' and '%s' cannot be used together" -msgstr "" - -#: apply.c:141 apply.c:152 apply.c:155 -#, c-format -msgid "'%s' outside a repository" -msgstr "" - -#: apply.c:807 -#, c-format -msgid "Cannot prepare timestamp regexp %s" -msgstr "" - -#: apply.c:816 -#, c-format -msgid "regexec returned %d for input: %s" -msgstr "" - -#: apply.c:890 -#, c-format -msgid "unable to find filename in patch at line %d" -msgstr "" - -#: apply.c:928 -#, c-format -msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" -msgstr "" - -#: apply.c:934 -#, c-format -msgid "git apply: bad git-diff - inconsistent new filename on line %d" -msgstr "" - -#: apply.c:935 -#, c-format -msgid "git apply: bad git-diff - inconsistent old filename on line %d" -msgstr "" - -#: apply.c:940 -#, c-format -msgid "git apply: bad git-diff - expected /dev/null on line %d" -msgstr "" - -#: apply.c:969 -#, c-format -msgid "invalid mode on line %d: %s" -msgstr "" - -#: apply.c:1288 -#, c-format -msgid "inconsistent header lines %d and %d" -msgstr "" - -#: apply.c:1378 -#, c-format -msgid "" -"git diff header lacks filename information when removing %d leading pathname " -"component (line %d)" -msgid_plural "" -"git diff header lacks filename information when removing %d leading pathname " -"components (line %d)" -msgstr[0] "" -msgstr[1] "" - -#: apply.c:1391 -#, c-format -msgid "git diff header lacks filename information (line %d)" -msgstr "" - -#: apply.c:1487 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "" - -#: apply.c:1556 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "" - -#: apply.c:1759 -msgid "new file depends on old contents" -msgstr "" - -#: apply.c:1761 -msgid "deleted file still has contents" -msgstr "" - -#: apply.c:1795 -#, c-format -msgid "corrupt patch at line %d" -msgstr "" - -#: apply.c:1832 -#, c-format -msgid "new file %s depends on old contents" -msgstr "" - -#: apply.c:1834 -#, c-format -msgid "deleted file %s still has contents" -msgstr "" - -#: apply.c:1837 -#, c-format -msgid "** warning: file %s becomes empty but is not deleted" -msgstr "" - -#: apply.c:1985 -#, c-format -msgid "corrupt binary patch at line %d: %.*s" -msgstr "" - -#: apply.c:2022 -#, c-format -msgid "unrecognized binary patch at line %d" -msgstr "" - -#: apply.c:2184 -#, c-format -msgid "patch with only garbage at line %d" -msgstr "" - -#: apply.c:2270 -#, c-format -msgid "unable to read symlink %s" -msgstr "" - -#: apply.c:2274 -#, c-format -msgid "unable to open or read %s" -msgstr "" - -#: apply.c:2943 -#, c-format -msgid "invalid start of line: '%c'" -msgstr "" - -#: apply.c:3064 -#, c-format -msgid "Hunk #%d succeeded at %d (offset %d line)." -msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." -msgstr[0] "" -msgstr[1] "" - -#: apply.c:3076 -#, c-format -msgid "Context reduced to (%ld/%ld) to apply fragment at %d" -msgstr "" - -#: apply.c:3082 -#, c-format -msgid "" -"while searching for:\n" -"%.*s" -msgstr "" - -#: apply.c:3104 -#, c-format -msgid "missing binary patch data for '%s'" -msgstr "" - -#: apply.c:3112 -#, c-format -msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" -msgstr "" - -#: apply.c:3159 -#, c-format -msgid "cannot apply binary patch to '%s' without full index line" -msgstr "" - -#: apply.c:3170 -#, c-format -msgid "" -"the patch applies to '%s' (%s), which does not match the current contents." -msgstr "" - -#: apply.c:3178 -#, c-format -msgid "the patch applies to an empty '%s' but it is not empty" -msgstr "" - -#: apply.c:3196 -#, c-format -msgid "the necessary postimage %s for '%s' cannot be read" -msgstr "" - -#: apply.c:3209 -#, c-format -msgid "binary patch does not apply to '%s'" -msgstr "" - -#: apply.c:3216 -#, c-format -msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" -msgstr "" - -#: apply.c:3237 -#, c-format -msgid "patch failed: %s:%ld" -msgstr "" - -#: apply.c:3360 -#, c-format -msgid "cannot checkout %s" -msgstr "" - -#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214 -#: setup.c:310 -#, c-format -msgid "failed to read %s" -msgstr "" - -#: apply.c:3420 -#, c-format -msgid "reading from '%s' beyond a symbolic link" -msgstr "" - -#: apply.c:3449 apply.c:3721 -#, c-format -msgid "path %s has been renamed/deleted" -msgstr "" - -#: apply.c:3559 apply.c:3736 -#, c-format -msgid "%s: does not exist in index" -msgstr "" - -#: apply.c:3568 apply.c:3744 apply.c:3960 -#, c-format -msgid "%s: does not match index" -msgstr "" - -#: apply.c:3605 -msgid "repository lacks the necessary blob to perform 3-way merge." -msgstr "" - -#: apply.c:3608 -#, c-format -msgid "Performing three-way merge...\n" -msgstr "" - -#: apply.c:3624 apply.c:3628 -#, c-format -msgid "cannot read the current contents of '%s'" -msgstr "" - -#: apply.c:3640 -#, c-format -msgid "Failed to perform three-way merge...\n" -msgstr "" - -#: apply.c:3654 -#, c-format -msgid "Applied patch to '%s' with conflicts.\n" -msgstr "" - -#: apply.c:3659 -#, c-format -msgid "Applied patch to '%s' cleanly.\n" -msgstr "" - -#: apply.c:3676 -#, c-format -msgid "Falling back to direct application...\n" -msgstr "" - -#: apply.c:3688 -msgid "removal patch leaves file contents" -msgstr "" - -#: apply.c:3761 -#, c-format -msgid "%s: wrong type" -msgstr "" - -#: apply.c:3763 -#, c-format -msgid "%s has type %o, expected %o" -msgstr "" - -#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932 -#: read-cache.c:1399 -#, c-format -msgid "invalid path '%s'" -msgstr "" - -#: apply.c:3958 -#, c-format -msgid "%s: already exists in index" -msgstr "" - -#: apply.c:3962 -#, c-format -msgid "%s: already exists in working directory" -msgstr "" - -#: apply.c:3982 -#, c-format -msgid "new mode (%o) of %s does not match old mode (%o)" -msgstr "" - -#: apply.c:3987 -#, c-format -msgid "new mode (%o) of %s does not match old mode (%o) of %s" -msgstr "" - -#: apply.c:4007 -#, c-format -msgid "affected file '%s' is beyond a symbolic link" -msgstr "" - -#: apply.c:4011 -#, c-format -msgid "%s: patch does not apply" -msgstr "" - -#: apply.c:4026 -#, c-format -msgid "Checking patch %s..." -msgstr "" - -#: apply.c:4118 -#, c-format -msgid "sha1 information is lacking or useless for submodule %s" -msgstr "" - -#: apply.c:4125 -#, c-format -msgid "mode change for %s, which is not in current HEAD" -msgstr "" - -#: apply.c:4128 -#, c-format -msgid "sha1 information is lacking or useless (%s)." -msgstr "" - -#: apply.c:4137 -#, c-format -msgid "could not add %s to temporary index" -msgstr "" - -#: apply.c:4147 -#, c-format -msgid "could not write temporary index to %s" -msgstr "" - -#: apply.c:4285 -#, c-format -msgid "unable to remove %s from index" -msgstr "" - -#: apply.c:4319 -#, c-format -msgid "corrupt patch for submodule %s" -msgstr "" - -#: apply.c:4325 -#, c-format -msgid "unable to stat newly created file '%s'" -msgstr "" - -#: apply.c:4333 -#, c-format -msgid "unable to create backing store for newly created file %s" -msgstr "" - -#: apply.c:4339 apply.c:4484 -#, c-format -msgid "unable to add cache entry for %s" -msgstr "" - -#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258 -#: builtin/gc.c:2293 -#, c-format -msgid "failed to write to '%s'" -msgstr "" - -#: apply.c:4386 -#, c-format -msgid "closing file '%s'" -msgstr "" - -#: apply.c:4456 -#, c-format -msgid "unable to write file '%s' mode %o" -msgstr "" - -#: apply.c:4554 -#, c-format -msgid "Applied patch %s cleanly." -msgstr "" - -#: apply.c:4562 -msgid "internal error" -msgstr "" - -#: apply.c:4565 -#, c-format -msgid "Applying patch %%s with %d reject..." -msgid_plural "Applying patch %%s with %d rejects..." -msgstr[0] "" -msgstr[1] "" - -#: apply.c:4576 -#, c-format -msgid "truncating .rej filename to %.*s.rej" -msgstr "" - -#: apply.c:4584 -#, c-format -msgid "cannot open %s" -msgstr "" - -#: apply.c:4598 -#, c-format -msgid "Hunk #%d applied cleanly." -msgstr "" - -#: apply.c:4602 -#, c-format -msgid "Rejected hunk #%d." -msgstr "" - -#: apply.c:4731 -#, c-format -msgid "Skipped patch '%s'." -msgstr "" - -#: apply.c:4740 -msgid "No valid patches in input (allow with \"--allow-empty\")" -msgstr "" - -#: apply.c:4761 -msgid "unable to read index file" -msgstr "" - -#: apply.c:4918 -#, c-format -msgid "can't open patch '%s': %s" -msgstr "" - -#: apply.c:4945 -#, c-format -msgid "squelched %d whitespace error" -msgid_plural "squelched %d whitespace errors" -msgstr[0] "" -msgstr[1] "" - -#: apply.c:4951 apply.c:4966 -#, c-format -msgid "%d line adds whitespace errors." -msgid_plural "%d lines add whitespace errors." -msgstr[0] "" -msgstr[1] "" - -#: apply.c:4959 -#, c-format -msgid "%d line applied after fixing whitespace errors." -msgid_plural "%d lines applied after fixing whitespace errors." -msgstr[0] "" -msgstr[1] "" - -#: apply.c:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430 -msgid "Unable to write new index file" -msgstr "" - -#: apply.c:5003 -msgid "don't apply changes matching the given path" -msgstr "" - -#: apply.c:5006 -msgid "apply changes matching the given path" -msgstr "" - -#: apply.c:5008 builtin/am.c:2379 -msgid "num" -msgstr "" - -#: apply.c:5009 -msgid "remove leading slashes from traditional diff paths" -msgstr "" - -#: apply.c:5012 -msgid "ignore additions made by the patch" -msgstr "" - -#: apply.c:5014 -msgid "instead of applying the patch, output diffstat for the input" -msgstr "" - -#: apply.c:5018 -msgid "show number of added and deleted lines in decimal notation" -msgstr "" - -#: apply.c:5020 -msgid "instead of applying the patch, output a summary for the input" -msgstr "" - -#: apply.c:5022 -msgid "instead of applying the patch, see if the patch is applicable" -msgstr "" - -#: apply.c:5024 -msgid "make sure the patch is applicable to the current index" -msgstr "" - -#: apply.c:5026 -msgid "mark new files with `git add --intent-to-add`" -msgstr "" - -#: apply.c:5028 -msgid "apply a patch without touching the working tree" -msgstr "" - -#: apply.c:5030 -msgid "accept a patch that touches outside the working area" -msgstr "" - -#: apply.c:5033 -msgid "also apply the patch (use with --stat/--summary/--check)" -msgstr "" - -#: apply.c:5035 -msgid "attempt three-way merge, fall back on normal patch if that fails" -msgstr "" - -#: apply.c:5037 -msgid "build a temporary index based on embedded index information" -msgstr "" - -#: apply.c:5040 builtin/checkout-index.c:230 -msgid "paths are separated with NUL character" -msgstr "" - -#: apply.c:5042 -msgid "ensure at least lines of context match" -msgstr "" - -#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358 -#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983 -#: builtin/rebase.c:1079 -msgid "action" -msgstr "" - -#: apply.c:5044 -msgid "detect new or modified lines that have whitespace errors" -msgstr "" - -#: apply.c:5047 apply.c:5050 -msgid "ignore changes in whitespace when finding context" -msgstr "" - -#: apply.c:5053 -msgid "apply the patch in reverse" -msgstr "" - -#: apply.c:5055 -msgid "don't expect at least one line of context" -msgstr "" - -#: apply.c:5057 -msgid "leave the rejected hunks in corresponding *.rej files" -msgstr "" - -#: apply.c:5059 -msgid "allow overlapping hunks" -msgstr "" - -#: apply.c:5062 -msgid "tolerate incorrectly detected missing new-line at the end of file" -msgstr "" - -#: apply.c:5065 -msgid "do not trust the line counts in the hunk headers" -msgstr "" - -#: apply.c:5067 builtin/am.c:2367 -msgid "root" -msgstr "" - -#: apply.c:5068 -msgid "prepend to all filenames" -msgstr "" - -#: apply.c:5071 -msgid "don't return error for empty patches" -msgstr "" - -#: archive-tar.c:125 archive-zip.c:346 -#, c-format -msgid "cannot stream blob %s" -msgstr "" - -#: archive-tar.c:265 archive-zip.c:359 -#, c-format -msgid "unsupported file mode: 0%o (SHA1: %s)" -msgstr "" - -#: archive-tar.c:447 -#, c-format -msgid "unable to start '%s' filter" -msgstr "" - -#: archive-tar.c:450 -msgid "unable to redirect descriptor" -msgstr "" - -#: archive-tar.c:457 -#, c-format -msgid "'%s' filter reported error" -msgstr "" - -#: archive-zip.c:319 -#, c-format -msgid "path is not valid UTF-8: %s" -msgstr "" - -#: archive-zip.c:323 -#, c-format -msgid "path too long (%d chars, SHA1: %s): %s" -msgstr "" - -#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366 -#, c-format -msgid "deflate error (%d)" -msgstr "" - -#: archive-zip.c:604 -#, c-format -msgid "timestamp too large for this system: %" -msgstr "" - -#: archive.c:14 -msgid "git archive [] [...]" -msgstr "" - -#: archive.c:16 -msgid "" -"git archive --remote [--exec ] [] [...]" -msgstr "" - -#: archive.c:17 -msgid "git archive --remote [--exec ] --list" -msgstr "" - -#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238 -#: builtin/tag.c:579 -#, c-format -msgid "cannot read '%s'" -msgstr "" - -#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334 -#, c-format -msgid "pathspec '%s' did not match any files" -msgstr "" - -#: archive.c:450 -#, c-format -msgid "no such ref: %.*s" -msgstr "" - -#: archive.c:456 -#, c-format -msgid "not a valid object name: %s" -msgstr "" - -#: archive.c:469 -#, c-format -msgid "not a tree object: %s" -msgstr "" - -#: archive.c:481 -msgid "current working directory is untracked" -msgstr "" - -#: archive.c:522 -#, c-format -msgid "File not found: %s" -msgstr "" - -#: archive.c:524 -#, c-format -msgid "Not a regular file: %s" -msgstr "" - -#: archive.c:551 -msgid "fmt" -msgstr "" - -#: archive.c:551 -msgid "archive format" -msgstr "" - -#: archive.c:552 builtin/log.c:1809 -msgid "prefix" -msgstr "" - -#: archive.c:553 -msgid "prepend prefix to each pathname in the archive" -msgstr "" - -#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885 -#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135 -#: builtin/fast-export.c:1181 builtin/fast-export.c:1183 -#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104 -#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410 -#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195 -msgid "file" -msgstr "" - -#: archive.c:555 -msgid "add untracked file to archive" -msgstr "" - -#: archive.c:558 builtin/archive.c:88 -msgid "write the archive to this file" -msgstr "" - -#: archive.c:560 -msgid "read .gitattributes in working directory" -msgstr "" - -#: archive.c:561 -msgid "report archived files on stderr" -msgstr "" - -#: archive.c:563 -msgid "set compression level" -msgstr "" - -#: archive.c:566 -msgid "list supported archive formats" -msgstr "" - -#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125 -#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718 -msgid "repo" -msgstr "" - -#: archive.c:569 builtin/archive.c:90 -msgid "retrieve the archive from remote repository " -msgstr "" - -#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708 -#: builtin/notes.c:496 -msgid "command" -msgstr "" - -#: archive.c:571 builtin/archive.c:92 -msgid "path to the remote git-upload-archive command" -msgstr "" - -#: archive.c:578 -msgid "Unexpected option --remote" -msgstr "" - -#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530 -#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099 -#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230 -#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442 -#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708 -#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144 -#: http-fetch.c:153 -#, c-format -msgid "the option '%s' requires '%s'" -msgstr "" - -#: archive.c:582 -msgid "Unexpected option --output" -msgstr "" - -#: archive.c:606 -#, c-format -msgid "Unknown archive format '%s'" -msgstr "" - -#: archive.c:615 -#, c-format -msgid "Argument not supported for format '%s': -%d" -msgstr "" - -#: attr.c:202 -#, c-format -msgid "%.*s is not a valid attribute name" -msgstr "" - -#: attr.c:363 -#, c-format -msgid "%s not allowed: %s:%d" -msgstr "" - -#: attr.c:403 -msgid "" -"Negative patterns are ignored in git attributes\n" -"Use '\\!' for literal leading exclamation." -msgstr "" - -#: bisect.c:488 -#, c-format -msgid "Badly quoted content in file '%s': %s" -msgstr "" - -#: bisect.c:698 -#, c-format -msgid "We cannot bisect more!\n" -msgstr "" - -#: bisect.c:765 -#, c-format -msgid "Not a valid commit name %s" -msgstr "" - -#: bisect.c:790 -#, c-format -msgid "" -"The merge base %s is bad.\n" -"This means the bug has been fixed between %s and [%s].\n" -msgstr "" - -#: bisect.c:795 -#, c-format -msgid "" -"The merge base %s is new.\n" -"The property has changed between %s and [%s].\n" -msgstr "" - -#: bisect.c:800 -#, c-format -msgid "" -"The merge base %s is %s.\n" -"This means the first '%s' commit is between %s and [%s].\n" -msgstr "" - -#: bisect.c:808 -#, c-format -msgid "" -"Some %s revs are not ancestors of the %s rev.\n" -"git bisect cannot work properly in this case.\n" -"Maybe you mistook %s and %s revs?\n" -msgstr "" - -#: bisect.c:821 -#, c-format -msgid "" -"the merge base between %s and [%s] must be skipped.\n" -"So we cannot be sure the first %s commit is between %s and %s.\n" -"We continue anyway." -msgstr "" - -#: bisect.c:860 -#, c-format -msgid "Bisecting: a merge base must be tested\n" -msgstr "" - -#: bisect.c:910 -#, c-format -msgid "a %s revision is needed" -msgstr "" - -#: bisect.c:940 -#, c-format -msgid "could not create file '%s'" -msgstr "" - -#: bisect.c:986 builtin/merge.c:155 -#, c-format -msgid "could not read file '%s'" -msgstr "" - -#: bisect.c:1026 -msgid "reading bisect refs failed" -msgstr "" - -#: bisect.c:1056 -#, c-format -msgid "%s was both %s and %s\n" -msgstr "" - -#: bisect.c:1065 -#, c-format -msgid "" -"No testable commit found.\n" -"Maybe you started with bad path arguments?\n" -msgstr "" - -#: bisect.c:1094 -#, c-format -msgid "(roughly %d step)" -msgid_plural "(roughly %d steps)" -msgstr[0] "" -msgstr[1] "" - -#. TRANSLATORS: the last %s will be replaced with "(roughly %d -#. steps)" translation. -#. -#: bisect.c:1100 -#, c-format -msgid "Bisecting: %d revision left to test after this %s\n" -msgid_plural "Bisecting: %d revisions left to test after this %s\n" -msgstr[0] "" -msgstr[1] "" - -#: blame.c:2773 -msgid "--contents and --reverse do not blend well." -msgstr "" - -#: blame.c:2787 -msgid "cannot use --contents with final commit object name" -msgstr "" - -#: blame.c:2808 -msgid "--reverse and --first-parent together require specified latest commit" -msgstr "" - -#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157 -#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118 -#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096 -#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381 -#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796 -#: builtin/shortlog.c:255 -msgid "revision walk setup failed" -msgstr "" - -#: blame.c:2835 -msgid "" -"--reverse --first-parent together require range along first-parent chain" -msgstr "" - -#: blame.c:2846 -#, c-format -msgid "no such path %s in %s" -msgstr "" - -#: blame.c:2857 -#, c-format -msgid "cannot read blob %s for path %s" -msgstr "" - -#: branch.c:93 -msgid "" -"cannot inherit upstream tracking configuration of multiple refs when " -"rebasing is requested" -msgstr "" - -#: branch.c:104 -#, c-format -msgid "not setting branch '%s' as its own upstream" -msgstr "" - -#: branch.c:160 -#, c-format -msgid "branch '%s' set up to track '%s' by rebasing." -msgstr "" - -#: branch.c:161 -#, c-format -msgid "branch '%s' set up to track '%s'." -msgstr "" - -#: branch.c:164 -#, c-format -msgid "branch '%s' set up to track:" -msgstr "" - -#: branch.c:176 -msgid "unable to write upstream branch configuration" -msgstr "" - -#: branch.c:178 -msgid "" -"\n" -"After fixing the error cause you may try to fix up\n" -"the remote tracking information by invoking:" -msgstr "" - -#: branch.c:219 -#, c-format -msgid "asked to inherit tracking from '%s', but no remote is set" -msgstr "" - -#: branch.c:225 -#, c-format -msgid "asked to inherit tracking from '%s', but no merge configuration is set" -msgstr "" - -#: branch.c:277 -#, c-format -msgid "not tracking: ambiguous information for ref '%s'" -msgstr "" - -#. TRANSLATORS: This is a line listing a remote with duplicate -#. refspecs in the advice message below. For RTL languages you'll -#. probably want to swap the "%s" and leading " " space around. -#. -#. TRANSLATORS: This is line item of ambiguous object output -#. from describe_ambiguous_object() above. For RTL languages -#. you'll probably want to swap the "%s" and leading " " space -#. around. -#. -#: branch.c:289 object-name.c:464 -#, c-format -msgid " %s\n" -msgstr "" - -#. TRANSLATORS: The second argument is a \n-delimited list of -#. duplicate refspecs, composed above. -#. -#: branch.c:295 -#, c-format -msgid "" -"There are multiple remotes whose fetch refspecs map to the remote\n" -"tracking ref '%s':\n" -"%s\n" -"This is typically a configuration error.\n" -"\n" -"To support setting up tracking branches, ensure that\n" -"different remotes' fetch refspecs map into different\n" -"tracking namespaces." -msgstr "" - -#: branch.c:344 -#, c-format -msgid "'%s' is not a valid branch name" -msgstr "" - -#: branch.c:364 -#, c-format -msgid "a branch named '%s' already exists" -msgstr "" - -#: branch.c:370 -#, c-format -msgid "cannot force update the branch '%s' checked out at '%s'" -msgstr "" - -#: branch.c:393 -#, c-format -msgid "cannot set up tracking information; starting point '%s' is not a branch" -msgstr "" - -#: branch.c:395 -#, c-format -msgid "the requested upstream branch '%s' does not exist" -msgstr "" - -#: branch.c:397 -msgid "" -"\n" -"If you are planning on basing your work on an upstream\n" -"branch that already exists at the remote, you may need to\n" -"run \"git fetch\" to retrieve it.\n" -"\n" -"If you are planning to push out a new local branch that\n" -"will track its remote counterpart, you may want to use\n" -"\"git push -u\" to set the upstream config as you push." -msgstr "" - -#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377 -#: builtin/replace.c:423 builtin/replace.c:453 -#, c-format -msgid "not a valid object name: '%s'" -msgstr "" - -#: branch.c:465 -#, c-format -msgid "ambiguous object name: '%s'" -msgstr "" - -#: branch.c:470 -#, c-format -msgid "not a valid branch point: '%s'" -msgstr "" - -#: branch.c:658 -#, c-format -msgid "submodule '%s': unable to find submodule" -msgstr "" - -#: branch.c:661 -#, c-format -msgid "" -"You may try updating the submodules using 'git checkout %s && git submodule " -"update --init'" -msgstr "" - -#: branch.c:672 branch.c:698 -#, c-format -msgid "submodule '%s': cannot create branch '%s'" -msgstr "" - -#: branch.c:730 -#, c-format -msgid "'%s' is already checked out at '%s'" -msgstr "" - -#: branch.c:755 -#, c-format -msgid "HEAD of working tree %s is not updated" -msgstr "" - -#: bundle.c:45 -#, c-format -msgid "unrecognized bundle hash algorithm: %s" -msgstr "" - -#: bundle.c:53 -#, c-format -msgid "unknown capability '%s'" -msgstr "" - -#: bundle.c:79 -#, c-format -msgid "'%s' does not look like a v2 or v3 bundle file" -msgstr "" - -#: bundle.c:118 -#, c-format -msgid "unrecognized header: %s%s (%d)" -msgstr "" - -#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402 -#: builtin/commit.c:865 -#, c-format -msgid "could not open '%s'" -msgstr "" - -#: bundle.c:203 -msgid "Repository lacks these prerequisite commits:" -msgstr "" - -#: bundle.c:206 -msgid "need a repository to verify a bundle" -msgstr "" - -#: bundle.c:264 -#, c-format -msgid "The bundle contains this ref:" -msgid_plural "The bundle contains these % refs:" -msgstr[0] "" -msgstr[1] "" - -#: bundle.c:272 -msgid "The bundle records a complete history." -msgstr "" - -#: bundle.c:274 -#, c-format -msgid "The bundle requires this ref:" -msgid_plural "The bundle requires these % refs:" -msgstr[0] "" -msgstr[1] "" - -#: bundle.c:350 -msgid "unable to dup bundle descriptor" -msgstr "" - -#: bundle.c:357 -msgid "Could not spawn pack-objects" -msgstr "" - -#: bundle.c:368 -msgid "pack-objects died" -msgstr "" - -#: bundle.c:417 -#, c-format -msgid "ref '%s' is excluded by the rev-list options" -msgstr "" - -#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400 -#, c-format -msgid "unrecognized argument: %s" -msgstr "" - -#: bundle.c:548 -#, c-format -msgid "unsupported bundle version %d" -msgstr "" - -#: bundle.c:550 -#, c-format -msgid "cannot write bundle version %d with algorithm %s" -msgstr "" - -#: bundle.c:600 -msgid "Refusing to create empty bundle." -msgstr "" - -#: bundle.c:610 -#, c-format -msgid "cannot create '%s'" -msgstr "" - -#: bundle.c:639 -msgid "index-pack died" -msgstr "" - -#: chunk-format.c:117 -msgid "terminating chunk id appears earlier than expected" -msgstr "" - -#: chunk-format.c:126 -#, c-format -msgid "improper chunk offset(s) % and %" -msgstr "" - -#: chunk-format.c:133 -#, c-format -msgid "duplicate chunk ID % found" -msgstr "" - -#: chunk-format.c:147 -#, c-format -msgid "final chunk has non-zero id %" -msgstr "" - -#: color.c:354 -#, c-format -msgid "invalid color value: %.*s" -msgstr "" - -#: commit-graph.c:204 midx.c:52 -msgid "invalid hash version" -msgstr "" - -#: commit-graph.c:262 -msgid "commit-graph file is too small" -msgstr "" - -#: commit-graph.c:355 -#, c-format -msgid "commit-graph signature %X does not match signature %X" -msgstr "" - -#: commit-graph.c:362 -#, c-format -msgid "commit-graph version %X does not match version %X" -msgstr "" - -#: commit-graph.c:369 -#, c-format -msgid "commit-graph hash version %X does not match version %X" -msgstr "" - -#: commit-graph.c:386 -#, c-format -msgid "commit-graph file is too small to hold %u chunks" -msgstr "" - -#: commit-graph.c:485 -msgid "commit-graph has no base graphs chunk" -msgstr "" - -#: commit-graph.c:495 -msgid "commit-graph chain does not match" -msgstr "" - -#: commit-graph.c:543 -#, c-format -msgid "invalid commit-graph chain: line '%s' not a hash" -msgstr "" - -#: commit-graph.c:567 -msgid "unable to find all commit-graph files" -msgstr "" - -#: commit-graph.c:752 commit-graph.c:789 -msgid "invalid commit position. commit-graph is likely corrupt" -msgstr "" - -#: commit-graph.c:773 -#, c-format -msgid "could not find commit %s" -msgstr "" - -#: commit-graph.c:806 -msgid "commit-graph requires overflow generation data but has none" -msgstr "" - -#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775 -#: builtin/clone.c:705 -#, c-format -msgid "unable to parse commit %s" -msgstr "" - -#: commit-graph.c:1373 builtin/pack-objects.c:3078 -#, c-format -msgid "unable to get type of object %s" -msgstr "" - -#: commit-graph.c:1404 -msgid "Loading known commits in commit graph" -msgstr "" - -#: commit-graph.c:1421 -msgid "Expanding reachable commits in commit graph" -msgstr "" - -#: commit-graph.c:1441 -msgid "Clearing commit marks in commit graph" -msgstr "" - -#: commit-graph.c:1460 -msgid "Computing commit graph topological levels" -msgstr "" - -#: commit-graph.c:1513 -msgid "Computing commit graph generation numbers" -msgstr "" - -#: commit-graph.c:1598 -msgid "Computing commit changed paths Bloom filters" -msgstr "" - -#: commit-graph.c:1675 -msgid "Collecting referenced commits" -msgstr "" - -#: commit-graph.c:1701 -#, c-format -msgid "Finding commits for commit graph in % pack" -msgid_plural "Finding commits for commit graph in % packs" -msgstr[0] "" -msgstr[1] "" - -#: commit-graph.c:1714 -#, c-format -msgid "error adding pack %s" -msgstr "" - -#: commit-graph.c:1718 -#, c-format -msgid "error opening index for %s" -msgstr "" - -#: commit-graph.c:1756 -msgid "Finding commits for commit graph among packed objects" -msgstr "" - -#: commit-graph.c:1774 -msgid "Finding extra edges in commit graph" -msgstr "" - -#: commit-graph.c:1823 -msgid "failed to write correct number of base graph ids" -msgstr "" - -#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475 -#, c-format -msgid "unable to create leading directories of %s" -msgstr "" - -#: commit-graph.c:1868 -msgid "unable to create temporary graph layer" -msgstr "" - -#: commit-graph.c:1873 -#, c-format -msgid "unable to adjust shared permissions for '%s'" -msgstr "" - -#: commit-graph.c:1930 -#, c-format -msgid "Writing out commit graph in %d pass" -msgid_plural "Writing out commit graph in %d passes" -msgstr[0] "" -msgstr[1] "" - -#: commit-graph.c:1967 -msgid "unable to open commit-graph chain file" -msgstr "" - -#: commit-graph.c:1983 -msgid "failed to rename base commit-graph file" -msgstr "" - -#: commit-graph.c:2004 -msgid "failed to rename temporary commit-graph file" -msgstr "" - -#: commit-graph.c:2137 -msgid "Scanning merged commits" -msgstr "" - -#: commit-graph.c:2181 -msgid "Merging commit-graph" -msgstr "" - -#: commit-graph.c:2289 -msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" -msgstr "" - -#: commit-graph.c:2396 -msgid "too many commits to write graph" -msgstr "" - -#: commit-graph.c:2494 -msgid "the commit-graph file has incorrect checksum and is likely corrupt" -msgstr "" - -#: commit-graph.c:2504 -#, c-format -msgid "commit-graph has incorrect OID order: %s then %s" -msgstr "" - -#: commit-graph.c:2514 commit-graph.c:2529 -#, c-format -msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" -msgstr "" - -#: commit-graph.c:2521 -#, c-format -msgid "failed to parse commit %s from commit-graph" -msgstr "" - -#: commit-graph.c:2539 -msgid "Verifying commits in commit graph" -msgstr "" - -#: commit-graph.c:2554 -#, c-format -msgid "failed to parse commit %s from object database for commit-graph" -msgstr "" - -#: commit-graph.c:2561 -#, c-format -msgid "root tree OID for commit %s in commit-graph is %s != %s" -msgstr "" - -#: commit-graph.c:2571 -#, c-format -msgid "commit-graph parent list for commit %s is too long" -msgstr "" - -#: commit-graph.c:2580 -#, c-format -msgid "commit-graph parent for %s is %s != %s" -msgstr "" - -#: commit-graph.c:2594 -#, c-format -msgid "commit-graph parent list for commit %s terminates early" -msgstr "" - -#: commit-graph.c:2599 -#, c-format -msgid "" -"commit-graph has generation number zero for commit %s, but non-zero elsewhere" -msgstr "" - -#: commit-graph.c:2603 -#, c-format -msgid "" -"commit-graph has non-zero generation number for commit %s, but zero elsewhere" -msgstr "" - -#: commit-graph.c:2620 -#, c-format -msgid "commit-graph generation for commit %s is % < %" -msgstr "" - -#: commit-graph.c:2626 -#, c-format -msgid "commit date for commit %s in commit-graph is % != %" -msgstr "" - -#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445 -#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456 -#, c-format -msgid "could not parse %s" -msgstr "" - -#: commit.c:56 -#, c-format -msgid "%s %s is not a commit!" -msgstr "" - -#: commit.c:197 -msgid "" -"Support for /info/grafts is deprecated\n" -"and will be removed in a future Git version.\n" -"\n" -"Please use \"git replace --convert-graft-file\"\n" -"to convert the grafts into replace refs.\n" -"\n" -"Turn this message off by running\n" -"\"git config advice.graftFileDeprecated false\"" -msgstr "" - -#: commit.c:1252 -#, c-format -msgid "Commit %s has an untrusted GPG signature, allegedly by %s." -msgstr "" - -#: commit.c:1256 -#, c-format -msgid "Commit %s has a bad GPG signature allegedly by %s." -msgstr "" - -#: commit.c:1259 -#, c-format -msgid "Commit %s does not have a GPG signature." -msgstr "" - -#: commit.c:1262 -#, c-format -msgid "Commit %s has a good GPG signature by %s\n" -msgstr "" - -#: commit.c:1516 -msgid "" -"Warning: commit message did not conform to UTF-8.\n" -"You may want to amend it after fixing the message, or set the config\n" -"variable i18n.commitencoding to the encoding your project uses.\n" -msgstr "" - -#: compat/obstack.c:406 compat/obstack.c:408 -msgid "memory exhausted" -msgstr "" - -#: compat/terminal.c:167 -msgid "cannot resume in the background, please use 'fg' to resume" -msgstr "" - -#: compat/terminal.c:168 -msgid "cannot restore terminal settings" -msgstr "" - -#: config.c:143 -#, c-format -msgid "" -"exceeded maximum include depth (%d) while including\n" -"\t%s\n" -"from\n" -"\t%s\n" -"This might be due to circular includes." -msgstr "" - -#: config.c:159 -#, c-format -msgid "could not expand include path '%s'" -msgstr "" - -#: config.c:170 -msgid "relative config includes must come from files" -msgstr "" - -#: config.c:219 -msgid "relative config include conditionals must come from files" -msgstr "" - -#: config.c:364 -msgid "" -"remote URLs cannot be configured in file directly or indirectly included by " -"includeIf.hasconfig:remote.*.url" -msgstr "" - -#: config.c:508 -#, c-format -msgid "invalid config format: %s" -msgstr "" - -#: config.c:512 -#, c-format -msgid "missing environment variable name for configuration '%.*s'" -msgstr "" - -#: config.c:517 -#, c-format -msgid "missing environment variable '%s' for configuration '%.*s'" -msgstr "" - -#: config.c:553 -#, c-format -msgid "key does not contain a section: %s" -msgstr "" - -#: config.c:558 -#, c-format -msgid "key does not contain variable name: %s" -msgstr "" - -#: config.c:580 sequencer.c:2802 -#, c-format -msgid "invalid key: %s" -msgstr "" - -#: config.c:585 -#, c-format -msgid "invalid key (newline): %s" -msgstr "" - -#: config.c:605 -msgid "empty config key" -msgstr "" - -#: config.c:623 config.c:635 -#, c-format -msgid "bogus config parameter: %s" -msgstr "" - -#: config.c:649 config.c:666 config.c:673 config.c:682 -#, c-format -msgid "bogus format in %s" -msgstr "" - -#: config.c:716 -#, c-format -msgid "bogus count in %s" -msgstr "" - -#: config.c:720 -#, c-format -msgid "too many entries in %s" -msgstr "" - -#: config.c:730 -#, c-format -msgid "missing config key %s" -msgstr "" - -#: config.c:738 -#, c-format -msgid "missing config value %s" -msgstr "" - -#: config.c:1089 -#, c-format -msgid "bad config line %d in blob %s" -msgstr "" - -#: config.c:1093 -#, c-format -msgid "bad config line %d in file %s" -msgstr "" - -#: config.c:1097 -#, c-format -msgid "bad config line %d in standard input" -msgstr "" - -#: config.c:1101 -#, c-format -msgid "bad config line %d in submodule-blob %s" -msgstr "" - -#: config.c:1105 -#, c-format -msgid "bad config line %d in command line %s" -msgstr "" - -#: config.c:1109 -#, c-format -msgid "bad config line %d in %s" -msgstr "" - -#: config.c:1246 -msgid "out of range" -msgstr "" - -#: config.c:1246 -msgid "invalid unit" -msgstr "" - -#: config.c:1247 -#, c-format -msgid "bad numeric config value '%s' for '%s': %s" -msgstr "" - -#: config.c:1257 -#, c-format -msgid "bad numeric config value '%s' for '%s' in blob %s: %s" -msgstr "" - -#: config.c:1260 -#, c-format -msgid "bad numeric config value '%s' for '%s' in file %s: %s" -msgstr "" - -#: config.c:1263 -#, c-format -msgid "bad numeric config value '%s' for '%s' in standard input: %s" -msgstr "" - -#: config.c:1266 -#, c-format -msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" -msgstr "" - -#: config.c:1269 -#, c-format -msgid "bad numeric config value '%s' for '%s' in command line %s: %s" -msgstr "" - -#: config.c:1272 -#, c-format -msgid "bad numeric config value '%s' for '%s' in %s: %s" -msgstr "" - -#: config.c:1368 -#, c-format -msgid "invalid value for variable %s" -msgstr "" - -#: config.c:1389 -#, c-format -msgid "ignoring unknown core.fsync component '%s'" -msgstr "" - -#: config.c:1425 -#, c-format -msgid "bad boolean config value '%s' for '%s'" -msgstr "" - -#: config.c:1443 -#, c-format -msgid "failed to expand user dir in: '%s'" -msgstr "" - -#: config.c:1452 -#, c-format -msgid "'%s' for '%s' is not a valid timestamp" -msgstr "" - -#: config.c:1545 -#, c-format -msgid "abbrev length out of range: %d" -msgstr "" - -#: config.c:1559 config.c:1570 -#, c-format -msgid "bad zlib compression level %d" -msgstr "" - -#: config.c:1660 -msgid "core.commentChar should only be one character" -msgstr "" - -#: config.c:1692 -#, c-format -msgid "ignoring unknown core.fsyncMethod value '%s'" -msgstr "" - -#: config.c:1698 -msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead" -msgstr "" - -#: config.c:1714 -#, c-format -msgid "invalid mode for object creation: %s" -msgstr "" - -#: config.c:1800 -#, c-format -msgid "malformed value for %s" -msgstr "" - -#: config.c:1826 -#, c-format -msgid "malformed value for %s: %s" -msgstr "" - -#: config.c:1827 -msgid "must be one of nothing, matching, simple, upstream or current" -msgstr "" - -#: config.c:1888 builtin/pack-objects.c:4078 -#, c-format -msgid "bad pack compression level %d" -msgstr "" - -#: config.c:2014 -#, c-format -msgid "unable to load config blob object '%s'" -msgstr "" - -#: config.c:2017 -#, c-format -msgid "reference '%s' does not point to a blob" -msgstr "" - -#: config.c:2035 -#, c-format -msgid "unable to resolve config blob '%s'" -msgstr "" - -#: config.c:2080 -#, c-format -msgid "failed to parse %s" -msgstr "" - -#: config.c:2136 -msgid "unable to parse command-line config" -msgstr "" - -#: config.c:2512 -msgid "unknown error occurred while reading the configuration files" -msgstr "" - -#: config.c:2686 -#, c-format -msgid "Invalid %s: '%s'" -msgstr "" - -#: config.c:2731 -#, c-format -msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" -msgstr "" - -#: config.c:2763 -#, c-format -msgid "unable to parse '%s' from command-line config" -msgstr "" - -#: config.c:2765 -#, c-format -msgid "bad config variable '%s' in file '%s' at line %d" -msgstr "" - -#: config.c:2850 -#, c-format -msgid "invalid section name '%s'" -msgstr "" - -#: config.c:2882 -#, c-format -msgid "%s has multiple values" -msgstr "" - -#: config.c:2911 -#, c-format -msgid "failed to write new configuration file %s" -msgstr "" - -#: config.c:3177 config.c:3518 -#, c-format -msgid "could not lock config file %s" -msgstr "" - -#: config.c:3188 -#, c-format -msgid "opening %s" -msgstr "" - -#: config.c:3225 builtin/config.c:361 -#, c-format -msgid "invalid pattern: %s" -msgstr "" - -#: config.c:3250 -#, c-format -msgid "invalid config file %s" -msgstr "" - -#: config.c:3263 config.c:3531 -#, c-format -msgid "fstat on %s failed" -msgstr "" - -#: config.c:3274 -#, c-format -msgid "unable to mmap '%s'%s" -msgstr "" - -#: config.c:3284 config.c:3536 -#, c-format -msgid "chmod on %s failed" -msgstr "" - -#: config.c:3369 config.c:3633 -#, c-format -msgid "could not write config file %s" -msgstr "" - -#: config.c:3403 -#, c-format -msgid "could not set '%s' to '%s'" -msgstr "" - -#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893 -#, c-format -msgid "could not unset '%s'" -msgstr "" - -#: config.c:3509 -#, c-format -msgid "invalid section name: %s" -msgstr "" - -#: config.c:3676 -#, c-format -msgid "missing value for '%s'" -msgstr "" - -#: connect.c:61 -msgid "the remote end hung up upon initial contact" -msgstr "" - -#: connect.c:63 -msgid "" -"Could not read from remote repository.\n" -"\n" -"Please make sure you have the correct access rights\n" -"and the repository exists." -msgstr "" - -#: connect.c:81 -#, c-format -msgid "server doesn't support '%s'" -msgstr "" - -#: connect.c:118 -#, c-format -msgid "server doesn't support feature '%s'" -msgstr "" - -#: connect.c:129 -msgid "expected flush after capabilities" -msgstr "" - -#: connect.c:265 -#, c-format -msgid "ignoring capabilities after first line '%s'" -msgstr "" - -#: connect.c:286 -msgid "protocol error: unexpected capabilities^{}" -msgstr "" - -#: connect.c:308 -#, c-format -msgid "protocol error: expected shallow sha-1, got '%s'" -msgstr "" - -#: connect.c:310 -msgid "repository on the other end cannot be shallow" -msgstr "" - -#: connect.c:349 -msgid "invalid packet" -msgstr "" - -#: connect.c:369 -#, c-format -msgid "protocol error: unexpected '%s'" -msgstr "" - -#: connect.c:499 -#, c-format -msgid "unknown object format '%s' specified by server" -msgstr "" - -#: connect.c:528 -#, c-format -msgid "invalid ls-refs response: %s" -msgstr "" - -#: connect.c:532 -msgid "expected flush after ref listing" -msgstr "" - -#: connect.c:535 -msgid "expected response end packet after ref listing" -msgstr "" - -#: connect.c:670 -#, c-format -msgid "protocol '%s' is not supported" -msgstr "" - -#: connect.c:721 -msgid "unable to set SO_KEEPALIVE on socket" -msgstr "" - -#: connect.c:761 connect.c:824 -#, c-format -msgid "Looking up %s ... " -msgstr "" - -#: connect.c:765 -#, c-format -msgid "unable to look up %s (port %s) (%s)" -msgstr "" - -#. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:769 connect.c:840 -#, c-format -msgid "" -"done.\n" -"Connecting to %s (port %s) ... " -msgstr "" - -#: connect.c:791 connect.c:868 -#, c-format -msgid "" -"unable to connect to %s:\n" -"%s" -msgstr "" - -#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:797 connect.c:874 -msgid "done." -msgstr "" - -#: connect.c:828 -#, c-format -msgid "unable to look up %s (%s)" -msgstr "" - -#: connect.c:834 -#, c-format -msgid "unknown port %s" -msgstr "" - -#: connect.c:971 connect.c:1303 -#, c-format -msgid "strange hostname '%s' blocked" -msgstr "" - -#: connect.c:973 -#, c-format -msgid "strange port '%s' blocked" -msgstr "" - -#: connect.c:983 -#, c-format -msgid "cannot start proxy %s" -msgstr "" - -#: connect.c:1054 -msgid "no path specified; see 'git help pull' for valid url syntax" -msgstr "" - -#: connect.c:1194 -msgid "newline is forbidden in git:// hosts and repo paths" -msgstr "" - -#: connect.c:1251 -msgid "ssh variant 'simple' does not support -4" -msgstr "" - -#: connect.c:1263 -msgid "ssh variant 'simple' does not support -6" -msgstr "" - -#: connect.c:1280 -msgid "ssh variant 'simple' does not support setting port" -msgstr "" - -#: connect.c:1392 -#, c-format -msgid "strange pathname '%s' blocked" -msgstr "" - -#: connect.c:1440 -msgid "unable to fork" -msgstr "" - -#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57 -msgid "Checking connectivity" -msgstr "" - -#: connected.c:122 -msgid "Could not run 'git rev-list'" -msgstr "" - -#: connected.c:146 -msgid "failed write to rev-list" -msgstr "" - -#: connected.c:151 -msgid "failed to close rev-list's stdin" -msgstr "" - -#: convert.c:183 -#, c-format -msgid "illegal crlf_action %d" -msgstr "" - -#: convert.c:196 -#, c-format -msgid "CRLF would be replaced by LF in %s" -msgstr "" - -#: convert.c:198 -#, c-format -msgid "" -"CRLF will be replaced by LF in %s.\n" -"The file will have its original line endings in your working directory" -msgstr "" - -#: convert.c:206 -#, c-format -msgid "LF would be replaced by CRLF in %s" -msgstr "" - -#: convert.c:208 -#, c-format -msgid "" -"LF will be replaced by CRLF in %s.\n" -"The file will have its original line endings in your working directory" -msgstr "" - -#: convert.c:273 -#, c-format -msgid "BOM is prohibited in '%s' if encoded as %s" -msgstr "" - -#: convert.c:280 -#, c-format -msgid "" -"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " -"working-tree-encoding." -msgstr "" - -#: convert.c:293 -#, c-format -msgid "BOM is required in '%s' if encoded as %s" -msgstr "" - -#: convert.c:295 -#, c-format -msgid "" -"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" -"%sLE (depending on the byte order) as working-tree-encoding." -msgstr "" - -#: convert.c:408 convert.c:479 -#, c-format -msgid "failed to encode '%s' from %s to %s" -msgstr "" - -#: convert.c:451 -#, c-format -msgid "encoding '%s' from %s to %s and back is not the same" -msgstr "" - -#: convert.c:654 -#, c-format -msgid "cannot fork to run external filter '%s'" -msgstr "" - -#: convert.c:674 -#, c-format -msgid "cannot feed the input to external filter '%s'" -msgstr "" - -#: convert.c:681 -#, c-format -msgid "external filter '%s' failed %d" -msgstr "" - -#: convert.c:716 convert.c:719 -#, c-format -msgid "read from external filter '%s' failed" -msgstr "" - -#: convert.c:722 convert.c:777 -#, c-format -msgid "external filter '%s' failed" -msgstr "" - -#: convert.c:826 -msgid "unexpected filter type" -msgstr "" - -#: convert.c:837 -msgid "path name too long for external filter" -msgstr "" - -#: convert.c:935 -#, c-format -msgid "" -"external filter '%s' is not available anymore although not all paths have " -"been filtered" -msgstr "" - -#: convert.c:1236 -msgid "true/false are no valid working-tree-encodings" -msgstr "" - -#: convert.c:1416 convert.c:1449 -#, c-format -msgid "%s: clean filter '%s' failed" -msgstr "" - -#: convert.c:1492 -#, c-format -msgid "%s: smudge filter %s failed" -msgstr "" - -#: credential.c:96 -#, c-format -msgid "skipping credential lookup for key: credential.%s" -msgstr "" - -#: credential.c:112 -msgid "refusing to work with credential missing host field" -msgstr "" - -#: credential.c:114 -msgid "refusing to work with credential missing protocol field" -msgstr "" - -#: credential.c:396 -#, c-format -msgid "url contains a newline in its %s component: %s" -msgstr "" - -#: credential.c:440 -#, c-format -msgid "url has no scheme: %s" -msgstr "" - -#: credential.c:513 -#, c-format -msgid "credential url cannot be parsed: %s" -msgstr "" - -#: date.c:139 -msgid "in the future" -msgstr "" - -#: date.c:145 -#, c-format -msgid "% second ago" -msgid_plural "% seconds ago" -msgstr[0] "" -msgstr[1] "" - -#: date.c:152 -#, c-format -msgid "% minute ago" -msgid_plural "% minutes ago" -msgstr[0] "" -msgstr[1] "" - -#: date.c:159 -#, c-format -msgid "% hour ago" -msgid_plural "% hours ago" -msgstr[0] "" -msgstr[1] "" - -#: date.c:166 -#, c-format -msgid "% day ago" -msgid_plural "% days ago" -msgstr[0] "" -msgstr[1] "" - -#: date.c:172 -#, c-format -msgid "% week ago" -msgid_plural "% weeks ago" -msgstr[0] "" -msgstr[1] "" - -#: date.c:179 -#, c-format -msgid "% month ago" -msgid_plural "% months ago" -msgstr[0] "" -msgstr[1] "" - -#: date.c:190 -#, c-format -msgid "% year" -msgid_plural "% years" -msgstr[0] "" -msgstr[1] "" - -#. TRANSLATORS: "%s" is " years" -#: date.c:193 -#, c-format -msgid "%s, % month ago" -msgid_plural "%s, % months ago" -msgstr[0] "" -msgstr[1] "" - -#: date.c:198 date.c:203 -#, c-format -msgid "% year ago" -msgid_plural "% years ago" -msgstr[0] "" -msgstr[1] "" - -#: delta-islands.c:272 -msgid "Propagating island marks" -msgstr "" - -#: delta-islands.c:290 -#, c-format -msgid "bad tree object %s" -msgstr "" - -#: delta-islands.c:334 -#, c-format -msgid "failed to load island regex for '%s': %s" -msgstr "" - -#: delta-islands.c:390 -#, c-format -msgid "island regex from config has too many capture groups (max=%d)" -msgstr "" - -#: delta-islands.c:467 -#, c-format -msgid "Marked %d islands, done.\n" -msgstr "" - -#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37 -#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203 -#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742 -#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45 -#: builtin/pull.c:47 builtin/pull.c:321 -#, c-format -msgid "invalid value for '%s': '%s'" -msgstr "" - -#: diff-lib.c:561 -msgid "--merge-base does not work with ranges" -msgstr "" - -#: diff-lib.c:563 -msgid "--merge-base only works with commits" -msgstr "" - -#: diff-lib.c:580 -msgid "unable to get HEAD" -msgstr "" - -#: diff-lib.c:587 -msgid "no merge base found" -msgstr "" - -#: diff-lib.c:589 -msgid "multiple merge bases found" -msgstr "" - -#: diff-no-index.c:237 -msgid "git diff --no-index [] " -msgstr "" - -#: diff-no-index.c:262 -msgid "" -"Not a git repository. Use --no-index to compare two paths outside a working " -"tree" -msgstr "" - -#: diff.c:159 -#, c-format -msgid " Failed to parse dirstat cut-off percentage '%s'\n" -msgstr "" - -#: diff.c:164 -#, c-format -msgid " Unknown dirstat parameter '%s'\n" -msgstr "" - -#: diff.c:300 -msgid "" -"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " -"'dimmed-zebra', 'plain'" -msgstr "" - -#: diff.c:328 -#, c-format -msgid "" -"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " -"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" -msgstr "" - -#: diff.c:336 -msgid "" -"color-moved-ws: allow-indentation-change cannot be combined with other " -"whitespace modes" -msgstr "" - -#: diff.c:413 -#, c-format -msgid "Unknown value for 'diff.submodule' config variable: '%s'" -msgstr "" - -#: diff.c:473 -#, c-format -msgid "" -"Found errors in 'diff.dirstat' config variable:\n" -"%s" -msgstr "" - -#: diff.c:4282 -#, c-format -msgid "external diff died, stopping at %s" -msgstr "" - -#: diff.c:4677 parse-options.c:1114 -#, c-format -msgid "options '%s', '%s', '%s', and '%s' cannot be used together" -msgstr "" - -#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578 -#, c-format -msgid "options '%s', '%s', and '%s' cannot be used together" -msgstr "" - -#: diff.c:4685 -#, c-format -msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'" -msgstr "" - -#: diff.c:4689 -#, c-format -msgid "" -"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'" -msgstr "" - -#: diff.c:4769 -msgid "--follow requires exactly one pathspec" -msgstr "" - -#: diff.c:4823 -#, c-format -msgid "invalid --stat value: %s" -msgstr "" - -#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319 -#: parse-options.c:217 parse-options.c:221 -#, c-format -msgid "%s expects a numerical value" -msgstr "" - -#: diff.c:4860 -#, c-format -msgid "" -"Failed to parse --dirstat/-X option parameter:\n" -"%s" -msgstr "" - -#: diff.c:4893 -#, c-format -msgid "unknown change class '%c' in --diff-filter=%s" -msgstr "" - -#: diff.c:4917 -#, c-format -msgid "unknown value after ws-error-highlight=%.*s" -msgstr "" - -#: diff.c:4931 -#, c-format -msgid "unable to resolve '%s'" -msgstr "" - -#: diff.c:4981 diff.c:4987 -#, c-format -msgid "%s expects / form" -msgstr "" - -#: diff.c:4999 -#, c-format -msgid "%s expects a character, got '%s'" -msgstr "" - -#: diff.c:5020 -#, c-format -msgid "bad --color-moved argument: %s" -msgstr "" - -#: diff.c:5039 -#, c-format -msgid "invalid mode '%s' in --color-moved-ws" -msgstr "" - -#: diff.c:5079 -msgid "" -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" -msgstr "" - -#: diff.c:5115 diff.c:5135 -#, c-format -msgid "invalid argument to %s" -msgstr "" - -#: diff.c:5239 -#, c-format -msgid "invalid regex given to -I: '%s'" -msgstr "" - -#: diff.c:5288 -#, c-format -msgid "failed to parse --submodule option parameter: '%s'" -msgstr "" - -#: diff.c:5344 -#, c-format -msgid "bad --word-diff argument: %s" -msgstr "" - -#: diff.c:5380 -msgid "Diff output format options" -msgstr "" - -#: diff.c:5382 diff.c:5388 -msgid "generate patch" -msgstr "" - -#: diff.c:5385 builtin/log.c:180 -msgid "suppress diff output" -msgstr "" - -#: diff.c:5390 diff.c:5504 diff.c:5511 -msgid "" -msgstr "" - -#: diff.c:5391 diff.c:5394 -msgid "generate diffs with lines context" -msgstr "" - -#: diff.c:5396 -msgid "generate the diff in raw format" -msgstr "" - -#: diff.c:5399 -msgid "synonym for '-p --raw'" -msgstr "" - -#: diff.c:5403 -msgid "synonym for '-p --stat'" -msgstr "" - -#: diff.c:5407 -msgid "machine friendly --stat" -msgstr "" - -#: diff.c:5410 -msgid "output only the last line of --stat" -msgstr "" - -#: diff.c:5412 diff.c:5420 -msgid "..." -msgstr "" - -#: diff.c:5413 -msgid "" -"output the distribution of relative amount of changes for each sub-directory" -msgstr "" - -#: diff.c:5417 -msgid "synonym for --dirstat=cumulative" -msgstr "" - -#: diff.c:5421 -msgid "synonym for --dirstat=files,param1,param2..." -msgstr "" - -#: diff.c:5425 -msgid "warn if changes introduce conflict markers or whitespace errors" -msgstr "" - -#: diff.c:5428 -msgid "condensed summary such as creations, renames and mode changes" -msgstr "" - -#: diff.c:5431 -msgid "show only names of changed files" -msgstr "" - -#: diff.c:5434 -msgid "show only names and status of changed files" -msgstr "" - -#: diff.c:5436 -msgid "[,[,]]" -msgstr "" - -#: diff.c:5437 -msgid "generate diffstat" -msgstr "" - -#: diff.c:5439 diff.c:5442 diff.c:5445 -msgid "" -msgstr "" - -#: diff.c:5440 -msgid "generate diffstat with a given width" -msgstr "" - -#: diff.c:5443 -msgid "generate diffstat with a given name width" -msgstr "" - -#: diff.c:5446 -msgid "generate diffstat with a given graph width" -msgstr "" - -#: diff.c:5448 -msgid "" -msgstr "" - -#: diff.c:5449 -msgid "generate diffstat with limited lines" -msgstr "" - -#: diff.c:5452 -msgid "generate compact summary in diffstat" -msgstr "" - -#: diff.c:5455 -msgid "output a binary diff that can be applied" -msgstr "" - -#: diff.c:5458 -msgid "show full pre- and post-image object names on the \"index\" lines" -msgstr "" - -#: diff.c:5460 -msgid "show colored diff" -msgstr "" - -#: diff.c:5461 -msgid "" -msgstr "" - -#: diff.c:5462 -msgid "" -"highlight whitespace errors in the 'context', 'old' or 'new' lines in the " -"diff" -msgstr "" - -#: diff.c:5465 -msgid "" -"do not munge pathnames and use NULs as output field terminators in --raw or " -"--numstat" -msgstr "" - -#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583 -msgid "" -msgstr "" - -#: diff.c:5469 -msgid "show the given source prefix instead of \"a/\"" -msgstr "" - -#: diff.c:5472 -msgid "show the given destination prefix instead of \"b/\"" -msgstr "" - -#: diff.c:5475 -msgid "prepend an additional prefix to every line of output" -msgstr "" - -#: diff.c:5478 -msgid "do not show any source or destination prefix" -msgstr "" - -#: diff.c:5481 -msgid "show context between diff hunks up to the specified number of lines" -msgstr "" - -#: diff.c:5485 diff.c:5490 diff.c:5495 -msgid "" -msgstr "" - -#: diff.c:5486 -msgid "specify the character to indicate a new line instead of '+'" -msgstr "" - -#: diff.c:5491 -msgid "specify the character to indicate an old line instead of '-'" -msgstr "" - -#: diff.c:5496 -msgid "specify the character to indicate a context instead of ' '" -msgstr "" - -#: diff.c:5499 -msgid "Diff rename options" -msgstr "" - -#: diff.c:5500 -msgid "[/]" -msgstr "" - -#: diff.c:5501 -msgid "break complete rewrite changes into pairs of delete and create" -msgstr "" - -#: diff.c:5505 -msgid "detect renames" -msgstr "" - -#: diff.c:5509 -msgid "omit the preimage for deletes" -msgstr "" - -#: diff.c:5512 -msgid "detect copies" -msgstr "" - -#: diff.c:5516 -msgid "use unmodified files as source to find copies" -msgstr "" - -#: diff.c:5518 -msgid "disable rename detection" -msgstr "" - -#: diff.c:5521 -msgid "use empty blobs as rename source" -msgstr "" - -#: diff.c:5523 -msgid "continue listing the history of a file beyond renames" -msgstr "" - -#: diff.c:5526 -msgid "" -"prevent rename/copy detection if the number of rename/copy targets exceeds " -"given limit" -msgstr "" - -#: diff.c:5528 -msgid "Diff algorithm options" -msgstr "" - -#: diff.c:5530 -msgid "produce the smallest possible diff" -msgstr "" - -#: diff.c:5533 -msgid "ignore whitespace when comparing lines" -msgstr "" - -#: diff.c:5536 -msgid "ignore changes in amount of whitespace" -msgstr "" - -#: diff.c:5539 -msgid "ignore changes in whitespace at EOL" -msgstr "" - -#: diff.c:5542 -msgid "ignore carrier-return at the end of line" -msgstr "" - -#: diff.c:5545 -msgid "ignore changes whose lines are all blank" -msgstr "" - -#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617 -msgid "" -msgstr "" - -#: diff.c:5548 -msgid "ignore changes whose all lines match " -msgstr "" - -#: diff.c:5551 -msgid "heuristic to shift diff hunk boundaries for easy reading" -msgstr "" - -#: diff.c:5554 -msgid "generate diff using the \"patience diff\" algorithm" -msgstr "" - -#: diff.c:5558 -msgid "generate diff using the \"histogram diff\" algorithm" -msgstr "" - -#: diff.c:5560 -msgid "" -msgstr "" - -#: diff.c:5561 -msgid "choose a diff algorithm" -msgstr "" - -#: diff.c:5563 -msgid "" -msgstr "" - -#: diff.c:5564 -msgid "generate diff using the \"anchored diff\" algorithm" -msgstr "" - -#: diff.c:5566 diff.c:5575 diff.c:5578 -msgid "" -msgstr "" - -#: diff.c:5567 -msgid "show word diff, using to delimit changed words" -msgstr "" - -#: diff.c:5570 -msgid "use to decide what a word is" -msgstr "" - -#: diff.c:5573 -msgid "equivalent to --word-diff=color --word-diff-regex=" -msgstr "" - -#: diff.c:5576 -msgid "moved lines of code are colored differently" -msgstr "" - -#: diff.c:5579 -msgid "how white spaces are ignored in --color-moved" -msgstr "" - -#: diff.c:5582 -msgid "Other diff options" -msgstr "" - -#: diff.c:5584 -msgid "when run from subdir, exclude changes outside and show relative paths" -msgstr "" - -#: diff.c:5588 -msgid "treat all files as text" -msgstr "" - -#: diff.c:5590 -msgid "swap two inputs, reverse the diff" -msgstr "" - -#: diff.c:5592 -msgid "exit with 1 if there were differences, 0 otherwise" -msgstr "" - -#: diff.c:5594 -msgid "disable all output of the program" -msgstr "" - -#: diff.c:5596 -msgid "allow an external diff helper to be executed" -msgstr "" - -#: diff.c:5598 -msgid "run external text conversion filters when comparing binary files" -msgstr "" - -#: diff.c:5600 -msgid "" -msgstr "" - -#: diff.c:5601 -msgid "ignore changes to submodules in the diff generation" -msgstr "" - -#: diff.c:5604 -msgid "" -msgstr "" - -#: diff.c:5605 -msgid "specify how differences in submodules are shown" -msgstr "" - -#: diff.c:5609 -msgid "hide 'git add -N' entries from the index" -msgstr "" - -#: diff.c:5612 -msgid "treat 'git add -N' entries as real in the index" -msgstr "" - -#: diff.c:5614 -msgid "" -msgstr "" - -#: diff.c:5615 -msgid "" -"look for differences that change the number of occurrences of the specified " -"string" -msgstr "" - -#: diff.c:5618 -msgid "" -"look for differences that change the number of occurrences of the specified " -"regex" -msgstr "" - -#: diff.c:5621 -msgid "show all changes in the changeset with -S or -G" -msgstr "" - -#: diff.c:5624 -msgid "treat in -S as extended POSIX regular expression" -msgstr "" - -#: diff.c:5627 -msgid "control the order in which files appear in the output" -msgstr "" - -#: diff.c:5628 diff.c:5631 -msgid "" -msgstr "" - -#: diff.c:5629 -msgid "show the change in the specified path first" -msgstr "" - -#: diff.c:5632 -msgid "skip the output to the specified path" -msgstr "" - -#: diff.c:5634 -msgid "" -msgstr "" - -#: diff.c:5635 -msgid "" -"look for differences that change the number of occurrences of the specified " -"object" -msgstr "" - -#: diff.c:5637 -msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" -msgstr "" - -#: diff.c:5638 -msgid "select files by diff type" -msgstr "" - -#: diff.c:5640 -msgid "" -msgstr "" - -#: diff.c:5641 -msgid "output to a specific file" -msgstr "" - -#: diff.c:6321 -msgid "exhaustive rename detection was skipped due to too many files." -msgstr "" - -#: diff.c:6324 -msgid "only found copies from modified paths due to too many files." -msgstr "" - -#: diff.c:6327 -#, c-format -msgid "" -"you may want to set your %s variable to at least %d and retry the command." -msgstr "" - -#: diffcore-order.c:24 -#, c-format -msgid "failed to read orderfile '%s'" -msgstr "" - -#: diffcore-rename.c:1564 -msgid "Performing inexact rename detection" -msgstr "" - -#: diffcore-rotate.c:29 -#, c-format -msgid "No such path '%s' in the diff" -msgstr "" - -#: dir.c:593 -#, c-format -msgid "pathspec '%s' did not match any file(s) known to git" -msgstr "" - -#: dir.c:733 dir.c:762 dir.c:775 -#, c-format -msgid "unrecognized pattern: '%s'" -msgstr "" - -#: dir.c:790 dir.c:804 -#, c-format -msgid "unrecognized negative pattern: '%s'" -msgstr "" - -#: dir.c:820 -#, c-format -msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" -msgstr "" - -#: dir.c:828 -msgid "disabling cone pattern matching" -msgstr "" - -#: dir.c:1212 -#, c-format -msgid "cannot use %s as an exclude file" -msgstr "" - -#: dir.c:2419 -#, c-format -msgid "could not open directory '%s'" -msgstr "" - -#: dir.c:2721 -msgid "failed to get kernel name and information" -msgstr "" - -#: dir.c:2846 -msgid "untracked cache is disabled on this system or location" -msgstr "" - -#: dir.c:3119 -msgid "" -"No directory name could be guessed.\n" -"Please specify a directory on the command line" -msgstr "" - -#: dir.c:3807 -#, c-format -msgid "index file corrupt in repo %s" -msgstr "" - -#: dir.c:3854 dir.c:3859 -#, c-format -msgid "could not create directories for %s" -msgstr "" - -#: dir.c:3888 -#, c-format -msgid "could not migrate git directory from '%s' to '%s'" -msgstr "" - -#: editor.c:74 -#, c-format -msgid "hint: Waiting for your editor to close the file...%c" -msgstr "" - -#: entry.c:179 -msgid "Filtering content" -msgstr "" - -#: entry.c:500 -#, c-format -msgid "could not stat file '%s'" -msgstr "" - -#: environment.c:147 -#, c-format -msgid "bad git namespace path \"%s\"" -msgstr "" - -#: exec-cmd.c:363 -#, c-format -msgid "too many args to run %s" -msgstr "" - -#: fetch-pack.c:194 -msgid "git fetch-pack: expected shallow list" -msgstr "" - -#: fetch-pack.c:197 -msgid "git fetch-pack: expected a flush packet after shallow list" -msgstr "" - -#: fetch-pack.c:208 -msgid "git fetch-pack: expected ACK/NAK, got a flush packet" -msgstr "" - -#: fetch-pack.c:228 -#, c-format -msgid "git fetch-pack: expected ACK/NAK, got '%s'" -msgstr "" - -#: fetch-pack.c:239 -msgid "unable to write to remote" -msgstr "" - -#: fetch-pack.c:397 fetch-pack.c:1460 -#, c-format -msgid "invalid shallow line: %s" -msgstr "" - -#: fetch-pack.c:403 fetch-pack.c:1466 -#, c-format -msgid "invalid unshallow line: %s" -msgstr "" - -#: fetch-pack.c:405 fetch-pack.c:1468 -#, c-format -msgid "object not found: %s" -msgstr "" - -#: fetch-pack.c:408 fetch-pack.c:1471 -#, c-format -msgid "error in object: %s" -msgstr "" - -#: fetch-pack.c:410 fetch-pack.c:1473 -#, c-format -msgid "no shallow found: %s" -msgstr "" - -#: fetch-pack.c:413 fetch-pack.c:1477 -#, c-format -msgid "expected shallow/unshallow, got %s" -msgstr "" - -#: fetch-pack.c:453 -#, c-format -msgid "got %s %d %s" -msgstr "" - -#: fetch-pack.c:470 -#, c-format -msgid "invalid commit %s" -msgstr "" - -#: fetch-pack.c:501 -msgid "giving up" -msgstr "" - -#: fetch-pack.c:514 progress.h:25 -msgid "done" -msgstr "" - -#: fetch-pack.c:526 -#, c-format -msgid "got %s (%d) %s" -msgstr "" - -#: fetch-pack.c:562 -#, c-format -msgid "Marking %s as complete" -msgstr "" - -#: fetch-pack.c:784 -#, c-format -msgid "already have %s (%s)" -msgstr "" - -#: fetch-pack.c:870 -msgid "fetch-pack: unable to fork off sideband demultiplexer" -msgstr "" - -#: fetch-pack.c:878 -msgid "protocol error: bad pack header" -msgstr "" - -#: fetch-pack.c:974 -#, c-format -msgid "fetch-pack: unable to fork off %s" -msgstr "" - -#: fetch-pack.c:980 -msgid "fetch-pack: invalid index-pack output" -msgstr "" - -#: fetch-pack.c:997 -#, c-format -msgid "%s failed" -msgstr "" - -#: fetch-pack.c:999 -msgid "error in sideband demultiplexer" -msgstr "" - -#: fetch-pack.c:1048 -#, c-format -msgid "Server version is %.*s" -msgstr "" - -#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071 -#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087 -#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103 -#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125 -#, c-format -msgid "Server supports %s" -msgstr "" - -#: fetch-pack.c:1058 -msgid "Server does not support shallow clients" -msgstr "" - -#: fetch-pack.c:1118 -msgid "Server does not support --shallow-since" -msgstr "" - -#: fetch-pack.c:1123 -msgid "Server does not support --shallow-exclude" -msgstr "" - -#: fetch-pack.c:1127 -msgid "Server does not support --deepen" -msgstr "" - -#: fetch-pack.c:1129 -msgid "Server does not support this repository's object format" -msgstr "" - -#: fetch-pack.c:1142 -msgid "no common commits" -msgstr "" - -#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166 -msgid "source repository is shallow, reject to clone." -msgstr "" - -#: fetch-pack.c:1157 fetch-pack.c:1705 -msgid "git fetch-pack: fetch failed." -msgstr "" - -#: fetch-pack.c:1271 -#, c-format -msgid "mismatched algorithms: client %s; server %s" -msgstr "" - -#: fetch-pack.c:1275 -#, c-format -msgid "the server does not support algorithm '%s'" -msgstr "" - -#: fetch-pack.c:1308 -msgid "Server does not support shallow requests" -msgstr "" - -#: fetch-pack.c:1315 -msgid "Server supports filter" -msgstr "" - -#: fetch-pack.c:1358 fetch-pack.c:2087 -msgid "unable to write request to remote" -msgstr "" - -#: fetch-pack.c:1376 -#, c-format -msgid "error reading section header '%s'" -msgstr "" - -#: fetch-pack.c:1382 -#, c-format -msgid "expected '%s', received '%s'" -msgstr "" - -#: fetch-pack.c:1416 -#, c-format -msgid "unexpected acknowledgment line: '%s'" -msgstr "" - -#: fetch-pack.c:1421 -#, c-format -msgid "error processing acks: %d" -msgstr "" - -#. TRANSLATORS: The parameter will be 'ready', a protocol -#. keyword. -#. -#: fetch-pack.c:1435 -#, c-format -msgid "expected packfile to be sent after '%s'" -msgstr "" - -#. TRANSLATORS: The parameter will be 'ready', a protocol -#. keyword. -#. -#: fetch-pack.c:1441 -#, c-format -msgid "expected no other sections to be sent after no '%s'" -msgstr "" - -#: fetch-pack.c:1482 -#, c-format -msgid "error processing shallow info: %d" -msgstr "" - -#: fetch-pack.c:1531 -#, c-format -msgid "expected wanted-ref, got '%s'" -msgstr "" - -#: fetch-pack.c:1536 -#, c-format -msgid "unexpected wanted-ref: '%s'" -msgstr "" - -#: fetch-pack.c:1541 -#, c-format -msgid "error processing wanted refs: %d" -msgstr "" - -#: fetch-pack.c:1571 -msgid "git fetch-pack: expected response end packet" -msgstr "" - -#: fetch-pack.c:1983 -msgid "no matching remote head" -msgstr "" - -#: fetch-pack.c:2006 builtin/clone.c:587 -msgid "remote did not send all necessary objects" -msgstr "" - -#: fetch-pack.c:2109 -msgid "unexpected 'ready' from remote" -msgstr "" - -#: fetch-pack.c:2132 -#, c-format -msgid "no such remote ref %s" -msgstr "" - -#: fetch-pack.c:2135 -#, c-format -msgid "Server does not allow request for unadvertised object %s" -msgstr "" - -#: fsmonitor-ipc.c:119 -#, c-format -msgid "fsmonitor_ipc__send_query: invalid path '%s'" -msgstr "" - -#: fsmonitor-ipc.c:125 -#, c-format -msgid "fsmonitor_ipc__send_query: unspecified error on '%s'" -msgstr "" - -#: fsmonitor-ipc.c:155 -msgid "fsmonitor--daemon is not running" -msgstr "" - -#: fsmonitor-ipc.c:164 -#, c-format -msgid "could not send '%s' command to fsmonitor--daemon" -msgstr "" - -#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995 -#: gpg-interface.c:1011 -msgid "could not create temporary file" -msgstr "" - -#: gpg-interface.c:332 gpg-interface.c:459 -#, c-format -msgid "failed writing detached signature to '%s'" -msgstr "" - -#: gpg-interface.c:450 -msgid "" -"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh " -"signature verification" -msgstr "" - -#: gpg-interface.c:479 -msgid "" -"ssh-keygen -Y find-principals/verify is needed for ssh signature " -"verification (available in openssh version 8.2p1+)" -msgstr "" - -#: gpg-interface.c:550 -#, c-format -msgid "ssh signing revocation file configured but not found: %s" -msgstr "" - -#: gpg-interface.c:638 -#, c-format -msgid "bad/incompatible signature '%s'" -msgstr "" - -#: gpg-interface.c:815 gpg-interface.c:820 -#, c-format -msgid "failed to get the ssh fingerprint for key '%s'" -msgstr "" - -#: gpg-interface.c:843 -msgid "" -"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured" -msgstr "" - -#: gpg-interface.c:865 -#, c-format -msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s" -msgstr "" - -#: gpg-interface.c:871 -#, c-format -msgid "gpg.ssh.defaultKeyCommand failed: %s %s" -msgstr "" - -#: gpg-interface.c:966 -msgid "gpg failed to sign the data" -msgstr "" - -#: gpg-interface.c:988 -msgid "user.signingkey needs to be set for ssh signing" -msgstr "" - -#: gpg-interface.c:999 -#, c-format -msgid "failed writing ssh signing key to '%s'" -msgstr "" - -#: gpg-interface.c:1017 -#, c-format -msgid "failed writing ssh signing key buffer to '%s'" -msgstr "" - -#: gpg-interface.c:1035 -msgid "" -"ssh-keygen -Y sign is needed for ssh signing (available in openssh version " -"8.2p1+)" -msgstr "" - -#: gpg-interface.c:1047 -#, c-format -msgid "failed reading ssh signing data buffer from '%s'" -msgstr "" - -#: graph.c:98 -#, c-format -msgid "ignored invalid color '%.*s' in log.graphColors" -msgstr "" - -#: grep.c:446 -msgid "" -"given pattern contains NULL byte (via -f ). This is only supported " -"with -P under PCRE v2" -msgstr "" - -#: grep.c:1859 -#, c-format -msgid "'%s': unable to read %s" -msgstr "" - -#: grep.c:1876 setup.c:178 builtin/clone.c:308 builtin/diff.c:90 -#: builtin/rm.c:136 -#, c-format -msgid "failed to stat '%s'" -msgstr "" - -#: grep.c:1887 -#, c-format -msgid "'%s': short read" -msgstr "" - -#: help.c:25 -msgid "start a working area (see also: git help tutorial)" -msgstr "" - -#: help.c:26 -msgid "work on the current change (see also: git help everyday)" -msgstr "" - -#: help.c:27 -msgid "examine the history and state (see also: git help revisions)" -msgstr "" - -#: help.c:28 -msgid "grow, mark and tweak your common history" -msgstr "" - -#: help.c:29 -msgid "collaborate (see also: git help workflows)" -msgstr "" - -#: help.c:33 -msgid "Main Porcelain Commands" -msgstr "" - -#: help.c:34 -msgid "Ancillary Commands / Manipulators" -msgstr "" - -#: help.c:35 -msgid "Ancillary Commands / Interrogators" -msgstr "" - -#: help.c:36 -msgid "Interacting with Others" -msgstr "" - -#: help.c:37 -msgid "Low-level Commands / Manipulators" -msgstr "" - -#: help.c:38 -msgid "Low-level Commands / Interrogators" -msgstr "" - -#: help.c:39 -msgid "Low-level Commands / Syncing Repositories" -msgstr "" - -#: help.c:40 -msgid "Low-level Commands / Internal Helpers" -msgstr "" - -#: help.c:316 -#, c-format -msgid "available git commands in '%s'" -msgstr "" - -#: help.c:323 -msgid "git commands available from elsewhere on your $PATH" -msgstr "" - -#: help.c:332 -msgid "These are common Git commands used in various situations:" -msgstr "" - -#: help.c:382 git.c:100 -#, c-format -msgid "unsupported command listing type '%s'" -msgstr "" - -#: help.c:422 -msgid "The Git concept guides are:" -msgstr "" - -#: help.c:446 -msgid "External commands" -msgstr "" - -#: help.c:468 -msgid "Command aliases" -msgstr "" - -#: help.c:486 -msgid "See 'git help ' to read about a specific subcommand" -msgstr "" - -#: help.c:563 -#, c-format -msgid "" -"'%s' appears to be a git command, but we were not\n" -"able to execute it. Maybe git-%s is broken?" -msgstr "" - -#: help.c:585 help.c:682 -#, c-format -msgid "git: '%s' is not a git command. See 'git --help'." -msgstr "" - -#: help.c:633 -msgid "Uh oh. Your system reports no Git commands at all." -msgstr "" - -#: help.c:655 -#, c-format -msgid "WARNING: You called a Git command named '%s', which does not exist." -msgstr "" - -#: help.c:660 -#, c-format -msgid "Continuing under the assumption that you meant '%s'." -msgstr "" - -#: help.c:666 -#, c-format -msgid "Run '%s' instead [y/N]? " -msgstr "" - -#: help.c:674 -#, c-format -msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." -msgstr "" - -#: help.c:686 -msgid "" -"\n" -"The most similar command is" -msgid_plural "" -"\n" -"The most similar commands are" -msgstr[0] "" -msgstr[1] "" - -#: help.c:729 -msgid "git version []" -msgstr "" - -#: help.c:784 -#, c-format -msgid "%s: %s - %s" -msgstr "" - -#: help.c:788 -msgid "" -"\n" -"Did you mean this?" -msgid_plural "" -"\n" -"Did you mean one of these?" -msgstr[0] "" -msgstr[1] "" - -#: hook.c:28 -#, c-format -msgid "" -"The '%s' hook was ignored because it's not set as executable.\n" -"You can disable this warning with `git config advice.ignoredHook false`." -msgstr "" - -#: hook.c:87 -#, c-format -msgid "Couldn't start hook '%s'\n" -msgstr "" - -#: ident.c:354 -msgid "Author identity unknown\n" -msgstr "" - -#: ident.c:357 -msgid "Committer identity unknown\n" -msgstr "" - -#: ident.c:363 -msgid "" -"\n" -"*** Please tell me who you are.\n" -"\n" -"Run\n" -"\n" -" git config --global user.email \"you@example.com\"\n" -" git config --global user.name \"Your Name\"\n" -"\n" -"to set your account's default identity.\n" -"Omit --global to set the identity only in this repository.\n" -"\n" -msgstr "" - -#: ident.c:398 -msgid "no email was given and auto-detection is disabled" -msgstr "" - -#: ident.c:403 -#, c-format -msgid "unable to auto-detect email address (got '%s')" -msgstr "" - -#: ident.c:420 -msgid "no name was given and auto-detection is disabled" -msgstr "" - -#: ident.c:426 -#, c-format -msgid "unable to auto-detect name (got '%s')" -msgstr "" - -#: ident.c:434 -#, c-format -msgid "empty ident name (for <%s>) not allowed" -msgstr "" - -#: ident.c:440 -#, c-format -msgid "name consists only of disallowed characters: %s" -msgstr "" - -#: ident.c:455 builtin/commit.c:649 -#, c-format -msgid "invalid date format: %s" -msgstr "" - -#: list-objects-filter-options.c:68 -msgid "expected 'tree:'" -msgstr "" - -#: list-objects-filter-options.c:83 -msgid "sparse:path filters support has been dropped" -msgstr "" - -#: list-objects-filter-options.c:90 -#, c-format -msgid "'%s' for 'object:type=' is not a valid object type" -msgstr "" - -#: list-objects-filter-options.c:109 -#, c-format -msgid "invalid filter-spec '%s'" -msgstr "" - -#: list-objects-filter-options.c:125 -#, c-format -msgid "must escape char in sub-filter-spec: '%c'" -msgstr "" - -#: list-objects-filter-options.c:167 -msgid "expected something after combine:" -msgstr "" - -#: list-objects-filter-options.c:249 -msgid "multiple filter-specs cannot be combined" -msgstr "" - -#: list-objects-filter-options.c:365 -msgid "unable to upgrade repository format to support partial clone" -msgstr "" - -#: list-objects-filter.c:532 -#, c-format -msgid "unable to access sparse blob in '%s'" -msgstr "" - -#: list-objects-filter.c:535 -#, c-format -msgid "unable to parse sparse filter data in %s" -msgstr "" - -#: list-objects.c:144 -#, c-format -msgid "entry '%s' in tree %s has tree mode, but is not a tree" -msgstr "" - -#: list-objects.c:157 -#, c-format -msgid "entry '%s' in tree %s has blob mode, but is not a blob" -msgstr "" - -#: list-objects.c:415 -#, c-format -msgid "unable to load root tree for commit %s" -msgstr "" - -#: lockfile.c:152 -#, c-format -msgid "" -"Unable to create '%s.lock': %s.\n" -"\n" -"Another git process seems to be running in this repository, e.g.\n" -"an editor opened by 'git commit'. Please make sure all processes\n" -"are terminated then try again. If it still fails, a git process\n" -"may have crashed in this repository earlier:\n" -"remove the file manually to continue." -msgstr "" - -#: lockfile.c:160 -#, c-format -msgid "Unable to create '%s.lock': %s" -msgstr "" - -#: ls-refs.c:175 -#, c-format -msgid "unexpected line: '%s'" -msgstr "" - -#: ls-refs.c:179 -msgid "expected flush after ls-refs arguments" -msgstr "" - -#: mailinfo.c:1050 -msgid "quoted CRLF detected" -msgstr "" - -#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46 -#, c-format -msgid "bad action '%s' for '%s'" -msgstr "" - -#: merge-ort.c:1630 merge-recursive.c:1214 -#, c-format -msgid "Failed to merge submodule %s (not checked out)" -msgstr "" - -#: merge-ort.c:1639 merge-recursive.c:1221 -#, c-format -msgid "Failed to merge submodule %s (commits not present)" -msgstr "" - -#: merge-ort.c:1648 merge-recursive.c:1228 -#, c-format -msgid "Failed to merge submodule %s (commits don't follow merge-base)" -msgstr "" - -#: merge-ort.c:1658 merge-ort.c:1666 -#, c-format -msgid "Note: Fast-forwarding submodule %s to %s" -msgstr "" - -#: merge-ort.c:1688 -#, c-format -msgid "Failed to merge submodule %s" -msgstr "" - -#: merge-ort.c:1695 -#, c-format -msgid "" -"Failed to merge submodule %s, but a possible merge resolution exists:\n" -"%s\n" -msgstr "" - -#: merge-ort.c:1699 merge-recursive.c:1284 -#, c-format -msgid "" -"If this is correct simply add it to the index for example\n" -"by using:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"which will accept this suggestion.\n" -msgstr "" - -#: merge-ort.c:1712 -#, c-format -msgid "" -"Failed to merge submodule %s, but multiple possible merges exist:\n" -"%s" -msgstr "" - -#: merge-ort.c:1937 merge-recursive.c:1375 -msgid "Failed to execute internal merge" -msgstr "" - -#: merge-ort.c:1942 merge-recursive.c:1380 -#, c-format -msgid "Unable to add %s to database" -msgstr "" - -#: merge-ort.c:1949 merge-recursive.c:1413 -#, c-format -msgid "Auto-merging %s" -msgstr "" - -#: merge-ort.c:2088 merge-recursive.c:2135 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " -"implicit directory rename(s) putting the following path(s) there: %s." -msgstr "" - -#: merge-ort.c:2098 merge-recursive.c:2145 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " -"implicit directory renames tried to put these paths there: %s" -msgstr "" - -#: merge-ort.c:2156 -#, c-format -msgid "" -"CONFLICT (directory rename split): Unclear where to rename %s to; it was " -"renamed to multiple other directories, with no destination getting a " -"majority of the files." -msgstr "" - -#: merge-ort.c:2310 merge-recursive.c:2481 -#, c-format -msgid "" -"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " -"renamed." -msgstr "" - -#: merge-ort.c:2450 merge-recursive.c:3264 -#, c-format -msgid "" -"Path updated: %s added in %s inside a directory that was renamed in %s; " -"moving it to %s." -msgstr "" - -#: merge-ort.c:2457 merge-recursive.c:3271 -#, c-format -msgid "" -"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " -"%s; moving it to %s." -msgstr "" - -#: merge-ort.c:2470 merge-recursive.c:3267 -#, c-format -msgid "" -"CONFLICT (file location): %s added in %s inside a directory that was renamed " -"in %s, suggesting it should perhaps be moved to %s." -msgstr "" - -#: merge-ort.c:2478 merge-recursive.c:3274 -#, c-format -msgid "" -"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " -"was renamed in %s, suggesting it should perhaps be moved to %s." -msgstr "" - -#: merge-ort.c:2634 -#, c-format -msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." -msgstr "" - -#: merge-ort.c:2729 -#, c-format -msgid "" -"CONFLICT (rename involved in collision): rename of %s -> %s has content " -"conflicts AND collides with another path; this may result in nested conflict " -"markers." -msgstr "" - -#: merge-ort.c:2748 merge-ort.c:2772 -#, c-format -msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." -msgstr "" - -#: merge-ort.c:3261 merge-recursive.c:3025 -#, c-format -msgid "cannot read object %s" -msgstr "" - -#: merge-ort.c:3264 merge-recursive.c:3028 -#, c-format -msgid "object %s is not a blob" -msgstr "" - -#: merge-ort.c:3693 -#, c-format -msgid "" -"CONFLICT (file/directory): directory in the way of %s from %s; moving it to " -"%s instead." -msgstr "" - -#: merge-ort.c:3770 -#, c-format -msgid "" -"CONFLICT (distinct types): %s had different types on each side; renamed both " -"of them so each can be recorded somewhere." -msgstr "" - -#: merge-ort.c:3777 -#, c-format -msgid "" -"CONFLICT (distinct types): %s had different types on each side; renamed one " -"of them so each can be recorded somewhere." -msgstr "" - -#: merge-ort.c:3866 merge-recursive.c:3104 -msgid "content" -msgstr "" - -#: merge-ort.c:3868 merge-recursive.c:3108 -msgid "add/add" -msgstr "" - -#: merge-ort.c:3870 merge-recursive.c:3153 -msgid "submodule" -msgstr "" - -#: merge-ort.c:3872 merge-recursive.c:3154 -#, c-format -msgid "CONFLICT (%s): Merge conflict in %s" -msgstr "" - -#: merge-ort.c:3916 -#, c-format -msgid "" -"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " -"of %s left in tree." -msgstr "" - -#: merge-ort.c:4212 -#, c-format -msgid "" -"Note: %s not up to date and in way of checking out conflicted version; old " -"copy renamed to %s" -msgstr "" - -#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge -#. base, and 2-3) the trees for the two trees we're merging. -#. -#: merge-ort.c:4586 -#, c-format -msgid "collecting merge info failed for trees %s, %s, %s" -msgstr "" - -#: merge-ort-wrappers.c:13 merge-recursive.c:3723 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" - -#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405 -msgid "Already up to date." -msgstr "" - -#: merge-recursive.c:353 -msgid "(bad commit)\n" -msgstr "" - -#: merge-recursive.c:381 -#, c-format -msgid "add_cacheinfo failed for path '%s'; merge aborting." -msgstr "" - -#: merge-recursive.c:390 -#, c-format -msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." -msgstr "" - -#: merge-recursive.c:881 -#, c-format -msgid "failed to create path '%s'%s" -msgstr "" - -#: merge-recursive.c:892 -#, c-format -msgid "Removing %s to make room for subdirectory\n" -msgstr "" - -#: merge-recursive.c:906 merge-recursive.c:925 -msgid ": perhaps a D/F conflict?" -msgstr "" - -#: merge-recursive.c:915 -#, c-format -msgid "refusing to lose untracked file at '%s'" -msgstr "" - -#: merge-recursive.c:956 builtin/cat-file.c:47 -#, c-format -msgid "cannot read object %s '%s'" -msgstr "" - -#: merge-recursive.c:961 -#, c-format -msgid "blob expected for %s '%s'" -msgstr "" - -#: merge-recursive.c:986 -#, c-format -msgid "failed to open '%s': %s" -msgstr "" - -#: merge-recursive.c:997 -#, c-format -msgid "failed to symlink '%s': %s" -msgstr "" - -#: merge-recursive.c:1002 -#, c-format -msgid "do not know what to do with %06o %s '%s'" -msgstr "" - -#: merge-recursive.c:1236 merge-recursive.c:1249 -#, c-format -msgid "Fast-forwarding submodule %s to the following commit:" -msgstr "" - -#: merge-recursive.c:1239 merge-recursive.c:1252 -#, c-format -msgid "Fast-forwarding submodule %s" -msgstr "" - -#: merge-recursive.c:1276 -#, c-format -msgid "Failed to merge submodule %s (merge following commits not found)" -msgstr "" - -#: merge-recursive.c:1280 -#, c-format -msgid "Failed to merge submodule %s (not fast-forward)" -msgstr "" - -#: merge-recursive.c:1281 -msgid "Found a possible merge resolution for the submodule:\n" -msgstr "" - -#: merge-recursive.c:1293 -#, c-format -msgid "Failed to merge submodule %s (multiple merges found)" -msgstr "" - -#: merge-recursive.c:1437 -#, c-format -msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." -msgstr "" - -#: merge-recursive.c:1509 -#, c-format -msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " -"in tree." -msgstr "" - -#: merge-recursive.c:1514 -#, c-format -msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " -"left in tree." -msgstr "" - -#: merge-recursive.c:1521 -#, c-format -msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " -"in tree at %s." -msgstr "" - -#: merge-recursive.c:1526 -#, c-format -msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " -"left in tree at %s." -msgstr "" - -#: merge-recursive.c:1561 -msgid "rename" -msgstr "" - -#: merge-recursive.c:1561 -msgid "renamed" -msgstr "" - -#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181 -#, c-format -msgid "Refusing to lose dirty file at %s" -msgstr "" - -#: merge-recursive.c:1622 -#, c-format -msgid "Refusing to lose untracked file at %s, even though it's in the way." -msgstr "" - -#: merge-recursive.c:1680 -#, c-format -msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" -msgstr "" - -#: merge-recursive.c:1711 -#, c-format -msgid "%s is a directory in %s adding as %s instead" -msgstr "" - -#: merge-recursive.c:1716 -#, c-format -msgid "Refusing to lose untracked file at %s; adding as %s instead" -msgstr "" - -#: merge-recursive.c:1743 -#, c-format -msgid "" -"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" -"\"->\"%s\" in \"%s\"%s" -msgstr "" - -#: merge-recursive.c:1748 -msgid " (left unresolved)" -msgstr "" - -#: merge-recursive.c:1840 -#, c-format -msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" -msgstr "" - -#: merge-recursive.c:2103 -#, c-format -msgid "" -"CONFLICT (directory rename split): Unclear where to place %s because " -"directory %s was renamed to multiple other directories, with no destination " -"getting a majority of the files." -msgstr "" - -#: merge-recursive.c:2237 -#, c-format -msgid "" -"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" -">%s in %s" -msgstr "" - -#: merge-recursive.c:3092 -msgid "modify" -msgstr "" - -#: merge-recursive.c:3092 -msgid "modified" -msgstr "" - -#: merge-recursive.c:3131 -#, c-format -msgid "Skipped %s (merged same as existing)" -msgstr "" - -#: merge-recursive.c:3184 -#, c-format -msgid "Adding as %s instead" -msgstr "" - -#: merge-recursive.c:3388 -#, c-format -msgid "Removing %s" -msgstr "" - -#: merge-recursive.c:3411 -msgid "file/directory" -msgstr "" - -#: merge-recursive.c:3416 -msgid "directory/file" -msgstr "" - -#: merge-recursive.c:3423 -#, c-format -msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" -msgstr "" - -#: merge-recursive.c:3432 -#, c-format -msgid "Adding %s" -msgstr "" - -#: merge-recursive.c:3441 -#, c-format -msgid "CONFLICT (add/add): Merge conflict in %s" -msgstr "" - -#: merge-recursive.c:3494 -#, c-format -msgid "merging of trees %s and %s failed" -msgstr "" - -#: merge-recursive.c:3588 -msgid "Merging:" -msgstr "" - -#: merge-recursive.c:3601 -#, c-format -msgid "found %u common ancestor:" -msgid_plural "found %u common ancestors:" -msgstr[0] "" -msgstr[1] "" - -#: merge-recursive.c:3651 -msgid "merge returned no commit" -msgstr "" - -#: merge-recursive.c:3823 -#, c-format -msgid "Could not parse object '%s'" -msgstr "" - -#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912 -#: builtin/stash.c:489 -msgid "Unable to write index." -msgstr "" - -#: merge.c:41 -msgid "failed to read the cache" -msgstr "" - -#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023 -#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714 -#: builtin/stash.c:269 -msgid "unable to write new index file" -msgstr "" - -#: midx.c:79 -msgid "multi-pack-index OID fanout is of the wrong size" -msgstr "" - -#: midx.c:112 -#, c-format -msgid "multi-pack-index file %s is too small" -msgstr "" - -#: midx.c:128 -#, c-format -msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" -msgstr "" - -#: midx.c:133 -#, c-format -msgid "multi-pack-index version %d not recognized" -msgstr "" - -#: midx.c:138 -#, c-format -msgid "multi-pack-index hash version %u does not match version %u" -msgstr "" - -#: midx.c:155 -msgid "multi-pack-index missing required pack-name chunk" -msgstr "" - -#: midx.c:157 -msgid "multi-pack-index missing required OID fanout chunk" -msgstr "" - -#: midx.c:159 -msgid "multi-pack-index missing required OID lookup chunk" -msgstr "" - -#: midx.c:161 -msgid "multi-pack-index missing required object offsets chunk" -msgstr "" - -#: midx.c:180 -#, c-format -msgid "multi-pack-index pack names out of order: '%s' before '%s'" -msgstr "" - -#: midx.c:228 -#, c-format -msgid "bad pack-int-id: %u (%u total packs)" -msgstr "" - -#: midx.c:278 -msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" -msgstr "" - -#: midx.c:509 -#, c-format -msgid "failed to add packfile '%s'" -msgstr "" - -#: midx.c:515 -#, c-format -msgid "failed to open pack-index '%s'" -msgstr "" - -#: midx.c:583 -#, c-format -msgid "failed to locate object %d in packfile" -msgstr "" - -#: midx.c:911 -msgid "cannot store reverse index file" -msgstr "" - -#: midx.c:1009 -#, c-format -msgid "could not parse line: %s" -msgstr "" - -#: midx.c:1011 -#, c-format -msgid "malformed line: %s" -msgstr "" - -#: midx.c:1181 -msgid "ignoring existing multi-pack-index; checksum mismatch" -msgstr "" - -#: midx.c:1206 -msgid "could not load pack" -msgstr "" - -#: midx.c:1212 -#, c-format -msgid "could not open index for %s" -msgstr "" - -#: midx.c:1223 -msgid "Adding packfiles to multi-pack-index" -msgstr "" - -#: midx.c:1266 -#, c-format -msgid "unknown preferred pack: '%s'" -msgstr "" - -#: midx.c:1311 -#, c-format -msgid "cannot select preferred pack %s with no objects" -msgstr "" - -#: midx.c:1343 -#, c-format -msgid "did not see pack-file %s to drop" -msgstr "" - -#: midx.c:1389 -#, c-format -msgid "preferred pack '%s' is expired" -msgstr "" - -#: midx.c:1402 -msgid "no pack files to index." -msgstr "" - -#: midx.c:1409 -msgid "refusing to write multi-pack .bitmap without any objects" -msgstr "" - -#: midx.c:1451 -msgid "could not write multi-pack bitmap" -msgstr "" - -#: midx.c:1461 -msgid "could not write multi-pack-index" -msgstr "" - -#: midx.c:1520 builtin/clean.c:37 -#, c-format -msgid "failed to remove %s" -msgstr "" - -#: midx.c:1553 -#, c-format -msgid "failed to clear multi-pack-index at %s" -msgstr "" - -#: midx.c:1616 -msgid "multi-pack-index file exists, but failed to parse" -msgstr "" - -#: midx.c:1624 -msgid "incorrect checksum" -msgstr "" - -#: midx.c:1627 -msgid "Looking for referenced packfiles" -msgstr "" - -#: midx.c:1642 -#, c-format -msgid "" -"oid fanout out of order: fanout[%d] = % > % = fanout[%d]" -msgstr "" - -#: midx.c:1647 -msgid "the midx contains no oid" -msgstr "" - -#: midx.c:1656 -msgid "Verifying OID order in multi-pack-index" -msgstr "" - -#: midx.c:1665 -#, c-format -msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" -msgstr "" - -#: midx.c:1685 -msgid "Sorting objects by packfile" -msgstr "" - -#: midx.c:1692 -msgid "Verifying object offsets" -msgstr "" - -#: midx.c:1708 -#, c-format -msgid "failed to load pack entry for oid[%d] = %s" -msgstr "" - -#: midx.c:1714 -#, c-format -msgid "failed to load pack-index for packfile %s" -msgstr "" - -#: midx.c:1723 -#, c-format -msgid "incorrect object offset for oid[%d] = %s: % != %" -msgstr "" - -#: midx.c:1750 -msgid "Counting referenced objects" -msgstr "" - -#: midx.c:1760 -msgid "Finding and deleting unreferenced packfiles" -msgstr "" - -#: midx.c:1952 -msgid "could not start pack-objects" -msgstr "" - -#: midx.c:1972 -msgid "could not finish pack-objects" -msgstr "" - -#: name-hash.c:542 -#, c-format -msgid "unable to create lazy_dir thread: %s" -msgstr "" - -#: name-hash.c:564 -#, c-format -msgid "unable to create lazy_name thread: %s" -msgstr "" - -#: name-hash.c:570 -#, c-format -msgid "unable to join lazy_name thread: %s" -msgstr "" - -#: notes-merge.c:276 -#, c-format -msgid "" -"You have not concluded your previous notes merge (%s exists).\n" -"Please, use 'git notes merge --commit' or 'git notes merge --abort' to " -"commit/abort the previous merge before you start a new notes merge." -msgstr "" - -#: notes-merge.c:283 -#, c-format -msgid "You have not concluded your notes merge (%s exists)." -msgstr "" - -#: notes-utils.c:46 -msgid "Cannot commit uninitialized/unreferenced notes tree" -msgstr "" - -#: notes-utils.c:105 -#, c-format -msgid "Bad notes.rewriteMode value: '%s'" -msgstr "" - -#: notes-utils.c:115 -#, c-format -msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" -msgstr "" - -#. TRANSLATORS: The first %s is the name of -#. the environment variable, the second %s is -#. its value. -#. -#: notes-utils.c:145 -#, c-format -msgid "Bad %s value: '%s'" -msgstr "" - -#: object-file.c:457 -#, c-format -msgid "object directory %s does not exist; check .git/objects/info/alternates" -msgstr "" - -#: object-file.c:515 -#, c-format -msgid "unable to normalize alternate object path: %s" -msgstr "" - -#: object-file.c:589 -#, c-format -msgid "%s: ignoring alternate object stores, nesting too deep" -msgstr "" - -#: object-file.c:596 -#, c-format -msgid "unable to normalize object directory: %s" -msgstr "" - -#: object-file.c:639 -msgid "unable to fdopen alternates lockfile" -msgstr "" - -#: object-file.c:657 -msgid "unable to read alternates file" -msgstr "" - -#: object-file.c:664 -msgid "unable to move new alternates file into place" -msgstr "" - -#: object-file.c:742 -#, c-format -msgid "path '%s' does not exist" -msgstr "" - -#: object-file.c:763 -#, c-format -msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "" - -#: object-file.c:769 -#, c-format -msgid "reference repository '%s' is not a local repository." -msgstr "" - -#: object-file.c:775 -#, c-format -msgid "reference repository '%s' is shallow" -msgstr "" - -#: object-file.c:783 -#, c-format -msgid "reference repository '%s' is grafted" -msgstr "" - -#: object-file.c:814 -#, c-format -msgid "could not find object directory matching %s" -msgstr "" - -#: object-file.c:864 -#, c-format -msgid "invalid line while parsing alternate refs: %s" -msgstr "" - -#: object-file.c:1014 -#, c-format -msgid "attempting to mmap % over limit %" -msgstr "" - -#: object-file.c:1049 -#, c-format -msgid "mmap failed%s" -msgstr "" - -#: object-file.c:1230 -#, c-format -msgid "object file %s is empty" -msgstr "" - -#: object-file.c:1349 object-file.c:2588 -#, c-format -msgid "corrupt loose object '%s'" -msgstr "" - -#: object-file.c:1351 object-file.c:2592 -#, c-format -msgid "garbage at end of loose object '%s'" -msgstr "" - -#: object-file.c:1473 -#, c-format -msgid "unable to parse %s header" -msgstr "" - -#: object-file.c:1475 -msgid "invalid object type" -msgstr "" - -#: object-file.c:1486 -#, c-format -msgid "unable to unpack %s header" -msgstr "" - -#: object-file.c:1490 -#, c-format -msgid "header for %s too long, exceeds %d bytes" -msgstr "" - -#: object-file.c:1720 -#, c-format -msgid "failed to read object %s" -msgstr "" - -#: object-file.c:1724 -#, c-format -msgid "replacement %s not found for %s" -msgstr "" - -#: object-file.c:1728 -#, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "" - -#: object-file.c:1732 -#, c-format -msgid "packed object %s (stored in %s) is corrupt" -msgstr "" - -#: object-file.c:1855 -#, c-format -msgid "unable to write file %s" -msgstr "" - -#: object-file.c:1862 -#, c-format -msgid "unable to set permission to '%s'" -msgstr "" - -#: object-file.c:1869 -msgid "file write error" -msgstr "" - -#: object-file.c:1904 -msgid "error when closing loose object file" -msgstr "" - -#: object-file.c:1971 -#, c-format -msgid "insufficient permission for adding an object to repository database %s" -msgstr "" - -#: object-file.c:1973 -msgid "unable to create temporary file" -msgstr "" - -#: object-file.c:1997 -msgid "unable to write loose object file" -msgstr "" - -#: object-file.c:2003 -#, c-format -msgid "unable to deflate new object %s (%d)" -msgstr "" - -#: object-file.c:2007 -#, c-format -msgid "deflateEnd on object %s failed (%d)" -msgstr "" - -#: object-file.c:2011 -#, c-format -msgid "confused by unstable object source data for %s" -msgstr "" - -#: object-file.c:2022 builtin/pack-objects.c:1251 -#, c-format -msgid "failed utime() on %s" -msgstr "" - -#: object-file.c:2100 -#, c-format -msgid "cannot read object for %s" -msgstr "" - -#: object-file.c:2151 -msgid "corrupt commit" -msgstr "" - -#: object-file.c:2159 -msgid "corrupt tag" -msgstr "" - -#: object-file.c:2259 -#, c-format -msgid "read error while indexing %s" -msgstr "" - -#: object-file.c:2262 -#, c-format -msgid "short read while indexing %s" -msgstr "" - -#: object-file.c:2335 object-file.c:2345 -#, c-format -msgid "%s: failed to insert into database" -msgstr "" - -#: object-file.c:2351 -#, c-format -msgid "%s: unsupported file type" -msgstr "" - -#: object-file.c:2375 builtin/fetch.c:1494 -#, c-format -msgid "%s is not a valid object" -msgstr "" - -#: object-file.c:2377 -#, c-format -msgid "%s is not a valid '%s' object" -msgstr "" - -#: object-file.c:2404 -#, c-format -msgid "unable to open %s" -msgstr "" - -#: object-file.c:2599 -#, c-format -msgid "hash mismatch for %s (expected %s)" -msgstr "" - -#: object-file.c:2622 -#, c-format -msgid "unable to mmap %s" -msgstr "" - -#: object-file.c:2628 -#, c-format -msgid "unable to unpack header of %s" -msgstr "" - -#: object-file.c:2633 -#, c-format -msgid "unable to parse header of %s" -msgstr "" - -#: object-file.c:2644 -#, c-format -msgid "unable to unpack contents of %s" -msgstr "" - -#. TRANSLATORS: This is a line of ambiguous object -#. output shown when we cannot look up or parse the -#. object in question. E.g. "deadbeef [bad object]". -#. -#: object-name.c:382 -#, c-format -msgid "%s [bad object]" -msgstr "" - -#. TRANSLATORS: This is a line of ambiguous commit -#. object output. E.g.: -#. * -#. "deadbeef commit 2021-01-01 - Some Commit Message" -#. -#: object-name.c:407 -#, c-format -msgid "%s commit %s - %s" -msgstr "" - -#. TRANSLATORS: This is a line of ambiguous -#. tag object output. E.g.: -#. * -#. "deadbeef tag 2022-01-01 - Some Tag Message" -#. * -#. The second argument is the YYYY-MM-DD found -#. in the tag. -#. * -#. The third argument is the "tag" string -#. from object.c. -#. -#: object-name.c:428 -#, c-format -msgid "%s tag %s - %s" -msgstr "" - -#. TRANSLATORS: This is a line of ambiguous -#. tag object output where we couldn't parse -#. the tag itself. E.g.: -#. * -#. "deadbeef [bad tag, could not parse it]" -#. -#: object-name.c:439 -#, c-format -msgid "%s [bad tag, could not parse it]" -msgstr "" - -#. TRANSLATORS: This is a line of ambiguous -#. object output. E.g. "deadbeef tree". -#. -#: object-name.c:447 -#, c-format -msgid "%s tree" -msgstr "" - -#. TRANSLATORS: This is a line of ambiguous -#. object output. E.g. "deadbeef blob". -#. -#: object-name.c:453 -#, c-format -msgid "%s blob" -msgstr "" - -#: object-name.c:569 -#, c-format -msgid "short object ID %s is ambiguous" -msgstr "" - -#. TRANSLATORS: The argument is the list of ambiguous -#. objects composed in show_ambiguous_object(). See -#. its "TRANSLATORS" comments for details. -#. -#: object-name.c:591 -#, c-format -msgid "" -"The candidates are:\n" -"%s" -msgstr "" - -#: object-name.c:888 -msgid "" -"Git normally never creates a ref that ends with 40 hex characters\n" -"because it will be ignored when you just specify 40-hex. These refs\n" -"may be created by mistake. For example,\n" -"\n" -" git switch -c $br $(git rev-parse ...)\n" -"\n" -"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" -"examine these refs and maybe delete them. Turn this message off by\n" -"running \"git config advice.objectNameWarning false\"" -msgstr "" - -#: object-name.c:1008 -#, c-format -msgid "log for '%.*s' only goes back to %s" -msgstr "" - -#: object-name.c:1016 -#, c-format -msgid "log for '%.*s' only has %d entries" -msgstr "" - -#: object-name.c:1794 -#, c-format -msgid "path '%s' exists on disk, but not in '%.*s'" -msgstr "" - -#: object-name.c:1800 -#, c-format -msgid "" -"path '%s' exists, but not '%s'\n" -"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" -msgstr "" - -#: object-name.c:1809 -#, c-format -msgid "path '%s' does not exist in '%.*s'" -msgstr "" - -#: object-name.c:1837 -#, c-format -msgid "" -"path '%s' is in the index, but not at stage %d\n" -"hint: Did you mean ':%d:%s'?" -msgstr "" - -#: object-name.c:1853 -#, c-format -msgid "" -"path '%s' is in the index, but not '%s'\n" -"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" -msgstr "" - -#: object-name.c:1861 -#, c-format -msgid "path '%s' exists on disk, but not in the index" -msgstr "" - -#: object-name.c:1863 -#, c-format -msgid "path '%s' does not exist (neither on disk nor in the index)" -msgstr "" - -#: object-name.c:1876 -msgid "relative path syntax can't be used outside working tree" -msgstr "" - -#: object-name.c:1901 -#, c-format -msgid ": required, only '%s' given" -msgstr "" - -#: object-name.c:2014 -#, c-format -msgid "invalid object name '%.*s'." -msgstr "" - -#: object.c:53 -#, c-format -msgid "invalid object type \"%s\"" -msgstr "" - -#: object.c:173 -#, c-format -msgid "object %s is a %s, not a %s" -msgstr "" - -#: object.c:250 -#, c-format -msgid "object %s has unknown type id %d" -msgstr "" - -#: object.c:263 -#, c-format -msgid "unable to parse object: %s" -msgstr "" - -#: object.c:283 object.c:294 -#, c-format -msgid "hash mismatch %s" -msgstr "" - -#: pack-bitmap.c:353 -msgid "multi-pack bitmap is missing required reverse index" -msgstr "" - -#: pack-bitmap.c:433 -msgid "load_reverse_index: could not open pack" -msgstr "" - -#: pack-bitmap.c:1072 pack-bitmap.c:1078 builtin/pack-objects.c:2432 -#, c-format -msgid "unable to get size of %s" -msgstr "" - -#: pack-bitmap.c:1937 -#, c-format -msgid "could not find %s in pack %s at offset %" -msgstr "" - -#: pack-bitmap.c:1973 builtin/rev-list.c:91 -#, c-format -msgid "unable to get disk usage of %s" -msgstr "" - -#: pack-revindex.c:221 -#, c-format -msgid "reverse-index file %s is too small" -msgstr "" - -#: pack-revindex.c:226 -#, c-format -msgid "reverse-index file %s is corrupt" -msgstr "" - -#: pack-revindex.c:234 -#, c-format -msgid "reverse-index file %s has unknown signature" -msgstr "" - -#: pack-revindex.c:238 -#, c-format -msgid "reverse-index file %s has unsupported version %" -msgstr "" - -#: pack-revindex.c:243 -#, c-format -msgid "reverse-index file %s has unsupported hash id %" -msgstr "" - -#: pack-write.c:251 -msgid "cannot both write and verify reverse index" -msgstr "" - -#: pack-write.c:270 -#, c-format -msgid "could not stat: %s" -msgstr "" - -#: pack-write.c:282 -#, c-format -msgid "failed to make %s readable" -msgstr "" - -#: pack-write.c:521 -#, c-format -msgid "could not write '%s' promisor file" -msgstr "" - -#: packfile.c:627 -msgid "offset before end of packfile (broken .idx?)" -msgstr "" - -#: packfile.c:657 -#, c-format -msgid "packfile %s cannot be mapped%s" -msgstr "" - -#: packfile.c:1924 -#, c-format -msgid "offset before start of pack index for %s (corrupt index?)" -msgstr "" - -#: packfile.c:1928 -#, c-format -msgid "offset beyond end of pack index for %s (truncated index?)" -msgstr "" - -#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175 -#, c-format -msgid "option `%s' expects a numerical value" -msgstr "" - -#: parse-options-cb.c:42 -#, c-format -msgid "malformed expiration date '%s'" -msgstr "" - -#: parse-options-cb.c:55 -#, c-format -msgid "option `%s' expects \"always\", \"auto\", or \"never\"" -msgstr "" - -#: parse-options-cb.c:133 parse-options-cb.c:150 -#, c-format -msgid "malformed object name '%s'" -msgstr "" - -#: parse-options-cb.c:307 -#, c-format -msgid "option `%s' expects \"%s\" or \"%s\"" -msgstr "" - -#: parse-options.c:58 -#, c-format -msgid "%s requires a value" -msgstr "" - -#: parse-options.c:93 -#, c-format -msgid "%s is incompatible with %s" -msgstr "" - -#: parse-options.c:98 -#, c-format -msgid "%s : incompatible with something else" -msgstr "" - -#: parse-options.c:112 parse-options.c:116 -#, c-format -msgid "%s takes no value" -msgstr "" - -#: parse-options.c:114 -#, c-format -msgid "%s isn't available" -msgstr "" - -#: parse-options.c:237 -#, c-format -msgid "%s expects a non-negative integer value with an optional k/m/g suffix" -msgstr "" - -#: parse-options.c:393 -#, c-format -msgid "ambiguous option: %s (could be --%s%s or --%s%s)" -msgstr "" - -#: parse-options.c:428 parse-options.c:436 -#, c-format -msgid "did you mean `--%s` (with two dashes)?" -msgstr "" - -#: parse-options.c:678 parse-options.c:1054 -#, c-format -msgid "alias of --%s" -msgstr "" - -#: parse-options.c:892 -#, c-format -msgid "unknown option `%s'" -msgstr "" - -#: parse-options.c:894 -#, c-format -msgid "unknown switch `%c'" -msgstr "" - -#: parse-options.c:896 -#, c-format -msgid "unknown non-ascii option in string: `%s'" -msgstr "" - -#: parse-options.c:920 -msgid "..." -msgstr "" - -#: parse-options.c:934 -#, c-format -msgid "usage: %s" -msgstr "" - -#. TRANSLATORS: the colon here should align with the -#. one in "usage: %s" translation. -#. -#: parse-options.c:949 -#, c-format -msgid " or: %s" -msgstr "" - -#. TRANSLATORS: You should only need to translate this format -#. string if your language is a RTL language (e.g. Arabic, -#. Hebrew etc.), not if it's a LTR language (e.g. German, -#. Russian, Chinese etc.). -#. * -#. When a translated usage string has an embedded "\n" it's -#. because options have wrapped to the next line. The line -#. after the "\n" will then be padded to align with the -#. command name, such as N_("git cmd [opt]\n<8 -#. spaces>[opt2]"), where the 8 spaces are the same length as -#. "git cmd ". -#. * -#. This format string prints out that already-translated -#. line. The "%*s" is whitespace padding to account for the -#. padding at the start of the line that we add in this -#. function. The "%s" is a line in the (hopefully already -#. translated) N_() usage string, which contained embedded -#. newlines before we split it up. -#. -#: parse-options.c:970 -#, c-format -msgid "%*s%s" -msgstr "" - -#: parse-options.c:993 -#, c-format -msgid " %s" -msgstr "" - -#: parse-options.c:1040 -msgid "-NUM" -msgstr "" - -#: path.c:922 -#, c-format -msgid "Could not make %s writable by group" -msgstr "" - -#: pathspec.c:150 -msgid "Escape character '\\' not allowed as last character in attr value" -msgstr "" - -#: pathspec.c:168 -msgid "Only one 'attr:' specification is allowed." -msgstr "" - -#: pathspec.c:171 -msgid "attr spec must not be empty" -msgstr "" - -#: pathspec.c:214 -#, c-format -msgid "invalid attribute name %s" -msgstr "" - -#: pathspec.c:279 -msgid "global 'glob' and 'noglob' pathspec settings are incompatible" -msgstr "" - -#: pathspec.c:286 -msgid "" -"global 'literal' pathspec setting is incompatible with all other global " -"pathspec settings" -msgstr "" - -#: pathspec.c:326 -msgid "invalid parameter for pathspec magic 'prefix'" -msgstr "" - -#: pathspec.c:347 -#, c-format -msgid "Invalid pathspec magic '%.*s' in '%s'" -msgstr "" - -#: pathspec.c:352 -#, c-format -msgid "Missing ')' at the end of pathspec magic in '%s'" -msgstr "" - -#: pathspec.c:390 -#, c-format -msgid "Unimplemented pathspec magic '%c' in '%s'" -msgstr "" - -#: pathspec.c:449 -#, c-format -msgid "%s: 'literal' and 'glob' are incompatible" -msgstr "" - -#: pathspec.c:465 -#, c-format -msgid "%s: '%s' is outside repository at '%s'" -msgstr "" - -#: pathspec.c:541 -#, c-format -msgid "'%s' (mnemonic: '%c')" -msgstr "" - -#: pathspec.c:551 -#, c-format -msgid "%s: pathspec magic not supported by this command: %s" -msgstr "" - -#: pathspec.c:618 -#, c-format -msgid "pathspec '%s' is beyond a symbolic link" -msgstr "" - -#: pathspec.c:663 -#, c-format -msgid "line is badly quoted: %s" -msgstr "" - -#: pkt-line.c:92 -msgid "unable to write flush packet" -msgstr "" - -#: pkt-line.c:99 -msgid "unable to write delim packet" -msgstr "" - -#: pkt-line.c:106 -msgid "unable to write response end packet" -msgstr "" - -#: pkt-line.c:113 -msgid "flush packet write failed" -msgstr "" - -#: pkt-line.c:153 -msgid "protocol error: impossibly long line" -msgstr "" - -#: pkt-line.c:169 pkt-line.c:171 -msgid "packet write with format failed" -msgstr "" - -#: pkt-line.c:204 pkt-line.c:252 -msgid "packet write failed - data exceeds max packet size" -msgstr "" - -#: pkt-line.c:222 -#, c-format -msgid "packet write failed: %s" -msgstr "" - -#: pkt-line.c:349 pkt-line.c:350 -msgid "read error" -msgstr "" - -#: pkt-line.c:360 pkt-line.c:361 -msgid "the remote end hung up unexpectedly" -msgstr "" - -#: pkt-line.c:417 pkt-line.c:419 -#, c-format -msgid "protocol error: bad line length character: %.4s" -msgstr "" - -#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444 -#, c-format -msgid "protocol error: bad line length %d" -msgstr "" - -#: pkt-line.c:472 sideband.c:165 -#, c-format -msgid "remote error: %s" -msgstr "" - -#: preload-index.c:125 -msgid "Refreshing index" -msgstr "" - -#: preload-index.c:144 -#, c-format -msgid "unable to create threaded lstat: %s" -msgstr "" - -#: pretty.c:1051 -msgid "unable to parse --pretty format" -msgstr "" - -#: promisor-remote.c:31 -msgid "promisor-remote: unable to fork off fetch subprocess" -msgstr "" - -#: promisor-remote.c:38 promisor-remote.c:40 -msgid "promisor-remote: could not write to fetch subprocess" -msgstr "" - -#: promisor-remote.c:44 -msgid "promisor-remote: could not close stdin to fetch subprocess" -msgstr "" - -#: promisor-remote.c:54 -#, c-format -msgid "promisor remote name cannot begin with '/': %s" -msgstr "" - -#: protocol-caps.c:103 -msgid "object-info: expected flush after arguments" -msgstr "" - -#: prune-packed.c:35 -msgid "Removing duplicate objects" -msgstr "" - -#: range-diff.c:68 -msgid "could not start `log`" -msgstr "" - -#: range-diff.c:70 -msgid "could not read `log` output" -msgstr "" - -#: range-diff.c:98 sequencer.c:5575 -#, c-format -msgid "could not parse commit '%s'" -msgstr "" - -#: range-diff.c:109 -#, c-format -msgid "" -"could not parse first line of `log` output: did not start with 'commit ': " -"'%s'" -msgstr "" - -#: range-diff.c:132 -#, c-format -msgid "could not parse git header '%.*s'" -msgstr "" - -#: range-diff.c:300 -msgid "failed to generate diff" -msgstr "" - -#: range-diff.c:558 range-diff.c:560 -#, c-format -msgid "could not parse log for '%s'" -msgstr "" - -#: read-cache.c:737 -#, c-format -msgid "will not add file alias '%s' ('%s' already exists in index)" -msgstr "" - -#: read-cache.c:753 -msgid "cannot create an empty blob in the object database" -msgstr "" - -#: read-cache.c:775 -#, c-format -msgid "%s: can only add regular files, symbolic links or git-directories" -msgstr "" - -#: read-cache.c:780 builtin/submodule--helper.c:3359 -#, c-format -msgid "'%s' does not have a commit checked out" -msgstr "" - -#: read-cache.c:832 -#, c-format -msgid "unable to index file '%s'" -msgstr "" - -#: read-cache.c:851 -#, c-format -msgid "unable to add '%s' to index" -msgstr "" - -#: read-cache.c:862 -#, c-format -msgid "unable to stat '%s'" -msgstr "" - -#: read-cache.c:1404 -#, c-format -msgid "'%s' appears as both a file and as a directory" -msgstr "" - -#: read-cache.c:1619 -msgid "Refresh index" -msgstr "" - -#: read-cache.c:1751 -#, c-format -msgid "" -"index.version set, but the value is invalid.\n" -"Using version %i" -msgstr "" - -#: read-cache.c:1761 -#, c-format -msgid "" -"GIT_INDEX_VERSION set, but the value is invalid.\n" -"Using version %i" -msgstr "" - -#: read-cache.c:1817 -#, c-format -msgid "bad signature 0x%08x" -msgstr "" - -#: read-cache.c:1820 -#, c-format -msgid "bad index version %d" -msgstr "" - -#: read-cache.c:1829 -msgid "bad index file sha1 signature" -msgstr "" - -#: read-cache.c:1863 -#, c-format -msgid "index uses %.4s extension, which we do not understand" -msgstr "" - -#: read-cache.c:1865 -#, c-format -msgid "ignoring %.4s extension" -msgstr "" - -#: read-cache.c:1902 -#, c-format -msgid "unknown index entry format 0x%08x" -msgstr "" - -#: read-cache.c:1918 -#, c-format -msgid "malformed name field in the index, near path '%s'" -msgstr "" - -#: read-cache.c:1975 -msgid "unordered stage entries in index" -msgstr "" - -#: read-cache.c:1978 -#, c-format -msgid "multiple stage entries for merged file '%s'" -msgstr "" - -#: read-cache.c:1981 -#, c-format -msgid "unordered stage entries for '%s'" -msgstr "" - -#: read-cache.c:2096 read-cache.c:2402 rerere.c:549 rerere.c:583 rerere.c:1096 -#: submodule.c:1831 builtin/add.c:586 builtin/check-ignore.c:183 -#: builtin/checkout.c:532 builtin/checkout.c:724 builtin/clean.c:1016 -#: builtin/commit.c:379 builtin/diff-tree.c:122 builtin/grep.c:521 -#: builtin/mv.c:148 builtin/reset.c:506 builtin/rm.c:293 -#: builtin/submodule--helper.c:335 builtin/submodule--helper.c:3319 -msgid "index file corrupt" -msgstr "" - -#: read-cache.c:2240 -#, c-format -msgid "unable to create load_cache_entries thread: %s" -msgstr "" - -#: read-cache.c:2253 -#, c-format -msgid "unable to join load_cache_entries thread: %s" -msgstr "" - -#: read-cache.c:2286 -#, c-format -msgid "%s: index file open failed" -msgstr "" - -#: read-cache.c:2290 -#, c-format -msgid "%s: cannot stat the open index" -msgstr "" - -#: read-cache.c:2294 -#, c-format -msgid "%s: index file smaller than expected" -msgstr "" - -#: read-cache.c:2298 -#, c-format -msgid "%s: unable to map index file%s" -msgstr "" - -#: read-cache.c:2341 -#, c-format -msgid "unable to create load_index_extensions thread: %s" -msgstr "" - -#: read-cache.c:2368 -#, c-format -msgid "unable to join load_index_extensions thread: %s" -msgstr "" - -#: read-cache.c:2414 -#, c-format -msgid "could not freshen shared index '%s'" -msgstr "" - -#: read-cache.c:2473 -#, c-format -msgid "broken index, expect %s in %s, got %s" -msgstr "" - -#: read-cache.c:3032 -msgid "cannot write split index for a sparse index" -msgstr "" - -#: read-cache.c:3114 strbuf.c:1192 wrapper.c:717 builtin/merge.c:1156 -#, c-format -msgid "could not close '%s'" -msgstr "" - -#: read-cache.c:3157 -msgid "failed to convert to a sparse-index" -msgstr "" - -#: read-cache.c:3228 -#, c-format -msgid "could not stat '%s'" -msgstr "" - -#: read-cache.c:3241 -#, c-format -msgid "unable to open git dir: %s" -msgstr "" - -#: read-cache.c:3253 -#, c-format -msgid "unable to unlink: %s" -msgstr "" - -#: read-cache.c:3282 -#, c-format -msgid "cannot fix permission bits on '%s'" -msgstr "" - -#: read-cache.c:3439 -#, c-format -msgid "%s: cannot drop to stage #0" -msgstr "" - -#: rebase-interactive.c:11 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'.\n" -"Or you can abort the rebase with 'git rebase --abort'.\n" -msgstr "" - -#: rebase-interactive.c:33 -#, c-format -msgid "" -"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." -msgstr "" - -#: rebase-interactive.c:42 -msgid "" -"\n" -"Commands:\n" -"p, pick = use commit\n" -"r, reword = use commit, but edit the commit message\n" -"e, edit = use commit, but stop for amending\n" -"s, squash = use commit, but meld into previous commit\n" -"f, fixup [-C | -c] = like \"squash\" but keep only the previous\n" -" commit's log message, unless -C is used, in which case\n" -" keep only this commit's message; -c is same as -C but\n" -" opens the editor\n" -"x, exec = run command (the rest of the line) using shell\n" -"b, break = stop here (continue rebase later with 'git rebase --continue')\n" -"d, drop = remove commit\n" -"l, label