diff options
Diffstat (limited to 'po/git.pot')
| -rw-r--r-- | po/git.pot | 6919 |
1 files changed, 3557 insertions, 3362 deletions
diff --git a/po/git.pot b/po/git.pot index 7dd2e2bcf3..49e3db0fa0 100644 --- a/po/git.pot +++ b/po/git.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2020-03-11 15:26+0800\n" +"POT-Creation-Date: 2020-05-27 07:23+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -23,9 +23,9 @@ msgstr "" msgid "Huh (%s)?" msgstr "" -#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124 -#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687 -#: builtin/rebase.c:2086 builtin/rebase.c:2130 +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3142 +#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518 +#: builtin/rebase.c:1919 msgid "could not read index" msgstr "" @@ -53,8 +53,7 @@ msgstr "" msgid "could not stage '%s'" msgstr "" -#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317 -#: builtin/rebase.c:899 +#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3336 msgid "could not write index" msgstr "" @@ -70,8 +69,8 @@ msgstr[1] "" msgid "note: %s is untracked now.\n" msgstr "" -#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281 -#: builtin/reset.c:144 +#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:294 +#: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" @@ -194,11 +193,11 @@ msgstr "" msgid "(empty) select nothing" msgstr "" -#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851 +#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1851 msgid "*** Commands ***" msgstr "" -#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848 +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1848 msgid "What now" msgstr "" @@ -210,12 +209,13 @@ msgstr "" msgid "unstaged" msgstr "" -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251 -#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144 -#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409 +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250 +#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145 +#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409 #: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 #: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 -#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213 +#: builtin/submodule--helper.c:2148 bugreport.c:129 +#: git-add--interactive.perl:213 msgid "path" msgstr "" @@ -223,33 +223,33 @@ msgstr "" msgid "could not refresh index" msgstr "" -#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765 +#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1765 #, c-format msgid "Bye.\n" msgstr "" -#: add-patch.c:33 git-add--interactive.perl:1428 +#: add-patch.c:34 git-add--interactive.perl:1428 #, c-format, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:34 git-add--interactive.perl:1429 +#: add-patch.c:35 git-add--interactive.perl:1429 #, c-format, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:35 git-add--interactive.perl:1430 +#: add-patch.c:36 git-add--interactive.perl:1430 #, c-format, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:37 +#: add-patch.c:38 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "staging." msgstr "" -#: add-patch.c:40 +#: add-patch.c:41 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -258,28 +258,28 @@ msgid "" "d - do not stage this hunk or any of the later hunks in the file\n" msgstr "" -#: add-patch.c:54 git-add--interactive.perl:1433 +#: add-patch.c:55 git-add--interactive.perl:1433 #, c-format, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:55 git-add--interactive.perl:1434 +#: add-patch.c:56 git-add--interactive.perl:1434 #, c-format, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:56 git-add--interactive.perl:1435 +#: add-patch.c:57 git-add--interactive.perl:1435 #, c-format, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:58 +#: add-patch.c:59 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "stashing." msgstr "" -#: add-patch.c:61 +#: add-patch.c:62 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -288,28 +288,28 @@ msgid "" "d - do not stash this hunk or any of the later hunks in the file\n" msgstr "" -#: add-patch.c:77 git-add--interactive.perl:1438 +#: add-patch.c:78 git-add--interactive.perl:1438 #, c-format, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:78 git-add--interactive.perl:1439 +#: add-patch.c:79 git-add--interactive.perl:1439 #, c-format, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:79 git-add--interactive.perl:1440 +#: add-patch.c:80 git-add--interactive.perl:1440 #, c-format, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:81 +#: add-patch.c:82 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "unstaging." msgstr "" -#: add-patch.c:84 +#: add-patch.c:85 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -318,28 +318,28 @@ msgid "" "d - do not unstage this hunk or any of the later hunks in the file\n" msgstr "" -#: add-patch.c:99 git-add--interactive.perl:1443 +#: add-patch.c:100 git-add--interactive.perl:1443 #, c-format, perl-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:100 git-add--interactive.perl:1444 +#: add-patch.c:101 git-add--interactive.perl:1444 #, c-format, perl-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:101 git-add--interactive.perl:1445 +#: add-patch.c:102 git-add--interactive.perl:1445 #, c-format, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:103 add-patch.c:168 add-patch.c:211 +#: add-patch.c:104 add-patch.c:169 add-patch.c:212 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "applying." msgstr "" -#: add-patch.c:106 +#: add-patch.c:107 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -348,31 +348,31 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file\n" msgstr "" -#: add-patch.c:121 git-add--interactive.perl:1448 +#: add-patch.c:122 git-add--interactive.perl:1448 #: git-add--interactive.perl:1463 #, c-format, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:122 git-add--interactive.perl:1449 +#: add-patch.c:123 git-add--interactive.perl:1449 #: git-add--interactive.perl:1464 #, c-format, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:123 git-add--interactive.perl:1450 +#: add-patch.c:124 git-add--interactive.perl:1450 #: git-add--interactive.perl:1465 #, c-format, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:125 add-patch.c:147 add-patch.c:190 +#: add-patch.c:126 add-patch.c:148 add-patch.c:191 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "discarding." msgstr "" -#: add-patch.c:128 add-patch.c:193 +#: add-patch.c:129 add-patch.c:194 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -381,22 +381,22 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file\n" msgstr "" -#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453 +#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1453 #, c-format, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454 +#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1454 #, c-format, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455 +#: add-patch.c:146 add-patch.c:189 git-add--interactive.perl:1455 #, c-format, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:150 +#: add-patch.c:151 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -405,22 +405,22 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file\n" msgstr "" -#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458 +#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1458 #, c-format, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459 +#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1459 #, c-format, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460 +#: add-patch.c:167 add-patch.c:210 git-add--interactive.perl:1460 #, c-format, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:171 +#: add-patch.c:172 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -429,7 +429,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file\n" msgstr "" -#: add-patch.c:214 +#: add-patch.c:215 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -438,47 +438,47 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file\n" msgstr "" -#: add-patch.c:318 +#: add-patch.c:319 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "" -#: add-patch.c:337 add-patch.c:341 +#: add-patch.c:338 add-patch.c:342 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "" -#: add-patch.c:395 +#: add-patch.c:396 msgid "could not parse diff" msgstr "" -#: add-patch.c:414 +#: add-patch.c:415 msgid "could not parse colored diff" msgstr "" -#: add-patch.c:428 +#: add-patch.c:429 #, c-format msgid "failed to run '%s'" msgstr "" -#: add-patch.c:587 +#: add-patch.c:588 msgid "mismatched output from interactive.diffFilter" msgstr "" -#: add-patch.c:588 +#: add-patch.c:589 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." msgstr "" -#: add-patch.c:761 +#: add-patch.c:762 #, c-format msgid "" "expected context line #%d in\n" "%.*s" msgstr "" -#: add-patch.c:776 +#: add-patch.c:777 #, c-format msgid "" "hunks do not overlap:\n" @@ -487,11 +487,11 @@ msgid "" "%.*s" msgstr "" -#: add-patch.c:1052 git-add--interactive.perl:1112 +#: add-patch.c:1053 git-add--interactive.perl:1112 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "" -#: add-patch.c:1056 +#: add-patch.c:1057 #, c-format msgid "" "---\n" @@ -501,18 +501,18 @@ msgid "" msgstr "" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1070 git-add--interactive.perl:1126 +#: add-patch.c:1071 git-add--interactive.perl:1126 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:1103 +#: add-patch.c:1104 msgid "could not parse hunk header" msgstr "" -#: add-patch.c:1148 +#: add-patch.c:1149 msgid "'git apply --cached' failed" msgstr "" @@ -624,59 +624,66 @@ msgstr "" msgid "'git apply' failed" msgstr "" -#: advice.c:115 +#: advice.c:140 +#, c-format +msgid "" +"\n" +"Disable this message with \"git config advice.%s false\"" +msgstr "" + +#: advice.c:156 #, c-format msgid "%shint: %.*s%s\n" msgstr "" -#: advice.c:168 +#: advice.c:247 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" -#: advice.c:170 +#: advice.c:249 msgid "Committing is not possible because you have unmerged files." msgstr "" -#: advice.c:172 +#: advice.c:251 msgid "Merging is not possible because you have unmerged files." msgstr "" -#: advice.c:174 +#: advice.c:253 msgid "Pulling is not possible because you have unmerged files." msgstr "" -#: advice.c:176 +#: advice.c:255 msgid "Reverting is not possible because you have unmerged files." msgstr "" -#: advice.c:178 +#: advice.c:257 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" -#: advice.c:186 +#: advice.c:265 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:194 +#: advice.c:273 msgid "Exiting because of an unresolved conflict." msgstr "" -#: advice.c:199 builtin/merge.c:1335 +#: advice.c:278 builtin/merge.c:1353 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: advice.c:201 +#: advice.c:280 msgid "Please, commit your changes before merging." msgstr "" -#: advice.c:202 +#: advice.c:281 msgid "Exiting because of unfinished merge." msgstr "" -#: advice.c:208 +#: advice.c:287 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -936,7 +943,7 @@ msgstr "" msgid "cannot checkout %s" msgstr "" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308 #, c-format msgid "failed to read %s" msgstr "" @@ -1131,7 +1138,7 @@ msgstr[1] "" msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201 +#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195 #, c-format msgid "cannot open %s" msgstr "" @@ -1197,7 +1204,7 @@ msgstr "" msgid "apply changes matching the given path" msgstr "" -#: apply.c:4973 builtin/am.c:2260 +#: apply.c:4973 builtin/am.c:2259 msgid "num" msgstr "" @@ -1253,7 +1260,7 @@ msgstr "" msgid "build a temporary index based on embedded index information" msgstr "" -#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "" @@ -1261,9 +1268,9 @@ msgstr "" msgid "ensure at least <n> lines of context match" msgstr "" -#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98 +#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3457 builtin/rebase.c:1508 +#: builtin/pack-objects.c:3458 builtin/rebase.c:1332 msgid "action" msgstr "" @@ -1292,8 +1299,8 @@ msgid "allow overlapping hunks" msgstr "" #: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 -#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774 -#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 +#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:775 +#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "" @@ -1305,7 +1312,7 @@ msgstr "" msgid "do not trust the line counts in the hunk headers" msgstr "" -#: apply.c:5032 builtin/am.c:2248 +#: apply.c:5032 builtin/am.c:2247 msgid "root" msgstr "" @@ -1313,6 +1320,55 @@ msgstr "" msgid "prepend <root> to all filenames" msgstr "" +#: archive-tar.c:125 archive-zip.c:351 +#, c-format +msgid "cannot stream blob %s" +msgstr "" + +#: archive-tar.c:266 archive-zip.c:369 +#, c-format +msgid "unsupported file mode: 0%o (SHA1: %s)" +msgstr "" + +#: archive-tar.c:293 archive-zip.c:359 +#, c-format +msgid "cannot read %s" +msgstr "" + +#: archive-tar.c:465 +#, c-format +msgid "unable to start '%s' filter" +msgstr "" + +#: archive-tar.c:468 +msgid "unable to redirect descriptor" +msgstr "" + +#: archive-tar.c:475 +#, 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:480 builtin/pack-objects.c:232 builtin/pack-objects.c:235 +#, c-format +msgid "deflate error (%d)" +msgstr "" + +#: archive-zip.c:615 +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "" + #: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "" @@ -1330,172 +1386,123 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "" -#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 +#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" -#: archive.c:396 +#: archive.c:401 #, c-format msgid "no such ref: %.*s" msgstr "" -#: archive.c:401 +#: archive.c:407 #, c-format msgid "not a valid object name: %s" msgstr "" -#: archive.c:414 +#: archive.c:420 #, c-format msgid "not a tree object: %s" msgstr "" -#: archive.c:426 +#: archive.c:432 msgid "current working directory is untracked" msgstr "" -#: archive.c:457 +#: archive.c:464 msgid "fmt" msgstr "" -#: archive.c:457 +#: archive.c:464 msgid "archive format" msgstr "" -#: archive.c:458 builtin/log.c:1653 +#: archive.c:465 builtin/log.c:1674 msgid "prefix" msgstr "" -#: archive.c:459 +#: archive.c:466 msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 +#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 #: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887 -#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:907 +#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 #: parse-options.h:190 msgid "file" msgstr "" -#: archive.c:461 builtin/archive.c:90 +#: archive.c:468 builtin/archive.c:90 msgid "write the archive to this file" msgstr "" -#: archive.c:463 +#: archive.c:470 msgid "read .gitattributes in working directory" msgstr "" -#: archive.c:464 +#: archive.c:471 msgid "report archived files on stderr" msgstr "" -#: archive.c:465 +#: archive.c:472 msgid "store only" msgstr "" -#: archive.c:466 +#: archive.c:473 msgid "compress faster" msgstr "" -#: archive.c:474 +#: archive.c:481 msgid "compress better" msgstr "" -#: archive.c:477 +#: archive.c:484 msgid "list supported archive formats" msgstr "" -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 #: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 msgid "repo" msgstr "" -#: archive.c:480 builtin/archive.c:92 +#: archive.c:487 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "" -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "" -#: archive.c:482 builtin/archive.c:94 +#: archive.c:489 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "" -#: archive.c:489 +#: archive.c:496 msgid "Unexpected option --remote" msgstr "" -#: archive.c:491 +#: archive.c:498 msgid "Option --exec can only be used together with --remote" msgstr "" -#: archive.c:493 +#: archive.c:500 msgid "Unexpected option --output" msgstr "" -#: archive.c:515 +#: archive.c:522 #, c-format msgid "Unknown archive format '%s'" msgstr "" -#: archive.c:522 +#: archive.c:529 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "" -#: archive-tar.c:125 archive-zip.c:351 -#, c-format -msgid "cannot stream blob %s" -msgstr "" - -#: archive-tar.c:266 archive-zip.c:369 -#, c-format -msgid "unsupported file mode: 0%o (SHA1: %s)" -msgstr "" - -#: archive-tar.c:293 archive-zip.c:359 -#, c-format -msgid "cannot read %s" -msgstr "" - -#: archive-tar.c:465 -#, c-format -msgid "unable to start '%s' filter" -msgstr "" - -#: archive-tar.c:468 -msgid "unable to redirect descriptor" -msgstr "" - -#: archive-tar.c:475 -#, 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:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234 -#, c-format -msgid "deflate error (%d)" -msgstr "" - -#: archive-zip.c:615 -#, c-format -msgid "timestamp too large for this system: %<PRIuMAX>" -msgstr "" - #: attr.c:212 #, c-format msgid "%.*s is not a valid attribute name" @@ -1574,12 +1581,12 @@ msgstr "" msgid "a %s revision is needed" msgstr "" -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "" -#: bisect.c:966 builtin/merge.c:149 +#: bisect.c:966 builtin/merge.c:151 #, c-format msgid "could not read file '%s'" msgstr "" @@ -1617,37 +1624,37 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "" msgstr[1] "" -#: blame.c:2700 +#: blame.c:2777 msgid "--contents and --reverse do not blend well." msgstr "" -#: blame.c:2714 +#: blame.c:2791 msgid "cannot use --contents with final commit object name" msgstr "" -#: blame.c:2735 +#: blame.c:2812 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006 -#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388 -#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 -#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290 +#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018 +#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405 +#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235 +#: builtin/merge.c:415 builtin/pack-objects.c:3276 builtin/pack-objects.c:3291 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "" -#: blame.c:2762 +#: blame.c:2839 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" -#: blame.c:2773 +#: blame.c:2850 #, c-format msgid "no such path %s in %s" msgstr "" -#: blame.c:2784 +#: blame.c:2861 #, c-format msgid "cannot read blob %s for path %s" msgstr "" @@ -1766,12 +1773,12 @@ msgstr "" msgid "Not a valid branch point: '%s'." msgstr "" -#: branch.c:364 +#: branch.c:365 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "" -#: branch.c:387 +#: branch.c:388 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "" @@ -1786,8 +1793,8 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016 -#: builtin/commit.c:815 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034 +#: builtin/commit.c:814 #, c-format msgid "could not open '%s'" msgstr "" @@ -1839,7 +1846,7 @@ msgstr "" msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306 +#: bundle.c:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "" @@ -1862,312 +1869,328 @@ msgstr "" msgid "invalid color value: %.*s" msgstr "" -#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457 -#, c-format -msgid "could not parse %s" -msgstr "" - -#: commit.c:53 -#, c-format -msgid "%s %s is not a commit!" -msgstr "" - -#: commit.c:193 -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:1153 -#, c-format -msgid "Commit %s has an untrusted GPG signature, allegedly by %s." -msgstr "" - -#: commit.c:1157 -#, c-format -msgid "Commit %s has a bad GPG signature allegedly by %s." -msgstr "" - -#: commit.c:1160 -#, c-format -msgid "Commit %s does not have a GPG signature." -msgstr "" - -#: commit.c:1163 -#, c-format -msgid "Commit %s has a good GPG signature by %s\n" -msgstr "" - -#: commit.c:1417 -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 "" - -#: commit-graph.c:122 +#: commit-graph.c:183 msgid "commit-graph file is too small" msgstr "" -#: commit-graph.c:189 +#: commit-graph.c:248 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "" -#: commit-graph.c:196 +#: commit-graph.c:255 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "" -#: commit-graph.c:203 +#: commit-graph.c:262 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "" -#: commit-graph.c:226 +#: commit-graph.c:284 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" -#: commit-graph.c:237 +#: commit-graph.c:294 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "" -#: commit-graph.c:280 +#: commit-graph.c:362 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "" -#: commit-graph.c:343 +#: commit-graph.c:436 msgid "commit-graph has no base graphs chunk" msgstr "" -#: commit-graph.c:353 +#: commit-graph.c:446 msgid "commit-graph chain does not match" msgstr "" -#: commit-graph.c:401 +#: commit-graph.c:494 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" -#: commit-graph.c:425 +#: commit-graph.c:518 msgid "unable to find all commit-graph files" msgstr "" -#: commit-graph.c:558 commit-graph.c:618 +#: commit-graph.c:651 commit-graph.c:711 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" -#: commit-graph.c:579 +#: commit-graph.c:672 #, c-format msgid "could not find commit %s" msgstr "" -#: commit-graph.c:852 builtin/am.c:1292 +#: commit-graph.c:948 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "" -#: commit-graph.c:1011 builtin/pack-objects.c:2782 +#: commit-graph.c:1096 +msgid "Writing changed paths Bloom filters index" +msgstr "" + +#: commit-graph.c:1121 +msgid "Writing changed paths Bloom filters data" +msgstr "" + +#: commit-graph.c:1160 builtin/pack-objects.c:2783 #, c-format msgid "unable to get type of object %s" msgstr "" -#: commit-graph.c:1043 +#: commit-graph.c:1196 msgid "Loading known commits in commit graph" msgstr "" -#: commit-graph.c:1060 +#: commit-graph.c:1213 msgid "Expanding reachable commits in commit graph" msgstr "" -#: commit-graph.c:1079 +#: commit-graph.c:1233 msgid "Clearing commit marks in commit graph" msgstr "" -#: commit-graph.c:1098 +#: commit-graph.c:1252 msgid "Computing commit graph generation numbers" msgstr "" -#: commit-graph.c:1173 +#: commit-graph.c:1300 +msgid "Computing commit changed paths Bloom filters" +msgstr "" + +#: commit-graph.c:1359 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1186 +#: commit-graph.c:1372 #, c-format msgid "error adding pack %s" msgstr "" -#: commit-graph.c:1190 +#: commit-graph.c:1376 #, c-format msgid "error opening index for %s" msgstr "" -#: commit-graph.c:1214 +#: commit-graph.c:1405 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1234 +#: commit-graph.c:1426 #, c-format msgid "invalid commit object id: %s" msgstr "" -#: commit-graph.c:1249 +#: commit-graph.c:1442 msgid "Finding commits for commit graph among packed objects" msgstr "" -#: commit-graph.c:1264 +#: commit-graph.c:1457 msgid "Counting distinct commits in commit graph" msgstr "" -#: commit-graph.c:1294 +#: commit-graph.c:1489 msgid "Finding extra edges in commit graph" msgstr "" -#: commit-graph.c:1340 +#: commit-graph.c:1538 msgid "failed to write correct number of base graph ids" msgstr "" -#: commit-graph.c:1373 midx.c:814 +#: commit-graph.c:1572 midx.c:812 #, c-format msgid "unable to create leading directories of %s" msgstr "" -#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248 +#: commit-graph.c:1585 +msgid "unable to create temporary graph layer" +msgstr "" + +#: commit-graph.c:1590 #, c-format -msgid "unable to create '%s'" +msgid "unable to adjust shared permissions for '%s'" msgstr "" -#: commit-graph.c:1445 +#: commit-graph.c:1667 #, 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:1486 +#: commit-graph.c:1712 msgid "unable to open commit-graph chain file" msgstr "" -#: commit-graph.c:1498 +#: commit-graph.c:1728 msgid "failed to rename base commit-graph file" msgstr "" -#: commit-graph.c:1518 +#: commit-graph.c:1748 msgid "failed to rename temporary commit-graph file" msgstr "" -#: commit-graph.c:1631 +#: commit-graph.c:1874 msgid "Scanning merged commits" msgstr "" -#: commit-graph.c:1642 +#: commit-graph.c:1885 #, c-format msgid "unexpected duplicate commit id %s" msgstr "" -#: commit-graph.c:1665 +#: commit-graph.c:1908 msgid "Merging commit-graph" msgstr "" -#: commit-graph.c:1844 +#: commit-graph.c:2096 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "" -#: commit-graph.c:1855 +#: commit-graph.c:2107 msgid "too many commits to write graph" msgstr "" -#: commit-graph.c:1944 +#: commit-graph.c:2200 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" -#: commit-graph.c:1954 +#: commit-graph.c:2210 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" -#: commit-graph.c:1964 commit-graph.c:1979 +#: commit-graph.c:2220 commit-graph.c:2235 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" -#: commit-graph.c:1971 +#: commit-graph.c:2227 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "" -#: commit-graph.c:1989 +#: commit-graph.c:2245 msgid "Verifying commits in commit graph" msgstr "" -#: commit-graph.c:2003 +#: commit-graph.c:2259 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" -#: commit-graph.c:2010 +#: commit-graph.c:2266 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" -#: commit-graph.c:2020 +#: commit-graph.c:2276 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" -#: commit-graph.c:2029 +#: commit-graph.c:2285 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "" -#: commit-graph.c:2042 +#: commit-graph.c:2298 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" -#: commit-graph.c:2047 +#: commit-graph.c:2303 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" -#: commit-graph.c:2051 +#: commit-graph.c:2307 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" -#: commit-graph.c:2066 +#: commit-graph.c:2322 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "" -#: commit-graph.c:2072 +#: commit-graph.c:2328 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" +#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403 +#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457 +#, c-format +msgid "could not parse %s" +msgstr "" + +#: commit.c:54 +#, c-format +msgid "%s %s is not a commit!" +msgstr "" + +#: commit.c:194 +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:1168 +#, c-format +msgid "Commit %s has an untrusted GPG signature, allegedly by %s." +msgstr "" + +#: commit.c:1172 +#, c-format +msgid "Commit %s has a bad GPG signature allegedly by %s." +msgstr "" + +#: commit.c:1175 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "" + +#: commit.c:1178 +#, c-format +msgid "Commit %s has a good GPG signature by %s\n" +msgstr "" + +#: commit.c:1432 +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 "" -#: config.c:124 +#: config.c:125 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -2177,289 +2200,289 @@ msgid "" "This might be due to circular includes." msgstr "" -#: config.c:140 +#: config.c:141 #, c-format msgid "could not expand include path '%s'" msgstr "" -#: config.c:151 +#: config.c:152 msgid "relative config includes must come from files" msgstr "" -#: config.c:197 +#: config.c:198 msgid "relative config include conditionals must come from files" msgstr "" -#: config.c:376 +#: config.c:378 #, c-format msgid "key does not contain a section: %s" msgstr "" -#: config.c:382 +#: config.c:384 #, c-format msgid "key does not contain variable name: %s" msgstr "" -#: config.c:406 sequencer.c:2444 +#: config.c:408 sequencer.c:2456 #, c-format msgid "invalid key: %s" msgstr "" -#: config.c:412 +#: config.c:414 #, c-format msgid "invalid key (newline): %s" msgstr "" -#: config.c:448 config.c:460 +#: config.c:450 config.c:462 #, c-format msgid "bogus config parameter: %s" msgstr "" -#: config.c:495 +#: config.c:497 #, c-format msgid "bogus format in %s" msgstr "" -#: config.c:821 +#: config.c:836 #, c-format msgid "bad config line %d in blob %s" msgstr "" -#: config.c:825 +#: config.c:840 #, c-format msgid "bad config line %d in file %s" msgstr "" -#: config.c:829 +#: config.c:844 #, c-format msgid "bad config line %d in standard input" msgstr "" -#: config.c:833 +#: config.c:848 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "" -#: config.c:837 +#: config.c:852 #, c-format msgid "bad config line %d in command line %s" msgstr "" -#: config.c:841 +#: config.c:856 #, c-format msgid "bad config line %d in %s" msgstr "" -#: config.c:978 +#: config.c:993 msgid "out of range" msgstr "" -#: config.c:978 +#: config.c:993 msgid "invalid unit" msgstr "" -#: config.c:979 +#: config.c:994 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "" -#: config.c:998 +#: config.c:1013 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" -#: config.c:1001 +#: config.c:1016 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" -#: config.c:1004 +#: config.c:1019 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" -#: config.c:1007 +#: config.c:1022 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" -#: config.c:1010 +#: config.c:1025 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" -#: config.c:1013 +#: config.c:1028 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" -#: config.c:1108 +#: config.c:1123 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "" -#: config.c:1117 +#: config.c:1132 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "" -#: config.c:1208 +#: config.c:1223 #, c-format msgid "abbrev length out of range: %d" msgstr "" -#: config.c:1222 config.c:1233 +#: config.c:1237 config.c:1248 #, c-format msgid "bad zlib compression level %d" msgstr "" -#: config.c:1325 +#: config.c:1340 msgid "core.commentChar should only be one character" msgstr "" -#: config.c:1358 +#: config.c:1373 #, c-format msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1430 +#: config.c:1445 #, c-format msgid "malformed value for %s" msgstr "" -#: config.c:1456 +#: config.c:1471 #, c-format msgid "malformed value for %s: %s" msgstr "" -#: config.c:1457 +#: config.c:1472 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" -#: config.c:1518 builtin/pack-objects.c:3541 +#: config.c:1533 builtin/pack-objects.c:3542 #, c-format msgid "bad pack compression level %d" msgstr "" -#: config.c:1639 +#: config.c:1655 #, c-format msgid "unable to load config blob object '%s'" msgstr "" -#: config.c:1642 +#: config.c:1658 #, c-format msgid "reference '%s' does not point to a blob" msgstr "" -#: config.c:1659 +#: config.c:1675 #, c-format msgid "unable to resolve config blob '%s'" msgstr "" -#: config.c:1689 +#: config.c:1705 #, c-format msgid "failed to parse %s" msgstr "" -#: config.c:1743 +#: config.c:1759 msgid "unable to parse command-line config" msgstr "" -#: config.c:2097 +#: config.c:2113 msgid "unknown error occurred while reading the configuration files" msgstr "" -#: config.c:2267 +#: config.c:2283 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: config.c:2312 +#: config.c:2328 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" -#: config.c:2358 +#: config.c:2374 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:2360 +#: config.c:2376 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:2441 +#: config.c:2457 #, c-format msgid "invalid section name '%s'" msgstr "" -#: config.c:2473 +#: config.c:2489 #, c-format msgid "%s has multiple values" msgstr "" -#: config.c:2502 +#: config.c:2518 #, c-format msgid "failed to write new configuration file %s" msgstr "" -#: config.c:2754 config.c:3078 +#: config.c:2770 config.c:3094 #, c-format msgid "could not lock config file %s" msgstr "" -#: config.c:2765 +#: config.c:2781 #, c-format msgid "opening %s" msgstr "" -#: config.c:2800 builtin/config.c:344 +#: config.c:2816 builtin/config.c:344 #, c-format msgid "invalid pattern: %s" msgstr "" -#: config.c:2825 +#: config.c:2841 #, c-format msgid "invalid config file %s" msgstr "" -#: config.c:2838 config.c:3091 +#: config.c:2854 config.c:3107 #, c-format msgid "fstat on %s failed" msgstr "" -#: config.c:2849 +#: config.c:2865 #, c-format msgid "unable to mmap '%s'" msgstr "" -#: config.c:2858 config.c:3096 +#: config.c:2874 config.c:3112 #, c-format msgid "chmod on %s failed" msgstr "" -#: config.c:2943 config.c:3193 +#: config.c:2959 config.c:3209 #, c-format msgid "could not write config file %s" msgstr "" -#: config.c:2977 +#: config.c:2993 #, c-format msgid "could not set '%s' to '%s'" msgstr "" -#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 +#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 #, c-format msgid "could not unset '%s'" msgstr "" -#: config.c:3069 +#: config.c:3085 #, c-format msgid "invalid section name: %s" msgstr "" -#: config.c:3236 +#: config.c:3252 #, c-format msgid "missing value for '%s'" msgstr "" @@ -2615,19 +2638,19 @@ msgstr "" msgid "unable to fork" msgstr "" -#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43 +#: connected.c:107 builtin/fsck.c:209 builtin/prune.c:45 msgid "Checking connectivity" msgstr "" -#: connected.c:110 +#: connected.c:119 msgid "Could not run 'git rev-list'" msgstr "" -#: connected.c:130 +#: connected.c:139 msgid "failed write to rev-list" msgstr "" -#: connected.c:137 +#: connected.c:146 msgid "failed to close rev-list's stdin" msgstr "" @@ -2719,35 +2742,63 @@ msgstr "" msgid "external filter '%s' failed" msgstr "" -#: convert.c:839 +#: convert.c:840 msgid "unexpected filter type" msgstr "" -#: convert.c:850 +#: convert.c:851 msgid "path name too long for external filter" msgstr "" -#: convert.c:924 +#: convert.c:943 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "" -#: convert.c:1223 +#: convert.c:1243 msgid "true/false are no valid working-tree-encodings" msgstr "" -#: convert.c:1411 convert.c:1445 +#: convert.c:1431 convert.c:1465 #, c-format msgid "%s: clean filter '%s' failed" msgstr "" -#: convert.c:1489 +#: convert.c:1511 #, c-format msgid "%s: smudge filter %s failed" msgstr "" +#: credential.c:96 +#, c-format +msgid "skipping credential lookup for key: credential.%s" +msgstr "" + +#: credential.c:112 +msgid "refusing to work with credential missing host field" +msgstr "" + +#: credential.c:114 +msgid "refusing to work with credential missing protocol field" +msgstr "" + +#: credential.c:396 +#, c-format +msgid "url contains a newline in its %s component: %s" +msgstr "" + +#: credential.c:440 +#, c-format +msgid "url has no scheme: %s" +msgstr "" + +#: credential.c:513 +#, c-format +msgid "credential url cannot be parsed: %s" +msgstr "" + #: date.c:138 msgid "in the future" msgstr "" @@ -2840,15 +2891,6 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "" -#: diffcore-order.c:24 -#, c-format -msgid "failed to read orderfile '%s'" -msgstr "" - -#: diffcore-rename.c:543 -msgid "Performing inexact rename detection" -msgstr "" - #: diff-no-index.c:238 msgid "git diff --no-index [<options>] <path> <path>" msgstr "" @@ -2900,528 +2942,537 @@ msgid "" "%s" msgstr "" -#: diff.c:4202 +#: diff.c:4238 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:4547 +#: diff.c:4583 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: diff.c:4550 +#: diff.c:4586 msgid "-G, -S and --find-object are mutually exclusive" msgstr "" -#: diff.c:4628 +#: diff.c:4664 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:4676 +#: diff.c:4712 #, c-format msgid "invalid --stat value: %s" msgstr "" -#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 +#: diff.c:4717 diff.c:4722 diff.c:4727 diff.c:4732 diff.c:5245 #: parse-options.c:197 parse-options.c:201 #, c-format msgid "%s expects a numerical value" msgstr "" -#: diff.c:4713 +#: diff.c:4749 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:4798 +#: diff.c:4834 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "" -#: diff.c:4822 +#: diff.c:4858 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "" -#: diff.c:4836 +#: diff.c:4872 #, c-format msgid "unable to resolve '%s'" msgstr "" -#: diff.c:4886 diff.c:4892 +#: diff.c:4922 diff.c:4928 #, c-format msgid "%s expects <n>/<m> form" msgstr "" -#: diff.c:4904 +#: diff.c:4940 #, c-format msgid "%s expects a character, got '%s'" msgstr "" -#: diff.c:4925 +#: diff.c:4961 #, c-format msgid "bad --color-moved argument: %s" msgstr "" -#: diff.c:4944 +#: diff.c:4980 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "" -#: diff.c:4984 +#: diff.c:5020 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" -#: diff.c:5020 diff.c:5040 +#: diff.c:5056 diff.c:5076 #, c-format msgid "invalid argument to %s" msgstr "" -#: diff.c:5178 +#: diff.c:5214 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "" -#: diff.c:5234 +#: diff.c:5270 #, c-format msgid "bad --word-diff argument: %s" msgstr "" -#: diff.c:5257 +#: diff.c:5293 msgid "Diff output format options" msgstr "" -#: diff.c:5259 diff.c:5265 +#: diff.c:5295 diff.c:5301 msgid "generate patch" msgstr "" -#: diff.c:5262 builtin/log.c:173 +#: diff.c:5298 builtin/log.c:177 msgid "suppress diff output" msgstr "" -#: diff.c:5267 diff.c:5381 diff.c:5388 +#: diff.c:5303 diff.c:5417 diff.c:5424 msgid "<n>" msgstr "" -#: diff.c:5268 diff.c:5271 +#: diff.c:5304 diff.c:5307 msgid "generate diffs with <n> lines context" msgstr "" -#: diff.c:5273 +#: diff.c:5309 msgid "generate the diff in raw format" msgstr "" -#: diff.c:5276 +#: diff.c:5312 msgid "synonym for '-p --raw'" msgstr "" -#: diff.c:5280 +#: diff.c:5316 msgid "synonym for '-p --stat'" msgstr "" -#: diff.c:5284 +#: diff.c:5320 msgid "machine friendly --stat" msgstr "" -#: diff.c:5287 +#: diff.c:5323 msgid "output only the last line of --stat" msgstr "" -#: diff.c:5289 diff.c:5297 +#: diff.c:5325 diff.c:5333 msgid "<param1,param2>..." msgstr "" -#: diff.c:5290 +#: diff.c:5326 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" -#: diff.c:5294 +#: diff.c:5330 msgid "synonym for --dirstat=cumulative" msgstr "" -#: diff.c:5298 +#: diff.c:5334 msgid "synonym for --dirstat=files,param1,param2..." msgstr "" -#: diff.c:5302 +#: diff.c:5338 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" -#: diff.c:5305 +#: diff.c:5341 msgid "condensed summary such as creations, renames and mode changes" msgstr "" -#: diff.c:5308 +#: diff.c:5344 msgid "show only names of changed files" msgstr "" -#: diff.c:5311 +#: diff.c:5347 msgid "show only names and status of changed files" msgstr "" -#: diff.c:5313 +#: diff.c:5349 msgid "<width>[,<name-width>[,<count>]]" msgstr "" -#: diff.c:5314 +#: diff.c:5350 msgid "generate diffstat" msgstr "" -#: diff.c:5316 diff.c:5319 diff.c:5322 +#: diff.c:5352 diff.c:5355 diff.c:5358 msgid "<width>" msgstr "" -#: diff.c:5317 +#: diff.c:5353 msgid "generate diffstat with a given width" msgstr "" -#: diff.c:5320 +#: diff.c:5356 msgid "generate diffstat with a given name width" msgstr "" -#: diff.c:5323 +#: diff.c:5359 msgid "generate diffstat with a given graph width" msgstr "" -#: diff.c:5325 +#: diff.c:5361 msgid "<count>" msgstr "" -#: diff.c:5326 +#: diff.c:5362 msgid "generate diffstat with limited lines" msgstr "" -#: diff.c:5329 +#: diff.c:5365 msgid "generate compact summary in diffstat" msgstr "" -#: diff.c:5332 +#: diff.c:5368 msgid "output a binary diff that can be applied" msgstr "" -#: diff.c:5335 +#: diff.c:5371 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" -#: diff.c:5337 +#: diff.c:5373 msgid "show colored diff" msgstr "" -#: diff.c:5338 +#: diff.c:5374 msgid "<kind>" msgstr "" -#: diff.c:5339 +#: diff.c:5375 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" -#: diff.c:5342 +#: diff.c:5378 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" msgstr "" -#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457 +#: diff.c:5381 diff.c:5384 diff.c:5387 diff.c:5493 msgid "<prefix>" msgstr "" -#: diff.c:5346 +#: diff.c:5382 msgid "show the given source prefix instead of \"a/\"" msgstr "" -#: diff.c:5349 +#: diff.c:5385 msgid "show the given destination prefix instead of \"b/\"" msgstr "" -#: diff.c:5352 +#: diff.c:5388 msgid "prepend an additional prefix to every line of output" msgstr "" -#: diff.c:5355 +#: diff.c:5391 msgid "do not show any source or destination prefix" msgstr "" -#: diff.c:5358 +#: diff.c:5394 msgid "show context between diff hunks up to the specified number of lines" msgstr "" -#: diff.c:5362 diff.c:5367 diff.c:5372 +#: diff.c:5398 diff.c:5403 diff.c:5408 msgid "<char>" msgstr "" -#: diff.c:5363 +#: diff.c:5399 msgid "specify the character to indicate a new line instead of '+'" msgstr "" -#: diff.c:5368 +#: diff.c:5404 msgid "specify the character to indicate an old line instead of '-'" msgstr "" -#: diff.c:5373 +#: diff.c:5409 msgid "specify the character to indicate a context instead of ' '" msgstr "" -#: diff.c:5376 +#: diff.c:5412 msgid "Diff rename options" msgstr "" -#: diff.c:5377 +#: diff.c:5413 msgid "<n>[/<m>]" msgstr "" -#: diff.c:5378 +#: diff.c:5414 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" -#: diff.c:5382 +#: diff.c:5418 msgid "detect renames" msgstr "" -#: diff.c:5386 +#: diff.c:5422 msgid "omit the preimage for deletes" msgstr "" -#: diff.c:5389 +#: diff.c:5425 msgid "detect copies" msgstr "" -#: diff.c:5393 +#: diff.c:5429 msgid "use unmodified files as source to find copies" msgstr "" -#: diff.c:5395 +#: diff.c:5431 msgid "disable rename detection" msgstr "" -#: diff.c:5398 +#: diff.c:5434 msgid "use empty blobs as rename source" msgstr "" -#: diff.c:5400 +#: diff.c:5436 msgid "continue listing the history of a file beyond renames" msgstr "" -#: diff.c:5403 +#: diff.c:5439 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" -#: diff.c:5405 +#: diff.c:5441 msgid "Diff algorithm options" msgstr "" -#: diff.c:5407 +#: diff.c:5443 msgid "produce the smallest possible diff" msgstr "" -#: diff.c:5410 +#: diff.c:5446 msgid "ignore whitespace when comparing lines" msgstr "" -#: diff.c:5413 +#: diff.c:5449 msgid "ignore changes in amount of whitespace" msgstr "" -#: diff.c:5416 +#: diff.c:5452 msgid "ignore changes in whitespace at EOL" msgstr "" -#: diff.c:5419 +#: diff.c:5455 msgid "ignore carrier-return at the end of line" msgstr "" -#: diff.c:5422 +#: diff.c:5458 msgid "ignore changes whose lines are all blank" msgstr "" -#: diff.c:5425 +#: diff.c:5461 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" -#: diff.c:5428 +#: diff.c:5464 msgid "generate diff using the \"patience diff\" algorithm" msgstr "" -#: diff.c:5432 +#: diff.c:5468 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" -#: diff.c:5434 +#: diff.c:5470 msgid "<algorithm>" msgstr "" -#: diff.c:5435 +#: diff.c:5471 msgid "choose a diff algorithm" msgstr "" -#: diff.c:5437 +#: diff.c:5473 msgid "<text>" msgstr "" -#: diff.c:5438 +#: diff.c:5474 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "" -#: diff.c:5440 diff.c:5449 diff.c:5452 +#: diff.c:5476 diff.c:5485 diff.c:5488 msgid "<mode>" msgstr "" -#: diff.c:5441 +#: diff.c:5477 msgid "show word diff, using <mode> to delimit changed words" msgstr "" -#: diff.c:5443 diff.c:5446 diff.c:5491 +#: diff.c:5479 diff.c:5482 diff.c:5527 msgid "<regex>" msgstr "" -#: diff.c:5444 +#: diff.c:5480 msgid "use <regex> to decide what a word is" msgstr "" -#: diff.c:5447 +#: diff.c:5483 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "" -#: diff.c:5450 +#: diff.c:5486 msgid "moved lines of code are colored differently" msgstr "" -#: diff.c:5453 +#: diff.c:5489 msgid "how white spaces are ignored in --color-moved" msgstr "" -#: diff.c:5456 +#: diff.c:5492 msgid "Other diff options" msgstr "" -#: diff.c:5458 +#: diff.c:5494 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" -#: diff.c:5462 +#: diff.c:5498 msgid "treat all files as text" msgstr "" -#: diff.c:5464 +#: diff.c:5500 msgid "swap two inputs, reverse the diff" msgstr "" -#: diff.c:5466 +#: diff.c:5502 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "" -#: diff.c:5468 +#: diff.c:5504 msgid "disable all output of the program" msgstr "" -#: diff.c:5470 +#: diff.c:5506 msgid "allow an external diff helper to be executed" msgstr "" -#: diff.c:5472 +#: diff.c:5508 msgid "run external text conversion filters when comparing binary files" msgstr "" -#: diff.c:5474 +#: diff.c:5510 msgid "<when>" msgstr "" -#: diff.c:5475 +#: diff.c:5511 msgid "ignore changes to submodules in the diff generation" msgstr "" -#: diff.c:5478 +#: diff.c:5514 msgid "<format>" msgstr "" -#: diff.c:5479 +#: diff.c:5515 msgid "specify how differences in submodules are shown" msgstr "" -#: diff.c:5483 +#: diff.c:5519 msgid "hide 'git add -N' entries from the index" msgstr "" -#: diff.c:5486 +#: diff.c:5522 msgid "treat 'git add -N' entries as real in the index" msgstr "" -#: diff.c:5488 +#: diff.c:5524 msgid "<string>" msgstr "" -#: diff.c:5489 +#: diff.c:5525 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "" -#: diff.c:5492 +#: diff.c:5528 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "" -#: diff.c:5495 +#: diff.c:5531 msgid "show all changes in the changeset with -S or -G" msgstr "" -#: diff.c:5498 +#: diff.c:5534 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" -#: diff.c:5501 +#: diff.c:5537 msgid "control the order in which files appear in the output" msgstr "" -#: diff.c:5502 +#: diff.c:5538 msgid "<object-id>" msgstr "" -#: diff.c:5503 +#: diff.c:5539 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "" -#: diff.c:5505 +#: diff.c:5541 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "" -#: diff.c:5506 +#: diff.c:5542 msgid "select files by diff type" msgstr "" -#: diff.c:5508 +#: diff.c:5544 msgid "<file>" msgstr "" -#: diff.c:5509 +#: diff.c:5545 msgid "Output to a specific file" msgstr "" -#: diff.c:6164 +#: diff.c:6200 msgid "inexact rename detection was skipped due to too many files." msgstr "" -#: diff.c:6167 +#: diff.c:6203 msgid "only found copies from modified paths due to too many files." msgstr "" -#: diff.c:6170 +#: diff.c:6206 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "" + +#: diffcore-rename.c:592 +msgid "Performing inexact rename detection" +msgstr "" + #: dir.c:555 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" @@ -3451,35 +3502,35 @@ msgstr "" msgid "cannot use %s as an exclude file" msgstr "" -#: dir.c:2144 +#: dir.c:2275 #, c-format msgid "could not open directory '%s'" msgstr "" -#: dir.c:2479 +#: dir.c:2575 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:2603 +#: dir.c:2699 msgid "untracked cache is disabled on this system or location" msgstr "" -#: dir.c:3407 +#: dir.c:3481 #, c-format msgid "index file corrupt in repo %s" msgstr "" -#: dir.c:3452 dir.c:3457 +#: dir.c:3526 dir.c:3531 #, c-format msgid "could not create directories for %s" msgstr "" -#: dir.c:3486 +#: dir.c:3560 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "" -#: editor.c:73 +#: editor.c:74 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "" @@ -3488,17 +3539,17 @@ msgstr "" msgid "Filtering content" msgstr "" -#: entry.c:476 +#: entry.c:479 #, c-format msgid "could not stat file '%s'" msgstr "" -#: environment.c:149 +#: environment.c:150 #, c-format msgid "bad git namespace path \"%s\"" msgstr "" -#: environment.c:331 +#: environment.c:337 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "" @@ -3508,244 +3559,244 @@ msgstr "" msgid "too many args to run %s" msgstr "" -#: fetch-pack.c:150 +#: fetch-pack.c:151 msgid "git fetch-pack: expected shallow list" msgstr "" -#: fetch-pack.c:153 +#: fetch-pack.c:154 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "" -#: fetch-pack.c:164 +#: fetch-pack.c:165 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "" -#: fetch-pack.c:184 +#: fetch-pack.c:185 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "" -#: fetch-pack.c:195 +#: fetch-pack.c:196 msgid "unable to write to remote" msgstr "" -#: fetch-pack.c:257 +#: fetch-pack.c:258 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "" -#: fetch-pack.c:356 fetch-pack.c:1340 +#: fetch-pack.c:357 fetch-pack.c:1364 #, c-format msgid "invalid shallow line: %s" msgstr "" -#: fetch-pack.c:362 fetch-pack.c:1346 +#: fetch-pack.c:363 fetch-pack.c:1370 #, c-format msgid "invalid unshallow line: %s" msgstr "" -#: fetch-pack.c:364 fetch-pack.c:1348 +#: fetch-pack.c:365 fetch-pack.c:1372 #, c-format msgid "object not found: %s" msgstr "" -#: fetch-pack.c:367 fetch-pack.c:1351 +#: fetch-pack.c:368 fetch-pack.c:1375 #, c-format msgid "error in object: %s" msgstr "" -#: fetch-pack.c:369 fetch-pack.c:1353 +#: fetch-pack.c:370 fetch-pack.c:1377 #, c-format msgid "no shallow found: %s" msgstr "" -#: fetch-pack.c:372 fetch-pack.c:1357 +#: fetch-pack.c:373 fetch-pack.c:1381 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "" -#: fetch-pack.c:414 +#: fetch-pack.c:415 #, c-format msgid "got %s %d %s" msgstr "" -#: fetch-pack.c:431 +#: fetch-pack.c:432 #, c-format msgid "invalid commit %s" msgstr "" -#: fetch-pack.c:462 +#: fetch-pack.c:463 msgid "giving up" msgstr "" -#: fetch-pack.c:475 progress.c:323 +#: fetch-pack.c:476 progress.c:336 msgid "done" msgstr "" -#: fetch-pack.c:487 +#: fetch-pack.c:488 #, c-format msgid "got %s (%d) %s" msgstr "" -#: fetch-pack.c:533 +#: fetch-pack.c:534 #, c-format msgid "Marking %s as complete" msgstr "" -#: fetch-pack.c:754 +#: fetch-pack.c:755 #, c-format msgid "already have %s (%s)" msgstr "" -#: fetch-pack.c:818 +#: fetch-pack.c:819 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" -#: fetch-pack.c:826 +#: fetch-pack.c:827 msgid "protocol error: bad pack header" msgstr "" -#: fetch-pack.c:900 +#: fetch-pack.c:901 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "" -#: fetch-pack.c:916 +#: fetch-pack.c:917 #, c-format msgid "%s failed" msgstr "" -#: fetch-pack.c:918 +#: fetch-pack.c:919 msgid "error in sideband demultiplexer" msgstr "" -#: fetch-pack.c:965 +#: fetch-pack.c:966 #, c-format msgid "Server version is %.*s" msgstr "" -#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985 -#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001 -#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 -#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039 +#: fetch-pack.c:971 fetch-pack.c:977 fetch-pack.c:980 fetch-pack.c:986 +#: fetch-pack.c:990 fetch-pack.c:994 fetch-pack.c:998 fetch-pack.c:1002 +#: fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 fetch-pack.c:1018 +#: fetch-pack.c:1024 fetch-pack.c:1030 fetch-pack.c:1035 fetch-pack.c:1040 #, c-format msgid "Server supports %s" msgstr "" -#: fetch-pack.c:972 +#: fetch-pack.c:973 msgid "Server does not support shallow clients" msgstr "" -#: fetch-pack.c:1032 +#: fetch-pack.c:1033 msgid "Server does not support --shallow-since" msgstr "" -#: fetch-pack.c:1037 +#: fetch-pack.c:1038 msgid "Server does not support --shallow-exclude" msgstr "" -#: fetch-pack.c:1041 +#: fetch-pack.c:1042 msgid "Server does not support --deepen" msgstr "" -#: fetch-pack.c:1058 +#: fetch-pack.c:1059 msgid "no common commits" msgstr "" -#: fetch-pack.c:1070 fetch-pack.c:1536 +#: fetch-pack.c:1071 fetch-pack.c:1563 msgid "git fetch-pack: fetch failed." msgstr "" -#: fetch-pack.c:1209 +#: fetch-pack.c:1211 msgid "Server does not support shallow requests" msgstr "" -#: fetch-pack.c:1216 +#: fetch-pack.c:1218 msgid "Server supports filter" msgstr "" -#: fetch-pack.c:1239 +#: fetch-pack.c:1242 msgid "unable to write request to remote" msgstr "" -#: fetch-pack.c:1257 +#: fetch-pack.c:1260 #, c-format msgid "error reading section header '%s'" msgstr "" -#: fetch-pack.c:1263 +#: fetch-pack.c:1266 #, c-format msgid "expected '%s', received '%s'" msgstr "" -#: fetch-pack.c:1303 +#: fetch-pack.c:1327 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "" -#: fetch-pack.c:1308 +#: fetch-pack.c:1332 #, c-format msgid "error processing acks: %d" msgstr "" -#: fetch-pack.c:1318 +#: fetch-pack.c:1342 msgid "expected packfile to be sent after 'ready'" msgstr "" -#: fetch-pack.c:1320 +#: fetch-pack.c:1344 msgid "expected no other sections to be sent after no 'ready'" msgstr "" -#: fetch-pack.c:1362 +#: fetch-pack.c:1386 #, c-format msgid "error processing shallow info: %d" msgstr "" -#: fetch-pack.c:1409 +#: fetch-pack.c:1433 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "" -#: fetch-pack.c:1414 +#: fetch-pack.c:1438 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "" -#: fetch-pack.c:1419 +#: fetch-pack.c:1443 #, c-format msgid "error processing wanted refs: %d" msgstr "" -#: fetch-pack.c:1762 +#: fetch-pack.c:1789 msgid "no matching remote head" msgstr "" -#: fetch-pack.c:1785 builtin/clone.c:689 +#: fetch-pack.c:1812 builtin/clone.c:692 msgid "remote did not send all necessary objects" msgstr "" -#: fetch-pack.c:1812 +#: fetch-pack.c:1839 #, c-format msgid "no such remote ref %s" msgstr "" -#: fetch-pack.c:1815 +#: fetch-pack.c:1842 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" -#: gpg-interface.c:408 -msgid "gpg failed to sign the data" -msgstr "" - -#: gpg-interface.c:434 +#: gpg-interface.c:272 msgid "could not create temporary file" msgstr "" -#: gpg-interface.c:437 +#: gpg-interface.c:275 #, c-format msgid "failed writing detached signature to '%s'" msgstr "" +#: gpg-interface.c:457 +msgid "gpg failed to sign the data" +msgstr "" + #: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" @@ -3762,7 +3813,7 @@ msgstr "" msgid "'%s': unable to read %s" msgstr "" -#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" @@ -3838,7 +3889,7 @@ msgstr "" msgid "These are common Git commands used in various situations:" msgstr "" -#: help.c:363 git.c:98 +#: help.c:363 git.c:99 #, c-format msgid "unsupported command listing type '%s'" msgstr "" @@ -3847,50 +3898,50 @@ msgstr "" msgid "The common Git guides are:" msgstr "" -#: help.c:512 +#: help.c:427 msgid "See 'git help <command>' to read about a specific subcommand" msgstr "" -#: help.c:517 +#: help.c:432 msgid "External commands" msgstr "" -#: help.c:532 +#: help.c:447 msgid "Command aliases" msgstr "" -#: help.c:596 +#: help.c:511 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" "able to execute it. Maybe git-%s is broken?" msgstr "" -#: help.c:655 +#: help.c:570 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: help.c:677 +#: help.c:592 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" -#: help.c:682 +#: help.c:597 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "" -#: help.c:687 +#: help.c:602 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" -#: help.c:695 +#: help.c:610 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" -#: help.c:699 +#: help.c:614 msgid "" "\n" "The most similar command is" @@ -3900,16 +3951,16 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: help.c:714 +#: help.c:653 msgid "git version [<options>]" msgstr "" -#: help.c:783 +#: help.c:708 #, c-format msgid "%s: %s - %s" msgstr "" -#: help.c:787 +#: help.c:712 msgid "" "\n" "Did you mean this?" @@ -3962,36 +4013,11 @@ msgstr "" msgid "name consists only of disallowed characters: %s" msgstr "" -#: ident.c:436 builtin/commit.c:635 +#: ident.c:436 builtin/commit.c:634 #, c-format msgid "invalid date format: %s" msgstr "" -#: list-objects.c:127 -#, c-format -msgid "entry '%s' in tree %s has tree mode, but is not a tree" -msgstr "" - -#: list-objects.c:140 -#, c-format -msgid "entry '%s' in tree %s has blob mode, but is not a blob" -msgstr "" - -#: list-objects.c:375 -#, c-format -msgid "unable to load root tree for commit %s" -msgstr "" - -#: list-objects-filter.c:492 -#, c-format -msgid "unable to access sparse blob in '%s'" -msgstr "" - -#: list-objects-filter.c:495 -#, c-format -msgid "unable to parse sparse filter data in %s" -msgstr "" - #: list-objects-filter-options.c:58 msgid "expected 'tree:<depth>'" msgstr "" @@ -4018,7 +4044,32 @@ msgstr "" msgid "multiple filter-specs cannot be combined" msgstr "" -#: lockfile.c:151 +#: list-objects-filter.c:492 +#, c-format +msgid "unable to access sparse blob in '%s'" +msgstr "" + +#: list-objects-filter.c:495 +#, c-format +msgid "unable to parse sparse filter data in %s" +msgstr "" + +#: list-objects.c:127 +#, c-format +msgid "entry '%s' in tree %s has tree mode, but is not a tree" +msgstr "" + +#: list-objects.c:140 +#, c-format +msgid "entry '%s' in tree %s has blob mode, but is not a blob" +msgstr "" + +#: list-objects.c:375 +#, c-format +msgid "unable to load root tree for commit %s" +msgstr "" + +#: lockfile.c:152 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -4030,19 +4081,13 @@ msgid "" "remove the file manually to continue." msgstr "" -#: lockfile.c:159 +#: lockfile.c:160 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "" -#: merge.c:41 -msgid "failed to read the cache" -msgstr "" - -#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913 -#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810 -#: builtin/stash.c:265 -msgid "unable to write new index file" +#: ls-refs.c:109 +msgid "expected flush after ls-refs arguments" msgstr "" #: merge-recursive.c:356 @@ -4213,7 +4258,7 @@ msgstr "" msgid "renamed" msgstr "" -#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117 +#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "" @@ -4249,12 +4294,12 @@ msgstr "" msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1793 +#: merge-recursive.c:1805 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:2056 +#: merge-recursive.c:2068 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4262,175 +4307,185 @@ msgid "" "getting a majority of the files." msgstr "" -#: merge-recursive.c:2088 +#: merge-recursive.c:2100 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " "implicit directory rename(s) putting the following path(s) there: %s." msgstr "" -#: merge-recursive.c:2098 +#: merge-recursive.c:2110 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " "implicit directory renames tried to put these paths there: %s" msgstr "" -#: merge-recursive.c:2190 +#: merge-recursive.c:2202 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" ">%s in %s" msgstr "" -#: merge-recursive.c:2435 +#: merge-recursive.c:2447 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "" -#: merge-recursive.c:2961 +#: merge-recursive.c:2973 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:2964 +#: merge-recursive.c:2976 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:3028 +#: merge-recursive.c:3040 msgid "modify" msgstr "" -#: merge-recursive.c:3028 +#: merge-recursive.c:3040 msgid "modified" msgstr "" -#: merge-recursive.c:3040 +#: merge-recursive.c:3052 msgid "content" msgstr "" -#: merge-recursive.c:3044 +#: merge-recursive.c:3056 msgid "add/add" msgstr "" -#: merge-recursive.c:3067 +#: merge-recursive.c:3079 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:3089 git-submodule.sh:1003 +#: merge-recursive.c:3101 git-submodule.sh:985 msgid "submodule" msgstr "" -#: merge-recursive.c:3090 +#: merge-recursive.c:3102 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:3120 +#: merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:3203 +#: merge-recursive.c:3215 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " "moving it to %s." msgstr "" -#: merge-recursive.c:3206 +#: merge-recursive.c:3218 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " "in %s, suggesting it should perhaps be moved to %s." msgstr "" -#: merge-recursive.c:3210 +#: merge-recursive.c:3222 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " "%s; moving it to %s." msgstr "" -#: merge-recursive.c:3213 +#: merge-recursive.c:3225 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " "was renamed in %s, suggesting it should perhaps be moved to %s." msgstr "" -#: merge-recursive.c:3327 +#: merge-recursive.c:3339 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:3350 +#: merge-recursive.c:3362 msgid "file/directory" msgstr "" -#: merge-recursive.c:3355 +#: merge-recursive.c:3367 msgid "directory/file" msgstr "" -#: merge-recursive.c:3362 +#: merge-recursive.c:3374 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:3371 +#: merge-recursive.c:3383 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:3380 +#: merge-recursive.c:3392 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "" -#: merge-recursive.c:3424 +#: merge-recursive.c:3436 msgid "Already up to date!" msgstr "" -#: merge-recursive.c:3433 +#: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:3537 +#: merge-recursive.c:3549 msgid "Merging:" msgstr "" -#: merge-recursive.c:3550 +#: merge-recursive.c:3562 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:3600 +#: merge-recursive.c:3612 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:3659 +#: merge-recursive.c:3671 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" " %s" msgstr "" -#: merge-recursive.c:3756 +#: merge-recursive.c:3768 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877 +#: merge-recursive.c:3786 builtin/merge.c:705 builtin/merge.c:885 msgid "Unable to write index." msgstr "" +#: merge.c:41 +msgid "failed to read the cache" +msgstr "" + +#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912 +#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816 +#: builtin/stash.c:265 +msgid "unable to write new index file" +msgstr "" + #: midx.c:68 #, c-format msgid "multi-pack-index file %s is too small" @@ -4480,107 +4535,115 @@ msgstr "" msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" -#: midx.c:210 +#: midx.c:208 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "" -#: midx.c:260 +#: midx.c:258 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" -#: midx.c:288 +#: midx.c:286 msgid "error preparing packfile from multi-pack-index" msgstr "" -#: midx.c:472 +#: midx.c:470 #, c-format msgid "failed to add packfile '%s'" msgstr "" -#: midx.c:478 +#: midx.c:476 #, c-format msgid "failed to open pack-index '%s'" msgstr "" -#: midx.c:538 +#: midx.c:536 #, c-format msgid "failed to locate object %d in packfile" msgstr "" -#: midx.c:842 +#: midx.c:840 msgid "Adding packfiles to multi-pack-index" msgstr "" -#: midx.c:875 +#: midx.c:873 #, c-format msgid "did not see pack-file %s to drop" msgstr "" -#: midx.c:973 +#: midx.c:925 +msgid "no pack files to index." +msgstr "" + +#: midx.c:977 msgid "Writing chunks to multi-pack-index" msgstr "" -#: midx.c:1052 +#: midx.c:1056 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "" -#: midx.c:1108 +#: midx.c:1112 msgid "Looking for referenced packfiles" msgstr "" -#: midx.c:1123 +#: midx.c:1127 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" -#: midx.c:1128 +#: midx.c:1132 +msgid "the midx contains no oid" +msgstr "" + +#: midx.c:1141 msgid "Verifying OID order in multi-pack-index" msgstr "" -#: midx.c:1137 +#: midx.c:1150 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "" -#: midx.c:1157 +#: midx.c:1170 msgid "Sorting objects by packfile" msgstr "" -#: midx.c:1164 +#: midx.c:1177 msgid "Verifying object offsets" msgstr "" -#: midx.c:1180 +#: midx.c:1193 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "" -#: midx.c:1186 +#: midx.c:1199 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "" -#: midx.c:1195 +#: midx.c:1208 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "" -#: midx.c:1220 +#: midx.c:1233 msgid "Counting referenced objects" msgstr "" -#: midx.c:1230 +#: midx.c:1243 msgid "Finding and deleting unreferenced packfiles" msgstr "" -#: midx.c:1388 +#: midx.c:1433 msgid "could not start pack-objects" msgstr "" -#: midx.c:1407 +#: midx.c:1452 msgid "could not finish pack-objects" msgstr "" @@ -4660,6 +4723,11 @@ msgstr "" msgid "hash mismatch %s" msgstr "" +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2135 +#, c-format +msgid "unable to get size of %s" +msgstr "" + #: packfile.c:629 msgid "offset before end of packfile (broken .idx?)" msgstr "" @@ -4674,9 +4742,24 @@ msgstr "" msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" -#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134 +#: parse-options-cb.c:20 parse-options-cb.c:24 #, c-format -msgid "unable to get size of %s" +msgid "option `%s' expects a numerical value" +msgstr "" + +#: parse-options-cb.c:41 +#, c-format +msgid "malformed expiration date '%s'" +msgstr "" + +#: parse-options-cb.c:54 +#, c-format +msgid "option `%s' expects \"always\", \"auto\", or \"never\"" +msgstr "" + +#: parse-options-cb.c:130 parse-options-cb.c:147 +#, c-format +msgid "malformed object name '%s'" msgstr "" #: parse-options.c:38 @@ -4719,26 +4802,31 @@ msgstr "" msgid "did you mean `--%s` (with two dashes)?" msgstr "" -#: parse-options.c:857 +#: parse-options.c:663 parse-options.c:963 +#, c-format +msgid "alias of --%s" +msgstr "" + +#: parse-options.c:854 #, c-format msgid "unknown option `%s'" msgstr "" -#: parse-options.c:859 +#: parse-options.c:856 #, c-format msgid "unknown switch `%c'" msgstr "" -#: parse-options.c:861 +#: parse-options.c:858 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "" -#: parse-options.c:885 +#: parse-options.c:882 msgid "..." msgstr "" -#: parse-options.c:904 +#: parse-options.c:901 #, c-format msgid "usage: %s" msgstr "" @@ -4746,45 +4834,20 @@ msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:910 +#: parse-options.c:907 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:913 +#: parse-options.c:910 #, c-format msgid " %s" msgstr "" -#: parse-options.c:952 +#: parse-options.c:949 msgid "-NUM" msgstr "" -#: parse-options.c:966 -#, c-format -msgid "alias of --%s" -msgstr "" - -#: parse-options-cb.c:20 parse-options-cb.c:24 -#, c-format -msgid "option `%s' expects a numerical value" -msgstr "" - -#: parse-options-cb.c:41 -#, c-format -msgid "malformed expiration date '%s'" -msgstr "" - -#: parse-options-cb.c:54 -#, c-format -msgid "option `%s' expects \"always\", \"auto\", or \"never\"" -msgstr "" - -#: parse-options-cb.c:130 parse-options-cb.c:147 -#, c-format -msgid "malformed object name '%s'" -msgstr "" - #: path.c:915 #, c-format msgid "Could not make %s writable by group" @@ -4841,27 +4904,27 @@ msgstr "" msgid "%s: 'literal' and 'glob' are incompatible" msgstr "" -#: pathspec.c:442 +#: pathspec.c:445 #, c-format msgid "%s: '%s' is outside repository at '%s'" msgstr "" -#: pathspec.c:517 +#: pathspec.c:521 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "" -#: pathspec.c:527 +#: pathspec.c:531 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" -#: pathspec.c:594 +#: pathspec.c:598 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "" -#: pathspec.c:639 +#: pathspec.c:643 #, c-format msgid "line is badly quoted: %s" msgstr "" @@ -4926,7 +4989,7 @@ msgstr "" msgid "unable to create threaded lstat: %s" msgstr "" -#: pretty.c:981 +#: pretty.c:982 msgid "unable to parse --pretty format" msgstr "" @@ -4939,29 +5002,40 @@ msgstr "" msgid "promisor remote name cannot begin with '/': %s" msgstr "" -#: range-diff.c:75 -msgid "could not start `log`" +#: prune-packed.c:35 +msgid "Removing duplicate objects" msgstr "" #: range-diff.c:77 +msgid "could not start `log`" +msgstr "" + +#: range-diff.c:79 msgid "could not read `log` output" msgstr "" -#: range-diff.c:96 sequencer.c:5020 +#: range-diff.c:98 sequencer.c:5143 #, c-format msgid "could not parse commit '%s'" msgstr "" -#: range-diff.c:122 +#: range-diff.c:112 +#, c-format +msgid "" +"could not parse first line of `log` output: did not start with 'commit ': " +"'%s'" +msgstr "" + +#: range-diff.c:137 #, c-format msgid "could not parse git header '%.*s'" msgstr "" -#: range-diff.c:285 +#: range-diff.c:301 msgid "failed to generate diff" msgstr "" -#: range-diff.c:518 range-diff.c:520 +#: range-diff.c:534 range-diff.c:536 #, c-format msgid "could not parse log for '%s'" msgstr "" @@ -5073,9 +5147,9 @@ msgstr "" #: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 #: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 -#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967 -#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485 -#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290 +#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961 +#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 +#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290 #: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "" @@ -5130,12 +5204,12 @@ msgstr "" msgid "broken index, expect %s in %s, got %s" msgstr "" -#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122 +#: read-cache.c:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130 #, c-format msgid "could not close '%s'" msgstr "" -#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959 +#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066 #, c-format msgid "could not stat '%s'" msgstr "" @@ -5230,14 +5304,14 @@ msgid "" "\n" msgstr "" -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444 -#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3463 +#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:347 builtin/rebase.c:258 #, c-format msgid "could not write '%s'" msgstr "" -#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210 -#: builtin/rebase.c:234 +#: rebase-interactive.c:116 builtin/rebase.c:190 builtin/rebase.c:216 +#: builtin/rebase.c:240 #, c-format msgid "could not write '%s'." msgstr "" @@ -5260,132 +5334,14 @@ msgid "" "\n" msgstr "" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262 -#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221 -#: builtin/rebase.c:246 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274 +#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227 +#: builtin/rebase.c:252 #, c-format msgid "could not read '%s'." msgstr "" -#: refs.c:262 -#, c-format -msgid "%s does not point to a valid object!" -msgstr "" - -#: refs.c:667 -#, c-format -msgid "ignoring dangling symref %s" -msgstr "" - -#: refs.c:669 ref-filter.c:2098 -#, c-format -msgid "ignoring broken ref %s" -msgstr "" - -#: refs.c:804 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "" - -#: refs.c:814 refs.c:865 -#, c-format -msgid "could not read ref '%s'" -msgstr "" - -#: refs.c:820 -#, c-format -msgid "ref '%s' already exists" -msgstr "" - -#: refs.c:825 -#, c-format -msgid "unexpected object ID when writing '%s'" -msgstr "" - -#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905 -#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157 -#: wrapper.c:620 -#, c-format -msgid "could not write to '%s'" -msgstr "" - -#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719 -#: builtin/rebase.c:1029 -#, c-format -msgid "could not open '%s' for writing" -msgstr "" - -#: refs.c:867 -#, c-format -msgid "unexpected object ID when deleting '%s'" -msgstr "" - -#: refs.c:998 -#, c-format -msgid "log for ref %s has gap after %s" -msgstr "" - -#: refs.c:1004 -#, c-format -msgid "log for ref %s unexpectedly ended on %s" -msgstr "" - -#: refs.c:1063 -#, c-format -msgid "log for %s is empty" -msgstr "" - -#: refs.c:1155 -#, c-format -msgid "refusing to update ref with bad name '%s'" -msgstr "" - -#: refs.c:1231 -#, c-format -msgid "update_ref failed for ref '%s': %s" -msgstr "" - -#: refs.c:2023 -#, c-format -msgid "multiple updates for ref '%s' not allowed" -msgstr "" - -#: refs.c:2055 -msgid "ref updates forbidden inside quarantine environment" -msgstr "" - -#: refs.c:2151 refs.c:2181 -#, c-format -msgid "'%s' exists; cannot create '%s'" -msgstr "" - -#: refs.c:2157 refs.c:2192 -#, c-format -msgid "cannot process '%s' and '%s' at the same time" -msgstr "" - -#: refs/files-backend.c:1233 -#, c-format -msgid "could not remove reference %s" -msgstr "" - -#: refs/files-backend.c:1247 refs/packed-backend.c:1541 -#: refs/packed-backend.c:1551 -#, c-format -msgid "could not delete reference %s: %s" -msgstr "" - -#: refs/files-backend.c:1250 refs/packed-backend.c:1554 -#, c-format -msgid "could not delete references: %s" -msgstr "" - -#: refspec.c:137 -#, c-format -msgid "invalid refspec '%s'" -msgstr "" - -#: ref-filter.c:42 wt-status.c:1938 +#: ref-filter.c:42 wt-status.c:1936 msgid "gone" msgstr "" @@ -5570,114 +5526,232 @@ msgstr "" msgid "malformed format string %s" msgstr "" -#: ref-filter.c:1488 +#: ref-filter.c:1486 #, c-format msgid "no branch, rebasing %s" msgstr "" -#: ref-filter.c:1491 +#: ref-filter.c:1489 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "" -#: ref-filter.c:1494 +#: ref-filter.c:1492 #, c-format msgid "no branch, bisect started on %s" msgstr "" -#: ref-filter.c:1504 +#: ref-filter.c:1502 msgid "no branch" msgstr "" -#: ref-filter.c:1540 ref-filter.c:1749 +#: ref-filter.c:1538 ref-filter.c:1747 #, c-format msgid "missing object %s for %s" msgstr "" -#: ref-filter.c:1550 +#: ref-filter.c:1548 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "" -#: ref-filter.c:2004 +#: ref-filter.c:2001 #, c-format msgid "malformed object at '%s'" msgstr "" -#: ref-filter.c:2093 +#: ref-filter.c:2090 #, c-format msgid "ignoring ref with broken name %s" msgstr "" -#: ref-filter.c:2389 +#: ref-filter.c:2095 refs.c:625 +#, c-format +msgid "ignoring broken ref %s" +msgstr "" + +#: ref-filter.c:2395 #, c-format msgid "format: %%(end) atom missing" msgstr "" -#: ref-filter.c:2489 +#: ref-filter.c:2495 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "" -#: ref-filter.c:2492 +#: ref-filter.c:2498 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "" -#: ref-filter.c:2502 +#: ref-filter.c:2508 #, c-format msgid "malformed object name %s" msgstr "" -#: ref-filter.c:2507 +#: ref-filter.c:2513 #, c-format msgid "option `%s' must point to a commit" msgstr "" -#: remote.c:366 +#: refs.c:262 +#, c-format +msgid "%s does not point to a valid object!" +msgstr "" + +#: refs.c:623 +#, c-format +msgid "ignoring dangling symref %s" +msgstr "" + +#: refs.c:760 +#, c-format +msgid "could not open '%s' for writing: %s" +msgstr "" + +#: refs.c:770 refs.c:821 +#, c-format +msgid "could not read ref '%s'" +msgstr "" + +#: refs.c:776 +#, c-format +msgid "ref '%s' already exists" +msgstr "" + +#: refs.c:781 +#, c-format +msgid "unexpected object ID when writing '%s'" +msgstr "" + +#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925 +#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173 +#: wrapper.c:620 +#, c-format +msgid "could not write to '%s'" +msgstr "" + +#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719 +#: builtin/rebase.c:852 +#, c-format +msgid "could not open '%s' for writing" +msgstr "" + +#: refs.c:823 +#, c-format +msgid "unexpected object ID when deleting '%s'" +msgstr "" + +#: refs.c:954 +#, c-format +msgid "log for ref %s has gap after %s" +msgstr "" + +#: refs.c:960 +#, c-format +msgid "log for ref %s unexpectedly ended on %s" +msgstr "" + +#: refs.c:1019 +#, c-format +msgid "log for %s is empty" +msgstr "" + +#: refs.c:1111 +#, c-format +msgid "refusing to update ref with bad name '%s'" +msgstr "" + +#: refs.c:1187 +#, c-format +msgid "update_ref failed for ref '%s': %s" +msgstr "" + +#: refs.c:1979 +#, c-format +msgid "multiple updates for ref '%s' not allowed" +msgstr "" + +#: refs.c:2011 +msgid "ref updates forbidden inside quarantine environment" +msgstr "" + +#: refs.c:2107 refs.c:2137 +#, c-format +msgid "'%s' exists; cannot create '%s'" +msgstr "" + +#: refs.c:2113 refs.c:2148 +#, c-format +msgid "cannot process '%s' and '%s' at the same time" +msgstr "" + +#: refs/files-backend.c:1233 +#, c-format +msgid "could not remove reference %s" +msgstr "" + +#: refs/files-backend.c:1247 refs/packed-backend.c:1541 +#: refs/packed-backend.c:1551 +#, c-format +msgid "could not delete reference %s: %s" +msgstr "" + +#: refs/files-backend.c:1250 refs/packed-backend.c:1554 +#, c-format +msgid "could not delete references: %s" +msgstr "" + +#: refspec.c:137 +#, c-format +msgid "invalid refspec '%s'" +msgstr "" + +#: remote.c:355 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "" -#: remote.c:414 +#: remote.c:403 msgid "more than one receivepack given, using the first" msgstr "" -#: remote.c:422 +#: remote.c:411 msgid "more than one uploadpack given, using the first" msgstr "" -#: remote.c:612 +#: remote.c:594 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:616 +#: remote.c:598 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:620 +#: remote.c:602 #, c-format msgid "%s tracks both %s and %s" msgstr "" -#: remote.c:688 +#: remote.c:670 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "" -#: remote.c:698 +#: remote.c:680 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "" -#: remote.c:1004 +#: remote.c:986 #, c-format msgid "src refspec %s does not match any" msgstr "" -#: remote.c:1009 +#: remote.c:991 #, c-format msgid "src refspec %s matches more than one" msgstr "" @@ -5686,7 +5760,7 @@ msgstr "" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1024 +#: remote.c:1006 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5700,7 +5774,7 @@ msgid "" "Neither worked, so we gave up. You must fully qualify the ref." msgstr "" -#: remote.c:1044 +#: remote.c:1026 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5708,7 +5782,7 @@ msgid "" "'%s:refs/heads/%s'?" msgstr "" -#: remote.c:1049 +#: remote.c:1031 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5716,7 +5790,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1054 +#: remote.c:1036 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5724,7 +5798,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1059 +#: remote.c:1041 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5732,114 +5806,114 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1095 +#: remote.c:1077 #, c-format msgid "%s cannot be resolved to branch" msgstr "" -#: remote.c:1106 +#: remote.c:1088 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "" -#: remote.c:1118 +#: remote.c:1100 #, c-format msgid "dst refspec %s matches more than one" msgstr "" -#: remote.c:1125 +#: remote.c:1107 #, c-format msgid "dst ref %s receives from more than one src" msgstr "" -#: remote.c:1628 remote.c:1729 +#: remote.c:1610 remote.c:1711 msgid "HEAD does not point to a branch" msgstr "" -#: remote.c:1637 +#: remote.c:1619 #, c-format msgid "no such branch: '%s'" msgstr "" -#: remote.c:1640 +#: remote.c:1622 #, c-format msgid "no upstream configured for branch '%s'" msgstr "" -#: remote.c:1646 +#: remote.c:1628 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: remote.c:1661 +#: remote.c:1643 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -#: remote.c:1673 +#: remote.c:1655 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "" -#: remote.c:1683 +#: remote.c:1665 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" -#: remote.c:1696 +#: remote.c:1678 msgid "push has no destination (push.default is 'nothing')" msgstr "" -#: remote.c:1718 +#: remote.c:1700 msgid "cannot resolve 'simple' push to a single destination" msgstr "" -#: remote.c:1844 +#: remote.c:1826 #, c-format msgid "couldn't find remote ref %s" msgstr "" -#: remote.c:1857 +#: remote.c:1839 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "" -#: remote.c:2020 +#: remote.c:2002 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:2024 +#: remote.c:2006 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:2027 +#: remote.c:2009 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "" -#: remote.c:2031 +#: remote.c:2013 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "" -#: remote.c:2034 +#: remote.c:2016 #, c-format msgid " (use \"%s\" for details)\n" msgstr "" -#: remote.c:2038 +#: remote.c:2020 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "" msgstr[1] "" -#: remote.c:2044 +#: remote.c:2026 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:2047 +#: remote.c:2029 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -5847,11 +5921,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2055 +#: remote.c:2037 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:2058 +#: remote.c:2040 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -5862,11 +5936,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2068 +#: remote.c:2050 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: remote.c:2251 +#: remote.c:2233 #, c-format msgid "cannot parse expected object name '%s'" msgstr "" @@ -5886,6 +5960,11 @@ msgstr "" msgid "replace depth too high for object %s" msgstr "" +#: repository.c:94 builtin/init-db.c:188 +#, c-format +msgid "The hash algorithm %s is not supported in this build." +msgstr "" + #: rerere.c:217 rerere.c:226 rerere.c:229 msgid "corrupt MERGE_RR" msgstr "" @@ -5944,7 +6023,7 @@ msgstr "" msgid "Recorded preimage for '%s'" msgstr "" -#: rerere.c:881 submodule.c:2078 builtin/log.c:1871 +#: rerere.c:881 submodule.c:2078 builtin/log.c:1891 #: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 #, c-format msgid "could not create directory '%s'" @@ -5979,20 +6058,29 @@ msgstr "" msgid "unable to open rr-cache directory" msgstr "" -#: revision.c:2497 +#: reset.c:42 +msgid "could not determine HEAD revision" +msgstr "" + +#: reset.c:70 reset.c:76 sequencer.c:3318 +#, c-format +msgid "failed to find tree of %s" +msgstr "" + +#: revision.c:2655 msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2500 +#: revision.c:2658 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2708 +#: revision.c:2866 msgid "--first-parent is incompatible with --bisect" msgstr "" -#: revision.c:2712 +#: revision.c:2870 msgid "-L does not yet support diff formats besides -p and -s" msgstr "" @@ -6012,125 +6100,124 @@ msgid "" "You can disable this warning with `git config advice.ignoredHook false`." msgstr "" -#: send-pack.c:144 +#: send-pack.c:145 msgid "unexpected flush packet while reading remote unpack status" msgstr "" -#: send-pack.c:146 +#: send-pack.c:147 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "" -#: send-pack.c:148 +#: send-pack.c:149 #, c-format msgid "remote unpack failed: %s" msgstr "" -#: send-pack.c:309 +#: send-pack.c:308 msgid "failed to sign the push certificate" msgstr "" -#: send-pack.c:423 +#: send-pack.c:399 msgid "the receiving end does not support --signed push" msgstr "" -#: send-pack.c:425 +#: send-pack.c:401 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "" -#: send-pack.c:437 +#: send-pack.c:413 msgid "the receiving end does not support --atomic push" msgstr "" -#: send-pack.c:442 +#: send-pack.c:418 msgid "the receiving end does not support push options" msgstr "" -#: sequencer.c:191 +#: sequencer.c:192 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "" -#: sequencer.c:296 +#: sequencer.c:297 #, c-format msgid "could not delete '%s'" msgstr "" -#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385 +#: sequencer.c:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "" -#: sequencer.c:325 +#: sequencer.c:326 msgid "revert" msgstr "" -#: sequencer.c:327 +#: sequencer.c:328 msgid "cherry-pick" msgstr "" -#: sequencer.c:329 +#: sequencer.c:330 msgid "rebase" msgstr "" -#: sequencer.c:331 +#: sequencer.c:332 #, c-format msgid "unknown action: %d" msgstr "" -#: sequencer.c:389 +#: sequencer.c:390 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" -#: sequencer.c:392 +#: sequencer.c:393 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:405 sequencer.c:2901 +#: sequencer.c:406 sequencer.c:2921 #, c-format msgid "could not lock '%s'" msgstr "" -#: sequencer.c:412 +#: sequencer.c:413 #, c-format msgid "could not write eol to '%s'" msgstr "" -#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921 -#: sequencer.c:3185 +#: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941 +#: sequencer.c:3203 #, c-format msgid "failed to finalize '%s'" msgstr "" -#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167 -#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120 -#: builtin/rebase.c:593 +#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185 +#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128 #, c-format msgid "could not read '%s'" msgstr "" -#: sequencer.c:466 +#: sequencer.c:457 #, c-format msgid "your local changes would be overwritten by %s." msgstr "" -#: sequencer.c:470 +#: sequencer.c:461 msgid "commit your changes or stash them to proceed." msgstr "" -#: sequencer.c:502 +#: sequencer.c:493 #, c-format msgid "%s: fast-forward" msgstr "" -#: sequencer.c:541 builtin/tag.c:565 +#: sequencer.c:532 builtin/tag.c:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "" @@ -6138,65 +6225,65 @@ msgstr "" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. -#: sequencer.c:635 +#: sequencer.c:626 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:652 +#: sequencer.c:643 msgid "unable to update cache tree" msgstr "" -#: sequencer.c:666 +#: sequencer.c:657 msgid "could not resolve HEAD commit" msgstr "" -#: sequencer.c:746 +#: sequencer.c:737 #, c-format msgid "no key present in '%.*s'" msgstr "" -#: sequencer.c:757 +#: sequencer.c:748 #, c-format msgid "unable to dequote value of '%s'" msgstr "" -#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072 +#: sequencer.c:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: sequencer.c:804 +#: sequencer.c:795 msgid "'GIT_AUTHOR_NAME' already given" msgstr "" -#: sequencer.c:809 +#: sequencer.c:800 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "" -#: sequencer.c:814 +#: sequencer.c:805 msgid "'GIT_AUTHOR_DATE' already given" msgstr "" -#: sequencer.c:818 +#: sequencer.c:809 #, c-format msgid "unknown variable '%s'" msgstr "" -#: sequencer.c:823 +#: sequencer.c:814 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "" -#: sequencer.c:825 +#: sequencer.c:816 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "" -#: sequencer.c:827 +#: sequencer.c:818 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "" -#: sequencer.c:876 +#: sequencer.c:867 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6213,11 +6300,11 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:1148 +#: sequencer.c:1141 msgid "'prepare-commit-msg' hook failed" msgstr "" -#: sequencer.c:1154 +#: sequencer.c:1147 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6232,7 +6319,7 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1167 +#: sequencer.c:1160 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6246,345 +6333,345 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1209 +#: sequencer.c:1202 msgid "couldn't look up newly created commit" msgstr "" -#: sequencer.c:1211 +#: sequencer.c:1204 msgid "could not parse newly created commit" msgstr "" -#: sequencer.c:1257 +#: sequencer.c:1250 msgid "unable to resolve HEAD after creating commit" msgstr "" -#: sequencer.c:1259 +#: sequencer.c:1252 msgid "detached HEAD" msgstr "" -#: sequencer.c:1263 +#: sequencer.c:1256 msgid " (root-commit)" msgstr "" -#: sequencer.c:1284 +#: sequencer.c:1277 msgid "could not parse HEAD" msgstr "" -#: sequencer.c:1286 +#: sequencer.c:1279 #, c-format msgid "HEAD %s is not a commit!" msgstr "" -#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574 +#: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1579 msgid "could not parse HEAD commit" msgstr "" -#: sequencer.c:1342 sequencer.c:1968 +#: sequencer.c:1335 sequencer.c:1980 msgid "unable to parse commit author" msgstr "" -#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687 +#: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:695 msgid "git write-tree failed to write a tree" msgstr "" -#: sequencer.c:1386 sequencer.c:1447 +#: sequencer.c:1379 sequencer.c:1450 #, c-format msgid "unable to read commit message from '%s'" msgstr "" -#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886 -#: builtin/merge.c:911 +#: sequencer.c:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894 +#: builtin/merge.c:919 msgid "failed to write commit object" msgstr "" -#: sequencer.c:1474 +#: sequencer.c:1433 sequencer.c:4118 +#, c-format +msgid "could not update %s" +msgstr "" + +#: sequencer.c:1481 #, c-format msgid "could not parse commit %s" msgstr "" -#: sequencer.c:1479 +#: sequencer.c:1486 #, c-format msgid "could not parse parent commit %s" msgstr "" -#: sequencer.c:1562 sequencer.c:1673 +#: sequencer.c:1569 sequencer.c:1680 #, c-format msgid "unknown command: %d" msgstr "" -#: sequencer.c:1620 sequencer.c:1645 +#: sequencer.c:1627 sequencer.c:1652 #, c-format msgid "This is a combination of %d commits." msgstr "" -#: sequencer.c:1630 +#: sequencer.c:1637 msgid "need a HEAD to fixup" msgstr "" -#: sequencer.c:1632 sequencer.c:3212 +#: sequencer.c:1639 sequencer.c:3230 msgid "could not read HEAD" msgstr "" -#: sequencer.c:1634 +#: sequencer.c:1641 msgid "could not read HEAD's commit message" msgstr "" -#: sequencer.c:1640 +#: sequencer.c:1647 #, c-format msgid "cannot write '%s'" msgstr "" -#: sequencer.c:1647 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1654 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "" -#: sequencer.c:1655 +#: sequencer.c:1662 #, c-format msgid "could not read commit message of %s" msgstr "" -#: sequencer.c:1662 +#: sequencer.c:1669 #, c-format msgid "This is the commit message #%d:" msgstr "" -#: sequencer.c:1668 +#: sequencer.c:1675 #, c-format msgid "The commit message #%d will be skipped:" msgstr "" -#: sequencer.c:1756 +#: sequencer.c:1763 msgid "your index file is unmerged." msgstr "" -#: sequencer.c:1763 +#: sequencer.c:1770 msgid "cannot fixup root commit" msgstr "" -#: sequencer.c:1782 +#: sequencer.c:1789 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:1790 sequencer.c:1798 +#: sequencer.c:1797 sequencer.c:1805 #, c-format msgid "commit %s does not have parent %d" msgstr "" -#: sequencer.c:1804 +#: sequencer.c:1811 #, c-format msgid "cannot get commit message for %s" msgstr "" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1823 +#: sequencer.c:1830 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:1888 +#: sequencer.c:1895 #, c-format msgid "could not rename '%s' to '%s'" msgstr "" -#: sequencer.c:1943 +#: sequencer.c:1952 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:1944 +#: sequencer.c:1953 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:1961 +#: sequencer.c:1972 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "" -#: sequencer.c:2018 +#: sequencer.c:2030 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:2025 +#: sequencer.c:2037 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:2102 +#: sequencer.c:2114 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "" -#: sequencer.c:2111 +#: sequencer.c:2123 #, c-format msgid "missing arguments for %s" msgstr "" -#: sequencer.c:2142 +#: sequencer.c:2154 #, c-format msgid "could not parse '%s'" msgstr "" -#: sequencer.c:2203 +#: sequencer.c:2215 #, c-format msgid "invalid line %d: %.*s" msgstr "" -#: sequencer.c:2214 +#: sequencer.c:2226 #, c-format msgid "cannot '%s' without a previous commit" msgstr "" -#: sequencer.c:2298 +#: sequencer.c:2310 msgid "cancelling a cherry picking in progress" msgstr "" -#: sequencer.c:2305 +#: sequencer.c:2317 msgid "cancelling a revert in progress" msgstr "" -#: sequencer.c:2349 +#: sequencer.c:2361 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" -#: sequencer.c:2351 +#: sequencer.c:2363 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "" -#: sequencer.c:2356 +#: sequencer.c:2368 msgid "no commits parsed." msgstr "" -#: sequencer.c:2367 +#: sequencer.c:2379 msgid "cannot cherry-pick during a revert." msgstr "" -#: sequencer.c:2369 +#: sequencer.c:2381 msgid "cannot revert during a cherry-pick." msgstr "" -#: sequencer.c:2447 +#: sequencer.c:2459 #, c-format msgid "invalid value for %s: %s" msgstr "" -#: sequencer.c:2540 +#: sequencer.c:2556 msgid "unusable squash-onto" msgstr "" -#: sequencer.c:2556 +#: sequencer.c:2576 #, c-format msgid "malformed options sheet: '%s'" msgstr "" -#: sequencer.c:2644 sequencer.c:4361 +#: sequencer.c:2664 sequencer.c:4469 msgid "empty commit set passed" msgstr "" -#: sequencer.c:2660 +#: sequencer.c:2680 msgid "revert is already in progress" msgstr "" -#: sequencer.c:2662 +#: sequencer.c:2682 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "" -#: sequencer.c:2665 +#: sequencer.c:2685 msgid "cherry-pick is already in progress" msgstr "" -#: sequencer.c:2667 +#: sequencer.c:2687 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "" -#: sequencer.c:2681 +#: sequencer.c:2701 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" -#: sequencer.c:2696 +#: sequencer.c:2716 msgid "could not lock HEAD" msgstr "" -#: sequencer.c:2756 sequencer.c:4099 +#: sequencer.c:2776 sequencer.c:4206 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:2758 sequencer.c:2769 +#: sequencer.c:2778 sequencer.c:2789 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:2760 sequencer.c:2804 +#: sequencer.c:2780 sequencer.c:2824 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:2790 builtin/grep.c:724 +#: sequencer.c:2810 builtin/grep.c:744 #, c-format msgid "cannot open '%s'" msgstr "" -#: sequencer.c:2792 +#: sequencer.c:2812 #, c-format msgid "cannot read '%s': %s" msgstr "" -#: sequencer.c:2793 +#: sequencer.c:2813 msgid "unexpected end of file" msgstr "" -#: sequencer.c:2799 +#: sequencer.c:2819 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:2810 +#: sequencer.c:2830 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" -#: sequencer.c:2851 +#: sequencer.c:2871 msgid "no revert in progress" msgstr "" -#: sequencer.c:2859 +#: sequencer.c:2879 msgid "no cherry-pick in progress" msgstr "" -#: sequencer.c:2869 +#: sequencer.c:2889 msgid "failed to skip the commit" msgstr "" -#: sequencer.c:2876 +#: sequencer.c:2896 msgid "there is nothing to skip" msgstr "" -#: sequencer.c:2879 +#: sequencer.c:2899 #, c-format msgid "" "have you committed already?\n" "try \"git %s --continue\"" msgstr "" -#: sequencer.c:3003 sequencer.c:4011 -#, c-format -msgid "could not update %s" -msgstr "" - -#: sequencer.c:3042 sequencer.c:3991 +#: sequencer.c:3060 sequencer.c:4098 msgid "cannot read HEAD" msgstr "" -#: sequencer.c:3059 +#: sequencer.c:3077 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "" -#: sequencer.c:3067 +#: sequencer.c:3085 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6596,22 +6683,27 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:3077 +#: sequencer.c:3095 #, c-format msgid "Could not apply %s... %.*s" msgstr "" -#: sequencer.c:3084 +#: sequencer.c:3102 #, c-format msgid "Could not merge %.*s" msgstr "" -#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641 +#: sequencer.c:3116 sequencer.c:3120 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "" -#: sequencer.c:3129 +#: sequencer.c:3132 +#, c-format +msgid "Executing: %s\n" +msgstr "" + +#: sequencer.c:3147 #, c-format msgid "" "execution failed: %s\n" @@ -6621,11 +6713,11 @@ msgid "" "\n" msgstr "" -#: sequencer.c:3135 +#: sequencer.c:3153 msgid "and made changes to the index and/or the working tree\n" msgstr "" -#: sequencer.c:3141 +#: sequencer.c:3159 #, c-format msgid "" "execution succeeded: %s\n" @@ -6636,99 +6728,125 @@ msgid "" "\n" msgstr "" -#: sequencer.c:3202 +#: sequencer.c:3220 #, c-format msgid "illegal label name: '%.*s'" msgstr "" -#: sequencer.c:3256 +#: sequencer.c:3274 msgid "writing fake root commit" msgstr "" -#: sequencer.c:3261 +#: sequencer.c:3279 msgid "writing squash-onto" msgstr "" -#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886 -#, c-format -msgid "failed to find tree of %s" -msgstr "" - -#: sequencer.c:3344 +#: sequencer.c:3363 #, c-format msgid "could not resolve '%s'" msgstr "" -#: sequencer.c:3375 +#: sequencer.c:3394 msgid "cannot merge without a current revision" msgstr "" -#: sequencer.c:3397 +#: sequencer.c:3416 #, c-format msgid "unable to parse '%.*s'" msgstr "" -#: sequencer.c:3406 +#: sequencer.c:3425 #, c-format msgid "nothing to merge: '%.*s'" msgstr "" -#: sequencer.c:3418 +#: sequencer.c:3437 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" -#: sequencer.c:3434 +#: sequencer.c:3453 #, c-format msgid "could not get commit message of '%s'" msgstr "" -#: sequencer.c:3594 +#: sequencer.c:3613 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "" -#: sequencer.c:3610 +#: sequencer.c:3629 msgid "merge: Unable to write new index file" msgstr "" -#: sequencer.c:3679 builtin/rebase.c:737 +#: sequencer.c:3703 +msgid "Cannot autostash" +msgstr "" + +#: sequencer.c:3706 +#, c-format +msgid "Unexpected stash response: '%s'" +msgstr "" + +#: sequencer.c:3712 +#, c-format +msgid "Could not create directory for '%s'" +msgstr "" + +#: sequencer.c:3715 +#, c-format +msgid "Created autostash: %s\n" +msgstr "" + +#: sequencer.c:3719 +msgid "could not reset --hard" +msgstr "" + +#: sequencer.c:3744 #, c-format msgid "Applied autostash.\n" msgstr "" -#: sequencer.c:3691 +#: sequencer.c:3756 #, c-format msgid "cannot store %s" msgstr "" -#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3759 #, c-format msgid "" -"Applying autostash resulted in conflicts.\n" +"%s\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -#: sequencer.c:3755 +#: sequencer.c:3764 +msgid "Applying autostash resulted in conflicts." +msgstr "" + +#: sequencer.c:3765 +msgid "Autostash exists; creating a new stash entry." +msgstr "" + +#: sequencer.c:3857 #, c-format msgid "%s: not a valid OID" msgstr "" -#: sequencer.c:3760 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3862 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "" -#: sequencer.c:3775 +#: sequencer.c:3877 #, c-format msgid "Stopped at HEAD\n" msgstr "" -#: sequencer.c:3777 +#: sequencer.c:3879 #, c-format msgid "Stopped at %s\n" msgstr "" -#: sequencer.c:3785 +#: sequencer.c:3887 #, c-format msgid "" "Could not execute the todo command\n" @@ -6741,114 +6859,124 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:3869 +#: sequencer.c:3931 +#, c-format +msgid "Rebasing (%d/%d)%s" +msgstr "" + +#: sequencer.c:3976 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "" -#: sequencer.c:3940 +#: sequencer.c:4047 #, c-format msgid "unknown command %d" msgstr "" -#: sequencer.c:3999 +#: sequencer.c:4106 msgid "could not read orig-head" msgstr "" -#: sequencer.c:4004 +#: sequencer.c:4111 msgid "could not read 'onto'" msgstr "" -#: sequencer.c:4018 +#: sequencer.c:4125 #, c-format msgid "could not update HEAD to %s" msgstr "" -#: sequencer.c:4111 +#: sequencer.c:4185 +#, c-format +msgid "Successfully rebased and updated %s.\n" +msgstr "" + +#: sequencer.c:4218 msgid "cannot rebase: You have unstaged changes." msgstr "" -#: sequencer.c:4120 +#: sequencer.c:4227 msgid "cannot amend non-existing commit" msgstr "" -#: sequencer.c:4122 +#: sequencer.c:4229 #, c-format msgid "invalid file: '%s'" msgstr "" -#: sequencer.c:4124 +#: sequencer.c:4231 #, c-format msgid "invalid contents: '%s'" msgstr "" -#: sequencer.c:4127 +#: sequencer.c:4234 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" "first and then run 'git rebase --continue' again." msgstr "" -#: sequencer.c:4163 sequencer.c:4202 +#: sequencer.c:4270 sequencer.c:4309 #, c-format msgid "could not write file: '%s'" msgstr "" -#: sequencer.c:4217 +#: sequencer.c:4324 msgid "could not remove CHERRY_PICK_HEAD" msgstr "" -#: sequencer.c:4224 +#: sequencer.c:4331 msgid "could not commit staged changes." msgstr "" -#: sequencer.c:4338 +#: sequencer.c:4446 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:4342 +#: sequencer.c:4450 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:4377 +#: sequencer.c:4485 msgid "can't revert as initial commit" msgstr "" -#: sequencer.c:4846 +#: sequencer.c:4962 msgid "make_script: unhandled options" msgstr "" -#: sequencer.c:4849 +#: sequencer.c:4965 msgid "make_script: error preparing revisions" msgstr "" -#: sequencer.c:5083 sequencer.c:5100 +#: sequencer.c:5206 sequencer.c:5223 msgid "nothing to do" msgstr "" -#: sequencer.c:5119 +#: sequencer.c:5242 msgid "could not skip unnecessary pick commands" msgstr "" -#: sequencer.c:5213 +#: sequencer.c:5336 msgid "the script was already rearranged." msgstr "" -#: setup.c:124 +#: setup.c:133 #, c-format msgid "'%s' is outside repository at '%s'" msgstr "" -#: setup.c:175 +#: setup.c:185 #, c-format msgid "" "%s: no such path in the working tree.\n" "Use 'git <command> -- <path>...' to specify paths that do not exist locally." msgstr "" -#: setup.c:188 +#: setup.c:198 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -6856,12 +6984,12 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" -#: setup.c:254 +#: setup.c:264 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "" -#: setup.c:273 +#: setup.c:283 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -6869,367 +6997,367 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" -#: setup.c:409 +#: setup.c:419 msgid "unable to set up work tree using invalid config" msgstr "" -#: setup.c:413 +#: setup.c:423 msgid "this operation must be run in a work tree" msgstr "" -#: setup.c:559 +#: setup.c:569 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "" -#: setup.c:567 +#: setup.c:577 msgid "unknown repository extensions found:" msgstr "" -#: setup.c:586 +#: setup.c:596 #, c-format msgid "error opening '%s'" msgstr "" -#: setup.c:588 +#: setup.c:598 #, c-format msgid "too large to be a .git file: '%s'" msgstr "" -#: setup.c:590 +#: setup.c:600 #, c-format msgid "error reading %s" msgstr "" -#: setup.c:592 +#: setup.c:602 #, c-format msgid "invalid gitfile format: %s" msgstr "" -#: setup.c:594 +#: setup.c:604 #, c-format msgid "no path in gitfile: %s" msgstr "" -#: setup.c:596 +#: setup.c:606 #, c-format msgid "not a git repository: %s" msgstr "" -#: setup.c:695 +#: setup.c:708 #, c-format msgid "'$%s' too big" msgstr "" -#: setup.c:709 +#: setup.c:722 #, c-format msgid "not a git repository: '%s'" msgstr "" -#: setup.c:738 setup.c:740 setup.c:771 +#: setup.c:751 setup.c:753 setup.c:784 #, c-format msgid "cannot chdir to '%s'" msgstr "" -#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856 +#: setup.c:756 setup.c:812 setup.c:822 setup.c:861 setup.c:869 msgid "cannot come back to cwd" msgstr "" -#: setup.c:870 +#: setup.c:883 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "" -#: setup.c:1108 +#: setup.c:1121 msgid "Unable to read current working directory" msgstr "" -#: setup.c:1117 setup.c:1123 +#: setup.c:1130 setup.c:1136 #, c-format msgid "cannot change to '%s'" msgstr "" -#: setup.c:1128 +#: setup.c:1141 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "" -#: setup.c:1134 +#: setup.c:1147 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" -#: setup.c:1245 +#: setup.c:1258 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" -#: setup.c:1289 +#: setup.c:1304 msgid "open /dev/null or dup failed" msgstr "" -#: setup.c:1304 +#: setup.c:1319 msgid "fork failed" msgstr "" -#: setup.c:1309 +#: setup.c:1324 msgid "setsid failed" msgstr "" -#: sha1-file.c:452 +#: sha1-file.c:470 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" -#: sha1-file.c:503 +#: sha1-file.c:521 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "" -#: sha1-file.c:575 +#: sha1-file.c:593 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "" -#: sha1-file.c:582 +#: sha1-file.c:600 #, c-format msgid "unable to normalize object directory: %s" msgstr "" -#: sha1-file.c:625 +#: sha1-file.c:643 msgid "unable to fdopen alternates lockfile" msgstr "" -#: sha1-file.c:643 +#: sha1-file.c:661 msgid "unable to read alternates file" msgstr "" -#: sha1-file.c:650 +#: sha1-file.c:668 msgid "unable to move new alternates file into place" msgstr "" -#: sha1-file.c:685 +#: sha1-file.c:703 #, c-format msgid "path '%s' does not exist" msgstr "" -#: sha1-file.c:711 +#: sha1-file.c:724 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" -#: sha1-file.c:717 +#: sha1-file.c:730 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: sha1-file.c:723 +#: sha1-file.c:736 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: sha1-file.c:731 +#: sha1-file.c:744 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: sha1-file.c:791 +#: sha1-file.c:804 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "" -#: sha1-file.c:943 +#: sha1-file.c:954 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "" -#: sha1-file.c:964 +#: sha1-file.c:975 msgid "mmap failed" msgstr "" -#: sha1-file.c:1128 +#: sha1-file.c:1139 #, c-format msgid "object file %s is empty" msgstr "" -#: sha1-file.c:1263 sha1-file.c:2443 +#: sha1-file.c:1274 sha1-file.c:2454 #, c-format msgid "corrupt loose object '%s'" msgstr "" -#: sha1-file.c:1265 sha1-file.c:2447 +#: sha1-file.c:1276 sha1-file.c:2458 #, c-format msgid "garbage at end of loose object '%s'" msgstr "" -#: sha1-file.c:1307 +#: sha1-file.c:1318 msgid "invalid object type" msgstr "" -#: sha1-file.c:1391 +#: sha1-file.c:1402 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "" -#: sha1-file.c:1394 +#: sha1-file.c:1405 #, c-format msgid "unable to unpack %s header" msgstr "" -#: sha1-file.c:1400 +#: sha1-file.c:1411 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "" -#: sha1-file.c:1403 +#: sha1-file.c:1414 #, c-format msgid "unable to parse %s header" msgstr "" -#: sha1-file.c:1629 +#: sha1-file.c:1640 #, c-format msgid "failed to read object %s" msgstr "" -#: sha1-file.c:1633 +#: sha1-file.c:1644 #, c-format msgid "replacement %s not found for %s" msgstr "" -#: sha1-file.c:1637 +#: sha1-file.c:1648 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "" -#: sha1-file.c:1641 +#: sha1-file.c:1652 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "" -#: sha1-file.c:1746 +#: sha1-file.c:1757 #, c-format msgid "unable to write file %s" msgstr "" -#: sha1-file.c:1753 +#: sha1-file.c:1764 #, c-format msgid "unable to set permission to '%s'" msgstr "" -#: sha1-file.c:1760 +#: sha1-file.c:1771 msgid "file write error" msgstr "" -#: sha1-file.c:1780 +#: sha1-file.c:1791 msgid "error when closing loose object file" msgstr "" -#: sha1-file.c:1845 +#: sha1-file.c:1856 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" -#: sha1-file.c:1847 +#: sha1-file.c:1858 msgid "unable to create temporary file" msgstr "" -#: sha1-file.c:1871 +#: sha1-file.c:1882 msgid "unable to write loose object file" msgstr "" -#: sha1-file.c:1877 +#: sha1-file.c:1888 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "" -#: sha1-file.c:1881 +#: sha1-file.c:1892 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "" -#: sha1-file.c:1885 +#: sha1-file.c:1896 #, c-format msgid "confused by unstable object source data for %s" msgstr "" -#: sha1-file.c:1895 builtin/pack-objects.c:1054 +#: sha1-file.c:1906 builtin/pack-objects.c:1055 #, c-format msgid "failed utime() on %s" msgstr "" -#: sha1-file.c:1972 +#: sha1-file.c:1983 #, c-format msgid "cannot read object for %s" msgstr "" -#: sha1-file.c:2011 +#: sha1-file.c:2022 msgid "corrupt commit" msgstr "" -#: sha1-file.c:2019 +#: sha1-file.c:2030 msgid "corrupt tag" msgstr "" -#: sha1-file.c:2119 +#: sha1-file.c:2130 #, c-format msgid "read error while indexing %s" msgstr "" -#: sha1-file.c:2122 +#: sha1-file.c:2133 #, c-format msgid "short read while indexing %s" msgstr "" -#: sha1-file.c:2195 sha1-file.c:2205 +#: sha1-file.c:2206 sha1-file.c:2216 #, c-format msgid "%s: failed to insert into database" msgstr "" -#: sha1-file.c:2211 +#: sha1-file.c:2222 #, c-format msgid "%s: unsupported file type" msgstr "" -#: sha1-file.c:2235 +#: sha1-file.c:2246 #, c-format msgid "%s is not a valid object" msgstr "" -#: sha1-file.c:2237 +#: sha1-file.c:2248 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: sha1-file.c:2264 builtin/index-pack.c:155 +#: sha1-file.c:2275 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "" -#: sha1-file.c:2454 sha1-file.c:2507 +#: sha1-file.c:2465 sha1-file.c:2518 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "" -#: sha1-file.c:2478 +#: sha1-file.c:2489 #, c-format msgid "unable to mmap %s" msgstr "" -#: sha1-file.c:2483 +#: sha1-file.c:2494 #, c-format msgid "unable to unpack header of %s" msgstr "" -#: sha1-file.c:2489 +#: sha1-file.c:2500 #, c-format msgid "unable to parse header of %s" msgstr "" -#: sha1-file.c:2500 +#: sha1-file.c:2511 #, c-format msgid "unable to unpack contents of %s" msgstr "" @@ -7317,43 +7445,43 @@ msgid "invalid object name '%.*s'." msgstr "" #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:837 +#: strbuf.c:853 #, c-format msgid "%u.%2.2u GiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:839 +#: strbuf.c:855 #, c-format msgid "%u.%2.2u GiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:847 +#: strbuf.c:863 #, c-format msgid "%u.%2.2u MiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:849 +#: strbuf.c:865 #, c-format msgid "%u.%2.2u MiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:856 +#: strbuf.c:872 #, c-format msgid "%u.%2.2u KiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:858 +#: strbuf.c:874 #, c-format msgid "%u.%2.2u KiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:864 +#: strbuf.c:880 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -7361,18 +7489,42 @@ msgstr[0] "" msgstr[1] "" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:866 +#: strbuf.c:882 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "" msgstr[1] "" -#: strbuf.c:1164 +#: strbuf.c:1180 #, c-format msgid "could not edit '%s'" msgstr "" +#: submodule-config.c:237 +#, c-format +msgid "ignoring suspicious submodule name: %s" +msgstr "" + +#: submodule-config.c:304 +msgid "negative values not allowed for submodule.fetchjobs" +msgstr "" + +#: submodule-config.c:402 +#, c-format +msgid "ignoring '%s' which may be interpreted as a command-line option: %s" +msgstr "" + +#: submodule-config.c:499 +#, c-format +msgid "invalid value for %s" +msgstr "" + +#: submodule-config.c:766 +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr "" + #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -7430,7 +7582,7 @@ msgstr "" msgid "process for submodule '%s' failed" msgstr "" -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045 +#: submodule.c:1147 builtin/branch.c:678 builtin/submodule--helper.c:2045 msgid "Failed to resolve HEAD as a valid ref." msgstr "" @@ -7539,39 +7691,15 @@ msgid "" "'%s'\n" msgstr "" -#: submodule.c:2209 +#: submodule.c:2210 msgid "could not start ls-files in .." msgstr "" -#: submodule.c:2248 +#: submodule.c:2250 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "" -#: submodule-config.c:236 -#, c-format -msgid "ignoring suspicious submodule name: %s" -msgstr "" - -#: submodule-config.c:303 -msgid "negative values not allowed for submodule.fetchjobs" -msgstr "" - -#: submodule-config.c:401 -#, c-format -msgid "ignoring '%s' which may be interpreted as a command-line option: %s" -msgstr "" - -#: submodule-config.c:498 -#, c-format -msgid "invalid value for %s" -msgstr "" - -#: submodule-config.c:765 -#, c-format -msgid "Could not update .gitmodules entry %s" -msgstr "" - #: trailer.c:238 #, c-format msgid "running trailer command '%s' failed" @@ -7626,86 +7754,6 @@ msgstr "" msgid "could not rename temporary file to %s" msgstr "" -#: transport.c:116 -#, c-format -msgid "Would set upstream of '%s' to '%s' of '%s'\n" -msgstr "" - -#: transport.c:145 -#, c-format -msgid "could not read bundle '%s'" -msgstr "" - -#: transport.c:214 -#, c-format -msgid "transport: invalid depth option '%s'" -msgstr "" - -#: transport.c:266 -msgid "see protocol.version in 'git help config' for more details" -msgstr "" - -#: transport.c:267 -msgid "server options require protocol version 2 or later" -msgstr "" - -#: transport.c:632 -msgid "could not parse transport.color.* config" -msgstr "" - -#: transport.c:705 -msgid "support for protocol v2 not implemented yet" -msgstr "" - -#: transport.c:831 -#, c-format -msgid "unknown value for config '%s': %s" -msgstr "" - -#: transport.c:897 -#, c-format -msgid "transport '%s' not allowed" -msgstr "" - -#: transport.c:949 -msgid "git-over-rsync is no longer supported" -msgstr "" - -#: transport.c:1044 -#, c-format -msgid "" -"The following submodule paths contain changes that can\n" -"not be found on any remote:\n" -msgstr "" - -#: transport.c:1048 -#, c-format -msgid "" -"\n" -"Please try\n" -"\n" -"\tgit push --recurse-submodules=on-demand\n" -"\n" -"or cd to the path and use\n" -"\n" -"\tgit push\n" -"\n" -"to push them to a remote.\n" -"\n" -msgstr "" - -#: transport.c:1056 -msgid "Aborting." -msgstr "" - -#: transport.c:1201 -msgid "failed to push all needed submodules" -msgstr "" - -#: transport.c:1345 transport-helper.c:657 -msgid "operation not supported by protocol" -msgstr "" - #: transport-helper.c:61 transport-helper.c:90 msgid "full write to remote helper failed" msgstr "" @@ -7748,7 +7796,7 @@ msgstr "" msgid "error while running fast-import" msgstr "" -#: transport-helper.c:545 transport-helper.c:1134 +#: transport-helper.c:545 transport-helper.c:1135 #, c-format msgid "could not read ref %s" msgstr "" @@ -7766,6 +7814,10 @@ msgstr "" msgid "invalid remote service path" msgstr "" +#: transport-helper.c:657 transport.c:1339 +msgid "operation not supported by protocol" +msgstr "" + #: transport-helper.c:660 #, c-format msgid "can't connect to subservice %s" @@ -7806,74 +7858,150 @@ msgstr "" msgid "helper %s does not support 'push-option'" msgstr "" -#: transport-helper.c:965 +#: transport-helper.c:966 msgid "remote-helper doesn't support push; refspec needed" msgstr "" -#: transport-helper.c:970 +#: transport-helper.c:971 #, c-format msgid "helper %s does not support 'force'" msgstr "" -#: transport-helper.c:1017 +#: transport-helper.c:1018 msgid "couldn't run fast-export" msgstr "" -#: transport-helper.c:1022 +#: transport-helper.c:1023 msgid "error while running fast-export" msgstr "" -#: transport-helper.c:1047 +#: transport-helper.c:1048 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" "Perhaps you should specify a branch such as 'master'.\n" msgstr "" -#: transport-helper.c:1120 +#: transport-helper.c:1121 #, c-format msgid "malformed response in ref list: %s" msgstr "" -#: transport-helper.c:1272 +#: transport-helper.c:1273 #, c-format msgid "read(%s) failed" msgstr "" -#: transport-helper.c:1299 +#: transport-helper.c:1300 #, c-format msgid "write(%s) failed" msgstr "" -#: transport-helper.c:1348 +#: transport-helper.c:1349 #, c-format msgid "%s thread failed" msgstr "" -#: transport-helper.c:1352 +#: transport-helper.c:1353 #, c-format msgid "%s thread failed to join: %s" msgstr "" -#: transport-helper.c:1371 transport-helper.c:1375 +#: transport-helper.c:1372 transport-helper.c:1376 #, c-format msgid "can't start thread for copying data: %s" msgstr "" -#: transport-helper.c:1412 +#: transport-helper.c:1413 #, c-format msgid "%s process failed to wait" msgstr "" -#: transport-helper.c:1416 +#: transport-helper.c:1417 #, c-format msgid "%s process failed" msgstr "" -#: transport-helper.c:1434 transport-helper.c:1443 +#: transport-helper.c:1435 transport-helper.c:1444 msgid "can't start thread for copying data" msgstr "" +#: transport.c:116 +#, c-format +msgid "Would set upstream of '%s' to '%s' of '%s'\n" +msgstr "" + +#: transport.c:145 +#, c-format +msgid "could not read bundle '%s'" +msgstr "" + +#: transport.c:214 +#, c-format +msgid "transport: invalid depth option '%s'" +msgstr "" + +#: transport.c:266 +msgid "see protocol.version in 'git help config' for more details" +msgstr "" + +#: transport.c:267 +msgid "server options require protocol version 2 or later" +msgstr "" + +#: transport.c:632 +msgid "could not parse transport.color.* config" +msgstr "" + +#: transport.c:705 +msgid "support for protocol v2 not implemented yet" +msgstr "" + +#: transport.c:839 +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "" + +#: transport.c:905 +#, c-format +msgid "transport '%s' not allowed" +msgstr "" + +#: transport.c:957 +msgid "git-over-rsync is no longer supported" +msgstr "" + +#: transport.c:1052 +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +msgstr "" + +#: transport.c:1056 +#, c-format +msgid "" +"\n" +"Please try\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"or cd to the path and use\n" +"\n" +"\tgit push\n" +"\n" +"to push them to a remote.\n" +"\n" +msgstr "" + +#: transport.c:1064 +msgid "Aborting." +msgstr "" + +#: transport.c:1209 +msgid "failed to push all needed submodules" +msgstr "" + #: tree-walk.c:32 msgid "too-short tree object" msgstr "" @@ -7890,98 +8018,98 @@ msgstr "" msgid "too-short tree file" msgstr "" -#: unpack-trees.c:110 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%sPlease commit your changes or stash them before you switch branches." msgstr "" -#: unpack-trees.c:112 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:115 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%sPlease commit your changes or stash them before you merge." msgstr "" -#: unpack-trees.c:117 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:120 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%sPlease commit your changes or stash them before you %s." msgstr "" -#: unpack-trees.c:122 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:127 +#: unpack-trees.c:130 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" -#: unpack-trees.c:131 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:133 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:136 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:138 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:141 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:143 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:149 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7989,7 +8117,7 @@ msgid "" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:151 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7997,89 +8125,100 @@ msgid "" "%%s" msgstr "" -#: unpack-trees.c:154 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:156 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:159 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:161 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:169 +#: unpack-trees.c:172 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "" -#: unpack-trees.c:172 +#: unpack-trees.c:175 #, c-format msgid "" -"Cannot update sparse checkout: the following entries are not up to date:\n" +"Cannot update submodule:\n" "%s" msgstr "" -#: unpack-trees.c:174 +#: unpack-trees.c:178 #, c-format msgid "" -"The following working tree files would be overwritten by sparse checkout " -"update:\n" +"The following paths are not up to date and were left despite sparse " +"patterns:\n" "%s" msgstr "" -#: unpack-trees.c:176 +#: unpack-trees.c:180 #, c-format msgid "" -"The following working tree files would be removed by sparse checkout " -"update:\n" +"The following paths are unmerged and were left despite sparse patterns:\n" "%s" msgstr "" -#: unpack-trees.c:178 +#: unpack-trees.c:182 #, c-format msgid "" -"Cannot update submodule:\n" +"The following paths were already present and thus not updated despite sparse " +"patterns:\n" "%s" msgstr "" -#: unpack-trees.c:255 +#: unpack-trees.c:262 #, c-format msgid "Aborting\n" msgstr "" -#: unpack-trees.c:317 +#: unpack-trees.c:289 +#, c-format +msgid "" +"After fixing the above paths, you may want to run `git sparse-checkout " +"reapply`.\n" +msgstr "" + +#: unpack-trees.c:350 msgid "Updating files" msgstr "" -#: unpack-trees.c:349 +#: unpack-trees.c:382 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" "colliding group is in the working tree:\n" msgstr "" -#: unpack-trees.c:1445 +#: unpack-trees.c:1498 msgid "Updating index flags" msgstr "" +#: upload-pack.c:1337 +msgid "expected flush after fetch arguments" +msgstr "" + #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "" @@ -8113,32 +8252,32 @@ msgstr "" msgid "Fetching objects" msgstr "" -#: worktree.c:259 builtin/am.c:2099 +#: worktree.c:262 builtin/am.c:2098 #, c-format msgid "failed to read '%s'" msgstr "" -#: worktree.c:305 +#: worktree.c:309 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" -#: worktree.c:316 +#: worktree.c:320 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" -#: worktree.c:328 +#: worktree.c:332 #, c-format msgid "'%s' does not exist" msgstr "" -#: worktree.c:334 +#: worktree.c:338 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "" -#: worktree.c:342 +#: worktree.c:347 #, c-format msgid "'%s' does not point back to '%s'" msgstr "" @@ -8186,11 +8325,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:211 wt-status.c:1074 +#: wt-status.c:211 wt-status.c:1072 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:234 wt-status.c:1083 +#: wt-status.c:234 wt-status.c:1081 msgid "Changes not staged for commit:" msgstr "" @@ -8288,28 +8427,28 @@ msgstr "" msgid "untracked content, " msgstr "" -#: wt-status.c:906 +#: wt-status.c:904 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "" msgstr[1] "" -#: wt-status.c:938 +#: wt-status.c:936 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:940 +#: wt-status.c:938 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:1022 +#: wt-status.c:1020 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." msgstr "" -#: wt-status.c:1114 +#: wt-status.c:1112 #, c-format msgid "" "\n" @@ -8317,242 +8456,242 @@ msgid "" "You can use '--no-ahead-behind' to avoid this.\n" msgstr "" -#: wt-status.c:1144 +#: wt-status.c:1142 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:1147 +#: wt-status.c:1145 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:1149 +#: wt-status.c:1147 msgid " (use \"git merge --abort\" to abort the merge)" msgstr "" -#: wt-status.c:1153 +#: wt-status.c:1151 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:1156 +#: wt-status.c:1154 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:1165 +#: wt-status.c:1163 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:1168 +#: wt-status.c:1166 msgid "The current patch is empty." msgstr "" -#: wt-status.c:1172 +#: wt-status.c:1170 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:1174 +#: wt-status.c:1172 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1176 +#: wt-status.c:1174 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:1309 +#: wt-status.c:1307 msgid "git-rebase-todo is missing." msgstr "" -#: wt-status.c:1311 +#: wt-status.c:1309 msgid "No commands done." msgstr "" -#: wt-status.c:1314 +#: wt-status.c:1312 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1325 +#: wt-status.c:1323 #, c-format msgid " (see more in file %s)" msgstr "" -#: wt-status.c:1330 +#: wt-status.c:1328 msgid "No commands remaining." msgstr "" -#: wt-status.c:1333 +#: wt-status.c:1331 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1341 +#: wt-status.c:1339 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" -#: wt-status.c:1353 +#: wt-status.c:1351 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1358 +#: wt-status.c:1356 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:1371 +#: wt-status.c:1369 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1373 +#: wt-status.c:1371 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1375 +#: wt-status.c:1373 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:1382 +#: wt-status.c:1380 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1386 +#: wt-status.c:1384 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1391 +#: wt-status.c:1389 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:1394 +#: wt-status.c:1392 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1398 +#: wt-status.c:1396 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1403 +#: wt-status.c:1401 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:1406 +#: wt-status.c:1404 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:1408 +#: wt-status.c:1406 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:1419 +#: wt-status.c:1417 msgid "Cherry-pick currently in progress." msgstr "" -#: wt-status.c:1422 +#: wt-status.c:1420 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1429 +#: wt-status.c:1427 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1432 +#: wt-status.c:1430 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr "" -#: wt-status.c:1435 +#: wt-status.c:1433 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1437 +#: wt-status.c:1435 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1439 +#: wt-status.c:1437 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1449 +#: wt-status.c:1447 msgid "Revert currently in progress." msgstr "" -#: wt-status.c:1452 +#: wt-status.c:1450 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1458 +#: wt-status.c:1456 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1461 +#: wt-status.c:1459 msgid " (run \"git revert --continue\" to continue)" msgstr "" -#: wt-status.c:1464 +#: wt-status.c:1462 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1466 +#: wt-status.c:1464 msgid " (use \"git revert --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1468 +#: wt-status.c:1466 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1478 +#: wt-status.c:1476 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1482 +#: wt-status.c:1480 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1485 +#: wt-status.c:1483 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1694 +#: wt-status.c:1692 msgid "On branch " msgstr "" -#: wt-status.c:1701 +#: wt-status.c:1699 msgid "interactive rebase in progress; onto " msgstr "" -#: wt-status.c:1703 +#: wt-status.c:1701 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1713 +#: wt-status.c:1711 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1730 +#: wt-status.c:1728 msgid "Initial commit" msgstr "" -#: wt-status.c:1731 +#: wt-status.c:1729 msgid "No commits yet" msgstr "" -#: wt-status.c:1745 +#: wt-status.c:1743 msgid "Untracked files" msgstr "" -#: wt-status.c:1747 +#: wt-status.c:1745 msgid "Ignored files" msgstr "" -#: wt-status.c:1751 +#: wt-status.c:1749 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -8560,97 +8699,97 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1757 +#: wt-status.c:1755 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1759 +#: wt-status.c:1757 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1765 +#: wt-status.c:1763 msgid "No changes" msgstr "" -#: wt-status.c:1770 +#: wt-status.c:1768 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1773 +#: wt-status.c:1771 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1776 +#: wt-status.c:1774 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1779 +#: wt-status.c:1777 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1782 +#: wt-status.c:1780 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1785 wt-status.c:1790 +#: wt-status.c:1783 wt-status.c:1788 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1788 +#: wt-status.c:1786 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1792 +#: wt-status.c:1790 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "" -#: wt-status.c:1905 +#: wt-status.c:1903 msgid "No commits yet on " msgstr "" -#: wt-status.c:1909 +#: wt-status.c:1907 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1940 +#: wt-status.c:1938 msgid "different" msgstr "" -#: wt-status.c:1942 wt-status.c:1950 +#: wt-status.c:1940 wt-status.c:1948 msgid "behind " msgstr "" -#: wt-status.c:1945 wt-status.c:1948 +#: wt-status.c:1943 wt-status.c:1946 msgid "ahead " msgstr "" #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2470 +#: wt-status.c:2468 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "" -#: wt-status.c:2476 +#: wt-status.c:2474 msgid "additionally, your index contains uncommitted changes." msgstr "" -#: wt-status.c:2478 +#: wt-status.c:2476 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" -#: compat/precompose_utf8.c:58 builtin/clone.c:455 +#: compat/precompose_utf8.c:58 builtin/clone.c:456 #, c-format msgid "failed to unlink '%s'" msgstr "" @@ -8664,7 +8803,7 @@ msgstr "" msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:93 builtin/commit.c:288 +#: builtin/add.c:93 builtin/commit.c:285 msgid "updating files failed" msgstr "" @@ -8677,7 +8816,7 @@ msgstr "" msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:266 builtin/rev-parse.c:899 +#: builtin/add.c:266 builtin/rev-parse.c:904 msgid "Could not read the index" msgstr "" @@ -8712,8 +8851,8 @@ msgstr "" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548 +#: builtin/add.c:322 builtin/clean.c:904 builtin/fetch.c:164 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:548 #: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 msgid "dry run" msgstr "" @@ -8722,7 +8861,7 @@ msgstr "" msgid "interactive picking" msgstr "" -#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307 +#: builtin/add.c:326 builtin/checkout.c:1535 builtin/reset.c:308 msgid "select hunks interactively" msgstr "" @@ -8812,7 +8951,7 @@ msgstr "" msgid "adding files failed" msgstr "" -#: builtin/add.c:447 builtin/commit.c:348 +#: builtin/add.c:447 builtin/commit.c:345 msgid "--pathspec-from-file is incompatible with --interactive/--patch" msgstr "" @@ -8833,13 +8972,13 @@ msgstr "" msgid "--chmod param '%s' must be either -x or +x" msgstr "" -#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354 -#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509 +#: builtin/add.c:501 builtin/checkout.c:1703 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "" -#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360 -#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515 +#: builtin/add.c:508 builtin/checkout.c:1715 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "" @@ -8989,41 +9128,41 @@ msgstr "" msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/am.c:1700 builtin/commit.c:398 +#: builtin/am.c:1699 builtin/commit.c:395 msgid "unable to write index file" msgstr "" -#: builtin/am.c:1704 +#: builtin/am.c:1703 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/am.c:1744 builtin/am.c:1812 +#: builtin/am.c:1743 builtin/am.c:1811 #, c-format msgid "Applying: %.*s" msgstr "" -#: builtin/am.c:1761 +#: builtin/am.c:1760 msgid "No changes -- Patch already applied." msgstr "" -#: builtin/am.c:1767 +#: builtin/am.c:1766 #, c-format msgid "Patch failed at %s %.*s" msgstr "" -#: builtin/am.c:1771 +#: builtin/am.c:1770 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" -#: builtin/am.c:1815 +#: builtin/am.c:1814 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" -#: builtin/am.c:1822 +#: builtin/am.c:1821 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -9031,195 +9170,197 @@ msgid "" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346 -#: builtin/reset.c:354 +#: builtin/am.c:1928 builtin/am.c:1932 builtin/am.c:1944 builtin/reset.c:347 +#: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/am.c:1981 +#: builtin/am.c:1980 msgid "failed to clean index" msgstr "" -#: builtin/am.c:2025 +#: builtin/am.c:2024 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -#: builtin/am.c:2132 +#: builtin/am.c:2131 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "" -#: builtin/am.c:2172 +#: builtin/am.c:2171 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "" -#: builtin/am.c:2176 +#: builtin/am.c:2175 #, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" msgstr "" -#: builtin/am.c:2207 +#: builtin/am.c:2206 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "" -#: builtin/am.c:2208 +#: builtin/am.c:2207 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "" -#: builtin/am.c:2214 +#: builtin/am.c:2213 msgid "run interactively" msgstr "" -#: builtin/am.c:2216 +#: builtin/am.c:2215 msgid "historical option -- no-op" msgstr "" -#: builtin/am.c:2218 +#: builtin/am.c:2217 msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:304 builtin/stash.c:812 +#: builtin/am.c:2218 builtin/init-db.c:541 builtin/prune-packed.c:16 +#: builtin/repack.c:306 builtin/stash.c:816 msgid "be quiet" msgstr "" -#: builtin/am.c:2221 +#: builtin/am.c:2220 msgid "add a Signed-off-by line to the commit message" msgstr "" -#: builtin/am.c:2224 +#: builtin/am.c:2223 msgid "recode into utf8 (default)" msgstr "" -#: builtin/am.c:2226 +#: builtin/am.c:2225 msgid "pass -k flag to git-mailinfo" msgstr "" -#: builtin/am.c:2228 +#: builtin/am.c:2227 msgid "pass -b flag to git-mailinfo" msgstr "" -#: builtin/am.c:2230 +#: builtin/am.c:2229 msgid "pass -m flag to git-mailinfo" msgstr "" -#: builtin/am.c:2232 +#: builtin/am.c:2231 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" -#: builtin/am.c:2235 +#: builtin/am.c:2234 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -#: builtin/am.c:2238 +#: builtin/am.c:2237 msgid "strip everything before a scissors line" msgstr "" -#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 -#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 -#: builtin/am.c:2267 +#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248 +#: builtin/am.c:2251 builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 +#: builtin/am.c:2266 msgid "pass it through git-apply" msgstr "" -#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670 -#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250 -#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505 -#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321 -#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:154 parse-options.h:175 parse-options.h:316 +#: builtin/am.c:2256 builtin/commit.c:1397 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:891 builtin/merge.c:252 +#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 +#: builtin/rebase.c:1329 builtin/repack.c:317 builtin/repack.c:321 +#: builtin/repack.c:323 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 +#: parse-options.h:316 msgid "n" msgstr "" -#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2262 builtin/branch.c:659 builtin/for-each-ref.c:38 +#: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38 +#: bugreport.c:131 msgid "format" msgstr "" -#: builtin/am.c:2264 +#: builtin/am.c:2263 msgid "format the patch(es) are in" msgstr "" -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "override error message when patch failure occurs" msgstr "" -#: builtin/am.c:2272 +#: builtin/am.c:2271 msgid "continue applying patches after resolving a conflict" msgstr "" -#: builtin/am.c:2275 +#: builtin/am.c:2274 msgid "synonyms for --continue" msgstr "" -#: builtin/am.c:2278 +#: builtin/am.c:2277 msgid "skip the current patch" msgstr "" -#: builtin/am.c:2281 +#: builtin/am.c:2280 msgid "restore the original branch and abort the patching operation." msgstr "" -#: builtin/am.c:2284 +#: builtin/am.c:2283 msgid "abort the patching operation but keep HEAD where it is." msgstr "" -#: builtin/am.c:2288 +#: builtin/am.c:2287 msgid "show the patch being applied" msgstr "" -#: builtin/am.c:2293 +#: builtin/am.c:2292 msgid "lie about committer date" msgstr "" -#: builtin/am.c:2295 +#: builtin/am.c:2294 msgid "use current timestamp for author date" msgstr "" -#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512 -#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517 -#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2296 builtin/commit-tree.c:120 builtin/commit.c:1517 +#: builtin/merge.c:289 builtin/pull.c:175 builtin/rebase.c:524 +#: builtin/rebase.c:1380 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "" -#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557 +#: builtin/am.c:2297 builtin/rebase.c:525 builtin/rebase.c:1381 msgid "GPG-sign commits" msgstr "" -#: builtin/am.c:2301 +#: builtin/am.c:2300 msgid "(internal use for git-rebase)" msgstr "" -#: builtin/am.c:2319 +#: builtin/am.c:2318 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "" -#: builtin/am.c:2326 +#: builtin/am.c:2325 msgid "failed to read the index" msgstr "" -#: builtin/am.c:2341 +#: builtin/am.c:2340 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" -#: builtin/am.c:2365 +#: builtin/am.c:2364 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -#: builtin/am.c:2371 +#: builtin/am.c:2370 msgid "Resolve operation not in progress, we are not resuming." msgstr "" -#: builtin/am.c:2381 +#: builtin/am.c:2380 msgid "interactive mode requires patches on the command line" msgstr "" @@ -9609,7 +9750,7 @@ msgstr "" msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:860 builtin/log.c:1702 +#: builtin/blame.c:860 builtin/log.c:1721 msgid "rev" msgstr "" @@ -9677,14 +9818,14 @@ msgstr "" msgid "4 years, 11 months ago" msgstr "" -#: builtin/blame.c:1079 +#: builtin/blame.c:1087 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "" msgstr[1] "" -#: builtin/blame.c:1125 +#: builtin/blame.c:1133 msgid "Blaming lines" msgstr "" @@ -9884,7 +10025,7 @@ msgstr "" msgid "do not use" msgstr "" -#: builtin/branch.c:626 builtin/rebase.c:513 +#: builtin/branch.c:626 builtin/rebase.c:520 msgid "upstream" msgstr "" @@ -9976,103 +10117,103 @@ msgstr "" msgid "list branches in columns" msgstr "" -#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:433 +#: builtin/tag.c:434 msgid "object" msgstr "" -#: builtin/branch.c:658 +#: builtin/branch.c:657 msgid "print only branches of the object" msgstr "" -#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440 +#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 msgid "sorting and filtering are case insensitive" msgstr "" -#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 +#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "" -#: builtin/branch.c:684 builtin/clone.c:785 +#: builtin/branch.c:682 builtin/clone.c:789 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:708 +#: builtin/branch.c:706 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 +#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 msgid "branch name required" msgstr "" -#: builtin/branch.c:753 +#: builtin/branch.c:751 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:758 +#: builtin/branch.c:756 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:765 +#: builtin/branch.c:763 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:768 +#: builtin/branch.c:766 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:783 +#: builtin/branch.c:781 msgid "too many branches for a copy operation" msgstr "" -#: builtin/branch.c:792 +#: builtin/branch.c:790 msgid "too many arguments for a rename operation" msgstr "" -#: builtin/branch.c:797 +#: builtin/branch.c:795 msgid "too many arguments to set new upstream" msgstr "" -#: builtin/branch.c:801 +#: builtin/branch.c:799 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:804 builtin/branch.c:827 +#: builtin/branch.c:802 builtin/branch.c:825 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:808 +#: builtin/branch.c:806 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:821 +#: builtin/branch.c:819 msgid "too many arguments to unset upstream" msgstr "" -#: builtin/branch.c:825 +#: builtin/branch.c:823 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:831 +#: builtin/branch.c:829 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:841 +#: builtin/branch.c:839 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" msgstr "" -#: builtin/branch.c:845 +#: builtin/branch.c:843 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -10094,19 +10235,19 @@ msgstr "" msgid "git bundle unbundle <file> [<refname>...]" msgstr "" -#: builtin/bundle.c:66 builtin/pack-objects.c:3375 +#: builtin/bundle.c:66 builtin/pack-objects.c:3376 msgid "do not show progress meter" msgstr "" -#: builtin/bundle.c:68 builtin/pack-objects.c:3377 +#: builtin/bundle.c:68 builtin/pack-objects.c:3378 msgid "show progress meter" msgstr "" -#: builtin/bundle.c:70 builtin/pack-objects.c:3379 +#: builtin/bundle.c:70 builtin/pack-objects.c:3380 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/bundle.c:73 builtin/pack-objects.c:3382 +#: builtin/bundle.c:73 builtin/pack-objects.c:3383 msgid "similar to --all-progress when progress meter is shown" msgstr "" @@ -10136,83 +10277,83 @@ msgstr "" msgid "Unknown subcommand: %s" msgstr "" -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:598 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" msgstr "" -#: builtin/cat-file.c:596 +#: builtin/cat-file.c:599 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" msgstr "" -#: builtin/cat-file.c:617 +#: builtin/cat-file.c:620 msgid "only one batch option may be specified" msgstr "" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:638 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:639 msgid "show object type" msgstr "" -#: builtin/cat-file.c:637 +#: builtin/cat-file.c:640 msgid "show object size" msgstr "" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:642 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:643 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:645 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:644 +#: builtin/cat-file.c:647 msgid "for blob objects, run filters on object's content" msgstr "" -#: builtin/cat-file.c:645 git-submodule.sh:1002 +#: builtin/cat-file.c:648 git-submodule.sh:984 msgid "blob" msgstr "" -#: builtin/cat-file.c:646 +#: builtin/cat-file.c:649 msgid "use a specific path for --textconv/--filters" msgstr "" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:651 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:652 msgid "buffer --batch output" msgstr "" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:654 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:655 +#: builtin/cat-file.c:658 msgid "show info about objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:659 +#: builtin/cat-file.c:662 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" -#: builtin/cat-file.c:661 +#: builtin/cat-file.c:664 msgid "show all objects with --batch or --batch-check" msgstr "" -#: builtin/cat-file.c:663 +#: builtin/cat-file.c:666 msgid "do not order --batch-all-objects output" msgstr "" @@ -10240,8 +10381,8 @@ msgstr "" msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537 -#: builtin/worktree.c:499 +#: builtin/check-ignore.c:21 builtin/checkout.c:1488 builtin/gc.c:537 +#: builtin/worktree.c:502 msgid "suppress progress reporting" msgstr "" @@ -10333,7 +10474,7 @@ msgstr "" #: builtin/checkout-index.c:178 builtin/column.c:31 #: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 #: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 -#: builtin/worktree.c:672 +#: builtin/worktree.c:675 msgid "string" msgstr "" @@ -10361,148 +10502,148 @@ msgstr "" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "" -#: builtin/checkout.c:175 builtin/checkout.c:214 +#: builtin/checkout.c:188 builtin/checkout.c:227 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:177 builtin/checkout.c:216 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:193 +#: builtin/checkout.c:206 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/checkout.c:243 +#: builtin/checkout.c:256 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/checkout.c:261 +#: builtin/checkout.c:274 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:277 +#: builtin/checkout.c:290 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:377 +#: builtin/checkout.c:395 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:382 +#: builtin/checkout.c:400 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:389 +#: builtin/checkout.c:407 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418 -#: builtin/checkout.c:422 +#: builtin/checkout.c:430 builtin/checkout.c:433 builtin/checkout.c:436 +#: builtin/checkout.c:440 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:425 builtin/checkout.c:428 +#: builtin/checkout.c:443 builtin/checkout.c:446 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:432 +#: builtin/checkout.c:450 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -#: builtin/checkout.c:436 +#: builtin/checkout.c:454 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "" -#: builtin/checkout.c:440 +#: builtin/checkout.c:458 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "" -#: builtin/checkout.c:445 builtin/checkout.c:450 +#: builtin/checkout.c:463 builtin/checkout.c:468 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:509 builtin/checkout.c:516 +#: builtin/checkout.c:527 builtin/checkout.c:534 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:684 builtin/sparse-checkout.c:106 +#: builtin/checkout.c:704 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:734 +#: builtin/checkout.c:758 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" "%s" msgstr "" -#: builtin/checkout.c:837 +#: builtin/checkout.c:861 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:879 +#: builtin/checkout.c:903 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:883 builtin/clone.c:717 +#: builtin/checkout.c:907 builtin/clone.c:720 msgid "unable to update HEAD" msgstr "" -#: builtin/checkout.c:887 +#: builtin/checkout.c:911 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:890 +#: builtin/checkout.c:914 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:894 +#: builtin/checkout.c:918 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:896 builtin/checkout.c:1320 +#: builtin/checkout.c:920 builtin/checkout.c:1344 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:898 +#: builtin/checkout.c:922 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:949 +#: builtin/checkout.c:973 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:955 +#: builtin/checkout.c:979 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10517,7 +10658,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:974 +#: builtin/checkout.c:998 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10534,26 +10675,26 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1033 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:1013 +#: builtin/checkout.c:1037 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:1053 builtin/checkout.c:1315 +#: builtin/checkout.c:1077 builtin/checkout.c:1339 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:1128 +#: builtin/checkout.c:1152 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" "Please use -- (and optionally --no-guess) to disambiguate" msgstr "" -#: builtin/checkout.c:1135 +#: builtin/checkout.c:1159 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -10565,323 +10706,325 @@ msgid "" "checkout.defaultRemote=origin in your config." msgstr "" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1169 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "" -#: builtin/checkout.c:1211 +#: builtin/checkout.c:1235 msgid "only one reference expected" msgstr "" -#: builtin/checkout.c:1228 +#: builtin/checkout.c:1252 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448 +#: builtin/checkout.c:1298 builtin/worktree.c:283 builtin/worktree.c:451 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1287 builtin/checkout.c:1649 +#: builtin/checkout.c:1311 builtin/checkout.c:1677 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1334 +#: builtin/checkout.c:1358 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "" -#: builtin/checkout.c:1336 +#: builtin/checkout.c:1360 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "" -#: builtin/checkout.c:1337 builtin/checkout.c:1345 +#: builtin/checkout.c:1361 builtin/checkout.c:1369 #, c-format msgid "a branch is expected, got '%s'" msgstr "" -#: builtin/checkout.c:1340 +#: builtin/checkout.c:1364 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "" -#: builtin/checkout.c:1356 +#: builtin/checkout.c:1380 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1360 +#: builtin/checkout.c:1384 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1364 +#: builtin/checkout.c:1388 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1368 +#: builtin/checkout.c:1392 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1372 +#: builtin/checkout.c:1396 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1376 +#: builtin/checkout.c:1400 msgid "you are switching branch while bisecting" msgstr "" -#: builtin/checkout.c:1383 +#: builtin/checkout.c:1407 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394 +#: builtin/checkout.c:1410 builtin/checkout.c:1414 builtin/checkout.c:1418 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404 -#: builtin/checkout.c:1409 builtin/checkout.c:1414 +#: builtin/checkout.c:1422 builtin/checkout.c:1425 builtin/checkout.c:1428 +#: builtin/checkout.c:1433 builtin/checkout.c:1438 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1411 +#: builtin/checkout.c:1435 #, c-format msgid "'%s' cannot take <start-point>" msgstr "" -#: builtin/checkout.c:1419 +#: builtin/checkout.c:1443 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1426 +#: builtin/checkout.c:1450 msgid "missing branch or commit argument" msgstr "" -#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72 -#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286 -#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563 -#: builtin/send-pack.c:174 +#: builtin/checkout.c:1492 builtin/clone.c:91 builtin/commit-graph.c:80 +#: builtin/commit-graph.c:164 builtin/fetch.c:168 builtin/merge.c:288 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561 +#: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "" -#: builtin/checkout.c:1469 +#: builtin/checkout.c:1493 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322 +#: builtin/checkout.c:1494 builtin/log.c:1709 parse-options.h:322 msgid "style" msgstr "" -#: builtin/checkout.c:1471 +#: builtin/checkout.c:1495 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1483 builtin/worktree.c:496 +#: builtin/checkout.c:1507 builtin/worktree.c:499 msgid "detach HEAD at named commit" msgstr "" -#: builtin/checkout.c:1484 +#: builtin/checkout.c:1508 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1486 +#: builtin/checkout.c:1510 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1488 +#: builtin/checkout.c:1512 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1488 +#: builtin/checkout.c:1512 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1490 builtin/merge.c:289 +#: builtin/checkout.c:1514 builtin/merge.c:292 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1493 +#: builtin/checkout.c:1517 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1530 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1509 +#: builtin/checkout.c:1533 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1513 +#: builtin/checkout.c:1537 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1565 -msgid "-b, -B and --orphan are mutually exclusive" +#: builtin/checkout.c:1592 +#, c-format +msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1568 +#: builtin/checkout.c:1596 msgid "-p and --overlay are mutually exclusive" msgstr "" -#: builtin/checkout.c:1605 +#: builtin/checkout.c:1633 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1610 -msgid "missing branch name; try -b" +#: builtin/checkout.c:1638 +#, c-format +msgid "missing branch name; try -%c" msgstr "" -#: builtin/checkout.c:1642 +#: builtin/checkout.c:1670 #, c-format msgid "could not resolve %s" msgstr "" -#: builtin/checkout.c:1658 +#: builtin/checkout.c:1686 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1693 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" -#: builtin/checkout.c:1669 +#: builtin/checkout.c:1697 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1678 +#: builtin/checkout.c:1706 msgid "--pathspec-from-file is incompatible with --detach" msgstr "" -#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506 +#: builtin/checkout.c:1709 builtin/reset.c:325 builtin/stash.c:1503 msgid "--pathspec-from-file is incompatible with --patch" msgstr "" -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1720 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1725 msgid "you must specify path(s) to restore" msgstr "" -#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774 -#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494 +#: builtin/checkout.c:1751 builtin/checkout.c:1753 builtin/checkout.c:1802 +#: builtin/checkout.c:1804 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/worktree.c:495 builtin/worktree.c:497 msgid "branch" msgstr "" -#: builtin/checkout.c:1724 +#: builtin/checkout.c:1752 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1726 +#: builtin/checkout.c:1754 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1727 +#: builtin/checkout.c:1755 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1729 +#: builtin/checkout.c:1757 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "" -#: builtin/checkout.c:1730 +#: builtin/checkout.c:1758 msgid "use overlay mode (default)" msgstr "" -#: builtin/checkout.c:1775 +#: builtin/checkout.c:1803 msgid "create and switch to a new branch" msgstr "" -#: builtin/checkout.c:1777 +#: builtin/checkout.c:1805 msgid "create/reset and switch to a branch" msgstr "" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1807 msgid "second guess 'git switch <no-such-branch>'" msgstr "" -#: builtin/checkout.c:1781 +#: builtin/checkout.c:1809 msgid "throw away local modifications" msgstr "" -#: builtin/checkout.c:1813 +#: builtin/checkout.c:1843 msgid "which tree-ish to checkout from" msgstr "" -#: builtin/checkout.c:1815 +#: builtin/checkout.c:1845 msgid "restore the index" msgstr "" -#: builtin/checkout.c:1817 +#: builtin/checkout.c:1847 msgid "restore the working tree (default)" msgstr "" -#: builtin/checkout.c:1819 +#: builtin/checkout.c:1849 msgid "ignore unmerged entries" msgstr "" -#: builtin/checkout.c:1820 +#: builtin/checkout.c:1850 msgid "use overlay mode" msgstr "" -#: builtin/clean.c:28 +#: builtin/clean.c:29 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Removing %s\n" msgstr "" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Would remove %s\n" msgstr "" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "Skipping repository %s\n" msgstr "" -#: builtin/clean.c:35 +#: builtin/clean.c:36 #, c-format msgid "Would skip repository %s\n" msgstr "" -#: builtin/clean.c:36 +#: builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "" -#: builtin/clean.c:37 +#: builtin/clean.c:38 #, c-format msgid "could not lstat %s\n" msgstr "" -#: builtin/clean.c:301 git-add--interactive.perl:595 +#: builtin/clean.c:302 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -10890,7 +11033,7 @@ msgid "" " - (empty) select nothing\n" msgstr "" -#: builtin/clean.c:305 git-add--interactive.perl:604 +#: builtin/clean.c:306 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -10909,27 +11052,27 @@ msgstr "" msgid "Huh (%s)?\n" msgstr "" -#: builtin/clean.c:663 +#: builtin/clean.c:661 #, c-format msgid "Input ignore patterns>> " msgstr "" -#: builtin/clean.c:700 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "" -#: builtin/clean.c:721 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "" -#: builtin/clean.c:795 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -10940,62 +11083,62 @@ msgid "" "? - help for prompt selection" msgstr "" -#: builtin/clean.c:831 +#: builtin/clean.c:825 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "" msgstr[1] "" -#: builtin/clean.c:847 +#: builtin/clean.c:841 msgid "No more files to clean, exiting." msgstr "" -#: builtin/clean.c:909 +#: builtin/clean.c:903 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:911 +#: builtin/clean.c:905 msgid "force" msgstr "" -#: builtin/clean.c:912 +#: builtin/clean.c:906 msgid "interactive cleaning" msgstr "" -#: builtin/clean.c:914 +#: builtin/clean.c:908 msgid "remove whole directories" msgstr "" -#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564 -#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179 -#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:909 builtin/log.c:182 builtin/log.c:184 +#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "" -#: builtin/clean.c:916 +#: builtin/clean.c:910 msgid "add <pattern> to ignore rules" msgstr "" -#: builtin/clean.c:917 +#: builtin/clean.c:911 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:919 +#: builtin/clean.c:913 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:937 +#: builtin/clean.c:931 msgid "-x and -X cannot be used together" msgstr "" -#: builtin/clean.c:941 +#: builtin/clean.c:935 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" -#: builtin/clean.c:944 +#: builtin/clean.c:938 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -11009,7 +11152,7 @@ msgstr "" msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:536 msgid "create a bare repository" msgstr "" @@ -11029,11 +11172,11 @@ msgstr "" msgid "setup as shared repository" msgstr "" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "pathspec" msgstr "" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "initialize submodules in the clone" msgstr "" @@ -11041,11 +11184,11 @@ msgstr "" msgid "number of submodules cloned in parallel" msgstr "" -#: builtin/clone.c:111 builtin/init-db.c:486 +#: builtin/clone.c:111 builtin/init-db.c:533 msgid "template-directory" msgstr "" -#: builtin/clone.c:112 builtin/init-db.c:487 +#: builtin/clone.c:112 builtin/init-db.c:534 msgid "directory from which templates will be used" msgstr "" @@ -11060,7 +11203,7 @@ msgid "use --reference only while cloning" msgstr "" #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3441 builtin/repack.c:327 +#: builtin/pack-objects.c:3442 builtin/repack.c:329 msgid "name" msgstr "" @@ -11076,8 +11219,8 @@ msgstr "" msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828 -#: builtin/pull.c:207 +#: builtin/clone.c:125 builtin/fetch.c:169 builtin/grep.c:848 +#: builtin/pull.c:208 msgid "depth" msgstr "" @@ -11085,7 +11228,8 @@ msgstr "" msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430 +#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3431 +#: builtin/pull.c:211 msgid "time" msgstr "" @@ -11093,12 +11237,12 @@ msgstr "" msgid "create a shallow clone since a specific time" msgstr "" -#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 -#: builtin/rebase.c:1480 +#: builtin/clone.c:129 builtin/fetch.c:173 builtin/fetch.c:196 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1304 msgid "revision" msgstr "" -#: builtin/clone.c:130 builtin/fetch.c:173 +#: builtin/clone.c:130 builtin/fetch.c:174 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "" @@ -11115,11 +11259,11 @@ msgstr "" msgid "any cloned submodules will be shallow" msgstr "" -#: builtin/clone.c:137 builtin/init-db.c:495 +#: builtin/clone.c:137 builtin/init-db.c:542 msgid "gitdir" msgstr "" -#: builtin/clone.c:138 builtin/init-db.c:496 +#: builtin/clone.c:138 builtin/init-db.c:543 msgid "separate git dir from working tree" msgstr "" @@ -11131,23 +11275,23 @@ msgstr "" msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76 +#: builtin/pull.c:230 builtin/push.c:570 builtin/send-pack.c:171 msgid "server-specific" msgstr "" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76 +#: builtin/pull.c:231 builtin/push.c:570 builtin/send-pack.c:172 msgid "option to transmit" msgstr "" -#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220 -#: builtin/push.c:574 +#: builtin/clone.c:143 builtin/fetch.c:192 builtin/pull.c:234 +#: builtin/push.c:571 msgid "use IPv4 addresses only" msgstr "" -#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223 -#: builtin/push.c:576 +#: builtin/clone.c:145 builtin/fetch.c:194 builtin/pull.c:237 +#: builtin/push.c:573 msgid "use IPv6 addresses only" msgstr "" @@ -11175,166 +11319,166 @@ msgstr "" msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:430 +#: builtin/clone.c:431 #, c-format msgid "failed to start iterator over '%s'" msgstr "" -#: builtin/clone.c:460 +#: builtin/clone.c:462 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:464 +#: builtin/clone.c:466 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:469 +#: builtin/clone.c:471 #, c-format msgid "failed to iterate over '%s'" msgstr "" -#: builtin/clone.c:494 +#: builtin/clone.c:498 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:508 +#: builtin/clone.c:512 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry with 'git restore --source=HEAD :/'\n" msgstr "" -#: builtin/clone.c:585 +#: builtin/clone.c:589 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:705 +#: builtin/clone.c:708 #, c-format msgid "unable to update %s" msgstr "" -#: builtin/clone.c:753 +#: builtin/clone.c:756 msgid "failed to initialize sparse-checkout" msgstr "" -#: builtin/clone.c:776 +#: builtin/clone.c:779 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:807 +#: builtin/clone.c:811 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:862 +#: builtin/clone.c:868 msgid "unable to write parameters to config file" msgstr "" -#: builtin/clone.c:925 +#: builtin/clone.c:931 msgid "cannot repack to clean up" msgstr "" -#: builtin/clone.c:927 +#: builtin/clone.c:933 msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:965 builtin/receive-pack.c:1950 +#: builtin/clone.c:971 builtin/receive-pack.c:1972 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:969 +#: builtin/clone.c:975 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:982 +#: builtin/clone.c:988 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:985 +#: builtin/clone.c:991 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:998 +#: builtin/clone.c:1004 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:1004 builtin/fetch.c:1796 +#: builtin/clone.c:1010 builtin/fetch.c:1789 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:1014 +#: builtin/clone.c:1020 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:1024 +#: builtin/clone.c:1030 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271 -#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327 +#: builtin/clone.c:1045 builtin/clone.c:1066 builtin/difftool.c:271 +#: builtin/log.c:1886 builtin/worktree.c:295 builtin/worktree.c:327 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:1044 +#: builtin/clone.c:1050 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:1064 +#: builtin/clone.c:1070 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:1066 +#: builtin/clone.c:1072 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:1090 +#: builtin/clone.c:1096 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" -#: builtin/clone.c:1154 +#: builtin/clone.c:1160 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1156 +#: builtin/clone.c:1162 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1158 +#: builtin/clone.c:1164 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1160 +#: builtin/clone.c:1166 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1163 +#: builtin/clone.c:1169 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:1168 +#: builtin/clone.c:1174 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:1243 builtin/clone.c:1251 +#: builtin/clone.c:1249 builtin/clone.c:1257 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:1254 +#: builtin/clone.c:1260 msgid "You appear to have cloned an empty repository." msgstr "" @@ -11370,6 +11514,92 @@ msgstr "" msgid "--command must be the first argument" msgstr "" +#: builtin/commit-graph.c:11 builtin/commit-graph.c:19 +msgid "" +"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +msgstr "" + +#: builtin/commit-graph.c:12 builtin/commit-graph.c:24 +msgid "" +"git commit-graph write [--object-dir <objdir>] [--append] [--" +"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]progress] <split options>" +msgstr "" + +#: builtin/commit-graph.c:60 +#, c-format +msgid "could not find object directory matching %s" +msgstr "" + +#: builtin/commit-graph.c:76 builtin/commit-graph.c:152 +#: builtin/commit-graph.c:257 builtin/fetch.c:180 builtin/log.c:1678 +msgid "dir" +msgstr "" + +#: builtin/commit-graph.c:77 builtin/commit-graph.c:153 +#: builtin/commit-graph.c:258 +msgid "The object directory to store the graph" +msgstr "" + +#: builtin/commit-graph.c:79 +msgid "if the commit-graph is split, only verify the tip file" +msgstr "" + +#: builtin/commit-graph.c:102 +#, c-format +msgid "Could not open commit-graph '%s'" +msgstr "" + +#: builtin/commit-graph.c:136 +#, c-format +msgid "unrecognized --split argument, %s" +msgstr "" + +#: builtin/commit-graph.c:155 +msgid "start walk at all refs" +msgstr "" + +#: builtin/commit-graph.c:157 +msgid "scan pack-indexes listed by stdin for commits" +msgstr "" + +#: builtin/commit-graph.c:159 +msgid "start walk at commits listed by stdin" +msgstr "" + +#: builtin/commit-graph.c:161 +msgid "include all commits already in the commit-graph file" +msgstr "" + +#: builtin/commit-graph.c:163 +msgid "enable computation for changed paths" +msgstr "" + +#: builtin/commit-graph.c:166 +msgid "allow writing an incremental commit-graph file" +msgstr "" + +#: builtin/commit-graph.c:170 +msgid "maximum number of commits in a non-base split commit-graph" +msgstr "" + +#: builtin/commit-graph.c:172 +msgid "maximum ratio between two levels of a split commit-graph" +msgstr "" + +#: builtin/commit-graph.c:174 +msgid "only expire files older than a given date-time" +msgstr "" + +#: builtin/commit-graph.c:190 +msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" +msgstr "" + +#: builtin/commit-graph.c:229 +#, c-format +msgid "unexpected non-hex object ID: %s" +msgstr "" + #: builtin/commit-tree.c:18 msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " @@ -11381,7 +11611,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:547 #, c-format msgid "not a valid object name %s" msgstr "" @@ -11409,13 +11639,13 @@ msgstr "" msgid "id of a parent commit object" msgstr "" -#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477 -#: builtin/tag.c:412 +#: builtin/commit-tree.c:114 builtin/commit.c:1506 builtin/merge.c:273 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1474 +#: builtin/tag.c:413 msgid "message" msgstr "" -#: builtin/commit-tree.c:115 builtin/commit.c:1501 +#: builtin/commit-tree.c:115 builtin/commit.c:1506 msgid "commit message" msgstr "" @@ -11423,8 +11653,8 @@ msgstr "" msgid "read commit log message from file" msgstr "" -#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288 -#: builtin/pull.c:175 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1518 builtin/merge.c:290 +#: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "" @@ -11461,10 +11691,14 @@ msgid "" msgstr "" #: builtin/commit.c:63 -msgid "Otherwise, please use 'git cherry-pick --skip'\n" +msgid "Otherwise, please use 'git rebase --skip'\n" msgstr "" #: builtin/commit.c:66 +msgid "Otherwise, please use 'git cherry-pick --skip'\n" +msgstr "" + +#: builtin/commit.c:69 msgid "" "and then use:\n" "\n" @@ -11477,106 +11711,110 @@ msgid "" "\n" msgstr "" -#: builtin/commit.c:315 +#: builtin/commit.c:312 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:351 +#: builtin/commit.c:348 msgid "--pathspec-from-file with -a does not make sense" msgstr "" -#: builtin/commit.c:364 +#: builtin/commit.c:361 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:376 +#: builtin/commit.c:373 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:385 +#: builtin/commit.c:382 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:400 +#: builtin/commit.c:397 msgid "unable to update temporary index" msgstr "" -#: builtin/commit.c:402 +#: builtin/commit.c:399 msgid "Failed to update main cache tree" msgstr "" -#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496 +#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:479 +#: builtin/commit.c:476 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:481 +#: builtin/commit.c:478 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:489 +#: builtin/commit.c:480 +msgid "cannot do a partial commit during a rebase." +msgstr "" + +#: builtin/commit.c:488 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:508 +#: builtin/commit.c:507 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:606 +#: builtin/commit.c:605 #, c-format msgid "commit '%s' lacks author header" msgstr "" -#: builtin/commit.c:608 +#: builtin/commit.c:607 #, c-format msgid "commit '%s' has malformed author line" msgstr "" -#: builtin/commit.c:627 +#: builtin/commit.c:626 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:680 +#: builtin/commit.c:679 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097 +#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1099 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:730 builtin/shortlog.c:319 +#: builtin/commit.c:729 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:732 +#: builtin/commit.c:731 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:736 +#: builtin/commit.c:735 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:767 builtin/commit.c:783 +#: builtin/commit.c:766 builtin/commit.c:782 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:774 +#: builtin/commit.c:773 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:834 +#: builtin/commit.c:833 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:853 +#: builtin/commit.c:852 #, c-format msgid "" "\n" @@ -11586,7 +11824,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:858 +#: builtin/commit.c:857 #, c-format msgid "" "\n" @@ -11596,14 +11834,14 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:871 +#: builtin/commit.c:870 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:879 +#: builtin/commit.c:878 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11611,389 +11849,326 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:896 +#: builtin/commit.c:895 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:904 +#: builtin/commit.c:903 #, c-format msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:911 +#: builtin/commit.c:910 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:929 +#: builtin/commit.c:928 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:997 +#: builtin/commit.c:999 msgid "Error building trees" msgstr "" -#: builtin/commit.c:1011 builtin/tag.c:275 +#: builtin/commit.c:1013 builtin/tag.c:276 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:1055 +#: builtin/commit.c:1057 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" -#: builtin/commit.c:1069 +#: builtin/commit.c:1071 #, c-format msgid "Invalid ignored mode '%s'" msgstr "" -#: builtin/commit.c:1087 builtin/commit.c:1327 +#: builtin/commit.c:1089 builtin/commit.c:1333 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1127 +#: builtin/commit.c:1129 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1171 +#: builtin/commit.c:1173 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1180 +#: builtin/commit.c:1182 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1183 +#: builtin/commit.c:1185 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1185 +#: builtin/commit.c:1187 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1188 +#: builtin/commit.c:1189 +msgid "You are in the middle of a rebase -- cannot amend." +msgstr "" + +#: builtin/commit.c:1192 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1198 +#: builtin/commit.c:1202 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1200 +#: builtin/commit.c:1204 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "" -#: builtin/commit.c:1208 +#: builtin/commit.c:1213 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1225 +#: builtin/commit.c:1231 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1231 +#: builtin/commit.c:1237 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "" -#: builtin/commit.c:1362 builtin/commit.c:1524 +#: builtin/commit.c:1368 builtin/commit.c:1529 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1364 builtin/commit.c:1526 +#: builtin/commit.c:1370 builtin/commit.c:1531 msgid "show branch information" msgstr "" -#: builtin/commit.c:1366 +#: builtin/commit.c:1372 msgid "show stash information" msgstr "" -#: builtin/commit.c:1368 builtin/commit.c:1528 +#: builtin/commit.c:1374 builtin/commit.c:1533 msgid "compute full ahead/behind values" msgstr "" -#: builtin/commit.c:1370 +#: builtin/commit.c:1376 msgid "version" msgstr "" -#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549 -#: builtin/worktree.c:643 +#: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549 +#: builtin/worktree.c:646 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1373 builtin/commit.c:1532 +#: builtin/commit.c:1379 builtin/commit.c:1537 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1376 builtin/commit.c:1535 +#: builtin/commit.c:1382 builtin/commit.c:1540 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538 +#: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543 #: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336 +#: builtin/fast-export.c:1159 builtin/rebase.c:1392 parse-options.h:336 msgid "mode" msgstr "" -#: builtin/commit.c:1379 builtin/commit.c:1538 +#: builtin/commit.c:1385 builtin/commit.c:1543 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1383 +#: builtin/commit.c:1389 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" -#: builtin/commit.c:1385 parse-options.h:192 +#: builtin/commit.c:1391 parse-options.h:192 msgid "when" msgstr "" -#: builtin/commit.c:1386 +#: builtin/commit.c:1392 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1388 +#: builtin/commit.c:1394 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1389 +#: builtin/commit.c:1395 msgid "do not detect renames" msgstr "" -#: builtin/commit.c:1391 +#: builtin/commit.c:1397 msgid "detect renames, optionally set similarity index" msgstr "" -#: builtin/commit.c:1411 +#: builtin/commit.c:1417 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" -#: builtin/commit.c:1494 +#: builtin/commit.c:1499 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1495 +#: builtin/commit.c:1500 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1497 +#: builtin/commit.c:1502 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414 +#: builtin/commit.c:1503 builtin/merge.c:277 builtin/tag.c:415 msgid "read message from file" msgstr "" -#: builtin/commit.c:1499 +#: builtin/commit.c:1504 msgid "author" msgstr "" -#: builtin/commit.c:1499 +#: builtin/commit.c:1504 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1500 builtin/gc.c:538 +#: builtin/commit.c:1505 builtin/gc.c:538 msgid "date" msgstr "" -#: builtin/commit.c:1500 +#: builtin/commit.c:1505 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504 -#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92 +#: builtin/commit.c:1507 builtin/commit.c:1508 builtin/commit.c:1509 +#: builtin/commit.c:1510 parse-options.h:328 ref-filter.h:92 msgid "commit" msgstr "" -#: builtin/commit.c:1502 +#: builtin/commit.c:1507 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1503 +#: builtin/commit.c:1508 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1504 +#: builtin/commit.c:1509 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1505 +#: builtin/commit.c:1510 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1506 +#: builtin/commit.c:1511 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290 -#: builtin/pull.c:144 builtin/revert.c:110 +#: builtin/commit.c:1512 builtin/log.c:1655 builtin/merge.c:293 +#: builtin/pull.c:145 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1508 +#: builtin/commit.c:1513 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1509 +#: builtin/commit.c:1514 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1511 +#: builtin/commit.c:1516 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1516 +#: builtin/commit.c:1521 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1517 +#: builtin/commit.c:1522 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1518 +#: builtin/commit.c:1523 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1519 +#: builtin/commit.c:1524 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1520 +#: builtin/commit.c:1525 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1521 +#: builtin/commit.c:1526 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1522 +#: builtin/commit.c:1527 msgid "bypass pre-commit and commit-msg hooks" msgstr "" -#: builtin/commit.c:1523 +#: builtin/commit.c:1528 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1536 +#: builtin/commit.c:1541 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1537 +#: builtin/commit.c:1542 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1544 +#: builtin/commit.c:1549 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1546 +#: builtin/commit.c:1551 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1619 +#: builtin/commit.c:1624 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1626 +#: builtin/commit.c:1631 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1645 +#: builtin/commit.c:1652 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1652 +#: builtin/commit.c:1659 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1657 +#: builtin/commit.c:1664 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1691 +#: builtin/commit.c:1698 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git restore --staged :/\" to recover." msgstr "" -#: builtin/commit-graph.c:11 builtin/commit-graph.c:17 -msgid "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" -msgstr "" - -#: builtin/commit-graph.c:12 builtin/commit-graph.c:22 -msgid "" -"git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" -msgstr "" - -#: builtin/commit-graph.c:52 -#, c-format -msgid "could not find object directory matching %s" -msgstr "" - -#: builtin/commit-graph.c:68 builtin/commit-graph.c:125 -#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657 -msgid "dir" -msgstr "" - -#: builtin/commit-graph.c:69 builtin/commit-graph.c:126 -#: builtin/commit-graph.c:211 -msgid "The object directory to store the graph" -msgstr "" - -#: builtin/commit-graph.c:71 -msgid "if the commit-graph is split, only verify the tip file" -msgstr "" - -#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23 -#, c-format -msgid "Could not open commit-graph '%s'" -msgstr "" - -#: builtin/commit-graph.c:128 -msgid "start walk at all refs" -msgstr "" - -#: builtin/commit-graph.c:130 -msgid "scan pack-indexes listed by stdin for commits" -msgstr "" - -#: builtin/commit-graph.c:132 -msgid "start walk at commits listed by stdin" -msgstr "" - -#: builtin/commit-graph.c:134 -msgid "include all commits already in the commit-graph file" -msgstr "" - -#: builtin/commit-graph.c:137 -msgid "allow writing an incremental commit-graph file" -msgstr "" - -#: builtin/commit-graph.c:139 builtin/commit-graph.c:143 -msgid "maximum number of commits in a non-base split commit-graph" -msgstr "" - -#: builtin/commit-graph.c:141 -msgid "maximum ratio between two levels of a split commit-graph" -msgstr "" - -#: builtin/commit-graph.c:159 -msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" -msgstr "" - #: builtin/config.c:11 msgid "git config [<options>]" msgstr "" @@ -12305,158 +12480,153 @@ msgstr "" msgid "git describe [<options>] --dirty" msgstr "" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "head" msgstr "" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "lightweight" msgstr "" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "annotated" msgstr "" -#: builtin/describe.c:275 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s not available" msgstr "" -#: builtin/describe.c:279 -#, c-format -msgid "annotated tag %s has no embedded name" -msgstr "" - #: builtin/describe.c:281 #, c-format -msgid "tag '%s' is really '%s' here" +msgid "tag '%s' is externally known as '%s'" msgstr "" -#: builtin/describe.c:325 +#: builtin/describe.c:328 #, c-format msgid "no tag exactly matches '%s'" msgstr "" -#: builtin/describe.c:327 +#: builtin/describe.c:330 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" -#: builtin/describe.c:394 +#: builtin/describe.c:397 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:421 +#: builtin/describe.c:424 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -#: builtin/describe.c:425 +#: builtin/describe.c:428 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:455 +#: builtin/describe.c:458 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:458 +#: builtin/describe.c:461 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -#: builtin/describe.c:526 +#: builtin/describe.c:529 #, c-format msgid "describe %s\n" msgstr "" -#: builtin/describe.c:529 +#: builtin/describe.c:532 #, c-format msgid "Not a valid object name %s" msgstr "" -#: builtin/describe.c:537 +#: builtin/describe.c:540 #, c-format msgid "%s is neither a commit nor blob" msgstr "" -#: builtin/describe.c:551 +#: builtin/describe.c:554 msgid "find the tag that comes after the commit" msgstr "" -#: builtin/describe.c:552 +#: builtin/describe.c:555 msgid "debug search strategy on stderr" msgstr "" -#: builtin/describe.c:553 +#: builtin/describe.c:556 msgid "use any ref" msgstr "" -#: builtin/describe.c:554 +#: builtin/describe.c:557 msgid "use any tag, even unannotated" msgstr "" -#: builtin/describe.c:555 +#: builtin/describe.c:558 msgid "always use long format" msgstr "" -#: builtin/describe.c:556 +#: builtin/describe.c:559 msgid "only follow first parent" msgstr "" -#: builtin/describe.c:559 +#: builtin/describe.c:562 msgid "only output exact matches" msgstr "" -#: builtin/describe.c:561 +#: builtin/describe.c:564 msgid "consider <n> most recent tags (default: 10)" msgstr "" -#: builtin/describe.c:563 +#: builtin/describe.c:566 msgid "only consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:565 +#: builtin/describe.c:568 msgid "do not consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:567 builtin/name-rev.c:535 +#: builtin/describe.c:570 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" msgstr "" -#: builtin/describe.c:568 builtin/describe.c:571 +#: builtin/describe.c:571 builtin/describe.c:574 msgid "mark" msgstr "" -#: builtin/describe.c:569 +#: builtin/describe.c:572 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" -#: builtin/describe.c:572 +#: builtin/describe.c:575 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" -#: builtin/describe.c:590 +#: builtin/describe.c:593 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:619 +#: builtin/describe.c:622 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:670 +#: builtin/describe.c:673 msgid "--dirty is incompatible with commit-ishes" msgstr "" -#: builtin/describe.c:672 +#: builtin/describe.c:675 msgid "--broken is incompatible with commit-ishes" msgstr "" @@ -12679,7 +12849,7 @@ msgstr "" msgid "Skip output of blob data" msgstr "" -#: builtin/fast-export.c:1177 builtin/log.c:1705 +#: builtin/fast-export.c:1177 builtin/log.c:1724 msgid "refspec" msgstr "" @@ -12707,203 +12877,204 @@ msgstr "" msgid "Cannot pass both --import-marks and --import-marks-if-exists" msgstr "" -#: builtin/fetch.c:34 +#: builtin/fetch.c:35 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/fetch.c:35 +#: builtin/fetch.c:36 msgid "git fetch [<options>] <group>" msgstr "" -#: builtin/fetch.c:36 +#: builtin/fetch.c:37 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "" -#: builtin/fetch.c:37 +#: builtin/fetch.c:38 msgid "git fetch --all [<options>]" msgstr "" -#: builtin/fetch.c:116 +#: builtin/fetch.c:117 msgid "fetch.parallel cannot be negative" msgstr "" -#: builtin/fetch.c:139 builtin/pull.c:184 +#: builtin/fetch.c:140 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:141 builtin/pull.c:228 +#: builtin/fetch.c:142 builtin/pull.c:245 msgid "set upstream for git pull/fetch" msgstr "" -#: builtin/fetch.c:143 builtin/pull.c:187 +#: builtin/fetch.c:144 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:145 builtin/pull.c:190 +#: builtin/fetch.c:146 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:146 +#: builtin/fetch.c:147 msgid "force overwrite of local reference" msgstr "" -#: builtin/fetch.c:148 +#: builtin/fetch.c:149 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:150 builtin/pull.c:194 +#: builtin/fetch.c:151 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:152 +#: builtin/fetch.c:153 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:154 +#: builtin/fetch.c:155 msgid "number of submodules fetched in parallel" msgstr "" -#: builtin/fetch.c:156 builtin/pull.c:197 +#: builtin/fetch.c:157 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:158 +#: builtin/fetch.c:159 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" -#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121 +#: builtin/fetch.c:160 builtin/fetch.c:183 builtin/pull.c:122 msgid "on-demand" msgstr "" -#: builtin/fetch.c:160 +#: builtin/fetch.c:161 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:164 builtin/pull.c:205 +#: builtin/fetch.c:165 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:166 +#: builtin/fetch.c:167 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208 +#: builtin/fetch.c:170 builtin/fetch.c:176 builtin/pull.c:209 +#: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:171 +#: builtin/fetch.c:172 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "" -#: builtin/fetch.c:177 builtin/pull.c:211 +#: builtin/fetch.c:178 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:180 +#: builtin/fetch.c:181 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:183 +#: builtin/fetch.c:184 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "" -#: builtin/fetch.c:187 builtin/pull.c:214 +#: builtin/fetch.c:188 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:188 builtin/pull.c:216 +#: builtin/fetch.c:189 builtin/pull.c:226 msgid "refmap" msgstr "" -#: builtin/fetch.c:189 builtin/pull.c:217 +#: builtin/fetch.c:190 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:196 +#: builtin/fetch.c:197 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" msgstr "" -#: builtin/fetch.c:199 +#: builtin/fetch.c:200 msgid "run 'gc --auto' after fetching" msgstr "" -#: builtin/fetch.c:201 builtin/pull.c:226 +#: builtin/fetch.c:202 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "" -#: builtin/fetch.c:203 +#: builtin/fetch.c:204 msgid "write the commit-graph after fetching" msgstr "" -#: builtin/fetch.c:513 +#: builtin/fetch.c:514 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:653 +#: builtin/fetch.c:654 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" -#: builtin/fetch.c:751 +#: builtin/fetch.c:752 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:755 +#: builtin/fetch.c:756 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856 +#: builtin/fetch.c:769 builtin/fetch.c:785 builtin/fetch.c:857 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:769 +#: builtin/fetch.c:770 msgid "can't fetch in current branch" msgstr "" -#: builtin/fetch.c:779 +#: builtin/fetch.c:780 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839 -#: builtin/fetch.c:851 +#: builtin/fetch.c:781 builtin/fetch.c:818 builtin/fetch.c:840 +#: builtin/fetch.c:852 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:784 +#: builtin/fetch.c:785 msgid "would clobber existing tag" msgstr "" -#: builtin/fetch.c:806 +#: builtin/fetch.c:807 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:809 +#: builtin/fetch.c:810 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:812 +#: builtin/fetch.c:813 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:851 +#: builtin/fetch.c:852 msgid "forced update" msgstr "" -#: builtin/fetch.c:856 +#: builtin/fetch.c:857 msgid "non-fast-forward" msgstr "" -#: builtin/fetch.c:877 +#: builtin/fetch.c:878 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" "flag or run 'git config fetch.showForcedUpdates true'." msgstr "" -#: builtin/fetch.c:881 +#: builtin/fetch.c:882 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -12912,169 +13083,169 @@ msgid "" " to avoid this check.\n" msgstr "" -#: builtin/fetch.c:920 +#: builtin/fetch.c:914 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:941 +#: builtin/fetch.c:935 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:1026 builtin/fetch.c:1164 +#: builtin/fetch.c:1020 builtin/fetch.c:1158 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:1037 +#: builtin/fetch.c:1031 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1128 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:1135 +#: builtin/fetch.c:1129 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:1167 +#: builtin/fetch.c:1161 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:1168 builtin/remote.c:1112 +#: builtin/fetch.c:1162 builtin/remote.c:1112 msgid "(none)" msgstr "" -#: builtin/fetch.c:1191 +#: builtin/fetch.c:1185 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:1210 +#: builtin/fetch.c:1204 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:1213 +#: builtin/fetch.c:1207 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:1421 +#: builtin/fetch.c:1415 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "" -#: builtin/fetch.c:1436 +#: builtin/fetch.c:1430 msgid "not setting upstream for a remote remote-tracking branch" msgstr "" -#: builtin/fetch.c:1438 +#: builtin/fetch.c:1432 msgid "not setting upstream for a remote tag" msgstr "" -#: builtin/fetch.c:1440 +#: builtin/fetch.c:1434 msgid "unknown branch type" msgstr "" -#: builtin/fetch.c:1442 +#: builtin/fetch.c:1436 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." msgstr "" -#: builtin/fetch.c:1568 builtin/fetch.c:1631 +#: builtin/fetch.c:1562 builtin/fetch.c:1625 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101 +#: builtin/fetch.c:1572 builtin/fetch.c:1627 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1590 +#: builtin/fetch.c:1584 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "" -#: builtin/fetch.c:1693 +#: builtin/fetch.c:1687 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -#: builtin/fetch.c:1730 +#: builtin/fetch.c:1724 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1780 +#: builtin/fetch.c:1773 msgid "Negative depth in --deepen is not supported" msgstr "" -#: builtin/fetch.c:1782 +#: builtin/fetch.c:1775 msgid "--deepen and --depth are mutually exclusive" msgstr "" -#: builtin/fetch.c:1787 +#: builtin/fetch.c:1780 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1789 +#: builtin/fetch.c:1782 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1805 +#: builtin/fetch.c:1798 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1807 +#: builtin/fetch.c:1800 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1816 +#: builtin/fetch.c:1809 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1823 +#: builtin/fetch.c:1816 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" -#: builtin/fetch.c:1841 +#: builtin/fetch.c:1834 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" msgstr "" -#: builtin/fmt-merge-msg.c:18 +#: builtin/fmt-merge-msg.c:7 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:18 msgid "populate log with at most <n> entries from shortlog" msgstr "" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:21 msgid "alias for --log (deprecated)" msgstr "" -#: builtin/fmt-merge-msg.c:677 +#: builtin/fmt-merge-msg.c:24 msgid "text" msgstr "" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:25 msgid "use <text> as start of message" msgstr "" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:26 msgid "file to read from" msgstr "" @@ -13114,7 +13285,7 @@ msgstr "" msgid "show only <n> matched refs" msgstr "" -#: builtin/for-each-ref.c:39 builtin/tag.c:439 +#: builtin/for-each-ref.c:39 builtin/tag.c:440 msgid "respect format colors" msgstr "" @@ -13138,243 +13309,243 @@ msgstr "" msgid "print only refs which don't contain the commit" msgstr "" -#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148 +#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 msgid "unknown" msgstr "" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:100 builtin/fsck.c:120 +#: builtin/fsck.c:101 builtin/fsck.c:121 #, c-format msgid "error in %s %s: %s" msgstr "" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:114 +#: builtin/fsck.c:115 #, c-format msgid "warning in %s %s: %s" msgstr "" -#: builtin/fsck.c:143 builtin/fsck.c:146 +#: builtin/fsck.c:144 builtin/fsck.c:147 #, c-format msgid "broken link from %7s %s" msgstr "" -#: builtin/fsck.c:155 +#: builtin/fsck.c:156 msgid "wrong object type in link" msgstr "" -#: builtin/fsck.c:171 +#: builtin/fsck.c:172 #, c-format msgid "" "broken link from %7s %s\n" " to %7s %s" msgstr "" -#: builtin/fsck.c:282 +#: builtin/fsck.c:283 #, c-format msgid "missing %s %s" msgstr "" -#: builtin/fsck.c:309 +#: builtin/fsck.c:310 #, c-format msgid "unreachable %s %s" msgstr "" -#: builtin/fsck.c:329 +#: builtin/fsck.c:330 #, c-format msgid "dangling %s %s" msgstr "" -#: builtin/fsck.c:339 +#: builtin/fsck.c:340 msgid "could not create lost-found" msgstr "" -#: builtin/fsck.c:350 +#: builtin/fsck.c:351 #, c-format msgid "could not finish '%s'" msgstr "" -#: builtin/fsck.c:367 +#: builtin/fsck.c:368 #, c-format msgid "Checking %s" msgstr "" -#: builtin/fsck.c:405 +#: builtin/fsck.c:406 #, c-format msgid "Checking connectivity (%d objects)" msgstr "" -#: builtin/fsck.c:424 +#: builtin/fsck.c:425 #, c-format msgid "Checking %s %s" msgstr "" -#: builtin/fsck.c:429 +#: builtin/fsck.c:430 msgid "broken links" msgstr "" -#: builtin/fsck.c:438 +#: builtin/fsck.c:439 #, c-format msgid "root %s" msgstr "" -#: builtin/fsck.c:446 +#: builtin/fsck.c:447 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "" -#: builtin/fsck.c:475 +#: builtin/fsck.c:476 #, c-format msgid "%s: object corrupt or missing" msgstr "" -#: builtin/fsck.c:500 +#: builtin/fsck.c:501 #, c-format msgid "%s: invalid reflog entry %s" msgstr "" -#: builtin/fsck.c:514 +#: builtin/fsck.c:515 #, c-format msgid "Checking reflog %s->%s" msgstr "" -#: builtin/fsck.c:548 +#: builtin/fsck.c:549 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "" -#: builtin/fsck.c:555 +#: builtin/fsck.c:556 #, c-format msgid "%s: not a commit" msgstr "" -#: builtin/fsck.c:609 +#: builtin/fsck.c:610 msgid "notice: No default references" msgstr "" -#: builtin/fsck.c:624 +#: builtin/fsck.c:625 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "" -#: builtin/fsck.c:637 +#: builtin/fsck.c:638 #, c-format msgid "%s: object could not be parsed: %s" msgstr "" -#: builtin/fsck.c:657 +#: builtin/fsck.c:658 #, c-format msgid "bad sha1 file: %s" msgstr "" -#: builtin/fsck.c:672 +#: builtin/fsck.c:673 msgid "Checking object directory" msgstr "" -#: builtin/fsck.c:675 +#: builtin/fsck.c:676 msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:690 +#: builtin/fsck.c:691 #, c-format msgid "Checking %s link" msgstr "" -#: builtin/fsck.c:695 builtin/index-pack.c:843 +#: builtin/fsck.c:696 builtin/index-pack.c:843 #, c-format msgid "invalid %s" msgstr "" -#: builtin/fsck.c:702 +#: builtin/fsck.c:703 #, c-format msgid "%s points to something strange (%s)" msgstr "" -#: builtin/fsck.c:708 +#: builtin/fsck.c:709 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "" -#: builtin/fsck.c:712 +#: builtin/fsck.c:713 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "" -#: builtin/fsck.c:724 +#: builtin/fsck.c:725 msgid "Checking cache tree" msgstr "" -#: builtin/fsck.c:729 +#: builtin/fsck.c:730 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "" -#: builtin/fsck.c:738 +#: builtin/fsck.c:739 msgid "non-tree in cache-tree" msgstr "" -#: builtin/fsck.c:769 +#: builtin/fsck.c:770 msgid "git fsck [<options>] [<object>...]" msgstr "" -#: builtin/fsck.c:775 +#: builtin/fsck.c:776 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:776 +#: builtin/fsck.c:777 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:777 +#: builtin/fsck.c:778 msgid "report tags" msgstr "" -#: builtin/fsck.c:778 +#: builtin/fsck.c:779 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:779 +#: builtin/fsck.c:780 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:780 +#: builtin/fsck.c:781 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:781 +#: builtin/fsck.c:782 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:782 +#: builtin/fsck.c:783 msgid "check only connectivity" msgstr "" -#: builtin/fsck.c:783 +#: builtin/fsck.c:784 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:785 +#: builtin/fsck.c:786 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:786 builtin/prune.c:132 +#: builtin/fsck.c:787 builtin/prune.c:134 msgid "show progress" msgstr "" -#: builtin/fsck.c:787 +#: builtin/fsck.c:788 msgid "show verbose names for reachable objects" msgstr "" -#: builtin/fsck.c:846 builtin/index-pack.c:225 +#: builtin/fsck.c:847 builtin/index-pack.c:225 msgid "Checking objects" msgstr "" -#: builtin/fsck.c:874 +#: builtin/fsck.c:875 #, c-format msgid "%s: object missing" msgstr "" -#: builtin/fsck.c:885 +#: builtin/fsck.c:886 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "" @@ -13393,12 +13564,12 @@ msgstr "" msgid "failed to parse '%s' value '%s'" msgstr "" -#: builtin/gc.c:475 builtin/init-db.c:55 +#: builtin/gc.c:475 builtin/init-db.c:57 #, c-format msgid "cannot stat '%s'" msgstr "" -#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:530 #, c-format msgid "cannot read '%s'" msgstr "" @@ -13487,258 +13658,258 @@ msgstr "" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731 -#: builtin/pack-objects.c:2854 +#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1730 +#: builtin/pack-objects.c:2855 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618 +#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:633 +#: builtin/grep.c:655 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:704 +#: builtin/grep.c:724 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:803 +#: builtin/grep.c:823 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:805 +#: builtin/grep.c:825 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:807 +#: builtin/grep.c:827 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:809 +#: builtin/grep.c:829 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:811 +#: builtin/grep.c:831 msgid "recursively search in each submodule" msgstr "" -#: builtin/grep.c:814 +#: builtin/grep.c:834 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:816 +#: builtin/grep.c:836 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:818 +#: builtin/grep.c:838 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:820 +#: builtin/grep.c:840 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:822 +#: builtin/grep.c:842 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:825 +#: builtin/grep.c:845 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:827 +#: builtin/grep.c:847 msgid "search in subdirectories (default)" msgstr "" -#: builtin/grep.c:829 +#: builtin/grep.c:849 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:833 +#: builtin/grep.c:853 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:836 +#: builtin/grep.c:856 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:839 +#: builtin/grep.c:859 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:842 +#: builtin/grep.c:862 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:845 +#: builtin/grep.c:865 msgid "show line numbers" msgstr "" -#: builtin/grep.c:846 +#: builtin/grep.c:866 msgid "show column number of first match" msgstr "" -#: builtin/grep.c:847 +#: builtin/grep.c:867 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:848 +#: builtin/grep.c:868 msgid "show filenames" msgstr "" -#: builtin/grep.c:850 +#: builtin/grep.c:870 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:852 +#: builtin/grep.c:872 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:854 +#: builtin/grep.c:874 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:857 +#: builtin/grep.c:877 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:859 +#: builtin/grep.c:879 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:862 +#: builtin/grep.c:882 msgid "show only matching parts of a line" msgstr "" -#: builtin/grep.c:864 +#: builtin/grep.c:884 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:865 +#: builtin/grep.c:885 msgid "highlight matches" msgstr "" -#: builtin/grep.c:867 +#: builtin/grep.c:887 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:869 +#: builtin/grep.c:889 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:872 +#: builtin/grep.c:892 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:875 +#: builtin/grep.c:895 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:877 +#: builtin/grep.c:897 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:879 +#: builtin/grep.c:899 msgid "use <n> worker threads" msgstr "" -#: builtin/grep.c:880 +#: builtin/grep.c:900 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:883 +#: builtin/grep.c:903 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:885 +#: builtin/grep.c:905 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:888 +#: builtin/grep.c:908 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:890 +#: builtin/grep.c:910 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:892 +#: builtin/grep.c:912 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:904 +#: builtin/grep.c:924 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:906 +#: builtin/grep.c:926 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:908 +#: builtin/grep.c:928 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:912 +#: builtin/grep.c:932 msgid "pager" msgstr "" -#: builtin/grep.c:912 +#: builtin/grep.c:932 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:916 +#: builtin/grep.c:936 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:983 +#: builtin/grep.c:1003 msgid "no pattern given" msgstr "" -#: builtin/grep.c:1019 +#: builtin/grep.c:1039 msgid "--no-index or --untracked cannot be used with revs" msgstr "" -#: builtin/grep.c:1027 +#: builtin/grep.c:1047 #, c-format msgid "unable to resolve revision: %s" msgstr "" -#: builtin/grep.c:1057 +#: builtin/grep.c:1077 msgid "--untracked not supported with --recurse-submodules" msgstr "" -#: builtin/grep.c:1061 +#: builtin/grep.c:1081 msgid "invalid option combination, ignoring --threads" msgstr "" -#: builtin/grep.c:1064 builtin/pack-objects.c:3547 +#: builtin/grep.c:1084 builtin/pack-objects.c:3548 msgid "no threads support, ignoring --threads" msgstr "" -#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851 +#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2852 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/grep.c:1101 +#: builtin/grep.c:1121 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:1127 +#: builtin/grep.c:1147 msgid "--cached or --untracked cannot be used with --no-index" msgstr "" -#: builtin/grep.c:1133 +#: builtin/grep.c:1153 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" -#: builtin/grep.c:1141 +#: builtin/grep.c:1161 msgid "both --cached and trees are given" msgstr "" @@ -13777,108 +13948,108 @@ msgstr "" msgid "process file as it were from this path" msgstr "" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "print all available commands" msgstr "" -#: builtin/help.c:47 +#: builtin/help.c:48 msgid "exclude guides" msgstr "" -#: builtin/help.c:48 +#: builtin/help.c:49 msgid "print list of useful guides" msgstr "" -#: builtin/help.c:49 +#: builtin/help.c:50 msgid "print all configuration variable names" msgstr "" -#: builtin/help.c:51 +#: builtin/help.c:52 msgid "show man page" msgstr "" -#: builtin/help.c:52 +#: builtin/help.c:53 msgid "show manual in web browser" msgstr "" -#: builtin/help.c:54 +#: builtin/help.c:55 msgid "show info page" msgstr "" -#: builtin/help.c:56 +#: builtin/help.c:57 msgid "print command description" msgstr "" -#: builtin/help.c:61 +#: builtin/help.c:62 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "" -#: builtin/help.c:77 +#: builtin/help.c:163 #, c-format msgid "unrecognized help format '%s'" msgstr "" -#: builtin/help.c:104 +#: builtin/help.c:190 msgid "Failed to start emacsclient." msgstr "" -#: builtin/help.c:117 +#: builtin/help.c:203 msgid "Failed to parse emacsclient version." msgstr "" -#: builtin/help.c:125 +#: builtin/help.c:211 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "" -#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 +#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 #, c-format msgid "failed to exec '%s'" msgstr "" -#: builtin/help.c:221 +#: builtin/help.c:307 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" -#: builtin/help.c:233 +#: builtin/help.c:319 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" -#: builtin/help.c:350 +#: builtin/help.c:436 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:367 +#: builtin/help.c:453 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:375 +#: builtin/help.c:461 msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:434 builtin/help.c:445 git.c:336 +#: builtin/help.c:520 builtin/help.c:531 git.c:337 #, c-format msgid "'%s' is aliased to '%s'" msgstr "" -#: builtin/help.c:448 git.c:365 +#: builtin/help.c:534 git.c:367 #, c-format msgid "bad alias.%s string: %s" msgstr "" -#: builtin/help.c:477 builtin/help.c:507 +#: builtin/help.c:563 builtin/help.c:593 #, c-format msgid "usage: %s%s" msgstr "" -#: builtin/help.c:491 +#: builtin/help.c:577 msgid "'git help config' for more information" msgstr "" @@ -13916,7 +14087,7 @@ msgstr "" msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:288 builtin/pack-objects.c:606 +#: builtin/index-pack.c:288 builtin/pack-objects.c:607 msgid "pack too large for current definition of off_t" msgstr "" @@ -13924,6 +14095,11 @@ msgstr "" msgid "pack exceeds maximum allowed size" msgstr "" +#: builtin/index-pack.c:306 builtin/repack.c:250 +#, c-format +msgid "unable to create '%s'" +msgstr "" + #: builtin/index-pack.c:312 #, c-format msgid "cannot open packfile '%s'" @@ -13982,8 +14158,8 @@ msgstr "" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:738 builtin/pack-objects.c:158 -#: builtin/pack-objects.c:218 builtin/pack-objects.c:313 +#: builtin/index-pack.c:738 builtin/pack-objects.c:159 +#: builtin/pack-objects.c:219 builtin/pack-objects.c:314 #, c-format msgid "unable to read %s" msgstr "" @@ -14044,7 +14220,7 @@ msgstr "" msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615 +#: builtin/index-pack.c:1208 builtin/pack-objects.c:2616 #, c-format msgid "unable to create thread: %s" msgstr "" @@ -14077,200 +14253,217 @@ msgstr[1] "" msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1392 +#: builtin/index-pack.c:1391 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1406 +#: builtin/index-pack.c:1405 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1431 +#: builtin/index-pack.c:1430 #, c-format msgid "cannot write %s file '%s'" msgstr "" -#: builtin/index-pack.c:1439 +#: builtin/index-pack.c:1438 #, c-format msgid "cannot close written %s file '%s'" msgstr "" -#: builtin/index-pack.c:1463 +#: builtin/index-pack.c:1462 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1477 +#: builtin/index-pack.c:1476 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1485 +#: builtin/index-pack.c:1484 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862 +#: builtin/index-pack.c:1528 builtin/pack-objects.c:2863 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1597 +#: builtin/index-pack.c:1596 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1599 +#: builtin/index-pack.c:1598 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1647 +#: builtin/index-pack.c:1646 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1654 +#: builtin/index-pack.c:1653 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1693 +#: builtin/index-pack.c:1692 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1742 builtin/index-pack.c:1745 -#: builtin/index-pack.c:1761 builtin/index-pack.c:1765 +#: builtin/index-pack.c:1741 builtin/index-pack.c:1744 +#: builtin/index-pack.c:1760 builtin/index-pack.c:1764 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1781 +#: builtin/index-pack.c:1780 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1783 +#: builtin/index-pack.c:1782 msgid "--stdin requires a git repository" msgstr "" -#: builtin/index-pack.c:1789 +#: builtin/index-pack.c:1788 msgid "--verify with no packfile name given" msgstr "" -#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1836 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "" -#: builtin/init-db.c:61 +#: builtin/init-db.c:63 #, c-format msgid "cannot stat template '%s'" msgstr "" -#: builtin/init-db.c:66 +#: builtin/init-db.c:68 #, c-format msgid "cannot opendir '%s'" msgstr "" -#: builtin/init-db.c:78 +#: builtin/init-db.c:80 #, c-format msgid "cannot readlink '%s'" msgstr "" -#: builtin/init-db.c:80 +#: builtin/init-db.c:82 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "" -#: builtin/init-db.c:86 +#: builtin/init-db.c:88 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "" -#: builtin/init-db.c:90 +#: builtin/init-db.c:92 #, c-format msgid "ignoring template %s" msgstr "" -#: builtin/init-db.c:121 +#: builtin/init-db.c:123 #, c-format msgid "templates not found in %s" msgstr "" -#: builtin/init-db.c:136 +#: builtin/init-db.c:138 #, c-format msgid "not copying templates from '%s': %s" msgstr "" -#: builtin/init-db.c:334 +#: builtin/init-db.c:356 #, c-format msgid "unable to handle file type %d" msgstr "" -#: builtin/init-db.c:337 +#: builtin/init-db.c:359 #, c-format msgid "unable to move %s to %s" msgstr "" -#: builtin/init-db.c:354 builtin/init-db.c:357 +#: builtin/init-db.c:374 +msgid "attempt to reinitialize repository with different hash" +msgstr "" + +#: builtin/init-db.c:380 builtin/init-db.c:601 +#, c-format +msgid "unknown hash algorithm '%s'" +msgstr "" + +#: builtin/init-db.c:397 builtin/init-db.c:400 #, c-format msgid "%s already exists" msgstr "" -#: builtin/init-db.c:413 +#: builtin/init-db.c:458 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:414 +#: builtin/init-db.c:459 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:418 +#: builtin/init-db.c:463 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:419 +#: builtin/init-db.c:464 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:468 +#: builtin/init-db.c:513 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" msgstr "" -#: builtin/init-db.c:491 +#: builtin/init-db.c:538 msgid "permissions" msgstr "" -#: builtin/init-db.c:492 +#: builtin/init-db.c:539 msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:529 builtin/init-db.c:534 +#: builtin/init-db.c:544 +msgid "hash" +msgstr "" + +#: builtin/init-db.c:545 +msgid "specify the hash algorithm to use" +msgstr "" + +#: builtin/init-db.c:578 builtin/init-db.c:583 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:538 +#: builtin/init-db.c:587 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:559 +#: builtin/init-db.c:614 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "" -#: builtin/init-db.c:587 +#: builtin/init-db.c:642 #, c-format msgid "Cannot access work tree '%s'" msgstr "" @@ -14337,507 +14530,507 @@ msgstr "" msgid "no input file given for in-place editing" msgstr "" -#: builtin/log.c:56 +#: builtin/log.c:57 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "" -#: builtin/log.c:57 +#: builtin/log.c:58 msgid "git show [<options>] <object>..." msgstr "" -#: builtin/log.c:110 +#: builtin/log.c:111 #, c-format msgid "invalid --decorate option: %s" msgstr "" -#: builtin/log.c:174 +#: builtin/log.c:178 msgid "show source" msgstr "" -#: builtin/log.c:175 +#: builtin/log.c:179 msgid "Use mail map file" msgstr "" -#: builtin/log.c:177 +#: builtin/log.c:182 msgid "only decorate refs that match <pattern>" msgstr "" -#: builtin/log.c:179 +#: builtin/log.c:184 msgid "do not decorate refs that match <pattern>" msgstr "" -#: builtin/log.c:180 +#: builtin/log.c:185 msgid "decorate options" msgstr "" -#: builtin/log.c:183 +#: builtin/log.c:188 msgid "Process line range n,m in file, counting from 1" msgstr "" -#: builtin/log.c:281 +#: builtin/log.c:298 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:535 +#: builtin/log.c:556 #, c-format msgid "git show %s: bad file" msgstr "" -#: builtin/log.c:550 builtin/log.c:645 +#: builtin/log.c:571 builtin/log.c:666 #, c-format msgid "could not read object %s" msgstr "" -#: builtin/log.c:670 +#: builtin/log.c:691 #, c-format msgid "unknown type: %d" msgstr "" -#: builtin/log.c:814 +#: builtin/log.c:835 #, c-format msgid "%s: invalid cover from description mode" msgstr "" -#: builtin/log.c:821 +#: builtin/log.c:842 msgid "format.headers without value" msgstr "" -#: builtin/log.c:936 +#: builtin/log.c:957 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:952 +#: builtin/log.c:973 #, c-format msgid "cannot open patch file %s" msgstr "" -#: builtin/log.c:969 +#: builtin/log.c:990 msgid "need exactly one range" msgstr "" -#: builtin/log.c:979 +#: builtin/log.c:1000 msgid "not a range" msgstr "" -#: builtin/log.c:1143 +#: builtin/log.c:1164 msgid "cover letter needs email format" msgstr "" -#: builtin/log.c:1149 +#: builtin/log.c:1170 msgid "failed to create cover-letter file" msgstr "" -#: builtin/log.c:1228 +#: builtin/log.c:1249 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1255 +#: builtin/log.c:1276 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "" -#: builtin/log.c:1313 +#: builtin/log.c:1334 msgid "two output directories?" msgstr "" -#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211 +#: builtin/log.c:1445 builtin/log.c:2217 builtin/log.c:2219 builtin/log.c:2231 #, c-format msgid "unknown commit %s" msgstr "" -#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1455 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "" -#: builtin/log.c:1439 +#: builtin/log.c:1460 msgid "could not find exact merge base" msgstr "" -#: builtin/log.c:1443 +#: builtin/log.c:1464 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" "Or you could specify base commit by --base=<base-commit-id> manually" msgstr "" -#: builtin/log.c:1463 +#: builtin/log.c:1484 msgid "failed to find exact merge base" msgstr "" -#: builtin/log.c:1474 +#: builtin/log.c:1495 msgid "base commit should be the ancestor of revision list" msgstr "" -#: builtin/log.c:1478 +#: builtin/log.c:1499 msgid "base commit shouldn't be in revision list" msgstr "" -#: builtin/log.c:1531 +#: builtin/log.c:1552 msgid "cannot get patch id" msgstr "" -#: builtin/log.c:1583 +#: builtin/log.c:1604 msgid "failed to infer range-diff ranges" msgstr "" -#: builtin/log.c:1629 +#: builtin/log.c:1650 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1632 +#: builtin/log.c:1653 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1636 +#: builtin/log.c:1657 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1638 +#: builtin/log.c:1659 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1640 +#: builtin/log.c:1661 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1641 +#: builtin/log.c:1662 msgid "sfx" msgstr "" -#: builtin/log.c:1642 +#: builtin/log.c:1663 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1644 +#: builtin/log.c:1665 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1646 +#: builtin/log.c:1667 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1648 +#: builtin/log.c:1669 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "" -#: builtin/log.c:1651 +#: builtin/log.c:1672 msgid "cover-from-description-mode" msgstr "" -#: builtin/log.c:1652 +#: builtin/log.c:1673 msgid "generate parts of a cover letter based on a branch's description" msgstr "" -#: builtin/log.c:1654 +#: builtin/log.c:1675 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1657 +#: builtin/log.c:1678 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1660 +#: builtin/log.c:1681 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1663 +#: builtin/log.c:1684 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1665 +#: builtin/log.c:1686 msgid "output all-zero hash in From header" msgstr "" -#: builtin/log.c:1667 +#: builtin/log.c:1688 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1669 +#: builtin/log.c:1690 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1671 +#: builtin/log.c:1692 msgid "Messaging" msgstr "" -#: builtin/log.c:1672 +#: builtin/log.c:1693 msgid "header" msgstr "" -#: builtin/log.c:1673 +#: builtin/log.c:1694 msgid "add email header" msgstr "" -#: builtin/log.c:1674 builtin/log.c:1676 +#: builtin/log.c:1695 builtin/log.c:1696 msgid "email" msgstr "" -#: builtin/log.c:1674 +#: builtin/log.c:1695 msgid "add To: header" msgstr "" -#: builtin/log.c:1676 +#: builtin/log.c:1696 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1678 +#: builtin/log.c:1697 msgid "ident" msgstr "" -#: builtin/log.c:1679 +#: builtin/log.c:1698 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" -#: builtin/log.c:1681 +#: builtin/log.c:1700 msgid "message-id" msgstr "" -#: builtin/log.c:1682 +#: builtin/log.c:1701 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1683 builtin/log.c:1686 +#: builtin/log.c:1702 builtin/log.c:1705 msgid "boundary" msgstr "" -#: builtin/log.c:1684 +#: builtin/log.c:1703 msgid "attach the patch" msgstr "" -#: builtin/log.c:1687 +#: builtin/log.c:1706 msgid "inline the patch" msgstr "" -#: builtin/log.c:1691 +#: builtin/log.c:1710 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1693 +#: builtin/log.c:1712 msgid "signature" msgstr "" -#: builtin/log.c:1694 +#: builtin/log.c:1713 msgid "add a signature" msgstr "" -#: builtin/log.c:1695 +#: builtin/log.c:1714 msgid "base-commit" msgstr "" -#: builtin/log.c:1696 +#: builtin/log.c:1715 msgid "add prerequisite tree info to the patch series" msgstr "" -#: builtin/log.c:1698 +#: builtin/log.c:1717 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1699 +#: builtin/log.c:1718 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1701 +#: builtin/log.c:1720 msgid "show progress while generating patches" msgstr "" -#: builtin/log.c:1703 +#: builtin/log.c:1722 msgid "show changes against <rev> in cover letter or single patch" msgstr "" -#: builtin/log.c:1706 +#: builtin/log.c:1725 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" -#: builtin/log.c:1708 +#: builtin/log.c:1727 msgid "percentage by which creation is weighted" msgstr "" -#: builtin/log.c:1792 +#: builtin/log.c:1812 #, c-format msgid "invalid ident line: %s" msgstr "" -#: builtin/log.c:1807 +#: builtin/log.c:1827 msgid "-n and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1809 +#: builtin/log.c:1829 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1817 +#: builtin/log.c:1837 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1819 +#: builtin/log.c:1839 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1821 +#: builtin/log.c:1841 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1854 +#: builtin/log.c:1874 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1958 +#: builtin/log.c:1978 msgid "--interdiff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:1962 +#: builtin/log.c:1982 msgid "Interdiff:" msgstr "" -#: builtin/log.c:1963 +#: builtin/log.c:1983 #, c-format msgid "Interdiff against v%d:" msgstr "" -#: builtin/log.c:1969 +#: builtin/log.c:1989 msgid "--creation-factor requires --range-diff" msgstr "" -#: builtin/log.c:1973 +#: builtin/log.c:1993 msgid "--range-diff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:1981 +#: builtin/log.c:2001 msgid "Range-diff:" msgstr "" -#: builtin/log.c:1982 +#: builtin/log.c:2002 #, c-format msgid "Range-diff against v%d:" msgstr "" -#: builtin/log.c:1993 +#: builtin/log.c:2013 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:2029 +#: builtin/log.c:2049 msgid "Generating patches" msgstr "" -#: builtin/log.c:2073 +#: builtin/log.c:2093 msgid "failed to create output files" msgstr "" -#: builtin/log.c:2132 +#: builtin/log.c:2152 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:2186 +#: builtin/log.c:2206 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:471 msgid "git ls-files [<options>] [<file>...]" msgstr "" -#: builtin/ls-files.c:526 +#: builtin/ls-files.c:527 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:528 +#: builtin/ls-files.c:529 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:531 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:533 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:535 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:537 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:539 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:541 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:544 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:546 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:548 msgid "show 'other' directories' names only" msgstr "" -#: builtin/ls-files.c:549 +#: builtin/ls-files.c:550 msgid "show line endings of files" msgstr "" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:552 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:555 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:557 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:559 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:562 msgid "exclude patterns are read from <file>" msgstr "" -#: builtin/ls-files.c:564 +#: builtin/ls-files.c:565 msgid "read additional per-directory exclude patterns in <file>" msgstr "" -#: builtin/ls-files.c:566 +#: builtin/ls-files.c:567 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:570 +#: builtin/ls-files.c:571 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:573 +#: builtin/ls-files.c:574 msgid "recurse through submodules" msgstr "" -#: builtin/ls-files.c:575 +#: builtin/ls-files.c:576 msgid "if any <file> is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:577 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:578 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" -#: builtin/ls-files.c:579 +#: builtin/ls-files.c:580 msgid "show debugging data" msgstr "" @@ -14852,7 +15045,7 @@ msgstr "" msgid "do not print remote URL" msgstr "" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1384 msgid "exec" msgstr "" @@ -14925,486 +15118,486 @@ msgstr "" msgid "empty mbox: '%s'" msgstr "" -#: builtin/merge.c:55 -msgid "git merge [<options>] [<commit>...]" +#: builtin/merge-base.c:32 +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "" + +#: builtin/merge-base.c:33 +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "" + +#: builtin/merge-base.c:34 +msgid "git merge-base --independent <commit>..." +msgstr "" + +#: builtin/merge-base.c:35 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "" + +#: builtin/merge-base.c:36 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "" + +#: builtin/merge-base.c:143 +msgid "output all common ancestors" +msgstr "" + +#: builtin/merge-base.c:145 +msgid "find ancestors for a single n-way merge" +msgstr "" + +#: builtin/merge-base.c:147 +msgid "list revs not reachable from others" +msgstr "" + +#: builtin/merge-base.c:149 +msgid "is the first one ancestor of the other?" +msgstr "" + +#: builtin/merge-base.c:151 +msgid "find where <commit> forked from reflog of <ref>" +msgstr "" + +#: builtin/merge-file.c:9 +msgid "" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" +msgstr "" + +#: builtin/merge-file.c:35 +msgid "send results to standard output" +msgstr "" + +#: builtin/merge-file.c:36 +msgid "use a diff3 based merge" +msgstr "" + +#: builtin/merge-file.c:37 +msgid "for conflicts, use our version" +msgstr "" + +#: builtin/merge-file.c:39 +msgid "for conflicts, use their version" +msgstr "" + +#: builtin/merge-file.c:41 +msgid "for conflicts, use a union version" +msgstr "" + +#: builtin/merge-file.c:44 +msgid "for conflicts, use this marker size" +msgstr "" + +#: builtin/merge-file.c:45 +msgid "do not warn about conflicts" +msgstr "" + +#: builtin/merge-file.c:47 +msgid "set labels for file1/orig-file/file2" +msgstr "" + +#: builtin/merge-recursive.c:47 +#, c-format +msgid "unknown option %s" +msgstr "" + +#: builtin/merge-recursive.c:53 +#, c-format +msgid "could not parse object '%s'" +msgstr "" + +#: builtin/merge-recursive.c:57 +#, c-format +msgid "cannot handle more than %d base. Ignoring %s." +msgid_plural "cannot handle more than %d bases. Ignoring %s." +msgstr[0] "" +msgstr[1] "" + +#: builtin/merge-recursive.c:65 +msgid "not handling anything other than two heads merge." +msgstr "" + +#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 +#, c-format +msgid "could not resolve ref '%s'" +msgstr "" + +#: builtin/merge-recursive.c:82 +#, c-format +msgid "Merging %s with %s\n" msgstr "" #: builtin/merge.c:56 -msgid "git merge --abort" +msgid "git merge [<options>] [<commit>...]" msgstr "" #: builtin/merge.c:57 +msgid "git merge --abort" +msgstr "" + +#: builtin/merge.c:58 msgid "git merge --continue" msgstr "" -#: builtin/merge.c:119 +#: builtin/merge.c:121 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:142 +#: builtin/merge.c:144 #, c-format msgid "option `%s' requires a value" msgstr "" -#: builtin/merge.c:188 +#: builtin/merge.c:190 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:189 +#: builtin/merge.c:191 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:194 +#: builtin/merge.c:196 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:245 builtin/pull.c:132 +#: builtin/merge.c:247 builtin/pull.c:133 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:248 builtin/pull.c:135 +#: builtin/merge.c:250 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:249 builtin/pull.c:138 +#: builtin/merge.c:251 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:251 builtin/pull.c:141 +#: builtin/merge.c:253 builtin/pull.c:142 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:254 builtin/pull.c:147 +#: builtin/merge.c:256 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:256 builtin/pull.c:150 +#: builtin/merge.c:258 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:258 builtin/pull.c:153 +#: builtin/merge.c:260 builtin/pull.c:154 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:260 +#: builtin/merge.c:262 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:262 builtin/pull.c:160 +#: builtin/merge.c:264 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:266 builtin/pull.c:163 +#: builtin/merge.c:268 builtin/pull.c:164 msgid "verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167 -#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114 +#: builtin/merge.c:269 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:527 builtin/rebase.c:1398 builtin/revert.c:114 msgid "strategy" msgstr "" -#: builtin/merge.c:268 builtin/pull.c:168 +#: builtin/merge.c:270 builtin/pull.c:169 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:269 builtin/pull.c:171 +#: builtin/merge.c:271 builtin/pull.c:172 msgid "option=value" msgstr "" -#: builtin/merge.c:270 builtin/pull.c:172 +#: builtin/merge.c:272 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:272 +#: builtin/merge.c:274 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:279 +#: builtin/merge.c:281 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:281 +#: builtin/merge.c:283 msgid "--abort but leave index and working tree alone" msgstr "" -#: builtin/merge.c:283 +#: builtin/merge.c:285 msgid "continue the current in-progress merge" msgstr "" -#: builtin/merge.c:285 builtin/pull.c:179 +#: builtin/merge.c:287 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "" -#: builtin/merge.c:291 +#: builtin/merge.c:294 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "" -#: builtin/merge.c:308 +#: builtin/merge.c:311 msgid "could not run stash." msgstr "" -#: builtin/merge.c:313 +#: builtin/merge.c:316 msgid "stash failed" msgstr "" -#: builtin/merge.c:318 +#: builtin/merge.c:321 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:340 builtin/merge.c:357 +#: builtin/merge.c:343 builtin/merge.c:360 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:387 +#: builtin/merge.c:390 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:398 +#: builtin/merge.c:401 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:448 +#: builtin/merge.c:451 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:499 +#: builtin/merge.c:502 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:586 +#: builtin/merge.c:589 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:708 +#: builtin/merge.c:716 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:722 +#: builtin/merge.c:730 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:737 +#: builtin/merge.c:745 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:789 +#: builtin/merge.c:797 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:798 +#: builtin/merge.c:806 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:804 +#: builtin/merge.c:812 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" msgstr "" -#: builtin/merge.c:809 +#: builtin/merge.c:817 msgid "An empty message aborts the commit.\n" msgstr "" -#: builtin/merge.c:812 +#: builtin/merge.c:820 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" -#: builtin/merge.c:865 +#: builtin/merge.c:873 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:880 +#: builtin/merge.c:888 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:941 +#: builtin/merge.c:949 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:980 +#: builtin/merge.c:988 msgid "No current branch." msgstr "" -#: builtin/merge.c:982 +#: builtin/merge.c:990 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:984 +#: builtin/merge.c:992 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:989 +#: builtin/merge.c:997 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1046 +#: builtin/merge.c:1054 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "" -#: builtin/merge.c:1149 +#: builtin/merge.c:1157 #, c-format msgid "not something we can merge in %s: %s" msgstr "" -#: builtin/merge.c:1183 +#: builtin/merge.c:1191 msgid "not something we can merge" msgstr "" -#: builtin/merge.c:1286 +#: builtin/merge.c:1295 msgid "--abort expects no arguments" msgstr "" -#: builtin/merge.c:1290 +#: builtin/merge.c:1299 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1299 +#: builtin/merge.c:1317 msgid "--quit expects no arguments" msgstr "" -#: builtin/merge.c:1312 +#: builtin/merge.c:1330 msgid "--continue expects no arguments" msgstr "" -#: builtin/merge.c:1316 +#: builtin/merge.c:1334 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1332 +#: builtin/merge.c:1350 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1339 +#: builtin/merge.c:1357 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1342 +#: builtin/merge.c:1360 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1356 +#: builtin/merge.c:1374 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1358 +#: builtin/merge.c:1376 msgid "You cannot combine --squash with --commit." msgstr "" -#: builtin/merge.c:1374 +#: builtin/merge.c:1392 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1391 +#: builtin/merge.c:1409 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1393 +#: builtin/merge.c:1411 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1398 +#: builtin/merge.c:1416 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1400 +#: builtin/merge.c:1418 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1481 +#: builtin/merge.c:1499 msgid "refusing to merge unrelated histories" msgstr "" -#: builtin/merge.c:1490 +#: builtin/merge.c:1508 msgid "Already up to date." msgstr "" -#: builtin/merge.c:1500 +#: builtin/merge.c:1518 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1542 +#: builtin/merge.c:1564 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1549 +#: builtin/merge.c:1571 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1574 +#: builtin/merge.c:1596 msgid "Already up to date. Yeeah!" msgstr "" -#: builtin/merge.c:1580 +#: builtin/merge.c:1602 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1603 builtin/merge.c:1668 +#: builtin/merge.c:1630 builtin/merge.c:1695 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1607 +#: builtin/merge.c:1634 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1659 +#: builtin/merge.c:1686 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1661 +#: builtin/merge.c:1688 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1670 +#: builtin/merge.c:1697 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1682 +#: builtin/merge.c:1711 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" -#: builtin/merge-base.c:32 -msgid "git merge-base [-a | --all] <commit> <commit>..." -msgstr "" - -#: builtin/merge-base.c:33 -msgid "git merge-base [-a | --all] --octopus <commit>..." -msgstr "" - -#: builtin/merge-base.c:34 -msgid "git merge-base --independent <commit>..." -msgstr "" - -#: builtin/merge-base.c:35 -msgid "git merge-base --is-ancestor <commit> <commit>" -msgstr "" - -#: builtin/merge-base.c:36 -msgid "git merge-base --fork-point <ref> [<commit>]" -msgstr "" - -#: builtin/merge-base.c:153 -msgid "output all common ancestors" -msgstr "" - -#: builtin/merge-base.c:155 -msgid "find ancestors for a single n-way merge" -msgstr "" - -#: builtin/merge-base.c:157 -msgid "list revs not reachable from others" -msgstr "" - -#: builtin/merge-base.c:159 -msgid "is the first one ancestor of the other?" -msgstr "" - -#: builtin/merge-base.c:161 -msgid "find where <commit> forked from reflog of <ref>" -msgstr "" - -#: builtin/merge-file.c:9 -msgid "" -"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " -"<orig-file> <file2>" -msgstr "" - -#: builtin/merge-file.c:35 -msgid "send results to standard output" -msgstr "" - -#: builtin/merge-file.c:36 -msgid "use a diff3 based merge" -msgstr "" - -#: builtin/merge-file.c:37 -msgid "for conflicts, use our version" -msgstr "" - -#: builtin/merge-file.c:39 -msgid "for conflicts, use their version" -msgstr "" - -#: builtin/merge-file.c:41 -msgid "for conflicts, use a union version" -msgstr "" - -#: builtin/merge-file.c:44 -msgid "for conflicts, use this marker size" -msgstr "" - -#: builtin/merge-file.c:45 -msgid "do not warn about conflicts" -msgstr "" - -#: builtin/merge-file.c:47 -msgid "set labels for file1/orig-file/file2" -msgstr "" - -#: builtin/merge-recursive.c:47 -#, c-format -msgid "unknown option %s" -msgstr "" - -#: builtin/merge-recursive.c:53 -#, c-format -msgid "could not parse object '%s'" -msgstr "" - -#: builtin/merge-recursive.c:57 -#, c-format -msgid "cannot handle more than %d base. Ignoring %s." -msgid_plural "cannot handle more than %d bases. Ignoring %s." -msgstr[0] "" -msgstr[1] "" - -#: builtin/merge-recursive.c:65 -msgid "not handling anything other than two heads merge." -msgstr "" - -#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 -#, c-format -msgid "could not resolve ref '%s'" -msgstr "" - -#: builtin/merge-recursive.c:82 -#, c-format -msgid "Merging %s with %s\n" -msgstr "" - #: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "" @@ -15437,7 +15630,7 @@ msgid "" "larger than this size" msgstr "" -#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25 msgid "too many arguments" msgstr "" @@ -15537,7 +15730,7 @@ msgstr "" msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518 +#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:520 #, c-format msgid "renaming '%s' failed" msgstr "" @@ -15722,7 +15915,7 @@ msgstr "" msgid "the note contents have been left in %s" msgstr "" -#: builtin/notes.c:242 builtin/tag.c:532 +#: builtin/notes.c:242 builtin/tag.c:533 #, c-format msgid "could not open or read '%s'" msgstr "" @@ -15943,7 +16136,7 @@ msgid "" "abort'.\n" msgstr "" -#: builtin/notes.c:897 builtin/tag.c:545 +#: builtin/notes.c:897 builtin/tag.c:546 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" @@ -15961,7 +16154,7 @@ msgstr "" msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:164 msgid "do not remove, show only" msgstr "" @@ -15977,349 +16170,349 @@ msgstr "" msgid "use notes from <notes-ref>" msgstr "" -#: builtin/notes.c:1034 builtin/stash.c:1643 +#: builtin/notes.c:1034 builtin/stash.c:1608 #, c-format msgid "unknown subcommand: %s" msgstr "" -#: builtin/pack-objects.c:52 +#: builtin/pack-objects.c:53 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:53 +#: builtin/pack-objects.c:54 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:430 +#: builtin/pack-objects.c:431 #, c-format msgid "bad packed object CRC for %s" msgstr "" -#: builtin/pack-objects.c:441 +#: builtin/pack-objects.c:442 #, c-format msgid "corrupt packed object for %s" msgstr "" -#: builtin/pack-objects.c:572 +#: builtin/pack-objects.c:573 #, c-format msgid "recursive delta detected for object %s" msgstr "" -#: builtin/pack-objects.c:783 +#: builtin/pack-objects.c:784 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "" -#: builtin/pack-objects.c:972 +#: builtin/pack-objects.c:973 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" -#: builtin/pack-objects.c:985 +#: builtin/pack-objects.c:986 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1046 builtin/update-index.c:90 +#: builtin/pack-objects.c:1047 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "" -#: builtin/pack-objects.c:1099 +#: builtin/pack-objects.c:1100 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "" -#: builtin/pack-objects.c:1297 +#: builtin/pack-objects.c:1298 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:1724 +#: builtin/pack-objects.c:1725 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "" -#: builtin/pack-objects.c:1733 +#: builtin/pack-objects.c:1734 #, c-format msgid "delta base offset out of bound for %s" msgstr "" -#: builtin/pack-objects.c:2004 +#: builtin/pack-objects.c:2005 msgid "Counting objects" msgstr "" -#: builtin/pack-objects.c:2149 +#: builtin/pack-objects.c:2150 #, c-format msgid "unable to parse object header of %s" msgstr "" -#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235 -#: builtin/pack-objects.c:2245 +#: builtin/pack-objects.c:2220 builtin/pack-objects.c:2236 +#: builtin/pack-objects.c:2246 #, c-format msgid "object %s cannot be read" msgstr "" -#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249 +#: builtin/pack-objects.c:2223 builtin/pack-objects.c:2250 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" -#: builtin/pack-objects.c:2259 +#: builtin/pack-objects.c:2260 msgid "suboptimal pack - out of memory" msgstr "" -#: builtin/pack-objects.c:2574 +#: builtin/pack-objects.c:2575 #, c-format msgid "Delta compression using up to %d threads" msgstr "" -#: builtin/pack-objects.c:2713 +#: builtin/pack-objects.c:2714 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "" -#: builtin/pack-objects.c:2801 +#: builtin/pack-objects.c:2802 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2807 +#: builtin/pack-objects.c:2808 msgid "inconsistency with delta count" msgstr "" -#: builtin/pack-objects.c:2888 +#: builtin/pack-objects.c:2889 #, c-format msgid "" "expected edge object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:2894 +#: builtin/pack-objects.c:2895 #, c-format msgid "" "expected object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:2992 +#: builtin/pack-objects.c:2993 msgid "invalid value for --missing" msgstr "" -#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159 +#: builtin/pack-objects.c:3052 builtin/pack-objects.c:3160 msgid "cannot open pack index" msgstr "" -#: builtin/pack-objects.c:3082 +#: builtin/pack-objects.c:3083 #, c-format msgid "loose object at %s could not be examined" msgstr "" -#: builtin/pack-objects.c:3167 +#: builtin/pack-objects.c:3168 msgid "unable to force loose object" msgstr "" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3261 #, c-format msgid "not a rev '%s'" msgstr "" -#: builtin/pack-objects.c:3263 +#: builtin/pack-objects.c:3264 #, c-format msgid "bad revision '%s'" msgstr "" -#: builtin/pack-objects.c:3288 +#: builtin/pack-objects.c:3289 msgid "unable to add recent objects" msgstr "" -#: builtin/pack-objects.c:3341 +#: builtin/pack-objects.c:3342 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:3345 +#: builtin/pack-objects.c:3346 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:3383 +#: builtin/pack-objects.c:3384 msgid "<version>[,<offset>]" msgstr "" -#: builtin/pack-objects.c:3384 +#: builtin/pack-objects.c:3385 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:3387 +#: builtin/pack-objects.c:3388 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:3389 +#: builtin/pack-objects.c:3390 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:3391 +#: builtin/pack-objects.c:3392 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:3393 +#: builtin/pack-objects.c:3394 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:3395 +#: builtin/pack-objects.c:3396 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:3397 +#: builtin/pack-objects.c:3398 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:3399 +#: builtin/pack-objects.c:3400 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:3401 +#: builtin/pack-objects.c:3402 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:3403 +#: builtin/pack-objects.c:3404 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:3405 +#: builtin/pack-objects.c:3406 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:3407 +#: builtin/pack-objects.c:3408 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:3409 +#: builtin/pack-objects.c:3410 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:3411 +#: builtin/pack-objects.c:3412 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3415 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:3417 +#: builtin/pack-objects.c:3418 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3421 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:3423 +#: builtin/pack-objects.c:3424 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:3425 +#: builtin/pack-objects.c:3426 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:3427 +#: builtin/pack-objects.c:3428 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:3429 +#: builtin/pack-objects.c:3430 msgid "pack loose unreachable objects" msgstr "" -#: builtin/pack-objects.c:3431 +#: builtin/pack-objects.c:3432 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:3434 +#: builtin/pack-objects.c:3435 msgid "use the sparse reachability algorithm" msgstr "" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3437 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:3438 +#: builtin/pack-objects.c:3439 msgid "create packs suitable for shallow fetches" msgstr "" -#: builtin/pack-objects.c:3440 +#: builtin/pack-objects.c:3441 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:3442 +#: builtin/pack-objects.c:3443 msgid "ignore this pack" msgstr "" -#: builtin/pack-objects.c:3444 +#: builtin/pack-objects.c:3445 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:3446 +#: builtin/pack-objects.c:3447 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:3448 +#: builtin/pack-objects.c:3449 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:3450 +#: builtin/pack-objects.c:3451 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:3454 +#: builtin/pack-objects.c:3455 msgid "write a bitmap index if possible" msgstr "" -#: builtin/pack-objects.c:3458 +#: builtin/pack-objects.c:3459 msgid "handling for missing objects" msgstr "" -#: builtin/pack-objects.c:3461 +#: builtin/pack-objects.c:3462 msgid "do not pack objects in promisor packfiles" msgstr "" -#: builtin/pack-objects.c:3463 +#: builtin/pack-objects.c:3464 msgid "respect islands during delta compression" msgstr "" -#: builtin/pack-objects.c:3492 +#: builtin/pack-objects.c:3493 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "" -#: builtin/pack-objects.c:3497 +#: builtin/pack-objects.c:3498 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "" -#: builtin/pack-objects.c:3551 +#: builtin/pack-objects.c:3552 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" -#: builtin/pack-objects.c:3553 +#: builtin/pack-objects.c:3554 msgid "minimum pack size limit is 1 MiB" msgstr "" -#: builtin/pack-objects.c:3558 +#: builtin/pack-objects.c:3559 msgid "--thin cannot be used to build an indexable pack" msgstr "" -#: builtin/pack-objects.c:3561 +#: builtin/pack-objects.c:3562 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "" -#: builtin/pack-objects.c:3567 +#: builtin/pack-objects.c:3568 msgid "cannot use --filter without --stdout" msgstr "" -#: builtin/pack-objects.c:3627 +#: builtin/pack-objects.c:3628 msgid "Enumerating objects" msgstr "" -#: builtin/pack-objects.c:3657 +#: builtin/pack-objects.c:3658 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -16338,31 +16531,27 @@ msgstr "" msgid "prune loose refs (default)" msgstr "" -#: builtin/prune-packed.c:9 +#: builtin/prune-packed.c:6 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "" -#: builtin/prune-packed.c:42 -msgid "Removing duplicate objects" -msgstr "" - -#: builtin/prune.c:12 +#: builtin/prune.c:14 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "" -#: builtin/prune.c:131 +#: builtin/prune.c:133 msgid "report pruned objects" msgstr "" -#: builtin/prune.c:134 +#: builtin/prune.c:136 msgid "expire objects older than <time>" msgstr "" -#: builtin/prune.c:136 +#: builtin/prune.c:138 msgid "limit traversal to objects outside promisor packfiles" msgstr "" -#: builtin/prune.c:150 +#: builtin/prune.c:152 msgid "cannot prune in a precious-objects repo" msgstr "" @@ -16375,61 +16564,78 @@ msgstr "" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/pull.c:122 +#: builtin/pull.c:123 msgid "control for recursive fetching of submodules" msgstr "" -#: builtin/pull.c:126 +#: builtin/pull.c:127 msgid "Options related to merging" msgstr "" -#: builtin/pull.c:129 +#: builtin/pull.c:130 msgid "incorporate changes by rebasing rather than merging" msgstr "" -#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:478 builtin/revert.c:126 msgid "allow fast-forward" msgstr "" -#: builtin/pull.c:166 -msgid "automatically stash/stash pop before and after rebase" +#: builtin/pull.c:167 parse-options.h:339 +msgid "automatically stash/stash pop before and after" msgstr "" -#: builtin/pull.c:182 +#: builtin/pull.c:183 msgid "Options related to fetching" msgstr "" -#: builtin/pull.c:192 +#: builtin/pull.c:193 msgid "force overwrite of local branch" msgstr "" -#: builtin/pull.c:200 +#: builtin/pull.c:201 msgid "number of submodules pulled in parallel" msgstr "" -#: builtin/pull.c:300 +#: builtin/pull.c:317 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "" -#: builtin/pull.c:426 +#: builtin/pull.c:349 +msgid "" +"Pulling without specifying how to reconcile divergent branches is\n" +"discouraged. You can squelch this message by running one of the following\n" +"commands sometime before your next pull:\n" +"\n" +" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # fast-forward only\n" +"\n" +"You can replace \"git config\" with \"git config --global\" to set a " +"default\n" +"preference for all repositories. You can also pass --rebase, --no-rebase,\n" +"or --ff-only on the command line to override the configured default per\n" +"invocation.\n" +msgstr "" + +#: builtin/pull.c:459 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "" -#: builtin/pull.c:428 +#: builtin/pull.c:461 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" -#: builtin/pull.c:429 +#: builtin/pull.c:462 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "" -#: builtin/pull.c:432 +#: builtin/pull.c:465 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -16437,74 +16643,70 @@ msgid "" "for your current branch, you must specify a branch on the command line." msgstr "" -#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73 +#: builtin/pull.c:470 builtin/rebase.c:1234 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "" -#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79 +#: builtin/pull.c:472 builtin/pull.c:487 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "" -#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82 +#: builtin/pull.c:474 builtin/pull.c:489 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "" -#: builtin/pull.c:442 builtin/pull.c:457 +#: builtin/pull.c:475 builtin/pull.c:490 msgid "See git-pull(1) for details." msgstr "" -#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459 -#: builtin/rebase.c:1415 git-parse-remote.sh:64 +#: builtin/pull.c:477 builtin/pull.c:483 builtin/pull.c:492 +#: builtin/rebase.c:1240 git-parse-remote.sh:64 msgid "<remote>" msgstr "" -#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464 +#: builtin/pull.c:477 builtin/pull.c:492 builtin/pull.c:497 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "" -#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75 +#: builtin/pull.c:485 builtin/rebase.c:1232 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "" -#: builtin/pull.c:461 git-parse-remote.sh:95 +#: builtin/pull.c:494 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" -#: builtin/pull.c:466 +#: builtin/pull.c:499 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" "from the remote, but no such ref was fetched." msgstr "" -#: builtin/pull.c:576 +#: builtin/pull.c:610 #, c-format msgid "unable to access commit %s" msgstr "" -#: builtin/pull.c:857 +#: builtin/pull.c:895 msgid "ignoring --verify-signatures for rebase" msgstr "" -#: builtin/pull.c:912 -msgid "--[no-]autostash option is only valid with --rebase." -msgstr "" - -#: builtin/pull.c:920 +#: builtin/pull.c:955 msgid "Updating an unborn branch with changes added to the index." msgstr "" -#: builtin/pull.c:924 +#: builtin/pull.c:959 msgid "pull with rebase" msgstr "" -#: builtin/pull.c:925 +#: builtin/pull.c:960 msgid "please commit or stash them." msgstr "" -#: builtin/pull.c:950 +#: builtin/pull.c:985 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -16512,7 +16714,7 @@ msgid "" "commit %s." msgstr "" -#: builtin/pull.c:956 +#: builtin/pull.c:991 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -16523,15 +16725,15 @@ msgid "" "to recover." msgstr "" -#: builtin/pull.c:971 +#: builtin/pull.c:1006 msgid "Cannot merge multiple branches into empty head." msgstr "" -#: builtin/pull.c:975 +#: builtin/pull.c:1010 msgid "Cannot rebase onto multiple branches." msgstr "" -#: builtin/pull.c:982 +#: builtin/pull.c:1018 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" @@ -16641,12 +16843,12 @@ msgid "" "without using the '--force' option.\n" msgstr "" -#: builtin/push.c:360 +#: builtin/push.c:361 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:367 +#: builtin/push.c:368 #, c-format msgid "failed to push some refs to '%s'" msgstr "" @@ -16675,65 +16877,65 @@ msgstr "" msgid "force updates" msgstr "" -#: builtin/push.c:552 builtin/send-pack.c:181 +#: builtin/push.c:551 builtin/send-pack.c:179 msgid "<refname>:<expect>" msgstr "" -#: builtin/push.c:553 builtin/send-pack.c:182 +#: builtin/push.c:552 builtin/send-pack.c:180 msgid "require old value of ref to be at this value" msgstr "" -#: builtin/push.c:556 +#: builtin/push.c:555 msgid "control recursive pushing of submodules" msgstr "" -#: builtin/push.c:558 builtin/send-pack.c:175 +#: builtin/push.c:556 builtin/send-pack.c:174 msgid "use thin pack" msgstr "" -#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161 +#: builtin/push.c:557 builtin/push.c:558 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "" -#: builtin/push.c:561 +#: builtin/push.c:559 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:564 +#: builtin/push.c:562 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:566 +#: builtin/push.c:564 msgid "bypass pre-push hook" msgstr "" -#: builtin/push.c:567 +#: builtin/push.c:565 msgid "push missing but relevant tags" msgstr "" -#: builtin/push.c:570 builtin/send-pack.c:169 +#: builtin/push.c:567 builtin/send-pack.c:168 msgid "GPG sign the push" msgstr "" -#: builtin/push.c:572 builtin/send-pack.c:176 +#: builtin/push.c:569 builtin/send-pack.c:175 msgid "request atomic transaction on remote side" msgstr "" -#: builtin/push.c:590 +#: builtin/push.c:587 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:592 +#: builtin/push.c:589 msgid "--delete doesn't make sense without any refs" msgstr "" -#: builtin/push.c:612 +#: builtin/push.c:609 #, c-format msgid "bad repository '%s'" msgstr "" -#: builtin/push.c:613 +#: builtin/push.c:610 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -16746,27 +16948,27 @@ msgid "" " git push <name>\n" msgstr "" -#: builtin/push.c:628 +#: builtin/push.c:625 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:630 +#: builtin/push.c:627 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:634 +#: builtin/push.c:631 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:636 +#: builtin/push.c:633 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:639 +#: builtin/push.c:636 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:643 +#: builtin/push.c:640 msgid "push options must not have new line characters" msgstr "" @@ -16890,190 +17092,190 @@ msgstr "" msgid "You need to resolve your current index first" msgstr "" -#: builtin/rebase.c:32 +#: builtin/rebase.c:35 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " "[<upstream> [<branch>]]" msgstr "" -#: builtin/rebase.c:34 +#: builtin/rebase.c:37 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" msgstr "" -#: builtin/rebase.c:36 +#: builtin/rebase.c:39 msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "" -#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226 +#: builtin/rebase.c:181 builtin/rebase.c:205 builtin/rebase.c:232 #, c-format msgid "unusable todo list: '%s'" msgstr "" -#: builtin/rebase.c:292 +#: builtin/rebase.c:298 #, c-format msgid "could not create temporary %s" msgstr "" -#: builtin/rebase.c:298 +#: builtin/rebase.c:304 msgid "could not mark as interactive" msgstr "" -#: builtin/rebase.c:352 +#: builtin/rebase.c:358 msgid "could not generate todo list" msgstr "" -#: builtin/rebase.c:391 +#: builtin/rebase.c:399 msgid "a base commit must be provided with --upstream or --onto" msgstr "" -#: builtin/rebase.c:461 +#: builtin/rebase.c:468 msgid "git rebase--interactive [<options>]" msgstr "" -#: builtin/rebase.c:474 builtin/rebase.c:1550 -msgid "(DEPRECATED) keep empty commits" +#: builtin/rebase.c:481 builtin/rebase.c:1374 +msgid "keep commits which start empty" msgstr "" -#: builtin/rebase.c:478 builtin/revert.c:128 +#: builtin/rebase.c:485 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "" -#: builtin/rebase.c:480 +#: builtin/rebase.c:487 msgid "rebase merge commits" msgstr "" -#: builtin/rebase.c:482 +#: builtin/rebase.c:489 msgid "keep original branch points of cousins" msgstr "" -#: builtin/rebase.c:484 +#: builtin/rebase.c:491 msgid "move commits that begin with squash!/fixup!" msgstr "" -#: builtin/rebase.c:485 +#: builtin/rebase.c:492 msgid "sign commits" msgstr "" -#: builtin/rebase.c:487 builtin/rebase.c:1490 +#: builtin/rebase.c:494 builtin/rebase.c:1314 msgid "display a diffstat of what changed upstream" msgstr "" -#: builtin/rebase.c:489 +#: builtin/rebase.c:496 msgid "continue rebase" msgstr "" -#: builtin/rebase.c:491 +#: builtin/rebase.c:498 msgid "skip commit" msgstr "" -#: builtin/rebase.c:492 +#: builtin/rebase.c:499 msgid "edit the todo list" msgstr "" -#: builtin/rebase.c:494 +#: builtin/rebase.c:501 msgid "show the current patch" msgstr "" -#: builtin/rebase.c:497 +#: builtin/rebase.c:504 msgid "shorten commit ids in the todo list" msgstr "" -#: builtin/rebase.c:499 +#: builtin/rebase.c:506 msgid "expand commit ids in the todo list" msgstr "" -#: builtin/rebase.c:501 +#: builtin/rebase.c:508 msgid "check the todo list" msgstr "" -#: builtin/rebase.c:503 +#: builtin/rebase.c:510 msgid "rearrange fixup/squash lines" msgstr "" -#: builtin/rebase.c:505 +#: builtin/rebase.c:512 msgid "insert exec commands in todo list" msgstr "" -#: builtin/rebase.c:506 +#: builtin/rebase.c:513 msgid "onto" msgstr "" -#: builtin/rebase.c:509 +#: builtin/rebase.c:516 msgid "restrict-revision" msgstr "" -#: builtin/rebase.c:509 +#: builtin/rebase.c:516 msgid "restrict revision" msgstr "" -#: builtin/rebase.c:511 +#: builtin/rebase.c:518 msgid "squash-onto" msgstr "" -#: builtin/rebase.c:512 +#: builtin/rebase.c:519 msgid "squash onto" msgstr "" -#: builtin/rebase.c:514 +#: builtin/rebase.c:521 msgid "the upstream commit" msgstr "" -#: builtin/rebase.c:516 +#: builtin/rebase.c:523 msgid "head-name" msgstr "" -#: builtin/rebase.c:516 +#: builtin/rebase.c:523 msgid "head name" msgstr "" -#: builtin/rebase.c:521 +#: builtin/rebase.c:528 msgid "rebase strategy" msgstr "" -#: builtin/rebase.c:522 +#: builtin/rebase.c:529 msgid "strategy-opts" msgstr "" -#: builtin/rebase.c:523 +#: builtin/rebase.c:530 msgid "strategy options" msgstr "" -#: builtin/rebase.c:524 +#: builtin/rebase.c:531 msgid "switch-to" msgstr "" -#: builtin/rebase.c:525 +#: builtin/rebase.c:532 msgid "the branch or commit to checkout" msgstr "" -#: builtin/rebase.c:526 +#: builtin/rebase.c:533 msgid "onto-name" msgstr "" -#: builtin/rebase.c:526 +#: builtin/rebase.c:533 msgid "onto name" msgstr "" -#: builtin/rebase.c:527 +#: builtin/rebase.c:534 msgid "cmd" msgstr "" -#: builtin/rebase.c:527 +#: builtin/rebase.c:534 msgid "the command to run" msgstr "" -#: builtin/rebase.c:530 builtin/rebase.c:1584 +#: builtin/rebase.c:537 builtin/rebase.c:1407 msgid "automatically re-schedule any `exec` that fails" msgstr "" -#: builtin/rebase.c:546 +#: builtin/rebase.c:553 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "" -#: builtin/rebase.c:562 +#: builtin/rebase.c:569 #, c-format -msgid "%s requires an interactive rebase" +msgid "%s requires the merge backend" msgstr "" #: builtin/rebase.c:612 @@ -17081,31 +17283,17 @@ msgstr "" msgid "could not get 'onto': '%s'" msgstr "" -#: builtin/rebase.c:627 +#: builtin/rebase.c:629 #, c-format msgid "invalid orig-head: '%s'" msgstr "" -#: builtin/rebase.c:652 +#: builtin/rebase.c:654 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "" -#: builtin/rebase.c:728 -#, c-format -msgid "Could not read '%s'" -msgstr "" - -#: builtin/rebase.c:746 -#, c-format -msgid "Cannot store %s" -msgstr "" - -#: builtin/rebase.c:853 -msgid "could not determine HEAD revision" -msgstr "" - -#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:799 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -17114,7 +17302,7 @@ msgid "" "abort\"." msgstr "" -#: builtin/rebase.c:1058 +#: builtin/rebase.c:882 #, c-format msgid "" "\n" @@ -17126,14 +17314,14 @@ msgid "" "As a result, git cannot rebase them." msgstr "" -#: builtin/rebase.c:1383 +#: builtin/rebase.c:1208 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" "\"." msgstr "" -#: builtin/rebase.c:1401 +#: builtin/rebase.c:1226 #, c-format msgid "" "%s\n" @@ -17144,7 +17332,7 @@ msgid "" "\n" msgstr "" -#: builtin/rebase.c:1417 +#: builtin/rebase.c:1242 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17153,185 +17341,189 @@ msgid "" "\n" msgstr "" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1272 msgid "exec commands cannot contain newlines" msgstr "" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1276 msgid "empty exec command" msgstr "" -#: builtin/rebase.c:1481 +#: builtin/rebase.c:1305 msgid "rebase onto given branch instead of upstream" msgstr "" -#: builtin/rebase.c:1483 +#: builtin/rebase.c:1307 msgid "use the merge-base of upstream and branch as the current base" msgstr "" -#: builtin/rebase.c:1485 +#: builtin/rebase.c:1309 msgid "allow pre-rebase hook to run" msgstr "" -#: builtin/rebase.c:1487 +#: builtin/rebase.c:1311 msgid "be quiet. implies --no-stat" msgstr "" -#: builtin/rebase.c:1493 +#: builtin/rebase.c:1317 msgid "do not show diffstat of what changed upstream" msgstr "" -#: builtin/rebase.c:1496 +#: builtin/rebase.c:1320 msgid "add a Signed-off-by: line to each commit" msgstr "" -#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504 +#: builtin/rebase.c:1322 builtin/rebase.c:1326 builtin/rebase.c:1328 msgid "passed to 'git am'" msgstr "" -#: builtin/rebase.c:1506 builtin/rebase.c:1508 +#: builtin/rebase.c:1330 builtin/rebase.c:1332 msgid "passed to 'git apply'" msgstr "" -#: builtin/rebase.c:1510 builtin/rebase.c:1513 +#: builtin/rebase.c:1334 builtin/rebase.c:1337 msgid "cherry-pick all commits, even if unchanged" msgstr "" -#: builtin/rebase.c:1515 +#: builtin/rebase.c:1339 msgid "continue" msgstr "" -#: builtin/rebase.c:1518 +#: builtin/rebase.c:1342 msgid "skip current patch and continue" msgstr "" -#: builtin/rebase.c:1520 +#: builtin/rebase.c:1344 msgid "abort and check out the original branch" msgstr "" -#: builtin/rebase.c:1523 +#: builtin/rebase.c:1347 msgid "abort but keep HEAD where it is" msgstr "" -#: builtin/rebase.c:1524 +#: builtin/rebase.c:1348 msgid "edit the todo list during an interactive rebase" msgstr "" -#: builtin/rebase.c:1527 +#: builtin/rebase.c:1351 msgid "show the patch file being applied or merged" msgstr "" -#: builtin/rebase.c:1530 +#: builtin/rebase.c:1354 msgid "use apply strategies to rebase" msgstr "" -#: builtin/rebase.c:1534 +#: builtin/rebase.c:1358 msgid "use merging strategies to rebase" msgstr "" -#: builtin/rebase.c:1538 +#: builtin/rebase.c:1362 msgid "let the user edit the list of commits to rebase" msgstr "" -#: builtin/rebase.c:1542 +#: builtin/rebase.c:1366 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "" -#: builtin/rebase.c:1547 +#: builtin/rebase.c:1371 msgid "how to handle commits that become empty" msgstr "" -#: builtin/rebase.c:1554 +#: builtin/rebase.c:1378 msgid "move commits that begin with squash!/fixup! under -i" msgstr "" -#: builtin/rebase.c:1560 -msgid "automatically stash/stash pop before and after" -msgstr "" - -#: builtin/rebase.c:1562 +#: builtin/rebase.c:1385 msgid "add exec lines after each commit of the editable list" msgstr "" -#: builtin/rebase.c:1566 +#: builtin/rebase.c:1389 msgid "allow rebasing commits with empty messages" msgstr "" -#: builtin/rebase.c:1570 +#: builtin/rebase.c:1393 msgid "try to rebase merges instead of skipping them" msgstr "" -#: builtin/rebase.c:1573 +#: builtin/rebase.c:1396 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "" -#: builtin/rebase.c:1575 +#: builtin/rebase.c:1398 msgid "use the given merge strategy" msgstr "" -#: builtin/rebase.c:1577 builtin/revert.c:115 +#: builtin/rebase.c:1400 builtin/revert.c:115 msgid "option" msgstr "" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1401 msgid "pass the argument through to the merge strategy" msgstr "" -#: builtin/rebase.c:1581 +#: builtin/rebase.c:1404 msgid "rebase all reachable commits up to the root(s)" msgstr "" -#: builtin/rebase.c:1598 +#: builtin/rebase.c:1409 +msgid "apply all changes, even those already present upstream" +msgstr "" + +#: builtin/rebase.c:1426 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." msgstr "" -#: builtin/rebase.c:1604 +#: builtin/rebase.c:1432 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "" -#: builtin/rebase.c:1645 +#: builtin/rebase.c:1473 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" -#: builtin/rebase.c:1650 +#: builtin/rebase.c:1478 msgid "cannot combine '--keep-base' with '--onto'" msgstr "" -#: builtin/rebase.c:1652 +#: builtin/rebase.c:1480 msgid "cannot combine '--keep-base' with '--root'" msgstr "" -#: builtin/rebase.c:1656 +#: builtin/rebase.c:1484 +msgid "cannot combine '--root' with '--fork-point'" +msgstr "" + +#: builtin/rebase.c:1487 msgid "No rebase in progress?" msgstr "" -#: builtin/rebase.c:1660 +#: builtin/rebase.c:1491 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" -#: builtin/rebase.c:1683 +#: builtin/rebase.c:1514 msgid "Cannot read HEAD" msgstr "" -#: builtin/rebase.c:1695 +#: builtin/rebase.c:1526 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" -#: builtin/rebase.c:1714 +#: builtin/rebase.c:1545 msgid "could not discard worktree changes" msgstr "" -#: builtin/rebase.c:1733 +#: builtin/rebase.c:1564 #, c-format msgid "could not move back to %s" msgstr "" -#: builtin/rebase.c:1778 +#: builtin/rebase.c:1610 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -17344,163 +17536,140 @@ msgid "" "valuable there.\n" msgstr "" -#: builtin/rebase.c:1806 +#: builtin/rebase.c:1638 msgid "switch `C' expects a numerical value" msgstr "" -#: builtin/rebase.c:1847 +#: builtin/rebase.c:1680 #, c-format msgid "Unknown mode: %s" msgstr "" -#: builtin/rebase.c:1869 +#: builtin/rebase.c:1702 msgid "--strategy requires --merge or --interactive" msgstr "" -#: builtin/rebase.c:1899 +#: builtin/rebase.c:1732 msgid "cannot combine apply options with merge options" msgstr "" -#: builtin/rebase.c:1912 +#: builtin/rebase.c:1745 #, c-format msgid "Unknown rebase backend: %s" msgstr "" -#: builtin/rebase.c:1937 +#: builtin/rebase.c:1770 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "" -#: builtin/rebase.c:1957 +#: builtin/rebase.c:1790 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "" -#: builtin/rebase.c:1961 +#: builtin/rebase.c:1794 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" -#: builtin/rebase.c:1985 +#: builtin/rebase.c:1818 #, c-format msgid "invalid upstream '%s'" msgstr "" -#: builtin/rebase.c:1991 +#: builtin/rebase.c:1824 msgid "Could not create new root commit" msgstr "" -#: builtin/rebase.c:2017 +#: builtin/rebase.c:1850 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "" -#: builtin/rebase.c:2020 +#: builtin/rebase.c:1853 #, c-format msgid "'%s': need exactly one merge base" msgstr "" -#: builtin/rebase.c:2028 +#: builtin/rebase.c:1861 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "" -#: builtin/rebase.c:2054 +#: builtin/rebase.c:1887 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "" -#: builtin/rebase.c:2062 builtin/submodule--helper.c:40 +#: builtin/rebase.c:1895 builtin/submodule--helper.c:40 #: builtin/submodule--helper.c:1990 #, c-format msgid "No such ref: %s" msgstr "" -#: builtin/rebase.c:2073 +#: builtin/rebase.c:1906 msgid "Could not resolve HEAD to a revision" msgstr "" -#: builtin/rebase.c:2111 -msgid "Cannot autostash" -msgstr "" - -#: builtin/rebase.c:2114 -#, c-format -msgid "Unexpected stash response: '%s'" -msgstr "" - -#: builtin/rebase.c:2120 -#, c-format -msgid "Could not create directory for '%s'" -msgstr "" - -#: builtin/rebase.c:2123 -#, c-format -msgid "Created autostash: %s\n" -msgstr "" - -#: builtin/rebase.c:2126 -msgid "could not reset --hard" -msgstr "" - -#: builtin/rebase.c:2135 +#: builtin/rebase.c:1927 msgid "Please commit or stash them." msgstr "" -#: builtin/rebase.c:2169 +#: builtin/rebase.c:1963 #, c-format msgid "could not switch to %s" msgstr "" -#: builtin/rebase.c:2180 +#: builtin/rebase.c:1974 msgid "HEAD is up to date." msgstr "" -#: builtin/rebase.c:2182 +#: builtin/rebase.c:1976 #, c-format msgid "Current branch %s is up to date.\n" msgstr "" -#: builtin/rebase.c:2190 +#: builtin/rebase.c:1984 msgid "HEAD is up to date, rebase forced." msgstr "" -#: builtin/rebase.c:2192 +#: builtin/rebase.c:1986 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "" -#: builtin/rebase.c:2200 +#: builtin/rebase.c:1994 msgid "The pre-rebase hook refused to rebase." msgstr "" -#: builtin/rebase.c:2207 +#: builtin/rebase.c:2001 #, c-format msgid "Changes to %s:\n" msgstr "" -#: builtin/rebase.c:2210 +#: builtin/rebase.c:2004 #, c-format msgid "Changes from %s to %s:\n" msgstr "" -#: builtin/rebase.c:2235 +#: builtin/rebase.c:2029 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" -#: builtin/rebase.c:2244 +#: builtin/rebase.c:2038 msgid "Could not detach HEAD" msgstr "" -#: builtin/rebase.c:2253 +#: builtin/rebase.c:2047 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "" -#: builtin/receive-pack.c:33 +#: builtin/receive-pack.c:34 msgid "git receive-pack <git-dir>" msgstr "" -#: builtin/receive-pack.c:821 +#: builtin/receive-pack.c:843 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -17517,7 +17686,7 @@ msgid "" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "" -#: builtin/receive-pack.c:841 +#: builtin/receive-pack.c:863 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -17529,11 +17698,11 @@ msgid "" "To squelch this message, you can set it to 'refuse'." msgstr "" -#: builtin/receive-pack.c:1938 +#: builtin/receive-pack.c:1960 msgid "quiet" msgstr "" -#: builtin/receive-pack.c:1952 +#: builtin/receive-pack.c:1974 msgid "You must specify a directory." msgstr "" @@ -18090,121 +18259,121 @@ msgstr "" msgid "Will not delete all non-push URLs" msgstr "" -#: builtin/repack.c:23 +#: builtin/repack.c:25 msgid "git repack [<options>]" msgstr "" -#: builtin/repack.c:28 +#: builtin/repack.c:30 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." msgstr "" -#: builtin/repack.c:191 +#: builtin/repack.c:193 msgid "could not start pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:230 builtin/repack.c:416 +#: builtin/repack.c:232 builtin/repack.c:418 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" -#: builtin/repack.c:254 +#: builtin/repack.c:256 msgid "could not finish pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:292 +#: builtin/repack.c:294 msgid "pack everything in a single pack" msgstr "" -#: builtin/repack.c:294 +#: builtin/repack.c:296 msgid "same as -a, and turn unreachable objects loose" msgstr "" -#: builtin/repack.c:297 +#: builtin/repack.c:299 msgid "remove redundant packs, and run git-prune-packed" msgstr "" -#: builtin/repack.c:299 +#: builtin/repack.c:301 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "" -#: builtin/repack.c:301 +#: builtin/repack.c:303 msgid "pass --no-reuse-object to git-pack-objects" msgstr "" -#: builtin/repack.c:303 +#: builtin/repack.c:305 msgid "do not run git-update-server-info" msgstr "" -#: builtin/repack.c:306 +#: builtin/repack.c:308 msgid "pass --local to git-pack-objects" msgstr "" -#: builtin/repack.c:308 +#: builtin/repack.c:310 msgid "write bitmap index" msgstr "" -#: builtin/repack.c:310 +#: builtin/repack.c:312 msgid "pass --delta-islands to git-pack-objects" msgstr "" -#: builtin/repack.c:311 +#: builtin/repack.c:313 msgid "approxidate" msgstr "" -#: builtin/repack.c:312 +#: builtin/repack.c:314 msgid "with -A, do not loosen objects older than this" msgstr "" -#: builtin/repack.c:314 +#: builtin/repack.c:316 msgid "with -a, repack unreachable objects" msgstr "" -#: builtin/repack.c:316 +#: builtin/repack.c:318 msgid "size of the window used for delta compression" msgstr "" -#: builtin/repack.c:317 builtin/repack.c:323 +#: builtin/repack.c:319 builtin/repack.c:325 msgid "bytes" msgstr "" -#: builtin/repack.c:318 +#: builtin/repack.c:320 msgid "same as the above, but limit memory size instead of entries count" msgstr "" -#: builtin/repack.c:320 +#: builtin/repack.c:322 msgid "limits the maximum delta depth" msgstr "" -#: builtin/repack.c:322 +#: builtin/repack.c:324 msgid "limits the maximum number of threads" msgstr "" -#: builtin/repack.c:324 +#: builtin/repack.c:326 msgid "maximum size of each packfile" msgstr "" -#: builtin/repack.c:326 +#: builtin/repack.c:328 msgid "repack objects in packs marked with .keep" msgstr "" -#: builtin/repack.c:328 +#: builtin/repack.c:330 msgid "do not repack this pack" msgstr "" -#: builtin/repack.c:338 +#: builtin/repack.c:340 msgid "cannot delete packs in a precious-objects repo" msgstr "" -#: builtin/repack.c:342 +#: builtin/repack.c:344 msgid "--keep-unreachable and -A are incompatible" msgstr "" -#: builtin/repack.c:425 +#: builtin/repack.c:427 msgid "Nothing new to pack." msgstr "" -#: builtin/repack.c:486 +#: builtin/repack.c:488 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -18216,7 +18385,7 @@ msgid "" "WARNING: Please rename them in %s manually:\n" msgstr "" -#: builtin/repack.c:534 +#: builtin/repack.c:536 #, c-format msgid "failed to remove '%s'" msgstr "" @@ -18515,91 +18684,91 @@ msgstr "" msgid "keep" msgstr "" -#: builtin/reset.c:82 +#: builtin/reset.c:83 msgid "You do not have a valid HEAD." msgstr "" -#: builtin/reset.c:84 +#: builtin/reset.c:85 msgid "Failed to find tree of HEAD." msgstr "" -#: builtin/reset.c:90 +#: builtin/reset.c:91 #, c-format msgid "Failed to find tree of %s." msgstr "" -#: builtin/reset.c:115 +#: builtin/reset.c:116 #, c-format msgid "HEAD is now at %s" msgstr "" -#: builtin/reset.c:194 +#: builtin/reset.c:195 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "" -#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595 #: builtin/stash.c:619 msgid "be quiet, only report errors" msgstr "" -#: builtin/reset.c:296 +#: builtin/reset.c:297 msgid "reset HEAD and index" msgstr "" -#: builtin/reset.c:297 +#: builtin/reset.c:298 msgid "reset only HEAD" msgstr "" -#: builtin/reset.c:299 builtin/reset.c:301 +#: builtin/reset.c:300 builtin/reset.c:302 msgid "reset HEAD, index and working tree" msgstr "" -#: builtin/reset.c:303 +#: builtin/reset.c:304 msgid "reset HEAD but keep local changes" msgstr "" -#: builtin/reset.c:309 +#: builtin/reset.c:310 msgid "record only the fact that removed paths will be added later" msgstr "" -#: builtin/reset.c:343 +#: builtin/reset.c:344 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "" -#: builtin/reset.c:351 +#: builtin/reset.c:352 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "" -#: builtin/reset.c:360 +#: builtin/reset.c:361 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "" -#: builtin/reset.c:370 +#: builtin/reset.c:371 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" -#: builtin/reset.c:372 +#: builtin/reset.c:373 #, c-format msgid "Cannot do %s reset with paths." msgstr "" -#: builtin/reset.c:387 +#: builtin/reset.c:388 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "" -#: builtin/reset.c:391 +#: builtin/reset.c:392 msgid "-N can only be used with --mixed" msgstr "" -#: builtin/reset.c:412 +#: builtin/reset.c:413 msgid "Unstaged changes after reset:" msgstr "" -#: builtin/reset.c:415 +#: builtin/reset.c:416 #, c-format msgid "" "\n" @@ -18608,12 +18777,12 @@ msgid "" "to make this the default.\n" msgstr "" -#: builtin/reset.c:425 +#: builtin/reset.c:434 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "" -#: builtin/reset.c:429 +#: builtin/reset.c:439 msgid "Could not write new index file." msgstr "" @@ -18633,23 +18802,23 @@ msgstr "" msgid "marked counting is incompatible with --objects" msgstr "" -#: builtin/rev-parse.c:408 +#: builtin/rev-parse.c:409 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "" -#: builtin/rev-parse.c:413 +#: builtin/rev-parse.c:414 msgid "keep the `--` passed as an arg" msgstr "" -#: builtin/rev-parse.c:415 +#: builtin/rev-parse.c:416 msgid "stop parsing after the first non-option argument" msgstr "" -#: builtin/rev-parse.c:418 +#: builtin/rev-parse.c:419 msgid "output in stuck long form" msgstr "" -#: builtin/rev-parse.c:551 +#: builtin/rev-parse.c:552 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -18832,15 +19001,15 @@ msgstr "" msgid "remote name" msgstr "" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:176 msgid "use stateless RPC protocol" msgstr "" -#: builtin/send-pack.c:178 +#: builtin/send-pack.c:177 msgid "read refs from stdin" msgstr "" -#: builtin/send-pack.c:179 +#: builtin/send-pack.c:178 msgid "print status from remote helper" msgstr "" @@ -19053,69 +19222,57 @@ msgid "show refs from stdin that aren't in local repository" msgstr "" #: builtin/sparse-checkout.c:21 -msgid "git sparse-checkout (init|list|set|add|disable) <options>" +msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" msgstr "" #: builtin/sparse-checkout.c:64 msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "" -#: builtin/sparse-checkout.c:225 +#: builtin/sparse-checkout.c:212 msgid "failed to create directory for sparse-checkout file" msgstr "" -#: builtin/sparse-checkout.c:266 +#: builtin/sparse-checkout.c:253 msgid "failed to set extensions.worktreeConfig setting" msgstr "" -#: builtin/sparse-checkout.c:283 +#: builtin/sparse-checkout.c:270 msgid "git sparse-checkout init [--cone]" msgstr "" -#: builtin/sparse-checkout.c:302 +#: builtin/sparse-checkout.c:289 msgid "initialize the sparse-checkout in cone mode" msgstr "" -#: builtin/sparse-checkout.c:308 -msgid "initialize sparse-checkout" -msgstr "" - -#: builtin/sparse-checkout.c:341 +#: builtin/sparse-checkout.c:326 #, c-format msgid "failed to open '%s'" msgstr "" -#: builtin/sparse-checkout.c:398 +#: builtin/sparse-checkout.c:383 #, c-format msgid "could not normalize path %s" msgstr "" -#: builtin/sparse-checkout.c:410 +#: builtin/sparse-checkout.c:395 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "" -#: builtin/sparse-checkout.c:435 +#: builtin/sparse-checkout.c:420 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "" -#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513 +#: builtin/sparse-checkout.c:474 builtin/sparse-checkout.c:498 msgid "unable to load existing sparse-checkout patterns" msgstr "" -#: builtin/sparse-checkout.c:558 +#: builtin/sparse-checkout.c:543 msgid "read patterns from standard in" msgstr "" -#: builtin/sparse-checkout.c:564 -msgid "set sparse-checkout patterns" -msgstr "" - -#: builtin/sparse-checkout.c:581 -msgid "disable sparse-checkout" -msgstr "" - -#: builtin/sparse-checkout.c:593 +#: builtin/sparse-checkout.c:580 msgid "error while refreshing working directory" msgstr "" @@ -19186,7 +19343,7 @@ msgstr "" msgid "Too many revisions specified:%s" msgstr "" -#: builtin/stash.c:162 git-legacy-stash.sh:549 +#: builtin/stash.c:162 msgid "No stash entries found." msgstr "" @@ -19195,7 +19352,7 @@ msgstr "" msgid "%s is not a valid reference" msgstr "" -#: builtin/stash.c:225 git-legacy-stash.sh:75 +#: builtin/stash.c:225 msgid "git stash clear with parameters is unimplemented" msgstr "" @@ -19225,7 +19382,7 @@ msgstr "" msgid "Merging %s with %s" msgstr "" -#: builtin/stash.c:461 git-legacy-stash.sh:681 +#: builtin/stash.c:461 msgid "Index was not unstashed." msgstr "" @@ -19248,104 +19405,104 @@ msgstr "" msgid "'%s' is not a stash reference" msgstr "" -#: builtin/stash.c:633 git-legacy-stash.sh:695 +#: builtin/stash.c:633 msgid "The stash entry is kept in case you need it again." msgstr "" -#: builtin/stash.c:656 git-legacy-stash.sh:713 +#: builtin/stash.c:656 msgid "No branch name specified" msgstr "" -#: builtin/stash.c:796 builtin/stash.c:833 +#: builtin/stash.c:800 builtin/stash.c:837 #, c-format msgid "Cannot update %s with %s" msgstr "" -#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543 +#: builtin/stash.c:818 builtin/stash.c:1475 builtin/stash.c:1540 msgid "stash message" msgstr "" -#: builtin/stash.c:824 +#: builtin/stash.c:828 msgid "\"git stash store\" requires one <commit> argument" msgstr "" -#: builtin/stash.c:1049 git-legacy-stash.sh:218 +#: builtin/stash.c:1046 msgid "No changes selected" msgstr "" -#: builtin/stash.c:1149 git-legacy-stash.sh:150 +#: builtin/stash.c:1146 msgid "You do not have the initial commit yet" msgstr "" -#: builtin/stash.c:1176 git-legacy-stash.sh:165 +#: builtin/stash.c:1173 msgid "Cannot save the current index state" msgstr "" -#: builtin/stash.c:1185 git-legacy-stash.sh:180 +#: builtin/stash.c:1182 msgid "Cannot save the untracked files" msgstr "" -#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201 -#: git-legacy-stash.sh:214 +#: builtin/stash.c:1193 builtin/stash.c:1202 msgid "Cannot save the current worktree state" msgstr "" -#: builtin/stash.c:1233 git-legacy-stash.sh:234 +#: builtin/stash.c:1230 msgid "Cannot record working tree state" msgstr "" -#: builtin/stash.c:1282 git-legacy-stash.sh:338 +#: builtin/stash.c:1279 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" -#: builtin/stash.c:1298 +#: builtin/stash.c:1295 msgid "Did you forget to 'git add'?" msgstr "" -#: builtin/stash.c:1313 git-legacy-stash.sh:346 +#: builtin/stash.c:1310 msgid "No local changes to save" msgstr "" -#: builtin/stash.c:1320 git-legacy-stash.sh:351 +#: builtin/stash.c:1317 msgid "Cannot initialize stash" msgstr "" -#: builtin/stash.c:1335 git-legacy-stash.sh:355 +#: builtin/stash.c:1332 msgid "Cannot save the current status" msgstr "" -#: builtin/stash.c:1340 +#: builtin/stash.c:1337 #, c-format msgid "Saved working directory and index state %s" msgstr "" -#: builtin/stash.c:1430 git-legacy-stash.sh:385 +#: builtin/stash.c:1427 msgid "Cannot remove worktree changes" msgstr "" -#: builtin/stash.c:1469 builtin/stash.c:1534 +#: builtin/stash.c:1466 builtin/stash.c:1531 msgid "keep index" msgstr "" -#: builtin/stash.c:1471 builtin/stash.c:1536 +#: builtin/stash.c:1468 builtin/stash.c:1533 msgid "stash in patch mode" msgstr "" -#: builtin/stash.c:1472 builtin/stash.c:1537 +#: builtin/stash.c:1469 builtin/stash.c:1534 msgid "quiet mode" msgstr "" -#: builtin/stash.c:1474 builtin/stash.c:1539 +#: builtin/stash.c:1471 builtin/stash.c:1536 msgid "include untracked files in stash" msgstr "" -#: builtin/stash.c:1476 builtin/stash.c:1541 +#: builtin/stash.c:1473 builtin/stash.c:1538 msgid "include ignore files" msgstr "" -#: builtin/stash.c:1600 -#, c-format -msgid "could not exec %s" +#: builtin/stash.c:1573 +msgid "" +"the stash.useBuiltin support has been removed!\n" +"See its entry in 'git help config' for details." msgstr "" #: builtin/stripspace.c:18 @@ -19764,17 +19921,25 @@ msgstr "" msgid "git submodule--helper config --check-writeable" msgstr "" -#: builtin/submodule--helper.c:2241 git-submodule.sh:174 +#: builtin/submodule--helper.c:2241 git-submodule.sh:176 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" -#: builtin/submodule--helper.c:2291 git.c:433 git.c:684 +#: builtin/submodule--helper.c:2257 +msgid "Suppress output for setting url of a submodule" +msgstr "" + +#: builtin/submodule--helper.c:2261 +msgid "git submodule--helper set-url [--quiet] <path> <newurl>" +msgstr "" + +#: builtin/submodule--helper.c:2323 git.c:436 git.c:683 #, c-format msgid "%s doesn't support --super-prefix" msgstr "" -#: builtin/submodule--helper.c:2297 +#: builtin/submodule--helper.c:2329 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "" @@ -19799,11 +19964,11 @@ msgstr "" msgid "shorten ref output" msgstr "" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason" msgstr "" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason of the update" msgstr "" @@ -19878,134 +20043,134 @@ msgstr "" msgid "bad object type." msgstr "" -#: builtin/tag.c:284 +#: builtin/tag.c:285 msgid "no tag message?" msgstr "" -#: builtin/tag.c:291 +#: builtin/tag.c:292 #, c-format msgid "The tag message has been left in %s\n" msgstr "" -#: builtin/tag.c:402 +#: builtin/tag.c:403 msgid "list tag names" msgstr "" -#: builtin/tag.c:404 +#: builtin/tag.c:405 msgid "print <n> lines of each tag message" msgstr "" -#: builtin/tag.c:406 +#: builtin/tag.c:407 msgid "delete tags" msgstr "" -#: builtin/tag.c:407 +#: builtin/tag.c:408 msgid "verify tags" msgstr "" -#: builtin/tag.c:409 +#: builtin/tag.c:410 msgid "Tag creation options" msgstr "" -#: builtin/tag.c:411 +#: builtin/tag.c:412 msgid "annotated tag, needs a message" msgstr "" -#: builtin/tag.c:413 +#: builtin/tag.c:414 msgid "tag message" msgstr "" -#: builtin/tag.c:415 +#: builtin/tag.c:416 msgid "force edit of tag message" msgstr "" -#: builtin/tag.c:416 +#: builtin/tag.c:417 msgid "annotated and GPG-signed tag" msgstr "" -#: builtin/tag.c:419 +#: builtin/tag.c:420 msgid "use another key to sign the tag" msgstr "" -#: builtin/tag.c:420 +#: builtin/tag.c:421 msgid "replace the tag if exists" msgstr "" -#: builtin/tag.c:421 builtin/update-ref.c:369 +#: builtin/tag.c:422 builtin/update-ref.c:492 msgid "create a reflog" msgstr "" -#: builtin/tag.c:423 +#: builtin/tag.c:424 msgid "Tag listing options" msgstr "" -#: builtin/tag.c:424 +#: builtin/tag.c:425 msgid "show tag list in columns" msgstr "" -#: builtin/tag.c:425 builtin/tag.c:427 +#: builtin/tag.c:426 builtin/tag.c:428 msgid "print only tags that contain the commit" msgstr "" -#: builtin/tag.c:426 builtin/tag.c:428 +#: builtin/tag.c:427 builtin/tag.c:429 msgid "print only tags that don't contain the commit" msgstr "" -#: builtin/tag.c:429 +#: builtin/tag.c:430 msgid "print only tags that are merged" msgstr "" -#: builtin/tag.c:430 +#: builtin/tag.c:431 msgid "print only tags that are not merged" msgstr "" -#: builtin/tag.c:434 +#: builtin/tag.c:435 msgid "print only tags of the object" msgstr "" -#: builtin/tag.c:482 +#: builtin/tag.c:483 msgid "--column and -n are incompatible" msgstr "" -#: builtin/tag.c:504 +#: builtin/tag.c:505 msgid "-n option is only allowed in list mode" msgstr "" -#: builtin/tag.c:506 +#: builtin/tag.c:507 msgid "--contains option is only allowed in list mode" msgstr "" -#: builtin/tag.c:508 +#: builtin/tag.c:509 msgid "--no-contains option is only allowed in list mode" msgstr "" -#: builtin/tag.c:510 +#: builtin/tag.c:511 msgid "--points-at option is only allowed in list mode" msgstr "" -#: builtin/tag.c:512 +#: builtin/tag.c:513 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "" -#: builtin/tag.c:523 +#: builtin/tag.c:524 msgid "only one -F or -m option is allowed." msgstr "" -#: builtin/tag.c:542 +#: builtin/tag.c:543 msgid "too many params" msgstr "" -#: builtin/tag.c:548 +#: builtin/tag.c:549 #, c-format msgid "'%s' is not a valid tag name." msgstr "" -#: builtin/tag.c:553 +#: builtin/tag.c:554 #, c-format msgid "tag '%s' already exists" msgstr "" -#: builtin/tag.c:584 +#: builtin/tag.c:585 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "" @@ -20269,19 +20434,19 @@ msgstr "" msgid "git update-ref [<options>] --stdin [-z]" msgstr "" -#: builtin/update-ref.c:364 +#: builtin/update-ref.c:487 msgid "delete the reference" msgstr "" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:489 msgid "update <refname> not the one it points to" msgstr "" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:490 msgid "stdin has NUL-terminated arguments" msgstr "" -#: builtin/update-ref.c:368 +#: builtin/update-ref.c:491 msgid "read updates from stdin" msgstr "" @@ -20373,7 +20538,7 @@ msgstr "" msgid "git worktree unlock <path>" msgstr "" -#: builtin/worktree.c:60 builtin/worktree.c:891 +#: builtin/worktree.c:60 builtin/worktree.c:894 #, c-format msgid "failed to delete '%s'" msgstr "" @@ -20447,170 +20612,170 @@ msgstr "" msgid "could not create directory of '%s'" msgstr "" -#: builtin/worktree.c:432 builtin/worktree.c:438 +#: builtin/worktree.c:435 builtin/worktree.c:441 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "" -#: builtin/worktree.c:434 +#: builtin/worktree.c:437 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "" -#: builtin/worktree.c:443 +#: builtin/worktree.c:446 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "" -#: builtin/worktree.c:449 +#: builtin/worktree.c:452 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "" -#: builtin/worktree.c:490 +#: builtin/worktree.c:493 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" -#: builtin/worktree.c:493 +#: builtin/worktree.c:496 msgid "create a new branch" msgstr "" -#: builtin/worktree.c:495 +#: builtin/worktree.c:498 msgid "create or reset a branch" msgstr "" -#: builtin/worktree.c:497 +#: builtin/worktree.c:500 msgid "populate the new working tree" msgstr "" -#: builtin/worktree.c:498 +#: builtin/worktree.c:501 msgid "keep the new working tree locked" msgstr "" -#: builtin/worktree.c:501 +#: builtin/worktree.c:504 msgid "set up tracking mode (see git-branch(1))" msgstr "" -#: builtin/worktree.c:504 +#: builtin/worktree.c:507 msgid "try to match the new branch name with a remote-tracking branch" msgstr "" -#: builtin/worktree.c:512 +#: builtin/worktree.c:515 msgid "-b, -B, and --detach are mutually exclusive" msgstr "" -#: builtin/worktree.c:573 +#: builtin/worktree.c:576 msgid "--[no-]track can only be used if a new branch is created" msgstr "" -#: builtin/worktree.c:673 +#: builtin/worktree.c:676 msgid "reason for locking" msgstr "" -#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 -#: builtin/worktree.c:919 +#: builtin/worktree.c:688 builtin/worktree.c:721 builtin/worktree.c:795 +#: builtin/worktree.c:922 #, c-format msgid "'%s' is not a working tree" msgstr "" -#: builtin/worktree.c:687 builtin/worktree.c:720 +#: builtin/worktree.c:690 builtin/worktree.c:723 msgid "The main working tree cannot be locked or unlocked" msgstr "" -#: builtin/worktree.c:692 +#: builtin/worktree.c:695 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "" -#: builtin/worktree.c:694 +#: builtin/worktree.c:697 #, c-format msgid "'%s' is already locked" msgstr "" -#: builtin/worktree.c:722 +#: builtin/worktree.c:725 #, c-format msgid "'%s' is not locked" msgstr "" -#: builtin/worktree.c:763 +#: builtin/worktree.c:766 msgid "working trees containing submodules cannot be moved or removed" msgstr "" -#: builtin/worktree.c:771 +#: builtin/worktree.c:774 msgid "force move even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:794 builtin/worktree.c:921 +#: builtin/worktree.c:797 builtin/worktree.c:924 #, c-format msgid "'%s' is a main working tree" msgstr "" -#: builtin/worktree.c:799 +#: builtin/worktree.c:802 #, c-format msgid "could not figure out destination name from '%s'" msgstr "" -#: builtin/worktree.c:805 +#: builtin/worktree.c:808 #, c-format msgid "target '%s' already exists" msgstr "" -#: builtin/worktree.c:813 +#: builtin/worktree.c:816 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" "use 'move -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:815 +#: builtin/worktree.c:818 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:818 +#: builtin/worktree.c:821 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "" -#: builtin/worktree.c:823 +#: builtin/worktree.c:826 #, c-format msgid "failed to move '%s' to '%s'" msgstr "" -#: builtin/worktree.c:871 +#: builtin/worktree.c:874 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "" -#: builtin/worktree.c:875 +#: builtin/worktree.c:878 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" -#: builtin/worktree.c:880 +#: builtin/worktree.c:883 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "" -#: builtin/worktree.c:903 +#: builtin/worktree.c:906 msgid "force removal even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:926 +#: builtin/worktree.c:929 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" "use 'remove -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:928 +#: builtin/worktree.c:931 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:931 +#: builtin/worktree.c:934 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" @@ -20631,17 +20796,106 @@ msgstr "" msgid "only useful for debugging" msgstr "" -#: fast-import.c:3125 +#: bugreport.c:14 +msgid "git version:\n" +msgstr "" + +#: bugreport.c:20 +#, c-format +msgid "uname() failed with error '%s' (%d)\n" +msgstr "" + +#: bugreport.c:30 +msgid "compiler info: " +msgstr "" + +#: bugreport.c:32 +msgid "libc info: " +msgstr "" + +#: bugreport.c:74 +msgid "not run from a git repository - no hooks to show\n" +msgstr "" + +#: bugreport.c:84 +msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" +msgstr "" + +#: bugreport.c:91 +msgid "" +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" +"\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" +"\n" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" +"\n" +"Anything else you want to add:\n" +"\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n" +msgstr "" + +#: bugreport.c:130 +msgid "specify a destination for the bugreport file" +msgstr "" + +#: bugreport.c:132 +msgid "specify a strftime format suffix for the filename" +msgstr "" + +#: bugreport.c:156 +#, c-format +msgid "could not create leading directories for '%s'" +msgstr "" + +#: bugreport.c:163 +msgid "System Info" +msgstr "" + +#: bugreport.c:166 +msgid "Enabled Hooks" +msgstr "" + +#: bugreport.c:174 +#, c-format +msgid "couldn't create a new file at '%s'" +msgstr "" + +#: bugreport.c:186 +#, c-format +msgid "Created new report at '%s'.\n" +msgstr "" + +#: fast-import.c:3085 +#, c-format +msgid "Missing from marks for submodule '%s'" +msgstr "" + +#: fast-import.c:3087 +#, c-format +msgid "Missing to marks for submodule '%s'" +msgstr "" + +#: fast-import.c:3222 #, c-format msgid "Expected 'mark' command, got %s" msgstr "" -#: fast-import.c:3130 +#: fast-import.c:3227 #, c-format msgid "Expected 'to' command, got %s" msgstr "" -#: fast-import.c:3254 +#: fast-import.c:3317 +msgid "Expected format name:filename for submodule rewrite option" +msgstr "" + +#: fast-import.c:3371 #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "" @@ -20676,7 +20930,7 @@ msgstr "" msgid "exit immediately after advertising capabilities" msgstr "" -#: git.c:27 +#: git.c:28 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" @@ -20686,7 +20940,7 @@ msgid "" " <command> [<args>]" msgstr "" -#: git.c:34 +#: git.c:35 msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" @@ -20694,139 +20948,139 @@ msgid "" "See 'git help git' for an overview of the system." msgstr "" -#: git.c:186 +#: git.c:187 #, c-format msgid "no directory given for --git-dir\n" msgstr "" -#: git.c:200 +#: git.c:201 #, c-format msgid "no namespace given for --namespace\n" msgstr "" -#: git.c:214 +#: git.c:215 #, c-format msgid "no directory given for --work-tree\n" msgstr "" -#: git.c:228 +#: git.c:229 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "" -#: git.c:250 +#: git.c:251 #, c-format msgid "-c expects a configuration string\n" msgstr "" -#: git.c:288 +#: git.c:289 #, c-format msgid "no directory given for -C\n" msgstr "" -#: git.c:314 +#: git.c:315 #, c-format msgid "unknown option: %s\n" msgstr "" -#: git.c:360 +#: git.c:362 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "" -#: git.c:369 +#: git.c:371 #, c-format msgid "" "alias '%s' changes environment variables.\n" "You can use '!git' in the alias to do this" msgstr "" -#: git.c:376 +#: git.c:378 #, c-format msgid "empty alias for %s" msgstr "" -#: git.c:379 +#: git.c:381 #, c-format msgid "recursive alias: %s" msgstr "" -#: git.c:459 +#: git.c:463 msgid "write failure on standard output" msgstr "" -#: git.c:461 +#: git.c:465 msgid "unknown write failure on standard output" msgstr "" -#: git.c:463 +#: git.c:467 msgid "close failed on standard output" msgstr "" -#: git.c:793 +#: git.c:792 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "" -#: git.c:843 +#: git.c:842 #, c-format msgid "cannot handle %s as a builtin" msgstr "" -#: git.c:856 +#: git.c:855 #, c-format msgid "" "usage: %s\n" "\n" msgstr "" -#: git.c:876 +#: git.c:875 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" -#: git.c:888 +#: git.c:887 #, c-format msgid "failed to run command '%s': %s\n" msgstr "" -#: http.c:378 +#: http.c:399 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "" -#: http.c:399 +#: http.c:420 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "" -#: http.c:408 +#: http.c:429 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "" -#: http.c:876 +#: http.c:914 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "" -#: http.c:949 +#: http.c:993 msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "" -#: http.c:1086 +#: http.c:1139 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "" -#: http.c:1093 +#: http.c:1146 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "" -#: http.c:1097 +#: http.c:1150 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "" -#: http.c:1966 +#: http.c:2032 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -20943,6 +21197,14 @@ msgstr "" msgid "remote-curl: unknown command '%s' from git" msgstr "" +#: compat/compiler.h:26 +msgid "no compiler information available\n" +msgstr "" + +#: compat/compiler.h:38 +msgid "no libc information available\n" +msgstr "" + #: list-objects-filter-options.h:85 msgid "args" msgstr "" @@ -20996,11 +21258,11 @@ msgstr "" msgid "update the index with reused conflict resolution if possible" msgstr "" -#: wt-status.h:67 +#: wt-status.h:80 msgid "HEAD detached at " msgstr "" -#: wt-status.h:68 +#: wt-status.h:81 msgid "HEAD detached from " msgstr "" @@ -21041,618 +21303,626 @@ msgid "List, create, or delete branches" msgstr "" #: command-list.h:59 -msgid "Move objects and refs by archive" +msgid "Collect information for user to file a bug report" msgstr "" #: command-list.h:60 -msgid "Provide content or type and size information for repository objects" +msgid "Move objects and refs by archive" msgstr "" #: command-list.h:61 -msgid "Display gitattributes information" +msgid "Provide content or type and size information for repository objects" msgstr "" #: command-list.h:62 -msgid "Debug gitignore / exclude files" +msgid "Display gitattributes information" msgstr "" #: command-list.h:63 -msgid "Show canonical names and email addresses of contacts" +msgid "Debug gitignore / exclude files" msgstr "" #: command-list.h:64 -msgid "Switch branches or restore working tree files" +msgid "Show canonical names and email addresses of contacts" msgstr "" #: command-list.h:65 -msgid "Copy files from the index to the working tree" +msgid "Switch branches or restore working tree files" msgstr "" #: command-list.h:66 -msgid "Ensures that a reference name is well formed" +msgid "Copy files from the index to the working tree" msgstr "" #: command-list.h:67 -msgid "Find commits yet to be applied to upstream" +msgid "Ensures that a reference name is well formed" msgstr "" #: command-list.h:68 -msgid "Apply the changes introduced by some existing commits" +msgid "Find commits yet to be applied to upstream" msgstr "" #: command-list.h:69 -msgid "Graphical alternative to git-commit" +msgid "Apply the changes introduced by some existing commits" msgstr "" #: command-list.h:70 -msgid "Remove untracked files from the working tree" +msgid "Graphical alternative to git-commit" msgstr "" #: command-list.h:71 -msgid "Clone a repository into a new directory" +msgid "Remove untracked files from the working tree" msgstr "" #: command-list.h:72 -msgid "Display data in columns" +msgid "Clone a repository into a new directory" msgstr "" #: command-list.h:73 -msgid "Record changes to the repository" +msgid "Display data in columns" msgstr "" #: command-list.h:74 -msgid "Write and verify Git commit-graph files" +msgid "Record changes to the repository" msgstr "" #: command-list.h:75 -msgid "Create a new commit object" +msgid "Write and verify Git commit-graph files" msgstr "" #: command-list.h:76 -msgid "Get and set repository or global options" +msgid "Create a new commit object" msgstr "" #: command-list.h:77 -msgid "Count unpacked number of objects and their disk consumption" +msgid "Get and set repository or global options" msgstr "" #: command-list.h:78 -msgid "Retrieve and store user credentials" +msgid "Count unpacked number of objects and their disk consumption" msgstr "" #: command-list.h:79 -msgid "Helper to temporarily store passwords in memory" +msgid "Retrieve and store user credentials" msgstr "" #: command-list.h:80 -msgid "Helper to store credentials on disk" +msgid "Helper to temporarily store passwords in memory" msgstr "" #: command-list.h:81 -msgid "Export a single commit to a CVS checkout" +msgid "Helper to store credentials on disk" msgstr "" #: command-list.h:82 -msgid "Salvage your data out of another SCM people love to hate" +msgid "Export a single commit to a CVS checkout" msgstr "" #: command-list.h:83 -msgid "A CVS server emulator for Git" +msgid "Salvage your data out of another SCM people love to hate" msgstr "" #: command-list.h:84 -msgid "A really simple server for Git repositories" +msgid "A CVS server emulator for Git" msgstr "" #: command-list.h:85 -msgid "Give an object a human readable name based on an available ref" +msgid "A really simple server for Git repositories" msgstr "" #: command-list.h:86 -msgid "Show changes between commits, commit and working tree, etc" +msgid "Give an object a human readable name based on an available ref" msgstr "" #: command-list.h:87 -msgid "Compares files in the working tree and the index" +msgid "Show changes between commits, commit and working tree, etc" msgstr "" #: command-list.h:88 -msgid "Compare a tree to the working tree or index" +msgid "Compares files in the working tree and the index" msgstr "" #: command-list.h:89 -msgid "Compares the content and mode of blobs found via two tree objects" +msgid "Compare a tree to the working tree or index" msgstr "" #: command-list.h:90 -msgid "Show changes using common diff tools" +msgid "Compares the content and mode of blobs found via two tree objects" msgstr "" #: command-list.h:91 -msgid "Git data exporter" +msgid "Show changes using common diff tools" msgstr "" #: command-list.h:92 -msgid "Backend for fast Git data importers" +msgid "Git data exporter" msgstr "" #: command-list.h:93 -msgid "Download objects and refs from another repository" +msgid "Backend for fast Git data importers" msgstr "" #: command-list.h:94 -msgid "Receive missing objects from another repository" +msgid "Download objects and refs from another repository" msgstr "" #: command-list.h:95 -msgid "Rewrite branches" +msgid "Receive missing objects from another repository" msgstr "" #: command-list.h:96 -msgid "Produce a merge commit message" +msgid "Rewrite branches" msgstr "" #: command-list.h:97 -msgid "Output information on each ref" +msgid "Produce a merge commit message" msgstr "" #: command-list.h:98 -msgid "Prepare patches for e-mail submission" +msgid "Output information on each ref" msgstr "" #: command-list.h:99 -msgid "Verifies the connectivity and validity of the objects in the database" +msgid "Prepare patches for e-mail submission" msgstr "" #: command-list.h:100 -msgid "Cleanup unnecessary files and optimize the local repository" +msgid "Verifies the connectivity and validity of the objects in the database" msgstr "" #: command-list.h:101 -msgid "Extract commit ID from an archive created using git-archive" +msgid "Cleanup unnecessary files and optimize the local repository" msgstr "" #: command-list.h:102 -msgid "Print lines matching a pattern" +msgid "Extract commit ID from an archive created using git-archive" msgstr "" #: command-list.h:103 -msgid "A portable graphical interface to Git" +msgid "Print lines matching a pattern" msgstr "" #: command-list.h:104 -msgid "Compute object ID and optionally creates a blob from a file" +msgid "A portable graphical interface to Git" msgstr "" #: command-list.h:105 -msgid "Display help information about Git" +msgid "Compute object ID and optionally creates a blob from a file" msgstr "" #: command-list.h:106 -msgid "Server side implementation of Git over HTTP" +msgid "Display help information about Git" msgstr "" #: command-list.h:107 -msgid "Download from a remote Git repository via HTTP" +msgid "Server side implementation of Git over HTTP" msgstr "" #: command-list.h:108 -msgid "Push objects over HTTP/DAV to another repository" +msgid "Download from a remote Git repository via HTTP" msgstr "" #: command-list.h:109 -msgid "Send a collection of patches from stdin to an IMAP folder" +msgid "Push objects over HTTP/DAV to another repository" msgstr "" #: command-list.h:110 -msgid "Build pack index file for an existing packed archive" +msgid "Send a collection of patches from stdin to an IMAP folder" msgstr "" #: command-list.h:111 -msgid "Create an empty Git repository or reinitialize an existing one" +msgid "Build pack index file for an existing packed archive" msgstr "" #: command-list.h:112 -msgid "Instantly browse your working repository in gitweb" +msgid "Create an empty Git repository or reinitialize an existing one" msgstr "" #: command-list.h:113 -msgid "Add or parse structured information in commit messages" +msgid "Instantly browse your working repository in gitweb" msgstr "" #: command-list.h:114 -msgid "The Git repository browser" +msgid "Add or parse structured information in commit messages" msgstr "" #: command-list.h:115 -msgid "Show commit logs" +msgid "The Git repository browser" msgstr "" #: command-list.h:116 -msgid "Show information about files in the index and the working tree" +msgid "Show commit logs" msgstr "" #: command-list.h:117 -msgid "List references in a remote repository" +msgid "Show information about files in the index and the working tree" msgstr "" #: command-list.h:118 -msgid "List the contents of a tree object" +msgid "List references in a remote repository" msgstr "" #: command-list.h:119 -msgid "Extracts patch and authorship from a single e-mail message" +msgid "List the contents of a tree object" msgstr "" #: command-list.h:120 -msgid "Simple UNIX mbox splitter program" +msgid "Extracts patch and authorship from a single e-mail message" msgstr "" #: command-list.h:121 -msgid "Join two or more development histories together" +msgid "Simple UNIX mbox splitter program" msgstr "" #: command-list.h:122 -msgid "Find as good common ancestors as possible for a merge" +msgid "Join two or more development histories together" msgstr "" #: command-list.h:123 -msgid "Run a three-way file merge" +msgid "Find as good common ancestors as possible for a merge" msgstr "" #: command-list.h:124 -msgid "Run a merge for files needing merging" +msgid "Run a three-way file merge" msgstr "" #: command-list.h:125 -msgid "The standard helper program to use with git-merge-index" +msgid "Run a merge for files needing merging" msgstr "" #: command-list.h:126 -msgid "Run merge conflict resolution tools to resolve merge conflicts" +msgid "The standard helper program to use with git-merge-index" msgstr "" #: command-list.h:127 -msgid "Show three-way merge without touching index" +msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "" #: command-list.h:128 -msgid "Write and verify multi-pack-indexes" +msgid "Show three-way merge without touching index" msgstr "" #: command-list.h:129 -msgid "Creates a tag object" +msgid "Write and verify multi-pack-indexes" msgstr "" #: command-list.h:130 -msgid "Build a tree-object from ls-tree formatted text" +msgid "Creates a tag object" msgstr "" #: command-list.h:131 -msgid "Move or rename a file, a directory, or a symlink" +msgid "Build a tree-object from ls-tree formatted text" msgstr "" #: command-list.h:132 -msgid "Find symbolic names for given revs" +msgid "Move or rename a file, a directory, or a symlink" msgstr "" #: command-list.h:133 -msgid "Add or inspect object notes" +msgid "Find symbolic names for given revs" msgstr "" #: command-list.h:134 -msgid "Import from and submit to Perforce repositories" +msgid "Add or inspect object notes" msgstr "" #: command-list.h:135 -msgid "Create a packed archive of objects" +msgid "Import from and submit to Perforce repositories" msgstr "" #: command-list.h:136 -msgid "Find redundant pack files" +msgid "Create a packed archive of objects" msgstr "" #: command-list.h:137 -msgid "Pack heads and tags for efficient repository access" +msgid "Find redundant pack files" msgstr "" #: command-list.h:138 -msgid "Routines to help parsing remote repository access parameters" +msgid "Pack heads and tags for efficient repository access" msgstr "" #: command-list.h:139 -msgid "Compute unique ID for a patch" +msgid "Routines to help parsing remote repository access parameters" msgstr "" #: command-list.h:140 -msgid "Prune all unreachable objects from the object database" +msgid "Compute unique ID for a patch" msgstr "" #: command-list.h:141 -msgid "Remove extra objects that are already in pack files" +msgid "Prune all unreachable objects from the object database" msgstr "" #: command-list.h:142 -msgid "Fetch from and integrate with another repository or a local branch" +msgid "Remove extra objects that are already in pack files" msgstr "" #: command-list.h:143 -msgid "Update remote refs along with associated objects" +msgid "Fetch from and integrate with another repository or a local branch" msgstr "" #: command-list.h:144 -msgid "Applies a quilt patchset onto the current branch" +msgid "Update remote refs along with associated objects" msgstr "" #: command-list.h:145 -msgid "Compare two commit ranges (e.g. two versions of a branch)" +msgid "Applies a quilt patchset onto the current branch" msgstr "" #: command-list.h:146 -msgid "Reads tree information into the index" +msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "" #: command-list.h:147 -msgid "Reapply commits on top of another base tip" +msgid "Reads tree information into the index" msgstr "" #: command-list.h:148 -msgid "Receive what is pushed into the repository" +msgid "Reapply commits on top of another base tip" msgstr "" #: command-list.h:149 -msgid "Manage reflog information" +msgid "Receive what is pushed into the repository" msgstr "" #: command-list.h:150 -msgid "Manage set of tracked repositories" +msgid "Manage reflog information" msgstr "" #: command-list.h:151 -msgid "Pack unpacked objects in a repository" +msgid "Manage set of tracked repositories" msgstr "" #: command-list.h:152 -msgid "Create, list, delete refs to replace objects" +msgid "Pack unpacked objects in a repository" msgstr "" #: command-list.h:153 -msgid "Generates a summary of pending changes" +msgid "Create, list, delete refs to replace objects" msgstr "" #: command-list.h:154 -msgid "Reuse recorded resolution of conflicted merges" +msgid "Generates a summary of pending changes" msgstr "" #: command-list.h:155 -msgid "Reset current HEAD to the specified state" +msgid "Reuse recorded resolution of conflicted merges" msgstr "" #: command-list.h:156 -msgid "Restore working tree files" +msgid "Reset current HEAD to the specified state" msgstr "" #: command-list.h:157 -msgid "Revert some existing commits" +msgid "Restore working tree files" msgstr "" #: command-list.h:158 -msgid "Lists commit objects in reverse chronological order" +msgid "Revert some existing commits" msgstr "" #: command-list.h:159 -msgid "Pick out and massage parameters" +msgid "Lists commit objects in reverse chronological order" msgstr "" #: command-list.h:160 -msgid "Remove files from the working tree and from the index" +msgid "Pick out and massage parameters" msgstr "" #: command-list.h:161 -msgid "Send a collection of patches as emails" +msgid "Remove files from the working tree and from the index" msgstr "" #: command-list.h:162 -msgid "Push objects over Git protocol to another repository" +msgid "Send a collection of patches as emails" msgstr "" #: command-list.h:163 -msgid "Restricted login shell for Git-only SSH access" +msgid "Push objects over Git protocol to another repository" msgstr "" #: command-list.h:164 -msgid "Summarize 'git log' output" +msgid "Restricted login shell for Git-only SSH access" msgstr "" #: command-list.h:165 -msgid "Show various types of objects" +msgid "Summarize 'git log' output" msgstr "" #: command-list.h:166 -msgid "Show branches and their commits" +msgid "Show various types of objects" msgstr "" #: command-list.h:167 -msgid "Show packed archive index" +msgid "Show branches and their commits" msgstr "" #: command-list.h:168 -msgid "List references in a local repository" +msgid "Show packed archive index" msgstr "" #: command-list.h:169 -msgid "Git's i18n setup code for shell scripts" +msgid "List references in a local repository" msgstr "" #: command-list.h:170 -msgid "Common Git shell script setup code" +msgid "Git's i18n setup code for shell scripts" msgstr "" #: command-list.h:171 -msgid "Initialize and modify the sparse-checkout" +msgid "Common Git shell script setup code" msgstr "" #: command-list.h:172 -msgid "Stash the changes in a dirty working directory away" +msgid "Initialize and modify the sparse-checkout" msgstr "" #: command-list.h:173 -msgid "Add file contents to the staging area" +msgid "Stash the changes in a dirty working directory away" msgstr "" #: command-list.h:174 -msgid "Show the working tree status" +msgid "Add file contents to the staging area" msgstr "" #: command-list.h:175 -msgid "Remove unnecessary whitespace" +msgid "Show the working tree status" msgstr "" #: command-list.h:176 -msgid "Initialize, update or inspect submodules" +msgid "Remove unnecessary whitespace" msgstr "" #: command-list.h:177 -msgid "Bidirectional operation between a Subversion repository and Git" +msgid "Initialize, update or inspect submodules" msgstr "" #: command-list.h:178 -msgid "Switch branches" +msgid "Bidirectional operation between a Subversion repository and Git" msgstr "" #: command-list.h:179 -msgid "Read, modify and delete symbolic refs" +msgid "Switch branches" msgstr "" #: command-list.h:180 -msgid "Create, list, delete or verify a tag object signed with GPG" +msgid "Read, modify and delete symbolic refs" msgstr "" #: command-list.h:181 -msgid "Creates a temporary file with a blob's contents" +msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" #: command-list.h:182 -msgid "Unpack objects from a packed archive" +msgid "Creates a temporary file with a blob's contents" msgstr "" #: command-list.h:183 -msgid "Register file contents in the working tree to the index" +msgid "Unpack objects from a packed archive" msgstr "" #: command-list.h:184 -msgid "Update the object name stored in a ref safely" +msgid "Register file contents in the working tree to the index" msgstr "" #: command-list.h:185 -msgid "Update auxiliary info file to help dumb servers" +msgid "Update the object name stored in a ref safely" msgstr "" #: command-list.h:186 -msgid "Send archive back to git-archive" +msgid "Update auxiliary info file to help dumb servers" msgstr "" #: command-list.h:187 -msgid "Send objects packed back to git-fetch-pack" +msgid "Send archive back to git-archive" msgstr "" #: command-list.h:188 -msgid "Show a Git logical variable" +msgid "Send objects packed back to git-fetch-pack" msgstr "" #: command-list.h:189 -msgid "Check the GPG signature of commits" +msgid "Show a Git logical variable" msgstr "" #: command-list.h:190 -msgid "Validate packed Git archive files" +msgid "Check the GPG signature of commits" msgstr "" #: command-list.h:191 -msgid "Check the GPG signature of tags" +msgid "Validate packed Git archive files" msgstr "" #: command-list.h:192 -msgid "Git web interface (web frontend to Git repositories)" +msgid "Check the GPG signature of tags" msgstr "" #: command-list.h:193 -msgid "Show logs with difference each commit introduces" +msgid "Git web interface (web frontend to Git repositories)" msgstr "" #: command-list.h:194 -msgid "Manage multiple working trees" +msgid "Show logs with difference each commit introduces" msgstr "" #: command-list.h:195 -msgid "Create a tree object from the current index" +msgid "Manage multiple working trees" msgstr "" #: command-list.h:196 -msgid "Defining attributes per path" +msgid "Create a tree object from the current index" msgstr "" #: command-list.h:197 -msgid "Git command-line interface and conventions" +msgid "Defining attributes per path" msgstr "" #: command-list.h:198 -msgid "A Git core tutorial for developers" +msgid "Git command-line interface and conventions" msgstr "" #: command-list.h:199 -msgid "Git for CVS users" +msgid "A Git core tutorial for developers" msgstr "" #: command-list.h:200 -msgid "Tweaking diff output" +msgid "Git for CVS users" msgstr "" #: command-list.h:201 -msgid "A useful minimum set of commands for Everyday Git" +msgid "Tweaking diff output" msgstr "" #: command-list.h:202 -msgid "A Git Glossary" +msgid "A useful minimum set of commands for Everyday Git" msgstr "" #: command-list.h:203 -msgid "Hooks used by Git" +msgid "Frequently asked questions about using Git" msgstr "" #: command-list.h:204 -msgid "Specifies intentionally untracked files to ignore" +msgid "A Git Glossary" msgstr "" #: command-list.h:205 -msgid "Defining submodule properties" +msgid "Hooks used by Git" msgstr "" #: command-list.h:206 -msgid "Git namespaces" +msgid "Specifies intentionally untracked files to ignore" msgstr "" #: command-list.h:207 -msgid "Git Repository Layout" +msgid "Defining submodule properties" msgstr "" #: command-list.h:208 -msgid "Specifying revisions and ranges for Git" +msgid "Git namespaces" msgstr "" #: command-list.h:209 -msgid "Mounting one repository inside another" +msgid "Git Repository Layout" msgstr "" #: command-list.h:210 -msgid "A tutorial introduction to Git: part two" +msgid "Specifying revisions and ranges for Git" msgstr "" #: command-list.h:211 -msgid "A tutorial introduction to Git" +msgid "Mounting one repository inside another" msgstr "" #: command-list.h:212 +msgid "A tutorial introduction to Git: part two" +msgstr "" + +#: command-list.h:213 +msgid "A tutorial introduction to Git" +msgstr "" + +#: command-list.h:214 msgid "An overview of recommended workflows with Git" msgstr "" @@ -21696,42 +21966,42 @@ msgstr "" msgid "cannot read $file for replaying" msgstr "" -#: git-bisect.sh:232 +#: git-bisect.sh:233 msgid "?? what are you talking about?" msgstr "" -#: git-bisect.sh:241 +#: git-bisect.sh:243 msgid "bisect run failed: no command provided." msgstr "" -#: git-bisect.sh:246 +#: git-bisect.sh:248 #, sh-format msgid "running $command" msgstr "" -#: git-bisect.sh:253 +#: git-bisect.sh:255 #, sh-format msgid "" "bisect run failed:\n" "exit code $res from '$command' is < 0 or >= 128" msgstr "" -#: git-bisect.sh:279 +#: git-bisect.sh:281 msgid "bisect run cannot continue any more" msgstr "" -#: git-bisect.sh:285 +#: git-bisect.sh:287 #, sh-format msgid "" "bisect run failed:\n" "'bisect_state $state' exited with error code $res" msgstr "" -#: git-bisect.sh:292 +#: git-bisect.sh:294 msgid "bisect run success" msgstr "" -#: git-bisect.sh:300 +#: git-bisect.sh:302 msgid "We are not bisecting." msgstr "" @@ -21773,128 +22043,46 @@ msgstr "" msgid "Simple merge did not work, trying automatic merge." msgstr "" -#: git-legacy-stash.sh:221 -msgid "Cannot remove temporary index (can't happen)" -msgstr "" - -#: git-legacy-stash.sh:272 -#, sh-format -msgid "Cannot update $ref_stash with $w_commit" -msgstr "" - -#: git-legacy-stash.sh:324 -#, sh-format -msgid "error: unknown option for 'stash push': $option" -msgstr "" - -#: git-legacy-stash.sh:356 -#, sh-format -msgid "Saved working directory and index state $stash_msg" -msgstr "" - -#: git-legacy-stash.sh:536 -#, sh-format -msgid "unknown option: $opt" -msgstr "" - -#: git-legacy-stash.sh:556 -#, sh-format -msgid "Too many revisions specified: $REV" -msgstr "" - -#: git-legacy-stash.sh:571 -#, sh-format -msgid "$reference is not a valid reference" -msgstr "" - -#: git-legacy-stash.sh:599 -#, sh-format -msgid "'$args' is not a stash-like commit" -msgstr "" - -#: git-legacy-stash.sh:610 -#, sh-format -msgid "'$args' is not a stash reference" -msgstr "" - -#: git-legacy-stash.sh:618 -msgid "unable to refresh index" -msgstr "" - -#: git-legacy-stash.sh:622 -msgid "Cannot apply a stash in the middle of a merge" -msgstr "" - -#: git-legacy-stash.sh:630 -msgid "Conflicts in index. Try without --index." -msgstr "" - -#: git-legacy-stash.sh:632 -msgid "Could not save index tree" -msgstr "" - -#: git-legacy-stash.sh:641 -msgid "Could not restore untracked files from stash entry" -msgstr "" - -#: git-legacy-stash.sh:666 -msgid "Cannot unstage modified files" -msgstr "" - -#: git-legacy-stash.sh:704 -#, sh-format -msgid "Dropped ${REV} ($s)" -msgstr "" - -#: git-legacy-stash.sh:705 -#, sh-format -msgid "${REV}: Could not drop stash entry" -msgstr "" - -#: git-legacy-stash.sh:792 -msgid "(To restore them type \"git stash apply\")" -msgstr "" - -#: git-submodule.sh:203 +#: git-submodule.sh:205 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" -#: git-submodule.sh:213 +#: git-submodule.sh:215 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:232 +#: git-submodule.sh:234 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:235 +#: git-submodule.sh:237 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "" -#: git-submodule.sh:242 +#: git-submodule.sh:244 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "" -#: git-submodule.sh:273 +#: git-submodule.sh:275 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:275 +#: git-submodule.sh:277 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:283 +#: git-submodule.sh:285 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" -#: git-submodule.sh:285 +#: git-submodule.sh:287 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -21905,122 +22093,122 @@ msgid "" "option." msgstr "" -#: git-submodule.sh:291 +#: git-submodule.sh:293 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" -#: git-submodule.sh:303 +#: git-submodule.sh:305 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:308 +#: git-submodule.sh:310 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:317 +#: git-submodule.sh:319 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:590 +#: git-submodule.sh:592 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:600 +#: git-submodule.sh:602 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:605 +#: git-submodule.sh:607 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "" -#: git-submodule.sh:623 +#: git-submodule.sh:625 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " "$sha1:" msgstr "" -#: git-submodule.sh:629 +#: git-submodule.sh:631 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " "Direct fetching of that commit failed." msgstr "" -#: git-submodule.sh:636 +#: git-submodule.sh:638 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:637 +#: git-submodule.sh:639 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "" -#: git-submodule.sh:641 +#: git-submodule.sh:643 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:642 +#: git-submodule.sh:644 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:647 +#: git-submodule.sh:649 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:648 +#: git-submodule.sh:650 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "" -#: git-submodule.sh:653 +#: git-submodule.sh:655 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:654 +#: git-submodule.sh:656 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "" -#: git-submodule.sh:685 +#: git-submodule.sh:687 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:896 +#: git-submodule.sh:878 msgid "The --cached option cannot be used with the --files option" msgstr "" -#: git-submodule.sh:948 +#: git-submodule.sh:930 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:968 +#: git-submodule.sh:950 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:971 +#: git-submodule.sh:953 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:974 +#: git-submodule.sh:956 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -22039,6 +22227,13 @@ msgstr "" msgid "Cannot store $stash_sha1" msgstr "" +#: git-rebase--preserve-merges.sh:113 +msgid "" +"Applying autostash resulted in conflicts.\n" +"Your changes are safe in the stash.\n" +"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" +msgstr "" + #: git-rebase--preserve-merges.sh:191 #, sh-format msgid "Rebasing ($new_count/$total)" |