undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

l10n: git.pot: v2.20.0 round 3 (5 new, 3 removed)

Browse Source 
Generate po/git.pot from v2.20.0-rc2 for git v2.20.0 l10n round 3.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
This commit is contained in:
Jiang Xin 2018-12-02 10:56:26 +08:00
parent 924a01f237
commit 578d8ea381
1 changed files with 142 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

274
po/git.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2018-12-01 16:14+0800\n" "POT-Creation-Date: 2018-12-02 10:55+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -655,7 +655,7 @@ msgstr ""
#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97 #: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97
#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101 #: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
#: builtin/pack-objects.c:3312 builtin/rebase.c:840 #: builtin/pack-objects.c:3312 builtin/rebase.c:857
msgid "action" msgid "action"
msgstr "" msgstr ""
@ -4784,8 +4784,8 @@ msgstr ""
msgid "could not copy '%s' to '%s'" msgid "could not copy '%s' to '%s'"
msgstr "" msgstr ""
#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1000 #: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1019
#: builtin/rebase.c:1351 builtin/rebase.c:1405 #: builtin/rebase.c:1372 builtin/rebase.c:1426
msgid "could not read index" msgid "could not read index"
msgstr "" msgstr ""
@ -7083,7 +7083,7 @@ msgstr ""
#: builtin/am.c:2215 builtin/commit.c:1340 builtin/fmt-merge-msg.c:671 #: builtin/am.c:2215 builtin/commit.c:1340 builtin/fmt-merge-msg.c:671
#: builtin/fmt-merge-msg.c:674 builtin/grep.c:868 builtin/merge.c:239 #: builtin/fmt-merge-msg.c:674 builtin/grep.c:868 builtin/merge.c:239
#: builtin/pull.c:151 builtin/pull.c:209 builtin/rebase.c:837 #: builtin/pull.c:151 builtin/pull.c:209 builtin/rebase.c:854
#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323 #: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
#: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386 #: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386
#: parse-options.h:144 parse-options.h:146 parse-options.h:268 #: parse-options.h:144 parse-options.h:146 parse-options.h:268
@ -7091,7 +7091,7 @@ msgid "n"
msgstr "" msgstr ""
#: builtin/am.c:2221 builtin/branch.c:637 builtin/for-each-ref.c:38 #: builtin/am.c:2221 builtin/branch.c:637 builtin/for-each-ref.c:38
#: builtin/replace.c:543 builtin/tag.c:422 builtin/verify-tag.c:39 #: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39
msgid "format" msgid "format"
msgstr "" msgstr ""
@ -7136,12 +7136,12 @@ msgid "use current timestamp for author date"
msgstr "" msgstr ""
#: builtin/am.c:2253 builtin/commit.c:1483 builtin/merge.c:273 #: builtin/am.c:2253 builtin/commit.c:1483 builtin/merge.c:273
#: builtin/pull.c:184 builtin/rebase.c:881 builtin/rebase--interactive.c:183 #: builtin/pull.c:184 builtin/rebase.c:898 builtin/rebase--interactive.c:183
#: builtin/revert.c:113 builtin/tag.c:402 #: builtin/revert.c:113 builtin/tag.c:402
msgid "key-id" msgid "key-id"
msgstr "" msgstr ""
#: builtin/am.c:2254 builtin/rebase.c:882 builtin/rebase--interactive.c:184 #: builtin/am.c:2254 builtin/rebase.c:899 builtin/rebase--interactive.c:184
msgid "GPG-sign commits" msgid "GPG-sign commits"
msgstr "" msgstr ""
@ -8610,7 +8610,7 @@ msgid "create a shallow clone since a specific time"
msgstr "" msgstr ""
#: builtin/clone.c:127 builtin/fetch.c:146 builtin/fetch.c:169 #: builtin/clone.c:127 builtin/fetch.c:146 builtin/fetch.c:169
#: builtin/rebase.c:814 #: builtin/rebase.c:831
msgid "revision" msgid "revision"
msgstr "" msgstr ""
@ -9162,7 +9162,7 @@ msgid "terminate entries with NUL"
msgstr "" msgstr ""
#: builtin/commit.c:1327 builtin/commit.c:1331 builtin/commit.c:1509 #: builtin/commit.c:1327 builtin/commit.c:1331 builtin/commit.c:1509
#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/rebase.c:893 #: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/rebase.c:910
#: builtin/tag.c:400 #: builtin/tag.c:400
msgid "mode" msgid "mode"
msgstr "" msgstr ""
@ -11978,7 +11978,7 @@ msgstr ""
msgid "do not print remote URL" msgid "do not print remote URL"
msgstr "" msgstr ""
#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:886 #: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:903
msgid "exec" msgid "exec"
msgstr "" msgstr ""
@ -12123,7 +12123,7 @@ msgid "verify that the named commit has a valid GPG signature"
msgstr "" msgstr ""
#: builtin/merge.c:255 builtin/notes.c:784 builtin/pull.c:177 #: builtin/merge.c:255 builtin/notes.c:784 builtin/pull.c:177
#: builtin/rebase.c:899 builtin/rebase--interactive.c:186 builtin/revert.c:110 #: builtin/rebase.c:916 builtin/rebase--interactive.c:186 builtin/revert.c:110
msgid "strategy" msgid "strategy"
msgstr "" msgstr ""
@ -13677,7 +13677,7 @@ msgid ""
"\n" "\n"
"To push to the branch of the same name on the remote, use\n" "To push to the branch of the same name on the remote, use\n"
"\n" "\n"
" git push %s %s\n" " git push %s HEAD\n"
"%s" "%s"
msgstr "" msgstr ""
@ -14065,168 +14065,168 @@ msgid ""
"\n" "\n"
msgstr "" msgstr ""
#: builtin/rebase.c:815 #: builtin/rebase.c:832
msgid "rebase onto given branch instead of upstream" msgid "rebase onto given branch instead of upstream"
msgstr "" msgstr ""
#: builtin/rebase.c:817 #: builtin/rebase.c:834
msgid "allow pre-rebase hook to run" msgid "allow pre-rebase hook to run"
msgstr "" msgstr ""
#: builtin/rebase.c:819 #: builtin/rebase.c:836
msgid "be quiet. implies --no-stat" msgid "be quiet. implies --no-stat"
msgstr "" msgstr ""
#: builtin/rebase.c:822 #: builtin/rebase.c:839
msgid "display a diffstat of what changed upstream" msgid "display a diffstat of what changed upstream"
msgstr "" msgstr ""
#: builtin/rebase.c:825 #: builtin/rebase.c:842
msgid "do not show diffstat of what changed upstream" msgid "do not show diffstat of what changed upstream"
msgstr "" msgstr ""
#: builtin/rebase.c:828 #: builtin/rebase.c:845
msgid "add a Signed-off-by: line to each commit" msgid "add a Signed-off-by: line to each commit"
msgstr "" msgstr ""
#: builtin/rebase.c:830 builtin/rebase.c:834 builtin/rebase.c:836 #: builtin/rebase.c:847 builtin/rebase.c:851 builtin/rebase.c:853
msgid "passed to 'git am'" msgid "passed to 'git am'"
msgstr "" msgstr ""
#: builtin/rebase.c:838 builtin/rebase.c:840 #: builtin/rebase.c:855 builtin/rebase.c:857
msgid "passed to 'git apply'" msgid "passed to 'git apply'"
msgstr "" msgstr ""
#: builtin/rebase.c:842 builtin/rebase.c:845 #: builtin/rebase.c:859 builtin/rebase.c:862
msgid "cherry-pick all commits, even if unchanged" msgid "cherry-pick all commits, even if unchanged"
msgstr "" msgstr ""
#: builtin/rebase.c:847 #: builtin/rebase.c:864
msgid "continue" msgid "continue"
msgstr "" msgstr ""
#: builtin/rebase.c:850 #: builtin/rebase.c:867
msgid "skip current patch and continue" msgid "skip current patch and continue"
msgstr "" msgstr ""
#: builtin/rebase.c:852 #: builtin/rebase.c:869
msgid "abort and check out the original branch" msgid "abort and check out the original branch"
msgstr "" msgstr ""
#: builtin/rebase.c:855 #: builtin/rebase.c:872
msgid "abort but keep HEAD where it is" msgid "abort but keep HEAD where it is"
msgstr "" msgstr ""
#: builtin/rebase.c:856 #: builtin/rebase.c:873
msgid "edit the todo list during an interactive rebase" msgid "edit the todo list during an interactive rebase"
msgstr "" msgstr ""
#: builtin/rebase.c:859 #: builtin/rebase.c:876
msgid "show the patch file being applied or merged" msgid "show the patch file being applied or merged"
msgstr "" msgstr ""
#: builtin/rebase.c:862 #: builtin/rebase.c:879
msgid "use merging strategies to rebase" msgid "use merging strategies to rebase"
msgstr "" msgstr ""
#: builtin/rebase.c:866 #: builtin/rebase.c:883
msgid "let the user edit the list of commits to rebase" msgid "let the user edit the list of commits to rebase"
msgstr "" msgstr ""
#: builtin/rebase.c:870 #: builtin/rebase.c:887
msgid "try to recreate merges instead of ignoring them" msgid "try to recreate merges instead of ignoring them"
msgstr "" msgstr ""
#: builtin/rebase.c:874
msgid "allow rerere to update index with resolved conflict"
msgstr ""
#: builtin/rebase.c:877
msgid "preserve empty commits during rebase"
msgstr ""
#: builtin/rebase.c:879
msgid "move commits that begin with squash!/fixup! under -i"
msgstr ""
#: builtin/rebase.c:885
msgid "automatically stash/stash pop before and after"
msgstr ""
#: builtin/rebase.c:887
msgid "add exec lines after each commit of the editable list"
msgstr ""
#: builtin/rebase.c:891 #: builtin/rebase.c:891
msgid "allow rebasing commits with empty messages" msgid "allow rerere to update index with resolved conflict"
msgstr "" msgstr ""
#: builtin/rebase.c:894 #: builtin/rebase.c:894
msgid "try to rebase merges instead of skipping them" msgid "preserve empty commits during rebase"
msgstr "" msgstr ""
#: builtin/rebase.c:897 #: builtin/rebase.c:896
msgid "use 'merge-base --fork-point' to refine upstream" msgid "move commits that begin with squash!/fixup! under -i"
msgstr ""
#: builtin/rebase.c:899
msgid "use the given merge strategy"
msgstr ""
#: builtin/rebase.c:901 builtin/revert.c:111
msgid "option"
msgstr "" msgstr ""
#: builtin/rebase.c:902 #: builtin/rebase.c:902
msgid "automatically stash/stash pop before and after"
msgstr ""
#: builtin/rebase.c:904
msgid "add exec lines after each commit of the editable list"
msgstr ""
#: builtin/rebase.c:908
msgid "allow rebasing commits with empty messages"
msgstr ""
#: builtin/rebase.c:911
msgid "try to rebase merges instead of skipping them"
msgstr ""
#: builtin/rebase.c:914
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr ""
#: builtin/rebase.c:916
msgid "use the given merge strategy"
msgstr ""
#: builtin/rebase.c:918 builtin/revert.c:111
msgid "option"
msgstr ""
#: builtin/rebase.c:919
msgid "pass the argument through to the merge strategy" msgid "pass the argument through to the merge strategy"
msgstr "" msgstr ""
#: builtin/rebase.c:905 #: builtin/rebase.c:922
msgid "rebase all reachable commits up to the root(s)" msgid "rebase all reachable commits up to the root(s)"
msgstr "" msgstr ""
#: builtin/rebase.c:921 #: builtin/rebase.c:938
#, c-format #, c-format
msgid "could not exec %s" msgid "could not exec %s"
msgstr "" msgstr ""
#: builtin/rebase.c:939 git-legacy-rebase.sh:213 #: builtin/rebase.c:956 git-legacy-rebase.sh:213
msgid "It looks like 'git am' is in progress. Cannot rebase." msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "" msgstr ""
#: builtin/rebase.c:980 git-legacy-rebase.sh:395 #: builtin/rebase.c:997 git-legacy-rebase.sh:395
msgid "No rebase in progress?" msgid "No rebase in progress?"
msgstr "" msgstr ""
#: builtin/rebase.c:983 git-legacy-rebase.sh:406 #: builtin/rebase.c:1001 git-legacy-rebase.sh:406
msgid "The --edit-todo action can only be used during interactive rebase." msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "" msgstr ""
#: builtin/rebase.c:996 git-legacy-rebase.sh:413 #: builtin/rebase.c:1015 git-legacy-rebase.sh:413
msgid "Cannot read HEAD" msgid "Cannot read HEAD"
msgstr "" msgstr ""
#: builtin/rebase.c:1009 git-legacy-rebase.sh:416 #: builtin/rebase.c:1028 git-legacy-rebase.sh:416
msgid "" msgid ""
"You must edit all merge conflicts and then\n" "You must edit all merge conflicts and then\n"
"mark them as resolved using git add" "mark them as resolved using git add"
msgstr "" msgstr ""
#: builtin/rebase.c:1027 #: builtin/rebase.c:1047
msgid "could not discard worktree changes" msgid "could not discard worktree changes"
msgstr "" msgstr ""
#: builtin/rebase.c:1045 #: builtin/rebase.c:1066
#, c-format #, c-format
msgid "could not move back to %s" msgid "could not move back to %s"
msgstr "" msgstr ""
#: builtin/rebase.c:1056 builtin/rm.c:368 #: builtin/rebase.c:1077 builtin/rm.c:368
#, c-format #, c-format
msgid "could not remove '%s'" msgid "could not remove '%s'"
msgstr "" msgstr ""
#: builtin/rebase.c:1082 #: builtin/rebase.c:1103
#, c-format #, c-format
msgid "" msgid ""
"It seems that there is already a %s directory, and\n" "It seems that there is already a %s directory, and\n"
@ -14239,20 +14239,20 @@ msgid ""
"valuable there.\n" "valuable there.\n"
msgstr "" msgstr ""
#: builtin/rebase.c:1103 #: builtin/rebase.c:1124
msgid "switch `C' expects a numerical value" msgid "switch `C' expects a numerical value"
msgstr "" msgstr ""
#: builtin/rebase.c:1140 #: builtin/rebase.c:1161
#, c-format #, c-format
msgid "Unknown mode: %s" msgid "Unknown mode: %s"
msgstr "" msgstr ""
#: builtin/rebase.c:1162 #: builtin/rebase.c:1183
msgid "--strategy requires --merge or --interactive" msgid "--strategy requires --merge or --interactive"
msgstr "" msgstr ""
#: builtin/rebase.c:1205 #: builtin/rebase.c:1226
#, c-format #, c-format
msgid "" msgid ""
"error: cannot combine interactive options (--interactive, --exec, --rebase-" "error: cannot combine interactive options (--interactive, --exec, --rebase-"
@ -14260,142 +14260,147 @@ msgid ""
"(%s)" "(%s)"
msgstr "" msgstr ""
#: builtin/rebase.c:1210 #: builtin/rebase.c:1231
#, c-format #, c-format
msgid "" msgid ""
"error: cannot combine merge options (--merge, --strategy, --strategy-option) " "error: cannot combine merge options (--merge, --strategy, --strategy-option) "
"with am options (%s)" "with am options (%s)"
msgstr "" msgstr ""
#: builtin/rebase.c:1230 git-legacy-rebase.sh:536 #: builtin/rebase.c:1251 git-legacy-rebase.sh:536
msgid "error: cannot combine '--preserve-merges' with '--rebase-merges'" msgid "error: cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "" msgstr ""
#: builtin/rebase.c:1235 git-legacy-rebase.sh:542 #: builtin/rebase.c:1256 git-legacy-rebase.sh:542
msgid "error: cannot combine '--rebase-merges' with '--strategy-option'" msgid "error: cannot combine '--rebase-merges' with '--strategy-option'"
msgstr "" msgstr ""
#: builtin/rebase.c:1238 git-legacy-rebase.sh:544 #: builtin/rebase.c:1259 git-legacy-rebase.sh:544
msgid "error: cannot combine '--rebase-merges' with '--strategy'" msgid "error: cannot combine '--rebase-merges' with '--strategy'"
msgstr "" msgstr ""
#: builtin/rebase.c:1262 #: builtin/rebase.c:1283
#, c-format #, c-format
msgid "invalid upstream '%s'" msgid "invalid upstream '%s'"
msgstr "" msgstr ""
#: builtin/rebase.c:1268 #: builtin/rebase.c:1289
msgid "Could not create new root commit" msgid "Could not create new root commit"
msgstr "" msgstr ""
#: builtin/rebase.c:1286 #: builtin/rebase.c:1307
#, c-format #, c-format
msgid "'%s': need exactly one merge base" msgid "'%s': need exactly one merge base"
msgstr "" msgstr ""
#: builtin/rebase.c:1293 #: builtin/rebase.c:1314
#, c-format #, c-format
msgid "Does not point to a valid commit '%s'" msgid "Does not point to a valid commit '%s'"
msgstr "" msgstr ""
#: builtin/rebase.c:1318 #: builtin/rebase.c:1339
#, c-format #, c-format
msgid "fatal: no such branch/commit '%s'" msgid "fatal: no such branch/commit '%s'"
msgstr "" msgstr ""
#: builtin/rebase.c:1326 builtin/submodule--helper.c:37 #: builtin/rebase.c:1347 builtin/submodule--helper.c:37
#: builtin/submodule--helper.c:1930 #: builtin/submodule--helper.c:1930
#, c-format #, c-format
msgid "No such ref: %s" msgid "No such ref: %s"
msgstr "" msgstr ""
#: builtin/rebase.c:1338 #: builtin/rebase.c:1359
msgid "Could not resolve HEAD to a revision" msgid "Could not resolve HEAD to a revision"
msgstr "" msgstr ""
#: builtin/rebase.c:1378 git-legacy-rebase.sh:665 #: builtin/rebase.c:1399 git-legacy-rebase.sh:665
msgid "Cannot autostash" msgid "Cannot autostash"
msgstr "" msgstr ""
#: builtin/rebase.c:1381 #: builtin/rebase.c:1402
#, c-format #, c-format
msgid "Unexpected stash response: '%s'" msgid "Unexpected stash response: '%s'"
msgstr "" msgstr ""
#: builtin/rebase.c:1387 #: builtin/rebase.c:1408
#, c-format #, c-format
msgid "Could not create directory for '%s'" msgid "Could not create directory for '%s'"
msgstr "" msgstr ""
#: builtin/rebase.c:1390 #: builtin/rebase.c:1411
#, c-format #, c-format
msgid "Created autostash: %s\n" msgid "Created autostash: %s\n"
msgstr "" msgstr ""
#: builtin/rebase.c:1393 #: builtin/rebase.c:1414
msgid "could not reset --hard" msgid "could not reset --hard"
msgstr "" msgstr ""
#: builtin/rebase.c:1394 builtin/reset.c:113 #: builtin/rebase.c:1415 builtin/reset.c:113
#, c-format #, c-format
msgid "HEAD is now at %s" msgid "HEAD is now at %s"
msgstr "" msgstr ""
#: builtin/rebase.c:1410 git-legacy-rebase.sh:674 #: builtin/rebase.c:1431 git-legacy-rebase.sh:674
msgid "Please commit or stash them." msgid "Please commit or stash them."
msgstr "" msgstr ""
#: builtin/rebase.c:1437 #: builtin/rebase.c:1458
#, c-format #, c-format
msgid "could not parse '%s'" msgid "could not parse '%s'"
msgstr "" msgstr ""
#: builtin/rebase.c:1448 #: builtin/rebase.c:1470
#, c-format #, c-format
msgid "could not switch to %s" msgid "could not switch to %s"
msgstr "" msgstr ""
#: builtin/rebase.c:1459 git-legacy-rebase.sh:697 #: builtin/rebase.c:1481 git-legacy-rebase.sh:697
#, sh-format #, sh-format
msgid "HEAD is up to date." msgid "HEAD is up to date."
msgstr "" msgstr ""
#: builtin/rebase.c:1461 #: builtin/rebase.c:1483
#, c-format #, c-format
msgid "Current branch %s is up to date.\n" msgid "Current branch %s is up to date.\n"
msgstr "" msgstr ""
#: builtin/rebase.c:1469 git-legacy-rebase.sh:707 #: builtin/rebase.c:1491 git-legacy-rebase.sh:707
#, sh-format #, sh-format
msgid "HEAD is up to date, rebase forced." msgid "HEAD is up to date, rebase forced."
msgstr "" msgstr ""
#: builtin/rebase.c:1471 #: builtin/rebase.c:1493
#, c-format #, c-format
msgid "Current branch %s is up to date, rebase forced.\n" msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "" msgstr ""
#: builtin/rebase.c:1479 git-legacy-rebase.sh:208 #: builtin/rebase.c:1501 git-legacy-rebase.sh:208
msgid "The pre-rebase hook refused to rebase." msgid "The pre-rebase hook refused to rebase."
msgstr "" msgstr ""
#: builtin/rebase.c:1485
#, c-format
msgid "Changes from %s to %s:\n"
msgstr ""
#: builtin/rebase.c:1508 #: builtin/rebase.c:1508
#, c-format #, c-format
msgid "Changes to %s:\n"
msgstr ""
#: builtin/rebase.c:1511
#, c-format
msgid "Changes from %s to %s:\n"
msgstr ""
#: builtin/rebase.c:1536
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n" msgid "First, rewinding head to replay your work on top of it...\n"
msgstr "" msgstr ""
#: builtin/rebase.c:1514 #: builtin/rebase.c:1543
msgid "Could not detach HEAD" msgid "Could not detach HEAD"
msgstr "" msgstr ""
#: builtin/rebase.c:1523 #: builtin/rebase.c:1552
#, c-format #, c-format
msgid "Fast-forwarded %s to %s. \n" msgid "Fast-forwarded %s to %s.\n"
msgstr "" msgstr ""
#: builtin/rebase--interactive.c:24 #: builtin/rebase--interactive.c:24
@ -15367,78 +15372,78 @@ msgstr ""
msgid "new commit is the same as the old one: '%s'" msgid "new commit is the same as the old one: '%s'"
msgstr "" msgstr ""
#: builtin/replace.c:514 #: builtin/replace.c:515
#, c-format #, c-format
msgid "" msgid ""
"could not convert the following graft(s):\n" "could not convert the following graft(s):\n"
"%s" "%s"
msgstr "" msgstr ""
#: builtin/replace.c:535 #: builtin/replace.c:536
msgid "list replace refs" msgid "list replace refs"
msgstr "" msgstr ""
#: builtin/replace.c:536 #: builtin/replace.c:537
msgid "delete replace refs" msgid "delete replace refs"
msgstr "" msgstr ""
#: builtin/replace.c:537 #: builtin/replace.c:538
msgid "edit existing object" msgid "edit existing object"
msgstr "" msgstr ""
#: builtin/replace.c:538 #: builtin/replace.c:539
msgid "change a commit's parents" msgid "change a commit's parents"
msgstr "" msgstr ""
#: builtin/replace.c:539 #: builtin/replace.c:540
msgid "convert existing graft file" msgid "convert existing graft file"
msgstr "" msgstr ""
#: builtin/replace.c:540 #: builtin/replace.c:541
msgid "replace the ref if it exists" msgid "replace the ref if it exists"
msgstr "" msgstr ""
#: builtin/replace.c:542 #: builtin/replace.c:543
msgid "do not pretty-print contents for --edit" msgid "do not pretty-print contents for --edit"
msgstr "" msgstr ""
#: builtin/replace.c:543 #: builtin/replace.c:544
msgid "use this format" msgid "use this format"
msgstr "" msgstr ""
#: builtin/replace.c:556 #: builtin/replace.c:557
msgid "--format cannot be used when not listing" msgid "--format cannot be used when not listing"
msgstr "" msgstr ""
#: builtin/replace.c:564 #: builtin/replace.c:565
msgid "-f only makes sense when writing a replacement" msgid "-f only makes sense when writing a replacement"
msgstr "" msgstr ""
#: builtin/replace.c:568 #: builtin/replace.c:569
msgid "--raw only makes sense with --edit" msgid "--raw only makes sense with --edit"
msgstr "" msgstr ""
#: builtin/replace.c:574 #: builtin/replace.c:575
msgid "-d needs at least one argument" msgid "-d needs at least one argument"
msgstr "" msgstr ""
#: builtin/replace.c:580 #: builtin/replace.c:581
msgid "bad number of arguments" msgid "bad number of arguments"
msgstr "" msgstr ""
#: builtin/replace.c:586 #: builtin/replace.c:587
msgid "-e needs exactly one argument" msgid "-e needs exactly one argument"
msgstr "" msgstr ""
#: builtin/replace.c:592 #: builtin/replace.c:593
msgid "-g needs at least one argument" msgid "-g needs at least one argument"
msgstr "" msgstr ""
#: builtin/replace.c:598 #: builtin/replace.c:599
msgid "--convert-graft-file takes no argument" msgid "--convert-graft-file takes no argument"
msgstr "" msgstr ""
#: builtin/replace.c:604 #: builtin/replace.c:605
msgid "only one pattern can be given with -l" msgid "only one pattern can be given with -l"
msgstr "" msgstr ""
@ -18335,16 +18340,21 @@ msgstr ""
msgid "Current branch $branch_name is up to date, rebase forced." msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "" msgstr ""
#: git-legacy-rebase.sh:721 #: git-legacy-rebase.sh:723
#, sh-format
msgid "Changes to $onto:"
msgstr ""
#: git-legacy-rebase.sh:725
#, sh-format #, sh-format
msgid "Changes from $mb to $onto:" msgid "Changes from $mb to $onto:"
msgstr "" msgstr ""
#: git-legacy-rebase.sh:730 #: git-legacy-rebase.sh:736
msgid "First, rewinding head to replay your work on top of it..." msgid "First, rewinding head to replay your work on top of it..."
msgstr "" msgstr ""
#: git-legacy-rebase.sh:740 #: git-legacy-rebase.sh:746
#, sh-format #, sh-format
msgid "Fast-forwarded $branch_name to $onto_name." msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "" msgstr ""