diff options
Diffstat (limited to 'po/git.pot')
-rw-r--r-- | po/git.pot | 1371 |
1 files changed, 962 insertions, 409 deletions
diff --git a/po/git.pot b/po/git.pot index 2c5e3d07ac..8b8228fd38 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: 2018-05-31 23:32+0800\n" +"POT-Creation-Date: 2018-06-08 09:03+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" @@ -58,7 +58,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "" -#: advice.c:168 builtin/merge.c:1249 +#: advice.c:168 builtin/merge.c:1250 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" @@ -723,23 +723,23 @@ msgstr "" msgid "pathspec '%s' did not match any files" msgstr "" -#: archive.c:436 +#: archive.c:434 msgid "fmt" msgstr "" -#: archive.c:436 +#: archive.c:434 msgid "archive format" msgstr "" -#: archive.c:437 builtin/log.c:1462 +#: archive.c:435 builtin/log.c:1462 msgid "prefix" msgstr "" -#: archive.c:438 +#: archive.c:436 msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:439 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127 +#: archive.c:437 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127 #: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869 #: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119 @@ -747,69 +747,69 @@ msgstr "" msgid "file" msgstr "" -#: archive.c:440 builtin/archive.c:89 +#: archive.c:438 builtin/archive.c:89 msgid "write the archive to this file" msgstr "" -#: archive.c:442 +#: archive.c:440 msgid "read .gitattributes in working directory" msgstr "" -#: archive.c:443 +#: archive.c:441 msgid "report archived files on stderr" msgstr "" -#: archive.c:444 +#: archive.c:442 msgid "store only" msgstr "" -#: archive.c:445 +#: archive.c:443 msgid "compress faster" msgstr "" -#: archive.c:453 +#: archive.c:451 msgid "compress better" msgstr "" -#: archive.c:456 +#: archive.c:454 msgid "list supported archive formats" msgstr "" -#: archive.c:458 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113 +#: archive.c:456 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113 #: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593 msgid "repo" msgstr "" -#: archive.c:459 builtin/archive.c:91 +#: archive.c:457 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "" -#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489 +#: archive.c:458 builtin/archive.c:92 builtin/notes.c:489 msgid "command" msgstr "" -#: archive.c:461 builtin/archive.c:93 +#: archive.c:459 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "" -#: archive.c:468 +#: archive.c:466 msgid "Unexpected option --remote" msgstr "" -#: archive.c:470 +#: archive.c:468 msgid "Option --exec can only be used together with --remote" msgstr "" -#: archive.c:472 +#: archive.c:470 msgid "Unexpected option --output" msgstr "" -#: archive.c:494 +#: archive.c:492 #, c-format msgid "Unknown archive format '%s'" msgstr "" -#: archive.c:501 +#: archive.c:499 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "" @@ -942,9 +942,9 @@ msgstr "" msgid "--reverse and --first-parent together require specified latest commit" msgstr "" -#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1860 -#: sequencer.c:3631 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920 -#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:371 +#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1861 +#: sequencer.c:3632 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920 +#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:372 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "" @@ -1098,7 +1098,7 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:88 sequencer.c:2080 sequencer.c:2557 builtin/commit.c:755 +#: bundle.c:88 sequencer.c:2081 sequencer.c:2558 builtin/commit.c:755 #, c-format msgid "could not open '%s'" msgstr "" @@ -1165,7 +1165,7 @@ msgstr "" msgid "invalid color value: %.*s" msgstr "" -#: commit.c:43 sequencer.c:2363 builtin/am.c:421 builtin/am.c:465 +#: commit.c:43 sequencer.c:2364 builtin/am.c:421 builtin/am.c:465 #: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376 #: builtin/replace.c:448 #, c-format @@ -1369,11 +1369,11 @@ msgstr "" msgid "could not unset '%s'" msgstr "" -#: connect.c:60 +#: connect.c:61 msgid "The remote end hung up upon initial contact" msgstr "" -#: connect.c:62 +#: connect.c:63 msgid "" "Could not read from remote repository.\n" "\n" @@ -1877,51 +1877,112 @@ msgstr "" msgid "'%s': short read" msgstr "" -#: help.c:179 +#: help.c:23 +msgid "start a working area (see also: git help tutorial)" +msgstr "" + +#: help.c:24 +msgid "work on the current change (see also: git help everyday)" +msgstr "" + +#: help.c:25 +msgid "examine the history and state (see also: git help revisions)" +msgstr "" + +#: help.c:26 +msgid "grow, mark and tweak your common history" +msgstr "" + +#: help.c:27 +msgid "collaborate (see also: git help workflows)" +msgstr "" + +#: help.c:31 +msgid "Main Porcelain Commands" +msgstr "" + +#: help.c:32 +msgid "Ancillary Commands / Manipulators" +msgstr "" + +#: help.c:33 +msgid "Ancillary Commands / Interrogators" +msgstr "" + +#: help.c:34 +msgid "Interacting with Others" +msgstr "" + +#: help.c:35 +msgid "Low-level Commands / Manipulators" +msgstr "" + +#: help.c:36 +msgid "Low-level Commands / Interrogators" +msgstr "" + +#: help.c:37 +msgid "Low-level Commands / Synching Repositories" +msgstr "" + +#: help.c:38 +msgid "Low-level Commands / Internal Helpers" +msgstr "" + +#: help.c:293 #, c-format msgid "available git commands in '%s'" msgstr "" -#: help.c:186 +#: help.c:300 msgid "git commands available from elsewhere on your $PATH" msgstr "" -#: help.c:217 +#: help.c:309 msgid "These are common Git commands used in various situations:" msgstr "" -#: help.c:281 +#: help.c:358 git.c:90 +#, c-format +msgid "unsupported command listing type '%s'" +msgstr "" + +#: help.c:405 +msgid "The common Git guides are:" +msgstr "" + +#: help.c:467 #, 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:336 +#: help.c:526 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: help.c:358 +#: help.c:548 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" -#: help.c:363 +#: help.c:553 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "" -#: help.c:368 +#: help.c:558 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" -#: help.c:376 +#: help.c:566 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" -#: help.c:380 +#: help.c:570 msgid "" "\n" "The most similar command is" @@ -1931,16 +1992,16 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: help.c:395 +#: help.c:585 msgid "git version [<options>]" msgstr "" -#: help.c:462 +#: help.c:652 #, c-format msgid "%s: %s - %s" msgstr "" -#: help.c:466 +#: help.c:656 msgid "" "\n" "Did you mean this?" @@ -2394,7 +2455,7 @@ msgstr "" msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:3511 builtin/merge.c:658 builtin/merge.c:815 +#: merge-recursive.c:3511 builtin/merge.c:659 builtin/merge.c:816 msgid "Unable to write index." msgstr "" @@ -2583,12 +2644,12 @@ msgid "" "Using version %i" msgstr "" -#: read-cache.c:2404 sequencer.c:4337 wrapper.c:658 builtin/merge.c:1047 +#: read-cache.c:2404 sequencer.c:4338 wrapper.c:658 builtin/merge.c:1048 #, c-format msgid "could not close '%s'" msgstr "" -#: read-cache.c:2477 sequencer.c:2101 sequencer.c:3233 +#: read-cache.c:2477 sequencer.c:2102 sequencer.c:3234 #, c-format msgid "could not stat '%s'" msgstr "" @@ -2603,7 +2664,7 @@ msgstr "" msgid "unable to unlink: %s" msgstr "" -#: refs.c:732 sequencer.c:4333 sequencer.c:4392 wrapper.c:225 wrapper.c:395 +#: refs.c:732 sequencer.c:4334 sequencer.c:4393 wrapper.c:225 wrapper.c:395 #: builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" @@ -3046,85 +3107,85 @@ msgstr "" msgid "the receiving end does not support push options" msgstr "" -#: sequencer.c:174 +#: sequencer.c:175 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "" -#: sequencer.c:274 +#: sequencer.c:275 #, c-format msgid "could not delete '%s'" msgstr "" -#: sequencer.c:300 +#: sequencer.c:301 msgid "revert" msgstr "" -#: sequencer.c:302 +#: sequencer.c:303 msgid "cherry-pick" msgstr "" -#: sequencer.c:304 +#: sequencer.c:305 msgid "rebase -i" msgstr "" -#: sequencer.c:306 +#: sequencer.c:307 #, c-format msgid "Unknown action: %d" msgstr "" -#: sequencer.c:363 +#: sequencer.c:364 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" -#: sequencer.c:366 +#: sequencer.c:367 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:379 sequencer.c:2467 +#: sequencer.c:380 sequencer.c:2468 #, c-format msgid "could not lock '%s'" msgstr "" -#: sequencer.c:381 sequencer.c:2345 sequencer.c:2471 sequencer.c:2485 -#: sequencer.c:2693 sequencer.c:4335 sequencer.c:4398 wrapper.c:656 +#: sequencer.c:382 sequencer.c:2346 sequencer.c:2472 sequencer.c:2486 +#: sequencer.c:2694 sequencer.c:4336 sequencer.c:4399 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "" -#: sequencer.c:386 +#: sequencer.c:387 #, c-format msgid "could not write eol to '%s'" msgstr "" -#: sequencer.c:391 sequencer.c:2350 sequencer.c:2473 sequencer.c:2487 -#: sequencer.c:2701 +#: sequencer.c:392 sequencer.c:2351 sequencer.c:2474 sequencer.c:2488 +#: sequencer.c:2702 #, c-format msgid "failed to finalize '%s'" msgstr "" -#: sequencer.c:414 sequencer.c:803 sequencer.c:1492 sequencer.c:2370 -#: sequencer.c:2683 sequencer.c:2787 builtin/am.c:259 builtin/commit.c:727 -#: builtin/merge.c:1045 +#: sequencer.c:415 sequencer.c:804 sequencer.c:1493 sequencer.c:2371 +#: sequencer.c:2684 sequencer.c:2788 builtin/am.c:259 builtin/commit.c:727 +#: builtin/merge.c:1046 #, c-format msgid "could not read '%s'" msgstr "" -#: sequencer.c:440 +#: sequencer.c:441 #, c-format msgid "your local changes would be overwritten by %s." msgstr "" -#: sequencer.c:444 +#: sequencer.c:445 msgid "commit your changes or stash them to proceed." msgstr "" -#: sequencer.c:473 +#: sequencer.c:474 #, c-format msgid "%s: fast-forward" msgstr "" @@ -3132,20 +3193,20 @@ msgstr "" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:562 +#: sequencer.c:563 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:578 +#: sequencer.c:579 msgid "unable to update cache tree" msgstr "" -#: sequencer.c:591 +#: sequencer.c:592 msgid "could not resolve HEAD commit" msgstr "" -#: sequencer.c:748 +#: sequencer.c:749 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -3162,15 +3223,15 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:817 +#: sequencer.c:818 msgid "writing root commit" msgstr "" -#: sequencer.c:1042 +#: sequencer.c:1043 msgid "'prepare-commit-msg' hook failed" msgstr "" -#: sequencer.c:1049 +#: sequencer.c:1050 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3185,7 +3246,7 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1062 +#: sequencer.c:1063 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3199,313 +3260,313 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1102 +#: sequencer.c:1103 msgid "couldn't look up newly created commit" msgstr "" -#: sequencer.c:1104 +#: sequencer.c:1105 msgid "could not parse newly created commit" msgstr "" -#: sequencer.c:1150 +#: sequencer.c:1151 msgid "unable to resolve HEAD after creating commit" msgstr "" -#: sequencer.c:1152 +#: sequencer.c:1153 msgid "detached HEAD" msgstr "" -#: sequencer.c:1156 +#: sequencer.c:1157 msgid " (root-commit)" msgstr "" -#: sequencer.c:1177 +#: sequencer.c:1178 msgid "could not parse HEAD" msgstr "" -#: sequencer.c:1179 +#: sequencer.c:1180 #, c-format msgid "HEAD %s is not a commit!" msgstr "" -#: sequencer.c:1183 builtin/commit.c:1528 +#: sequencer.c:1184 builtin/commit.c:1528 msgid "could not parse HEAD commit" msgstr "" -#: sequencer.c:1234 sequencer.c:1831 +#: sequencer.c:1235 sequencer.c:1832 msgid "unable to parse commit author" msgstr "" -#: sequencer.c:1244 builtin/am.c:1630 builtin/merge.c:644 +#: sequencer.c:1245 builtin/am.c:1630 builtin/merge.c:645 msgid "git write-tree failed to write a tree" msgstr "" -#: sequencer.c:1261 sequencer.c:1316 +#: sequencer.c:1262 sequencer.c:1317 #, c-format msgid "unable to read commit message from '%s'" msgstr "" -#: sequencer.c:1283 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:824 -#: builtin/merge.c:849 +#: sequencer.c:1284 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:825 +#: builtin/merge.c:850 msgid "failed to write commit object" msgstr "" -#: sequencer.c:1343 +#: sequencer.c:1344 #, c-format msgid "could not parse commit %s" msgstr "" -#: sequencer.c:1348 +#: sequencer.c:1349 #, c-format msgid "could not parse parent commit %s" msgstr "" -#: sequencer.c:1499 sequencer.c:1524 +#: sequencer.c:1500 sequencer.c:1525 #, c-format msgid "This is a combination of %d commits." msgstr "" -#: sequencer.c:1509 sequencer.c:4354 +#: sequencer.c:1510 sequencer.c:4355 msgid "need a HEAD to fixup" msgstr "" -#: sequencer.c:1511 sequencer.c:2728 +#: sequencer.c:1512 sequencer.c:2729 msgid "could not read HEAD" msgstr "" -#: sequencer.c:1513 +#: sequencer.c:1514 msgid "could not read HEAD's commit message" msgstr "" -#: sequencer.c:1519 +#: sequencer.c:1520 #, c-format msgid "cannot write '%s'" msgstr "" -#: sequencer.c:1526 git-rebase--interactive.sh:457 +#: sequencer.c:1527 git-rebase--interactive.sh:457 msgid "This is the 1st commit message:" msgstr "" -#: sequencer.c:1534 +#: sequencer.c:1535 #, c-format msgid "could not read commit message of %s" msgstr "" -#: sequencer.c:1541 +#: sequencer.c:1542 #, c-format msgid "This is the commit message #%d:" msgstr "" -#: sequencer.c:1547 +#: sequencer.c:1548 #, c-format msgid "The commit message #%d will be skipped:" msgstr "" -#: sequencer.c:1552 +#: sequencer.c:1553 #, c-format msgid "unknown command: %d" msgstr "" -#: sequencer.c:1630 +#: sequencer.c:1631 msgid "your index file is unmerged." msgstr "" -#: sequencer.c:1637 +#: sequencer.c:1638 msgid "cannot fixup root commit" msgstr "" -#: sequencer.c:1656 +#: sequencer.c:1657 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:1664 +#: sequencer.c:1665 #, c-format msgid "commit %s does not have parent %d" msgstr "" -#: sequencer.c:1668 +#: sequencer.c:1669 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "" -#: sequencer.c:1674 +#: sequencer.c:1675 #, 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:1693 +#: sequencer.c:1694 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:1758 +#: sequencer.c:1759 #, c-format msgid "could not rename '%s' to '%s'" msgstr "" -#: sequencer.c:1812 +#: sequencer.c:1813 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:1813 +#: sequencer.c:1814 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:1863 +#: sequencer.c:1864 msgid "empty commit set passed" msgstr "" -#: sequencer.c:1873 +#: sequencer.c:1874 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:1880 +#: sequencer.c:1881 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:1960 +#: sequencer.c:1961 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "" -#: sequencer.c:1969 +#: sequencer.c:1970 #, c-format msgid "missing arguments for %s" msgstr "" -#: sequencer.c:2028 +#: sequencer.c:2029 #, c-format msgid "invalid line %d: %.*s" msgstr "" -#: sequencer.c:2036 +#: sequencer.c:2037 #, c-format msgid "cannot '%s' without a previous commit" msgstr "" -#: sequencer.c:2084 sequencer.c:4137 sequencer.c:4172 +#: sequencer.c:2085 sequencer.c:4138 sequencer.c:4173 #, c-format msgid "could not read '%s'." msgstr "" -#: sequencer.c:2107 +#: sequencer.c:2108 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" -#: sequencer.c:2109 +#: sequencer.c:2110 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "" -#: sequencer.c:2114 +#: sequencer.c:2115 msgid "no commits parsed." msgstr "" -#: sequencer.c:2125 +#: sequencer.c:2126 msgid "cannot cherry-pick during a revert." msgstr "" -#: sequencer.c:2127 +#: sequencer.c:2128 msgid "cannot revert during a cherry-pick." msgstr "" -#: sequencer.c:2194 +#: sequencer.c:2195 #, c-format msgid "invalid key: %s" msgstr "" -#: sequencer.c:2197 +#: sequencer.c:2198 #, c-format msgid "invalid value for %s: %s" msgstr "" -#: sequencer.c:2268 +#: sequencer.c:2269 msgid "unusable squash-onto" msgstr "" -#: sequencer.c:2284 +#: sequencer.c:2285 #, c-format msgid "malformed options sheet: '%s'" msgstr "" -#: sequencer.c:2322 +#: sequencer.c:2323 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:2323 +#: sequencer.c:2324 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:2326 +#: sequencer.c:2327 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" -#: sequencer.c:2340 +#: sequencer.c:2341 msgid "could not lock HEAD" msgstr "" -#: sequencer.c:2395 sequencer.c:3402 +#: sequencer.c:2396 sequencer.c:3403 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:2397 +#: sequencer.c:2398 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:2399 sequencer.c:2434 +#: sequencer.c:2400 sequencer.c:2435 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:2420 builtin/grep.c:720 +#: sequencer.c:2421 builtin/grep.c:720 #, c-format msgid "cannot open '%s'" msgstr "" -#: sequencer.c:2422 +#: sequencer.c:2423 #, c-format msgid "cannot read '%s': %s" msgstr "" -#: sequencer.c:2423 +#: sequencer.c:2424 msgid "unexpected end of file" msgstr "" -#: sequencer.c:2429 +#: sequencer.c:2430 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:2440 +#: sequencer.c:2441 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" -#: sequencer.c:2544 sequencer.c:3320 +#: sequencer.c:2545 sequencer.c:3321 #, c-format msgid "could not update %s" msgstr "" -#: sequencer.c:2582 sequencer.c:3300 +#: sequencer.c:2583 sequencer.c:3301 msgid "cannot read HEAD" msgstr "" -#: sequencer.c:2617 sequencer.c:2621 builtin/difftool.c:639 +#: sequencer.c:2618 sequencer.c:2622 builtin/difftool.c:639 #, c-format msgid "could not copy '%s' to '%s'" msgstr "" -#: sequencer.c:2640 +#: sequencer.c:2641 msgid "could not read index" msgstr "" -#: sequencer.c:2645 +#: sequencer.c:2646 #, c-format msgid "" "execution failed: %s\n" @@ -3515,11 +3576,11 @@ msgid "" "\n" msgstr "" -#: sequencer.c:2651 +#: sequencer.c:2652 msgid "and made changes to the index and/or the working tree\n" msgstr "" -#: sequencer.c:2657 +#: sequencer.c:2658 #, c-format msgid "" "execution succeeded: %s\n" @@ -3530,62 +3591,62 @@ msgid "" "\n" msgstr "" -#: sequencer.c:2770 +#: sequencer.c:2771 msgid "writing fake root commit" msgstr "" -#: sequencer.c:2775 +#: sequencer.c:2776 msgid "writing squash-onto" msgstr "" -#: sequencer.c:2810 +#: sequencer.c:2811 #, c-format msgid "failed to find tree of %s" msgstr "" -#: sequencer.c:2828 +#: sequencer.c:2829 msgid "could not write index" msgstr "" -#: sequencer.c:2860 +#: sequencer.c:2861 msgid "cannot merge without a current revision" msgstr "" -#: sequencer.c:2883 +#: sequencer.c:2884 #, c-format msgid "could not resolve '%s'" msgstr "" -#: sequencer.c:2905 +#: sequencer.c:2906 #, c-format msgid "could not get commit message of '%s'" msgstr "" -#: sequencer.c:2915 sequencer.c:2940 +#: sequencer.c:2916 sequencer.c:2941 #, c-format msgid "could not write '%s'" msgstr "" -#: sequencer.c:3004 +#: sequencer.c:3005 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "" -#: sequencer.c:3020 +#: sequencer.c:3021 msgid "merge: Unable to write new index file" msgstr "" -#: sequencer.c:3087 +#: sequencer.c:3088 #, c-format msgid "Applied autostash.\n" msgstr "" -#: sequencer.c:3099 +#: sequencer.c:3100 #, c-format msgid "cannot store %s" msgstr "" -#: sequencer.c:3102 git-rebase.sh:188 +#: sequencer.c:3103 git-rebase.sh:188 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3593,7 +3654,7 @@ msgid "" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -#: sequencer.c:3133 +#: sequencer.c:3134 #, c-format msgid "" "Could not execute the todo command\n" @@ -3606,108 +3667,108 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:3201 +#: sequencer.c:3202 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "" -#: sequencer.c:3263 +#: sequencer.c:3264 #, c-format msgid "unknown command %d" msgstr "" -#: sequencer.c:3308 +#: sequencer.c:3309 msgid "could not read orig-head" msgstr "" -#: sequencer.c:3313 sequencer.c:4351 +#: sequencer.c:3314 sequencer.c:4352 msgid "could not read 'onto'" msgstr "" -#: sequencer.c:3327 +#: sequencer.c:3328 #, c-format msgid "could not update HEAD to %s" msgstr "" -#: sequencer.c:3413 +#: sequencer.c:3414 msgid "cannot rebase: You have unstaged changes." msgstr "" -#: sequencer.c:3422 +#: sequencer.c:3423 msgid "cannot amend non-existing commit" msgstr "" -#: sequencer.c:3424 +#: sequencer.c:3425 #, c-format msgid "invalid file: '%s'" msgstr "" -#: sequencer.c:3426 +#: sequencer.c:3427 #, c-format msgid "invalid contents: '%s'" msgstr "" -#: sequencer.c:3429 +#: sequencer.c:3430 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:3454 sequencer.c:3492 +#: sequencer.c:3455 sequencer.c:3493 #, c-format msgid "could not write file: '%s'" msgstr "" -#: sequencer.c:3507 +#: sequencer.c:3508 msgid "could not remove CHERRY_PICK_HEAD" msgstr "" -#: sequencer.c:3514 +#: sequencer.c:3515 msgid "could not commit staged changes." msgstr "" -#: sequencer.c:3611 +#: sequencer.c:3612 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:3615 +#: sequencer.c:3616 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:3648 +#: sequencer.c:3649 msgid "can't revert as initial commit" msgstr "" -#: sequencer.c:4097 +#: sequencer.c:4098 msgid "make_script: unhandled options" msgstr "" -#: sequencer.c:4100 +#: sequencer.c:4101 msgid "make_script: error preparing revisions" msgstr "" -#: sequencer.c:4141 sequencer.c:4176 +#: sequencer.c:4142 sequencer.c:4177 #, c-format msgid "unusable todo list: '%s'" msgstr "" -#: sequencer.c:4235 +#: sequencer.c:4236 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" -#: sequencer.c:4301 +#: sequencer.c:4302 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):\n" msgstr "" -#: sequencer.c:4308 +#: sequencer.c:4309 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -3718,7 +3779,7 @@ msgid "" "\n" msgstr "" -#: sequencer.c:4320 +#: sequencer.c:4321 #, c-format msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" @@ -3726,12 +3787,12 @@ msgid "" "Or you can abort the rebase with 'git rebase --abort'.\n" msgstr "" -#: sequencer.c:4374 +#: sequencer.c:4375 #, c-format msgid "could not parse commit '%s'" msgstr "" -#: sequencer.c:4489 +#: sequencer.c:4490 msgid "the script was already rearranged." msgstr "" @@ -3968,44 +4029,44 @@ msgstr "" msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: submodule.c:1373 +#: submodule.c:1375 #, c-format msgid "'%s' not recognized as a git repository" msgstr "" -#: submodule.c:1511 +#: submodule.c:1513 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1524 +#: submodule.c:1526 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1617 +#: submodule.c:1619 #, c-format msgid "submodule '%s' has dirty index" msgstr "" -#: submodule.c:1716 +#: submodule.c:1718 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" -#: submodule.c:1728 submodule.c:1784 +#: submodule.c:1730 submodule.c:1786 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "" -#: submodule.c:1732 builtin/submodule--helper.c:1261 +#: submodule.c:1734 builtin/submodule--helper.c:1261 #: builtin/submodule--helper.c:1271 #, c-format msgid "could not create directory '%s'" msgstr "" -#: submodule.c:1735 +#: submodule.c:1737 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -4013,16 +4074,16 @@ msgid "" "'%s'\n" msgstr "" -#: submodule.c:1819 +#: submodule.c:1821 #, c-format msgid "could not recurse into submodule '%s'" msgstr "" -#: submodule.c:1863 +#: submodule.c:1865 msgid "could not start ls-files in .." msgstr "" -#: submodule.c:1902 +#: submodule.c:1904 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "" @@ -4401,7 +4462,7 @@ msgid "could not open '%s' for reading and writing" msgstr "" #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 -#: builtin/am.c:862 builtin/merge.c:1042 +#: builtin/am.c:862 builtin/merge.c:1043 #, c-format msgid "could not open '%s' for reading" msgstr "" @@ -4907,7 +4968,7 @@ msgstr "" msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:233 builtin/rev-parse.c:888 +#: builtin/add.c:233 builtin/rev-parse.c:892 msgid "Could not read the index" msgstr "" @@ -5330,7 +5391,7 @@ msgid "pass it through git-apply" msgstr "" #: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:665 -#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:207 +#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:208 #: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:201 #: builtin/repack.c:205 builtin/repack.c:207 builtin/show-branch.c:631 #: builtin/show-ref.c:169 builtin/tag.c:383 parse-options.h:144 @@ -5383,7 +5444,7 @@ msgstr "" msgid "use current timestamp for author date" msgstr "" -#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:238 +#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:239 #: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399 msgid "key-id" msgstr "" @@ -6513,7 +6574,7 @@ msgstr "" msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1131 builtin/merge.c:240 +#: builtin/checkout.c:1131 builtin/merge.c:241 msgid "update ignored files (default)" msgstr "" @@ -6538,7 +6599,7 @@ msgid "do not check if another worktree is holding the given ref" msgstr "" #: builtin/checkout.c:1145 builtin/clone.c:85 builtin/fetch.c:149 -#: builtin/merge.c:237 builtin/pull.c:128 builtin/push.c:572 +#: builtin/merge.c:238 builtin/pull.c:128 builtin/push.c:572 #: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "" @@ -7454,7 +7515,7 @@ msgstr "" msgid "override date for commit" msgstr "" -#: builtin/commit.c:1457 builtin/merge.c:227 builtin/notes.c:402 +#: builtin/commit.c:1457 builtin/merge.c:228 builtin/notes.c:402 #: builtin/notes.c:565 builtin/tag.c:392 msgid "message" msgstr "" @@ -7488,7 +7549,7 @@ msgstr "" msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1463 builtin/log.c:1446 builtin/merge.c:241 +#: builtin/commit.c:1463 builtin/log.c:1446 builtin/merge.c:242 #: builtin/pull.c:154 builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "" @@ -7513,7 +7574,7 @@ msgstr "" msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1469 builtin/merge.c:239 builtin/pull.c:184 +#: builtin/commit.c:1469 builtin/merge.c:240 builtin/pull.c:184 #: builtin/revert.c:113 msgid "GPG sign commit" msgstr "" @@ -8089,41 +8150,41 @@ msgstr "" msgid "do not prompt before launching a diff tool" msgstr "" -#: builtin/difftool.c:705 +#: builtin/difftool.c:704 msgid "use symlinks in dir-diff mode" msgstr "" -#: builtin/difftool.c:706 +#: builtin/difftool.c:705 msgid "<tool>" msgstr "" -#: builtin/difftool.c:707 +#: builtin/difftool.c:706 msgid "use the specified diff tool" msgstr "" -#: builtin/difftool.c:709 +#: builtin/difftool.c:708 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" -#: builtin/difftool.c:712 +#: builtin/difftool.c:711 msgid "" "make 'git- |