@matheusbsbs / matheus-bagliano / commits / 36dd6933bd

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

Generate po/git.pot from v2.20.0-rc1-10-g7068cbc4ab for git v2.20.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Dec 1, 2018 at 16:15 UTC 36dd6933bd1df5971141dc128801b8b42beee1b0
1 file changed +195 -195
po/git.pot
+195 -195
@@ -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-11-20 10:05+0800\n"
11 +"POT-Creation-Date: 2018-12-01 16:14+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:3310 builtin/rebase.c:839
658 +#: builtin/pack-objects.c:3312 builtin/rebase.c:840
659 msgid "action"
660 msgstr ""
661
@@ -1000,7 +1000,7 @@ msgstr ""
1000 #: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963
1001 #: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932
1002 #: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406
1003 -#: builtin/pack-objects.c:3135 builtin/pack-objects.c:3150
1003 +#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152
1004 #: builtin/shortlog.c:192
1005 msgid "revision walk setup failed"
1006 msgstr ""
@@ -1534,7 +1534,7 @@ msgstr ""
1534 msgid "must be one of nothing, matching, simple, upstream or current"
1535 msgstr ""
1536
1537 -#: config.c:1481 builtin/pack-objects.c:3389
1537 +#: config.c:1481 builtin/pack-objects.c:3391
1538 #, c-format
1539 msgid "bad pack compression level %d"
1540 msgstr ""
@@ -1582,87 +1582,87 @@ msgstr ""
1582 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
1583 msgstr ""
1584
1585 -#: config.c:2319
1585 +#: config.c:2322
1586 #, c-format
1587 msgid "unable to parse '%s' from command-line config"
1588 msgstr ""
1589
1590 -#: config.c:2321
1590 +#: config.c:2324
1591 #, c-format
1592 msgid "bad config variable '%s' in file '%s' at line %d"
1593 msgstr ""
1594
1595 -#: config.c:2402
1595 +#: config.c:2405
1596 #, c-format
1597 msgid "invalid section name '%s'"
1598 msgstr ""
1599
1600 -#: config.c:2434
1600 +#: config.c:2437
1601 #, c-format
1602 msgid "%s has multiple values"
1603 msgstr ""
1604
1605 -#: config.c:2463
1605 +#: config.c:2466
1606 #, c-format
1607 msgid "failed to write new configuration file %s"
1608 msgstr ""
1609
1610 -#: config.c:2714 config.c:3038
1610 +#: config.c:2717 config.c:3041
1611 #, c-format
1612 msgid "could not lock config file %s"
1613 msgstr ""
1614
1615 -#: config.c:2725
1615 +#: config.c:2728
1616 #, c-format
1617 msgid "opening %s"
1618 msgstr ""
1619
1620 -#: config.c:2760 builtin/config.c:327
1620 +#: config.c:2763 builtin/config.c:327
1621 #, c-format
1622 msgid "invalid pattern: %s"
1623 msgstr ""
1624
1625 -#: config.c:2785
1625 +#: config.c:2788
1626 #, c-format
1627 msgid "invalid config file %s"
1628 msgstr ""
1629
1630 -#: config.c:2798 config.c:3051
1630 +#: config.c:2801 config.c:3054
1631 #, c-format
1632 msgid "fstat on %s failed"
1633 msgstr ""
1634
1635 -#: config.c:2809
1635 +#: config.c:2812
1636 #, c-format
1637 msgid "unable to mmap '%s'"
1638 msgstr ""
1639
1640 -#: config.c:2818 config.c:3056
1640 +#: config.c:2821 config.c:3059
1641 #, c-format
1642 msgid "chmod on %s failed"
1643 msgstr ""
1644
1645 -#: config.c:2903 config.c:3153
1645 +#: config.c:2906 config.c:3156
1646 #, c-format
1647 msgid "could not write config file %s"
1648 msgstr ""
1649
1650 -#: config.c:2937
1650 +#: config.c:2940
1651 #, c-format
1652 msgid "could not set '%s' to '%s'"
1653 msgstr ""
1654
1655 -#: config.c:2939 builtin/remote.c:782
1655 +#: config.c:2942 builtin/remote.c:782
1656 #, c-format
1657 msgid "could not unset '%s'"
1658 msgstr ""
1659
1660 -#: config.c:3029
1660 +#: config.c:3032
1661 #, c-format
1662 msgid "invalid section name: %s"
1663 msgstr ""
1664
1665 -#: config.c:3196
1665 +#: config.c:3199
1666 #, c-format
1667 msgid "missing value for '%s'"
1668 msgstr ""
@@ -3137,7 +3137,7 @@ msgstr ""
3137
3138 #: midx.c:205
3139 #, c-format
3140 -msgid "bad pack-int-id: %u (%u total packs"
3140 +msgid "bad pack-int-id: %u (%u total packs)"
3141 msgstr ""
3142
3143 #: midx.c:246
@@ -3514,32 +3514,32 @@ msgstr ""
3514 msgid "unable to join load_cache_entries thread: %s"
3515 msgstr ""
3516
3517 -#: read-cache.c:2200
3517 +#: read-cache.c:2201
3518 #, c-format
3519 msgid "unable to create load_index_extensions thread: %s"
3520 msgstr ""
3521
3522 -#: read-cache.c:2227
3522 +#: read-cache.c:2228
3523 #, c-format
3524 msgid "unable to join load_index_extensions thread: %s"
3525 msgstr ""
3526
3527 -#: read-cache.c:2953 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086
3527 +#: read-cache.c:2982 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086
3528 #, c-format
3529 msgid "could not close '%s'"
3530 msgstr ""
3531
3532 -#: read-cache.c:3026 sequencer.c:2203 sequencer.c:3592
3532 +#: read-cache.c:3055 sequencer.c:2203 sequencer.c:3592
3533 #, c-format
3534 msgid "could not stat '%s'"
3535 msgstr ""
3536
3537 -#: read-cache.c:3039
3537 +#: read-cache.c:3068
3538 #, c-format
3539 msgid "unable to open git dir: %s"
3540 msgstr ""
3541
3542 -#: read-cache.c:3051
3542 +#: read-cache.c:3080
3543 #, c-format
3544 msgid "unable to unlink: %s"
3545 msgstr ""
@@ -3701,18 +3701,18 @@ msgstr ""
3701 msgid "cannot process '%s' and '%s' at the same time"
3702 msgstr ""
3703
3704 -#: refs/files-backend.c:1227
3704 +#: refs/files-backend.c:1228
3705 #, c-format
3706 msgid "could not remove reference %s"
3707 msgstr ""
3708
3709 -#: refs/files-backend.c:1241 refs/packed-backend.c:1532
3709 +#: refs/files-backend.c:1242 refs/packed-backend.c:1532
3710 #: refs/packed-backend.c:1542
3711 #, c-format
3712 msgid "could not delete reference %s: %s"
3713 msgstr ""
3714
3715 -#: refs/files-backend.c:1244 refs/packed-backend.c:1545
3715 +#: refs/files-backend.c:1245 refs/packed-backend.c:1545
3716 #, c-format
3717 msgid "could not delete references: %s"
3718 msgstr ""
@@ -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:999
4788 -#: builtin/rebase.c:1350 builtin/rebase.c:1404
4787 +#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1000
4788 +#: builtin/rebase.c:1351 builtin/rebase.c:1405
4789 msgid "could not read index"
4790 msgstr ""
4791
@@ -4827,12 +4827,12 @@ msgstr ""
4827 msgid "writing squash-onto"
4828 msgstr ""
4829
4830 -#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:590
4830 +#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:591
4831 #, c-format
4832 msgid "failed to find tree of %s"
4833 msgstr ""
4834
4835 -#: sequencer.c:3015 builtin/rebase.c:603
4835 +#: sequencer.c:3015 builtin/rebase.c:604
4836 msgid "could not write index"
4837 msgstr ""
4838
@@ -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:836
7086 +#: builtin/pull.c:151 builtin/pull.c:209 builtin/rebase.c:837
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
@@ -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:880 builtin/rebase--interactive.c:183
7139 +#: builtin/pull.c:184 builtin/rebase.c:881 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:881 builtin/rebase--interactive.c:184
7144 +#: builtin/am.c:2254 builtin/rebase.c:882 builtin/rebase--interactive.c:184
7145 msgid "GPG-sign commits"
7146 msgstr ""
7147
@@ -8576,7 +8576,7 @@ msgid "use --reference only while cloning"
8576 msgstr ""
8577
8578 #: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:46
8579 -#: builtin/pack-objects.c:3299 builtin/repack.c:329
8579 +#: builtin/pack-objects.c:3301 builtin/repack.c:329
8580 msgid "name"
8581 msgstr ""
8582
@@ -8601,7 +8601,7 @@ msgstr ""
8601 msgid "create a shallow clone of that depth"
8602 msgstr ""
8603
8604 -#: builtin/clone.c:125 builtin/fetch.c:144 builtin/pack-objects.c:3290
8604 +#: builtin/clone.c:125 builtin/fetch.c:144 builtin/pack-objects.c:3292
8605 msgid "time"
8606 msgstr ""
8607
@@ -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:813
8613 +#: builtin/rebase.c:814
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:892
9165 +#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/rebase.c:893
9166 #: builtin/tag.c:400
9167 msgid "mode"
9168 msgstr ""
@@ -10830,7 +10830,7 @@ msgstr ""
10830 msgid "invalid option combination, ignoring --threads"
10831 msgstr ""
10832
10833 -#: builtin/grep.c:1054 builtin/pack-objects.c:3395
10833 +#: builtin/grep.c:1054 builtin/pack-objects.c:3397
10834 msgid "no threads support, ignoring --threads"
10835 msgstr ""
10836
@@ -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:885
11981 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:886
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:898 builtin/rebase--interactive.c:186 builtin/revert.c:110
12126 +#: builtin/rebase.c:899 builtin/rebase--interactive.c:186 builtin/revert.c:110
12127 msgid "strategy"
12128 msgstr ""
12129
@@ -13207,234 +13207,234 @@ msgid ""
13207 " %s"
13208 msgstr ""
13209
13210 -#: builtin/pack-objects.c:2855
13210 +#: builtin/pack-objects.c:2857
13211 msgid "invalid value for --missing"
13212 msgstr ""
13213
13214 -#: builtin/pack-objects.c:2914 builtin/pack-objects.c:3022
13214 +#: builtin/pack-objects.c:2916 builtin/pack-objects.c:3024
13215 msgid "cannot open pack index"
13216 msgstr ""
13217
13218 -#: builtin/pack-objects.c:2945
13218 +#: builtin/pack-objects.c:2947
13219 #, c-format
13220 msgid "loose object at %s could not be examined"
13221 msgstr ""
13222
13223 -#: builtin/pack-objects.c:3030
13223 +#: builtin/pack-objects.c:3032
13224 msgid "unable to force loose object"
13225 msgstr ""
13226
13227 -#: builtin/pack-objects.c:3120
13227 +#: builtin/pack-objects.c:3122
13228 #, c-format
13229 msgid "not a rev '%s'"
13230 msgstr ""
13231
13232 -#: builtin/pack-objects.c:3123
13232 +#: builtin/pack-objects.c:3125
13233 #, c-format
13234 msgid "bad revision '%s'"
13235 msgstr ""
13236
13237 -#: builtin/pack-objects.c:3148
13237 +#: builtin/pack-objects.c:3150
13238 msgid "unable to add recent objects"
13239 msgstr ""
13240
13241 -#: builtin/pack-objects.c:3201
13241 +#: builtin/pack-objects.c:3203
13242 #, c-format
13243 msgid "unsupported index version %s"
13244 msgstr ""
13245
13246 -#: builtin/pack-objects.c:3205
13246 +#: builtin/pack-objects.c:3207
13247 #, c-format
13248 msgid "bad index version '%s'"
13249 msgstr ""
13250
13251 -#: builtin/pack-objects.c:3235
13251 +#: builtin/pack-objects.c:3237
13252 msgid "do not show progress meter"
13253 msgstr ""
13254
13255 -#: builtin/pack-objects.c:3237
13255 +#: builtin/pack-objects.c:3239
13256 msgid "show progress meter"
13257 msgstr ""
13258
13259 -#: builtin/pack-objects.c:3239
13259 +#: builtin/pack-objects.c:3241
13260 msgid "show progress meter during object writing phase"
13261 msgstr ""
13262
13263 -#: builtin/pack-objects.c:3242
13263 +#: builtin/pack-objects.c:3244
13264 msgid "similar to --all-progress when progress meter is shown"
13265 msgstr ""
13266
13267 -#: builtin/pack-objects.c:3243
13267 +#: builtin/pack-objects.c:3245
13268 msgid "<version>[,<offset>]"
13269 msgstr ""
13270
13271 -#: builtin/pack-objects.c:3244
13271 +#: builtin/pack-objects.c:3246
13272 msgid "write the pack index file in the specified idx format version"
13273 msgstr ""
13274
13275 -#: builtin/pack-objects.c:3247
13275 +#: builtin/pack-objects.c:3249
13276 msgid "maximum size of each output pack file"
13277 msgstr ""
13278
13279 -#: builtin/pack-objects.c:3249
13279 +#: builtin/pack-objects.c:3251
13280 msgid "ignore borrowed objects from alternate object store"
13281 msgstr ""
13282
13283 -#: builtin/pack-objects.c:3251
13283 +#: builtin/pack-objects.c:3253
13284 msgid "ignore packed objects"
13285 msgstr ""
13286
13287 -#: builtin/pack-objects.c:3253
13287 +#: builtin/pack-objects.c:3255
13288 msgid "limit pack window by objects"
13289 msgstr ""
13290
13291 -#: builtin/pack-objects.c:3255
13291 +#: builtin/pack-objects.c:3257
13292 msgid "limit pack window by memory in addition to object limit"
13293 msgstr ""
13294
13295 -#: builtin/pack-objects.c:3257
13295 +#: builtin/pack-objects.c:3259
13296 msgid "maximum length of delta chain allowed in the resulting pack"
13297 msgstr ""
13298
13299 -#: builtin/pack-objects.c:3259
13299 +#: builtin/pack-objects.c:3261
13300 msgid "reuse existing deltas"
13301 msgstr ""
13302
13303 -#: builtin/pack-objects.c:3261
13303 +#: builtin/pack-objects.c:3263
13304 msgid "reuse existing objects"
13305 msgstr ""
13306
13307 -#: builtin/pack-objects.c:3263
13307 +#: builtin/pack-objects.c:3265
13308 msgid "use OFS_DELTA objects"
13309 msgstr ""
13310
13311 -#: builtin/pack-objects.c:3265
13311 +#: builtin/pack-objects.c:3267
13312 msgid "use threads when searching for best delta matches"
13313 msgstr ""
13314
13315 -#: builtin/pack-objects.c:3267
13315 +#: builtin/pack-objects.c:3269
13316 msgid "do not create an empty pack output"
13317 msgstr ""
13318
13319 -#: builtin/pack-objects.c:3269
13319 +#: builtin/pack-objects.c:3271
13320 msgid "read revision arguments from standard input"
13321 msgstr ""
13322
13323 -#: builtin/pack-objects.c:3271
13323 +#: builtin/pack-objects.c:3273
13324 msgid "limit the objects to those that are not yet packed"
13325 msgstr ""
13326
13327 -#: builtin/pack-objects.c:3274
13327 +#: builtin/pack-objects.c:3276
13328 msgid "include objects reachable from any reference"
13329 msgstr ""
13330
13331 -#: builtin/pack-objects.c:3277
13331 +#: builtin/pack-objects.c:3279
13332 msgid "include objects referred by reflog entries"
13333 msgstr ""
13334
13335 -#: builtin/pack-objects.c:3280
13335 +#: builtin/pack-objects.c:3282
13336 msgid "include objects referred to by the index"
13337 msgstr ""
13338
13339 -#: builtin/pack-objects.c:3283
13339 +#: builtin/pack-objects.c:3285
13340 msgid "output pack to stdout"
13341 msgstr ""
13342
13343 -#: builtin/pack-objects.c:3285
13343 +#: builtin/pack-objects.c:3287
13344 msgid "include tag objects that refer to objects to be packed"
13345 msgstr ""
13346
13347 -#: builtin/pack-objects.c:3287
13347 +#: builtin/pack-objects.c:3289
13348 msgid "keep unreachable objects"
13349 msgstr ""
13350
13351 -#: builtin/pack-objects.c:3289
13351 +#: builtin/pack-objects.c:3291
13352 msgid "pack loose unreachable objects"
13353 msgstr ""
13354
13355 -#: builtin/pack-objects.c:3291
13355 +#: builtin/pack-objects.c:3293
13356 msgid "unpack unreachable objects newer than <time>"
13357 msgstr ""
13358
13359 -#: builtin/pack-objects.c:3294
13359 +#: builtin/pack-objects.c:3296
13360 msgid "create thin packs"
13361 msgstr ""
13362
13363 -#: builtin/pack-objects.c:3296
13363 +#: builtin/pack-objects.c:3298
13364 msgid "create packs suitable for shallow fetches"
13365 msgstr ""
13366
13367 -#: builtin/pack-objects.c:3298
13367 +#: builtin/pack-objects.c:3300
13368 msgid "ignore packs that have companion .keep file"
13369 msgstr ""
13370
13371 -#: builtin/pack-objects.c:3300
13371 +#: builtin/pack-objects.c:3302
13372 msgid "ignore this pack"
13373 msgstr ""
13374
13375 -#: builtin/pack-objects.c:3302
13375 +#: builtin/pack-objects.c:3304
13376 msgid "pack compression level"
13377 msgstr ""
13378
13379 -#: builtin/pack-objects.c:3304
13379 +#: builtin/pack-objects.c:3306
13380 msgid "do not hide commits by grafts"
13381 msgstr ""
13382
13383 -#: builtin/pack-objects.c:3306
13383 +#: builtin/pack-objects.c:3308
13384 msgid "use a bitmap index if available to speed up counting objects"
13385 msgstr ""
13386
13387 -#: builtin/pack-objects.c:3308
13387 +#: builtin/pack-objects.c:3310
13388 msgid "write a bitmap index together with the pack index"
13389 msgstr ""
13390
13391 -#: builtin/pack-objects.c:3311
13391 +#: builtin/pack-objects.c:3313
13392 msgid "handling for missing objects"
13393 msgstr ""
13394
13395 -#: builtin/pack-objects.c:3314
13395 +#: builtin/pack-objects.c:3316
13396 msgid "do not pack objects in promisor packfiles"
13397 msgstr ""
13398
13399 -#: builtin/pack-objects.c:3316
13399 +#: builtin/pack-objects.c:3318
13400 msgid "respect islands during delta compression"
13401 msgstr ""
13402
13403 -#: builtin/pack-objects.c:3340
13403 +#: builtin/pack-objects.c:3342
13404 #, c-format
13405 msgid "delta chain depth %d is too deep, forcing %d"
13406 msgstr ""
13407
13408 -#: builtin/pack-objects.c:3345
13408 +#: builtin/pack-objects.c:3347
13409 #, c-format
13410 msgid "pack.deltaCacheLimit is too high, forcing %d"
13411 msgstr ""
13412
13413 -#: builtin/pack-objects.c:3399
13413 +#: builtin/pack-objects.c:3401
13414 msgid "--max-pack-size cannot be used to build a pack for transfer"
13415 msgstr ""
13416
13417 -#: builtin/pack-objects.c:3401
13417 +#: builtin/pack-objects.c:3403
13418 msgid "minimum pack size limit is 1 MiB"
13419 msgstr ""
13420
13421 -#: builtin/pack-objects.c:3406
13421 +#: builtin/pack-objects.c:3408
13422 msgid "--thin cannot be used to build an indexable pack"
13423 msgstr ""
13424
13425 -#: builtin/pack-objects.c:3409
13425 +#: builtin/pack-objects.c:3411
13426 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
13427 msgstr ""
13428
13429 -#: builtin/pack-objects.c:3415
13429 +#: builtin/pack-objects.c:3417
13430 msgid "cannot use --filter without --stdout"
13431 msgstr ""
13432
13433 -#: builtin/pack-objects.c:3474
13433 +#: builtin/pack-objects.c:3476
13434 msgid "Enumerating objects"
13435 msgstr ""
13436
13437 -#: builtin/pack-objects.c:3493
13437 +#: builtin/pack-objects.c:3495
13438 #, c-format
13439 msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
13440 msgstr ""
@@ -13550,7 +13550,7 @@ msgid ""
13550 "for your current branch, you must specify a branch on the command line."
13551 msgstr ""
13552
13553 -#: builtin/pull.c:432 builtin/rebase.c:760 git-parse-remote.sh:73
13553 +#: builtin/pull.c:432 builtin/rebase.c:761 git-parse-remote.sh:73
13554 msgid "You are not currently on a branch."
13555 msgstr ""
13556
@@ -13567,16 +13567,16 @@ msgid "See git-pull(1) for details."
13567 msgstr ""
13568
13569 #: builtin/pull.c:439 builtin/pull.c:445 builtin/pull.c:454
13570 -#: builtin/rebase.c:766 git-parse-remote.sh:64
13570 +#: builtin/rebase.c:767 git-parse-remote.sh:64
13571 msgid "<remote>"
13572 msgstr ""
13573
13574 #: builtin/pull.c:439 builtin/pull.c:454 builtin/pull.c:459
13575 -#: git-legacy-rebase.sh:548 git-parse-remote.sh:65
13575 +#: git-legacy-rebase.sh:556 git-parse-remote.sh:65
13576 msgid "<branch>"
13577 msgstr ""
13578
13579 -#: builtin/pull.c:447 builtin/rebase.c:758 git-parse-remote.sh:75
13579 +#: builtin/pull.c:447 builtin/rebase.c:759 git-parse-remote.sh:75
13580 msgid "There is no tracking information for the current branch."
13581 msgstr ""
13582
@@ -14045,7 +14045,7 @@ msgstr ""
14045 msgid "could not determine HEAD revision"
14046 msgstr ""
14047
14048 -#: builtin/rebase.c:752
14048 +#: builtin/rebase.c:753
14049 #, c-format
14050 msgid ""
14051 "%s\n"
@@ -14056,7 +14056,7 @@ msgid ""
14056 "\n"
14057 msgstr ""
14058
14059 -#: builtin/rebase.c:768
14059 +#: builtin/rebase.c:769
14060 #, c-format
14061 msgid ""
14062 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -14065,168 +14065,168 @@ msgid ""
14065 "\n"
14066 msgstr ""
14067
14068 -#: builtin/rebase.c:814
14068 +#: builtin/rebase.c:815
14069 msgid "rebase onto given branch instead of upstream"
14070 msgstr ""
14071
14072 -#: builtin/rebase.c:816
14072 +#: builtin/rebase.c:817
14073 msgid "allow pre-rebase hook to run"
14074 msgstr ""
14075
14076 -#: builtin/rebase.c:818
14076 +#: builtin/rebase.c:819
14077 msgid "be quiet. implies --no-stat"
14078 msgstr ""
14079
14080 -#: builtin/rebase.c:821
14080 +#: builtin/rebase.c:822
14081 msgid "display a diffstat of what changed upstream"
14082 msgstr ""
14083
14084 -#: builtin/rebase.c:824
14084 +#: builtin/rebase.c:825
14085 msgid "do not show diffstat of what changed upstream"
14086 msgstr ""
14087
14088 -#: builtin/rebase.c:827
14088 +#: builtin/rebase.c:828
14089 msgid "add a Signed-off-by: line to each commit"
14090 msgstr ""
14091
14092 -#: builtin/rebase.c:829 builtin/rebase.c:833 builtin/rebase.c:835
14092 +#: builtin/rebase.c:830 builtin/rebase.c:834 builtin/rebase.c:836
14093 msgid "passed to 'git am'"
14094 msgstr ""
14095
14096 -#: builtin/rebase.c:837 builtin/rebase.c:839
14096 +#: builtin/rebase.c:838 builtin/rebase.c:840
14097 msgid "passed to 'git apply'"
14098 msgstr ""
14099
14100 -#: builtin/rebase.c:841 builtin/rebase.c:844
14100 +#: builtin/rebase.c:842 builtin/rebase.c:845
14101 msgid "cherry-pick all commits, even if unchanged"
14102 msgstr ""
14103
14104 -#: builtin/rebase.c:846
14104 +#: builtin/rebase.c:847
14105 msgid "continue"
14106 msgstr ""
14107
14108 -#: builtin/rebase.c:849
14108 +#: builtin/rebase.c:850
14109 msgid "skip current patch and continue"
14110 msgstr ""
14111
14112 -#: builtin/rebase.c:851
14112 +#: builtin/rebase.c:852
14113 msgid "abort and check out the original branch"
14114 msgstr ""
14115
14116 -#: builtin/rebase.c:854
14116 +#: builtin/rebase.c:855
14117 msgid "abort but keep HEAD where it is"
14118 msgstr ""
14119
14120 -#: builtin/rebase.c:855
14120 +#: builtin/rebase.c:856
14121 msgid "edit the todo list during an interactive rebase"
14122 msgstr ""
14123
14124 -#: builtin/rebase.c:858
14124 +#: builtin/rebase.c:859
14125 msgid "show the patch file being applied or merged"
14126 msgstr ""
14127
14128 -#: builtin/rebase.c:861
14128 +#: builtin/rebase.c:862
14129 msgid "use merging strategies to rebase"
14130 msgstr ""
14131
14132 -#: builtin/rebase.c:865
14132 +#: builtin/rebase.c:866
14133 msgid "let the user edit the list of commits to rebase"
14134 msgstr ""
14135
14136 -#: builtin/rebase.c:869
14136 +#: builtin/rebase.c:870
14137 msgid "try to recreate merges instead of ignoring them"
14138 msgstr ""
14139
14140 -#: builtin/rebase.c:873
14140 +#: builtin/rebase.c:874
14141 msgid "allow rerere to update index with resolved conflict"
14142 msgstr ""
14143
14144 -#: builtin/rebase.c:876
14144 +#: builtin/rebase.c:877
14145 msgid "preserve empty commits during rebase"
14146 msgstr ""
14147
14148 -#: builtin/rebase.c:878
14148 +#: builtin/rebase.c:879
14149 msgid "move commits that begin with squash!/fixup! under -i"
14150 msgstr ""
14151
14152 -#: builtin/rebase.c:884
14152 +#: builtin/rebase.c:885
14153 msgid "automatically stash/stash pop before and after"
14154 msgstr ""
14155
14156 -#: builtin/rebase.c:886
14156 +#: builtin/rebase.c:887
14157 msgid "add exec lines after each commit of the editable list"
14158 msgstr ""
14159
14160 -#: builtin/rebase.c:890
14160 +#: builtin/rebase.c:891
14161 msgid "allow rebasing commits with empty messages"
14162 msgstr ""
14163
14164 -#: builtin/rebase.c:893
14164 +#: builtin/rebase.c:894
14165 msgid "try to rebase merges instead of skipping them"
14166 msgstr ""
14167
14168 -#: builtin/rebase.c:896
14168 +#: builtin/rebase.c:897
14169 msgid "use 'merge-base --fork-point' to refine upstream"
14170 msgstr ""
14171
14172 -#: builtin/rebase.c:898
14172 +#: builtin/rebase.c:899
14173 msgid "use the given merge strategy"
14174 msgstr ""
14175
14176 -#: builtin/rebase.c:900 builtin/revert.c:111
14176 +#: builtin/rebase.c:901 builtin/revert.c:111
14177 msgid "option"
14178 msgstr ""
14179
14180 -#: builtin/rebase.c:901
14180 +#: builtin/rebase.c:902
14181 msgid "pass the argument through to the merge strategy"
14182 msgstr ""
14183
14184 -#: builtin/rebase.c:904
14184 +#: builtin/rebase.c:905
14185 msgid "rebase all reachable commits up to the root(s)"
14186 msgstr ""
14187
14188 -#: builtin/rebase.c:920
14188 +#: builtin/rebase.c:921
14189 #, c-format
14190 msgid "could not exec %s"
14191 msgstr ""
14192
14193 -#: builtin/rebase.c:938 git-legacy-rebase.sh:213
14193 +#: builtin/rebase.c:939 git-legacy-rebase.sh:213
14194 msgid "It looks like 'git am' is in progress. Cannot rebase."
14195 msgstr ""
14196
14197 -#: builtin/rebase.c:979 git-legacy-rebase.sh:387
14197 +#: builtin/rebase.c:980 git-legacy-rebase.sh:395
14198 msgid "No rebase in progress?"
14199 msgstr ""
14200
14201 -#: builtin/rebase.c:982 git-legacy-rebase.sh:398
14201 +#: builtin/rebase.c:983 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:995 git-legacy-rebase.sh:405
14205 +#: builtin/rebase.c:996 git-legacy-rebase.sh:413
14206 msgid "Cannot read HEAD"
14207 msgstr ""
14208
14209 -#: builtin/rebase.c:1008 git-legacy-rebase.sh:408
14209 +#: builtin/rebase.c:1009 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:1026
14215 +#: builtin/rebase.c:1027
14216 msgid "could not discard worktree changes"
14217 msgstr ""
14218
14219 -#: builtin/rebase.c:1044
14219 +#: builtin/rebase.c:1045
14220 #, c-format
14221 msgid "could not move back to %s"
14222 msgstr ""
14223
14224 -#: builtin/rebase.c:1055 builtin/rm.c:368
14224 +#: builtin/rebase.c:1056 builtin/rm.c:368
14225 #, c-format
14226 msgid "could not remove '%s'"
14227 msgstr ""
14228
14229 -#: builtin/rebase.c:1081
14229 +#: builtin/rebase.c:1082
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:1102
14242 +#: builtin/rebase.c:1103
14243 msgid "switch `C' expects a numerical value"
14244 msgstr ""
14245
14246 -#: builtin/rebase.c:1139
14246 +#: builtin/rebase.c:1140
14247 #, c-format
14248 msgid "Unknown mode: %s"
14249 msgstr ""
14250
14251 -#: builtin/rebase.c:1161
14251 +#: builtin/rebase.c:1162
14252 msgid "--strategy requires --merge or --interactive"
14253 msgstr ""
14254
14255 -#: builtin/rebase.c:1204
14255 +#: builtin/rebase.c:1205
14256 #, c-format
14257 msgid ""
14258 "error: cannot combine interactive options (--interactive, --exec, --rebase-"
@@ -14260,140 +14260,140 @@ msgid ""
14260 "(%s)"
14261 msgstr ""
14262
14263 -#: builtin/rebase.c:1209
14263 +#: builtin/rebase.c:1210
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:1229 git-legacy-rebase.sh:528
14270 +#: builtin/rebase.c:1230 git-legacy-rebase.sh:536
14271 msgid "error: cannot combine '--preserve-merges' with '--rebase-merges'"
14272 msgstr ""
14273
14274 -#: builtin/rebase.c:1234 git-legacy-rebase.sh:534
14274 +#: builtin/rebase.c:1235 git-legacy-rebase.sh:542
14275 msgid "error: cannot combine '--rebase-merges' with '--strategy-option'"
14276 msgstr ""
14277
14278 -#: builtin/rebase.c:1237 git-legacy-rebase.sh:536
14278 +#: builtin/rebase.c:1238 git-legacy-rebase.sh:544
14279 msgid "error: cannot combine '--rebase-merges' with '--strategy'"
14280 msgstr ""
14281
14282 -#: builtin/rebase.c:1261
14282 +#: builtin/rebase.c:1262
14283 #, c-format
14284 msgid "invalid upstream '%s'"
14285 msgstr ""
14286
14287 -#: builtin/rebase.c:1267
14287 +#: builtin/rebase.c:1268
14288 msgid "Could not create new root commit"
14289 msgstr ""
14290
14291 -#: builtin/rebase.c:1285
14291 +#: builtin/rebase.c:1286
14292 #, c-format
14293 msgid "'%s': need exactly one merge base"
14294 msgstr ""
14295
14296 -#: builtin/rebase.c:1292
14296 +#: builtin/rebase.c:1293
14297 #, c-format
14298 msgid "Does not point to a valid commit '%s'"
14299 msgstr ""
14300
14301 -#: builtin/rebase.c:1317
14301 +#: builtin/rebase.c:1318
14302 #, c-format
14303 msgid "fatal: no such branch/commit '%s'"
14304 msgstr ""
14305
14306 -#: builtin/rebase.c:1325 builtin/submodule--helper.c:37
14306 +#: builtin/rebase.c:1326 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:1337
14312 +#: builtin/rebase.c:1338
14313 msgid "Could not resolve HEAD to a revision"
14314 msgstr ""
14315
14316 -#: builtin/rebase.c:1377 git-legacy-rebase.sh:657
14316 +#: builtin/rebase.c:1378 git-legacy-rebase.sh:665
14317 msgid "Cannot autostash"
14318 msgstr ""
14319
14320 -#: builtin/rebase.c:1380
14320 +#: builtin/rebase.c:1381
14321 #, c-format
14322 msgid "Unexpected stash response: '%s'"
14323 msgstr ""
14324
14325 -#: builtin/rebase.c:1386
14325 +#: builtin/rebase.c:1387
14326 #, c-format
14327 msgid "Could not create directory for '%s'"
14328 msgstr ""
14329
14330 -#: builtin/rebase.c:1389
14330 +#: builtin/rebase.c:1390
14331 #, c-format
14332 msgid "Created autostash: %s\n"
14333 msgstr ""
14334
14335 -#: builtin/rebase.c:1392
14335 +#: builtin/rebase.c:1393
14336 msgid "could not reset --hard"
14337 msgstr ""
14338
14339 -#: builtin/rebase.c:1393 builtin/reset.c:113
14339 +#: builtin/rebase.c:1394 builtin/reset.c:113
14340 #, c-format
14341 msgid "HEAD is now at %s"
14342 msgstr ""
14343
14344 -#: builtin/rebase.c:1409 git-legacy-rebase.sh:666
14344 +#: builtin/rebase.c:1410 git-legacy-rebase.sh:674
14345 msgid "Please commit or stash them."
14346 msgstr ""
14347
14348 -#: builtin/rebase.c:1436
14348 +#: builtin/rebase.c:1437
14349 #, c-format
14350 msgid "could not parse '%s'"
14351 msgstr ""
14352
14353 -#: builtin/rebase.c:1447
14353 +#: builtin/rebase.c:1448
14354 #, c-format
14355 msgid "could not switch to %s"
14356 msgstr ""
14357
14358 -#: builtin/rebase.c:1458 git-legacy-rebase.sh:689
14358 +#: builtin/rebase.c:1459 git-legacy-rebase.sh:697
14359 #, sh-format
14360 msgid "HEAD is up to date."
14361 msgstr ""
14362
14363 -#: builtin/rebase.c:1460
14363 +#: builtin/rebase.c:1461
14364 #, c-format
14365 msgid "Current branch %s is up to date.\n"
14366 msgstr ""
14367
14368 -#: builtin/rebase.c:1468 git-legacy-rebase.sh:699
14368 +#: builtin/rebase.c:1469 git-legacy-rebase.sh:707
14369 #, sh-format
14370 msgid "HEAD is up to date, rebase forced."
14371 msgstr ""
14372
14373 -#: builtin/rebase.c:1470
14373 +#: builtin/rebase.c:1471
14374 #, c-format
14375 msgid "Current branch %s is up to date, rebase forced.\n"
14376 msgstr ""
14377
14378 -#: builtin/rebase.c:1478 git-legacy-rebase.sh:208
14378 +#: builtin/rebase.c:1479 git-legacy-rebase.sh:208
14379 msgid "The pre-rebase hook refused to rebase."
14380 msgstr ""
14381
14382 -#: builtin/rebase.c:1484
14382 +#: builtin/rebase.c:1485
14383 #, c-format
14384 msgid "Changes from %s to %s:\n"
14385 msgstr ""
14386
14387 -#: builtin/rebase.c:1507
14387 +#: builtin/rebase.c:1508
14388 #, c-format
14389 msgid "First, rewinding head to replay your work on top of it...\n"
14390 msgstr ""
14391
14392 -#: builtin/rebase.c:1513
14392 +#: builtin/rebase.c:1514
14393 msgid "Could not detach HEAD"
14394 msgstr ""
14395
14396 -#: builtin/rebase.c:1522
14396 +#: builtin/rebase.c:1523
14397 #, c-format
14398 msgid "Fast-forwarded %s to %s. \n"
14399 msgstr ""
@@ -17365,7 +17365,7 @@ msgid "Public key pinning not supported with cURL < 7.44.0"
17365 msgstr ""
17366
17367 #: http.c:837
17368 -msgid "CURLSSLOPT_NO_REVOKE not suported with cURL < 7.44.0"
17368 +msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
17369 msgstr ""
17370
17371 #: http.c:910
@@ -18273,12 +18273,12 @@ msgstr ""
18273 msgid "Simple merge did not work, trying automatic merge."
18274 msgstr ""
18275
18276 -#: git-legacy-rebase.sh:426
18276 +#: git-legacy-rebase.sh:434
18277 #, sh-format
18278 msgid "Could not move back to $head_name"
18279 msgstr ""
18280
18281 -#: git-legacy-rebase.sh:452
18281 +#: git-legacy-rebase.sh:460
18282 #, sh-format
18283 msgid ""
18284 "It seems that there is already a $state_dir_base directory, and\n"
@@ -18291,60 +18291,60 @@ msgid ""
18291 "valuable there."
18292 msgstr ""
18293
18294 -#: git-legacy-rebase.sh:517
18294 +#: git-legacy-rebase.sh:525
18295 msgid "error: cannot combine '--signoff' with '--preserve-merges'"
18296 msgstr ""
18297
18298 -#: git-legacy-rebase.sh:562
18298 +#: git-legacy-rebase.sh:570
18299 #, sh-format
18300 msgid "invalid upstream '$upstream_name'"
18301 msgstr ""
18302
18303 -#: git-legacy-rebase.sh:586
18303 +#: git-legacy-rebase.sh:594
18304 #, sh-format
18305 msgid "$onto_name: there are more than one merge bases"
18306 msgstr ""
18307
18308 -#: git-legacy-rebase.sh:589 git-legacy-rebase.sh:593
18308 +#: git-legacy-rebase.sh:597 git-legacy-rebase.sh:601
18309 #, sh-format
18310 msgid "$onto_name: there is no merge base"
18311 msgstr ""
18312
18313 -#: git-legacy-rebase.sh:598
18313 +#: git-legacy-rebase.sh:606
18314 #, sh-format
18315 msgid "Does not point to a valid commit: $onto_name"
18316 msgstr ""
18317
18318 -#: git-legacy-rebase.sh:624
18318 +#: git-legacy-rebase.sh:632
18319 #, sh-format
18320 msgid "fatal: no such branch/commit '$branch_name'"
18321 msgstr ""
18322
18323 -#: git-legacy-rebase.sh:662
18323 +#: git-legacy-rebase.sh:670
18324 #, sh-format
18325 msgid "Created autostash: $stash_abbrev"
18326 msgstr ""
18327
18328 -#: git-legacy-rebase.sh:691
18328 +#: git-legacy-rebase.sh:699
18329 #, sh-format
18330 msgid "Current branch $branch_name is up to date."
18331 msgstr ""
18332
18333 -#: git-legacy-rebase.sh:701
18333 +#: git-legacy-rebase.sh:709
18334 #, sh-format
18335 msgid "Current branch $branch_name is up to date, rebase forced."
18336 msgstr ""
18337
18338 -#: git-legacy-rebase.sh:713
18338 +#: git-legacy-rebase.sh:721
18339 #, sh-format
18340 msgid "Changes from $mb to $onto:"
18341 msgstr ""
18342
18343 -#: git-legacy-rebase.sh:722
18343 +#: git-legacy-rebase.sh:730
18344 msgid "First, rewinding head to replay your work on top of it..."
18345 msgstr ""
18346
18347 -#: git-legacy-rebase.sh:732
18347 +#: git-legacy-rebase.sh:740
18348 #, sh-format
18349 msgid "Fast-forwarded $branch_name to $onto_name."
18350 msgstr ""