@matheusbsbs / matheus-bagliano / commits / a4156d2034

l10n: git.pot: v2.5.0 round 2 (9 new, 5 removed)

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

Jiang Xin committed Jul 14, 2015 at 07:20 UTC a4156d2034f6b5370e2f5605502854d1cc064b9b
1 file changed +199 -182
po/git.pot
+199 -182
@@ -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: 2015-06-27 19:17+0800\n"
11 +"POT-Creation-Date: 2015-07-14 07:19+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"
@@ -624,8 +624,8 @@ msgstr ""
624 msgid "failed to read the cache"
625 msgstr ""
626
627 -#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594
628 -#: builtin/clone.c:654
627 +#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587
628 +#: builtin/clone.c:647
629 msgid "unable to write new index file"
630 msgstr ""
631
@@ -672,7 +672,7 @@ msgstr ""
672 msgid "blob expected for %s '%s'"
673 msgstr ""
674
675 -#: merge-recursive.c:788 builtin/clone.c:313
675 +#: merge-recursive.c:788 builtin/clone.c:306
676 #, c-format
677 msgid "failed to open '%s'"
678 msgstr ""
@@ -1930,7 +1930,7 @@ msgstr ""
1930 msgid "behind "
1931 msgstr ""
1932
1933 -#: compat/precompose_utf8.c:55 builtin/clone.c:352
1933 +#: compat/precompose_utf8.c:55 builtin/clone.c:345
1934 #, c-format
1935 msgid "failed to unlink '%s'"
1936 msgstr ""
@@ -2008,7 +2008,7 @@ msgstr ""
2008 msgid "interactive picking"
2009 msgstr ""
2010
2011 -#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286
2011 +#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286
2012 msgid "select hunks interactively"
2013 msgstr ""
2014
@@ -2340,7 +2340,7 @@ msgstr ""
2340 msgid "Checking patch %s..."
2341 msgstr ""
2342
2343 -#: builtin/apply.c:3909 builtin/checkout.c:237 builtin/reset.c:135
2343 +#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135
2344 #, c-format
2345 msgid "make_cache_entry failed for path '%s'"
2346 msgstr ""
@@ -3027,7 +3027,7 @@ msgstr ""
3027 msgid "Failed to resolve HEAD as a valid ref."
3028 msgstr ""
3029
3030 -#: builtin/branch.c:878 builtin/clone.c:629
3030 +#: builtin/branch.c:878 builtin/clone.c:622
3031 msgid "HEAD not found below refs/heads!"
3032 msgstr ""
3033
@@ -3216,7 +3216,7 @@ msgstr ""
3216 msgid "terminate input and output records by a NUL character"
3217 msgstr ""
3218
3219 -#: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279
3219 +#: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279
3220 msgid "suppress progress reporting"
3221 msgstr ""
3222
@@ -3313,113 +3313,113 @@ msgstr ""
3313 msgid "copy out the files from named stage"
3314 msgstr ""
3315
3316 -#: builtin/checkout.c:26
3316 +#: builtin/checkout.c:24
3317 msgid "git checkout [<options>] <branch>"
3318 msgstr ""
3319
3320 -#: builtin/checkout.c:27
3320 +#: builtin/checkout.c:25
3321 msgid "git checkout [<options>] [<branch>] -- <file>..."
3322 msgstr ""
3323
3324 -#: builtin/checkout.c:138 builtin/checkout.c:171
3324 +#: builtin/checkout.c:134 builtin/checkout.c:167
3325 #, c-format
3326 msgid "path '%s' does not have our version"
3327 msgstr ""
3328
3329 -#: builtin/checkout.c:140 builtin/checkout.c:173
3329 +#: builtin/checkout.c:136 builtin/checkout.c:169
3330 #, c-format
3331 msgid "path '%s' does not have their version"
3332 msgstr ""
3333
3334 -#: builtin/checkout.c:156
3334 +#: builtin/checkout.c:152
3335 #, c-format
3336 msgid "path '%s' does not have all necessary versions"
3337 msgstr ""
3338
3339 -#: builtin/checkout.c:200
3339 +#: builtin/checkout.c:196
3340 #, c-format
3341 msgid "path '%s' does not have necessary versions"
3342 msgstr ""
3343
3344 -#: builtin/checkout.c:217
3344 +#: builtin/checkout.c:213
3345 #, c-format
3346 msgid "path '%s': cannot merge"
3347 msgstr ""
3348
3349 -#: builtin/checkout.c:234
3349 +#: builtin/checkout.c:230
3350 #, c-format
3351 msgid "Unable to add merge result for '%s'"
3352 msgstr ""
3353
3354 -#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261
3355 -#: builtin/checkout.c:264 builtin/checkout.c:277
3354 +#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
3355 +#: builtin/checkout.c:260
3356 #, c-format
3357 msgid "'%s' cannot be used with updating paths"
3358 msgstr ""
3359
3360 -#: builtin/checkout.c:267 builtin/checkout.c:270
3360 +#: builtin/checkout.c:263 builtin/checkout.c:266
3361 #, c-format
3362 msgid "'%s' cannot be used with %s"
3363 msgstr ""
3364
3365 -#: builtin/checkout.c:273
3365 +#: builtin/checkout.c:269
3366 #, c-format
3367 msgid "Cannot update paths and switch to branch '%s' at the same time."
3368 msgstr ""
3369
3370 -#: builtin/checkout.c:287 builtin/checkout.c:481
3370 +#: builtin/checkout.c:280 builtin/checkout.c:474
3371 msgid "corrupt index file"
3372 msgstr ""
3373
3374 -#: builtin/checkout.c:347 builtin/checkout.c:354
3374 +#: builtin/checkout.c:340 builtin/checkout.c:347
3375 #, c-format
3376 msgid "path '%s' is unmerged"
3377 msgstr ""
3378
3379 -#: builtin/checkout.c:503
3379 +#: builtin/checkout.c:496
3380 msgid "you need to resolve your current index first"
3381 msgstr ""
3382
3383 -#: builtin/checkout.c:634
3383 +#: builtin/checkout.c:627
3384 #, c-format
3385 msgid "Can not do reflog for '%s'\n"
3386 msgstr ""
3387
3388 -#: builtin/checkout.c:670
3388 +#: builtin/checkout.c:663
3389 msgid "HEAD is now at"
3390 msgstr ""
3391
3392 -#: builtin/checkout.c:677
3392 +#: builtin/checkout.c:670
3393 #, c-format
3394 msgid "Reset branch '%s'\n"
3395 msgstr ""
3396
3397 -#: builtin/checkout.c:680
3397 +#: builtin/checkout.c:673
3398 #, c-format
3399 msgid "Already on '%s'\n"
3400 msgstr ""
3401
3402 -#: builtin/checkout.c:684
3402 +#: builtin/checkout.c:677
3403 #, c-format
3404 msgid "Switched to and reset branch '%s'\n"
3405 msgstr ""
3406
3407 -#: builtin/checkout.c:686 builtin/checkout.c:1285
3407 +#: builtin/checkout.c:679 builtin/checkout.c:1134
3408 #, c-format
3409 msgid "Switched to a new branch '%s'\n"
3410 msgstr ""
3411
3412 -#: builtin/checkout.c:688
3412 +#: builtin/checkout.c:681
3413 #, c-format
3414 msgid "Switched to branch '%s'\n"
3415 msgstr ""
3416
3417 -#: builtin/checkout.c:740
3417 +#: builtin/checkout.c:733
3418 #, c-format
3419 msgid " ... and %d more.\n"
3420 msgstr ""
3421
3422 -#: builtin/checkout.c:746
3422 +#: builtin/checkout.c:739
3423 #, c-format
3424 msgid ""
3425 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -3434,7 +3434,7 @@ msgid_plural ""
3434 msgstr[0] ""
3435 msgstr[1] ""
3436
3437 -#: builtin/checkout.c:765
3437 +#: builtin/checkout.c:758
3438 #, c-format
3439 msgid ""
3440 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -3451,189 +3451,161 @@ msgid_plural ""
3451 msgstr[0] ""
3452 msgstr[1] ""
3453
3454 -#: builtin/checkout.c:801
3454 +#: builtin/checkout.c:794
3455 msgid "internal error in revision walk"
3456 msgstr ""
3457
3458 -#: builtin/checkout.c:805
3458 +#: builtin/checkout.c:798
3459 msgid "Previous HEAD position was"
3460 msgstr ""
3461
3462 -#: builtin/checkout.c:832 builtin/checkout.c:1280
3462 +#: builtin/checkout.c:825 builtin/checkout.c:1129
3463 msgid "You are on a branch yet to be born"
3464 msgstr ""
3465
3466 -#: builtin/checkout.c:893
3467 -msgid "no branch specified"
3468 -msgstr ""
3469 -
3470 -#: builtin/checkout.c:895
3471 -#, c-format
3472 -msgid "'%s' already exists"
3473 -msgstr ""
3474 -
3475 -#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842
3476 -#: builtin/clone.c:853
3477 -#, c-format
3478 -msgid "could not create leading directories of '%s'"
3479 -msgstr ""
3480 -
3481 -#: builtin/checkout.c:924
3482 -#, c-format
3483 -msgid "could not create directory of '%s'"
3484 -msgstr ""
3485 -
3486 -#: builtin/checkout.c:960
3487 -#, c-format
3488 -msgid "Enter %s (identifier %s)"
3489 -msgstr ""
3490 -
3491 -#: builtin/checkout.c:1070
3466 +#: builtin/checkout.c:931
3467 #, c-format
3468 msgid "'%s' is already checked out at '%s'"
3469 msgstr ""
3470
3496 -#: builtin/checkout.c:1176
3471 +#: builtin/checkout.c:1036
3472 #, c-format
3473 msgid "only one reference expected, %d given."
3474 msgstr ""
3475
3501 -#: builtin/checkout.c:1215
3476 +#: builtin/checkout.c:1075
3477 #, c-format
3478 msgid "invalid reference: %s"
3479 msgstr ""
3480
3506 -#: builtin/checkout.c:1255
3481 +#: builtin/checkout.c:1104
3482 #, c-format
3483 msgid "reference is not a tree: %s"
3484 msgstr ""
3485
3511 -#: builtin/checkout.c:1294
3486 +#: builtin/checkout.c:1143
3487 msgid "paths cannot be used with switching branches"
3488 msgstr ""
3489
3515 -#: builtin/checkout.c:1297 builtin/checkout.c:1301
3490 +#: builtin/checkout.c:1146 builtin/checkout.c:1150
3491 #, c-format
3492 msgid "'%s' cannot be used with switching branches"
3493 msgstr ""
3494
3520 -#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313
3521 -#: builtin/checkout.c:1316
3495 +#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162
3496 +#: builtin/checkout.c:1165
3497 #, c-format
3498 msgid "'%s' cannot be used with '%s'"
3499 msgstr ""
3500
3526 -#: builtin/checkout.c:1321
3501 +#: builtin/checkout.c:1170
3502 #, c-format
3503 msgid "Cannot switch branch to a non-commit '%s'"
3504 msgstr ""
3505
3531 -#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83
3532 -#: builtin/remote.c:159 builtin/remote.c:161
3506 +#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83
3507 +#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282
3508 +#: builtin/worktree.c:284
3509 msgid "branch"
3510 msgstr ""
3511
3536 -#: builtin/checkout.c:1347
3512 +#: builtin/checkout.c:1204
3513 msgid "create and checkout a new branch"
3514 msgstr ""
3515
3540 -#: builtin/checkout.c:1349
3516 +#: builtin/checkout.c:1206
3517 msgid "create/reset and checkout a branch"
3518 msgstr ""
3519
3544 -#: builtin/checkout.c:1350
3520 +#: builtin/checkout.c:1207
3521 msgid "create reflog for new branch"
3522 msgstr ""
3523
3548 -#: builtin/checkout.c:1351
3524 +#: builtin/checkout.c:1208
3525 msgid "detach the HEAD at named commit"
3526 msgstr ""
3527
3552 -#: builtin/checkout.c:1352
3528 +#: builtin/checkout.c:1209
3529 msgid "set upstream info for new branch"
3530 msgstr ""
3531
3556 -#: builtin/checkout.c:1354
3532 +#: builtin/checkout.c:1211
3533 msgid "new-branch"
3534 msgstr ""
3535
3560 -#: builtin/checkout.c:1354
3536 +#: builtin/checkout.c:1211
3537 msgid "new unparented branch"
3538 msgstr ""
3539
3564 -#: builtin/checkout.c:1355
3540 +#: builtin/checkout.c:1212
3541 msgid "checkout our version for unmerged files"
3542 msgstr ""
3543
3568 -#: builtin/checkout.c:1357
3544 +#: builtin/checkout.c:1214
3545 msgid "checkout their version for unmerged files"
3546 msgstr ""
3547
3572 -#: builtin/checkout.c:1359
3548 +#: builtin/checkout.c:1216
3549 msgid "force checkout (throw away local modifications)"
3550 msgstr ""
3551
3576 -#: builtin/checkout.c:1360
3552 +#: builtin/checkout.c:1217
3553 msgid "perform a 3-way merge with the new branch"
3554 msgstr ""
3555
3580 -#: builtin/checkout.c:1361 builtin/merge.c:227
3556 +#: builtin/checkout.c:1218 builtin/merge.c:227
3557 msgid "update ignored files (default)"
3558 msgstr ""
3559
3584 -#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244
3560 +#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244
3561 msgid "style"
3562 msgstr ""
3563
3588 -#: builtin/checkout.c:1363
3564 +#: builtin/checkout.c:1220
3565 msgid "conflict style (merge or diff3)"
3566 msgstr ""
3567
3592 -#: builtin/checkout.c:1366
3568 +#: builtin/checkout.c:1223
3569 msgid "do not limit pathspecs to sparse entries only"
3570 msgstr ""
3571
3596 -#: builtin/checkout.c:1368
3572 +#: builtin/checkout.c:1225
3573 msgid "second guess 'git checkout <no-such-branch>'"
3574 msgstr ""
3575
3600 -#: builtin/checkout.c:1370
3601 -msgid "check a branch out in a separate working directory"
3602 -msgstr ""
3603 -
3604 -#: builtin/checkout.c:1372
3576 +#: builtin/checkout.c:1227
3577 msgid "do not check if another worktree is holding the given ref"
3578 msgstr ""
3579
3608 -#: builtin/checkout.c:1406
3580 +#: builtin/checkout.c:1252
3581 msgid "-b, -B and --orphan are mutually exclusive"
3582 msgstr ""
3583
3612 -#: builtin/checkout.c:1423
3584 +#: builtin/checkout.c:1269
3585 msgid "--track needs a branch name"
3586 msgstr ""
3587
3616 -#: builtin/checkout.c:1428
3588 +#: builtin/checkout.c:1274
3589 msgid "Missing branch name; try -b"
3590 msgstr ""
3591
3620 -#: builtin/checkout.c:1464
3592 +#: builtin/checkout.c:1310
3593 msgid "invalid path specification"
3594 msgstr ""
3595
3624 -#: builtin/checkout.c:1471
3596 +#: builtin/checkout.c:1317
3597 #, c-format
3598 msgid ""
3599 "Cannot update paths and switch to branch '%s' at the same time.\n"
3600 "Did you intend to checkout '%s' which can not be resolved as commit?"
3601 msgstr ""
3602
3631 -#: builtin/checkout.c:1476
3603 +#: builtin/checkout.c:1322
3604 #, c-format
3605 msgid "git checkout: --detach does not take a path argument '%s'"
3606 msgstr ""
3607
3636 -#: builtin/checkout.c:1480
3608 +#: builtin/checkout.c:1326
3609 msgid ""
3610 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3611 "checking out of the index."
@@ -3893,172 +3865,178 @@ msgstr ""
3865 msgid "set config inside the new repository"
3866 msgstr ""
3867
3896 -#: builtin/clone.c:247
3868 +#: builtin/clone.c:240
3869 #, c-format
3870 msgid "reference repository '%s' is not a local repository."
3871 msgstr ""
3872
3901 -#: builtin/clone.c:251
3873 +#: builtin/clone.c:244
3874 #, c-format
3875 msgid "reference repository '%s' is shallow"
3876 msgstr ""
3877
3906 -#: builtin/clone.c:254
3878 +#: builtin/clone.c:247
3879 #, c-format
3880 msgid "reference repository '%s' is grafted"
3881 msgstr ""
3882
3911 -#: builtin/clone.c:317
3883 +#: builtin/clone.c:310
3884 #, c-format
3885 msgid "failed to create directory '%s'"
3886 msgstr ""
3887
3916 -#: builtin/clone.c:319 builtin/diff.c:84
3888 +#: builtin/clone.c:312 builtin/diff.c:84
3889 #, c-format
3890 msgid "failed to stat '%s'"
3891 msgstr ""
3892
3921 -#: builtin/clone.c:321
3893 +#: builtin/clone.c:314
3894 #, c-format
3895 msgid "%s exists and is not a directory"
3896 msgstr ""
3897
3926 -#: builtin/clone.c:335
3898 +#: builtin/clone.c:328
3899 #, c-format
3900 msgid "failed to stat %s\n"
3901 msgstr ""
3902
3931 -#: builtin/clone.c:357
3903 +#: builtin/clone.c:350
3904 #, c-format
3905 msgid "failed to create link '%s'"
3906 msgstr ""
3907
3936 -#: builtin/clone.c:361
3908 +#: builtin/clone.c:354
3909 #, c-format
3910 msgid "failed to copy file to '%s'"
3911 msgstr ""
3912
3941 -#: builtin/clone.c:384 builtin/clone.c:558
3913 +#: builtin/clone.c:377 builtin/clone.c:551
3914 #, c-format
3915 msgid "done.\n"
3916 msgstr ""
3917
3946 -#: builtin/clone.c:396
3918 +#: builtin/clone.c:389
3919 msgid ""
3920 "Clone succeeded, but checkout failed.\n"
3921 "You can inspect what was checked out with 'git status'\n"
3922 "and retry the checkout with 'git checkout -f HEAD'\n"
3923 msgstr ""
3924
3953 -#: builtin/clone.c:473
3925 +#: builtin/clone.c:466
3926 #, c-format
3927 msgid "Could not find remote branch %s to clone."
3928 msgstr ""
3929
3958 -#: builtin/clone.c:553
3930 +#: builtin/clone.c:546
3931 #, c-format
3932 msgid "Checking connectivity... "
3933 msgstr ""
3934
3963 -#: builtin/clone.c:556
3935 +#: builtin/clone.c:549
3936 msgid "remote did not send all necessary objects"
3937 msgstr ""
3938
3967 -#: builtin/clone.c:620
3939 +#: builtin/clone.c:613
3940 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3941 msgstr ""
3942
3971 -#: builtin/clone.c:651
3943 +#: builtin/clone.c:644
3944 msgid "unable to checkout working tree"
3945 msgstr ""
3946
3975 -#: builtin/clone.c:738
3947 +#: builtin/clone.c:731
3948 msgid "cannot repack to clean up"
3949 msgstr ""
3950
3979 -#: builtin/clone.c:740
3951 +#: builtin/clone.c:733
3952 msgid "cannot unlink temporary alternates file"
3953 msgstr ""
3954
3983 -#: builtin/clone.c:770
3955 +#: builtin/clone.c:763
3956 msgid "Too many arguments."
3957 msgstr ""
3958
3987 -#: builtin/clone.c:774
3959 +#: builtin/clone.c:767
3960 msgid "You must specify a repository to clone."
3961 msgstr ""
3962
3991 -#: builtin/clone.c:785
3963 +#: builtin/clone.c:778
3964 #, c-format
3965 msgid "--bare and --origin %s options are incompatible."
3966 msgstr ""
3967
3996 -#: builtin/clone.c:788
3968 +#: builtin/clone.c:781
3969 msgid "--bare and --separate-git-dir are incompatible."
3970 msgstr ""
3971
4000 -#: builtin/clone.c:801
3972 +#: builtin/clone.c:794
3973 #, c-format
3974 msgid "repository '%s' does not exist"
3975 msgstr ""
3976
4005 -#: builtin/clone.c:807 builtin/fetch.c:1160
3977 +#: builtin/clone.c:800 builtin/fetch.c:1160
3978 #, c-format
3979 msgid "depth %s is not a positive number"
3980 msgstr ""
3981
4010 -#: builtin/clone.c:817
3982 +#: builtin/clone.c:810
3983 #, c-format
3984 msgid "destination path '%s' already exists and is not an empty directory."
3985 msgstr ""
3986
4015 -#: builtin/clone.c:827
3987 +#: builtin/clone.c:820
3988 #, c-format
3989 msgid "working tree '%s' already exists."
3990 msgstr ""
3991
4020 -#: builtin/clone.c:845
3992 +#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193
3993 +#: builtin/worktree.c:220
3994 +#, c-format
3995 +msgid "could not create leading directories of '%s'"
3996 +msgstr ""
3997 +
3998 +#: builtin/clone.c:838
3999 #, c-format
4000 msgid "could not create work tree dir '%s'"
4001 msgstr ""
4002
4025 -#: builtin/clone.c:863
4003 +#: builtin/clone.c:856
4004 #, c-format
4005 msgid "Cloning into bare repository '%s'...\n"
4006 msgstr ""
4007
4030 -#: builtin/clone.c:865
4008 +#: builtin/clone.c:858
4009 #, c-format
4010 msgid "Cloning into '%s'...\n"
4011 msgstr ""
4012
4035 -#: builtin/clone.c:890
4013 +#: builtin/clone.c:883
4014 msgid "--dissociate given, but there is no --reference"
4015 msgstr ""
4016
4039 -#: builtin/clone.c:907
4017 +#: builtin/clone.c:900
4018 msgid "--depth is ignored in local clones; use file:// instead."
4019 msgstr ""
4020
4043 -#: builtin/clone.c:910
4021 +#: builtin/clone.c:903
4022 msgid "source repository is shallow, ignoring --local"
4023 msgstr ""
4024
4047 -#: builtin/clone.c:915
4025 +#: builtin/clone.c:908
4026 msgid "--local is ignored"
4027 msgstr ""
4028
4051 -#: builtin/clone.c:919
4029 +#: builtin/clone.c:912
4030 #, c-format
4031 msgid "Don't know how to clone %s"
4032 msgstr ""
4033
4056 -#: builtin/clone.c:968 builtin/clone.c:976
4034 +#: builtin/clone.c:961 builtin/clone.c:969
4035 #, c-format
4036 msgid "Remote branch %s not found in upstream %s"
4037 msgstr ""
4038
4061 -#: builtin/clone.c:979
4039 +#: builtin/clone.c:972
4040 msgid "You appear to have cloned an empty repository."
4041 msgstr ""
4042
@@ -5351,7 +5329,7 @@ msgstr ""
5329 msgid "field name to sort on"
5330 msgstr ""
5331
5354 -#: builtin/fsck.c:147 builtin/prune.c:236
5332 +#: builtin/fsck.c:147 builtin/prune.c:137
5333 msgid "Checking connectivity"
5334 msgstr ""
5335
@@ -5399,7 +5377,7 @@ msgstr ""
5377 msgid "write dangling objects in .git/lost-found"
5378 msgstr ""
5379
5402 -#: builtin/fsck.c:627 builtin/prune.c:198
5380 +#: builtin/fsck.c:627 builtin/prune.c:107
5381 msgid "show progress"
5382 msgstr ""
5383
@@ -7798,60 +7776,22 @@ msgstr ""
7776 msgid "Removing duplicate objects"
7777 msgstr ""
7778
7801 -#: builtin/prune.c:12
7779 +#: builtin/prune.c:11
7780 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
7781 msgstr ""
7782
7805 -#: builtin/prune.c:86
7806 -#, c-format
7807 -msgid "Removing worktrees/%s: not a valid directory"
7808 -msgstr ""
7809 -
7810 -#: builtin/prune.c:92
7811 -#, c-format
7812 -msgid "Removing worktrees/%s: gitdir file does not exist"
7813 -msgstr ""
7814 -
7815 -#: builtin/prune.c:97
7816 -#, c-format
7817 -msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
7818 -msgstr ""
7819 -
7820 -#: builtin/prune.c:108
7821 -#, c-format
7822 -msgid "Removing worktrees/%s: invalid gitdir file"
7823 -msgstr ""
7824 -
7825 -#: builtin/prune.c:124
7826 -#, c-format
7827 -msgid "Removing worktrees/%s: gitdir file points to non-existent location"
7828 -msgstr ""
7829 -
7830 -#: builtin/prune.c:159
7831 -#, c-format
7832 -msgid "failed to remove: %s"
7833 -msgstr ""
7834 -
7835 -#: builtin/prune.c:196
7783 +#: builtin/prune.c:105 builtin/worktree.c:112
7784 msgid "do not remove, show only"
7785 msgstr ""
7786
7839 -#: builtin/prune.c:197
7787 +#: builtin/prune.c:106 builtin/worktree.c:113
7788 msgid "report pruned objects"
7789 msgstr ""
7790
7843 -#: builtin/prune.c:199
7844 -msgid "prune .git/worktrees"
7845 -msgstr ""
7846 -
7847 -#: builtin/prune.c:201
7791 +#: builtin/prune.c:109 builtin/worktree.c:115
7792 msgid "expire objects older than <time>"
7793 msgstr ""
7794
7851 -#: builtin/prune.c:216
7852 -msgid "--worktrees does not take extra arguments"
7853 -msgstr ""
7854 -
7795 #: builtin/push.c:14
7796 msgid "git push [<options>] [<repository> [<refspec>...]]"
7797 msgstr ""
@@ -9798,6 +9738,83 @@ msgstr ""
9738 msgid "print tag contents"
9739 msgstr ""
9740
9741 +#: builtin/worktree.c:11
9742 +msgid "git worktree add [<options>] <path> <branch>"
9743 +msgstr ""
9744 +
9745 +#: builtin/worktree.c:12
9746 +msgid "git worktree prune [<options>]"
9747 +msgstr ""
9748 +
9749 +#: builtin/worktree.c:27
9750 +#, c-format
9751 +msgid "Removing worktrees/%s: not a valid directory"
9752 +msgstr ""
9753 +
9754 +#: builtin/worktree.c:33
9755 +#, c-format
9756 +msgid "Removing worktrees/%s: gitdir file does not exist"
9757 +msgstr ""
9758 +
9759 +#: builtin/worktree.c:38
9760 +#, c-format
9761 +msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
9762 +msgstr ""
9763 +
9764 +#: builtin/worktree.c:49
9765 +#, c-format
9766 +msgid "Removing worktrees/%s: invalid gitdir file"
9767 +msgstr ""
9768 +
9769 +#: builtin/worktree.c:65
9770 +#, c-format
9771 +msgid "Removing worktrees/%s: gitdir file points to non-existent location"
9772 +msgstr ""
9773 +
9774 +#: builtin/worktree.c:100
9775 +#, c-format
9776 +msgid "failed to remove: %s"
9777 +msgstr ""
9778 +
9779 +#: builtin/worktree.c:186
9780 +#, c-format
9781 +msgid "'%s' already exists"
9782 +msgstr ""
9783 +
9784 +#: builtin/worktree.c:207
9785 +#, c-format
9786 +msgid "could not create directory of '%s'"
9787 +msgstr ""
9788 +
9789 +#: builtin/worktree.c:241
9790 +msgid "unable to resolve HEAD"
9791 +msgstr ""
9792 +
9793 +#: builtin/worktree.c:249
9794 +#, c-format
9795 +msgid "Enter %s (identifier %s)"
9796 +msgstr ""
9797 +
9798 +#: builtin/worktree.c:281
9799 +msgid "checkout <branch> even if already checked out in other worktree"
9800 +msgstr ""
9801 +
9802 +#: builtin/worktree.c:283
9803 +msgid "create a new branch"
9804 +msgstr ""
9805 +
9806 +#: builtin/worktree.c:285
9807 +msgid "create or reset a branch"
9808 +msgstr ""
9809 +
9810 +#: builtin/worktree.c:286
9811 +msgid "detach HEAD at named commit"
9812 +msgstr ""
9813 +
9814 +#: builtin/worktree.c:292
9815 +msgid "-b and -B are mutually exclusive"
9816 +msgstr ""
9817 +
9818 #: builtin/write-tree.c:13
9819 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
9820 msgstr ""
@@ -9858,7 +9875,7 @@ msgid "List, create, or delete branches"
9875 msgstr ""
9876
9877 #: common-cmds.h:21
9861 -msgid "Checkout a branch or paths to the working tree"
9878 +msgid "Switch branches or restore working tree files"
9879 msgstr ""
9880
9881 #: common-cmds.h:22