@matheusbsbs / matheus-bagliano / commits / 578d8ea381

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

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>

Jiang Xin committed Dec 2, 2018 at 10:56 UTC 578d8ea381f817bbc9cf6239a9facdb6a21506e0
1 file changed +119 -109
po/git.pot
+119 -109
@@ -8,7 +8,7 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
11 -"POT-Creation-Date: 2018-12-01 16:14+0800\n"
11 +"POT-Creation-Date: 2018-12-02 10:55+0800\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -655,7 +655,7 @@ msgstr ""
655
656 #: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97
657 #: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
658 -#: builtin/pack-objects.c:3312 builtin/rebase.c:840
658 +#: builtin/pack-objects.c:3312 builtin/rebase.c:857
659 msgid "action"
660 msgstr ""
661
@@ -4784,8 +4784,8 @@ msgstr ""
4784 msgid "could not copy '%s' to '%s'"
4785 msgstr ""
4786
4787 -#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1000
4788 -#: builtin/rebase.c:1351 builtin/rebase.c:1405
4787 +#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1019
4788 +#: builtin/rebase.c:1372 builtin/rebase.c:1426
4789 msgid "could not read index"
4790 msgstr ""
4791
@@ -7083,7 +7083,7 @@ msgstr ""
7083
7084 #: builtin/am.c:2215 builtin/commit.c:1340 builtin/fmt-merge-msg.c:671
7085 #: builtin/fmt-merge-msg.c:674 builtin/grep.c:868 builtin/merge.c:239
7086 -#: builtin/pull.c:151 builtin/pull.c:209 builtin/rebase.c:837
7086 +#: builtin/pull.c:151 builtin/pull.c:209 builtin/rebase.c:854
7087 #: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
7088 #: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386
7089 #: parse-options.h:144 parse-options.h:146 parse-options.h:268
@@ -7091,7 +7091,7 @@ msgid "n"
7091 msgstr ""
7092
7093 #: builtin/am.c:2221 builtin/branch.c:637 builtin/for-each-ref.c:38
7094 -#: builtin/replace.c:543 builtin/tag.c:422 builtin/verify-tag.c:39
7094 +#: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39
7095 msgid "format"
7096 msgstr ""
7097
@@ -7136,12 +7136,12 @@ msgid "use current timestamp for author date"
7136 msgstr ""
7137
7138 #: builtin/am.c:2253 builtin/commit.c:1483 builtin/merge.c:273
7139 -#: builtin/pull.c:184 builtin/rebase.c:881 builtin/rebase--interactive.c:183
7139 +#: builtin/pull.c:184 builtin/rebase.c:898 builtin/rebase--interactive.c:183
7140 #: builtin/revert.c:113 builtin/tag.c:402
7141 msgid "key-id"
7142 msgstr ""
7143
7144 -#: builtin/am.c:2254 builtin/rebase.c:882 builtin/rebase--interactive.c:184
7144 +#: builtin/am.c:2254 builtin/rebase.c:899 builtin/rebase--interactive.c:184
7145 msgid "GPG-sign commits"
7146 msgstr ""
7147
@@ -8610,7 +8610,7 @@ msgid "create a shallow clone since a specific time"
8610 msgstr ""
8611
8612 #: builtin/clone.c:127 builtin/fetch.c:146 builtin/fetch.c:169
8613 -#: builtin/rebase.c:814
8613 +#: builtin/rebase.c:831
8614 msgid "revision"
8615 msgstr ""
8616
@@ -9162,7 +9162,7 @@ msgid "terminate entries with NUL"
9162 msgstr ""
9163
9164 #: builtin/commit.c:1327 builtin/commit.c:1331 builtin/commit.c:1509
9165 -#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/rebase.c:893
9165 +#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/rebase.c:910
9166 #: builtin/tag.c:400
9167 msgid "mode"
9168 msgstr ""
@@ -11978,7 +11978,7 @@ msgstr ""
11978 msgid "do not print remote URL"
11979 msgstr ""
11980
11981 -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:886
11981 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:903
11982 msgid "exec"
11983 msgstr ""
11984
@@ -12123,7 +12123,7 @@ msgid "verify that the named commit has a valid GPG signature"
12123 msgstr ""
12124
12125 #: builtin/merge.c:255 builtin/notes.c:784 builtin/pull.c:177
12126 -#: builtin/rebase.c:899 builtin/rebase--interactive.c:186 builtin/revert.c:110
12126 +#: builtin/rebase.c:916 builtin/rebase--interactive.c:186 builtin/revert.c:110
12127 msgid "strategy"
12128 msgstr ""
12129
@@ -13677,7 +13677,7 @@ msgid ""
13677 "\n"
13678 "To push to the branch of the same name on the remote, use\n"
13679 "\n"
13680 -" git push %s %s\n"
13680 +" git push %s HEAD\n"
13681 "%s"
13682 msgstr ""
13683
@@ -14065,168 +14065,168 @@ msgid ""
14065 "\n"
14066 msgstr ""
14067
14068 -#: builtin/rebase.c:815
14068 +#: builtin/rebase.c:832
14069 msgid "rebase onto given branch instead of upstream"
14070 msgstr ""
14071
14072 -#: builtin/rebase.c:817
14072 +#: builtin/rebase.c:834
14073 msgid "allow pre-rebase hook to run"
14074 msgstr ""
14075
14076 -#: builtin/rebase.c:819
14076 +#: builtin/rebase.c:836
14077 msgid "be quiet. implies --no-stat"
14078 msgstr ""
14079
14080 -#: builtin/rebase.c:822
14080 +#: builtin/rebase.c:839
14081 msgid "display a diffstat of what changed upstream"
14082 msgstr ""
14083
14084 -#: builtin/rebase.c:825
14084 +#: builtin/rebase.c:842
14085 msgid "do not show diffstat of what changed upstream"
14086 msgstr ""
14087
14088 -#: builtin/rebase.c:828
14088 +#: builtin/rebase.c:845
14089 msgid "add a Signed-off-by: line to each commit"
14090 msgstr ""
14091
14092 -#: builtin/rebase.c:830 builtin/rebase.c:834 builtin/rebase.c:836
14092 +#: builtin/rebase.c:847 builtin/rebase.c:851 builtin/rebase.c:853
14093 msgid "passed to 'git am'"
14094 msgstr ""
14095
14096 -#: builtin/rebase.c:838 builtin/rebase.c:840
14096 +#: builtin/rebase.c:855 builtin/rebase.c:857
14097 msgid "passed to 'git apply'"
14098 msgstr ""
14099
14100 -#: builtin/rebase.c:842 builtin/rebase.c:845
14100 +#: builtin/rebase.c:859 builtin/rebase.c:862
14101 msgid "cherry-pick all commits, even if unchanged"
14102 msgstr ""
14103
14104 -#: builtin/rebase.c:847
14104 +#: builtin/rebase.c:864
14105 msgid "continue"
14106 msgstr ""
14107
14108 -#: builtin/rebase.c:850
14108 +#: builtin/rebase.c:867
14109 msgid "skip current patch and continue"
14110 msgstr ""
14111
14112 -#: builtin/rebase.c:852
14112 +#: builtin/rebase.c:869
14113 msgid "abort and check out the original branch"
14114 msgstr ""
14115
14116 -#: builtin/rebase.c:855
14116 +#: builtin/rebase.c:872
14117 msgid "abort but keep HEAD where it is"
14118 msgstr ""
14119
14120 -#: builtin/rebase.c:856
14120 +#: builtin/rebase.c:873
14121 msgid "edit the todo list during an interactive rebase"
14122 msgstr ""
14123
14124 -#: builtin/rebase.c:859
14124 +#: builtin/rebase.c:876
14125 msgid "show the patch file being applied or merged"
14126 msgstr ""
14127
14128 -#: builtin/rebase.c:862
14128 +#: builtin/rebase.c:879
14129 msgid "use merging strategies to rebase"
14130 msgstr ""
14131
14132 -#: builtin/rebase.c:866
14132 +#: builtin/rebase.c:883
14133 msgid "let the user edit the list of commits to rebase"
14134 msgstr ""
14135
14136 -#: builtin/rebase.c:870
14136 +#: builtin/rebase.c:887
14137 msgid "try to recreate merges instead of ignoring them"
14138 msgstr ""
14139
14140 -#: builtin/rebase.c:874
14141 -msgid "allow rerere to update index with resolved conflict"
14140 +#: builtin/rebase.c:891
14141 +msgid "allow rerere to update index with resolved conflict"
14142 msgstr ""
14143
14144 -#: builtin/rebase.c:877
14144 +#: builtin/rebase.c:894
14145 msgid "preserve empty commits during rebase"
14146 msgstr ""
14147
14148 -#: builtin/rebase.c:879
14148 +#: builtin/rebase.c:896
14149 msgid "move commits that begin with squash!/fixup! under -i"
14150 msgstr ""
14151
14152 -#: builtin/rebase.c:885
14152 +#: builtin/rebase.c:902
14153 msgid "automatically stash/stash pop before and after"
14154 msgstr ""
14155
14156 -#: builtin/rebase.c:887
14156 +#: builtin/rebase.c:904
14157 msgid "add exec lines after each commit of the editable list"
14158 msgstr ""
14159
14160 -#: builtin/rebase.c:891
14160 +#: builtin/rebase.c:908
14161 msgid "allow rebasing commits with empty messages"
14162 msgstr ""
14163
14164 -#: builtin/rebase.c:894
14164 +#: builtin/rebase.c:911
14165 msgid "try to rebase merges instead of skipping them"
14166 msgstr ""
14167
14168 -#: builtin/rebase.c:897
14168 +#: builtin/rebase.c:914
14169 msgid "use 'merge-base --fork-point' to refine upstream"
14170 msgstr ""
14171
14172 -#: builtin/rebase.c:899
14172 +#: builtin/rebase.c:916
14173 msgid "use the given merge strategy"
14174 msgstr ""
14175
14176 -#: builtin/rebase.c:901 builtin/revert.c:111
14176 +#: builtin/rebase.c:918 builtin/revert.c:111
14177 msgid "option"
14178 msgstr ""
14179
14180 -#: builtin/rebase.c:902
14180 +#: builtin/rebase.c:919
14181 msgid "pass the argument through to the merge strategy"
14182 msgstr ""
14183
14184 -#: builtin/rebase.c:905
14184 +#: builtin/rebase.c:922
14185 msgid "rebase all reachable commits up to the root(s)"
14186 msgstr ""
14187
14188 -#: builtin/rebase.c:921
14188 +#: builtin/rebase.c:938
14189 #, c-format
14190 msgid "could not exec %s"
14191 msgstr ""
14192
14193 -#: builtin/rebase.c:939 git-legacy-rebase.sh:213
14193 +#: builtin/rebase.c:956 git-legacy-rebase.sh:213
14194 msgid "It looks like 'git am' is in progress. Cannot rebase."
14195 msgstr ""
14196
14197 -#: builtin/rebase.c:980 git-legacy-rebase.sh:395
14197 +#: builtin/rebase.c:997 git-legacy-rebase.sh:395
14198 msgid "No rebase in progress?"
14199 msgstr ""
14200
14201 -#: builtin/rebase.c:983 git-legacy-rebase.sh:406
14201 +#: builtin/rebase.c:1001 git-legacy-rebase.sh:406
14202 msgid "The --edit-todo action can only be used during interactive rebase."
14203 msgstr ""
14204
14205 -#: builtin/rebase.c:996 git-legacy-rebase.sh:413
14205 +#: builtin/rebase.c:1015 git-legacy-rebase.sh:413
14206 msgid "Cannot read HEAD"
14207 msgstr ""
14208
14209 -#: builtin/rebase.c:1009 git-legacy-rebase.sh:416
14209 +#: builtin/rebase.c:1028 git-legacy-rebase.sh:416
14210 msgid ""
14211 "You must edit all merge conflicts and then\n"
14212 "mark them as resolved using git add"
14213 msgstr ""
14214
14215 -#: builtin/rebase.c:1027
14215 +#: builtin/rebase.c:1047
14216 msgid "could not discard worktree changes"
14217 msgstr ""
14218
14219 -#: builtin/rebase.c:1045
14219 +#: builtin/rebase.c:1066
14220 #, c-format
14221 msgid "could not move back to %s"
14222 msgstr ""
14223
14224 -#: builtin/rebase.c:1056 builtin/rm.c:368
14224 +#: builtin/rebase.c:1077 builtin/rm.c:368
14225 #, c-format
14226 msgid "could not remove '%s'"
14227 msgstr ""
14228
14229 -#: builtin/rebase.c:1082
14229 +#: builtin/rebase.c:1103
14230 #, c-format
14231 msgid ""
14232 "It seems that there is already a %s directory, and\n"
@@ -14239,20 +14239,20 @@ msgid ""
14239 "valuable there.\n"
14240 msgstr ""
14241
14242 -#: builtin/rebase.c:1103
14242 +#: builtin/rebase.c:1124
14243 msgid "switch `C' expects a numerical value"
14244 msgstr ""
14245
14246 -#: builtin/rebase.c:1140
14246 +#: builtin/rebase.c:1161
14247 #, c-format
14248 msgid "Unknown mode: %s"
14249 msgstr ""
14250
14251 -#: builtin/rebase.c:1162
14251 +#: builtin/rebase.c:1183
14252 msgid "--strategy requires --merge or --interactive"
14253 msgstr ""
14254
14255 -#: builtin/rebase.c:1205
14255 +#: builtin/rebase.c:1226
14256 #, c-format
14257 msgid ""
14258 "error: cannot combine interactive options (--interactive, --exec, --rebase-"
@@ -14260,142 +14260,147 @@ msgid ""
14260 "(%s)"
14261 msgstr ""
14262
14263 -#: builtin/rebase.c:1210
14263 +#: builtin/rebase.c:1231
14264 #, c-format
14265 msgid ""
14266 "error: cannot combine merge options (--merge, --strategy, --strategy-option) "
14267 "with am options (%s)"
14268 msgstr ""
14269
14270 -#: builtin/rebase.c:1230 git-legacy-rebase.sh:536
14270 +#: builtin/rebase.c:1251 git-legacy-rebase.sh:536
14271 msgid "error: cannot combine '--preserve-merges' with '--rebase-merges'"
14272 msgstr ""
14273
14274 -#: builtin/rebase.c:1235 git-legacy-rebase.sh:542
14274 +#: builtin/rebase.c:1256 git-legacy-rebase.sh:542
14275 msgid "error: cannot combine '--rebase-merges' with '--strategy-option'"
14276 msgstr ""
14277
14278 -#: builtin/rebase.c:1238 git-legacy-rebase.sh:544
14278 +#: builtin/rebase.c:1259 git-legacy-rebase.sh:544
14279 msgid "error: cannot combine '--rebase-merges' with '--strategy'"
14280 msgstr ""
14281
14282 -#: builtin/rebase.c:1262
14282 +#: builtin/rebase.c:1283
14283 #, c-format
14284 msgid "invalid upstream '%s'"
14285 msgstr ""
14286
14287 -#: builtin/rebase.c:1268
14287 +#: builtin/rebase.c:1289
14288 msgid "Could not create new root commit"
14289 msgstr ""
14290
14291 -#: builtin/rebase.c:1286
14291 +#: builtin/rebase.c:1307
14292 #, c-format
14293 msgid "'%s': need exactly one merge base"
14294 msgstr ""
14295
14296 -#: builtin/rebase.c:1293
14296 +#: builtin/rebase.c:1314
14297 #, c-format
14298 msgid "Does not point to a valid commit '%s'"
14299 msgstr ""
14300
14301 -#: builtin/rebase.c:1318
14301 +#: builtin/rebase.c:1339
14302 #, c-format
14303 msgid "fatal: no such branch/commit '%s'"
14304 msgstr ""
14305
14306 -#: builtin/rebase.c:1326 builtin/submodule--helper.c:37
14306 +#: builtin/rebase.c:1347 builtin/submodule--helper.c:37
14307 #: builtin/submodule--helper.c:1930
14308 #, c-format
14309 msgid "No such ref: %s"
14310 msgstr ""
14311
14312 -#: builtin/rebase.c:1338
14312 +#: builtin/rebase.c:1359
14313 msgid "Could not resolve HEAD to a revision"
14314 msgstr ""
14315
14316 -#: builtin/rebase.c:1378 git-legacy-rebase.sh:665
14316 +#: builtin/rebase.c:1399 git-legacy-rebase.sh:665
14317 msgid "Cannot autostash"
14318 msgstr ""
14319
14320 -#: builtin/rebase.c:1381
14320 +#: builtin/rebase.c:1402
14321 #, c-format
14322 msgid "Unexpected stash response: '%s'"
14323 msgstr ""
14324
14325 -#: builtin/rebase.c:1387
14325 +#: builtin/rebase.c:1408
14326 #, c-format
14327 msgid "Could not create directory for '%s'"
14328 msgstr ""
14329
14330 -#: builtin/rebase.c:1390
14330 +#: builtin/rebase.c:1411
14331 #, c-format
14332 msgid "Created autostash: %s\n"
14333 msgstr ""
14334
14335 -#: builtin/rebase.c:1393
14335 +#: builtin/rebase.c:1414
14336 msgid "could not reset --hard"
14337 msgstr ""
14338
14339 -#: builtin/rebase.c:1394 builtin/reset.c:113
14339 +#: builtin/rebase.c:1415 builtin/reset.c:113
14340 #, c-format
14341 msgid "HEAD is now at %s"
14342 msgstr ""
14343
14344 -#: builtin/rebase.c:1410 git-legacy-rebase.sh:674
14344 +#: builtin/rebase.c:1431 git-legacy-rebase.sh:674
14345 msgid "Please commit or stash them."
14346 msgstr ""
14347
14348 -#: builtin/rebase.c:1437
14348 +#: builtin/rebase.c:1458
14349 #, c-format
14350 msgid "could not parse '%s'"
14351 msgstr ""
14352
14353 -#: builtin/rebase.c:1448
14353 +#: builtin/rebase.c:1470
14354 #, c-format
14355 msgid "could not switch to %s"
14356 msgstr ""
14357
14358 -#: builtin/rebase.c:1459 git-legacy-rebase.sh:697
14358 +#: builtin/rebase.c:1481 git-legacy-rebase.sh:697
14359 #, sh-format
14360 msgid "HEAD is up to date."
14361 msgstr ""
14362
14363 -#: builtin/rebase.c:1461
14363 +#: builtin/rebase.c:1483
14364 #, c-format
14365 msgid "Current branch %s is up to date.\n"
14366 msgstr ""
14367
14368 -#: builtin/rebase.c:1469 git-legacy-rebase.sh:707
14368 +#: builtin/rebase.c:1491 git-legacy-rebase.sh:707
14369 #, sh-format
14370 msgid "HEAD is up to date, rebase forced."
14371 msgstr ""
14372
14373 -#: builtin/rebase.c:1471
14373 +#: builtin/rebase.c:1493
14374 #, c-format
14375 msgid "Current branch %s is up to date, rebase forced.\n"
14376 msgstr ""
14377
14378 -#: builtin/rebase.c:1479 git-legacy-rebase.sh:208
14378 +#: builtin/rebase.c:1501 git-legacy-rebase.sh:208
14379 msgid "The pre-rebase hook refused to rebase."
14380 msgstr ""
14381
14382 -#: builtin/rebase.c:1485
14382 +#: builtin/rebase.c:1508
14383 +#, c-format
14384 +msgid "Changes to %s:\n"
14385 +msgstr ""
14386 +
14387 +#: builtin/rebase.c:1511
14388 #, c-format
14389 msgid "Changes from %s to %s:\n"
14390 msgstr ""
14391
14387 -#: builtin/rebase.c:1508
14392 +#: builtin/rebase.c:1536
14393 #, c-format
14394 msgid "First, rewinding head to replay your work on top of it...\n"
14395 msgstr ""
14396
14392 -#: builtin/rebase.c:1514
14397 +#: builtin/rebase.c:1543
14398 msgid "Could not detach HEAD"
14399 msgstr ""
14400
14396 -#: builtin/rebase.c:1523
14401 +#: builtin/rebase.c:1552
14402 #, c-format
14398 -msgid "Fast-forwarded %s to %s. \n"
14403 +msgid "Fast-forwarded %s to %s.\n"
14404 msgstr ""
14405
14406 #: builtin/rebase--interactive.c:24
@@ -15367,78 +15372,78 @@ msgstr ""
15372 msgid "new commit is the same as the old one: '%s'"
15373 msgstr ""
15374
15370 -#: builtin/replace.c:514
15375 +#: builtin/replace.c:515
15376 #, c-format
15377 msgid ""
15378 "could not convert the following graft(s):\n"
15379 "%s"
15380 msgstr ""
15381
15377 -#: builtin/replace.c:535
15382 +#: builtin/replace.c:536
15383 msgid "list replace refs"
15384 msgstr ""
15385
15381 -#: builtin/replace.c:536
15386 +#: builtin/replace.c:537
15387 msgid "delete replace refs"
15388 msgstr ""
15389
15385 -#: builtin/replace.c:537
15390 +#: builtin/replace.c:538
15391 msgid "edit existing object"
15392 msgstr ""
15393
15389 -#: builtin/replace.c:538
15394 +#: builtin/replace.c:539
15395 msgid "change a commit's parents"
15396 msgstr ""
15397
15393 -#: builtin/replace.c:539
15398 +#: builtin/replace.c:540
15399 msgid "convert existing graft file"
15400 msgstr ""
15401
15397 -#: builtin/replace.c:540
15402 +#: builtin/replace.c:541
15403 msgid "replace the ref if it exists"
15404 msgstr ""
15405
15401 -#: builtin/replace.c:542
15406 +#: builtin/replace.c:543
15407 msgid "do not pretty-print contents for --edit"
15408 msgstr ""
15409
15405 -#: builtin/replace.c:543
15410 +#: builtin/replace.c:544
15411 msgid "use this format"
15412 msgstr ""
15413
15409 -#: builtin/replace.c:556
15414 +#: builtin/replace.c:557
15415 msgid "--format cannot be used when not listing"
15416 msgstr ""
15417
15413 -#: builtin/replace.c:564
15418 +#: builtin/replace.c:565
15419 msgid "-f only makes sense when writing a replacement"
15420 msgstr ""
15421
15417 -#: builtin/replace.c:568
15422 +#: builtin/replace.c:569
15423 msgid "--raw only makes sense with --edit"
15424 msgstr ""
15425
15421 -#: builtin/replace.c:574
15426 +#: builtin/replace.c:575
15427 msgid "-d needs at least one argument"
15428 msgstr ""
15429
15425 -#: builtin/replace.c:580
15430 +#: builtin/replace.c:581
15431 msgid "bad number of arguments"
15432 msgstr ""
15433
15429 -#: builtin/replace.c:586
15434 +#: builtin/replace.c:587
15435 msgid "-e needs exactly one argument"
15436 msgstr ""
15437
15433 -#: builtin/replace.c:592
15438 +#: builtin/replace.c:593
15439 msgid "-g needs at least one argument"
15440 msgstr ""
15441
15437 -#: builtin/replace.c:598
15442 +#: builtin/replace.c:599
15443 msgid "--convert-graft-file takes no argument"
15444 msgstr ""
15445
15441 -#: builtin/replace.c:604
15446 +#: builtin/replace.c:605
15447 msgid "only one pattern can be given with -l"
15448 msgstr ""
15449
@@ -18335,16 +18340,21 @@ msgstr ""
18340 msgid "Current branch $branch_name is up to date, rebase forced."
18341 msgstr ""
18342
18338 -#: git-legacy-rebase.sh:721
18343 +#: git-legacy-rebase.sh:723
18344 +#, sh-format
18345 +msgid "Changes to $onto:"
18346 +msgstr ""
18347 +
18348 +#: git-legacy-rebase.sh:725
18349 #, sh-format
18350 msgid "Changes from $mb to $onto:"
18351 msgstr ""
18352
18343 -#: git-legacy-rebase.sh:730
18353 +#: git-legacy-rebase.sh:736
18354 msgid "First, rewinding head to replay your work on top of it..."
18355 msgstr ""
18356
18347 -#: git-legacy-rebase.sh:740
18357 +#: git-legacy-rebase.sh:746
18358 #, sh-format
18359 msgid "Fast-forwarded $branch_name to $onto_name."
18360 msgstr ""