@matheusbsbs / matheus-bagliano / commits / 2640b6a3a6

l10n: id: po-id for 2.33.0 round 2

Update translation for following component: * builtin/submodule--helper.c Translate following new component: * builtin/revert.c Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>

Bagas Sanjaya committed Aug 14, 2021 at 09:35 UTC 2640b6a3a6d2665a8c4dd199742d8f3d455fe343
1 file changed +569 -531
po/id.po
+569 -531
@@ -7,8 +7,8 @@ msgid ""
7 msgstr ""
8 "Project-Id-Version: Git\n"
9 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
10 -"POT-Creation-Date: 2021-08-03 17:06+0800\n"
11 -"PO-Revision-Date: 2021-05-17 18:32+0700\n"
10 +"POT-Creation-Date: 2021-08-14 07:56+0800\n"
11 +"PO-Revision-Date: 2021-08-14 09:35+0700\n"
12 "Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n"
13 "Language-Team: Indonesian\n"
14 "Language: id\n"
@@ -22,7 +22,7 @@ msgstr ""
22 msgid "Huh (%s)?"
23 msgstr "Huh (%s)"
24
25 -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
25 +#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
26 #: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
27 #: builtin/rebase.c:1953
28 msgid "could not read index"
@@ -52,7 +52,7 @@ msgstr "Perbarui"
52 msgid "could not stage '%s'"
53 msgstr "tidak dapat menggelar '%s'"
54
55 -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3707
55 +#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
56 msgid "could not write index"
57 msgstr "tidak dapat menulis indeks"
58
@@ -211,9 +211,10 @@ msgstr "tak tergelar"
211 #: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
212 #: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
213 #: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
214 -#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1818
215 -#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326
216 -#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572
214 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
215 +#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
216 +#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
217 +#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
218 #: git-add--interactive.perl:213
219 msgid "path"
220 msgstr "jalur"
@@ -782,7 +783,7 @@ msgstr ""
783 msgid "Exiting because of an unresolved conflict."
784 msgstr ""
785
785 -#: advice.c:283 builtin/merge.c:1374
786 +#: advice.c:283 builtin/merge.c:1375
787 msgid "You have not concluded your merge (MERGE_HEAD exists)."
788 msgstr ""
789
@@ -1517,7 +1518,7 @@ msgstr "Tidak dapat membaca %s"
1518
1519 #: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
1520 #: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
1520 -#: builtin/merge.c:1143
1521 +#: builtin/merge.c:1144
1522 #, c-format
1523 msgid "could not read '%s'"
1524 msgstr "tidak dapat membaca '%s'"
@@ -1606,7 +1607,8 @@ msgid "list supported archive formats"
1607 msgstr "daftar format arsip yang didukung"
1608
1609 #: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
1609 -#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
1610 +#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
1611 +#: builtin/submodule--helper.c:2902
1612 msgid "repo"
1613 msgstr "repositori"
1614
@@ -1794,9 +1796,10 @@ msgstr "tidak dapat menggunakan --contents dengan nama objek komit final"
1796
1797 #: blame.c:2811
1798 msgid "--reverse and --first-parent together require specified latest commit"
1797 -msgstr "--reverse dan --first-parent bersama-sama butuh komit terbaru yang disebutkan"
1799 +msgstr ""
1800 +"--reverse dan --first-parent bersama-sama butuh komit terbaru yang disebutkan"
1801
1799 -#: blame.c:2820 bundle.c:224 ref-filter.c:2274 remote.c:2041 sequencer.c:2333
1802 +#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
1803 #: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
1804 #: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
1805 #: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
@@ -1808,7 +1811,8 @@ msgstr "persiapan jalan revisi gagal"
1811 msgid ""
1812 "--reverse --first-parent together require range along first-parent chain"
1813 msgstr ""
1811 -"--reverse --first-parent bersama-sama butuh rentang bersama rantai induk pertama"
1814 +"--reverse --first-parent bersama-sama butuh rentang bersama rantai induk "
1815 +"pertama"
1816
1817 #: blame.c:2849
1818 #, c-format
@@ -2988,23 +2992,23 @@ msgstr ""
2992 msgid "path name too long for external filter"
2993 msgstr ""
2994
2991 -#: convert.c:934
2995 +#: convert.c:935
2996 #, c-format
2997 msgid ""
2998 "external filter '%s' is not available anymore although not all paths have "
2999 "been filtered"
3000 msgstr ""
3001
2998 -#: convert.c:1234
3002 +#: convert.c:1236
3003 msgid "true/false are no valid working-tree-encodings"
3004 msgstr ""
3005
3002 -#: convert.c:1414 convert.c:1447
3006 +#: convert.c:1416 convert.c:1449
3007 #, c-format
3008 msgid "%s: clean filter '%s' failed"
3009 msgstr ""
3010
3007 -#: convert.c:1490
3011 +#: convert.c:1492
3012 #, c-format
3013 msgid "%s: smudge filter %s failed"
3014 msgstr ""
@@ -3235,10 +3239,10 @@ msgstr ""
3239
3240 #: diff.c:4643
3241 msgid ""
3238 -"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
3242 +"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
3243 "with -G and -S"
3244 msgstr ""
3241 -"---pickaxe-all dan --find-object saling eksklusif, gunakan --pickaxe-all "
3245 +"--pickaxe-all dan --find-object saling eksklusif, gunakan --pickaxe-all "
3246 "dengan -G dan -S"
3247
3248 #: diff.c:4722
@@ -3780,8 +3784,7 @@ msgstr "Keluarkan ke berkas yang disebutkan"
3784
3785 #: diff.c:6298
3786 msgid "exhaustive rename detection was skipped due to too many files."
3783 -msgstr ""
3784 -"deteksi penamaan ulang lengkap dilewati karena terlalu banyak berkas."
3787 +msgstr "deteksi penamaan ulang lengkap dilewati karena terlalu banyak berkas."
3788
3789 #: diff.c:6301
3790 msgid "only found copies from modified paths due to too many files."
@@ -3801,7 +3804,7 @@ msgstr ""
3804 msgid "failed to read orderfile '%s'"
3805 msgstr ""
3806
3804 -#: diffcore-rename.c:1510
3807 +#: diffcore-rename.c:1514
3808 msgid "Performing inexact rename detection"
3809 msgstr ""
3810
@@ -3820,49 +3823,49 @@ msgstr ""
3823 msgid "unrecognized pattern: '%s'"
3824 msgstr ""
3825
3823 -#: dir.c:792 dir.c:806
3826 +#: dir.c:790 dir.c:804
3827 #, c-format
3828 msgid "unrecognized negative pattern: '%s'"
3829 msgstr ""
3830
3828 -#: dir.c:824
3831 +#: dir.c:820
3832 #, c-format
3833 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
3834 msgstr ""
3835
3833 -#: dir.c:834
3836 +#: dir.c:830
3837 msgid "disabling cone pattern matching"
3838 msgstr ""
3839
3837 -#: dir.c:1221
3840 +#: dir.c:1214
3841 #, c-format
3842 msgid "cannot use %s as an exclude file"
3843 msgstr ""
3844
3842 -#: dir.c:2358
3845 +#: dir.c:2351
3846 #, c-format
3847 msgid "could not open directory '%s'"
3848 msgstr ""
3849
3847 -#: dir.c:2660
3850 +#: dir.c:2653
3851 msgid "failed to get kernel name and information"
3852 msgstr ""
3853
3851 -#: dir.c:2784
3854 +#: dir.c:2777
3855 msgid "untracked cache is disabled on this system or location"
3856 msgstr ""
3857
3855 -#: dir.c:3617
3858 +#: dir.c:3610
3859 #, c-format
3860 msgid "index file corrupt in repo %s"
3861 msgstr ""
3862
3860 -#: dir.c:3664 dir.c:3669
3863 +#: dir.c:3657 dir.c:3662
3864 #, c-format
3865 msgid "could not create directories for %s"
3866 msgstr ""
3867
3865 -#: dir.c:3698
3868 +#: dir.c:3691
3869 #, c-format
3870 msgid "could not migrate git directory from '%s' to '%s'"
3871 msgstr ""
@@ -3886,7 +3889,7 @@ msgstr ""
3889 msgid "bad git namespace path \"%s\""
3890 msgstr ""
3891
3889 -#: environment.c:335
3892 +#: environment.c:334
3893 #, c-format
3894 msgid "could not set GIT_DIR to '%s'"
3895 msgstr ""
@@ -4500,39 +4503,39 @@ msgstr ""
4503 msgid "bad action '%s' for '%s'"
4504 msgstr ""
4505
4503 -#: merge-ort.c:1228 merge-recursive.c:1206
4506 +#: merge-ort.c:1569 merge-recursive.c:1201
4507 #, c-format
4508 msgid "Failed to merge submodule %s (not checked out)"
4509 msgstr ""
4510
4508 -#: merge-ort.c:1237 merge-recursive.c:1213
4511 +#: merge-ort.c:1578 merge-recursive.c:1208
4512 #, c-format
4513 msgid "Failed to merge submodule %s (commits not present)"
4514 msgstr ""
4515
4513 -#: merge-ort.c:1246 merge-recursive.c:1220
4516 +#: merge-ort.c:1587 merge-recursive.c:1215
4517 #, c-format
4518 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
4519 msgstr ""
4520
4518 -#: merge-ort.c:1256 merge-ort.c:1263
4521 +#: merge-ort.c:1597 merge-ort.c:1604
4522 #, c-format
4523 msgid "Note: Fast-forwarding submodule %s to %s"
4524 msgstr ""
4525
4523 -#: merge-ort.c:1284
4526 +#: merge-ort.c:1625
4527 #, c-format
4528 msgid "Failed to merge submodule %s"
4529 msgstr ""
4530
4528 -#: merge-ort.c:1291
4531 +#: merge-ort.c:1632
4532 #, c-format
4533 msgid ""
4534 "Failed to merge submodule %s, but a possible merge resolution exists:\n"
4535 "%s\n"
4536 msgstr ""
4537
4535 -#: merge-ort.c:1295 merge-recursive.c:1274
4538 +#: merge-ort.c:1636 merge-recursive.c:1269
4539 #, c-format
4540 msgid ""
4541 "If this is correct simply add it to the index for example\n"
@@ -4543,42 +4546,42 @@ msgid ""
4546 "which will accept this suggestion.\n"
4547 msgstr ""
4548
4546 -#: merge-ort.c:1308
4549 +#: merge-ort.c:1649
4550 #, c-format
4551 msgid ""
4552 "Failed to merge submodule %s, but multiple possible merges exist:\n"
4553 "%s"
4554 msgstr ""
4555
4553 -#: merge-ort.c:1527 merge-recursive.c:1363
4556 +#: merge-ort.c:1868 merge-recursive.c:1358
4557 msgid "Failed to execute internal merge"
4558 msgstr ""
4559
4557 -#: merge-ort.c:1532 merge-recursive.c:1368
4560 +#: merge-ort.c:1873 merge-recursive.c:1363
4561 #, c-format
4562 msgid "Unable to add %s to database"
4563 msgstr ""
4564
4562 -#: merge-ort.c:1539 merge-recursive.c:1401
4565 +#: merge-ort.c:1880 merge-recursive.c:1396
4566 #, c-format
4567 msgid "Auto-merging %s"
4568 msgstr ""
4569
4567 -#: merge-ort.c:1678 merge-recursive.c:2123
4570 +#: merge-ort.c:2019 merge-recursive.c:2118
4571 #, c-format
4572 msgid ""
4573 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
4574 "implicit directory rename(s) putting the following path(s) there: %s."
4575 msgstr ""
4576
4574 -#: merge-ort.c:1688 merge-recursive.c:2133
4577 +#: merge-ort.c:2029 merge-recursive.c:2128
4578 #, c-format
4579 msgid ""
4580 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
4581 "implicit directory renames tried to put these paths there: %s"
4582 msgstr ""
4583
4581 -#: merge-ort.c:1746
4584 +#: merge-ort.c:2087
4585 #, c-format
4586 msgid ""
4587 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4586,47 +4589,47 @@ msgid ""
4589 "majority of the files."
4590 msgstr ""
4591
4589 -#: merge-ort.c:1900 merge-recursive.c:2469
4592 +#: merge-ort.c:2241 merge-recursive.c:2464
4593 #, c-format
4594 msgid ""
4595 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
4596 "renamed."
4597 msgstr ""
4598
4596 -#: merge-ort.c:2044 merge-recursive.c:3252
4599 +#: merge-ort.c:2385 merge-recursive.c:3247
4600 #, c-format
4601 msgid ""
4602 "Path updated: %s added in %s inside a directory that was renamed in %s; "
4603 "moving it to %s."
4604 msgstr ""
4605
4603 -#: merge-ort.c:2051 merge-recursive.c:3259
4606 +#: merge-ort.c:2392 merge-recursive.c:3254
4607 #, c-format
4608 msgid ""
4609 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
4610 "%s; moving it to %s."
4611 msgstr ""
4612
4610 -#: merge-ort.c:2064 merge-recursive.c:3255
4613 +#: merge-ort.c:2405 merge-recursive.c:3250
4614 #, c-format
4615 msgid ""
4616 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
4617 "in %s, suggesting it should perhaps be moved to %s."
4618 msgstr ""
4619
4617 -#: merge-ort.c:2072 merge-recursive.c:3262
4620 +#: merge-ort.c:2413 merge-recursive.c:3257
4621 #, c-format
4622 msgid ""
4623 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
4624 "was renamed in %s, suggesting it should perhaps be moved to %s."
4625 msgstr ""
4626
4624 -#: merge-ort.c:2228
4627 +#: merge-ort.c:2569
4628 #, c-format
4629 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
4630 msgstr ""
4631
4629 -#: merge-ort.c:2323
4632 +#: merge-ort.c:2664
4633 #, c-format
4634 msgid ""
4635 "CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4634,67 +4637,67 @@ msgid ""
4637 "markers."
4638 msgstr ""
4639
4637 -#: merge-ort.c:2342 merge-ort.c:2366
4640 +#: merge-ort.c:2683 merge-ort.c:2707
4641 #, c-format
4642 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
4643 msgstr ""
4644
4642 -#: merge-ort.c:2819 merge-recursive.c:3013
4645 +#: merge-ort.c:3182 merge-recursive.c:3008
4646 #, c-format
4647 msgid "cannot read object %s"
4648 msgstr ""
4649
4647 -#: merge-ort.c:2822 merge-recursive.c:3016
4650 +#: merge-ort.c:3185 merge-recursive.c:3011
4651 #, c-format
4652 msgid "object %s is not a blob"
4653 msgstr ""
4654
4652 -#: merge-ort.c:3250
4655 +#: merge-ort.c:3613
4656 #, c-format
4657 msgid ""
4658 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
4659 "%s instead."
4660 msgstr ""
4661
4659 -#: merge-ort.c:3326
4662 +#: merge-ort.c:3689
4663 #, c-format
4664 msgid ""
4665 "CONFLICT (distinct types): %s had different types on each side; renamed both "
4666 "of them so each can be recorded somewhere."
4667 msgstr ""
4668
4666 -#: merge-ort.c:3333
4669 +#: merge-ort.c:3696
4670 #, c-format
4671 msgid ""
4672 "CONFLICT (distinct types): %s had different types on each side; renamed one "
4673 "of them so each can be recorded somewhere."
4674 msgstr ""
4675
4673 -#: merge-ort.c:3433 merge-recursive.c:3092
4676 +#: merge-ort.c:3796 merge-recursive.c:3087
4677 msgid "content"
4678 msgstr ""
4679
4677 -#: merge-ort.c:3435 merge-recursive.c:3096
4680 +#: merge-ort.c:3798 merge-recursive.c:3091
4681 msgid "add/add"
4682 msgstr ""
4683
4681 -#: merge-ort.c:3437 merge-recursive.c:3141
4684 +#: merge-ort.c:3800 merge-recursive.c:3136
4685 msgid "submodule"
4686 msgstr ""
4687
4685 -#: merge-ort.c:3439 merge-recursive.c:3142
4688 +#: merge-ort.c:3802 merge-recursive.c:3137
4689 #, c-format
4690 msgid "CONFLICT (%s): Merge conflict in %s"
4691 msgstr ""
4692
4690 -#: merge-ort.c:3470
4693 +#: merge-ort.c:3833
4694 #, c-format
4695 msgid ""
4696 "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
4697 "of %s left in tree."
4698 msgstr ""
4699
4697 -#: merge-ort.c:3757
4700 +#: merge-ort.c:4120
4701 #, c-format
4702 msgid ""
4703 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4704,192 +4707,192 @@ msgstr ""
4707 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
4708 #. base, and 2-3) the trees for the two trees we're merging.
4709 #.
4707 -#: merge-ort.c:4116
4710 +#: merge-ort.c:4487
4711 #, c-format
4712 msgid "collecting merge info failed for trees %s, %s, %s"
4713 msgstr ""
4714
4712 -#: merge-ort-wrappers.c:13 merge-recursive.c:3707
4715 +#: merge-ort-wrappers.c:13 merge-recursive.c:3702
4716 #, c-format
4717 msgid ""
4718 "Your local changes to the following files would be overwritten by merge:\n"
4719 " %s"
4720 msgstr ""
4721
4719 -#: merge-ort-wrappers.c:33 merge-recursive.c:3473 builtin/merge.c:402
4722 +#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
4723 msgid "Already up to date."
4724 msgstr "Sudah terbaru."
4725
4723 -#: merge-recursive.c:357
4726 +#: merge-recursive.c:352
4727 msgid "(bad commit)\n"
4728 msgstr ""
4729
4727 -#: merge-recursive.c:380
4730 +#: merge-recursive.c:375
4731 #, c-format
4732 msgid "add_cacheinfo failed for path '%s'; merge aborting."
4733 msgstr ""
4734
4732 -#: merge-recursive.c:389
4735 +#: merge-recursive.c:384
4736 #, c-format
4737 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
4738 msgstr ""
4739
4737 -#: merge-recursive.c:877
4740 +#: merge-recursive.c:872
4741 #, c-format
4742 msgid "failed to create path '%s'%s"
4743 msgstr ""
4744
4742 -#: merge-recursive.c:888
4745 +#: merge-recursive.c:883
4746 #, c-format
4747 msgid "Removing %s to make room for subdirectory\n"
4748 msgstr ""
4749
4747 -#: merge-recursive.c:902 merge-recursive.c:921
4750 +#: merge-recursive.c:897 merge-recursive.c:916
4751 msgid ": perhaps a D/F conflict?"
4752 msgstr ""
4753
4751 -#: merge-recursive.c:911
4754 +#: merge-recursive.c:906
4755 #, c-format
4756 msgid "refusing to lose untracked file at '%s'"
4757 msgstr ""
4758
4756 -#: merge-recursive.c:952 builtin/cat-file.c:41
4759 +#: merge-recursive.c:947 builtin/cat-file.c:41
4760 #, c-format
4761 msgid "cannot read object %s '%s'"
4762 msgstr ""
4763
4761 -#: merge-recursive.c:957
4764 +#: merge-recursive.c:952
4765 #, c-format
4766 msgid "blob expected for %s '%s'"
4767 msgstr ""
4768
4766 -#: merge-recursive.c:982
4769 +#: merge-recursive.c:977
4770 #, c-format
4771 msgid "failed to open '%s': %s"
4772 msgstr ""
4773
4771 -#: merge-recursive.c:993
4774 +#: merge-recursive.c:988
4775 #, c-format
4776 msgid "failed to symlink '%s': %s"
4777 msgstr ""
4778
4776 -#: merge-recursive.c:998
4779 +#: merge-recursive.c:993
4780 #, c-format
4781 msgid "do not know what to do with %06o %s '%s'"
4782 msgstr ""
4783
4781 -#: merge-recursive.c:1228 merge-recursive.c:1240
4784 +#: merge-recursive.c:1223 merge-recursive.c:1235
4785 #, c-format
4786 msgid "Fast-forwarding submodule %s to the following commit:"
4787 msgstr ""
4788
4786 -#: merge-recursive.c:1231 merge-recursive.c:1243
4789 +#: merge-recursive.c:1226 merge-recursive.c:1238
4790 #, c-format
4791 msgid "Fast-forwarding submodule %s"
4792 msgstr ""
4793
4791 -#: merge-recursive.c:1266
4794 +#: merge-recursive.c:1261
4795 #, c-format
4796 msgid "Failed to merge submodule %s (merge following commits not found)"
4797 msgstr ""
4798
4796 -#: merge-recursive.c:1270
4799 +#: merge-recursive.c:1265
4800 #, c-format
4801 msgid "Failed to merge submodule %s (not fast-forward)"
4802 msgstr ""
4803
4801 -#: merge-recursive.c:1271
4804 +#: merge-recursive.c:1266
4805 msgid "Found a possible merge resolution for the submodule:\n"
4806 msgstr ""
4807
4805 -#: merge-recursive.c:1283
4808 +#: merge-recursive.c:1278
4809 #, c-format
4810 msgid "Failed to merge submodule %s (multiple merges found)"
4811 msgstr ""
4812
4810 -#: merge-recursive.c:1425
4813 +#: merge-recursive.c:1420
4814 #, c-format
4815 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
4816 msgstr ""
4817
4815 -#: merge-recursive.c:1497
4818 +#: merge-recursive.c:1492
4819 #, c-format
4820 msgid ""
4821 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
4822 "in tree."
4823 msgstr ""
4824
4822 -#: merge-recursive.c:1502
4825 +#: merge-recursive.c:1497
4826 #, c-format
4827 msgid ""
4828 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
4829 "left in tree."
4830 msgstr ""
4831
4829 -#: merge-recursive.c:1509
4832 +#: merge-recursive.c:1504
4833 #, c-format
4834 msgid ""
4835 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
4836 "in tree at %s."
4837 msgstr ""
4838
4836 -#: merge-recursive.c:1514
4839 +#: merge-recursive.c:1509
4840 #, c-format
4841 msgid ""
4842 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
4843 "left in tree at %s."
4844 msgstr ""
4845
4843 -#: merge-recursive.c:1549
4846 +#: merge-recursive.c:1544
4847 msgid "rename"
4848 msgstr ""
4849
4847 -#: merge-recursive.c:1549
4850 +#: merge-recursive.c:1544
4851 msgid "renamed"
4852 msgstr ""
4853
4851 -#: merge-recursive.c:1600 merge-recursive.c:2506 merge-recursive.c:3169
4854 +#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
4855 #, c-format
4856 msgid "Refusing to lose dirty file at %s"
4857 msgstr ""
4858
4856 -#: merge-recursive.c:1610
4859 +#: merge-recursive.c:1605
4860 #, c-format
4861 msgid "Refusing to lose untracked file at %s, even though it's in the way."
4862 msgstr ""
4863
4861 -#: merge-recursive.c:1668
4864 +#: merge-recursive.c:1663
4865 #, c-format
4866 msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
4867 msgstr ""
4868
4866 -#: merge-recursive.c:1699
4869 +#: merge-recursive.c:1694
4870 #, c-format
4871 msgid "%s is a directory in %s adding as %s instead"
4872 msgstr ""
4873
4871 -#: merge-recursive.c:1704
4874 +#: merge-recursive.c:1699
4875 #, c-format
4876 msgid "Refusing to lose untracked file at %s; adding as %s instead"
4877 msgstr ""
4878
4876 -#: merge-recursive.c:1731
4879 +#: merge-recursive.c:1726
4880 #, c-format
4881 msgid ""
4882 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
4883 "\"->\"%s\" in \"%s\"%s"
4884 msgstr ""
4885
4883 -#: merge-recursive.c:1736
4886 +#: merge-recursive.c:1731
4887 msgid " (left unresolved)"
4888 msgstr ""
4889
4887 -#: merge-recursive.c:1828
4890 +#: merge-recursive.c:1823
4891 #, c-format
4892 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
4893 msgstr ""
4894
4892 -#: merge-recursive.c:2091
4895 +#: merge-recursive.c:2086
4896 #, c-format
4897 msgid ""
4898 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4897,85 +4900,85 @@ msgid ""
4900 "getting a majority of the files."
4901 msgstr ""
4902
4900 -#: merge-recursive.c:2225
4903 +#: merge-recursive.c:2220
4904 #, c-format
4905 msgid ""
4906 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
4907 ">%s in %s"
4908 msgstr ""
4909
4907 -#: merge-recursive.c:3080
4910 +#: merge-recursive.c:3075
4911 msgid "modify"
4912 msgstr ""
4913
4911 -#: merge-recursive.c:3080
4914 +#: merge-recursive.c:3075
4915 msgid "modified"
4916 msgstr ""
4917
4915 -#: merge-recursive.c:3119
4918 +#: merge-recursive.c:3114
4919 #, c-format
4920 msgid "Skipped %s (merged same as existing)"
4921 msgstr ""
4922
4920 -#: merge-recursive.c:3172
4923 +#: merge-recursive.c:3167
4924 #, c-format
4925 msgid "Adding as %s instead"
4926 msgstr ""
4927
4925 -#: merge-recursive.c:3376
4928 +#: merge-recursive.c:3371
4929 #, c-format
4930 msgid "Removing %s"
4931 msgstr ""
4932
4930 -#: merge-recursive.c:3399
4933 +#: merge-recursive.c:3394
4934 msgid "file/directory"
4935 msgstr ""
4936
4934 -#: merge-recursive.c:3404
4937 +#: merge-recursive.c:3399
4938 msgid "directory/file"
4939 msgstr ""
4940
4938 -#: merge-recursive.c:3411
4941 +#: merge-recursive.c:3406
4942 #, c-format
4943 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
4944 msgstr ""
4945
4943 -#: merge-recursive.c:3420
4946 +#: merge-recursive.c:3415
4947 #, c-format
4948 msgid "Adding %s"
4949 msgstr ""
4950
4948 -#: merge-recursive.c:3429
4951 +#: merge-recursive.c:3424
4952 #, c-format
4953 msgid "CONFLICT (add/add): Merge conflict in %s"
4954 msgstr ""
4955
4953 -#: merge-recursive.c:3482
4956 +#: merge-recursive.c:3477
4957 #, c-format
4958 msgid "merging of trees %s and %s failed"
4959 msgstr ""
4960
4958 -#: merge-recursive.c:3576
4961 +#: merge-recursive.c:3571
4962 msgid "Merging:"
4963 msgstr ""
4964
4962 -#: merge-recursive.c:3589
4965 +#: merge-recursive.c:3584
4966 #, c-format
4967 msgid "found %u common ancestor:"
4968 msgid_plural "found %u common ancestors:"
4969 msgstr[0] ""
4970 msgstr[1] ""
4971
4969 -#: merge-recursive.c:3639
4972 +#: merge-recursive.c:3634
4973 msgid "merge returned no commit"
4974 msgstr ""
4975
4973 -#: merge-recursive.c:3804
4976 +#: merge-recursive.c:3799
4977 #, c-format
4978 msgid "Could not parse object '%s'"
4979 msgstr ""
4980
4978 -#: merge-recursive.c:3822 builtin/merge.c:716 builtin/merge.c:900
4981 +#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
4982 #: builtin/stash.c:473
4983 msgid "Unable to write index."
4984 msgstr ""
@@ -4985,7 +4988,7 @@ msgid "failed to read the cache"
4988 msgstr ""
4989
4990 #: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
4988 -#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821
4991 +#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
4992 #: builtin/stash.c:267
4993 msgid "unable to write new index file"
4994 msgstr ""
@@ -6082,10 +6085,10 @@ msgstr ""
6085
6086 #: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
6087 #: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
6085 -#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:987
6088 +#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
6089 #: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
6090 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
6088 -#: builtin/submodule--helper.c:331
6091 +#: builtin/submodule--helper.c:333
6092 msgid "index file corrupt"
6093 msgstr ""
6094
@@ -6139,36 +6142,36 @@ msgstr ""
6142 msgid "broken index, expect %s in %s, got %s"
6143 msgstr ""
6144
6142 -#: read-cache.c:3031 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
6145 +#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
6146 #, c-format
6147 msgid "could not close '%s'"
6148 msgstr ""
6149
6147 -#: read-cache.c:3074
6150 +#: read-cache.c:3075
6151 msgid "failed to convert to a sparse-index"
6152 msgstr ""
6153
6151 -#: read-cache.c:3145 sequencer.c:2684 sequencer.c:4440
6154 +#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
6155 #, c-format
6156 msgid "could not stat '%s'"
6157 msgstr ""
6158
6156 -#: read-cache.c:3158
6159 +#: read-cache.c:3159
6160 #, c-format
6161 msgid "unable to open git dir: %s"
6162 msgstr ""
6163
6161 -#: read-cache.c:3170
6164 +#: read-cache.c:3171
6165 #, c-format
6166 msgid "unable to unlink: %s"
6167 msgstr ""
6168
6166 -#: read-cache.c:3199
6169 +#: read-cache.c:3200
6170 #, c-format
6171 msgid "cannot fix permission bits on '%s'"
6172 msgstr ""
6173
6171 -#: read-cache.c:3348
6174 +#: read-cache.c:3349
6175 #, c-format
6176 msgid "%s: cannot drop to stage #0"
6177 msgstr ""
@@ -6532,17 +6535,17 @@ msgstr ""
6535 msgid "ignoring broken ref %s"
6536 msgstr ""
6537
6535 -#: ref-filter.c:2498
6538 +#: ref-filter.c:2502
6539 #, c-format
6540 msgid "format: %%(end) atom missing"
6541 msgstr ""
6542
6540 -#: ref-filter.c:2592
6543 +#: ref-filter.c:2596
6544 #, c-format
6545 msgid "malformed object name %s"
6546 msgstr ""
6547
6545 -#: ref-filter.c:2597
6548 +#: ref-filter.c:2601
6549 #, c-format
6550 msgid "option `%s' must point to a commit"
6551 msgstr ""
@@ -6984,7 +6987,7 @@ msgid "Recorded preimage for '%s'"
6987 msgstr ""
6988
6989 #: rerere.c:865 submodule.c:2076 builtin/log.c:2002
6987 -#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
6990 +#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
6991 #, c-format
6992 msgid "could not create directory '%s'"
6993 msgstr ""
@@ -7022,7 +7025,7 @@ msgstr ""
7025 msgid "could not determine HEAD revision"
7026 msgstr "tidak dapat menentukan revisi HEAD"
7027
7025 -#: reset.c:70 reset.c:76 sequencer.c:3689
7028 +#: reset.c:69 reset.c:75 sequencer.c:3689
7029 #, c-format
7030 msgid "failed to find tree of %s"
7031 msgstr "gagal menemukan pohon %s"
@@ -7221,7 +7224,7 @@ msgid "unable to dequote value of '%s'"
7224 msgstr ""
7225
7226 #: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
7224 -#: builtin/am.c:821 builtin/merge.c:1140 builtin/rebase.c:910
7227 +#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
7228 #, c-format
7229 msgid "could not open '%s' for reading"
7230 msgstr ""
@@ -7334,7 +7337,7 @@ msgstr ""
7337 msgid "HEAD %s is not a commit!"
7338 msgstr ""
7339
7337 -#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1702
7340 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
7341 msgid "could not parse HEAD commit"
7342 msgstr ""
7343
@@ -7342,7 +7345,7 @@ msgstr ""
7345 msgid "unable to parse commit author"
7346 msgstr ""
7347
7345 -#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:706
7348 +#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
7349 msgid "git write-tree failed to write a tree"
7350 msgstr ""
7351
@@ -7360,8 +7363,8 @@ msgstr ""
7363 msgid "corrupt author: missing date information"
7364 msgstr ""
7365
7363 -#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1816 builtin/merge.c:909
7364 -#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78
7366 +#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
7367 +#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
7368 msgid "failed to write commit object"
7369 msgstr ""
7370
@@ -8101,11 +8104,11 @@ msgstr ""
8104 msgid "attempting to use sparse-index without cone mode"
8105 msgstr ""
8106
8104 -#: sparse-index.c:174
8107 +#: sparse-index.c:176
8108 msgid "unable to update cache-tree, staying full"
8109 msgstr ""
8110
8108 -#: sparse-index.c:261
8111 +#: sparse-index.c:263
8112 #, c-format
8113 msgid "index entry is a directory, but not sparse (%08x)"
8114 msgstr ""
@@ -8260,7 +8263,7 @@ msgstr ""
8263 msgid "process for submodule '%s' failed"
8264 msgstr "proses untuk submodul '%s' gagal"
8265
8263 -#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2469
8266 +#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
8267 msgid "Failed to resolve HEAD as a valid ref."
8268 msgstr "Gagal menguraikan HEAD sebagai referensi valid."
8269
@@ -8928,7 +8931,7 @@ msgstr ""
8931 msgid "Updating index flags"
8932 msgstr ""
8933
8931 -#: unpack-trees.c:2707
8934 +#: unpack-trees.c:2718
8935 #, c-format
8936 msgid "worktree and untracked commit have duplicate entries: %s"
8937 msgstr ""
@@ -9717,7 +9720,7 @@ msgstr "latihan"
9720 msgid "interactive picking"
9721 msgstr "pengambilan interaktif"
9722
9720 -#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308
9723 +#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
9724 msgid "select hunks interactively"
9725 msgstr "pilih bingkah secara interaktif"
9726
@@ -9848,12 +9851,12 @@ msgstr "Opsi --ignore-missing hanya dapat digunakan bersama dengan --dry-run"
9851 msgid "--chmod param '%s' must be either -x or +x"
9852 msgstr "--chmod param '%s' harus berupa -x atau +x"
9853
9851 -#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363
9854 +#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
9855 #: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
9856 msgid "--pathspec-from-file is incompatible with pathspec arguments"
9857 msgstr "--pathspec-from-file tidak kompatibel dengan argumen pathspec"
9858
9856 -#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369
9859 +#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
9860 #: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
9861 msgid "--pathspec-file-nul requires --pathspec-from-file"
9862 msgstr "--pathspec-file-nul butuh --pathspec-from-file"
@@ -10287,15 +10290,17 @@ msgstr "git bisect--helper --bisect-reset [<komit>]"
10290
10291 #: builtin/bisect--helper.c:24
10292 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
10290 -msgstr "git bisect--helper --bisect-next-check <istilah bagus> <istilah jelek> [<istilah>]"
10293 +msgstr ""
10294 +"git bisect--helper --bisect-next-check <istilah bagus> <istilah jelek> "
10295 +"[<istilah>]"
10296
10297 #: builtin/bisect--helper.c:25
10298 msgid ""
10299 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
10300 "term-new]"
10301 msgstr ""
10297 -"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | "
10298 -"--term-new]"
10302 +"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
10303 +"term-new]"
10304
10305 #: builtin/bisect--helper.c:26
10306 msgid ""
@@ -10303,9 +10308,9 @@ msgid ""
10308 "=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
10309 "[<paths>...]"
10310 msgstr ""
10306 -"git bisect--helper --bisect-start [--term-{new,bad}=<istilah> "
10307 -"--term-{old,good}=<istilah>] [--no-checkout] [--first-parent] [<jelek> "
10308 -"[<bagus>...]] [--] [<jalur>...]"
10311 +"git bisect--helper --bisect-start [--term-{new,bad}=<istilah> --term-{old,"
10312 +"good}=<istilah>] [--no-checkout] [--first-parent] [<jelek> [<bagus>...]] "
10313 +"[--] [<jalur>...]"
10314
10315 #: builtin/bisect--helper.c:28
10316 msgid "git bisect--helper --bisect-next"
@@ -10649,7 +10654,7 @@ msgstr "jangan perlakukan komit akar sebagai perbatasan (asali: off)"
10654 msgid "show work cost statistics"
10655 msgstr "perlihatkan statistik biaya usaha"
10656
10652 -#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94
10657 +#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
10658 #: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
10659 #: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
10660 #: builtin/push.c:566 builtin/send-pack.c:198
@@ -10754,7 +10759,8 @@ msgstr "hanya proses rentang baris <awal>,<akhir> atau fungsi :<nama fungsi>"
10759
10760 #: builtin/blame.c:945
10761 msgid "--progress can't be used with --incremental or porcelain formats"
10757 -msgstr "--progress tidak dapat digunakan dengan --incremental atau format porselen"
10762 +msgstr ""
10763 +"--progress tidak dapat digunakan dengan --incremental atau format porselen"
10764
10765 #. TRANSLATORS: This string is used to tell us the
10766 #. maximum display width for a relative timestamp in
@@ -11422,7 +11428,7 @@ msgstr ""
11428 msgid "terminate input and output records by a NUL character"
11429 msgstr ""
11430
11425 -#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549
11431 +#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
11432 #: builtin/worktree.c:493
11433 msgid "suppress progress reporting"
11434 msgstr ""
@@ -11481,9 +11487,10 @@ msgid "git checkout--worker [<options>]"
11487 msgstr ""
11488
11489 #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
11484 -#: builtin/column.c:31 builtin/submodule--helper.c:1824
11485 -#: builtin/submodule--helper.c:1827 builtin/submodule--helper.c:1835
11486 -#: builtin/submodule--helper.c:2333 builtin/worktree.c:491
11490 +#: builtin/column.c:31 builtin/submodule--helper.c:1892
11491 +#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
11492 +#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
11493 +#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
11494 #: builtin/worktree.c:728
11495 msgid "string"
11496 msgstr ""
@@ -11578,70 +11585,70 @@ msgstr "jalur '%s': tidak dapat gabung"
11585 msgid "Unable to add merge result for '%s'"
11586 msgstr "Tidak dapat menambahkan hasil penggabungan untuk '%s'"
11587
11581 -#: builtin/checkout.c:414
11588 +#: builtin/checkout.c:411
11589 #, c-format
11590 msgid "Recreated %d merge conflict"
11591 msgid_plural "Recreated %d merge conflicts"
11592 msgstr[0] "Konflik penggabungan %d dibuat ulang"
11593 msgstr[1] "Konflik penggabungan %d dibuat ulang"
11594
11588 -#: builtin/checkout.c:419
11595 +#: builtin/checkout.c:416
11596 #, c-format
11597 msgid "Updated %d path from %s"
11598 msgid_plural "Updated %d paths from %s"
11599 msgstr[0] "%d jalur diperbarui dari %s"
11600 msgstr[1] "%d jalur diperbarui dari %s"
11601
11595 -#: builtin/checkout.c:426
11602 +#: builtin/checkout.c:423
11603 #, c-format
11604 msgid "Updated %d path from the index"
11605 msgid_plural "Updated %d paths from the index"
11606 msgstr[0] "%d jalur diperbarui dari indeks"
11607 msgstr[1] "%d jalur diperbarui dari indeks"
11608
11602 -#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455
11603 -#: builtin/checkout.c:459
11609 +#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
11610 +#: builtin/checkout.c:456
11611 #, c-format
11612 msgid "'%s' cannot be used with updating paths"
11613 msgstr "'%s' tidak dapat digunakan untuk memperbarui jalur"
11614
11608 -#: builtin/checkout.c:462 builtin/checkout.c:465
11615 +#: builtin/checkout.c:459 builtin/checkout.c:462
11616 #, c-format
11617 msgid "'%s' cannot be used with %s"
11618 msgstr "'%s' tidak dapat digunakan untuk %s"
11619
11613 -#: builtin/checkout.c:469
11620 +#: builtin/checkout.c:466
11621 #, c-format
11622 msgid "Cannot update paths and switch to branch '%s' at the same time."
11623 msgstr ""
11624 "Tidak dapat memperbarui jalur dan mengganti ke cabang '%s' dalam waktu yang "
11625 "bersamaan."
11626
11620 -#: builtin/checkout.c:473
11627 +#: builtin/checkout.c:470
11628 #, c-format
11629 msgid "neither '%s' or '%s' is specified"
11630 msgstr "baik '%s' atau '%s' tidak disebutkan"
11631
11625 -#: builtin/checkout.c:477
11632 +#: builtin/checkout.c:474
11633 #, c-format
11634 msgid "'%s' must be used when '%s' is not specified"
11635 msgstr "'%s' harus disebutkan ketika '%s' tidak disebutkan"
11636
11630 -#: builtin/checkout.c:482 builtin/checkout.c:487
11637 +#: builtin/checkout.c:479 builtin/checkout.c:484
11638 #, c-format
11639 msgid "'%s' or '%s' cannot be used with %s"
11640 msgstr "'%s' atau '%s' tidak dapat digunakan untuk %s"
11641
11635 -#: builtin/checkout.c:563 builtin/checkout.c:570
11642 +#: builtin/checkout.c:558 builtin/checkout.c:565
11643 #, c-format
11644 msgid "path '%s' is unmerged"
11645 msgstr "jalur '%s' tak tergabung"
11646
11640 -#: builtin/checkout.c:739
11647 +#: builtin/checkout.c:734
11648 msgid "you need to resolve your current index first"
11649 msgstr "Anda perlu selesaikan dulu indeks Anda saat ini"
11650
11644 -#: builtin/checkout.c:793
11651 +#: builtin/checkout.c:788
11652 #, c-format
11653 msgid ""
11654 "cannot continue with staged changes in the following files:\n"
@@ -11651,50 +11658,50 @@ msgstr ""
11658 "berikut:\n"
11659 "%s"
11660
11654 -#: builtin/checkout.c:886
11661 +#: builtin/checkout.c:881
11662 #, c-format
11663 msgid "Can not do reflog for '%s': %s\n"
11664 msgstr "Tidak dapat melakukan reflog untuk '%s': %s\n"
11665
11659 -#: builtin/checkout.c:928
11666 +#: builtin/checkout.c:923
11667 msgid "HEAD is now at"
11668 msgstr "HEAD sekarang berada di"
11669
11663 -#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
11670 +#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
11671 msgid "unable to update HEAD"
11672 msgstr "tidak dapat memperbarui HEAD"
11673
11667 -#: builtin/checkout.c:936
11674 +#: builtin/checkout.c:931
11675 #, c-format
11676 msgid "Reset branch '%s'\n"
11677 msgstr "Ganti ulang cabang '%s'\n"
11678
11672 -#: builtin/checkout.c:939
11679 +#: builtin/checkout.c:934
11680 #, c-format
11681 msgid "Already on '%s'\n"
11682 msgstr "Sudah berada pada '%s'\n"
11683
11677 -#: builtin/checkout.c:943
11684 +#: builtin/checkout.c:938
11685 #, c-format
11686 msgid "Switched to and reset branch '%s'\n"
11687 msgstr "Ganti ke dan ganti cabang '%s'\n"
11688
11682 -#: builtin/checkout.c:945 builtin/checkout.c:1376
11689 +#: builtin/checkout.c:940 builtin/checkout.c:1371
11690 #, c-format
11691 msgid "Switched to a new branch '%s'\n"
11692 msgstr "Ganti ke cabang baru '%s'\n"
11693
11687 -#: builtin/checkout.c:947
11694 +#: builtin/checkout.c:942
11695 #, c-format
11696 msgid "Switched to branch '%s'\n"
11697 msgstr "Ganti ke cabang '%s'\n"
11698
11692 -#: builtin/checkout.c:998
11699 +#: builtin/checkout.c:993
11700 #, c-format
11701 msgid " ... and %d more.\n"
11702 msgstr "... dan %d lainnya.\n"
11703
11697 -#: builtin/checkout.c:1004
11704 +#: builtin/checkout.c:999
11705 #, c-format
11706 msgid ""
11707 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -11717,7 +11724,7 @@ msgstr[1] ""
11724 "\n"
11725 "%s\n"
11726
11720 -#: builtin/checkout.c:1023
11727 +#: builtin/checkout.c:1018
11728 #, c-format
11729 msgid ""
11730 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -11740,19 +11747,19 @@ msgstr[1] ""
11747 "saat yang tepat untuk dilakukan dengan:\n"
11748 "git branch <nama-cabang-baru> %s\n"
11749
11743 -#: builtin/checkout.c:1058
11750 +#: builtin/checkout.c:1053
11751 msgid "internal error in revision walk"
11752 msgstr "kesalahan internal dalam jalan revisi"
11753
11747 -#: builtin/checkout.c:1062
11754 +#: builtin/checkout.c:1057
11755 msgid "Previous HEAD position was"
11756 msgstr "Posisi HEAD sebelumnya adalah"
11757
11751 -#: builtin/checkout.c:1102 builtin/checkout.c:1371
11758 +#: builtin/checkout.c:1097 builtin/checkout.c:1366
11759 msgid "You are on a branch yet to be born"
11760 msgstr "Anda berada pada cabang yang belum lahir"
11761
11755 -#: builtin/checkout.c:1184
11762 +#: builtin/checkout.c:1179
11763 #, c-format
11764 msgid ""
11765 "'%s' could be both a local file and a tracking branch.\n"
@@ -11761,7 +11768,7 @@ msgstr ""
11768 "'%s' bisa jadi berkas lokal dan cabang pelacak.\n"
11769 "Mohon gunakan -- (dan secara opsional --no-guess) untuk disambiguasi"
11770
11764 -#: builtin/checkout.c:1191
11771 +#: builtin/checkout.c:1186
11772 msgid ""
11773 "If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
11774 "you can do so by fully qualifying the name with the --track option:\n"
@@ -11781,51 +11788,51 @@ msgstr ""
11788 "seperti remote 'origin', pertimbangkan untuk menyetel\n"
11789 "checkout.defaultRemote=origin di konfigurasi Anda"
11790
11784 -#: builtin/checkout.c:1201
11791 +#: builtin/checkout.c:1196
11792 #, c-format
11793 msgid "'%s' matched multiple (%d) remote tracking branches"
11794 msgstr "'%s' cocok dengan banyak (%d) cabang pelacak remote"
11795
11789 -#: builtin/checkout.c:1267
11796 +#: builtin/checkout.c:1262
11797 msgid "only one reference expected"
11798 msgstr "hanya satu referensi yang diharapkan"
11799
11793 -#: builtin/checkout.c:1284
11800 +#: builtin/checkout.c:1279
11801 #, c-format
11802 msgid "only one reference expected, %d given."
11803 msgstr "hanya satu referensi yang diharapkan, %d diberikan"
11804
11798 -#: builtin/checkout.c:1330 builtin/worktree.c:268 builtin/worktree.c:436
11805 +#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
11806 #, c-format
11807 msgid "invalid reference: %s"
11808 msgstr "referensi tidak valid: %s"
11809
11803 -#: builtin/checkout.c:1343 builtin/checkout.c:1709
11810 +#: builtin/checkout.c:1338 builtin/checkout.c:1707
11811 #, c-format
11812 msgid "reference is not a tree: %s"
11813 msgstr "referensi bukan pohon: %s"
11814
11808 -#: builtin/checkout.c:1390
11815 +#: builtin/checkout.c:1385
11816 #, c-format
11817 msgid "a branch is expected, got tag '%s'"
11818 msgstr "sebuah cabang diharapkan, dapat tag '%s'"
11819
11813 -#: builtin/checkout.c:1392
11820 +#: builtin/checkout.c:1387
11821 #, c-format
11822 msgid "a branch is expected, got remote branch '%s'"
11823 msgstr "sebuah cabang diharapkan, dapat cabang remote '%s'"
11824
11818 -#: builtin/checkout.c:1393 builtin/checkout.c:1401
11825 +#: builtin/checkout.c:1388 builtin/checkout.c:1396
11826 #, c-format
11827 msgid "a branch is expected, got '%s'"
11828 msgstr "sebuah cabang diharapkan, dapat '%s'"
11829
11823 -#: builtin/checkout.c:1396
11830 +#: builtin/checkout.c:1391
11831 #, c-format
11832 msgid "a branch is expected, got commit '%s'"
11833 msgstr "sebuah cabang diharapkan, dapat komit '%s'"
11834
11828 -#: builtin/checkout.c:1412
11835 +#: builtin/checkout.c:1407
11836 msgid ""
11837 "cannot switch branch while merging\n"
11838 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -11834,7 +11841,7 @@ msgstr ""
11841 "Pertimbangkan untuk menggunakan \"git merge --quit\" atau \"git worktree add"
11842 "\"."
11843
11837 -#: builtin/checkout.c:1416
11844 +#: builtin/checkout.c:1411
11845 msgid ""
11846 "cannot switch branch in the middle of an am session\n"
11847 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -11842,7 +11849,7 @@ msgstr ""
11849 "tidak dapat mengganti cabang di tengah sesi am\n"
11850 "Pertimbangkan untuk menggunakan \"git am --quit\" atau \"git worktree add\"."
11851
11845 -#: builtin/checkout.c:1420
11852 +#: builtin/checkout.c:1415
11853 msgid ""
11854 "cannot switch branch while rebasing\n"
11855 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -11851,7 +11858,7 @@ msgstr ""
11858 "Pertimbangkan untuk menggunakan \"git rebase --quit\" atau \"git worktree add"
11859 "\"."
11860
11854 -#: builtin/checkout.c:1424
11861 +#: builtin/checkout.c:1419
11862 msgid ""
11863 "cannot switch branch while cherry-picking\n"
11864 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -11860,147 +11867,147 @@ msgstr ""
11867 "Pertimbangkan untuk menggunakan \"git cherry-pick --quit\" atau \"git "
11868 "worktree add\"."
11869
11863 -#: builtin/checkout.c:1428
11870 +#: builtin/checkout.c:1423
11871 msgid ""
11872 "cannot switch branch while reverting\n"
11873 "Consider \"git revert --quit\" or \"git worktree add\"."
11874 msgstr ""
11875 "tidak dapat mengganti cabang saat pembalikan\n"
11869 -"Pertimbangkan untuk menggunakan \"git revert --quit\" atau \"git "
11870 -"worktree add\"."
11876 +"Pertimbangkan untuk menggunakan \"git revert --quit\" atau \"git worktree add"
11877 +"\"."
11878
11872 -#: builtin/checkout.c:1432
11879 +#: builtin/checkout.c:1427
11880 msgid "you are switching branch while bisecting"
11881 msgstr "Anda mengganti cabang saat pembagian dua"
11882
11876 -#: builtin/checkout.c:1439
11883 +#: builtin/checkout.c:1434
11884 msgid "paths cannot be used with switching branches"
11885 msgstr "jalur tidak dapat digunakan dengan mengganti cabang"
11886
11880 -#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450
11887 +#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
11888 #, c-format
11889 msgid "'%s' cannot be used with switching branches"
11890 msgstr "'%s' tidak dapat digunakan dengan mengganti cabang"
11891
11885 -#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460
11886 -#: builtin/checkout.c:1465 builtin/checkout.c:1470
11892 +#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
11893 +#: builtin/checkout.c:1460 builtin/checkout.c:1465
11894 #, c-format
11895 msgid "'%s' cannot be used with '%s'"
11896 msgstr "'%s' tidak dapat digunakan dengan '%s'"
11897
11891 -#: builtin/checkout.c:1467
11898 +#: builtin/checkout.c:1462
11899 #, c-format
11900 msgid "'%s' cannot take <start-point>"
11901 msgstr "'%s' tidak bisa mengambil <titik-awal>"
11902
11896 -#: builtin/checkout.c:1475
11903 +#: builtin/checkout.c:1470
11904 #, c-format
11905 msgid "Cannot switch branch to a non-commit '%s'"
11906 msgstr "Tidak dapat mengganti cabang ke bukan komit '%s'"
11907
11901 -#: builtin/checkout.c:1482
11908 +#: builtin/checkout.c:1477
11909 msgid "missing branch or commit argument"
11910 msgstr "kehilangan argumen cabang atau komit"
11911
11905 -#: builtin/checkout.c:1525
11912 +#: builtin/checkout.c:1520
11913 msgid "perform a 3-way merge with the new branch"
11914 msgstr "lakukan penggabungan 3 arah dengan cabang baru"
11915
11909 -#: builtin/checkout.c:1526 builtin/log.c:1810 parse-options.h:323
11916 +#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
11917 msgid "style"
11918 msgstr "gaya"
11919
11913 -#: builtin/checkout.c:1527
11920 +#: builtin/checkout.c:1522
11921 msgid "conflict style (merge or diff3)"
11922 msgstr "gaya konflik (merge atau diff3)"
11923
11917 -#: builtin/checkout.c:1539 builtin/worktree.c:488
11924 +#: builtin/checkout.c:1534 builtin/worktree.c:488
11925 msgid "detach HEAD at named commit"
11926 msgstr "lepas HEAD pada komit bernama"
11927
11921 -#: builtin/checkout.c:1540
11928 +#: builtin/checkout.c:1535
11929 msgid "set upstream info for new branch"
11930 msgstr "setel info hulu untuk cabang baru"
11931
11925 -#: builtin/checkout.c:1542
11932 +#: builtin/checkout.c:1537
11933 msgid "force checkout (throw away local modifications)"
11934 msgstr "paksa checkout (buang modifikasi lokal)"
11935
11929 -#: builtin/checkout.c:1544
11936 +#: builtin/checkout.c:1539
11937 msgid "new-branch"
11938 msgstr "cabang baru"
11939
11933 -#: builtin/checkout.c:1544
11940 +#: builtin/checkout.c:1539
11941 msgid "new unparented branch"
11942 msgstr "cabang baru tanpa induk"
11943
11937 -#: builtin/checkout.c:1546 builtin/merge.c:301
11944 +#: builtin/checkout.c:1541 builtin/merge.c:301
11945 msgid "update ignored files (default)"
11946 msgstr "perbarui berkas yang diabaikan (default)"
11947
11941 -#: builtin/checkout.c:1549
11948 +#: builtin/checkout.c:1544
11949 msgid "do not check if another worktree is holding the given ref"
11950 msgstr ""
11951 "jangan periksa jika pohon kerja yang lain mempunyai referensi yang diberikan"
11952
11946 -#: builtin/checkout.c:1562
11953 +#: builtin/checkout.c:1557
11954 msgid "checkout our version for unmerged files"
11955 msgstr "checkout versi kami untuk berkas yang tak tergabung"
11956
11950 -#: builtin/checkout.c:1565
11957 +#: builtin/checkout.c:1560
11958 msgid "checkout their version for unmerged files"
11959 msgstr "checkout versi mereka untuk berkas yang tak tergabung"
11960
11954 -#: builtin/checkout.c:1569
11961 +#: builtin/checkout.c:1564
11962 msgid "do not limit pathspecs to sparse entries only"
11963 msgstr "jangan batasi jalur spek hanya ke entri tipis"
11964
11958 -#: builtin/checkout.c:1624
11965 +#: builtin/checkout.c:1622
11966 #, c-format
11967 msgid "-%c, -%c and --orphan are mutually exclusive"
11968 msgstr "-%c, -%c dan --orphan saling eksklusif"
11969
11963 -#: builtin/checkout.c:1628
11970 +#: builtin/checkout.c:1626
11971 msgid "-p and --overlay are mutually exclusive"
11972 msgstr "-p dan --overlay saling eksklusif"
11973
11967 -#: builtin/checkout.c:1665
11974 +#: builtin/checkout.c:1663
11975 msgid "--track needs a branch name"
11976 msgstr "--track butuh nama cabang"
11977
11971 -#: builtin/checkout.c:1670
11978 +#: builtin/checkout.c:1668
11979 #, c-format
11980 msgid "missing branch name; try -%c"
11981 msgstr "kehilangan nama cabang; coba -%c"
11982
11976 -#: builtin/checkout.c:1702
11983 +#: builtin/checkout.c:1700
11984 #, c-format
11985 msgid "could not resolve %s"
11986 msgstr "tidak dapat menyelesaikan %s"
11987
11981 -#: builtin/checkout.c:1718
11988 +#: builtin/checkout.c:1716
11989 msgid "invalid path specification"
11990 msgstr "spesifikasi jalur tidak valid"
11991
11985 -#: builtin/checkout.c:1725
11992 +#: builtin/checkout.c:1723
11993 #, c-format
11994 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
11995 msgstr "'%s' bukanlah commit dan cabang '%s' tidak dapat dibuat dari itu"
11996
11990 -#: builtin/checkout.c:1729
11997 +#: builtin/checkout.c:1727
11998 #, c-format
11999 msgid "git checkout: --detach does not take a path argument '%s'"
12000 msgstr "git checkout: --detach tidak mengambil argumen jalur '%s'"
12001
11995 -#: builtin/checkout.c:1738
12002 +#: builtin/checkout.c:1736
12003 msgid "--pathspec-from-file is incompatible with --detach"
12004 msgstr "--pathspec-from-file tidak kompatible dengan --detach"
12005
11999 -#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1630
12006 +#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
12007 msgid "--pathspec-from-file is incompatible with --patch"
12008 msgstr "--pathspec-from-file tidak kompatibel dengan --patch"
12009
12003 -#: builtin/checkout.c:1754
12010 +#: builtin/checkout.c:1752
12011 msgid ""
12012 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
12013 "checking out of the index."
@@ -12008,70 +12015,71 @@ msgstr ""
12015 "git checkout: --ours/--theirs, --force dan --merge tidak kompatibel saat\n"
12016 "men-checkout index"
12017
12011 -#: builtin/checkout.c:1759
12018 +#: builtin/checkout.c:1757
12019 msgid "you must specify path(s) to restore"
12020 msgstr "Anda harus sebutkan jalur untuk dipulihkan"
12021
12015 -#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836
12016 -#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170
12017 -#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:484
12022 +#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
12023 +#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
12024 +#: builtin/remote.c:172 builtin/submodule--helper.c:2736
12025 +#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
12026 #: builtin/worktree.c:486
12027 msgid "branch"
12028 msgstr "cabang"
12029
12022 -#: builtin/checkout.c:1786
12030 +#: builtin/checkout.c:1784
12031 msgid "create and checkout a new branch"
12032 msgstr "buat dan checkout cabang baru"
12033
12026 -#: builtin/checkout.c:1788
12034 +#: builtin/checkout.c:1786
12035 msgid "create/reset and checkout a branch"
12036 msgstr "buat/setel ulang dan checkout cabang"
12037
12030 -#: builtin/checkout.c:1789
12038 +#: builtin/checkout.c:1787
12039 msgid "create reflog for new branch"
12040 msgstr "buat reflog untuk cabang baru"
12041
12034 -#: builtin/checkout.c:1791
12042 +#: builtin/checkout.c:1789
12043 msgid "second guess 'git checkout <no-such-branch>' (default)"
12044 msgstr "tebakan kedua 'git checkout <tidak-ada-cabang-seperti-itu>' (default)"
12045
12038 -#: builtin/checkout.c:1792
12046 +#: builtin/checkout.c:1790
12047 msgid "use overlay mode (default)"
12048 msgstr "gunakan mode hamparan (default)"
12049
12042 -#: builtin/checkout.c:1837
12050 +#: builtin/checkout.c:1835
12051 msgid "create and switch to a new branch"
12052 msgstr "buat dan ganti ke cabang baru"
12053
12046 -#: builtin/checkout.c:1839
12054 +#: builtin/checkout.c:1837
12055 msgid "create/reset and switch to a branch"
12056 msgstr "buat/setel ulang dan ganti ke cabang"
12057
12050 -#: builtin/checkout.c:1841
12058 +#: builtin/checkout.c:1839
12059 msgid "second guess 'git switch <no-such-branch>'"
12060 msgstr "tebakan kedua 'git switch <tidak-ada-cabang-seperti-itu>'"
12061
12054 -#: builtin/checkout.c:1843
12062 +#: builtin/checkout.c:1841
12063 msgid "throw away local modifications"
12064 msgstr "buang modifikasi lokal"
12065
12058 -#: builtin/checkout.c:1877
12066 +#: builtin/checkout.c:1875
12067 msgid "which tree-ish to checkout from"
12068 msgstr "mana mirip-cabang untuk di-checkout"
12069
12062 -#: builtin/checkout.c:1879
12070 +#: builtin/checkout.c:1877
12071 msgid "restore the index"
12072 msgstr "pulihkan indeks"
12073
12066 -#: builtin/checkout.c:1881
12074 +#: builtin/checkout.c:1879
12075 msgid "restore the working tree (default)"
12076 msgstr "pulihkan pohon kerja (default)"
12077
12070 -#: builtin/checkout.c:1883
12078 +#: builtin/checkout.c:1881
12079 msgid "ignore unmerged entries"
12080 msgstr "abaikan entri yang tak tergabung"
12081
12074 -#: builtin/checkout.c:1884
12082 +#: builtin/checkout.c:1882
12083 msgid "use overlay mode"
12084 msgstr "gunakan mode hamparan"
12085
@@ -12301,13 +12309,13 @@ msgstr "direktori templat"
12309 msgid "directory from which templates will be used"
12310 msgstr "direktori dimana templat akan digunakan"
12311
12304 -#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1831
12305 -#: builtin/submodule--helper.c:2336
12312 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
12313 +#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
12314 msgid "reference repository"
12315 msgstr "repositori rujukan"
12316
12309 -#: builtin/clone.c:123 builtin/submodule--helper.c:1833
12310 -#: builtin/submodule--helper.c:2338
12317 +#: builtin/clone.c:123 builtin/submodule--helper.c:1901
12318 +#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
12319 msgid "use --reference only while cloning"
12320 msgstr "gunakan --reference hanya pada saat kloning"
12321
@@ -12356,8 +12364,8 @@ msgstr "revisi"
12364 msgid "deepen history of shallow clone, excluding rev"
12365 msgstr "perdalam riwayat klon dangkal, tidak termasuk rev"
12366
12359 -#: builtin/clone.c:137 builtin/submodule--helper.c:1843
12360 -#: builtin/submodule--helper.c:2352
12367 +#: builtin/clone.c:137 builtin/submodule--helper.c:1911
12368 +#: builtin/submodule--helper.c:2369
12369 msgid "clone only one branch, HEAD or --branch"
12370 msgstr "klon hanya satu cabang, HEAD atau --branch"
12371
@@ -13396,36 +13404,36 @@ msgstr "ok merekam perubahan kosong"
13404 msgid "ok to record a change with an empty message"
13405 msgstr "ok merekam perubahan dengan pesan kosong"
13406
13399 -#: builtin/commit.c:1747
13407 +#: builtin/commit.c:1750
13408 #, c-format
13409 msgid "Corrupt MERGE_HEAD file (%s)"
13410 msgstr "Berkas MERGE_HEAD (%s) rusak"
13411
13404 -#: builtin/commit.c:1754
13412 +#: builtin/commit.c:1757
13413 msgid "could not read MERGE_MODE"
13414 msgstr "tidak dapat membaca MERGE_MODE"
13415
13408 -#: builtin/commit.c:1775
13416 +#: builtin/commit.c:1778
13417 #, c-format
13418 msgid "could not read commit message: %s"
13419 msgstr "tidak dapat membaca pesan komit: %s"
13420
13413 -#: builtin/commit.c:1782
13421 +#: builtin/commit.c:1785
13422 #, c-format
13423 msgid "Aborting commit due to empty commit message.\n"
13424 msgstr "Batalkan komit karena pesan komit kosong.\n"
13425
13418 -#: builtin/commit.c:1787
13426 +#: builtin/commit.c:1790
13427 #, c-format
13428 msgid "Aborting commit; you did not edit the message.\n"
13429 msgstr "Batalkan komit; Anda tidak menyunting pesan.\n"
13430
13423 -#: builtin/commit.c:1798
13431 +#: builtin/commit.c:1801
13432 #, c-format
13433 msgid "Aborting commit due to empty commit message body.\n"
13434 msgstr "Batalkan komit karena badan pesan komit kosong.\n"
13435
13428 -#: builtin/commit.c:1834
13436 +#: builtin/commit.c:1837
13437 msgid ""
13438 "repository has been updated, but unable to write\n"
13439 "new_index file. Check that disk is not full and quota is\n"
@@ -13833,7 +13841,9 @@ msgstr "tidak ada tag yang tepat cocok dengan '%s'"
13841 #: builtin/describe.c:330
13842 #, c-format
13843 msgid "No exact match on refs or tags, searching to describe\n"
13836 -msgstr "tidak ada kecocokan eksak pada referensi atau tag, mencari untuk menjelaskan \n"
13844 +msgstr ""
13845 +"tidak ada kecocokan eksak pada referensi atau tag, mencari untuk "
13846 +"menjelaskan \n"
13847
13848 #: builtin/describe.c:397
13849 #, c-format
@@ -14769,15 +14779,15 @@ msgstr ""
14779 msgid "git for-each-repo --config=<config> <command-args>"
14780 msgstr ""
14781
14772 -#: builtin/for-each-repo.c:37
14782 +#: builtin/for-each-repo.c:34
14783 msgid "config"
14784 msgstr ""
14785
14776 -#: builtin/for-each-repo.c:38
14786 +#: builtin/for-each-repo.c:35
14787 msgid "config key storing a list of repository paths"
14788 msgstr ""
14789
14780 -#: builtin/for-each-repo.c:46
14790 +#: builtin/for-each-repo.c:43
14791 msgid "missing --config=<config>"
14792 msgstr ""
14793
@@ -15432,7 +15442,8 @@ msgstr "cetak baris kosong di antara cocokan dari berkas yang berbeda"
15442
15443 #: builtin/grep.c:903
15444 msgid "show filename only once above matches from same file"
15435 -msgstr "perlihatkan nama berkas hanya sekali di atas cocokan dari berkas yang sama"
15445 +msgstr ""
15446 +"perlihatkan nama berkas hanya sekali di atas cocokan dari berkas yang sama"
15447
15448 #: builtin/grep.c:906
15449 msgid "show <n> context lines before and after matches"
@@ -17116,38 +17127,38 @@ msgstr "Tidak ada pesan komit -- tak perbarui HEAD\n"
17127 msgid "'%s' does not point to a commit"
17128 msgstr "'%s' tidak menunjuk pada sebuah komit"
17129
17119 -#: builtin/merge.c:602
17130 +#: builtin/merge.c:603
17131 #, c-format
17132 msgid "Bad branch.%s.mergeoptions string: %s"
17133 msgstr "Untai branch.%s.mergeoptions jelek: %s"
17134
17124 -#: builtin/merge.c:728
17135 +#: builtin/merge.c:729
17136 msgid "Not handling anything other than two heads merge."
17137 msgstr "Tak tangani apapun selain penggabungan dua kepala."
17138
17128 -#: builtin/merge.c:741
17139 +#: builtin/merge.c:742
17140 #, c-format
17141 msgid "Unknown option for merge-recursive: -X%s"
17142 msgstr "Opsi merge-recursive tak dikenal: -X%s"
17143
17133 -#: builtin/merge.c:760 t/helper/test-fast-rebase.c:223
17144 +#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
17145 #, c-format
17146 msgid "unable to write %s"
17147 msgstr "tidak dapat menulis %s"
17148
17138 -#: builtin/merge.c:812
17149 +#: builtin/merge.c:813
17150 #, c-format
17151 msgid "Could not read from '%s'"
17152 msgstr "Tidak dapat membaca dari '%s'"
17153
17143 -#: builtin/merge.c:821
17154 +#: builtin/merge.c:822
17155 #, c-format
17156 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
17157 msgstr ""
17158 "Tak mengkomit penggabungan; gunakan 'git commit' untuk menyelesaikan "
17159 "penggabungan.\n"
17160
17150 -#: builtin/merge.c:827
17161 +#: builtin/merge.c:828
17162 msgid ""
17163 "Please enter a commit message to explain why this merge is necessary,\n"
17164 "especially if it merges an updated upstream into a topic branch.\n"
@@ -17157,11 +17168,11 @@ msgstr ""
17168 "diperlukan, khususnya jika itu menggabungkan hulu terbarui ke cabang\n"
17169 "topik.\n"
17170
17160 -#: builtin/merge.c:832
17171 +#: builtin/merge.c:833
17172 msgid "An empty message aborts the commit.\n"
17173 msgstr "Pesan kosong membatalkan komit.\n"
17174
17164 -#: builtin/merge.c:835
17175 +#: builtin/merge.c:836
17176 #, c-format
17177 msgid ""
17178 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -17170,72 +17181,72 @@ msgstr ""
17181 "Baris yang diawali dengan '%c' akan diabaikan, dan pesan kosong batalkan\n"
17182 "komit.\n"
17183
17173 -#: builtin/merge.c:888
17184 +#: builtin/merge.c:889
17185 msgid "Empty commit message."
17186 msgstr "Pesan komit kosong"
17187
17177 -#: builtin/merge.c:903
17188 +#: builtin/merge.c:904
17189 #, c-format
17190 msgid "Wonderful.\n"
17191 msgstr "Luar biasa.\n"
17192
17182 -#: builtin/merge.c:964
17193 +#: builtin/merge.c:965
17194 #, c-format
17195 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
17196 msgstr "Penggabungan otomatis gagal; selesaikan konflik lalu komit hasilnya.\n"
17197
17187 -#: builtin/merge.c:1003
17198 +#: builtin/merge.c:1004
17199 msgid "No current branch."
17200 msgstr "Tidak ada cabang saat ini."
17201
17191 -#: builtin/merge.c:1005
17202 +#: builtin/merge.c:1006
17203 msgid "No remote for the current branch."
17204 msgstr "Tidak ada remote untuk cabang saat ini."
17205
17195 -#: builtin/merge.c:1007
17206 +#: builtin/merge.c:1008
17207 msgid "No default upstream defined for the current branch."
17208 msgstr "Tidak ada hulu asali yang ditentukan untuk cabang saat ini."
17209
17199 -#: builtin/merge.c:1012
17210 +#: builtin/merge.c:1013
17211 #, c-format
17212 msgid "No remote-tracking branch for %s from %s"
17213 msgstr "Tidak ada cabang pelacak remote untuk %s dari %s"
17214
17204 -#: builtin/merge.c:1069
17215 +#: builtin/merge.c:1070
17216 #, c-format
17217 msgid "Bad value '%s' in environment '%s'"
17218 msgstr "Nilai jelek '%s' dalam lingkungan '%s'"
17219
17209 -#: builtin/merge.c:1172
17220 +#: builtin/merge.c:1173
17221 #, c-format
17222 msgid "not something we can merge in %s: %s"
17223 msgstr "bukan sesuatu yang kami bisa gabungkan di %s: %s"
17224
17214 -#: builtin/merge.c:1206
17225 +#: builtin/merge.c:1207
17226 msgid "not something we can merge"
17227 msgstr "bukan sesuatu yang kami bisa gabungkan"
17228
17218 -#: builtin/merge.c:1316
17229 +#: builtin/merge.c:1317
17230 msgid "--abort expects no arguments"
17231 msgstr "--abort harap tanpa argumen"
17232
17222 -#: builtin/merge.c:1320
17233 +#: builtin/merge.c:1321
17234 msgid "There is no merge to abort (MERGE_HEAD missing)."
17235 msgstr "Tidak ada penggabungan yang bisa dibatalkan (MERGE_HEAD hilang)."
17236
17226 -#: builtin/merge.c:1338
17237 +#: builtin/merge.c:1339
17238 msgid "--quit expects no arguments"
17239 msgstr "--quit harap tanpa argumen"
17240
17230 -#: builtin/merge.c:1351
17241 +#: builtin/merge.c:1352
17242 msgid "--continue expects no arguments"
17243 msgstr "--continue harap tanpa argumen"
17244
17234 -#: builtin/merge.c:1355
17245 +#: builtin/merge.c:1356
17246 msgid "There is no merge in progress (MERGE_HEAD missing)."
17247 msgstr "Tidak ada penggabungan yang sedang berlangsung (MERGE_HEAD hilang)."
17248
17238 -#: builtin/merge.c:1371
17249 +#: builtin/merge.c:1372
17250 msgid ""
17251 "You have not concluded your merge (MERGE_HEAD exists).\n"
17252 "Please, commit your changes before you merge."
@@ -17243,7 +17254,7 @@ msgstr ""
17254 "Anda belum mengakhiri penggabungan Anda (MERGE_HEAD ada).\n"
17255 "Mohon komit perubahan Anda sebelum Anda gabungkan."
17256
17246 -#: builtin/merge.c:1378
17257 +#: builtin/merge.c:1379
17258 msgid ""
17259 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
17260 "Please, commit your changes before you merge."
@@ -17251,89 +17262,89 @@ msgstr ""
17262 "Anda belum mengakhiri pemetikan ceri Anda (CHERRY_PICK_HEAD ada).\n"
17263 "Mohon komit perubahan Anda sebelum Anda gabungkan."
17264
17254 -#: builtin/merge.c:1381
17265 +#: builtin/merge.c:1382
17266 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
17267 msgstr "Anda belum mengakhiri pemetikan ceri Anda (CHERRY_PICK_HEAD ada)."
17268
17258 -#: builtin/merge.c:1395
17269 +#: builtin/merge.c:1396
17270 msgid "You cannot combine --squash with --no-ff."
17271 msgstr "Anda tidak dapat menggabungkan --squash dengan --no-ff."
17272
17262 -#: builtin/merge.c:1397
17273 +#: builtin/merge.c:1398
17274 msgid "You cannot combine --squash with --commit."
17275 msgstr "Anda tidak dapat menggabungkan --squash dengan --commit"
17276
17266 -#: builtin/merge.c:1413
17277 +#: builtin/merge.c:1414
17278 msgid "No commit specified and merge.defaultToUpstream not set."
17279 msgstr ""
17280 "Tidak ada komit yang disebutkan dan merge.defaultToUpstream tidak disetel."
17281
17271 -#: builtin/merge.c:1430
17282 +#: builtin/merge.c:1431
17283 msgid "Squash commit into empty head not supported yet"
17284 msgstr "Lumat komit ke kepala kosong belum didukung"
17285
17275 -#: builtin/merge.c:1432
17286 +#: builtin/merge.c:1433
17287 msgid "Non-fast-forward commit does not make sense into an empty head"
17288 msgstr "Komit nir maju cepat tidak masuk akal ke kepala kosong"
17289
17279 -#: builtin/merge.c:1437
17290 +#: builtin/merge.c:1438
17291 #, c-format
17292 msgid "%s - not something we can merge"
17293 msgstr "%s - bukan sesuatu yang kami bisa gabungkan"
17294
17284 -#: builtin/merge.c:1439
17295 +#: builtin/merge.c:1440
17296 msgid "Can merge only exactly one commit into empty head"
17297 msgstr "Hanya bisa menggabungkan tepantnya satu komit ke kepala kosong"
17298
17288 -#: builtin/merge.c:1520
17299 +#: builtin/merge.c:1521
17300 msgid "refusing to merge unrelated histories"
17301 msgstr "menolak menggabungkan riwayat tak terkait"
17302
17292 -#: builtin/merge.c:1539
17303 +#: builtin/merge.c:1540
17304 #, c-format
17305 msgid "Updating %s..%s\n"
17306 msgstr "Memperbarui %s..%s\n"
17307
17297 -#: builtin/merge.c:1585
17308 +#: builtin/merge.c:1587
17309 #, c-format
17310 msgid "Trying really trivial in-index merge...\n"
17311 msgstr "Mencoba penggabungan dalam indeks yang sangat sepele\n"
17312
17302 -#: builtin/merge.c:1592
17313 +#: builtin/merge.c:1594
17314 #, c-format
17315 msgid "Nope.\n"
17316 msgstr "Tidak.\n"
17317
17307 -#: builtin/merge.c:1623
17318 +#: builtin/merge.c:1625
17319 msgid "Not possible to fast-forward, aborting."
17320 msgstr "Tidak mungkin untuk maju cepat, batalkan."
17321
17311 -#: builtin/merge.c:1651 builtin/merge.c:1716
17322 +#: builtin/merge.c:1653 builtin/merge.c:1719
17323 #, c-format
17324 msgid "Rewinding the tree to pristine...\n"
17325 msgstr "Memutar ulang pohon ke asli...\n"
17326
17316 -#: builtin/merge.c:1655
17327 +#: builtin/merge.c:1657
17328 #, c-format
17329 msgid "Trying merge strategy %s...\n"
17330 msgstr "Mencoba strategi penggabungan %s...\n"
17331
17321 -#: builtin/merge.c:1707
17332 +#: builtin/merge.c:1709
17333 #, c-format
17334 msgid "No merge strategy handled the merge.\n"
17335 msgstr "Tidak ada strategi yang menangani penggabungan.\n"
17336
17326 -#: builtin/merge.c:1709
17337 +#: builtin/merge.c:1711
17338 #, c-format
17339 msgid "Merge with strategy %s failed.\n"
17340 msgstr "Penggabungan dengan strategi %s gagal.\n"
17341
17331 -#: builtin/merge.c:1718
17342 +#: builtin/merge.c:1721
17343 #, c-format
17333 -msgid "Using the %s to prepare resolving by hand.\n"
17334 -msgstr "Menggunakan %s untuk menyiapkan penyelesaian dengan tangan.\n"
17344 +msgid "Using the %s strategy to prepare resolving by hand.\n"
17345 +msgstr "Menggunakan strategi %s untuk menyiapkan penyelesaian dengan tangan.\n"
17346
17336 -#: builtin/merge.c:1732
17347 +#: builtin/merge.c:1735
17348 #, c-format
17349 msgid "Automatic merge went well; stopped before committing as requested\n"
17350 msgstr ""
@@ -19621,7 +19632,7 @@ msgid "fatal: no such branch/commit '%s'"
19632 msgstr "fatal: tidak ada cabang/komit seperti '%s'"
19633
19634 #: builtin/rebase.c:1929 builtin/submodule--helper.c:39
19624 -#: builtin/submodule--helper.c:2414
19635 +#: builtin/submodule--helper.c:2431
19636 #, c-format
19637 msgid "No such ref: %s"
19638 msgstr "Tidak ada referensi seperti: %s"
@@ -20943,89 +20954,89 @@ msgstr ""
20954
20955 #: builtin/revert.c:24
20956 msgid "git revert [<options>] <commit-ish>..."
20946 -msgstr ""
20957 +msgstr "git revert [<opsi>] <mirip-komit>..."
20958
20959 #: builtin/revert.c:25
20960 msgid "git revert <subcommand>"
20950 -msgstr ""
20961 +msgstr "git revert <subperintah>"
20962
20963 #: builtin/revert.c:30
20964 msgid "git cherry-pick [<options>] <commit-ish>..."
20954 -msgstr ""
20965 +msgstr "git cherry-pick [<opsi>] <mirip-komit>..."
20966
20967 #: builtin/revert.c:31
20968 msgid "git cherry-pick <subcommand>"
20958 -msgstr ""
20969 +msgstr "git cherry-pick <subperintah>"
20970
20971 #: builtin/revert.c:72
20972 #, c-format
20973 msgid "option `%s' expects a number greater than zero"
20963 -msgstr ""
20974 +msgstr "opsi `%s' harap sebuah angka lebih dari nol"
20975
20976 #: builtin/revert.c:92
20977 #, c-format
20978 msgid "%s: %s cannot be used with %s"
20968 -msgstr ""
20979 +msgstr "%s: %s tidak dapat digunakan dengan %s"
20980
20981 #: builtin/revert.c:102
20982 msgid "end revert or cherry-pick sequence"
20972 -msgstr ""
20983 +msgstr "akhiri rangkaian pembalikan atau pemetikan ceri"
20984
20985 #: builtin/revert.c:103
20986 msgid "resume revert or cherry-pick sequence"
20976 -msgstr ""
20987 +msgstr "lanjutkan rangkaian pembalikan atau pemetikan ceri"
20988
20989 #: builtin/revert.c:104
20990 msgid "cancel revert or cherry-pick sequence"
20980 -msgstr ""
20991 +msgstr "batalkan rangkaian pembalikan atau pemetikan ceri"
20992
20993 #: builtin/revert.c:105
20994 msgid "skip current commit and continue"
20984 -msgstr ""
20995 +msgstr "lewati komit saat ini dan lanjutkan"
20996
20997 #: builtin/revert.c:107
20998 msgid "don't automatically commit"
20988 -msgstr ""
20999 +msgstr "jangan komit otomatis"
21000
21001 #: builtin/revert.c:108
21002 msgid "edit the commit message"
20992 -msgstr ""
21003 +msgstr "sunting pesan komit"
21004
21005 #: builtin/revert.c:111
21006 msgid "parent-number"
20996 -msgstr ""
21007 +msgstr "nomor-induk"
21008
21009 #: builtin/revert.c:112
21010 msgid "select mainline parent"
21000 -msgstr ""
21011 +msgstr "pilih induk garis utama"
21012
21013 #: builtin/revert.c:114
21014 msgid "merge strategy"
21004 -msgstr ""
21015 +msgstr "strategi penggabungan"
21016
21017 #: builtin/revert.c:116
21018 msgid "option for merge strategy"
21008 -msgstr ""
21019 +msgstr "opsi untuk strategi penggabungan"
21020
21021 #: builtin/revert.c:125
21022 msgid "append commit name"
21012 -msgstr ""
21023 +msgstr "tambahkan nama komit"
21024
21025 #: builtin/revert.c:127
21026 msgid "preserve initially empty commits"
21016 -msgstr ""
21027 +msgstr "pertahankan komit kosong awal"
21028
21029 #: builtin/revert.c:129
21030 msgid "keep redundant, empty commits"
21020 -msgstr ""
21031 +msgstr "simpan komit kosong mubazir"
21032
21033 #: builtin/revert.c:237
21034 msgid "revert failed"
21024 -msgstr ""
21035 +msgstr "pembalikan gagal"
21036
21037 #: builtin/revert.c:250
21038 msgid "cherry-pick failed"
21028 -msgstr ""
21039 +msgstr "pemetikan ceri gagal"
21040
21041 #: builtin/rm.c:20
21042 msgid "git rm [<options>] [--] <file>..."
@@ -21260,7 +21271,8 @@ msgstr "perlihatkan dasar penggabungan yang mungkin"
21271
21272 #: builtin/show-branch.c:662
21273 msgid "show refs unreachable from any other ref"
21263 -msgstr "perlihatkan referensi yang tidak dapat dicapai dari referensi yang lainnya"
21274 +msgstr ""
21275 +"perlihatkan referensi yang tidak dapat dicapai dari referensi yang lainnya"
21276
21277 #: builtin/show-branch.c:664
21278 msgid "show commits in topological order"
@@ -21290,7 +21302,8 @@ msgstr "perlihatkan <n> entri ref-log terkini dimulai dari dasar"
21302 msgid ""
21303 "--reflog is incompatible with --all, --remotes, --independent or --merge-base"
21304 msgstr ""
21293 -"--reflog tidak kompatibel dengan --all, --remotes, --independent atau --merge-base"
21305 +"--reflog tidak kompatibel dengan --all, --remotes, --independent atau --"
21306 +"merge-base"
21307
21308 #: builtin/show-branch.c:735
21309 msgid "no branches given, and HEAD is not valid"
@@ -21342,8 +21355,8 @@ msgid ""
21355 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
21356 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
21357 msgstr ""
21345 -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] "
21346 -"[-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pola>...]"
21358 +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
21359 +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pola>...]"
21360
21361 #: builtin/show-ref.c:13
21362 msgid "git show-ref --exclude-existing[=<pattern>]"
@@ -21379,7 +21392,9 @@ msgstr "jangan cetak hasil ke keluaran standar (berguna dengan --verify)"
21392
21393 #: builtin/show-ref.c:179
21394 msgid "show refs from stdin that aren't in local repository"
21382 -msgstr "perlihatkan referensi dari masukan standar yang tidak ada dalam repositori lokal"
21395 +msgstr ""
21396 +"perlihatkan referensi dari masukan standar yang tidak ada dalam repositori "
21397 +"lokal"
21398
21399 #: builtin/sparse-checkout.c:22
21400 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
@@ -21426,37 +21441,37 @@ msgstr ""
21441 msgid "failed to open '%s'"
21442 msgstr ""
21443
21429 -#: builtin/sparse-checkout.c:419
21444 +#: builtin/sparse-checkout.c:413
21445 #, c-format
21446 msgid "could not normalize path %s"
21447 msgstr ""
21448
21434 -#: builtin/sparse-checkout.c:431
21449 +#: builtin/sparse-checkout.c:425
21450 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
21451 msgstr ""
21452
21438 -#: builtin/sparse-checkout.c:456
21453 +#: builtin/sparse-checkout.c:450
21454 #, c-format
21455 msgid "unable to unquote C-style string '%s'"
21456 msgstr ""
21457
21443 -#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534
21458 +#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
21459 msgid "unable to load existing sparse-checkout patterns"
21460 msgstr ""
21461
21447 -#: builtin/sparse-checkout.c:579
21462 +#: builtin/sparse-checkout.c:573
21463 msgid "read patterns from standard in"
21464 msgstr ""
21465
21451 -#: builtin/sparse-checkout.c:594
21466 +#: builtin/sparse-checkout.c:588
21467 msgid "git sparse-checkout reapply"
21468 msgstr ""
21469
21455 -#: builtin/sparse-checkout.c:613
21470 +#: builtin/sparse-checkout.c:607
21471 msgid "git sparse-checkout disable"
21472 msgstr ""
21473
21459 -#: builtin/sparse-checkout.c:644
21474 +#: builtin/sparse-checkout.c:638
21475 msgid "error while refreshing working directory"
21476 msgstr ""
21477
@@ -21742,7 +21757,7 @@ msgstr ""
21757 msgid "prepend comment character and space to each line"
21758 msgstr ""
21759
21745 -#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2423
21760 +#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
21761 #, c-format
21762 msgid "Expecting a full ref name, got %s"
21763 msgstr "Mengharapkan nama referensi penuh, dapat %s"
@@ -21756,27 +21771,28 @@ msgstr "submodule--helper print-default-remote tidak membutuhkan argumen"
21771 msgid "cannot strip one component off url '%s'"
21772 msgstr "tidak dapat mencopot satu komponen dari url '%s'"
21773
21759 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
21774 +#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
21775 +#: builtin/submodule--helper.c:2891
21776 msgid "alternative anchor for relative paths"
21777 msgstr "jangkar alternatif untuk jalur relatif"
21778
21763 -#: builtin/submodule--helper.c:414
21779 +#: builtin/submodule--helper.c:416
21780 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
21781 msgstr "git submodule--helper list [--prefix=<jalur>] [<jalur>...]"
21782
21767 -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629
21768 -#: builtin/submodule--helper.c:652
21783 +#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
21784 +#: builtin/submodule--helper.c:654
21785 #, c-format
21786 msgid "No url found for submodule path '%s' in .gitmodules"
21787 msgstr ""
21788 "Tidak ada url yang ditemukan untuk jalur submodul '%s' dalam .gitmodules"
21789
21774 -#: builtin/submodule--helper.c:524
21790 +#: builtin/submodule--helper.c:526
21791 #, c-format
21792 msgid "Entering '%s'\n"
21793 msgstr "Memasuki '%s'\n"
21794
21779 -#: builtin/submodule--helper.c:527
21795 +#: builtin/submodule--helper.c:529
21796 #, c-format
21797 msgid ""
21798 "run_command returned non-zero status for %s\n"
@@ -21785,7 +21801,7 @@ msgstr ""
21801 "run_command mengembalikan status bukan nol untuk %s\n"
21802 "."
21803
21788 -#: builtin/submodule--helper.c:549
21804 +#: builtin/submodule--helper.c:551
21805 #, c-format
21806 msgid ""
21807 "run_command returned non-zero status while recursing in the nested "
@@ -21796,21 +21812,21 @@ msgstr ""
21812 "bersarang %s\n"
21813 "."
21814
21799 -#: builtin/submodule--helper.c:565
21815 +#: builtin/submodule--helper.c:567
21816 msgid "suppress output of entering each submodule command"
21817 msgstr "sembunyikan keluaran memasuki setiap perintah submodul"
21818
21803 -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888
21804 -#: builtin/submodule--helper.c:1487
21819 +#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
21820 +#: builtin/submodule--helper.c:1489
21821 msgid "recurse into nested submodules"
21822 msgstr "rekursi ke dalam submodul bersarang"
21823
21808 -#: builtin/submodule--helper.c:572
21824 +#: builtin/submodule--helper.c:574
21825 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
21826 msgstr ""
21827 "git submodule--helper foreach [--quiet] [--recursive] [--] [<perintah>]"
21828
21813 -#: builtin/submodule--helper.c:599
21829 +#: builtin/submodule--helper.c:601
21830 #, c-format
21831 msgid ""
21832 "could not look up configuration '%s'. Assuming this repository is its own "
@@ -21819,54 +21835,54 @@ msgstr ""
21835 "tidak dapat mencari konfigurasi '%s'. Asumsi bahwa repositori ini adalah "
21836 "hulu otoritatif tersendiri."
21837
21822 -#: builtin/submodule--helper.c:666
21838 +#: builtin/submodule--helper.c:668
21839 #, c-format
21840 msgid "Failed to register url for submodule path '%s'"
21841 msgstr "Gagal mendaftarkan url untuk jalur submodul '%s'"
21842
21827 -#: builtin/submodule--helper.c:670
21843 +#: builtin/submodule--helper.c:672
21844 #, c-format
21845 msgid "Submodule '%s' (%s) registered for path '%s'\n"
21846 msgstr "Submodul '%s' (%s) didaftarkan untuk jalur '%s'\n"
21847
21832 -#: builtin/submodule--helper.c:680
21848 +#: builtin/submodule--helper.c:682
21849 #, c-format
21850 msgid "warning: command update mode suggested for submodule '%s'\n"
21851 msgstr "peringatan: perintah mode pembaruan disarankan untuk submodul '%s'\n"
21852
21837 -#: builtin/submodule--helper.c:687
21853 +#: builtin/submodule--helper.c:689
21854 #, c-format
21855 msgid "Failed to register update mode for submodule path '%s'"
21856 msgstr "Gagal mendaftarkan mode pembaruan untuk jalur submodul '%s'"
21857
21842 -#: builtin/submodule--helper.c:709
21858 +#: builtin/submodule--helper.c:711
21859 msgid "suppress output for initializing a submodule"
21860 msgstr "sembunyikan keluaran menginisialisasi submodul"
21861
21846 -#: builtin/submodule--helper.c:714
21862 +#: builtin/submodule--helper.c:716
21863 msgid "git submodule--helper init [<options>] [<path>]"
21864 msgstr "git submodule--helper init [<opsi>] [<jalur>]"
21865
21850 -#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922
21866 +#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
21867 #, c-format
21868 msgid "no submodule mapping found in .gitmodules for path '%s'"
21869 msgstr "tidak ada pemetaan submodul ditemukan di .gitmodules untuk jalur '%s'"
21870
21855 -#: builtin/submodule--helper.c:835
21871 +#: builtin/submodule--helper.c:837
21872 #, c-format
21873 msgid "could not resolve HEAD ref inside the submodule '%s'"
21874 msgstr "tidak dapat menguraikan referensi HEAD di dalam submodul '%s'"
21875
21860 -#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
21876 +#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
21877 #, c-format
21878 msgid "failed to recurse into submodule '%s'"
21879 msgstr "gagal merekursi ke dalam submodul '%s'"
21880
21865 -#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
21881 +#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
21882 msgid "suppress submodule status output"
21883 msgstr "sembunyikan keluaran status submodul"
21884
21869 -#: builtin/submodule--helper.c:887
21885 +#: builtin/submodule--helper.c:889
21886 msgid ""
21887 "use commit stored in the index instead of the one stored in the submodule "
21888 "HEAD"
@@ -21874,97 +21890,96 @@ msgstr ""
21890 "gunakan komit yang disimpan di dalam indeks daripada yang disimpan di dalam "
21891 "HEAD"
21892
21877 -#: builtin/submodule--helper.c:893
21893 +#: builtin/submodule--helper.c:895
21894 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
21895 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<jalur>...]"
21896
21881 -#: builtin/submodule--helper.c:917
21897 +#: builtin/submodule--helper.c:919
21898 msgid "git submodule--helper name <path>"
21899 msgstr "git submodule--helper name <jalur>"
21900
21885 -#: builtin/submodule--helper.c:989
21901 +#: builtin/submodule--helper.c:991
21902 #, c-format
21903 msgid "* %s %s(blob)->%s(submodule)"
21904 msgstr "* %s %s(blob)->%s(submodul)"
21905
21890 -#: builtin/submodule--helper.c:992
21906 +#: builtin/submodule--helper.c:994
21907 #, c-format
21908 msgid "* %s %s(submodule)->%s(blob)"
21909 msgstr "* %s %s(submodul)->%s(blob)"
21910
21895 -#: builtin/submodule--helper.c:1005
21911 +#: builtin/submodule--helper.c:1007
21912 #, c-format
21913 msgid "%s"
21914 msgstr "%s"
21915
21900 -#: builtin/submodule--helper.c:1055
21916 +#: builtin/submodule--helper.c:1057
21917 #, c-format
21918 msgid "couldn't hash object from '%s'"
21919 msgstr "tidak dapat hash objek dari '%s'"
21920
21905 -#: builtin/submodule--helper.c:1059
21921 +#: builtin/submodule--helper.c:1061
21922 #, c-format
21923 msgid "unexpected mode %o\n"
21924 msgstr "mode tidak diharapkan %o\n"
21925
21910 -#: builtin/submodule--helper.c:1300
21926 +#: builtin/submodule--helper.c:1302
21927 msgid "use the commit stored in the index instead of the submodule HEAD"
21928 msgstr "gunakan komit yang disimpan di dalam indeks daripada HEAD submodul"
21929
21914 -#: builtin/submodule--helper.c:1302
21930 +#: builtin/submodule--helper.c:1304
21931 msgid "compare the commit in the index with that in the submodule HEAD"
21916 -msgstr ""
21917 -"bandingkan komit di dalam indeks dengan yang di dalam HEAD submodul"
21932 +msgstr "bandingkan komit di dalam indeks dengan yang di dalam HEAD submodul"
21933
21919 -#: builtin/submodule--helper.c:1304
21934 +#: builtin/submodule--helper.c:1306
21935 msgid "skip submodules with 'ignore_config' value set to 'all'"
21936 msgstr "lewatkan submodul dengan nilai 'ignore_config' disetel ke 'all'"
21937
21923 -#: builtin/submodule--helper.c:1306
21938 +#: builtin/submodule--helper.c:1308
21939 msgid "limit the summary size"
21940 msgstr "batasi ukuran ringkasan"
21941
21927 -#: builtin/submodule--helper.c:1311
21942 +#: builtin/submodule--helper.c:1313
21943 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
21944 msgstr "git submodule--helper summary [<opsi>] [<commit>] -- [<jalur>]"
21945
21931 -#: builtin/submodule--helper.c:1335
21946 +#: builtin/submodule--helper.c:1337
21947 msgid "could not fetch a revision for HEAD"
21948 msgstr "tidak dapat mengambil revisi untuk HEAD"
21949
21935 -#: builtin/submodule--helper.c:1340
21950 +#: builtin/submodule--helper.c:1342
21951 msgid "--cached and --files are mutually exclusive"
21952 msgstr "--cached dan --files saling eksklusif"
21953
21939 -#: builtin/submodule--helper.c:1407
21954 +#: builtin/submodule--helper.c:1409
21955 #, c-format
21956 msgid "Synchronizing submodule url for '%s'\n"
21957 msgstr "Mensinkronisasi url submodul untuk '%s'\n"
21958
21944 -#: builtin/submodule--helper.c:1413
21959 +#: builtin/submodule--helper.c:1415
21960 #, c-format
21961 msgid "failed to register url for submodule path '%s'"
21962 msgstr "gagal mendaftarkan url untuk jalur submodul '%s'"
21963
21949 -#: builtin/submodule--helper.c:1427
21964 +#: builtin/submodule--helper.c:1429
21965 #, c-format
21966 msgid "failed to get the default remote for submodule '%s'"
21967 msgstr "gagal mendapatkan remote asali untuk submodul '%s'"
21968
21954 -#: builtin/submodule--helper.c:1438
21969 +#: builtin/submodule--helper.c:1440
21970 #, c-format
21971 msgid "failed to update remote for submodule '%s'"
21972 msgstr "gagal memperbarui remote untuk submodul '%s'"
21973
21959 -#: builtin/submodule--helper.c:1485
21974 +#: builtin/submodule--helper.c:1487
21975 msgid "suppress output of synchronizing submodule url"
21976 msgstr "sembunyikan keluaran mensinkronisasi url submodul"
21977
21963 -#: builtin/submodule--helper.c:1492
21978 +#: builtin/submodule--helper.c:1494
21979 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
21980 msgstr "git submodule--helper sync [--quiet] [--recursive] [<jalur>]"
21981
21967 -#: builtin/submodule--helper.c:1546
21982 +#: builtin/submodule--helper.c:1548
21983 #, c-format
21984 msgid ""
21985 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -21973,7 +21988,7 @@ msgstr ""
21988 "Pohon kerja submodul '%s' berisi direktori .git (gunakan 'rm -rf' bila Anda "
21989 "benar-benar ingin menghapus itu termasuk semua riwayatnya)"
21990
21976 -#: builtin/submodule--helper.c:1558
21991 +#: builtin/submodule--helper.c:1560
21992 #, c-format
21993 msgid ""
21994 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -21982,46 +21997,46 @@ msgstr ""
21997 "Pohon kerja submodul '%s' berisi modifikasi lokal; gunakan '-f' untuk "
21998 "menyingkirkan itu"
21999
21985 -#: builtin/submodule--helper.c:1566
22000 +#: builtin/submodule--helper.c:1568
22001 #, c-format
22002 msgid "Cleared directory '%s'\n"
22003 msgstr "Direktori '%s' dibersihkan\n"
22004
21990 -#: builtin/submodule--helper.c:1568
22005 +#: builtin/submodule--helper.c:1570
22006 #, c-format
22007 msgid "Could not remove submodule work tree '%s'\n"
22008 msgstr "Tidak dapat menghapus pohon kerja submodul '%s'\n"
22009
21995 -#: builtin/submodule--helper.c:1579
22010 +#: builtin/submodule--helper.c:1581
22011 #, c-format
22012 msgid "could not create empty submodule directory %s"
22013 msgstr "tidak dapat membuat direktori submodul kosong %s"
22014
22000 -#: builtin/submodule--helper.c:1595
22015 +#: builtin/submodule--helper.c:1597
22016 #, c-format
22017 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
22018 msgstr "Submodul '%s' (%s) tak terdaftar untuk jalur '%s'\n"
22019
22005 -#: builtin/submodule--helper.c:1624
22020 +#: builtin/submodule--helper.c:1626
22021 msgid "remove submodule working trees even if they contain local changes"
22022 msgstr "hapus pohon kerja submodul bahkan jika itu berisi perubahan lokal"
22023
22009 -#: builtin/submodule--helper.c:1625
22024 +#: builtin/submodule--helper.c:1627
22025 msgid "unregister all submodules"
22026 msgstr "batal daftar semua submodul"
22027
22013 -#: builtin/submodule--helper.c:1630
22028 +#: builtin/submodule--helper.c:1632
22029 msgid ""
22030 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
22031 msgstr ""
22032 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<jalur>...]]"
22033
22019 -#: builtin/submodule--helper.c:1644
22034 +#: builtin/submodule--helper.c:1646
22035 msgid "Use '--all' if you really want to deinitialize all submodules"
22036 msgstr ""
22037 "Gunakan '--all' jika Anda benar-benar ingin deinisialisasi semua submodul"
22038
22024 -#: builtin/submodule--helper.c:1713
22039 +#: builtin/submodule--helper.c:1690
22040 msgid ""
22041 "An alternate computed from a superproject's alternate is invalid.\n"
22042 "To allow Git to clone without an alternate in such a case, set\n"
@@ -22033,46 +22048,68 @@ msgstr ""
22048 " itu, setel submodule.alternateErrorStrategy ke 'info' atau yang sama,\n"
22049 "kloning degan '--reference-if-able' daripada '--reference'."
22050
22036 -#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
22051 +#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
22052 #, c-format
22053 msgid "submodule '%s' cannot add alternate: %s"
22054 msgstr "submodul '%s' tidak dapat menambahkan pengganti: %s"
22055
22041 -#: builtin/submodule--helper.c:1791
22056 +#: builtin/submodule--helper.c:1768
22057 #, c-format
22058 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
22059 msgstr "Nilai '%s' untuk submodule.alternateErrorStrategy tidak dikenal"
22060
22046 -#: builtin/submodule--helper.c:1798
22061 +#: builtin/submodule--helper.c:1775
22062 #, c-format
22063 msgid "Value '%s' for submodule.alternateLocation is not recognized"
22064 msgstr "Nilai '%s' untuk submodule.alternateLocation tidak dikenal"
22065
22051 -#: builtin/submodule--helper.c:1822
22066 +#: builtin/submodule--helper.c:1800
22067 +#, c-format
22068 +msgid "refusing to create/use '%s' in another submodule's git dir"
22069 +msgstr ""
22070 +"menolak membuat/menggunakan '%s' di dalam direktori git submodul yang lain"
22071 +
22072 +#: builtin/submodule--helper.c:1841
22073 +#, c-format
22074 +msgid "clone of '%s' into submodule path '%s' failed"
22075 +msgstr "gagal mengkloning '%s' ke dalam jalur submodul '%s'"
22076 +
22077 +#: builtin/submodule--helper.c:1846
22078 +#, c-format
22079 +msgid "directory not empty: '%s'"
22080 +msgstr "direktori tidak kosong: '%s'"
22081 +
22082 +#: builtin/submodule--helper.c:1858
22083 +#, c-format
22084 +msgid "could not get submodule directory for '%s'"
22085 +msgstr "tidak dapat mendapatkan direktori submodul untuk '%s'"
22086 +
22087 +#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
22088 msgid "where the new submodule will be cloned to"
22089 msgstr "di mana submodul baru akan dikloning"
22090
22055 -#: builtin/submodule--helper.c:1825
22091 +#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
22092 msgid "name of the new submodule"
22093 msgstr "nama submodul baru"
22094
22059 -#: builtin/submodule--helper.c:1828
22095 +#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
22096 msgid "url where to clone the submodule from"
22097 msgstr "url di mana submodul dikloning"
22098
22063 -#: builtin/submodule--helper.c:1836
22099 +#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
22100 msgid "depth for shallow clones"
22101 msgstr "kedalaman untuk kloning dangkal"
22102
22067 -#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
22103 +#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
22104 +#: builtin/submodule--helper.c:2909
22105 msgid "force cloning progress"
22106 msgstr "paksa perkembangan kloning"
22107
22071 -#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
22108 +#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
22109 msgid "disallow cloning into non-empty directory"
22110 msgstr "tak perbolehkan kloning ke dalam direktori bukan kosong"
22111
22075 -#: builtin/submodule--helper.c:1848
22112 +#: builtin/submodule--helper.c:1916
22113 msgid ""
22114 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
22115 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -22082,103 +22119,82 @@ msgstr ""
22119 "<repositori>] [--name <nama>] [--depth <kedalaman>] [--single-branch] --url "
22120 "<url> --path <jalur>"
22121
22085 -#: builtin/submodule--helper.c:1873
22086 -#, c-format
22087 -msgid "refusing to create/use '%s' in another submodule's git dir"
22088 -msgstr ""
22089 -"menolak membuat/menggunakan '%s' di dalam direktori git submodul yang lain"
22090 -
22091 -#: builtin/submodule--helper.c:1884
22092 -#, c-format
22093 -msgid "clone of '%s' into submodule path '%s' failed"
22094 -msgstr "gagal mengkloning '%s' ke dalam jalur submodul '%s'"
22095 -
22096 -#: builtin/submodule--helper.c:1888
22097 -#, c-format
22098 -msgid "directory not empty: '%s'"
22099 -msgstr "direktori tidak kosong: '%s'"
22100 -
22101 -#: builtin/submodule--helper.c:1900
22102 -#, c-format
22103 -msgid "could not get submodule directory for '%s'"
22104 -msgstr "tidak dapat mendapatkan direktori submodul untuk '%s'"
22105 -
22106 -#: builtin/submodule--helper.c:1936
22122 +#: builtin/submodule--helper.c:1953
22123 #, c-format
22124 msgid "Invalid update mode '%s' for submodule path '%s'"
22125 msgstr "Mode pembaruan '%s' tidak valid untuk jalur submodul '%s'"
22126
22111 -#: builtin/submodule--helper.c:1940
22127 +#: builtin/submodule--helper.c:1957
22128 #, c-format
22129 msgid "Invalid update mode '%s' configured for submodule path '%s'"
22130 msgstr "Mode pembaruan '%s' tidak valid untuk jalur submodul '%s'"
22131
22116 -#: builtin/submodule--helper.c:2041
22132 +#: builtin/submodule--helper.c:2058
22133 #, c-format
22134 msgid "Submodule path '%s' not initialized"
22135 msgstr "Jalur submodul '%s' tidak diinisialisasi"
22136
22121 -#: builtin/submodule--helper.c:2045
22137 +#: builtin/submodule--helper.c:2062
22138 msgid "Maybe you want to use 'update --init'?"
22139 msgstr "Mungkin Anda ingin menggunakan 'update --init'?"
22140
22125 -#: builtin/submodule--helper.c:2075
22141 +#: builtin/submodule--helper.c:2092
22142 #, c-format
22143 msgid "Skipping unmerged submodule %s"
22144 msgstr "Melewati submodul tak tergabung %s"
22145
22130 -#: builtin/submodule--helper.c:2104
22146 +#: builtin/submodule--helper.c:2121
22147 #, c-format
22148 msgid "Skipping submodule '%s'"
22149 msgstr "Melewati submodul '%s'"
22150
22135 -#: builtin/submodule--helper.c:2254
22151 +#: builtin/submodule--helper.c:2271
22152 #, c-format
22153 msgid "Failed to clone '%s'. Retry scheduled"
22154 msgstr "Gagal mengkloning '%s'. Percobaan ulang dijadwalkan"
22155
22140 -#: builtin/submodule--helper.c:2265
22156 +#: builtin/submodule--helper.c:2282
22157 #, c-format
22158 msgid "Failed to clone '%s' a second time, aborting"
22159 msgstr "Gagal mengkloning '%s' untuk kedua kalinya, batalkan"
22160
22145 -#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
22161 +#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
22162 msgid "path into the working tree"
22163 msgstr "jalur ke dalam pohon kerja"
22164
22149 -#: builtin/submodule--helper.c:2330
22165 +#: builtin/submodule--helper.c:2347
22166 msgid "path into the working tree, across nested submodule boundaries"
22167 msgstr "jalur ke dalam pohon kerja, melintasi perbatasan submodul bersarang"
22168
22153 -#: builtin/submodule--helper.c:2334
22169 +#: builtin/submodule--helper.c:2351
22170 msgid "rebase, merge, checkout or none"
22171 msgstr "dasarkan ulang, gabungkan, checkout atau tidak sama sekali"
22172
22157 -#: builtin/submodule--helper.c:2340
22173 +#: builtin/submodule--helper.c:2357
22174 msgid "create a shallow clone truncated to the specified number of revisions"
22175 msgstr "buat klon dangkal terpotong hingga sejumlah revisi yang disebutkan"
22176
22161 -#: builtin/submodule--helper.c:2343
22177 +#: builtin/submodule--helper.c:2360
22178 msgid "parallel jobs"
22179 msgstr "pekerjaan paralel"
22180
22165 -#: builtin/submodule--helper.c:2345
22181 +#: builtin/submodule--helper.c:2362
22182 msgid "whether the initial clone should follow the shallow recommendation"
22183 msgstr "apakah klon awal seharusnya mengikuti rekomendasi dangkal"
22184
22169 -#: builtin/submodule--helper.c:2346
22185 +#: builtin/submodule--helper.c:2363
22186 msgid "don't print cloning progress"
22187 msgstr "jangan cetak perkembangan pengkloningan"
22188
22173 -#: builtin/submodule--helper.c:2357
22189 +#: builtin/submodule--helper.c:2374
22190 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
22191 msgstr "git submodule--helper update-clone [--prefix=<jalur>] [<jalur>...]"
22192
22177 -#: builtin/submodule--helper.c:2370
22193 +#: builtin/submodule--helper.c:2387
22194 msgid "bad value for update parameter"
22195 msgstr "nilai jelek untuk parameter pembaruan"
22196
22181 -#: builtin/submodule--helper.c:2418
22197 +#: builtin/submodule--helper.c:2435
22198 #, c-format
22199 msgid ""
22200 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -22187,84 +22203,142 @@ msgstr ""
22203 "Cabang submodul (%s) dikonfigurasikan untuk mewarisi cabang dari proyek "
22204 "super, tapi proyek super tidak pada cabang apapun"
22205
22190 -#: builtin/submodule--helper.c:2541
22206 +#: builtin/submodule--helper.c:2558
22207 #, c-format
22208 msgid "could not get a repository handle for submodule '%s'"
22209 msgstr "tidak dapat mendapat pegangan repositori untuk submodul '%s'"
22210
22195 -#: builtin/submodule--helper.c:2574
22211 +#: builtin/submodule--helper.c:2591
22212 msgid "recurse into submodules"
22213 msgstr "rekursi ke dalam submodul"
22214
22199 -#: builtin/submodule--helper.c:2580
22215 +#: builtin/submodule--helper.c:2597
22216 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
22217 msgstr "git submodule--helper absorb-git-dirs [<opsi>] [<jalur>...]"
22218
22203 -#: builtin/submodule--helper.c:2636
22219 +#: builtin/submodule--helper.c:2653
22220 msgid "check if it is safe to write to the .gitmodules file"
22221 msgstr "periksa apakah itu aman untuk menulis ke berkas .gitmodules"
22222
22207 -#: builtin/submodule--helper.c:2639
22223 +#: builtin/submodule--helper.c:2656
22224 msgid "unset the config in the .gitmodules file"
22225 msgstr "batal setel konfigurasi dalam berkas .gitmodules"
22226
22211 -#: builtin/submodule--helper.c:2644
22227 +#: builtin/submodule--helper.c:2661
22228 msgid "git submodule--helper config <name> [<value>]"
22229 msgstr "git submodule--helper config <nama> [<nilai>]"
22230
22215 -#: builtin/submodule--helper.c:2645
22231 +#: builtin/submodule--helper.c:2662
22232 msgid "git submodule--helper config --unset <name>"
22233 msgstr "git submodule--helper config --unset <nama>"
22234
22219 -#: builtin/submodule--helper.c:2646
22235 +#: builtin/submodule--helper.c:2663
22236 msgid "git submodule--helper config --check-writeable"
22237 msgstr "git submodule--helper config --check-writeable"
22238
22223 -#: builtin/submodule--helper.c:2665 git-submodule.sh:150
22239 +#: builtin/submodule--helper.c:2682 git-submodule.sh:150
22240 #, sh-format
22241 msgid "please make sure that the .gitmodules file is in the working tree"
22242 msgstr "mohom pastikan berkas .gitmodules di dalam pohon kerja"
22243
22228 -#: builtin/submodule--helper.c:2681
22244 +#: builtin/submodule--helper.c:2698
22245 msgid "suppress output for setting url of a submodule"
22246 msgstr "sembunyikan keluaran penyetelan url submodule"
22247
22232 -#: builtin/submodule--helper.c:2685
22248 +#: builtin/submodule--helper.c:2702
22249 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
22250 msgstr "git submodule--helper set-url [--quiet] <jalur> <url baru>"
22251
22236 -#: builtin/submodule--helper.c:2718
22252 +#: builtin/submodule--helper.c:2735
22253 msgid "set the default tracking branch to master"
22254 msgstr "setel cabang pelacak asali ke master"
22255
22240 -#: builtin/submodule--helper.c:2720
22256 +#: builtin/submodule--helper.c:2737
22257 msgid "set the default tracking branch"
22258 msgstr "setel cabang pelacak asali"
22259
22244 -#: builtin/submodule--helper.c:2724
22260 +#: builtin/submodule--helper.c:2741
22261 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
22262 msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <jalur>"
22263
22248 -#: builtin/submodule--helper.c:2725
22264 +#: builtin/submodule--helper.c:2742
22265 msgid ""
22266 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
22267 msgstr ""
22268 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <cabang> <jalur>"
22269
22254 -#: builtin/submodule--helper.c:2732
22270 +#: builtin/submodule--helper.c:2749
22271 msgid "--branch or --default required"
22272 msgstr "--branch atau --default dibutuhkan"
22273
22258 -#: builtin/submodule--helper.c:2735
22274 +#: builtin/submodule--helper.c:2752
22275 msgid "--branch and --default are mutually exclusive"
22276 msgstr "--branch dan --default saling eksklusif"
22277
22262 -#: builtin/submodule--helper.c:2792 git.c:449 git.c:724
22278 +#: builtin/submodule--helper.c:2815
22279 +#, c-format
22280 +msgid "Adding existing repo at '%s' to the index\n"
22281 +msgstr "Menambahkan repo yang sudah ada pada '%s' ke indeks\n"
22282 +
22283 +#: builtin/submodule--helper.c:2818
22284 +#, c-format
22285 +msgid "'%s' already exists and is not a valid git repo"
22286 +msgstr "'%s' sudah ada dan bukan repo git valid"
22287 +
22288 +#: builtin/submodule--helper.c:2828
22289 +#, c-format
22290 +msgid "A git directory for '%s' is found locally with remote(s):"
22291 +msgstr "Sebuah direktori git untuk '%s' ditemukan lokal dengan remote:"
22292 +
22293 +#: builtin/submodule--helper.c:2833
22294 +#, c-format
22295 +msgid ""
22296 +"If you want to reuse this local git directory instead of cloning again from\n"
22297 +" %s\n"
22298 +"use the '--force' option. If the local git directory is not the correct "
22299 +"repo\n"
22300 +"or if you are unsure what this means, choose another name with the '--name' "
22301 +"option.\n"
22302 +msgstr ""
22303 +"Jika Anda ingin menggunakan ulang direktori git lokal ini daripada "
22304 +"mengkloning lagi dari\n"
22305 +" %s\n"
22306 +"gynakan opsi '--force'. Jika direktori git lokal bukan repo yang benar\n"
22307 +"atau Anda tidak yakin apa maksudnya, pilih nama yang lain dengan opsi "
22308 +"'--name'.\n"
22309 +
22310 +#: builtin/submodule--helper.c:2842
22311 +#, c-format
22312 +msgid "Reactivating local git directory for submodule '%s'\n"
22313 +msgstr "Mengaktifkan ulang direktori git lokal untuk submodul '%s'\n"
22314 +
22315 +#: builtin/submodule--helper.c:2875
22316 +#, c-format
22317 +msgid "unable to checkout submodule '%s'"
22318 +msgstr "Tidak dapat men-checkout submodul '%s'"
22319 +
22320 +#: builtin/submodule--helper.c:2888
22321 +msgid "branch of repository to checkout on cloning"
22322 +msgstr "cabang repositori untuk di-checkout saat kloning"
22323 +
22324 +#: builtin/submodule--helper.c:2910
22325 +msgid "allow adding an otherwise ignored submodule path"
22326 +msgstr "perbolehkan menambah jalur submodul yang diabaikan"
22327 +
22328 +#: builtin/submodule--helper.c:2917
22329 +msgid ""
22330 +"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
22331 +"name <name>"
22332 +msgstr ""
22333 +"git submodule--helper add-clone [<opsi>...] --url <url> --path <path> "
22334 +"--name <nama>"
22335 +
22336 +#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
22337 #, c-format
22338 msgid "%s doesn't support --super-prefix"
22339 msgstr "%s tidak mendukung --super-prefix"
22340
22267 -#: builtin/submodule--helper.c:2798
22341 +#: builtin/submodule--helper.c:2991
22342 #, c-format
22343 msgid "'%s' is not a valid submodule--helper subcommand"
22344 msgstr "'%s' bukan subperintah submodule--helper valid"
@@ -24407,124 +24481,88 @@ msgstr ""
24481 msgid "'$sm_path' does not have a commit checked out"
24482 msgstr ""
24483
24410 -#: git-submodule.sh:249
24411 -#, sh-format
24412 -msgid "Adding existing repo at '$sm_path' to the index"
24413 -msgstr ""
24414 -
24415 -#: git-submodule.sh:251
24416 -#, sh-format
24417 -msgid "'$sm_path' already exists and is not a valid git repo"
24418 -msgstr ""
24419 -
24420 -#: git-submodule.sh:259
24421 -#, sh-format
24422 -msgid "A git directory for '$sm_name' is found locally with remote(s):"
24423 -msgstr ""
24424 -
24425 -#: git-submodule.sh:261
24426 -#, sh-format
24427 -msgid ""
24428 -"If you want to reuse this local git directory instead of cloning again from\n"
24429 -" $realrepo\n"
24430 -"use the '--force' option. If the local git directory is not the correct "
24431 -"repo\n"
24432 -"or you are unsure what this means choose another name with the '--name' "
24433 -"option."
24434 -msgstr ""
24435 -
24436 -#: git-submodule.sh:267
24437 -#, sh-format
24438 -msgid "Reactivating local git directory for submodule '$sm_name'."
24439 -msgstr ""
24440 -
24441 -#: git-submodule.sh:279
24442 -#, sh-format
24443 -msgid "Unable to checkout submodule '$sm_path'"
24444 -msgstr ""
24445 -
24446 -#: git-submodule.sh:284
24484 +#: git-submodule.sh:248
24485 #, sh-format
24486 msgid "Failed to add submodule '$sm_path'"
24487 msgstr ""
24488
24451 -#: git-submodule.sh:293
24489 +#: git-submodule.sh:257
24490 #, sh-format
24491 msgid "Failed to register submodule '$sm_path'"
24492 msgstr ""
24493
24456 -#: git-submodule.sh:568
24494 +#: git-submodule.sh:532
24495 #, sh-format
24496 msgid "Unable to find current revision in submodule path '$displaypath'"
24497 msgstr ""
24498
24461 -#: git-submodule.sh:578
24499 +#: git-submodule.sh:542
24500 #, sh-format
24501 msgid "Unable to fetch in submodule path '$sm_path'"
24502 msgstr ""
24503
24466 -#: git-submodule.sh:583
24504 +#: git-submodule.sh:547
24505 #, sh-format
24506 msgid ""
24507 "Unable to find current ${remote_name}/${branch} revision in submodule path "
24508 "'$sm_path'"
24509 msgstr ""
24510
24473 -#: git-submodule.sh:601
24511 +#: git-submodule.sh:565
24512 #, sh-format
24513 msgid ""
24514 "Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
24515 "$sha1:"
24516 msgstr ""
24517
24480 -#: git-submodule.sh:607
24518 +#: git-submodule.sh:571
24519 #, sh-format
24520 msgid ""
24521 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
24522 "Direct fetching of that commit failed."
24523 msgstr ""
24524
24487 -#: git-submodule.sh:614
24525 +#: git-submodule.sh:578
24526 #, sh-format
24527 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
24528 msgstr ""
24529
24492 -#: git-submodule.sh:615
24530 +#: git-submodule.sh:579
24531 #, sh-format
24532 msgid "Submodule path '$displaypath': checked out '$sha1'"
24533 msgstr ""
24534
24497 -#: git-submodule.sh:619
24535 +#: git-submodule.sh:583
24536 #, sh-format
24537 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
24538 msgstr ""
24539
24502 -#: git-submodule.sh:620
24540 +#: git-submodule.sh:584
24541 #, sh-format
24542 msgid "Submodule path '$displaypath': rebased into '$sha1'"
24543 msgstr ""
24544
24507 -#: git-submodule.sh:625
24545 +#: git-submodule.sh:589
24546 #, sh-format
24547 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
24548 msgstr ""
24549
24512 -#: git-submodule.sh:626
24550 +#: git-submodule.sh:590
24551 #, sh-format
24552 msgid "Submodule path '$displaypath': merged in '$sha1'"
24553 msgstr ""
24554
24517 -#: git-submodule.sh:631
24555 +#: git-submodule.sh:595
24556 #, sh-format
24557 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
24558 msgstr ""
24559
24522 -#: git-submodule.sh:632
24560 +#: git-submodule.sh:596
24561 #, sh-format
24562 msgid "Submodule path '$displaypath': '$command $sha1'"
24563 msgstr ""
24564
24527 -#: git-submodule.sh:663
24565 +#: git-submodule.sh:627
24566 #, sh-format
24567 msgid "Failed to recurse into submodule path '$displaypath'"
24568 msgstr ""