Incremental po/git.pot update and new l10n workflow
PATCH v3 5/9 po/git.pot: this is now a generated file
In reply to Jiang XinWe no longer keep track of the contents of this file.
--- po/git.pot | 25151 --------------------------------------------------- 1 file changed, 25151 deletions(-) delete mode 100644 po/git.pot
po/git.pot deleted +0 -25151
@@ -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 <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\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 <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <[email protected]>\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 (<ret> 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 <file>'\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 <new-branch-name>\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 <num> 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 <n> 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 <root> 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: %<PRIuMAX>" -msgstr "" - -#: archive.c:14 -msgid "git archive [<options>] <tree-ish> [<path>...]" -msgstr "" - -#: archive.c:16 -msgid "" -"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" -msgstr "" - -#: archive.c:17 -msgid "git archive --remote <repo> [--exec <cmd>] --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 <repo>" -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 %<PRIuMAX> 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 %<PRIuMAX> 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) %<PRIx64> and %<PRIx64>" -msgstr "" - -#: chunk-format.c:133 -#, c-format -msgid "duplicate chunk ID %<PRIx32> found" -msgstr "" - -#: chunk-format.c:147 -#, c-format -msgid "final chunk has non-zero id %<PRIx32>" -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 %<PRIuMAX> pack" -msgid_plural "Finding commits for commit graph in %<PRIuMAX> 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 %<PRIuMAX> < %<PRIuMAX>" -msgstr "" - -#: commit-graph.c:2626 -#, c-format -msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" -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 <GIT_DIR>/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"
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.36.0.1.g15c4090757
Part of the diff is not shown here. View the raw message.
PATCH v3 6/9 po/git.pot: don't check in result of "make pot"
In reply to Jiang XinFrom: Ævar Arnfjörð Bjarmason <[email protected]>
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
553743We 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 was in preceding commit to make this change easier to review, and to preempt the mailing list from blocking it due to it being too large.
--- Makefile | 5 +++-- po/.gitignore | 1 + 2 files changed, 4 insertions(+), 2 deletions(-)
Makefile +3 -2
@@ -2788,8 +2788,8 @@ endef $(call mkdir_p_parent_template) $(QUIET_GEN)$(gen_pot_header) -po/git.pot: .build/pot/git.header $(LOCALIZED_ALL_GEN_PO) FORCE - $(QUIET_GEN)$(MSGCAT) $(MSGCAT_FLAGS) $(filter-out FORCE,$^) >$@ +po/git.pot: .build/pot/git.header $(LOCALIZED_ALL_GEN_PO) + $(QUIET_GEN)$(MSGCAT) $(MSGCAT_FLAGS) $^ >$@ .PHONY: pot pot: po/git.pot
@@ -3319,6 +3319,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
po/.gitignore +1 -0
@@ -1 +1,2 @@ /build +/git.pot
Signature · 1 line
2.36.0.1.g15c4090757
Re: [PATCH v3 6/9] po/git.pot: don't check in result of "make pot"
Makefile dist-doc: git$X · line 3322
Quoted 7 lines · Jiang Xin
.PHONY: pot
pot: po/git.potMakefile +1
-0@@ -3319,6 +3319,7 @@ dist-doc: git$X distclean: clean $(RM) configure + $(RM) po/git.pot
I think I noted "why not add this to clean?" in an earlier round, but didn't think it through.
On second thought we should do that, but the reason is that "distclean" should only clean things that you get if you do "make dist".
I.e. we add "configure" to a generated tarball, but not po/git.pot, so this should just be under regular "clean", not "distclean".
Re: [PATCH v3 6/9] po/git.pot: don't check in result of "make pot"
Quoted 15 lines · Ævar Arnfjörð Bjarmason
Makefile dist-doc: git$X · line 3322
Quoted 7 lines · Jiang Xin
.PHONY: pot
pot: po/git.potMakefile +1
-0@@ -3319,6 +3319,7 @@ dist-doc: git$X distclean: clean $(RM) configure + $(RM) po/git.potI think I noted "why not add this to clean?" in an earlier round, but didn't think it through.
Quoted 5 lines
On second thought we should do that, but the reason is that "distclean" should only clean things that you get if you do "make dist".
I.e. we add "configure" to a generated tarball, but not po/git.pot, so this should just be under regular "clean", not "distclean".
Will remove "po/git.pot" under regular "clean" rule in next reroll. I copied it from your original patch without thinking carefully.
Re: [PATCH v3 6/9] po/git.pot: don't check in result of "make pot"
Quoted 18 lines · Jiang Xin
Quoted 15 lines · Ævar Arnfjörð Bjarmason
Review dist-doc: git$X · line 3322
Quoted 7 lines · Jiang Xin
.PHONY: pot
pot: po/git.pot(quoted diff) +1
-0@@ -3319,6 +3319,7 @@ dist-doc: git$X distclean: clean $(RM) configure + $(RM) po/git.potI think I noted "why not add this to clean?" in an earlier round, but didn't think it through.
Quoted 8 lines
Quoted 5 lines
On second thought we should do that, but the reason is that "distclean" should only clean things that you get if you do "make dist".
I.e. we add "configure" to a generated tarball, but not po/git.pot, so this should just be under regular "clean", not "distclean".
Will remove "po/git.pot" under regular "clean" rule in next reroll. I copied it from your original patch without thinking carefully.
Like this:
-- snip --
Makefile +1 -1
@@ -3319,7 +3319,6 @@ 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
@@ -3333,6 +3332,7 @@ cocciclean: clean: profile-clean coverage-clean cocciclean $(RM) -r .build + $(RM) po/git.pot $(RM) *.res $(RM) $(OBJECTS) $(RM) $(LIB_FILE) $(XDIFF_LIB) $(REFTABLE_LIB) $(REFTABLE_TEST_LIB)
-- snap --
Re: [PATCH v3 6/9] po/git.pot: don't check in result of "make pot"
In reply to Jiang XinQuoted 17 lines · Jiang Xin
Quoted 15 lines · Ævar Arnfjörð Bjarmason
Makefile dist-doc: git$X · line 3322
Quoted 7 lines · Jiang Xin
.PHONY: pot
pot: po/git.potMakefile +1
-0@@ -3319,6 +3319,7 @@ dist-doc: git$X distclean: clean $(RM) configure + $(RM) po/git.potI think I noted "why not add this to clean?" in an earlier round, but didn't think it through.
Quoted 8 lines
Quoted 5 lines
On second thought we should do that, but the reason is that "distclean" should only clean things that you get if you do "make dist".
I.e. we add "configure" to a generated tarball, but not po/git.pot, so this should just be under regular "clean", not "distclean".
Will remove "po/git.pot" under regular "clean" rule in next reroll. I copied it from your original patch without thinking carefully.
Yes, sorry about that. Just to be clear I didn't think this was an issue you introduced. To be honest I thought it could be mine or yours, and didn't dig to look into the history :)
I have no idea why I added it to distclean, and it doesn't make any sense to me now, but oh well, as long as we fix it ... :)
PATCH v3 7/9 Makefile: add "po-update" rule to update po/XX.po
In reply to Jiang XinFrom: Jiang Xin <[email protected]>
Since there is no longer a "po/git.pot" file in tree, a l10n team leader has to run several commands to update their "po/XX.po" file:
$ make pot
$ msgmerge --add-location --backup=off -U po/XX.po po/git.potTo make this process easier, add a new rule so that l10n team leaders can update their "po/XX.po" with one command. E.g.:
$ make po-update PO_FILE=po/zh_CN.po
--- Makefile | 18 ++++++++++++++++++ shared.mak | 1 + 2 files changed, 19 insertions(+)
Makefile +18 -0
@@ -571,6 +571,7 @@ TCLTK_PATH = wish XGETTEXT = xgettext MSGCAT = msgcat MSGFMT = msgfmt +MSGMERGE = msgmerge CURL_CONFIG = curl-config GCOV = gcov STRIP = strip
@@ -2716,6 +2717,7 @@ XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \ XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --language=Perl \ --keyword=__ --keyword=N__ --keyword="__n:1,2" MSGCAT_FLAGS = --sort-by-file +MSGMERGE_FLAGS = --add-location --backup=off --update LOCALIZED_C = $(FOUND_C_SOURCES) $(FOUND_H_SOURCES) $(SCALAR_SOURCES) \ $(GENERATED_H) LOCALIZED_SH = $(SCRIPT_SH)
@@ -2794,6 +2796,22 @@ po/git.pot: .build/pot/git.header $(LOCALIZED_ALL_GEN_PO) .PHONY: pot pot: po/git.pot +define check_po_file_envvar + $(if $(PO_FILE), \ + $(if $(filter po/%.po,$(PO_FILE)), , \ + $(error PO_FILE should match pattern: "po/%.po")), \ + $(error PO_FILE is not defined)) +endef + +.PHONY: po-update +po-update: po/git.pot + $(check_po_file_envvar) + @if test ! -e $(PO_FILE); then \ + echo >&2 "error: $(PO_FILE) does not exist"; \ + exit 1; \ + fi + $(QUIET_MSGMERGE)$(MSGMERGE) $(MSGMERGE_FLAGS) $(PO_FILE) po/git.pot + .PHONY: check-pot check-pot: $(LOCALIZED_ALL_GEN_PO)
shared.mak +1 -0
@@ -63,6 +63,7 @@ ifndef V QUIET_LNCP = @echo ' ' LN/CP $@; QUIET_XGETTEXT = @echo ' ' XGETTEXT $@; QUIET_MSGFMT = @echo ' ' MSGFMT $@; + QUIET_MSGMERGE = @echo ' ' MSGMERGE $@; QUIET_GCOV = @echo ' ' GCOV $@; QUIET_SP = @echo ' ' SP $<; QUIET_HDR = @echo ' ' HDR $(<:hcc=h);
Signature · 1 line
2.36.0.1.g15c4090757
PATCH v3 8/9 Makefile: add "po-init" rule to initialize po/XX.po
In reply to Jiang XinFrom: Ævar Arnfjörð Bjarmason <[email protected]>
The core translation is the minimum set of work that must be done for a new language translation.
There are over 5000 messages in the template message file "po/git.pot" that need to be translated. It is not a piece of cake for such a huge workload. So we used to define a small set of messages called "core translation" that a new l10n contributor must complete before sending pull request to the l10n coordinator.
By pulling in some parts of the git-po-helper[^1] logic, we add rule "core-pot" to create this core translation message "po/git-core.pot":
make core-pot
To help new l10n contributors to initialized their "po/XX.pot" from "po/git-core.pot", we also add new rules "po-init":
make po-init PO_FILE=po/XX.po
[^1]: https://github.com/git-l10n/git-po-helper/
--- Makefile | 41 +++++++++++++++++++++++++++++++++++++++++ po/.gitignore | 1 + shared.mak | 1 + 3 files changed, 43 insertions(+)
Makefile +41 -0
@@ -2808,6 +2808,7 @@ po-update: po/git.pot $(check_po_file_envvar) @if test ! -e $(PO_FILE); then \ echo >&2 "error: $(PO_FILE) does not exist"; \ + echo >&2 'To create an initial po file, use: "make po-init PO_FILE=po/XX.po"'; \ exit 1; \ fi $(QUIET_MSGMERGE)$(MSGMERGE) $(MSGMERGE_FLAGS) $(PO_FILE) po/git.pot
@@ -2815,6 +2816,46 @@ po-update: po/git.pot .PHONY: check-pot check-pot: $(LOCALIZED_ALL_GEN_PO) +### TODO FIXME: Translating everything in these files is a bad +### heuristic for "core", as we'll translate obscure error() messages +### along with commonly seen i18n messages. A better heuristic would +### be to e.g. use spatch to first remove error/die/warning +### etc. messages. +LOCALIZED_C_CORE = +LOCALIZED_C_CORE += builtin/checkout.c +LOCALIZED_C_CORE += builtin/clone.c +LOCALIZED_C_CORE += builtin/index-pack.c +LOCALIZED_C_CORE += builtin/push.c +LOCALIZED_C_CORE += builtin/reset.c +LOCALIZED_C_CORE += remote.c +LOCALIZED_C_CORE += wt-status.c + +LOCALIZED_C_CORE_GEN_PO = $(LOCALIZED_C_CORE:%=.build/pot/po/%.po) + +.PHONY: core-pot +core-pot: po/git-core.pot + +.build/pot/git-core.header: $(LOCALIZED_C_CORE_GEN_PO) + $(call mkdir_p_parent_template) + $(QUIET_GEN)$(gen_pot_header) + +po/git-core.pot: .build/pot/git-core.header $(LOCALIZED_C_CORE_GEN_PO) + $(QUIET_GEN)$(MSGCAT) $(MSGCAT_FLAGS) $^ >$@ + +.PHONY: po-init +po-init: po/git-core.pot + $(check_po_file_envvar) + @if test -e $(PO_FILE); then \ + echo >&2 "error: $(PO_FILE) exists already"; \ + exit 1; \ + fi + $(QUIET_MSGINIT)msginit \ + --input=$< \ + --output=$(PO_FILE) \ + --no-translator \ + --locale=$(PO_FILE:po/%.po=%) + +## po/*.po files & their rules ifdef NO_GETTEXT POFILES := MOFILES :=
po/.gitignore +1 -0
@@ -1,2 +1,3 @@ /build /git.pot +/git-core.pot
shared.mak +1 -0
@@ -62,6 +62,7 @@ ifndef V QUIET_BUILT_IN = @echo ' ' BUILTIN $@; QUIET_LNCP = @echo ' ' LN/CP $@; QUIET_XGETTEXT = @echo ' ' XGETTEXT $@; + QUIET_MSGINIT = @echo ' ' MSGINIT $@; QUIET_MSGFMT = @echo ' ' MSGFMT $@; QUIET_MSGMERGE = @echo ' ' MSGMERGE $@; QUIET_GCOV = @echo ' ' GCOV $@;
Signature · 1 line
2.36.0.1.g15c4090757
PATCH v3 9/9 l10n: Document the new l10n workflow
In reply to Jiang XinFrom: Ævar Arnfjörð Bjarmason <[email protected]>
Change the "flow" of how translators interact with the l10n repository at [1] to adjust it for a new workflow of not having a po/git.pot file in-tree at all, and to not commit line numbers to the po/*.po files that we do track in tree.
The current workflow was added in a combination of dce37b66fb0 (l10n:
initial git.pot for 1.7.10 upcoming release, 2012-02-13) and 271ce198cd0 (Update l10n guide, 2012-02-29).
As noted in preceding commits I think that it came about due to technical debt I'd left behind in how the "po/git.pot" file was created, and a mis-impression that the file:line comments were needed as anything more than a transitory translation aid.
As the updated po/README.md shows the new workflow is substantially the same, the difference is that translators no longer need to initially pull from the l10n coordinator for a new po/git.pot, they can simply use git.git's canonical source repository.
The l10n coordinator is still expected to announce a release to translate, which presumably would always be Junio's latest release tag. I'm not certain if this part of the process is actually important. I.e. the delta translation-wise between that tag and "master" is usually pretty small, so perhaps translators can just work on "master" instead.
1. https://github.com/git-l10n/git-po/
--- po/README.md | 230 ++++++++++++++++++++++++++------------------------- 1 file changed, 117 insertions(+), 113 deletions(-)
po/README.md +117 -113
@@ -9,8 +9,14 @@ coordinates our localization effort in the l10 coordinator repository: https://github.com/git-l10n/git-po/ -The two character language translation codes are defined by ISO\_639-1, as -stated in the gettext(1) full manual, appendix A.1, Usual Language Codes. +We will use XX as an alias to refer to the language translation code in +the following paragraphs, for example we use "po/XX.po" to refer to the +translation file for a specific language. But this doesn't mean that +the language code has only two letters. The language code can be in one +of two forms: "ll" or "ll\_CC". Here "ll" is the ISO 639 two-letter +language code and "CC" is the ISO 3166 two-letter code for country names +and subdivisions. For example: "de" for German language code, "zh\_CN" +for Simplified Chinese language code. ## Contributing to an existing translation
@@ -39,72 +45,74 @@ language, so that the l10n coordinator only needs to interact with one person per language. -## Core translation +## Translation Process Flow -The core translation is the smallest set of work that must be completed -for a new language translation. Because there are more than 5000 messages -in the template message file "po/git.pot" that need to be translated, -this is not a piece of cake for the contributor for a new language. +The overall data-flow looks like this: -The core template message file which contains a small set of messages -will be generated in "po-core/core.pot" automatically by running a helper -program named "git-po-helper" (described later). + +-------------------+ +------------------+ + | Git source code | ----(2)---> | L10n coordinator | + | repository | <---(5)---- | repository | + +-------------------+ +------------------+ + | | ^ + (1) (3) (4) + V v | + +----------------------------------+ + | Language Team XX | + +----------------------------------+ -```shell -git-po-helper init --core XX.po -``` +- Translatable strings are marked in the source file. +- Language teams can start translation iterations at any time, even + before the l10n window opens: -After translating the generated "po-core/XX.po", you can merge it to -"po/XX.po" using the following commands: + + Pull from the master branch of the source (1) + + Update the message file by running "make po-update PO\_FILE=po/XX.po" + + Translate the message file "po/XX.po" -```shell -msgcat po-core/XX.po po/XX.po -s -o /tmp/XX.po -mv /tmp/XX.po po/XX.po -git-po-helper update XX.po -``` +- The L10n coordinator pulls from source and announces the l10n window + open (2) +- Language team pulls from the l10n coordinator, starts another + translation iteration against the l10n coordinator's tree (3) -Edit "po/XX.po" by hand to fix "fuzzy" messages, which may have misplaced -translated messages and duplicate messages. + + Run "git pull --rebase" from the l10n coordinator + + Update the message file by running "make po-update PO\_FILE=po/XX.po" + + Translate the message file "po/XX.po" + + Squash trivial l10n git commits using "git rebase -i" +- Language team sends pull request to the l10n coordinator (4) +- L10n coordinator checks and merges +- L10n coordinator asks the result to be pulled (5). -## Translation Process Flow -The overall data-flow looks like this: +## Dynamically generated POT files - +-------------------+ +------------------+ - | Git source code | ---(1)---> | L10n coordinator | - | repository | <---(4)--- | repository | - +-------------------+ +------------------+ - | ^ - (2) (3) - V | - +------------------+ - | Language Team XX | - +------------------+ +POT files are templates for l10n contributors to create or update their +translation files. We used to have the "po/git.pot" file which was +generated by the l10n coordinator, but this file had been removed from +the tree. -- Translatable strings are marked in the source file. -- L10n coordinator pulls from the source (1) -- L10n coordinator updates the message template "po/git.pot" -- Language team pulls from L10n coordinator (2) -- Language team updates the message file "po/XX.po" -- L10n coordinator pulls from Language team (3) -- L10n coordinator asks the result to be pulled (4). +The two POT files "po/git.pot" and "po/git-core.pot" can be created +dynamically when necessary. +L10n contributors use "po/git.pot" to prepare translations for their +languages, but they are not expected to modify it. The "po/git.pot" file +can be generated manually with the following command: -## Maintaining the "po/git.pot" file +```shell +make po/git.pot +``` -(This is done by the l10n coordinator). +The "po/git-core.pot" file is the template for core translations. A core +translation is the minimum set of work necessary to complete a +translation of a new language. Since there are more than 5000 messages +in the full set of template message file "po/git.pot" that need to be +translated, this is not a piece of cake for new language contributors. -The "po/git.pot" file contains a message catalog extracted from Git's -sources. The l10n coordinator maintains it by adding new translations with -msginit(1), or update existing ones with msgmerge(1). In order to update -the Git sources to extract the messages from, the l10n coordinator is -expected to pull from the main git repository at strategic point in -history (e.g. when a major release and release candidates are tagged), -and then run "make pot" at the top-level directory. +The "core" template file "po/git-core.pot" can be generated manually +by running: -Language contributors use this file to prepare translations for their -language, but they are not expected to modify it. +```shell +make po/git-core.pot +``` ## Initializing a "XX.po" file
@@ -115,32 +123,14 @@ If your language XX does not have translated message file "po/XX.po" yet, you add a translation for the first time by running: ```shell -msginit --locale=XX +make po-init PO_FILE=po/XX.po ``` -in the "po/" directory, where XX is the locale, e.g. "de", "is", "pt\_BR", -"zh\_CN", etc. - -Then edit the automatically generated copyright info in your new "XX.po" -to be correct, e.g. for Icelandic: - -```diff -@@ -1,6 +1,6 @@ --# Icelandic translations for PACKAGE package. --# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER --# This file is distributed under the same license as the PACKAGE package. -+# Icelandic translations for Git. -+# Copyright (C) 2010 Ævar Arnfjörð Bjarmason <[email protected]> -+# This file is distributed under the same license as the Git package. - # Ævar Arnfjörð Bjarmason <[email protected]>, 2010. -``` - -And change references to PACKAGE VERSION in the PO Header Entry to -just "Git": +where XX is the locale, e.g. "de", "is", "pt\_BR", "zh\_CN", etc. -```shell -perl -pi -e 's/(?<="Project-Id-Version: )PACKAGE VERSION/Git/' XX.po -``` +The newly generated message file "po/XX.po" is based on the core pot +file "po/git-core.pot", so it contains only a minimal set of messages +and it's a good start for a new language contribution. Once you are done testing the translation (see below), commit the result and ask the l10n coordinator to pull from you.
@@ -153,19 +143,53 @@ and ask the l10n coordinator to pull from you. If you are replacing translation strings in an existing "XX.po" file to improve the translation, just edit the file. -If there's an existing "XX.po" file for your language, but the repository -of the l10n coordinator has newer "po/git.pot" file, you would need to first -pull from the l10n coordinator (see the beginning of this document for its -URL), and then update the existing translation by running: +If you want to find new translatable strings in source files of upstream +repository and propagate them to your "po/XX.po", run command: ```shell -msgmerge --add-location --backup=off -U XX.po git.pot +make po-update PO_FILE=po/XX.po ``` -in the "po/" directory, where "XX.po" is the file you want to update. +It will: -Once you are done testing the translation (see below), commit the result -and ask the l10n coordinator to pull from you. +- Call "make po/git.pot" to generate new "po/git.pot" file +- Call "msgmerge --add-location --backup=off -U po/XX.po po/git.pot" + to update your "po/XX.po" +- The "--add-location" option for msgmerge will add location lines, + and these location lines will help translation tools to locate + translation context easily. + +Once you are done testing the translation (see below), it's better +to commit a location-less "po/XX.po" file to save repository space +and make a user-friendly patch for review. + +To save a location-less "po/XX.po" automatically in repository, you +can: + +First define a new attribute for "po/XX.po" by appending the following +line in ".git/info/attributes": + +``` +/po/XX.po filter=gettext-no-location +``` + +Then define the driver for the "gettext-no-location" clean filter to +strip out both filenames and locations from the contents as follows: + +```shell +git config --global filter.gettext-no-location.clean \ + "msgcat --no-location -" +``` + +For users who have gettext version 0.20 or higher, it is also possible +to define a clean filter to preserve filenames but not locations: + +```shell +git config --global filter.gettext-no-location.clean \ + "msgcat --add-location=file -" +``` + +You're now ready to ask the l10n coordinator to pull from you. ## Fuzzy translation
@@ -196,6 +220,14 @@ common errors, e.g. missing printf format strings, or translated messages that deviate from the originals in whether they begin/end with a newline or not. +L10n coordinator will check your contributions using a helper program +(see "PO helper" section below): + +```shell +git-po-helper check-po po/XX.po +git-po-helper check-commits <rev-list-opts> +``` + ## Marking strings for translation
@@ -370,29 +402,6 @@ l10n workflow. To build and install the helper program from source, see [git-po-helper/README][]. -Usage for git-po-helper: - -- To start a new language translation: - - ```shell - git-po-helper init XX.po - ``` - -- To update your "XX.po" file: - - ```shell - git-po-helper update XX.po - ``` - -- To check commit log and syntax of "XX.po": - - ```shell - git-po-helper check-po XX.po - git-po-helper check-commits - ``` - -Run "git-po-helper" without arguments to show usage. - ## Conventions
@@ -436,13 +445,8 @@ additional conventions: - Initialize proper filename of the "XX.po" file conforming to iso-639 and iso-3166. -- Must complete a minimal translation based on the "po-core/core.pot" - template. Using the following command to initialize the minimal - "po-core/XX.po" file: - - ```shell - git-po-helper init --core <your-language> - ``` +- Must complete a minimal translation based on the "Core + translation". See that section above. - Add a new entry in the "po/TEAMS" file with proper format, and check the syntax of "po/TEAMS" by running the following command:
Signature · 1 line
2.36.0.1.g15c4090757
PATCH v2 2/9 Makefile: generate "po/git.pot" from stable LOCALIZED_C
In reply to Jiang XinFrom: Jiang Xin <[email protected]>
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
endifBut 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
--- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Makefile +2 -1
@@ -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)
Signature · 1 line
2.36.0.1.g15c4090757
Re: [PATCH v2 2/9] Makefile: generate "po/git.pot" from stable LOCALIZED_C
Quoted 6 lines · Jiang Xin
From: Jiang Xin <[email protected]>
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.
As noted in my review of 1/9 this part of the rationale makes perfect sense, no matter what we should always get the same results from "make pot" on different platforms.
And I like the simplicity of using FOUND_C_SOURCES, unfortunately...
Quoted 13 lines
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 endifBut it is much simpler to use variables "$(FOUND_C_SOURCES)" and "$(FOUND_C_SOURCES)" to form a stable "
LOCALIZED_C".
Quoted 7 lines
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
Those files which list "our" code look like obvious bug fixes, i.e. we are the primary maintainer of that compat/* code, so we should do the translation.
But the inclusion of compat/regex/regcomp.c there is a bug IMO. It's code we got from glibc/awk. Do we really want to be using translator time on that?
Hrm, maybe. After all those systems (most notably Windows) won't have glibc/awk's translation catalogs, and in any case even if they did we'd be using some ~decade old version of the code, so the two won't match up well.
So maybe this is fine....
Quoted 11 lines
Signed-off-by Jiang Xin <[email protected]>Signed-off-by Junio C Hamano <[email protected]>--- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)Makefile +0
-0
Makefile XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \ · line 2718
Quoted 6 lines
Makefile +2
-1@@ -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)
The SCALAR_SOURCES seems snuck in here, but it's worth noting in the commit message that we effectively had it here before as part of C_OBJ.
Re: [PATCH v2 2/9] Makefile: generate "po/git.pot" from stable LOCALIZED_C
Quoted 6 lines · Ævar Arnfjörð Bjarmason
Quoted 6 lines
Makefile +0
-0@@ -2714,7 +2714,8 @@ XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \ --keyword=gettextln --keyword=eval_gettextln
Quoted 8 lines
Makefile XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \ · line 2718
Quoted 5 lines
Makefile +2
-1XGETTEXT_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)The
SCALAR_SOURCESseems snuck in here, but it's worth noting in the commit message that we effectively had it here before as part ofC_OBJ.
Agree.
PATCH v2 3/9 Makefile: have "make pot" not "reset --hard"
In reply to Jiang XinFrom: Ævar Arnfjörð Bjarmason <[email protected]>
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).
--- .gitignore | 1 + Makefile | 73 ++++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 53 insertions(+), 21 deletions(-)
.gitignore +1 -0
@@ -200,6 +200,7 @@ *.[aos] *.o.json *.py[co] +.build/ .depend/ *.gcda *.gcno
Makefile +52 -21
110 lines not on this page · raw message
Signature · 1 line
2.36.0.1.g15c4090757
Re: [PATCH v2 3/9] Makefile: have "make pot" not "reset --hard"
Quoted 227 lines · Jiang Xin
From: Ævar Arnfjörð Bjarmason <[email protected]>
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 until1f31963e921(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 <[email protected]>Signed-off-by Jiang Xin <[email protected]>Signed-off-by Junio C Hamano <[email protected]>--- .gitignore | 1 + Makefile | 73 ++++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 53 insertions(+), 21 deletions(-).gitignore +1
-0@@ -200,6 +200,7 @@ *.[aos] *.o.json *.py[co] +.build/ .depend/ *.gcda *.gcnoMakefile +51
-21@@ -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 <[email protected]>" \ + --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
Makefile cocciclean: · line 3328
Quoted 7 lines
Makefile +1
-0@@ -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)
In the previous discussion of kicking things around I lost track of what version of mine this is picked up from, but I range-diff'd it to my 6cf9c1f7022 (Makefile: have "make pot" not "reset --hard", 2022-04-02), which is the latest I had in avar/Makefile-incremental-po-git-pot-rule on my branch.
A range-diff of the two follows below (yours being the RHS). Some comments:
* There's a bug here where you're creating .build/pot/po/pretty.c.po files, not .build/pot/po/pretty.c, i.e. you add a *.po extension.
As the commit message diff shows that results in us adding comments to po/git.pot that reference the filename as e.g. add-patch.c.po instead of the correct add-patch.c.
So while it sucks to have a pretty.c file in .build/ that's really just a partial *.po instead of one with a *.po extension the whole excercise of us sub-shelling into .build/pot/ etc. is to work around msgcat's and xgettext's lack specifying a custom "trust me, this is the filename", so we should make it *.c again.
(We could also post-munge the file, but that would suck more)
* We went a bit back & forth on the "if grep -q PRItime" part on the GH ticket. FWIW I still think just skipping that work is a better choice. Yes we'll have ~10MB of redundant files in .build, and it's marginally slower, but "make pot" isn't a hot target, better to optimize for simplicity.
But if you're really set on having it I don't mind...
* You add a "MSGCAT_FLAGS = --sort-by-file" here, maybe worth having some "common" flags variable in the earlier commit we can use here? I.e. share --sort-by-file with xgettext.
* Your version is missing FORCE on po/git.pot, which is a bug. We can't omit it on any file that's checked in. We're about to "git rm" it anyway, so maybe we shouldn't worry about it though...
* This commit breaks the non-ASCII msgid, but 4/9 is about to fix it, so likewise maybe not worth worrying about re-arranging them...
1: 6cf9c1f7022 ! 1: c569d1cd688 Makefile: have "make pot" not "reset --hard"
@@ Metadata
## Commit message ##
Makefile: have "make pot" not "reset --hard"
- Change "make pot" to work on copies of the working tree files in a new
- ".build/pot/" directory, instead of altering them in place and doing a
- "reset --hard" afterwards.
-
- This both speeds up the "make pot" target on an initial run, and makes
- it *much* faster for incremental runs, and will allow us to implement
- related targets in subsequent commits.
+ 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,
@@ Commit message
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").
-
- So we still need a FORCE on po/git.pot, but now we'll have that target
- copy ".build/pot/git.pot" to "po/git.pot", and the former doesn't need
- FORCE.
-
- I think 1f31963e921 was confused in the rationale for adding "FORCE"
- though, it's needed for the reasons noted above, but it's got nothing
- to do with how we do C compilation or find headers, which it suggest
- is the case. It was also made as a preparatory change for
- d85b0dff729 (Makefile: use find to determine static header
- dependencies, 2014-08-25).
-
- Unlike the compiler, when we generate the "pot "file we won't recurse
- from one header file to another, we only consider the specific targets
- we're given, so if we miss a bar.h included via foo.h $(LOCALIZED_C)
- the FORCE won't help us.
+ 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":
- Before fc0fd5b23bc 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.
-
- We didn't need to do this for the *.perl and *.sh files, so let's
- skip that and only do it for the *.[ch] files.
-
- Let's then create these munged *.[ch] files in a tree in .build/pot/"
- corresponding to our source tree, and have "xgettext" consider
- those. The rule needs to be careful to "(cd .build/pot && ...)",
- because otherwise the comments in the po/git.pot file wouldn't refer
- to the correct source locations (they'd be prefixed with
- ".build/git/").
-
- We'll then generate intermediate .build/pot/po/% files from %, which
- is handy to see at a glance what strings (if any) in a given file are
+ 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
+ $ make .build/pot/po/pretty.c.po
[...]
- $ cat .build/pot/po/pretty.c
+ $ 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"
@@ Commit message
different. E.g. for the "Your edited hunk[...]" message we'll now apply this change (comment content elided):
- +#. #-#-#-#-# add-patch.c #-#-#-#-#
+ +#. #-#-#-#-# add-patch.c.po #-#-#-#-#
#. TRANSLATORS: do not translate [y/n]
[...]
- +#. #-#-#-#-# git-add--interactive.perl #-#-#-#-#
+ +#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-#
#. TRANSLATORS: do not translate [y/n]
[...]
#: add-patch.c:1253 git-add--interactive.perl:1244
@@ Commit message
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr ""
- There are three such changes, and they all make the context more
+ 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.
- The removal of the "--msgid-bugs-address" here and the addition of
- "--omit-header" and ".build/pot/pot.header" is because we'll now
- always carry forward the existing po/git.pot header.
+ 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.
- We'd previously generate the header with xgettext(1), but now we'll be
- carrying forward whatever header we find in po/git.pot. Right now this
- doesn't matter, we'll even update the timestamp in the header as
- before when running "make pot".
+ 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 our previous 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).
+ 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: Jiang Xin <[email protected]>
+ Signed-off-by: Junio C Hamano <[email protected]>
## .gitignore ##
@@
@@ .gitignore
*.gcno
## Makefile ##
-@@ Makefile: pdf:
- XGETTEXT_FLAGS = \
+@@ Makefile: INSTALL = install
+ TCL_PATH = tclsh
+ TCLTK_PATH = wish
+ XGETTEXT = xgettext
++MSGCAT = msgcat
+ MSGFMT = msgfmt
+ CURL_CONFIG = curl-config
+ GCOV = gcov
+@@ Makefile: XGETTEXT_FLAGS = \
--force-po \
--add-comments=TRANSLATORS: \
-- --msgid-bugs-address="Git Mailing List <[email protected]>" \
-- --from-code=UTF-8
-+ --from-code=UTF-8 \
-+ --omit-header
-+
+ --msgid-bugs-address="Git Mailing List <[email protected]>" \
++ --package-name=Git \
+ --sort-by-file \
+ --from-code=UTF-8
XGETTEXT_FLAGS_C = $(XGETTEXT_FLAGS) --language=C \
- --keyword=_ --keyword=N_ --keyword="Q_:1,2"
- XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \
+@@ Makefile: 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)
@@ Makefile: LOCALIZED_SH += t/t0200/test.sh
LOCALIZED_PERL += t/t0200/test.perl
endif
@@ Makefile: LOCALIZED_SH += t/t0200/test.sh
-## 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/% files containing a extract -+## of the translations we find in each file in the source tree. The -+## files have the same basename as the source due xgettext(1) not -+## having a way to override the basename inserted into comments. ++## 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/%) ++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/%) ++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/%) ++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 = $(LOCALIZED_C:%=.build/pot/in/%)
-+$(LOCALIZED_C_GEN): .build/pot/in/%: % ++$(LOCALIZED_C_GEN_PO): .build/pot/po/%.po: %
+ $(call mkdir_p_parent_template)
-+ $(QUIET_GEN)sed -e 's|PRItime|PRIuMAX|g' <$< >$@
-+
-+$(LOCALIZED_C_GEN_PO): .build/pot/po/%: .build/pot/in/%
-+ $(call mkdir_p_parent_template)
-+ $(QUIET_XGETTEXT)(\
-+ cd .build/pot/in && \
-+ $(XGETTEXT) -o $(@:.build/pot/po/%=../po/%) \
-+ $(XGETTEXT_FLAGS_C) \
-+ $(<:.build/pot/in/%=%) \
-+ )
++ $(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/%: % ++$(LOCALIZED_SH_GEN_PO): .build/pot/po/%.po: %
+ $(call mkdir_p_parent_template)
-+ $(QUIET_XGETTEXT)$(XGETTEXT) -o$@ $(XGETTEXT_FLAGS_SH) $<
++ $(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/%: %
-+ $(call mkdir_p_parent_template)
-+ $(QUIET_XGETTEXT)$(XGETTEXT) -o$@ $(XGETTEXT_FLAGS_PERL) $<
-+
-+.build/pot/pot.header:
++$(LOCALIZED_PERL_GEN_PO): .build/pot/po/%.po: %
+ $(call mkdir_p_parent_template)
-+ $(QUIET_GEN)sed -n -e '/^$$/q' -e 'p' <po/git.pot >$@
++ $(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.pot: .build/pot/pot.header $(LOCALIZED_ALL_GEN_PO)
-+ $(QUIET_GEN)msgcat $^ >$@
++.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.pot FORCE
-+ $(QUIET_CP)cp $< $@
++po/git.pot: .build/pot/git.header $(LOCALIZED_ALL_GEN_PO)
++ $(QUIET_GEN)$(MSGCAT) $(MSGCAT_FLAGS) $^ >$@
.PHONY: pot
pot: po/git.pot
@@ Makefile: cocciclean:
$(RM) *.res
$(RM) $(OBJECTS)
$(RM) $(LIB_FILE) $(XDIFF_LIB) $(REFTABLE_LIB) $(REFTABLE_TEST_LIB)
-
- ## shared.mak ##
-@@ shared.mak: ifndef V
- QUIET_AR = @echo ' ' AR $@;
- QUIET_LINK = @echo ' ' LINK $@;
- QUIET_BUILT_IN = @echo ' ' BUILTIN $@;
-+ QUIET_CP = @echo ' ' CP $@;
- QUIET_LNCP = @echo ' ' LN/CP $@;
- QUIET_XGETTEXT = @echo ' ' XGETTEXT $@;
- QUIET_MSGFMT = @echo ' ' MSGFMT $@;
Re: [PATCH v2 3/9] Makefile: have "make pot" not "reset --hard"
Quoted 11 lines · Ævar Arnfjörð Bjarmason
In the previous discussion of kicking things around I lost track of what version of mine this is picked up from, but I range-diff'd it to my
6cf9c1f7022(Makefile: have "make pot" not "reset --hard", 2022-04-02), which is the latest I had in avar/Makefile-incremental-po-git-pot-rule on my branch.A range-diff of the two follows below (yours being the RHS). Some comments:
* There's a bug here where you're creating .build/pot/po/pretty.c.po files, not
.build/pot/po/pretty.c, i.e. you add a *.po extension.
In the original version of your commit, each source file has a duplicate version in the ".build/" directory, and this will confuse IDE (E.g.: VS Code) when I jump to a function declaration.
Name the "pot" snippets with the ".po" extension only have the following side effect, nothing else:
+#. #-#-#-#-# add-patch.c.po #-#-#-#-#
#. TRANSLATORS: do not translate [y/n]
[...]
+#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-#I add some notes in commit message:
While we could rename the "pot" snippets without the ".po" extension 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.
Quoted 3 lines
* We went a bit back & forth on the "if grep -q PRItime" part on the GH ticket. FWIW I still think just skipping that work is a better choice. Yes we'll have ~10MB of redundant files in .build, and it's
Redundant source files (*.c, *.h, *.perl) in .build will make IDE mad.
Quoted 5 lines
marginally slower, but "make pot" isn't a hot target, better to optimize for simplicity.
But if you're really set on having it I don't mind...
Quoted 7 lines
* You add a "
MSGCAT_FLAGS= --sort-by-file" here, maybe worth having some "common" flags variable in the earlier commit we can use here? I.e. share --sort-by-file with xgettext.* Your version is missing FORCE on po/git.pot, which is a bug. We can't omit it on any file that's checked in. We're about to "git rm" it anyway, so maybe we shouldn't worry about it though...
I'm confused. Since the "po/git.pot" target has a full set of prerequisites, it is fine to remove FORCE from dependence.
Re: [PATCH v2 3/9] Makefile: have "make pot" not "reset --hard"
Quoted 18 lines · Jiang Xin
Quoted 11 lines · Ævar Arnfjörð Bjarmason
In the previous discussion of kicking things around I lost track of what version of mine this is picked up from, but I range-diff'd it to my
6cf9c1f7022(Makefile: have "make pot" not "reset --hard", 2022-04-02), which is the latest I had in avar/Makefile-incremental-po-git-pot-rule on my branch.A range-diff of the two follows below (yours being the RHS). Some comments:
* There's a bug here where you're creating .build/pot/po/pretty.c.po files, not
.build/pot/po/pretty.c, i.e. you add a *.po extension.In the original version of your commit, each source file has a duplicate version in the ".build/" directory, and this will confuse IDE (E.g.: VS Code) when I jump to a function declaration.
Quoted 7 lines
Name the "pot" snippets with the ".po" extension only have the following side effect, nothing else:
+#. #-#-#-#-# add-patch.c.po #-#-#-#-# #. TRANSLATORS: do not translate [y/n] [...] +#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-#
I don't think we should sacrifice correctness for such an IDE workaround, which surely will just bite someone else in a different way. I.e. now if I'm auto-completing .po<TAB> in a hypothetical naïve IDE that's looking in .build/ I'll get these built files instead.
The right solution in both cases being that the IDE in question should be ignoring things covered by .gitignore, or perhaps we could ship something in contrib/ for specific IDEs?
There's also an easy workaround we can do on the GNU make side. Unless you mark files as PRECIOUS it'll delete files that are only used for intermediate targets.
We could thus make the chain e.g.:
git.c -> .build/pot/po/git.c -> .build/pot/po/git.c.done
Instead of:
git.c -> .build/pot/po/git.c -> .build/pot/po/git.c.done
Where the only point of the ".build/pot/po/git.c.done" is to have make delete the intermediate file as soon as it's done with it.
Or, since the comments all start with #. or #: we could post-munge them with "sed" I guess.
Quoted 6 lines
I add some notes in commit message:
While we could rename the "pot" snippets without the ".po" extension 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.
Ah, I see that after you pointed out. I'd skimmed entirely over the commit message thinking it must have been something I wrote, and didn't notice that edit. Sorry.
Quoted 5 lines
Quoted 3 lines
* We went a bit back & forth on the "if grep -q PRItime" part on the GH ticket. FWIW I still think just skipping that work is a better choice. Yes we'll have ~10MB of redundant files in .build, and it's
Redundant source files (*.c, *.h, *.perl) in .build will make IDE mad.
Hopefully we can have our cake & eat it too here, per the above.
Quoted 9 lines
Quoted 9 lines
marginally slower, but "make pot" isn't a hot target, better to optimize for simplicity.
But if you're really set on having it I don't mind...
* You add a "
MSGCAT_FLAGS= --sort-by-file" here, maybe worth having some "common" flags variable in the earlier commit we can use here? I.e. share --sort-by-file with xgettext.
Quoted 6 lines
Quoted 3 lines
* Your version is missing FORCE on po/git.pot, which is a bug. We can't omit it on any file that's checked in. We're about to "git rm" it anyway, so maybe we shouldn't worry about it though...
I'm confused. Since the "po/git.pot" target has a full set of prerequisites, it is fine to remove FORCE from dependence.
At this point in the series po/git.pot is still a file tracked by git.
Thus:
make pot
git reset --hard HEAD^
make potOr whatever will report that there's nothing to do, since the timestamp of the "generated" file will be newer than that of what it depends on.
That's why my version pulled that dance with having the .build/pot/git.pot be non-FORCE and the po/git.pot be FORCE until it was git rm'd.
PATCH v2 4/9 i18n CI: stop allowing non-ASCII source messages in po/git.pot
In reply to Jiang XinFrom: Ævar Arnfjörð Bjarmason <[email protected]>
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 ina6226fd772b (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 with the same prerequisites as the "po/git.pot" target, but without changing the file "po/git.pot". Running it as part of the "static-analysis" CI target will ensure that we catch any such issues in the future. E.g.:
$ make check-pot
XGETTEXT .build/pot/po/builtin/submodule--helper.c.po
xgettext: Non-ASCII string at builtin/submodule--helper.c:3381.
Please specify the source encoding through --from-code.
make: *** [.build/pot/po/builtin/submodule--helper.c.po] Error 11. 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)
--- Makefile | 6 ++++-- builtin/submodule--helper.c | 2 +- ci/run-static-analysis.sh | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-)
Makefile +4 -2
@@ -2708,8 +2708,7 @@ XGETTEXT_FLAGS = \ --add-comments=TRANSLATORS: \ --msgid-bugs-address="Git Mailing List <[email protected]>" \ --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: $(LOCALIZED_ALL_GEN_PO) + ifdef NO_GETTEXT POFILES := MOFILES :=
builtin/submodule--helper.c +1 -1
@@ -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 ()
ci/run-static-analysis.sh +2 -0
@@ -29,4 +29,6 @@ fi make hdr-check || exit 1 +make check-pot + save_good_tree
Signature · 1 line
2.36.0.1.g15c4090757
Re: [PATCH v2 4/9] i18n CI: stop allowing non-ASCII source messages in po/git.pot
Quoted 88 lines · Jiang Xin
From: Ævar Arnfjörð Bjarmason <[email protected]>
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 ofcmd_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
Makefilechanges made this easy: let's add a "make check-pot" target with the same prerequisites as the "po/git.pot" target, but without changing the file "po/git.pot". Running it as part of the "static-analysis" CI target will ensure that we catch any such issues in the future. E.g.:$ make check-pot XGETTEXT .build/pot/po/builtin/submodule--helper.c.po xgettext: Non-ASCII string at builtin/submodule--helper.c:3381. Please specify the source encoding through --from-code. make: *** [.build/pot/po/builtin/submodule--helper.c.po] Error 11.
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 <[email protected]>Signed-off-by Jiang Xin <[email protected]>Signed-off-by Junio C Hamano <[email protected]>--- Makefile | 6 ++++-- builtin/submodule--helper.c | 2 +- ci/run-static-analysis.sh | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-)Makefile +4
-2@@ -2708,8 +2708,7 @@ XGETTEXT_FLAGS = \ --add-comments=TRANSLATORS: \ --msgid-bugs-address="Git Mailing List <[email protected]>" \ --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: $(LOCALIZED_ALL_GEN_PO) + ifdef NO_GETTEXT POFILES := MOFILES :=builtin/submodule--helper.c +1
-1@@ -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 ()ci/run-static-analysis.sh +0
-0
ci/run-static-analysis.sh fi · line 34
Quoted 6 lines
ci/run-static-analysis.sh +2
-0@@ -29,4 +29,6 @@ fi make hdr-check || exit 1 +make check-pot + save_good_tree
In my latest version of this (range-diff below, yours is the RHS) I had this depend on the full po.git pot file, i.e. .build/pot/git.pot. You're instead making it depend on only the intermediate files we msgcat from it.
What I was going for was to detect that non-ASCII issue, which your version will also do, but out of general paranoia I thought running it thorugh the same toolchain and produce the end result made sense.
So if there's any issue that the msgcat that produces po.git would spot we'll miss it here, but I don't know of any such problem.
So maybe there's nothing to worry about here, but it's probably worth noting that we're confident that we won't have any trouble because of not checking the end result po.git in the commit message...
1: a7f8122d43f ! 1: e2cfb1a2408 i18n CI: stop allowing non-ASCII source messages in po/git.pot
@@ Commit message
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.
+ check-pot" target with the same prerequisites as the "po/git.pot"
+ target, but without changing the file "po/git.pot". Running it as part
+ of the "static-analysis" CI target will ensure that we catch any such
+ issues in the future. E.g.:
+
+ $ make check-pot
+ XGETTEXT .build/pot/po/builtin/submodule--helper.c.po
+ xgettext: Non-ASCII string at builtin/submodule--helper.c:3381.
+ Please specify the source encoding through --from-code.
+ make: *** [.build/pot/po/builtin/submodule--helper.c.po] Error 1
1. cd5513a7168 (i18n: Makefile: "pot" target to extract messages marked for translation, 2011-02-22)
@@ Commit message
gettext, 2011-11-18)
+ Signed-off-by: Jiang Xin <[email protected]>
+ Signed-off-by: Junio C Hamano <[email protected]>
## Makefile ##
-@@ Makefile: pdf:
- XGETTEXT_FLAGS = \
- --force-po \
+@@ Makefile: XGETTEXT_FLAGS = \
--add-comments=TRANSLATORS: \
-- --from-code=UTF-8 \
- --omit-header
-
+ --msgid-bugs-address="Git Mailing List <[email protected]>" \
+ --package-name=Git \
+- --sort-by-file \
+- --from-code=UTF-8
++ --sort-by-file
XGETTEXT_FLAGS_C = $(XGETTEXT_FLAGS) --language=C \
-@@ Makefile: po/git.pot: .build/pot/git.pot FORCE
+ --keyword=_ --keyword=N_ --keyword="Q_:1,2"
+ XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \
+@@ Makefile: po/git.pot: .build/pot/git.header $(LOCALIZED_ALL_GEN_PO)
.PHONY: pot
pot: po/git.pot
+.PHONY: check-pot
-+check-pot: .build/pot/git.pot
++check-pot: $(LOCALIZED_ALL_GEN_PO)
+
ifdef NO_GETTEXT
POFILES :=
PATCH v2 5/9 po/git.pot: this is now a generated file
In reply to Jiang XinFrom: Junio C Hamano <[email protected]>
--- po/git.pot | 25151 --------------------------------------------------- 1 file changed, 25151 deletions(-) delete mode 100644 po/git.pot
po/git.pot deleted +0 -25151
@@ -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 <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\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 <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <[email protected]>\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 (<ret> 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 <file>'\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 <new-branch-name>\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 <num> 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 <n> 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 <root> 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: %<PRIuMAX>" -msgstr "" - -#: archive.c:14 -msgid "git archive [<options>] <tree-ish> [<path>...]" -msgstr "" - -#: archive.c:16 -msgid "" -"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" -msgstr "" - -#: archive.c:17 -msgid "git archive --remote <repo> [--exec <cmd>] --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 <repo>" -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 %<PRIuMAX> 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 %<PRIuMAX> 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) %<PRIx64> and %<PRIx64>" -msgstr "" - -#: chunk-format.c:133 -#, c-format -msgid "duplicate chunk ID %<PRIx32> found" -msgstr "" - -#: chunk-format.c:147 -#, c-format -msgid "final chunk has non-zero id %<PRIx32>" -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 %<PRIuMAX> pack" -msgid_plural "Finding commits for commit graph in %<PRIuMAX> 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 %<PRIuMAX> < %<PRIuMAX>" -msgstr "" - -#: commit-graph.c:2626 -#, c-format -msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" -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 <GIT_DIR>/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"
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.36.0.1.g15c4090757
Part of the diff is not shown here. View the raw message.
PATCH v2 6/9 po/git.pot: don't check in result of "make pot"
In reply to Jiang XinFrom: Ævar Arnfjörð Bjarmason <[email protected]>
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
553743We 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 was in preceding commit to make this change easier to review, and to preempt the mailing list from blocking it due to it being too large.
--- Makefile | 1 + po/.gitignore | 1 + 2 files changed, 2 insertions(+)
Makefile +1 -0
@@ -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
po/.gitignore +1 -0
@@ -1 +1,2 @@ /build +/git.pot
Signature · 1 line
2.36.0.1.g15c4090757
PATCH v2 7/9 Makefile: add "po-update" rule to update po/XX.po
In reply to Jiang XinFrom: Jiang Xin <[email protected]>
Since there is no longer a "po/git.pot" file in tree, a l10n team leader has to run several commands to update their "po/XX.po" file:
$ make pot
$ msgmerge --add-location --backup=off -U po/XX.po po/git.potTo make this process easier, add a new rule so that l10n team leaders can update their "po/XX.po" with one command. E.g.:
$ make po-update PO_FILE=po/zh_CN.po
--- Makefile | 18 ++++++++++++++++++ shared.mak | 1 + 2 files changed, 19 insertions(+)
Makefile +18 -0
@@ -571,6 +571,7 @@ TCLTK_PATH = wish XGETTEXT = xgettext MSGCAT = msgcat MSGFMT = msgfmt +MSGMERGE = msgmerge CURL_CONFIG = curl-config GCOV = gcov STRIP = strip
@@ -2716,6 +2717,7 @@ XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \ XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --language=Perl \ --keyword=__ --keyword=N__ --keyword="__n:1,2" MSGCAT_FLAGS = --sort-by-file +MSGMERGE_FLAGS = --add-location --backup=off --update LOCALIZED_C = $(FOUND_C_SOURCES) $(SCALAR_SOURCES) \ $(FOUND_H_SOURCES) $(GENERATED_H) LOCALIZED_SH = $(SCRIPT_SH)
@@ -2787,6 +2789,22 @@ po/git.pot: .build/pot/git.header $(LOCALIZED_ALL_GEN_PO) .PHONY: pot pot: po/git.pot +define check_po_file_envvar + $(if $(PO_FILE), \ + $(if $(filter po/%.po,$(PO_FILE)), , \ + $(error PO_FILE should match pattern: "po/%.po")), \ + $(error PO_FILE is not defined)) +endef + +.PHONY: po-update +po-update: po/git.pot + $(check_po_file_envvar) + @if test ! -e $(PO_FILE); then \ + echo >&2 "error: $(PO_FILE) does not exist"; \ + exit 1; \ + fi + $(QUIET_MSGMERGE)$(MSGMERGE) $(MSGMERGE_FLAGS) $(PO_FILE) po/git.pot + .PHONY: check-pot check-pot: $(LOCALIZED_ALL_GEN_PO)
shared.mak +1 -0
@@ -63,6 +63,7 @@ ifndef V QUIET_LNCP = @echo ' ' LN/CP $@; QUIET_XGETTEXT = @echo ' ' XGETTEXT $@; QUIET_MSGFMT = @echo ' ' MSGFMT $@; + QUIET_MSGMERGE = @echo ' ' MSGMERGE $@; QUIET_GCOV = @echo ' ' GCOV $@; QUIET_SP = @echo ' ' SP $<; QUIET_HDR = @echo ' ' HDR $(<:hcc=h);
Signature · 1 line
2.36.0.1.g15c4090757
Re: [PATCH v2 7/9] Makefile: add "po-update" rule to update po/XX.po
Quoted 33 lines · Jiang Xin
From: Jiang Xin <[email protected]>
Since there is no longer a "po/git.pot" file in tree, a l10n team leader has to run several commands to update their "po/XX.po" file:
$ make pot $ msgmerge --add-location --backup=off -U po/XX.po po/git.potTo make this process easier, add a new rule so that l10n team leaders can update their "po/XX.po" with one command. E.g.:
$ make po-update PO_FILE=po/zh_CN.poSigned-off-by Jiang Xin <[email protected]>Signed-off-by Junio C Hamano <[email protected]>--- Makefile | 18 ++++++++++++++++++ shared.mak | 1 + 2 files changed, 19 insertions(+)Makefile +1
-0@@ -571,6 +571,7 @@ TCLTK_PATH = wish XGETTEXT = xgettext MSGCAT = msgcat MSGFMT = msgfmt +MSGMERGE = msgmerge CURL_CONFIG = curl-config GCOV = gcov STRIP = strip
Makefile XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \ · line 2720
Quoted 4 lines
Makefile +1
-0@@ -2716,6 +2717,7 @@ XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \ XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --language=Perl \ --keyword=__ --keyword=N__ --keyword="__n:1,2" MSGCAT_FLAGS = --sort-by-file +MSGMERGE_FLAGS = --add-location --backup=off --update
Ok, we'd like to have the location in the po/*.po files still. We're just getting rid of po/git.pot.
I had some patches to also do it for the po/XX.po files, thinking that we'd only check in the "meaningful" data. We'd then offer translators some targets to add the locations to the file for working on them, and then flip back before they did a "git commit" etc. etc.
But none of that needs to happen now, and this series is already quite large, so just leaving things here seems like a good stopping point.
I also tested with --no-location (updated all to have no location), and a subsequent --add-location run repairs it. It also fixes a manually edited nonsense location for a valid msgid. So this all seems OK to me.
Quoted 12 lines
Makefile +5
-0LOCALIZED_C = $(FOUND_C_SOURCES) $(SCALAR_SOURCES) \ $(FOUND_H_SOURCES) $(GENERATED_H) LOCALIZED_SH = $(SCRIPT_SH)@@ -2787,6 +2789,22 @@ po/git.pot: .build/pot/git.header $(LOCALIZED_ALL_GEN_PO) .PHONY: pot pot: po/git.pot +define check_po_file_envvar + $(if $(PO_FILE), \ + $(if $(filter po/%.po,$(PO_FILE)), , \ + $(error PO_FILE should match pattern: "po/%.po")), \ + $(error PO_FILE is not defined))
Makefile po/git.pot: .build/pot/git.header $(LOCALIZED_ALL_GEN_PO) · line 2806
Quoted 10 lines
Makefile +10
-0+endef + +.PHONY: po-update +po-update: po/git.pot + $(check_po_file_envvar) + @if test ! -e $(PO_FILE); then \ + echo >&2 "error: $(PO_FILE) does not exist"; \ + exit 1; \ + fi + $(QUIET_MSGMERGE)$(MSGMERGE) $(MSGMERGE_FLAGS) $(PO_FILE) po/git.pot
Nit: better to put the $(QUIET_MSGMERGE) in place of that @, i.e. V=1 will give you the full debug dump.
This is fine too I suppose, but we tend to use $(QUIET_*) like that elsewhere...
Quoted 15 lines
Makefile +0
-0.PHONY: check-pot check-pot: $(LOCALIZED_ALL_GEN_PO)shared.mak +1
-0@@ -63,6 +63,7 @@ ifndef V QUIET_LNCP = @echo ' ' LN/CP $@; QUIET_XGETTEXT = @echo ' ' XGETTEXT $@; QUIET_MSGFMT = @echo ' ' MSGFMT $@; + QUIET_MSGMERGE = @echo ' ' MSGMERGE $@; QUIET_GCOV = @echo ' ' GCOV $@; QUIET_SP = @echo ' ' SP $<; QUIET_HDR = @echo ' ' HDR $(<:hcc=h);
PATCH v2 8/9 Makefile: add "po-init" rule to initialize po/XX.po
In reply to Jiang XinFrom: Ævar Arnfjörð Bjarmason <[email protected]>
The core translation is the minimum set of work that must be done for a new language translation.
There are over 5000 messages in the template message file "po/git.pot" that need to be translated. It is not a piece of cake for such a huge workload. So we used to define a small set of messages called "core translation" that a new l10n contributor must complete before sending pull request to the l10n coordinator.
By pulling in some parts of the git-po-helper[^1] logic, we add rule "core-pot" to create this core translation message "po/git-core.pot":
make core-pot
To help new l10n contributors to initialized their "po/XX.pot" from "po/git-core.pot", we also add new rules "po-init":
make po-init POT_FILE=po/XX.po
[^1]: https://github.com/git-l10n/git-po-helper/
--- Makefile | 44 ++++++++++++++++++++++++++++++++++++++++++++ po/.gitignore | 1 + shared.mak | 1 + 3 files changed, 46 insertions(+)
Makefile +44 -0
@@ -2801,6 +2801,7 @@ po-update: po/git.pot $(check_po_file_envvar) @if test ! -e $(PO_FILE); then \ echo >&2 "error: $(PO_FILE) does not exist"; \ + echo >&2 'To create an initial po file, use: "make po-init PO_FILE=po/XX.po"'; \ exit 1; \ fi $(QUIET_MSGMERGE)$(MSGMERGE) $(MSGMERGE_FLAGS) $(PO_FILE) po/git.pot
@@ -2808,6 +2809,49 @@ po-update: po/git.pot .PHONY: check-pot check-pot: $(LOCALIZED_ALL_GEN_PO) +### TODO FIXME: Translating everything in these files is a bad +### heuristic for "core", as we'll translate obscure error() messages +### along with commonly seen i18n messages. A better heuristic would +### be to e.g. use spatch to first remove error/die/warning +### etc. messages. +LOCALIZED_C_CORE = +LOCALIZED_C_CORE += builtin/checkout.c +LOCALIZED_C_CORE += builtin/clone.c +LOCALIZED_C_CORE += builtin/index-pack.c +LOCALIZED_C_CORE += builtin/push.c +LOCALIZED_C_CORE += builtin/reset.c +LOCALIZED_C_CORE += remote.c +LOCALIZED_C_CORE += wt-status.c + +LOCALIZED_C_CORE_GEN_PO = $(LOCALIZED_C_CORE:%=.build/pot/po/%.po) + +.PHONY: core-pot +core-pot: po/git-core.pot + +.build/pot/git-core.header: $(LOCALIZED_C_CORE_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"' >>$@ + +po/git-core.pot: .build/pot/git-core.header $(LOCALIZED_C_CORE_GEN_PO) + $(QUIET_GEN)$(MSGCAT) $(MSGCAT_FLAGS) $^ >$@ + +.PHONY: po-init +po-init: po/git-core.pot + $(check_po_file_envvar) + @if test -e $(PO_FILE); then \ + echo >&2 "error: $(PO_FILE) exists already"; \ + exit 1; \ + fi + $(QUIET_MSGINIT)msginit \ + --input=$< \ + --output=$(PO_FILE) \ + --no-translator \ + --locale=$(PO_FILE:po/%.po=%) + +## po/*.po files & their rules ifdef NO_GETTEXT POFILES := MOFILES :=
po/.gitignore +1 -0
@@ -1,2 +1,3 @@ /build /git.pot +/git-core.pot
shared.mak +1 -0
@@ -62,6 +62,7 @@ ifndef V QUIET_BUILT_IN = @echo ' ' BUILTIN $@; QUIET_LNCP = @echo ' ' LN/CP $@; QUIET_XGETTEXT = @echo ' ' XGETTEXT $@; + QUIET_MSGINIT = @echo ' ' MSGINIT $@; QUIET_MSGFMT = @echo ' ' MSGFMT $@; QUIET_MSGMERGE = @echo ' ' MSGMERGE $@; QUIET_GCOV = @echo ' ' GCOV $@;
Signature · 1 line
2.36.0.1.g15c4090757
Re: [PATCH v2 8/9] Makefile: add "po-init" rule to initialize po/XX.po
Quoted 14 lines · Jiang Xin
From: Ævar Arnfjörð Bjarmason <[email protected]>
The core translation is the minimum set of work that must be done for a new language translation.
There are over 5000 messages in the template message file "po/git.pot" that need to be translated. It is not a piece of cake for such a huge workload. So we used to define a small set of messages called "core translation" that a new l10n contributor must complete before sending pull request to the l10n coordinator.
By pulling in some parts of the git-po-helper[^1] logic, we add rule "core-pot" to create this core translation message "po/git-core.pot":
Quoted 6 lines
make core-pot
To help new l10n contributors to initialized their "po/XX.pot" from "po/git-core.pot", we also add new rules "po-init":
make po-init POT_FILE=po/XX.po
This is a typo, you mean PO_FILE, not POT_FILE.
Quoted 10 lines
Makefile | 44 ++++++++++++++++++++++++++++++++++++++++++++ po/.gitignore | 1 + shared.mak | 1 + 3 files changed, 46 insertions(+)Makefile +0
-0
Makefile po-update: po/git.pot · line 2804
Quoted 4 lines
Makefile +1
-0@@ -2801,6 +2801,7 @@ po-update: po/git.pot $(check_po_file_envvar) @if test ! -e $(PO_FILE); then \ echo >&2 "error: $(PO_FILE) does not exist"; \ + echo >&2 'To create an initial po file, use: "make po-init PO_FILE=po/XX.po"'; \
Correct here.
Quoted 23 lines
Makefile +16
-0exit 1; \ fi $(QUIET_MSGMERGE)$(MSGMERGE) $(MSGMERGE_FLAGS) $(PO_FILE) po/git.pot@@ -2808,6 +2809,49 @@ po-update: po/git.pot .PHONY: check-pot check-pot: $(LOCALIZED_ALL_GEN_PO) +### TODO FIXME: Translating everything in these files is a bad +### heuristic for "core", as we'll translate obscure error() messages +### along with commonly seen i18n messages. A better heuristic would +### be to e.g. use spatch to first remove error/die/warning +### etc. messages. +LOCALIZED_C_CORE = +LOCALIZED_C_CORE += builtin/checkout.c +LOCALIZED_C_CORE += builtin/clone.c +LOCALIZED_C_CORE += builtin/index-pack.c +LOCALIZED_C_CORE += builtin/push.c +LOCALIZED_C_CORE += builtin/reset.c +LOCALIZED_C_CORE += remote.c +LOCALIZED_C_CORE += wt-status.c + +LOCALIZED_C_CORE_GEN_PO = $(LOCALIZED_C_CORE:%=.build/pot/po/%.po) +
Makefile po-update: po/git.pot · line 2837
Quoted 10 lines
Makefile +10
-0+.PHONY: core-pot +core-pot: po/git-core.pot + +.build/pot/git-core.header: $(LOCALIZED_C_CORE_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"' >>$@ +
This looks OK to me, FWIW in the version I have on my branch I tried to munge some of this a bit more. So the diff between my (-)/yours (+) is:
--- po/fo.po 2022-05-19 12:23:02.548459230 +0200 +++ po/fo.po.jx 2022-05-19 12:22:50.608563768 +0200 @@ -1,19454 +1,1224 @@ +# Faroese translations for Git package. +# Copyright (C) 2022 THE Git'S COPYRIGHT HOLDER # This file is distributed under the same license as the Git package. +# Automatically generated, 2022. +# msgid "" msgstr "" "Project-Id-Version: Git\n" -"Last-Translator: make by the Makefile\n" -"Language-Team: Git Mailing List <[email protected]>\n" +"Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\n" +"POT-Creation-Date: 2022-05-19 12:22+0200\n" +"PO-Revision-Date: 2022-05-19 12:22+0200\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" "Language: fo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"PO-Revision-Date: 2022-04-11 11:05+0200\n"
So yours has the "Faroese translations for Git package" (good), but I also omitted/corrected some of the headers. See 72ed0c8b2e6 (i18n:
migrate to line-number-less i18n workflow, 2022-04-03) in my fork.
This version is also fine, but just in case you wanted to steal something from it...
PATCH v2 9/9 l10n: Document the new l10n workflow
In reply to Jiang XinFrom: Ævar Arnfjörð Bjarmason <[email protected]>
Change the "flow" of how translators interact with the l10n repository at [1] to adjust it for a new workflow of not having a po/git.pot file in-tree at all, and to not commit line numbers to the po/*.po files that we do track in tree.
The current workflow was added in a combination of dce37b66fb0 (l10n:
initial git.pot for 1.7.10 upcoming release, 2012-02-13) and 271ce198cd0 (Update l10n guide, 2012-02-29).
As noted in preceding commits I think that it came about due to technical debt I'd left behind in how the "po/git.pot" file was created, and a mis-impression that the file:line comments were needed as anything more than a transitory translation aid.
As the updated po/README.md shows the new workflow is substantially the same, the difference is that translators no longer need to initially pull from the l10n coordinator for a new po/git.pot, they can simply use git.git's canonical source repository.
The l10n coordinator is still expected to announce a release to translate, which presumably would always be Junio's latest release tag. I'm not certain if this part of the process is actually important. I.e. the delta translation-wise between that tag and "master" is usually pretty small, so perhaps translators can just work on "master" instead.
1. https://github.com/git-l10n/git-po/
--- po/README.md | 191 ++++++++++++++++++++++++--------------------------- 1 file changed, 88 insertions(+), 103 deletions(-)
po/README.md +88 -103
@@ -46,65 +46,67 @@ for a new language translation. Because there are more than 5000 messages in the template message file "po/git.pot" that need to be translated, this is not a piece of cake for the contributor for a new language. -The core template message file which contains a small set of messages -will be generated in "po-core/core.pot" automatically by running a helper -program named "git-po-helper" (described later). +The "core" set of messages can be generated at "po/git-core.pot" by +running: ```shell -git-po-helper init --core XX.po +make core-pot ``` -After translating the generated "po-core/XX.po", you can merge it to -"po/XX.po" using the following commands: - -```shell -msgcat po-core/XX.po po/XX.po -s -o /tmp/XX.po -mv /tmp/XX.po po/XX.po -git-po-helper update XX.po -``` - -Edit "po/XX.po" by hand to fix "fuzzy" messages, which may have misplaced -translated messages and duplicate messages. +And then proceeding with the rest of these instructions on the new +generated "po/git-core.pot" file. ## Translation Process Flow The overall data-flow looks like this: - +-------------------+ +------------------+ - | Git source code | ---(1)---> | L10n coordinator | - | repository | <---(4)--- | repository | - +-------------------+ +------------------+ - | ^ - (2) (3) - V | - +------------------+ - | Language Team XX | - +------------------+ + +-------------------+ +------------------+ + | Git source code | ----(2)---> | L10n coordinator | + | repository | <---(5)---- | repository | + +-------------------+ +------------------+ + | | ^ + (1) (3) (4) + V v | + +----------------------------------+ + | Language Team XX | + +----------------------------------+ - Translatable strings are marked in the source file. -- L10n coordinator pulls from the source (1) -- L10n coordinator updates the message template "po/git.pot" -- Language team pulls from L10n coordinator (2) -- Language team updates the message file "po/XX.po" -- L10n coordinator pulls from Language team (3) -- L10n coordinator asks the result to be pulled (4). +- Language teams can start translation iterations at any time, even + before the l10n window opens: + + + Pull from the source (1) + + Update the message file by running "make po-update PO\_FILE=po/XX.po" + + Translate the message file "po/XX.po" +- The L10n coordinator pulls from source and announces the l10n window + open (2) +- Language team pulls from the l10n coordinator, starts another + translation iteration against the l10n coordinator's tree (3) -## Maintaining the "po/git.pot" file + + Run "git pull --rebase" from the l10n coordinator + + Update the message file by running "make po-update PO\_FILE=po/XX.po" + + Translate the message file "po/XX.po" + + Squash trivial l10n git commits using "git rebase -i" -(This is done by the l10n coordinator). +- Language team sends pull request to the l10n coordinator (4) +- L10n coordinator checks and merges +- L10n coordinator asks the result to be pulled (5). -The "po/git.pot" file contains a message catalog extracted from Git's -sources. The l10n coordinator maintains it by adding new translations with -msginit(1), or update existing ones with msgmerge(1). In order to update -the Git sources to extract the messages from, the l10n coordinator is -expected to pull from the main git repository at strategic point in -history (e.g. when a major release and release candidates are tagged), -and then run "make pot" at the top-level directory. -Language contributors use this file to prepare translations for their -language, but they are not expected to modify it. +## Creating the "po/git.pot" file + +The "po/git.pot" file, once generated by the the l10n coordinator had +been removed from the tree. L10n contributors can generated it at +runtime using command: + +```shell +make pot +``` + +Then language contributors use this file to prepare translations for +their language, but they are not expected to modify it. ## Initializing a "XX.po" file
@@ -115,32 +117,14 @@ If your language XX does not have translated message file "po/XX.po" yet, you add a translation for the first time by running: ```shell -msginit --locale=XX -``` - -in the "po/" directory, where XX is the locale, e.g. "de", "is", "pt\_BR", -"zh\_CN", etc. - -Then edit the automatically generated copyright info in your new "XX.po" -to be correct, e.g. for Icelandic: - -```diff -@@ -1,6 +1,6 @@ --# Icelandic translations for PACKAGE package. --# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER --# This file is distributed under the same license as the PACKAGE package. -+# Icelandic translations for Git. -+# Copyright (C) 2010 Ævar Arnfjörð Bjarmason <[email protected]> -+# This file is distributed under the same license as the Git package. - # Ævar Arnfjörð Bjarmason <[email protected]>, 2010. +make po-init PO_FILE=po/XX.po ``` -And change references to PACKAGE VERSION in the PO Header Entry to -just "Git": +Where XX is the locale, e.g. "de", "is", "pt\_BR", "zh\_CN", etc. -```shell -perl -pi -e 's/(?<="Project-Id-Version: )PACKAGE VERSION/Git/' XX.po -``` +The newly generated message file "po/XX.po" is based on the core pot +file "po/git-core.pot", so it contains only a minimal set of messages +and it's a good start for a new language contribution. Once you are done testing the translation (see below), commit the result and ask the l10n coordinator to pull from you.
@@ -153,19 +137,40 @@ and ask the l10n coordinator to pull from you. If you are replacing translation strings in an existing "XX.po" file to improve the translation, just edit the file. -If there's an existing "XX.po" file for your language, but the repository -of the l10n coordinator has newer "po/git.pot" file, you would need to first -pull from the l10n coordinator (see the beginning of this document for its -URL), and then update the existing translation by running: +If you want to find new translatable strings in source files of upstream +repository and propagate them to your "po/XX.po", run command: ```shell -msgmerge --add-location --backup=off -U XX.po git.pot +make po-update PO_FILE=po/XX.po ``` -in the "po/" directory, where "XX.po" is the file you want to update. +It will: -Once you are done testing the translation (see below), commit the result -and ask the l10n coordinator to pull from you. +- Call "make pot" at runtime to generate new "po/git.pot" file +- Call "msgmerge --add-location --backup=off -U po/XX.po po/git.pot" + to update your "po/XX.po" +- The "--add-location" option for msgmerge will add location lines, + and these location lines will help translation tools to location + translation context easily. + +Once you are done testing the translation (see below), it's better +to commit a location-less "po/XX.po" file to save repository space +and make a user-friendly patch for review. + +To save a location-less "po/XX.po" automatically in repository, you +can: + +- Define new attribute for "po/XX.po" by adding new line in + ".git/info/attributes": + + /po/XX.po filter=gettext-no-location + +- Define driver for "gettext-no-location" filter: + + $ git config --global filter.gettext-no-location.clean \ + "msgcat --no-location -" + +You're now ready to ask the l10n coordinator to pull from you. ## Fuzzy translation
@@ -196,6 +201,14 @@ common errors, e.g. missing printf format strings, or translated messages that deviate from the originals in whether they begin/end with a newline or not. +L10n coordinator will check your contributions using a helper program +(see "PO helper" section below): + +```shell +git-po-helper check-po po/XX.po +git-po-helper check-commits <rev-list-opts> +``` + ## Marking strings for translation
@@ -370,29 +383,6 @@ l10n workflow. To build and install the helper program from source, see [git-po-helper/README][]. -Usage for git-po-helper: - -- To start a new language translation: - - ```shell - git-po-helper init XX.po - ``` - -- To update your "XX.po" file: - - ```shell - git-po-helper update XX.po - ``` - -- To check commit log and syntax of "XX.po": - - ```shell - git-po-helper check-po XX.po - git-po-helper check-commits - ``` - -Run "git-po-helper" without arguments to show usage. - ## Conventions
@@ -436,13 +426,8 @@ additional conventions: - Initialize proper filename of the "XX.po" file conforming to iso-639 and iso-3166. -- Must complete a minimal translation based on the "po-core/core.pot" - template. Using the following command to initialize the minimal - "po-core/XX.po" file: - - ```shell - git-po-helper init --core <your-language> - ``` +- Must complete a minimal translation based on the "Core + translation". See that section above. - Add a new entry in the "po/TEAMS" file with proper format, and check the syntax of "po/TEAMS" by running the following command:
Signature · 1 line
2.36.0.1.g15c4090757
Re: [PATCH v2 9/9] l10n: Document the new l10n workflow
po/README.md for a new language translation. Because there are more than 5000 messages · line 100
Quoted 3 lines · Jiang Xin
po/README.md +3
-0+## Creating the "po/git.pot" file + +The "po/git.pot" file, once generated by the the l10n coordinator had
"once generated" -> "used to be generated"
Quoted 1 line
+been removed from the tree. L10n contributors can generated it at
"can generated it" -> "can generate it"
po/README.md for a new language translation. Because there are more than 5000 messages · line 106
Quoted 5 lines
po/README.md +5
-0+runtime using command: + +```shell +make pot +```
Just a minor detail, but I wonder if we want "make po/git.pot" here rather than "make pot", as the text before this command talks about "creating the po/git.pot file". It used to be that the readers of this document didn't have to worry about po/git.pot and the only thing they needed to know was stuff starting from "make po-init", but now they must be more aware of po/git.pot than before, so...
po/README.md If your language XX does not have translated message file "po/XX.po" yet, · line 123
Quoted 11 lines
po/README.md +4
-2+Then language contributors use this file to prepare translations for +their language, but they are not expected to modify it.@@ -115,32 +117,14 @@ If your language XX does not have translated message file "po/XX.po" yet, +make po-init PO_FILE=po/XX.po ``` -And change references to PACKAGE VERSION in the PO Header Entry to -just "Git": +Where XX is the locale, e.g. "de", "is", "pt\_BR", "zh\_CN", etc.
"Where" -> "where".
XX was called "the two character language translation codes" (mouthful isn't it) in much earlier part of the documentation, but here it stands for more than the language part. I wonder if that is confusing and we'd better use something other than XX.
In any case, we should define "locale" and tell the readers that language "XX" can be followed by territory "_YY" that clarifies the variant of the language, probably at the same place where we explained the two-letter language code and to the same degree by explaining the two-letter country codes and where they come from (i.e. ISO 3166-1).
Quoted 3 lines
+It will:
+- Call "make pot" at runtime to generate new "po/git.pot" file
What does "at runtime" mean here? Would it change the meaning if I rewrote this line to
Call "make pot" to generate new "po/git.pot" file
at all? To put it differently, does it call "make pot" at runtime, but it does not call "msgmerge --add-location ..." at runtime?
If "at runtime" is truly a noiseword, then remove it. It is confusing.
po/README.md and ask the l10n coordinator to pull from you. · line 154
Quoted 5 lines
+- Call "msgmerge --add-location --backup=off -U po/XX.po po/git.pot"
po/README.md +4
-0+ to update your "po/XX.po" +- The "--add-location" option for msgmerge will add location lines, + and these location lines will help translation tools to location + translation context easily.
"help translation tools to location" -> "help translation tools to locate"
probably.
po/README.md and ask the l10n coordinator to pull from you. · line 168
Quoted 9 lines
po/README.md +9
-0+To save a location-less "po/XX.po" automatically in repository, you +can: + +- Define new attribute for "po/XX.po" by adding new line in + ".git/info/attributes": + + /po/XX.po filter=gettext-no-location + +- Define driver for "gettext-no-location" filter:
"filter" -> "clean filter"?
po/README.md and ask the l10n coordinator to pull from you. · line 173
Quoted 4 lines
po/README.md +4
-0+ $ git config --global filter.gettext-no-location.clean \ + "msgcat --no-location -" + +You're now ready to ask the l10n coordinator to pull from you.
Should this part also explain what it is doing, just like we explained what happens when "make po-update" is run in an earlier section?
The above sets up a clean filter for po/XX.po file so that the "msgcat --no-location" command is used to strip out the location information from the contents when the file is checked in.
or something, perhaps?
Re: [PATCH v2 9/9] l10n: Document the new l10n workflow
Quoted 11 lines · Junio C Hamano
XX was called "the two character language translation codes" (mouthful isn't it) in much earlier part of the documentation, but here it stands for more than the language part. I wonder if that is confusing and we'd better use something other than XX.
In any case, we should define "locale" and tell the readers that language "XX" can be followed by territory "
_YY" that clarifies the variant of the language, probably at the same place where we explained the two-letter language code and to the same degree by explaining the two-letter country codes and where they come from (i.e. ISO 3166-1).
May change like this:
-- snip --
@@ -9,8 +9,15 @@
https://github.com/git-l10n/git-po/
-The two character language translation codes are defined by ISO\_639-1, as -stated in the gettext(1) full manual, appendix A.1, Usual Language Codes. +We will use XX as an alias to refer to the language translation code in +the following paragraphs, for example we use "po/XX.po" to refer to a +translation file for a specific language. But this doesn't mean that +the language code has only two letters. We should know that the language +code can be in one of two forms: "ll" or "ll\_CC". Here "ll" is the ISO +639 two-letter language code and "CC" is the ISO 3166 two-letter code +for country names and subdivisions. For example, for German, the language +code is "de", and for Chinese in mainland China, the language code is +"zh\_CN".
-- snap --