diff options
Diffstat (limited to 'po/id.po')
| -rw-r--r-- | po/id.po | 6717 |
1 files changed, 3422 insertions, 3295 deletions
@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2021-11-10 08:55+0800\n" +"POT-Creation-Date: 2022-01-17 08:34+0800\n" "PO-Revision-Date: 2021-08-14 09:35+0700\n" "Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n" "Language-Team: Indonesian\n" @@ -22,8 +22,8 @@ msgstr "" msgid "Huh (%s)?" msgstr "Huh (%s)" -#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512 -#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233 +#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509 +#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233 #: builtin/rebase.c:1642 msgid "could not read index" msgstr "tidak dapat membaca indeks" @@ -52,7 +52,7 @@ msgstr "Perbarui" msgid "could not stage '%s'" msgstr "tidak dapat menggelar '%s'" -#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718 +#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713 msgid "could not write index" msgstr "tidak dapat menulis indeks" @@ -68,8 +68,8 @@ msgstr[1] "%d jalur diperbarui\n" msgid "note: %s is untracked now.\n" msgstr "catatan: %s sekarang tak terlacak.\n" -#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298 -#: builtin/reset.c:151 +#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306 +#: builtin/reset.c:167 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry gagal untuk jalur '%s'" @@ -110,21 +110,21 @@ msgstr[1] "%d jalur ditambahkan\n" msgid "ignoring unmerged: %s" msgstr "mengabaikan tak tergabung: %s" -#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369 +#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371 #, c-format msgid "Only binary files changed.\n" msgstr "Hanya berkas biner yang berubah.\n" -#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371 +#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373 #, c-format msgid "No changes.\n" msgstr "Tidak ada perubahan.\n" -#: add-interactive.c:947 git-add--interactive.perl:1379 +#: add-interactive.c:947 git-add--interactive.perl:1381 msgid "Patch update" msgstr "Pembaruan tambalan" -#: add-interactive.c:986 git-add--interactive.perl:1792 +#: add-interactive.c:986 git-add--interactive.perl:1794 msgid "Review diff" msgstr "Tinjau diff" @@ -192,11 +192,11 @@ msgstr "pilih item bernomor" msgid "(empty) select nothing" msgstr "(empty) tidak pilih apapun" -#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896 +#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898 msgid "*** Commands ***" msgstr "*** Perintah ***" -#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893 +#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895 msgid "What now" msgstr "Apa sekarang" @@ -208,13 +208,13 @@ msgstr "tergelar" msgid "unstaged" msgstr "tak tergelar" -#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311 -#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128 -#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194 -#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857 -#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503 -#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573 -#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811 +#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367 +#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128 +#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858 +#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504 +#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574 +#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812 #: git-add--interactive.perl:213 msgid "path" msgstr "jalur" @@ -223,27 +223,27 @@ msgstr "jalur" msgid "could not refresh index" msgstr "tidak dapat menyegarkan indeks" -#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803 +#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805 #, c-format msgid "Bye.\n" msgstr "Sampai jumpa.\n" -#: add-patch.c:34 git-add--interactive.perl:1431 +#: add-patch.c:34 git-add--interactive.perl:1433 #, c-format, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "Gelar perubahan mode [y,n,q,a,d%s,?]? " -#: add-patch.c:35 git-add--interactive.perl:1432 +#: add-patch.c:35 git-add--interactive.perl:1434 #, c-format, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "Gelar penghapusan [y,n,q,a,d%s,?]? " -#: add-patch.c:36 git-add--interactive.perl:1433 +#: add-patch.c:36 git-add--interactive.perl:1435 #, c-format, perl-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "Gelar penambahan [y,n,q,a,d%s,?]? " -#: add-patch.c:37 git-add--interactive.perl:1434 +#: add-patch.c:37 git-add--interactive.perl:1436 #, c-format, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Gelar bingkah ini [y,n,q,a,d%s,?]? " @@ -270,22 +270,22 @@ msgstr "" "a - gelar bingkah ini dan semua bingkah selanjutnya dalam berkas\n" "d - jangan gelar bingkah ini atau bingkah selanjutnya dalam berkas\n" -#: add-patch.c:56 git-add--interactive.perl:1437 +#: add-patch.c:56 git-add--interactive.perl:1439 #, c-format, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "Stase perubahan mode [y,n,q,a,d%s,?]? " -#: add-patch.c:57 git-add--interactive.perl:1438 +#: add-patch.c:57 git-add--interactive.perl:1440 #, c-format, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "Stase penghapusan [y,n,q,a,d%s,?]? " -#: add-patch.c:58 git-add--interactive.perl:1439 +#: add-patch.c:58 git-add--interactive.perl:1441 #, c-format, perl-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "Stase penambahan [y,n,q,a,d%s,?]? " -#: add-patch.c:59 git-add--interactive.perl:1440 +#: add-patch.c:59 git-add--interactive.perl:1442 #, c-format, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Stase bingkah ini [y,n,q,a,d%s,?]? " @@ -312,22 +312,22 @@ msgstr "" "a - stase bingkah ini dan semua bingkah selanjutnya dalam berkas\n" "d - jangan stase bingkah ini atau bingkah selanjutnya dalam berkas\n" -#: add-patch.c:80 git-add--interactive.perl:1443 +#: add-patch.c:80 git-add--interactive.perl:1445 #, c-format, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "Batal gelar perubahan mode [y,n,q,a,d%s,?]? " -#: add-patch.c:81 git-add--interactive.perl:1444 +#: add-patch.c:81 git-add--interactive.perl:1446 #, c-format, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "Batal gelar penghapusan [y,n,q,a,d%s,?]? " -#: add-patch.c:82 git-add--interactive.perl:1445 +#: add-patch.c:82 git-add--interactive.perl:1447 #, c-format, perl-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "Batal gelar penambahan [y,n,q,a,d%s,?]? " -#: add-patch.c:83 git-add--interactive.perl:1446 +#: add-patch.c:83 git-add--interactive.perl:1448 #, c-format, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "Batal gelar bingkah ini [y,n,q,a,d%s,?]? " @@ -354,22 +354,22 @@ msgstr "" "a - batal gelar bingkah ini dan semua bingkah selanjutnya dalam berkas\n" "d - jangan batal gelar bingkah ini atau bingkah selanjutnya dalam berkas\n" -#: add-patch.c:103 git-add--interactive.perl:1449 +#: add-patch.c:103 git-add--interactive.perl:1451 #, c-format, perl-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "Terapkan perubahan mode ke indeks [y,n,q,a,d%s,?]? " -#: add-patch.c:104 git-add--interactive.perl:1450 +#: add-patch.c:104 git-add--interactive.perl:1452 #, c-format, perl-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "Terapkan penghapusan ke indeks [y,n,q,a,d%s,?]? " -#: add-patch.c:105 git-add--interactive.perl:1451 +#: add-patch.c:105 git-add--interactive.perl:1453 #, c-format, perl-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "Terapkan penambahan ke indeks [y,n,q,a,d%s,?]? " -#: add-patch.c:106 git-add--interactive.perl:1452 +#: add-patch.c:106 git-add--interactive.perl:1454 #, c-format, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "Terapkan bingkah ini ke indeks [y,n,q,a,d%s,?]? " @@ -396,26 +396,26 @@ msgstr "" "a - terapkan bingkah ini dan semua bingkah selanjutnya dalam berkas\n" "d - jangan terapkan bingkah ini atau bingkah selanjutnya dalam berkas\n" -#: add-patch.c:126 git-add--interactive.perl:1455 -#: git-add--interactive.perl:1473 +#: add-patch.c:126 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 #, c-format, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "Buang perubahan mode dari pohon kerja [y,n,q,a,d%s,?]? " -#: add-patch.c:127 git-add--interactive.perl:1456 -#: git-add--interactive.perl:1474 +#: add-patch.c:127 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 #, c-format, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "Buang penghapusan dari pohon kerja [y,n,q,a,d%s,?]? " -#: add-patch.c:128 git-add--interactive.perl:1457 -#: git-add--interactive.perl:1475 +#: add-patch.c:128 git-add--interactive.perl:1459 +#: git-add--interactive.perl:1477 #, c-format, perl-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "Buang penambahan dari pohon kerja [y,n,q,a,d%s,?]? " -#: add-patch.c:129 git-add--interactive.perl:1458 -#: git-add--interactive.perl:1476 +#: add-patch.c:129 git-add--interactive.perl:1460 +#: git-add--interactive.perl:1478 #, c-format, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "Buang bingkah ini dari pohon kerja [y,n,q,a,d%s,?]? " @@ -442,22 +442,22 @@ msgstr "" "a - buang hunk ini dan semua bingkah selanjutnya dalam berkas\n" "d - jangan buang hunk ini atau bingkah selanjutnya dalam berkas\n" -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463 #, c-format, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "Buang perubahan mode dari indeks dan pohon kerja [y,n,q,a,d%s,?]? " -#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464 #, c-format, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "Buang penghapusan dari indeks dan pohon kerja [y,n,q,a,d%s,?]? " -#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465 #, c-format, perl-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "Buang penambahan dari indeks dan pohon kerja [y,n,q,a,d%s,?]? " -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466 #, c-format, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "Buang bingkah ini dari indeks dan pohon kerja [y,n,q,a,d%s,?]? " @@ -476,22 +476,22 @@ msgstr "" "a - buang bingkah ini dan semua bingkah selanjutnya dalam berkas\n" "d - jangan buang bingkah ini atau bingkah selanjutnya dalam berkas\n" -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469 #, c-format, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "Terapkan perubahan mode ke indeks dan pohon kerja [y,n,q,a,d%s,?]? " -#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470 #, c-format, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "Terapkan penghapusan ke indeks dan pohon kerja [y,n,q,a,d%s,?]? " -#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471 #, c-format, perl-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "Terapkan penambahan ke indeks dan pohon kerja [y,n,q,a,d%s,?]? " -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472 #, c-format, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "Terapkan bingkah ini ke indeks dan pohon kerja [y,n,q,a,d%s,?]? " @@ -629,7 +629,7 @@ msgstr "'git apply --cached' gagal" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: add-patch.c:1247 git-add--interactive.perl:1242 +#: add-patch.c:1247 git-add--interactive.perl:1244 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" @@ -640,11 +640,11 @@ msgstr "" msgid "The selected hunks do not apply to the index!" msgstr "Bingkah yang dipilih tidak diterapkan ke indeks!" -#: add-patch.c:1291 git-add--interactive.perl:1346 +#: add-patch.c:1291 git-add--interactive.perl:1348 msgid "Apply them to the worktree anyway? " msgstr "Tetap terapkan itu ke pohon kerja? " -#: add-patch.c:1298 git-add--interactive.perl:1349 +#: add-patch.c:1298 git-add--interactive.perl:1351 msgid "Nothing was applied.\n" msgstr "Tidak ada yang diterapkan.\n" @@ -682,11 +682,11 @@ msgstr "Tidak ada bingkah selanjutnya" msgid "No other hunks to goto" msgstr "Tidak ada bingkah lainnya untuk dikunjungi" -#: add-patch.c:1549 git-add--interactive.perl:1606 +#: add-patch.c:1549 git-add--interactive.perl:1608 msgid "go to which hunk (<ret> to see more)? " msgstr "pergi ke bingkah yang mana (<ret> untuk lihat lebih)? " -#: add-patch.c:1550 git-add--interactive.perl:1608 +#: add-patch.c:1550 git-add--interactive.perl:1610 msgid "go to which hunk? " msgstr "pergi ke bingkah yang mana?" @@ -706,7 +706,7 @@ msgstr[1] "Maaf, hanya %d bingkah yang tersedia." msgid "No other hunks to search" msgstr "Tidak ada bingkah lainnya untuk dicari" -#: add-patch.c:1581 git-add--interactive.perl:1661 +#: add-patch.c:1581 git-add--interactive.perl:1663 msgid "search for regex? " msgstr "cari untuk regex? " @@ -742,58 +742,62 @@ msgid "" "\n" "Disable this message with \"git config advice.%s false\"" msgstr "" +"\n" +"Nonaktifkan pesan ini dengan \"git config advice.%s false\"" #: advice.c:94 #, c-format msgid "%shint: %.*s%s\n" -msgstr "" +msgstr "%shint: %.*s%s\n" #: advice.c:178 msgid "Cherry-picking is not possible because you have unmerged files." -msgstr "" +msgstr "Pemetikan ceri tidak mungkin sebab Anda punya berkas tak tergabung." #: advice.c:180 msgid "Committing is not possible because you have unmerged files." -msgstr "" +msgstr "Pengkomitan tidak mungkin sebab Anda punya berkas tak tergabung." #: advice.c:182 msgid "Merging is not possible because you have unmerged files." -msgstr "" +msgstr "Penggabungan tidak mungkin sebab Anda punya berkas tak tergabung." #: advice.c:184 msgid "Pulling is not possible because you have unmerged files." -msgstr "" +msgstr "Penarikan tidak mungkin sebab Anda punya berkas tak tergabung." #: advice.c:186 msgid "Reverting is not possible because you have unmerged files." -msgstr "" +msgstr "Pembalikkan tidak mungkin sebab Anda punya berkas tak tergabung." #: advice.c:188 #, c-format msgid "It is not possible to %s because you have unmerged files." -msgstr "" +msgstr "Tidak mungkin untuk %s sebab Anda punya berkas tak tergabung." #: advice.c:196 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." msgstr "" +"Perbaiki di dalam pohon kerja, lalu gunakan 'git add/rm <berkas>'\n" +"sebagaimana mestinya untuk menandai resolusi dan membuat sebuah komit." #: advice.c:204 msgid "Exiting because of an unresolved conflict." -msgstr "" +msgstr "Keluar karena sebuah konflik tak terselesaikan." -#: advice.c:209 builtin/merge.c:1379 +#: advice.c:209 builtin/merge.c:1382 msgid "You have not concluded your merge (MERGE_HEAD exists)." -msgstr "" +msgstr "Anda belum mengakhiri penggabungan Anda (MERGE_HEAD ada)." #: advice.c:211 msgid "Please, commit your changes before merging." -msgstr "" +msgstr "Mohon komit perubahan Anda sebelum menggabungkan." #: advice.c:212 msgid "Exiting because of unfinished merge." -msgstr "" +msgstr "Keluar karena penggabungan belum selesai." #: advice.c:217 msgid "Not possible to fast-forward, aborting." @@ -806,6 +810,9 @@ msgid "" "outside of your sparse-checkout definition, so will not be\n" "updated in the index:\n" msgstr "" +"Jalur dan/atau spek jalur berikut cocok dengan jalur yang ada\n" +"di luar definisi checkout tipis Anda, jadi tidak akan diperbarui\n" +"di dalam indeks:\n" #: advice.c:234 msgid "" @@ -813,6 +820,9 @@ msgid "" "* Use the --sparse option.\n" "* Disable or modify the sparsity rules." msgstr "" +"Jika Anda berniat memperbarui entri tersebut, coba salah satu dari:\n" +"* Gunakan opsi --sparse\n" +"* Nonaktifkan atau modifikasi aturan kejarangan." #: advice.c:242 #, c-format @@ -836,14 +846,33 @@ msgid "" "false\n" "\n" msgstr "" +"Catatan: berganti ke '%s'.\n" +"\n" +"Anda berada dalam keadaan 'HEAD terpisah'. Anda dapat melihat-lihat, membuat\n" +"perubahan eksperimental and komit, dan Anda dapat membuang komit apa saja yang\n" +"Anda buat di dalam keadaan ini tanpa mempengaruhi cabang apapun dengan bergantin" +"kembali ke sebuah cabang.\n" +"\n" +"Jika Anda ingin membuat cabang baru untuk menyimpan komit yang Anda buat, Anda\n" +"dapat melakukannya (sekarang atau nanti) dengan:\n" +"\n" +" git switch -c <nama cabang baru>\n" +"\n" +"Atau batalkan operasi ini dengan:\n" +"\n" +" git switch -\n" +"\n" +"Matikan saran ini dengan menyetel variabel konfigurasi advice.detachedHead ke " +"false\n" +"\n" #: alias.c:50 msgid "cmdline ends with \\" -msgstr "" +msgstr "baris perintah diakhiri dengan \\" #: alias.c:51 msgid "unclosed quote" -msgstr "" +msgstr "tanda kutip tak ditutup" #: apply.c:70 #, c-format @@ -855,21 +884,33 @@ msgstr "opsi spasi putih tidak dikenal '%s'" msgid "unrecognized whitespace ignore option '%s'" msgstr "opsi abai spasi putih tidak dikenal '%s'" -#: apply.c:136 -msgid "--reject and --3way cannot be used together." -msgstr "--reject dan --3way tidak dapat digunakan bersamaan." - -#: apply.c:139 -msgid "--3way outside a repository" -msgstr "--3way di luar repositori" - -#: apply.c:150 -msgid "--index outside a repository" -msgstr "--index di luar repositori" - -#: apply.c:153 -msgid "--cached outside a repository" -msgstr "--cached di luar repositori" +#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307 +#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870 +#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885 +#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541 +#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470 +#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757 +#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361 +#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155 +#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038 +#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560 +#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778 +#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073 +#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641 +#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199 +#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426 +#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710 +#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316 +#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572 +#: builtin/worktree.c:702 +#, c-format +msgid "options '%s' and '%s' cannot be used together" +msgstr "Opsi '%s' dan '%s' tidak dapat digunakan bersamaan" + +#: apply.c:139 apply.c:150 apply.c:153 +#, c-format +msgid "'%s' outside a repository" +msgstr "'%s' di luar repositori" #: apply.c:800 #, c-format @@ -1081,8 +1122,8 @@ msgstr "tambalan gagal: %s:%ld" msgid "cannot checkout %s" msgstr "tidak dapat men-checkout %s" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214 -#: setup.c:308 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214 +#: setup.c:309 #, c-format msgid "failed to read %s" msgstr "gagal membaca %s" @@ -1092,427 +1133,425 @@ msgstr "gagal membaca %s" msgid "reading from '%s' beyond a symbolic link" msgstr "membaca dari '%s' diluar tautan simbolik" -#: apply.c:3442 apply.c:3709 +#: apply.c:3442 apply.c:3711 #, c-format msgid "path %s has been renamed/deleted" msgstr "jalus %s sudah dinamai ulang/dihapus" -#: apply.c:3549 apply.c:3724 +#: apply.c:3549 apply.c:3726 #, c-format msgid "%s: does not exist in index" msgstr "%s: tidak ada di indeks" -#: apply.c:3558 apply.c:3732 apply.c:3976 +#: apply.c:3558 apply.c:3734 apply.c:3978 #, c-format msgid "%s: does not match index" msgstr "%s: tidak cocok dengan indeks" -#: apply.c:3593 +#: apply.c:3595 msgid "repository lacks the necessary blob to perform 3-way merge." msgstr "" "repositori kekurangan blob yang diperlukan untuk melakukan penggabungan 3 " "arah." -#: apply.c:3596 +#: apply.c:3598 #, c-format msgid "Performing three-way merge...\n" msgstr "Melakukan penggabungan 3 arah...\n" -#: apply.c:3612 apply.c:3616 +#: apply.c:3614 apply.c:3618 #, c-format msgid "cannot read the current contents of '%s'" msgstr "tidak dapat membaca konten saat ini dari '%s'" -#: apply.c:3628 +#: apply.c:3630 #, c-format msgid "Failed to perform three-way merge...\n" msgstr "Gagal melakukan penggabungan 3 arah...\n" -#: apply.c:3642 +#: apply.c:3644 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Tambalan diterapkan ke '%s' dengan konflik.\n" -#: apply.c:3647 +#: apply.c:3649 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Tambalan diterapkan ke '%s' dengan rapi.\n" -#: apply.c:3664 +#: apply.c:3666 #, c-format msgid "Falling back to direct application...\n" msgstr "Mundur ke penerapan langsung...\n" -#: apply.c:3676 +#: apply.c:3678 msgid "removal patch leaves file contents" msgstr "tambalan penghapusan meninggalkan isi berkas" -#: apply.c:3749 +#: apply.c:3751 #, c-format msgid "%s: wrong type" msgstr "%s: salah tipe" -#: apply.c:3751 +#: apply.c:3753 #, c-format msgid "%s has type %o, expected %o" msgstr "%s bertipe %o, diharapkan %o" -#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905 -#: read-cache.c:1368 +#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918 +#: read-cache.c:1381 #, c-format msgid "invalid path '%s'" msgstr "jalur tidak valid '%s'" -#: apply.c:3974 +#: apply.c:3976 #, c-format msgid "%s: already exists in index" msgstr "%s: sudah ada di indeks" -#: apply.c:3978 +#: apply.c:3980 #, c-format msgid "%s: already exists in working directory" msgstr "%s: sudah ada di direktori kerja" -#: apply.c:3998 +#: apply.c:4000 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "mode baru (%o) dari %s tidak cocok dengan mode lama (%o)" -#: apply.c:4003 +#: apply.c:4005 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "mode baru (%o) dari %s tidak cocok dengan mode lama (%o) dari %s" -#: apply.c:4023 +#: apply.c:4025 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "berkas yang terpengaruh '%s' diluar tautan simbolik" -#: apply.c:4027 +#: apply.c:4029 #, c-format msgid "%s: patch does not apply" msgstr "%s: tambalan tak diterapkan" -#: apply.c:4042 +#: apply.c:4044 #, c-format msgid "Checking patch %s..." msgstr "Memeriksa tambalan %s..." -#: apply.c:4134 +#: apply.c:4136 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "informasi sha1 kurang atau tidak berguna untuk submodul %s" -#: apply.c:4141 +#: apply.c:4143 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "perubahan mode untuk %s, yang bukan dalam HEAD saat ini" -#: apply.c:4144 +#: apply.c:4146 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "informasi sha1 kurang atau tidak berguna (%s)" -#: apply.c:4153 +#: apply.c:4155 #, c-format msgid "could not add %s to temporary index" msgstr "tidak dapat menambahkan %s ke indeks sementara" -#: apply.c:4163 +#: apply.c:4165 #, c-format msgid "could not write temporary index to %s" msgstr "tidak dapat menulis indeks sementara ke %s" -#: apply.c:4301 +#: apply.c:4303 #, c-format msgid "unable to remove %s from index" msgstr "tidak dapat menghapus %s dari indeks" -#: apply.c:4335 +#: apply.c:4337 #, c-format msgid "corrupt patch for submodule %s" msgstr "tambalan rusak untuk submodul %s" -#: apply.c:4341 +#: apply.c:4343 #, c-format msgid "unable to stat newly created file '%s'" msgstr "tidak dapat men-stat berkas yang baru dibuat '%s'" -#: apply.c:4349 +#: apply.c:4351 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "tidak dapat membuat simpanan pendukung untuk berkas yang baru dibuat %s" -#: apply.c:4355 apply.c:4500 +#: apply.c:4357 apply.c:4502 #, c-format msgid "unable to add cache entry for %s" msgstr "tidak dapat menambahkan entri tembolok untuk %s" -#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241 -#: builtin/gc.c:2276 +#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258 +#: builtin/gc.c:2293 #, c-format msgid "failed to write to '%s'" msgstr "gagal menulis ke '%s'" -#: apply.c:4402 +#: apply.c:4404 #, c-format msgid "closing file '%s'" msgstr "menutup berkas '%s'" -#: apply.c:4472 +#: apply.c:4474 #, c-format msgid "unable to write file '%s' mode %o" msgstr "tidak dapat menulis berkas '%s' mode %o" -#: apply.c:4570 +#: apply.c:4572 #, c-format msgid "Applied patch %s cleanly." msgstr "Tambalan %s diterapkan dengan rapi." -#: apply.c:4578 +#: apply.c:4580 msgid "internal error" msgstr "kesalahan internal" -#: apply.c:4581 +#: apply.c:4583 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Menerapkan tambalan %%s dengan %d penolakan..." msgstr[1] "Menerapkan tambalan %%s dengan %d penolakan..." -#: apply.c:4592 +#: apply.c:4594 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "memotong nama berkas .rej ke %.*s.rej" -#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408 +#: apply.c:4602 #, c-format msgid "cannot open %s" msgstr "tidak dapat membuka %s" -#: apply.c:4614 +#: apply.c:4616 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Bingkah #%d diterapkan dengan rapi." -#: apply.c:4618 +#: apply.c:4620 #, c-format msgid "Rejected hunk #%d." msgstr "Bingkah #%d ditolak." -#: apply.c:4747 +#: apply.c:4749 #, c-format msgid "Skipped patch '%s'." msgstr "Tambalan '%s' dilewatkan." -#: apply.c:4755 -msgid "unrecognized input" -msgstr "masukan tidak dikenal" +#: apply.c:4758 +msgid "No valid patches in input (allow with \"--allow-empty\")" +msgstr "" -#: apply.c:4775 +#: apply.c:4779 msgid "unable to read index file" msgstr "tidak dapa membaca berkas indeks" -#: apply.c:4932 +#: apply.c:4936 #, c-format msgid "can't open patch '%s': %s" msgstr "tidak dapat membuka tambalan '%s': %s" -#: apply.c:4959 +#: apply.c:4963 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d kesalahan spasi putih dipadamkan" msgstr[1] "%d kesalahan spasi putih dipadamkan" -#: apply.c:4965 apply.c:4980 +#: apply.c:4969 apply.c:4984 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d baris menambahkan kesalahan spasi putih." msgstr[1] "%d baris menambahkan kesalahan spasi putih." -#: apply.c:4973 +#: apply.c:4977 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d baris diterapkan setelah memperbaiki kesalahan spasi putih." msgstr[1] "%d baris diterapkan setelah memperbaiki kesalahan spasi putih." -#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429 +#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "Tidak dapat menulis berkas indeks baru" -#: apply.c:5017 +#: apply.c:5021 msgid "don't apply changes matching the given path" msgstr "jangan terapkan perubahan yang cocok dengan jalur yang diberikan" -#: apply.c:5020 +#: apply.c:5024 msgid "apply changes matching the given path" msgstr "terapkan perubahan yang cocok dengan jalur yang diberikan" -#: apply.c:5022 builtin/am.c:2320 +#: apply.c:5026 builtin/am.c:2376 msgid "num" msgstr "jumlah" -#: apply.c:5023 +#: apply.c:5027 msgid "remove <num> leading slashes from traditional diff paths" msgstr "hapus <jumlah> garis miring terkemuka dari jalur diff tradisional" -#: apply.c:5026 +#: apply.c:5030 msgid "ignore additions made by the patch" msgstr "abaikan penambahan yang dibuat oleh tambalan" -#: apply.c:5028 +#: apply.c:5032 msgid "instead of applying the patch, output diffstat for the input" msgstr "daripada menerapkan tambalan, keluarkan diffstat untuk masukan" -#: apply.c:5032 +#: apply.c:5036 msgid "show number of added and deleted lines in decimal notation" msgstr "" "perlihatkan jumlah baris yang ditambahkan dan dihapuskan dalam notasi desimal" -#: apply.c:5034 +#: apply.c:5038 msgid "instead of applying the patch, output a summary for the input" msgstr "daripada menerapkan tambalan, keluarkan ringkasan untuk masukan" -#: apply.c:5036 +#: apply.c:5040 msgid "instead of applying the patch, see if the patch is applicable" msgstr "daripada menerapkan tambalan, lihat jika tambalan bisa diterapkan" -#: apply.c:5038 +#: apply.c:5042 msgid "make sure the patch is applicable to the current index" msgstr "pastikan tambalan bisa diterapkan ke indeks saat ini" -#: apply.c:5040 +#: apply.c:5044 msgid "mark new files with `git add --intent-to-add`" msgstr "tandai berkas baru dengan `git add --intent-to-add`" -#: apply.c:5042 +#: apply.c:5046 msgid "apply a patch without touching the working tree" msgstr "terapkan sebuah tambalan tanpa menyentuh pohon kerja" -#: apply.c:5044 +#: apply.c:5048 msgid "accept a patch that touches outside the working area" msgstr "terima sebuah tambalan yang menyentuh di luar area kerja" -#: apply.c:5047 +#: apply.c:5051 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "juga terapkan tambalan (gunakan dengan --stat/--summary/--check)" -#: apply.c:5049 +#: apply.c:5053 msgid "attempt three-way merge, fall back on normal patch if that fails" msgstr "coba penggabungan tiga arah, mundur ke penambalan normal jika gagal" -#: apply.c:5051 +#: apply.c:5055 msgid "build a temporary index based on embedded index information" msgstr "bangun sebuah indeks sementara berdasarkan informasi indeks tertanam" -#: apply.c:5054 builtin/checkout-index.c:196 +#: apply.c:5058 builtin/checkout-index.c:196 msgid "paths are separated with NUL character" msgstr "jalur dipisahkan dengan karakter NUL" -#: apply.c:5056 +#: apply.c:5060 msgid "ensure at least <n> lines of context match" msgstr "pastikan setidaknya <n> baris dari konteks cocokan" -#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299 +#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 #: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960 #: builtin/rebase.c:1051 msgid "action" msgstr "aksi" -#: apply.c:5058 +#: apply.c:5062 msgid "detect new or modified lines that have whitespace errors" msgstr "deteksi baris baru atau yang diubah yang ada kesalahan spasi putih" -#: apply.c:5061 apply.c:5064 +#: apply.c:5065 apply.c:5068 msgid "ignore changes in whitespace when finding context" msgstr "abaikan perubahan spasi putih ketika menemukan konteks" -#: apply.c:5067 +#: apply.c:5071 msgid "apply the patch in reverse" msgstr "terapkan tambalan terbalik" -#: apply.c:5069 +#: apply.c:5073 msgid "don't expect at least one line of context" msgstr "jangan harap setidaknya satu baris konteks" -#: apply.c:5071 +#: apply.c:5075 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "tinggalkan bingkah yang ditolak pada berkas *.rej yang bersesuaian" -#: apply.c:5073 +#: apply.c:5077 msgid "allow overlapping hunks" msgstr "perbolehkan bingkah yang tumpang tindih" -#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22 -#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788 -#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120 -msgid "be verbose" -msgstr "jadi berkata-kata" - -#: apply.c:5076 +#: apply.c:5080 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerir baris baru hilang yang salah dideteksi pada akhir berkas" -#: apply.c:5079 +#: apply.c:5083 msgid "do not trust the line counts in the hunk headers" msgstr "jangan percaya hitungan baris pada kepala bingkah" -#: apply.c:5081 builtin/am.c:2308 +#: apply.c:5085 builtin/am.c:2364 msgid "root" msgstr "akar" -#: apply.c:5082 +#: apply.c:5086 msgid "prepend <root> to all filenames" msgstr "tambahkan <akar> di depan semua nama berkas" +#: apply.c:5089 +msgid "don't return error for empty patches" +msgstr "jangan kembalikan kesalahan untuk tambalan kosong" + #: archive-tar.c:125 archive-zip.c:345 #, c-format msgid "cannot stream blob %s" -msgstr "" +msgstr "tidak dapat mengaruskan blob %s" #: archive-tar.c:265 archive-zip.c:358 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" -msgstr "" +msgstr "mode berkas tidak didukung: 0%o (SHA1: %s)" -#: archive-tar.c:450 +#: archive-tar.c:447 #, c-format msgid "unable to start '%s' filter" -msgstr "" +msgstr "tidak dapat memulai saringan '%s'" -#: archive-tar.c:453 +#: archive-tar.c:450 msgid "unable to redirect descriptor" -msgstr "" +msgstr "tidak dapat mengalihkan pendeskripsi" -#: archive-tar.c:460 +#: archive-tar.c:457 #, c-format msgid "'%s' filter reported error" -msgstr "" +msgstr "saringan '%s' melaporkan kesalahan" #: archive-zip.c:318 #, c-format msgid "path is not valid UTF-8: %s" -msgstr "" +msgstr "jalur bukan UTF-8 valid: %s" #: archive-zip.c:322 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" -msgstr "" +msgstr "jalur terlalu panjang (%d karakter, SHA1: %s): %s" #: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368 #, c-format msgid "deflate error (%d)" -msgstr "" +msgstr "kesalahan deflasi (%d)" #: archive-zip.c:603 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" -msgstr "" +msgstr "stempel waktu terlalu besar untuk sistem ini: %<PRIuMAX>" #: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" @@ -1533,19 +1572,13 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <repo> [--exec <perintah>] --list" -#: archive.c:188 +#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238 +#: builtin/tag.c:578 #, c-format -msgid "cannot read %s" -msgstr "Tidak dapat membaca %s" - -#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114 -#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834 -#: builtin/merge.c:1145 -#, c-format -msgid "could not read '%s'" +msgid "cannot read '%s'" msgstr "tidak dapat membaca '%s'" -#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334 +#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334 #, c-format msgid "pathspec '%s' did not match any files" msgstr "spek jalur '%s' tidak cocok dengan berkas apapun" @@ -1587,7 +1620,7 @@ msgstr "fmt" msgid "archive format" msgstr "format arsip" -#: archive.c:552 builtin/log.c:1775 +#: archive.c:552 builtin/log.c:1790 msgid "prefix" msgstr "prefiks" @@ -1597,9 +1630,9 @@ msgstr "tambahkan prefiks di depan setiap nama jalur dalam arsip" #: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884 #: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135 -#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 -#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103 -#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410 +#: builtin/fast-export.c:1181 builtin/fast-export.c:1183 +#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103 +#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410 #: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190 msgid "file" msgstr "berkas" @@ -1629,7 +1662,7 @@ msgid "list supported archive formats" msgstr "daftar format arsip yang didukung" #: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121 -#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512 +#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513 msgid "repo" msgstr "repositori" @@ -1637,7 +1670,7 @@ msgstr "repositori" msgid "retrieve the archive from remote repository <repo>" msgstr "ambil arsip dari repositori remote <repo>" -#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714 +#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708 #: builtin/notes.c:496 msgid "command" msgstr "perintah" @@ -1650,18 +1683,20 @@ msgstr "jalur ke perintah git-upload-archive remote" msgid "Unexpected option --remote" msgstr "Opsi --remote tak diharapkan" -#: archive.c:580 -msgid "Option --exec can only be used together with --remote" -msgstr "Opsi --exec hanya dapat digunakan bersamaan dengan --remote" +#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544 +#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370 +#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115 +#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281 +#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144 +#: http-fetch.c:153 +#, c-format +msgid "the option '%s' requires '%s'" +msgstr "opsi `%s' butuh '%s'" #: archive.c:582 msgid "Unexpected option --output" msgstr "Opsi --output tak diharapkan" -#: archive.c:584 -msgid "Options --add-file and --remote cannot be used together" -msgstr "Opsi --add-file dan --remote tidak dapat digunakan bersamaan" - #: archive.c:606 #, c-format msgid "Unknown archive format '%s'" @@ -1767,7 +1802,7 @@ msgstr "sebuah revisi %s diperlukan" msgid "could not create file '%s'" msgstr "tidak dapat membuat berkas '%s'" -#: bisect.c:985 builtin/merge.c:154 +#: bisect.c:985 builtin/merge.c:155 #, c-format msgid "could not read file '%s'" msgstr "tidak dapat membaca berkas '%s'" @@ -1820,10 +1855,10 @@ msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse dan --first-parent bersama-sama butuh komit terbaru yang disebutkan" -#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041 -#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114 -#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 -#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373 +#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158 +#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114 +#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071 +#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373 #: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790 #: builtin/shortlog.c:255 msgid "revision walk setup failed" @@ -1846,94 +1881,94 @@ msgstr "tidak ada jalur seperti %s di %s" msgid "cannot read blob %s for path %s" msgstr "tidak dapat membaca blob %s untuk jalur %s" -#: branch.c:53 -#, c-format +#: branch.c:77 msgid "" -"\n" -"After fixing the error cause you may try to fix up\n" -"the remote tracking information by invoking\n" -"\"git branch --set-upstream-to=%s%s%s\"." +"cannot inherit upstream tracking configuration of multiple refs when " +"rebasing is requested" msgstr "" +"tidak dapat mewariskan konfigurasi pelacakan hulu banyak referensi ketika " +"pendasaran ulang diminta" -#: branch.c:67 +#: branch.c:88 #, c-format -msgid "Not setting branch %s as its own upstream." -msgstr "" +msgid "not setting branch '%s' as its own upstream" +msgstr "tidak menyetel '%s' sebagai hulunya" -#: branch.c:93 +#: branch.c:144 #, c-format -msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." -msgstr "" +msgid "branch '%s' set up to track '%s' by rebasing." +msgstr "cabang '%s' disiapkan untuk melacak '%s' oleh pendasaran ulang." -#: branch.c:94 +#: branch.c:145 #, c-format -msgid "Branch '%s' set up to track remote branch '%s' from '%s'." -msgstr "" +msgid "branch '%s' set up to track '%s'." +msgstr "cabang '%s' disiapkan untuk melacak '%s'." -#: branch.c:98 +#: branch.c:148 #, c-format -msgid "Branch '%s' set up to track local branch '%s' by rebasing." -msgstr "" +msgid "branch '%s' set up to track:" +msgstr "cabang '%s' disiapkan untuk melacak:" -#: branch.c:99 -#, c-format -msgid "Branch '%s' set up to track local branch '%s'." -msgstr "" +#: branch.c:160 +msgid "unable to write upstream branch configuration" +msgstr "tidak dapat menulis konfigurasi cabang hulu" -#: branch.c:104 -#, c-format -msgid "Branch '%s' set up to track remote ref '%s' by rebasing." +#: branch.c:162 +msgid "" +"\n" +"After fixing the error cause you may try to fix up\n" +"the remote tracking information by invoking:" msgstr "" +"\n" +"Setelah memperbaiki penyebab kesalahan Anda dapat mencoba memperbaiki\n" +"informasi pelacakan remote dengan menjalankan:" -#: branch.c:105 +#: branch.c:203 #, c-format -msgid "Branch '%s' set up to track remote ref '%s'." +msgid "asked to inherit tracking from '%s', but no remote is set" msgstr "" +"diminta mewariskan pelacakan dari '%s', tetapi tidak ada remote yang disetel" -#: branch.c:109 +#: branch.c:209 #, c-format -msgid "Branch '%s' set up to track local ref '%s' by rebasing." +msgid "asked to inherit tracking from '%s', but no merge configuration is set" msgstr "" +"diminta mewariskan pelacakan dari '%s', tetapi tidak ada konfigurasi " +"penggabungan yang disetel" -#: branch.c:110 +#: branch.c:252 #, c-format -msgid "Branch '%s' set up to track local ref '%s'." -msgstr "" +msgid "not tracking: ambiguous information for ref %s" +msgstr "tak melacak: informasi ambigu untuk referensi %s" -#: branch.c:119 -msgid "Unable to write upstream branch configuration" -msgstr "" - -#: branch.c:156 +#: branch.c:287 #, c-format -msgid "Not tracking: ambiguous information for ref %s" -msgstr "" +msgid "'%s' is not a valid branch name" +msgstr "'%s' bukan nama cabang valid" -#: branch.c:189 +#: branch.c:307 #, c-format -msgid "'%s' is not a valid branch name." -msgstr "" +msgid "a branch named '%s' already exists" +msgstr "sebuah cabang bernama '%s' sudah ada" -#: branch.c:208 +#: branch.c:313 #, c-format -msgid "A branch named '%s' already exists." -msgstr "" +msgid "cannot force update the branch '%s' checked out at '%s'" +msgstr "tidak dapat memperbarui paksa cabang '%s' yang ter-check out pada '%s'" -#: branch.c:213 -msgid "Cannot force update the current branch." -msgstr "" - -#: branch.c:233 +#: branch.c:336 #, c-format -msgid "Cannot setup tracking information; starting point '%s' is not a branch." +msgid "cannot set up tracking information; starting point '%s' is not a branch" msgstr "" +"tidak dapat menyiapkan informasi pelacakan; titik awal '%s' bukan sebuah " +"cabang" -#: branch.c:235 +#: branch.c:338 #, c-format msgid "the requested upstream branch '%s' does not exist" -msgstr "" +msgstr "cabang hulu yang diminta '%s' tidak ada" -#: branch.c:237 +#: branch.c:340 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1945,30 +1980,31 @@ msgid "" "\"git push -u\" to set the upstream config as you push." msgstr "" -#: branch.c:281 +#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377 +#: builtin/replace.c:423 builtin/replace.c:453 #, c-format -msgid "Not a valid object name: '%s'." -msgstr "" +msgid "not a valid object name: '%s'" +msgstr "bukan nama objek valid: '%s'" -#: branch.c:301 +#: branch.c:404 #, c-format -msgid "Ambiguous object name: '%s'." -msgstr "" +msgid "ambiguous object name: '%s'" +msgstr "nama objek ambigu: '%s'" -#: branch.c:306 +#: branch.c:409 #, c-format -msgid "Not a valid branch point: '%s'." -msgstr "" +msgid "not a valid branch point: '%s'" +msgstr "bukan sebuah titik cabang valid: '%s'" -#: branch.c:366 +#: branch.c:469 #, c-format msgid "'%s' is already checked out at '%s'" -msgstr "" +msgstr "'%s' sudah di-checkout pada '%s'" -#: branch.c:389 +#: branch.c:494 #, c-format msgid "HEAD of working tree %s is not updated" -msgstr "" +msgstr "HEAD dari pohon kerja %s tidak diperbarui" #: bundle.c:44 #, c-format @@ -1990,7 +2026,7 @@ msgstr "'%s' tidak terlihat seperti berkas bundel v2 atau v3" msgid "unrecognized header: %s%s (%d)" msgstr "kepala tidak dikenal: %s%s (%d)" -#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406 #: builtin/commit.c:862 #, c-format msgid "could not open '%s'" @@ -2049,7 +2085,7 @@ msgstr "versi bundle %d tidak didukung" msgid "cannot write bundle version %d with algorithm %s" msgstr "tidak dapat menulis versi bundel %d dengan algoritma %s" -#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399 #, c-format msgid "unrecognized argument: %s" msgstr "argumen tidak dikenal: %s" @@ -2086,7 +2122,7 @@ msgstr "" msgid "final chunk has non-zero id %<PRIx32>" msgstr "" -#: color.c:329 +#: color.c:354 #, c-format msgid "invalid color value: %.*s" msgstr "" @@ -2136,207 +2172,207 @@ msgstr "" msgid "unable to find all commit-graph files" msgstr "" -#: commit-graph.c:746 commit-graph.c:783 +#: commit-graph.c:749 commit-graph.c:786 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" -#: commit-graph.c:767 +#: commit-graph.c:770 #, c-format msgid "could not find commit %s" msgstr "" -#: commit-graph.c:800 +#: commit-graph.c:803 msgid "commit-graph requires overflow generation data but has none" msgstr "" -#: commit-graph.c:1105 builtin/am.c:1342 +#: commit-graph.c:1108 builtin/am.c:1369 #, c-format msgid "unable to parse commit %s" msgstr "" -#: commit-graph.c:1367 builtin/pack-objects.c:3070 +#: commit-graph.c:1370 builtin/pack-objects.c:3070 #, c-format msgid "unable to get type of object %s" msgstr "" -#: commit-graph.c:1398 +#: commit-graph.c:1401 msgid "Loading known commits in commit graph" msgstr "" -#: commit-graph.c:1415 +#: commit-graph.c:1418 msgid "Expanding reachable commits in commit graph" msgstr "" -#: commit-graph.c:1435 +#: commit-graph.c:1438 msgid "Clearing commit marks in commit graph" msgstr "" -#: commit-graph.c:1454 +#: commit-graph.c:1457 msgid "Computing commit graph topological levels" msgstr "" -#: commit-graph.c:1507 +#: commit-graph.c:1510 msgid "Computing commit graph generation numbers" msgstr "" -#: commit-graph.c:1588 +#: commit-graph.c:1591 msgid "Computing commit changed paths Bloom filters" msgstr "" -#: commit-graph.c:1665 +#: commit-graph.c:1668 msgid "Collecting referenced commits" msgstr "" -#: commit-graph.c:1690 +#: commit-graph.c:1693 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1703 +#: commit-graph.c:1706 #, c-format msgid "error adding pack %s" msgstr "" -#: commit-graph.c:1707 +#: commit-graph.c:1710 #, c-format msgid "error opening index for %s" msgstr "" -#: commit-graph.c:1744 +#: commit-graph.c:1747 msgid "Finding commits for commit graph among packed objects" msgstr "" -#: commit-graph.c:1762 +#: commit-graph.c:1765 msgid "Finding extra edges in commit graph" msgstr "" -#: commit-graph.c:1811 +#: commit-graph.c:1814 msgid "failed to write correct number of base graph ids" msgstr "" -#: commit-graph.c:1842 midx.c:1146 +#: commit-graph.c:1845 midx.c:1149 #, c-format msgid "unable to create leading directories of %s" msgstr "" -#: commit-graph.c:1855 +#: commit-graph.c:1858 msgid "unable to create temporary graph layer" msgstr "" -#: commit-graph.c:1860 +#: commit-graph.c:1863 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "" -#: commit-graph.c:1917 +#: commit-graph.c:1920 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1953 +#: commit-graph.c:1956 msgid "unable to open commit-graph chain file" msgstr "" -#: commit-graph.c:1969 +#: commit-graph.c:1972 msgid "failed to rename base commit-graph file" msgstr "" -#: commit-graph.c:1989 +#: commit-graph.c:1992 msgid "failed to rename temporary commit-graph file" msgstr "" -#: commit-graph.c:2122 +#: commit-graph.c:2125 msgid "Scanning merged commits" msgstr "" -#: commit-graph.c:2166 +#: commit-graph.c:2169 msgid "Merging commit-graph" msgstr "" -#: commit-graph.c:2274 +#: commit-graph.c:2277 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "" -#: commit-graph.c:2381 +#: commit-graph.c:2384 msgid "too many commits to write graph" msgstr "" -#: commit-graph.c:2479 +#: commit-graph.c:2482 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" -#: commit-graph.c:2489 +#: commit-graph.c:2492 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" -#: commit-graph.c:2499 commit-graph.c:2514 +#: commit-graph.c:2502 commit-graph.c:2517 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" -#: commit-graph.c:2506 +#: commit-graph.c:2509 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "" -#: commit-graph.c:2524 +#: commit-graph.c:2527 msgid "Verifying commits in commit graph" msgstr "" -#: commit-graph.c:2539 +#: commit-graph.c:2542 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" -#: commit-graph.c:2546 +#: commit-graph.c:2549 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" -#: commit-graph.c:2556 +#: commit-graph.c:2559 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" -#: commit-graph.c:2565 +#: commit-graph.c:2568 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "" -#: commit-graph.c:2579 +#: commit-graph.c:2582 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" -#: commit-graph.c:2584 +#: commit-graph.c:2587 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" -#: commit-graph.c:2588 +#: commit-graph.c:2591 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" -#: commit-graph.c:2605 +#: commit-graph.c:2608 #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" msgstr "" -#: commit-graph.c:2611 +#: commit-graph.c:2614 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" -#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418 -#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457 +#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444 +#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456 #, c-format msgid "could not parse %s" msgstr "" @@ -2358,27 +2394,27 @@ msgid "" "\"git config advice.graftFileDeprecated false\"" msgstr "" -#: commit.c:1239 +#: commit.c:1241 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: commit.c:1243 +#: commit.c:1245 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: commit.c:1246 +#: commit.c:1248 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: commit.c:1249 +#: commit.c:1251 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: commit.c:1503 +#: commit.c:1505 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -2442,7 +2478,7 @@ msgstr "kunci tidak berisi bagian: %s" msgid "key does not contain variable name: %s" msgstr "kunci tidak berisi nama variabel: %s" -#: config.c:470 sequencer.c:2804 +#: config.c:470 sequencer.c:2806 #, c-format msgid "invalid key: %s" msgstr "kunci tidak valid: %s" @@ -2596,144 +2632,144 @@ msgstr "core.commentChar harusnya hanya satu karakter" msgid "invalid mode for object creation: %s" msgstr "mode tidak valid untuk pembuatan objek: %s" -#: config.c:1581 +#: config.c:1584 #, c-format msgid "malformed value for %s" msgstr "nilai rusak untuk %s" -#: config.c:1607 +#: config.c:1610 #, c-format msgid "malformed value for %s: %s" msgstr "nilai rusak untuk %s: %s" -#: config.c:1608 +#: config.c:1611 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "harus salah satu dari nothing, matching, simple, upstream atau current" -#: config.c:1669 builtin/pack-objects.c:4053 +#: config.c:1672 builtin/pack-objects.c:4053 #, c-format msgid "bad pack compression level %d" msgstr "level kompresi pak jelek %d" -#: config.c:1792 +#: config.c:1795 #, c-format msgid "unable to load config blob object '%s'" msgstr "tidak dapat memuat objek blob konfigurasi '%s'" -#: config.c:1795 +#: config.c:1798 #, c-format msgid "reference '%s' does not point to a blob" msgstr "referensi '%s' tidak menunjuk pada sebuah blob" -#: config.c:1813 +#: config.c:1816 #, c-format msgid "unable to resolve config blob '%s'" msgstr "tidak dapat menguraikan blob konfigurasi '%s'" -#: config.c:1858 +#: config.c:1861 #, c-format msgid "failed to parse %s" msgstr "gagal menguraikan %s" -#: config.c:1914 +#: config.c:1917 msgid "unable to parse command-line config" msgstr "gagal menguraikan konfigurasi baris perintah" -#: config.c:2282 +#: config.c:2285 msgid "unknown error occurred while reading the configuration files" msgstr "error tidak diketahui ketika membaca berkas konfigurasi" -#: config.c:2456 +#: config.c:2459 #, c-format msgid "Invalid %s: '%s'" msgstr "%s tidak valid: '%s'" -#: config.c:2501 +#: config.c:2504 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "nilai splitIndex.maxPercentChange '%d' harusnya diantara 0 dan 100" -#: config.c:2547 +#: config.c:2550 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "tidak dapat menguraikan '%s' dari konfigurasi baris perintah" -#: config.c:2549 +#: config.c:2552 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "variabel konfigurasi '%s' jelek dalam berkas '%s' pada baris %d" -#: config.c:2633 +#: config.c:2637 #, c-format msgid "invalid section name '%s'" msgstr "nama bagian '%s' tidak valid" -#: config.c:2665 +#: config.c:2669 #, c-format msgid "%s has multiple values" msgstr "%s punya banyak nilai" -#: config.c:2694 +#: config.c:2698 #, c-format msgid "failed to write new configuration file %s" msgstr "gagal menulis berkas konfigurasi baru %s" -#: config.c:2946 config.c:3273 +#: config.c:2950 config.c:3277 #, c-format msgid "could not lock config file %s" msgstr "tidak dapat mengunci berkas konfigurasi %s" -#: config.c:2957 +#: config.c:2961 #, c-format msgid "opening %s" msgstr "membuka %s" -#: config.c:2994 builtin/config.c:361 +#: config.c:2998 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "pola tidak valid: %s" -#: config.c:3019 +#: config.c:3023 #, c-format msgid "invalid config file %s" msgstr "berkas konfigurasi %s tidak valid" -#: config.c:3032 config.c:3286 +#: config.c:3036 config.c:3290 #, c-format msgid "fstat on %s failed" msgstr "fstat pada %s gagal" -#: config.c:3043 +#: config.c:3047 #, c-format msgid "unable to mmap '%s'%s" msgstr "tidak dapat me-mmap '%s'%s" -#: config.c:3053 config.c:3291 +#: config.c:3057 config.c:3295 #, c-format msgid "chmod on %s failed" msgstr "chmod pada %s gagal" -#: config.c:3138 config.c:3388 +#: config.c:3142 config.c:3392 #, c-format msgid "could not write config file %s" msgstr "tidak dapat menulis berkas konfigurasi %s" -#: config.c:3172 +#: config.c:3176 #, c-format msgid "could not set '%s' to '%s'" msgstr "tidak dapat menyetel '%s' ke '%s'" -#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868 +#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868 #, c-format msgid "could not unset '%s'" msgstr "tidak dapat mem-batal setel '%s'" -#: config.c:3264 +#: config.c:3268 #, c-format msgid "invalid section name: %s" msgstr "nama bagian tidak valid: %s" -#: config.c:3431 +#: config.c:3435 #, c-format msgid "missing value for '%s'" msgstr "nilai hilang untuk '%s'" @@ -2902,7 +2938,7 @@ msgstr "" msgid "unable to fork" msgstr "" -#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45 +#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57 msgid "Checking connectivity" msgstr "" @@ -3190,17 +3226,17 @@ msgid "" "tree" msgstr "" -#: diff.c:157 +#: diff.c:158 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Gagal mengurai persentase potongan dirstat '%s'\n" -#: diff.c:162 +#: diff.c:163 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Parameter dirstat tidak ditketahui '%s'\n" -#: diff.c:298 +#: diff.c:299 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" @@ -3208,7 +3244,7 @@ msgstr "" "Setelan warna berpindah harus salah satu dari 'no', 'default', 'blocks', " "'dimmed-zebra', 'plain'" -#: diff.c:326 +#: diff.c:327 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " @@ -3218,7 +3254,7 @@ msgstr "" "space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-" "change'" -#: diff.c:334 +#: diff.c:335 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" @@ -3226,12 +3262,12 @@ msgstr "" "color-moved-ws: allow-indentation-change tidak dapat digabungkan dengan mode " "spasi yang lainnya" -#: diff.c:411 +#: diff.c:412 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Nilai tidak dikenal untuk variabel konfigurasi 'diff.submodule': '%s'" -#: diff.c:471 +#: diff.c:472 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -3240,49 +3276,51 @@ msgstr "" "Ditemukan error dalam variable konfigurasi 'diff.dirstat':\n" "%s" -#: diff.c:4290 +#: diff.c:4237 #, c-format msgid "external diff died, stopping at %s" msgstr "diff eksternal mati, berhenti pada %s" -#: diff.c:4642 -msgid "--name-only, --name-status, --check and -s are mutually exclusive" -msgstr "--name-only, --name-status, --check dan -s saling eksklusif" +#: diff.c:4589 +#, c-format +msgid "options '%s', '%s', '%s', and '%s' cannot be used together" +msgstr "Opsi '%s', '%s', '%s', dan '%s' tidak dapat digunakan bersamaan" -#: diff.c:4645 -msgid "-G, -S and --find-object are mutually exclusive" -msgstr "-G, -S dan --find-object saling eksklusif" +#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506 +#, c-format +msgid "options '%s', '%s', and '%s' cannot be used together" +msgstr "Opsi '%s', '%s', dan '%s' tidak dapat digunakan bersamaan" -#: diff.c:4648 -msgid "" -"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S" +#: diff.c:4597 +#, c-format +msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'" msgstr "" -"-G dan --pickaxe-regex saling eksklusif, gunakan --pickaxe-regex dengan -S" +"opsi '%s' dan '%s' tidak dapat digunakan bersamaan, gunakan '%s' dengan '%s'" -#: diff.c:4651 +#: diff.c:4601 +#, c-format msgid "" -"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " -"with -G and -S" +"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'" msgstr "" -"--pickaxe-all dan --find-object saling eksklusif, gunakan --pickaxe-all " -"dengan -G dan -S" +"opsi '%s' dan '%s' tidak dapat digunakan bersamaan, gunakan '%s' dengan '%s' " +"dan '%s'" -#: diff.c:4730 +#: diff.c:4681 msgid "--follow requires exactly one pathspec" msgstr "--follow butuh tepatnya satu spek jalur" -#: diff.c:4778 +#: diff.c:4729 #, c-format msgid "invalid --stat value: %s" msgstr "nilai --stat tidak valid: %s" -#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326 +#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277 #: parse-options.c:217 parse-options.c:221 #, c-format msgid "%s expects a numerical value" msgstr "%s harap nilai numerik" -#: diff.c:4815 +#: diff.c:4766 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3291,42 +3329,42 @@ msgstr "" "Gagal menguraikan parameter opsi --dirstat/-X:\n" "%s" -#: diff.c:4900 +#: diff.c:4851 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "kelas perubahan '%c' tidak dikenal dalam --diff-filter=%s" -#: diff.c:4924 +#: diff.c:4875 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "nilai tidak dikenal setelah ws-error-highlight=%.*s" -#: diff.c:4938 +#: diff.c:4889 #, c-format msgid "unable to resolve '%s'" msgstr "tidak dapat menguraikan '%s'" -#: diff.c:4988 diff.c:4994 +#: diff.c:4939 diff.c:4945 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s butuh bentuk <n>/<m>" -#: diff.c:5006 +#: diff.c:4957 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s butuh sebuah karakter, dapat '%s'" -#: diff.c:5027 +#: diff.c:4978 #, c-format msgid "bad --color-moved argument: %s" msgstr "argumen --color-moved jelek: %s" -#: diff.c:5046 +#: diff.c:4997 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "mode tidak valid '%s' dalam --color-moved-ws" -#: diff.c:5086 +#: diff.c:5037 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3334,162 +3372,162 @@ msgstr "" "opsi diff-algorithm terima \"myers\", \"minimal\", \"patience\" dan " "\"histogram\"" -#: diff.c:5122 diff.c:5142 +#: diff.c:5073 diff.c:5093 #, c-format msgid "invalid argument to %s" msgstr "argumen tidak valid ke %s" -#: diff.c:5246 +#: diff.c:5197 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "regex tidak valid diberikan ke -I: '%s'" -#: diff.c:5295 +#: diff.c:5246 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "gagal menguraikan parameter opsi --submodule: '%s'" -#: diff.c:5351 +#: diff.c:5302 #, c-format msgid "bad --word-diff argument: %s" msgstr "argumen --word-diff jelek: %s" -#: diff.c:5387 +#: diff.c:5338 msgid "Diff output format options" msgstr "Opsi format keluaran diff" -#: diff.c:5389 diff.c:5395 +#: diff.c:5340 diff.c:5346 msgid "generate patch" msgstr "buat tambalan" -#: diff.c:5392 builtin/log.c:179 +#: diff.c:5343 builtin/log.c:179 msgid "suppress diff output" msgstr "sembunyikan keluaran diff" -#: diff.c:5397 diff.c:5511 diff.c:5518 +#: diff.c:5348 diff.c:5462 diff.c:5469 msgid "<n>" msgstr "<n>" -#: diff.c:5398 diff.c:5401 +#: diff.c:5349 diff.c:5352 msgid "generate diffs with <n> lines context" msgstr "buat diff dengan <n> baris konteks" -#: diff.c:5403 +#: diff.c:5354 msgid "generate the diff in raw format" msgstr "buat diff dalam format mentah" -#: diff.c:5406 +#: diff.c:5357 msgid "synonym for '-p --raw'" msgstr "sinonim untuk '-p --raw'" -#: diff.c:5410 +#: diff.c:5361 msgid "synonym for '-p --stat'" msgstr "sinonim untuk '-p --stat'" -#: diff.c:5414 +#: diff.c:5365 msgid "machine friendly --stat" msgstr "--stat yang ramah mesin" -#: diff.c:5417 +#: diff.c:5368 msgid "output only the last line of --stat" msgstr "keluarkan hanya baris terakhir --stat" -#: diff.c:5419 diff.c:5427 +#: diff.c:5370 diff.c:5378 msgid "<param1,param2>..." msgstr "<parameter 1,parameter 2>..." -#: diff.c:5420 +#: diff.c:5371 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "keluarkan distribusi jumlah perubahan relatif untuk setiap subdirektori" -#: diff.c:5424 +#: diff.c:5375 msgid "synonym for --dirstat=cumulative" msgstr "sinonim untuk --dirstat=cumulative" -#: diff.c:5428 +#: diff.c:5379 msgid "synonym for --dirstat=files,param1,param2..." msgstr "sinonim untuk --dirstat=files,param1,param2..." -#: diff.c:5432 +#: diff.c:5383 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "peringatkan bila perubahan memasukkan penanda konflik atau kesalahan spasi" -#: diff.c:5435 +#: diff.c:5386 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "ringkasan singkat seperti pembuatan, penggantian nama dan perubahan mode" -#: diff.c:5438 +#: diff.c:5389 msgid "show only names of changed files" msgstr "perlihatkan hanya nama berkas yang berubah" -#: diff.c:5441 +#: diff.c:5392 msgid "show only names and status of changed files" msgstr "perlihatkan hanya nama dan status berkas yang berubah" -#: diff.c:5443 +#: diff.c:5394 msgid "<width>[,<name-width>[,<count>]]" msgstr "<lebar>[,<nama lebar>[,<hitungan>]]" -#: diff.c:5444 +#: diff.c:5395 msgid "generate diffstat" msgstr "buat diffstat" -#: diff.c:5446 diff.c:5449 diff.c:5452 +#: diff.c:5397 diff.c:5400 diff.c:5403 msgid "<width>" msgstr "<lebar>" -#: diff.c:5447 +#: diff.c:5398 msgid "generate diffstat with a given width" msgstr "buat diffstat dengan lebar yang diberikan" -#: diff.c:5450 +#: diff.c:5401 msgid "generate diffstat with a given name width" msgstr "buat diffstat dengan nama lebar yang diberikan" -#: diff.c:5453 +#: diff.c:5404 msgid "generate diffstat with a given graph width" msgstr "buat diffstat dengan lebar grafik yang diberikan" -#: diff.c:5455 +#: diff.c:5406 msgid "<count>" msgstr "<hitungan>" -#: diff.c:5456 +#: diff.c:5407 msgid "generate diffstat with limited lines" msgstr "buat diffstat dengan baris yang terbatas" -#: diff.c:5459 +#: diff.c:5410 msgid "generate compact summary in diffstat" msgstr "buat ringkasan singkat dalam diffstat" -#: diff.c:5462 +#: diff.c:5413 msgid "output a binary diff that can be applied" msgstr "keluarkan diff biner yang dapat diterapkan" -#: diff.c:5465 +#: diff.c:5416 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "perlihatkan objek pra- dan pasca-citra penuh pada baris \"index\"" -#: diff.c:5467 +#: diff.c:5418 msgid "show colored diff" msgstr "perlihatkan diff berwarna" -#: diff.c:5468 +#: diff.c:5419 msgid "<kind>" msgstr "<tipe>" -#: diff.c:5469 +#: diff.c:5420 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" "soroti kesalahan spasi dalam baris 'context', 'old' atau 'new' dalam diff" -#: diff.c:5472 +#: diff.c:5423 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3497,91 +3535,91 @@ msgstr "" "jangan tengkar jalur nama dan gunakan NUL sebagai pembatas bidang keluaran " "pada --raw atau --numstat" -#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590 +#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541 msgid "<prefix>" msgstr "<prefiks>" -#: diff.c:5476 +#: diff.c:5427 msgid "show the given source prefix instead of \"a/\"" msgstr "perlihatkan prefiks sumber yang diberikan daripada \"a/\"" -#: diff.c:5479 +#: diff.c:5430 msgid "show the given destination prefix instead of \"b/\"" msgstr "perlihatkan prefiks tujuan daripada \"b/\"" -#: diff.c:5482 +#: diff.c:5433 msgid "prepend an additional prefix to every line of output" msgstr "tambah depan prefiks tambahan pada setiap baris keluaran" -#: diff.c:5485 +#: diff.c:5436 msgid "do not show any source or destination prefix" msgstr "jangan perlihatkan prefiks sumber atau tujuan apapun" -#: diff.c:5488 +#: diff.c:5439 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "perlihatkan konteks diantara bingkah diff hingga jumlah baris yang disebutkan" -#: diff.c:5492 diff.c:5497 diff.c:5502 +#: diff.c:5443 diff.c:5448 diff.c:5453 msgid "<char>" msgstr "<karakter>" -#: diff.c:5493 +#: diff.c:5444 msgid "specify the character to indicate a new line instead of '+'" msgstr "sebutkan karakter yang menandai baris baru daripada '+'" -#: diff.c:5498 +#: diff.c:5449 msgid "specify the character to indicate an old line instead of '-'" msgstr "sebutkan karakter yang menandai baris lama daripada '-'" -#: diff.c:5503 +#: diff.c:5454 msgid "specify the character to indicate a context instead of ' '" msgstr "sebutkan karakter yang menandai konteks daripada ' '" -#: diff.c:5506 +#: diff.c:5457 msgid "Diff rename options" msgstr "Opsi penamaan ulang diff" -#: diff.c:5507 +#: diff.c:5458 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5508 +#: diff.c:5459 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" "pisahkan perubahan penulisan ulang penuh kedalam pasangan penghapusan dan " "pembuatan" -#: diff.c:5512 +#: diff.c:5463 msgid "detect renames" msgstr "deteksi penamaan ulang" -#: diff.c:5516 +#: diff.c:5467 msgid "omit the preimage for deletes" msgstr "lewati pracitra untuk penghapusan" -#: diff.c:5519 +#: diff.c:5470 msgid "detect copies" msgstr "deteksi penyalinan" -#: diff.c:5523 +#: diff.c:5474 msgid "use unmodified files as source to find copies" msgstr "" "gunakan berkas tak termodifikasi sebagai sumber untuk menemukan salinan" -#: diff.c:5525 +#: diff.c:5476 msgid "disable rename detection" msgstr "nonaktifkan deteksi penamaan ulang" -#: diff.c:5528 +#: diff.c:5479 msgid "use empty blobs as rename source" msgstr "gunakan blob kosong sebagai sumber penamaan ulang" -#: diff.c:5530 +#: diff.c:5481 msgid "continue listing the history of a file beyond renames" msgstr "lanjutkan daftarkan riwayat berkas di luar penamaan ulang" -#: diff.c:5533 +#: diff.c:5484 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3589,232 +3627,232 @@ msgstr "" "cegah pendeteksian penamaan ulang/penyalinan jika jumlah target penamaan " "ulang/penyalinan melebihi batas yang diberikan" -#: diff.c:5535 +#: diff.c:5486 msgid "Diff algorithm options" msgstr "Opsi algoritma diff" -#: diff.c:5537 +#: diff.c:5488 msgid "produce the smallest possible diff" msgstr "hasilkan diff yang paling kecil yang dimungkinkan" -#: diff.c:5540 +#: diff.c:5491 msgid "ignore whitespace when comparing lines" msgstr "abaikan spasi saat membandingkan baris" -#: diff.c:5543 +#: diff.c:5494 msgid "ignore changes in amount of whitespace" msgstr "abaikan perubahan dalam jumlah spasi" -#: diff.c:5546 +#: diff.c:5497 msgid "ignore changes in whitespace at EOL" msgstr "abaikan perubahan spasi pada EOL" -#: diff.c:5549 +#: diff.c:5500 msgid "ignore carrier-return at the end of line" msgstr "abaikan kembalian-kurir pada akhir baris" -#: diff.c:5552 +#: diff.c:5503 msgid "ignore changes whose lines are all blank" msgstr "abaikan perubahan yang semua baris kosong" -#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624 +#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575 msgid "<regex>" msgstr "<regex>" -#: diff.c:5555 +#: diff.c:5506 msgid "ignore changes whose all lines match <regex>" msgstr "abaikan perubahan yang semua baris cocok dengan <regex>" -#: diff.c:5558 +#: diff.c:5509 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" "heuristik untuk geser perbatasan bingkah diff untuk pembacaan yang mudah" -#: diff.c:5561 +#: diff.c:5512 msgid "generate diff using the \"patience diff\" algorithm" msgstr "buat diff menggunakan algoritma \"diff sabar\"" -#: diff.c:5565 +#: diff.c:5516 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "buat diff menggunakan algoritma \"diff histogram\"" -#: diff.c:5567 +#: diff.c:5518 msgid "<algorithm>" msgstr "<algoritma>" -#: diff.c:5568 +#: diff.c:5519 msgid "choose a diff algorithm" msgstr "pilih algoritma diff" -#: diff.c:5570 +#: diff.c:5521 msgid "<text>" msgstr "<teks>" -#: diff.c:5571 +#: diff.c:5522 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "buat diff menggunakan algoritma \"diff terlabuh\"" -#: diff.c:5573 diff.c:5582 diff.c:5585 +#: diff.c:5524 diff.c:5533 diff.c:5536 msgid "<mode>" msgstr "<mode>" -#: diff.c:5574 +#: diff.c:5525 msgid "show word diff, using <mode> to delimit changed words" msgstr "" "perlihatkan diff kata, menggunakan <mode> untuk batasi kata yang berubah" -#: diff.c:5577 +#: diff.c:5528 msgid "use <regex> to decide what a word is" msgstr "gunakan <regex> untuk menentukan apa itu kata" -#: diff.c:5580 +#: diff.c:5531 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "sama dengan --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5583 +#: diff.c:5534 msgid "moved lines of code are colored differently" msgstr "baris kode yang berpindah diwarnai berbeda" -#: diff.c:5586 +#: diff.c:5537 msgid "how white spaces are ignored in --color-moved" msgstr "bagaimana spasi diabaikan di --color-moved" -#: diff.c:5589 +#: diff.c:5540 msgid "Other diff options" msgstr "Opsi diff yang lainnya" -#: diff.c:5591 +#: diff.c:5542 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "ketika dijalankan dari subdirektori, kecualikan perubahan diluar dan " "perlihatkan jalur relatif" -#: diff.c:5595 +#: diff.c:5546 msgid "treat all files as text" msgstr "perlakukan semua berkas sebagai teks" -#: diff.c:5597 +#: diff.c:5548 msgid "swap two inputs, reverse the diff" msgstr "tukar dua masukkan, balikkan diff" -#: diff.c:5599 +#: diff.c:5550 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "keluar dengan 1 jika ada perbedaan, selain itu 0" -#: diff.c:5601 +#: diff.c:5552 msgid "disable all output of the program" msgstr "nonaktifkan semua keluaran program" -#: diff.c:5603 +#: diff.c:5554 msgid "allow an external diff helper to be executed" msgstr "perbolehkan pembantu diff eksternal untuk dieksekusi" -#: diff.c:5605 +#: diff.c:5556 msgid "run external text conversion filters when comparing binary files" msgstr "" "jalankan saringan konversi teks eksternal ketika membandingkan berkas biner" -#: diff.c:5607 +#: diff.c:5558 msgid "<when>" msgstr "<kapan>" -#: diff.c:5608 +#: diff.c:5559 msgid "ignore changes to submodules in the diff generation" msgstr "abaikan perubahan submodul dalam pembuatan diff" -#: diff.c:5611 +#: diff.c:5562 msgid "<format>" msgstr "<format>" -#: diff.c:5612 +#: diff.c:5563 msgid "specify how differences in submodules are shown" msgstr "sebutkan bagaimana perbedaan dalam submodul diperlihatkan" -#: diff.c:5616 +#: diff.c:5567 msgid "hide 'git add -N' entries from the index" msgstr "sembunyikan entri 'git add -N' dari indeks" -#: diff.c:5619 +#: diff.c:5570 msgid "treat 'git add -N' entries as real in the index" msgstr "perlakukan entri 'git add -N' sebagai nyata dalam indeks" -#: diff.c:5621 +#: diff.c:5572 msgid "<string>" msgstr "<untai>" -#: diff.c:5622 +#: diff.c:5573 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "cari perbedaan yang mengubah jumlah kemunculan untai yang disebutkan" -#: diff.c:5625 +#: diff.c:5576 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "cari perbedaan yang mengubah jumlah kemunculan regex yang disebutkan" -#: diff.c:5628 +#: diff.c:5579 msgid "show all changes in the changeset with -S or -G" msgstr "perlihatkan semua perubahan dalam set perubahan dengan -S atau -G" -#: diff.c:5631 +#: diff.c:5582 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" "perlakukan <string> di -S sebagai ekspresi reguler POSIX yang diperluas" -#: diff.c:5634 +#: diff.c:5585 msgid "control the order in which files appear in the output" msgstr "kontrol urutan berkas yang muncul dalam keluaran" -#: diff.c:5635 diff.c:5638 +#: diff.c:5586 diff.c:5589 msgid "<path>" msgstr "<jalur>" -#: diff.c:5636 +#: diff.c:5587 msgid "show the change in the specified path first" msgstr "perlihatkan perubahan dalam jalur yang disebutkan terlebih dahulu" -#: diff.c:5639 +#: diff.c:5590 msgid "skip the output to the specified path" msgstr "lewati keluaran ke jalur yang disebutkan" -#: diff.c:5641 +#: diff.c:5592 msgid "<object-id>" msgstr "<id objek>" -#: diff.c:5642 +#: diff.c:5593 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "cari perubahan yang mengubah jumlah kemunculan objek yang disebutkan" -#: diff.c:5644 +#: diff.c:5595 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5645 +#: diff.c:5596 msgid "select files by diff type" msgstr "pilih berkas oleh tipe diff" -#: diff.c:5647 +#: diff.c:5598 msgid "<file>" msgstr "<berkas>" -#: diff.c:5648 +#: diff.c:5599 msgid "Output to a specific file" msgstr "Keluarkan ke berkas yang disebutkan" -#: diff.c:6306 +#: diff.c:6257 msgid "exhaustive rename detection was skipped due to too many files." msgstr "deteksi penamaan ulang lengkap dilewati karena terlalu banyak berkas." -#: diff.c:6309 +#: diff.c:6260 msgid "only found copies from modified paths due to too many files." msgstr "" "hanya ditemukan salinan dari jalur yang berubah karena terlalu banyak berkas." -#: diff.c:6312 +#: diff.c:6263 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3856,29 +3894,29 @@ msgstr "" msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "" -#: dir.c:830 +#: dir.c:828 msgid "disabling cone pattern matching" msgstr "" -#: dir.c:1214 +#: dir.c:1212 #, c-format msgid "cannot use %s as an exclude file" msgstr "" -#: dir.c:2464 +#: dir.c:2418 #, c-format msgid "could not open directory '%s'" msgstr "" -#: dir.c:2766 +#: dir.c:2720 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:2890 +#: dir.c:2844 msgid "untracked cache is disabled on this system or location" msgstr "" -#: dir.c:3158 +#: dir.c:3112 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -3886,36 +3924,36 @@ msgstr "" "Nama direktori tidak dapat ditebak.\n" "Mohon sebutkan direktori pada baris perintah" -#: dir.c:3837 +#: dir.c:3800 #, c-format msgid "index file corrupt in repo %s" msgstr "" -#: dir.c:3884 dir.c:3889 +#: dir.c:3847 dir.c:3852 #, c-format msgid "could not create directories for %s" msgstr "" -#: dir.c:3918 +#: dir.c:3881 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "" -#: editor.c:77 +#: editor.c:74 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "" -#: entry.c:177 +#: entry.c:179 msgid "Filtering content" msgstr "" -#: entry.c:498 +#: entry.c:500 #, c-format msgid "could not stat file '%s'" msgstr "" -#: environment.c:143 +#: environment.c:145 #, c-format msgid "bad git namespace path \"%s\"" msgstr "" @@ -3925,273 +3963,269 @@ msgstr "" msgid "too many args to run %s" msgstr "" -#: fetch-pack.c:193 +#: fetch-pack.c:194 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: daftar dangkal diharapkan" -#: fetch-pack.c:196 +#: fetch-pack.c:197 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack: sebuah paket bilasan diharapkan setelah daftar dangkal" -#: fetch-pack.c:207 +#: fetch-pack.c:208 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: ACK/NAK diharapkan, dapat paket bilasan" -#: fetch-pack.c:227 +#: fetch-pack.c:228 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: ACK/NAK diharapkan, dapat '%s'" -#: fetch-pack.c:238 +#: fetch-pack.c:239 msgid "unable to write to remote" msgstr "tidak dapat menulis ke remote" -#: fetch-pack.c:299 -msgid "--stateless-rpc requires multi_ack_detailed" -msgstr "--stateless-rpc memerlukan multi_ack_detailed" - -#: fetch-pack.c:394 fetch-pack.c:1434 +#: fetch-pack.c:395 fetch-pack.c:1439 #, c-format msgid "invalid shallow line: %s" msgstr "baris dangkal tidak valid: %s" -#: fetch-pack.c:400 fetch-pack.c:1440 +#: fetch-pack.c:401 fetch-pack.c:1445 #, c-format msgid "invalid unshallow line: %s" msgstr "baris dangkal-balik tidak valid: %s" -#: fetch-pack.c:402 fetch-pack.c:1442 +#: fetch-pack.c:403 fetch-pack.c:1447 #, c-format msgid "object not found: %s" msgstr "object tidak ditemukan: %s" -#: fetch-pack.c:405 fetch-pack.c:1445 +#: fetch-pack.c:406 fetch-pack.c:1450 #, c-format msgid "error in object: %s" msgstr "kesalahan dalam objek: %s" -#: fetch-pack.c:407 fetch-pack.c:1447 +#: fetch-pack.c:408 fetch-pack.c:1452 #, c-format msgid "no shallow found: %s" msgstr "tidak ada dangkal yang ditemukan: %s" -#: fetch-pack.c:410 fetch-pack.c:1451 +#: fetch-pack.c:411 fetch-pack.c:1456 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "dangkal/dangkal-balik diharapkan, dapat %s" -#: fetch-pack.c:450 +#: fetch-pack.c:451 #, c-format msgid "got %s %d %s" msgstr "dapat %s %d %s" -#: fetch-pack.c:467 +#: fetch-pack.c:468 #, c-format msgid "invalid commit %s" msgstr "komit tidak valid %s" -#: fetch-pack.c:498 +#: fetch-pack.c:499 msgid "giving up" msgstr "menyerah" -#: fetch-pack.c:511 progress.c:339 +#: fetch-pack.c:512 progress.c:339 msgid "done" msgstr "selesai" -#: fetch-pack.c:523 +#: fetch-pack.c:524 #, c-format msgid "got %s (%d) %s" msgstr "dapat %s (%d) %s" -#: fetch-pack.c:559 +#: fetch-pack.c:560 #, c-format msgid "Marking %s as complete" msgstr "Menandai %s sebagai lengkap" -#: fetch-pack.c:774 +#: fetch-pack.c:775 #, c-format msgid "already have %s (%s)" msgstr "sudah punya %s (%s)" -#: fetch-pack.c:860 +#: fetch-pack.c:861 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: tidak dapat menggarpu pemultipleks-balik pita samping" -#: fetch-pack.c:868 +#: fetch-pack.c:869 msgid "protocol error: bad pack header" msgstr "kesalahan protokol: kepala pak jelek" -#: fetch-pack.c:962 +#: fetch-pack.c:965 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: tidak dapat menggarpu %s" -#: fetch-pack.c:968 +#: fetch-pack.c:971 msgid "fetch-pack: invalid index-pack output" msgstr "fetch-pack: keluaran index-pack tidak valid" -#: fetch-pack.c:985 +#: fetch-pack.c:988 #, c-format msgid "%s failed" msgstr "%s gagal" -#: fetch-pack.c:987 +#: fetch-pack.c:990 msgid "error in sideband demultiplexer" msgstr "kesalahan dalam pemultipleks-balik pita samping" -#: fetch-pack.c:1030 +#: fetch-pack.c:1035 #, c-format msgid "Server version is %.*s" msgstr "Versi peladen %.*s" -#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053 -#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069 -#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085 -#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107 +#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058 +#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074 +#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090 +#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112 #, c-format msgid "Server supports %s" msgstr "Peladen mendukung %s" -#: fetch-pack.c:1040 +#: fetch-pack.c:1045 msgid "Server does not support shallow clients" msgstr "Peladen tidak mendukung klien dangkal" -#: fetch-pack.c:1100 +#: fetch-pack.c:1105 msgid "Server does not support --shallow-since" msgstr "Peladen tidak mendukung --shallow-since" -#: fetch-pack.c:1105 +#: fetch-pack.c:1110 msgid "Server does not support --shallow-exclude" msgstr "Peladen tidak mendukung --shallow-exclude" -#: fetch-pack.c:1109 +#: fetch-pack.c:1114 msgid "Server does not support --deepen" msgstr "Peladen tidak mendukung --deepen" -#: fetch-pack.c:1111 +#: fetch-pack.c:1116 msgid "Server does not support this repository's object format" msgstr "Peladen tidak mendukung objek format repositori ini" -#: fetch-pack.c:1124 +#: fetch-pack.c:1129 msgid "no common commits" msgstr "tidak ada komit umum" -#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130 +#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130 msgid "source repository is shallow, reject to clone." msgstr "repositori sumber dangkal, menolak mengkloning." -#: fetch-pack.c:1139 fetch-pack.c:1671 +#: fetch-pack.c:1144 fetch-pack.c:1681 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: pengambilan gagal." -#: fetch-pack.c:1253 +#: fetch-pack.c:1258 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "algoritma tidak cocok: klien %s; peladen %s" -#: fetch-pack.c:1257 +#: fetch-pack.c:1262 #, c-format msgid "the server does not support algorithm '%s'" msgstr "peladen tidak mendukung algoritma '%s'" -#: fetch-pack.c:1290 +#: fetch-pack.c:1295 msgid "Server does not support shallow requests" msgstr "Peladen tidak mendukung permintaan dangkal" -#: fetch-pack.c:1297 +#: fetch-pack.c:1302 msgid "Server supports filter" msgstr "Peladen mendukung saringan" -#: fetch-pack.c:1340 fetch-pack.c:2053 +#: fetch-pack.c:1345 fetch-pack.c:2063 msgid "unable to write request to remote" msgstr "tidak dapat menulis permintaan kepada remote" -#: fetch-pack.c:1358 +#: fetch-pack.c:1363 #, c-format msgid "error reading section header '%s'" msgstr "kesalahan membaca kepala seksi '%s'" -#: fetch-pack.c:1364 +#: fetch-pack.c:1369 #, c-format msgid "expected '%s', received '%s'" msgstr "diharapkan '%s', diterima '%s'" -#: fetch-pack.c:1398 +#: fetch-pack.c:1403 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "baris pengakuan tidak diharapkan: %s" -#: fetch-pack.c:1403 +#: fetch-pack.c:1408 #, c-format msgid "error processing acks: %d" msgstr "kesalahan memproses ack: %d" -#: fetch-pack.c:1413 +#: fetch-pack.c:1418 msgid "expected packfile to be sent after 'ready'" msgstr "berkas pak diharapkan dikirim setelah 'ready'" -#: fetch-pack.c:1415 +#: fetch-pack.c:1420 msgid "expected no other sections to be sent after no 'ready'" msgstr "" "tidak ada seksi lainnya yang diharapkan dikirim setelah tidak ada 'ready'" -#: fetch-pack.c:1456 +#: fetch-pack.c:1461 #, c-format msgid "error processing shallow info: %d" msgstr "gagal memproses info dangkal: %d" -#: fetch-pack.c:1505 +#: fetch-pack.c:1510 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "wanted-ref diharapkan, dapat '%s'" -#: fetch-pack.c:1510 +#: fetch-pack.c:1515 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref tidak diharapkan: '%s'" -#: fetch-pack.c:1515 +#: fetch-pack.c:1520 #, c-format msgid "error processing wanted refs: %d" msgstr "kesalahan memproses referensi yang diminta: %d" -#: fetch-pack.c:1545 +#: fetch-pack.c:1550 msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack: paket jawaban akhir diharapkan" -#: fetch-pack.c:1949 +#: fetch-pack.c:1959 msgid "no matching remote head" msgstr "tidak ada kepala remote yang cocok" -#: fetch-pack.c:1972 builtin/clone.c:581 +#: fetch-pack.c:1982 builtin/clone.c:581 msgid "remote did not send all necessary objects" msgstr "remote tidak mengirim semua objek yang dibutuhkan" -#: fetch-pack.c:2075 +#: fetch-pack.c:2085 msgid "unexpected 'ready' from remote" msgstr "'ready' tidak diharapkan dari remote" -#: fetch-pack.c:2098 +#: fetch-pack.c:2108 #, c-format msgid "no such remote ref %s" msgstr "tidak ada referensi remote seperti %s" -#: fetch-pack.c:2101 +#: fetch-pack.c:2111 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Peladen tidak memperbolehkan permintaan untuk objek tak diiklankan %s" -#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902 -#: gpg-interface.c:918 +#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974 +#: gpg-interface.c:990 msgid "could not create temporary file" msgstr "tidak dapat membuat berkas sementara" -#: gpg-interface.c:332 gpg-interface.c:454 +#: gpg-interface.c:332 gpg-interface.c:460 #, c-format msgid "failed writing detached signature to '%s'" msgstr "gagal menulis tandatangan terlepas ke '%s'" -#: gpg-interface.c:445 +#: gpg-interface.c:451 msgid "" "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh " "signature verification" @@ -4199,7 +4233,7 @@ msgstr "" "gpg.ssh.allowedSignersFile perlu dikonfigurasi dan ada untuk verifikasi " "tandatangan ssh" -#: gpg-interface.c:469 +#: gpg-interface.c:480 msgid "" "ssh-keygen -Y find-principals/verify is needed for ssh signature " "verification (available in openssh version 8.2p1+)" @@ -4207,57 +4241,57 @@ msgstr "" "ssh-keygen -Y find-principals/verify diperlukan untuk verifikasi tandatangan " "ssh (tersedia di openssh versi 8.2p1+)" -#: gpg-interface.c:523 +#: gpg-interface.c:536 #, c-format msgid "ssh signing revocation file configured but not found: %s" msgstr "" "berkas pencabutan penandatanganan ssh terkonfigurasi tapi tidak ada: %s" -#: gpg-interface.c:576 +#: gpg-interface.c:624 #, c-format msgid "bad/incompatible signature '%s'" msgstr "tanda tangan '%s' jelek/tidak kompatibel" -#: gpg-interface.c:735 gpg-interface.c:740 +#: gpg-interface.c:801 gpg-interface.c:806 #, c-format msgid "failed to get the ssh fingerprint for key '%s'" msgstr "gagal mendapatkan sidik jari ssh untuk kunci '%s'" -#: gpg-interface.c:762 +#: gpg-interface.c:829 msgid "" "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured" msgstr "" "baik user.signingkey atau gpg.ssh.defaultKeyCommand perlu dikonfigurasi" -#: gpg-interface.c:780 +#: gpg-interface.c:851 #, c-format msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s" msgstr "gpg.ssh.defaultKeyCommand sukses tapi tidak mengembalikan kunci: %s %s" -#: gpg-interface.c:786 +#: gpg-interface.c:857 #, c-format msgid "gpg.ssh.defaultKeyCommand failed: %s %s" msgstr "gpg.ssh.defaultKeyCommand gagal: %s %s" -#: gpg-interface.c:874 +#: gpg-interface.c:945 msgid "gpg failed to sign the data" msgstr "gpg gagal menandatangani data" -#: gpg-interface.c:895 +#: gpg-interface.c:967 msgid "user.signingkey needs to be set for ssh signing" msgstr "user.signingkey perlu disetel untuk penandatanganan ssh" -#: gpg-interface.c:906 +#: gpg-interface.c:978 #, c-format msgid "failed writing ssh signing key to '%s'" msgstr "gagal menulis kunci penandatanganan ssh ke '%s'" -#: gpg-interface.c:924 +#: gpg-interface.c:996 #, c-format msgid "failed writing ssh signing key buffer to '%s'" msgstr "gagal menulis penyangga kunci penandatanganan ssh ke '%s'" -#: gpg-interface.c:942 +#: gpg-interface.c:1014 msgid "" "ssh-keygen -Y sign is needed for ssh signing (available in openssh version " "8.2p1+)" @@ -4265,7 +4299,7 @@ msgstr "" "ssh-keygen -Y sign diperlukan untuk penandatanganan ssh (tersedia di " "openssh versi 8.2p1+)" -#: gpg-interface.c:954 +#: gpg-interface.c:1026 #, c-format msgid "failed reading ssh signing data buffer from '%s'" msgstr "gagal membaca penyangga data penandatanganan ssh dari '%s'" @@ -4275,7 +4309,7 @@ msgstr "gagal membaca penyangga data penandatanganan ssh dari '%s'" msgid "ignored invalid color '%.*s' in log.graphColors" msgstr "warna tidak valid '%.*s' diabaikan di log.graphColors" -#: grep.c:533 +#: grep.c:531 msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" @@ -4283,18 +4317,18 @@ msgstr "" "pola yang diberikan berisi bita NULL (via -f <berkas>). Hal ini hanya " "didukung dengan -P di bawah PCRE v2" -#: grep.c:1928 +#: grep.c:1942 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': tidak dapat membaca %s" -#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90 +#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90 #: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" msgstr "gagal men-stat '%s'" -#: grep.c:1956 +#: grep.c:1970 #, c-format msgid "'%s': short read" msgstr "'%s': baca pendek" @@ -4415,7 +4449,7 @@ msgstr "Melanjutkan di bawah asumsi bahwa maksud Anda '%s'." #: help.c:646 #, c-format -msgid "Run '%s' instead? (y/N)" +msgid "Run '%s' instead [y/N]? " msgstr "" #: help.c:654 @@ -4618,7 +4652,7 @@ msgstr "" msgid "quoted CRLF detected" msgstr "" -#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46 +#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46 #, c-format msgid "bad action '%s' for '%s'" msgstr "" @@ -4810,14 +4844,14 @@ msgstr "" msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-ort.c:3856 +#: merge-ort.c:3869 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " "of %s left in tree." msgstr "" -#: merge-ort.c:4152 +#: merge-ort.c:4165 #, c-format msgid "" "Note: %s not up to date and in way of checking out conflicted version; old " @@ -4827,7 +4861,7 @@ msgstr "" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. -#: merge-ort.c:4521 +#: merge-ort.c:4534 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "" @@ -4839,7 +4873,7 @@ msgid "" " %s" msgstr "" -#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403 +#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405 msgid "Already up to date." msgstr "Sudah terbaru." @@ -5098,7 +5132,7 @@ msgstr "" msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904 +#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906 #: builtin/stash.c:489 msgid "Unable to write index." msgstr "" @@ -5107,8 +5141,8 @@ msgstr "" msgid "failed to read the cache" msgstr "gagal membaca tembolok" -#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967 -#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706 +#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022 +#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706 #: builtin/stash.c:269 msgid "unable to write new index file" msgstr "gagal menulis berkas indeks baru" @@ -5117,212 +5151,214 @@ msgstr "gagal menulis berkas indeks baru" msgid "multi-pack-index OID fanout is of the wrong size" msgstr "OID kipas-keluar indeks multipak salah ukuran" -#: midx.c:109 +#: midx.c:111 #, c-format msgid "multi-pack-index file %s is too small" msgstr "berkas indeks multipak %s terlalu kecil" -#: midx.c:125 +#: midx.c:127 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" -msgstr "tanda tangan indeks multipak 0x%08x tidak cocok dengan tanda tangan 0x%08x" +msgstr "" +"tanda tangan indeks multipak 0x%08x tidak cocok dengan tanda tangan 0x%08x" -#: midx.c:130 +#: midx.c:132 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "versi indeks multipak %d tidak dikenal" -#: midx.c:135 +#: midx.c:137 #, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "versi hash indeks multipak %u tidak cocok dengan versi %u" -#: midx.c:152 +#: midx.c:154 msgid "multi-pack-index missing required pack-name chunk" msgstr "indeks multipak kehilangan bingkah pack-name yang diperlukan" -#: midx.c:154 +#: midx.c:156 msgid "multi-pack-index missing required OID fanout chunk" msgstr "indeks multipak kehilangan bingkah OID kipas keluar yang diperlukan" -#: midx.c:156 +#: midx.c:158 msgid "multi-pack-index missing required OID lookup chunk" msgstr "indeks multipak kehilangan bingkah pencarian OID yang diperlukan" -#: midx.c:158 +#: midx.c:160 msgid "multi-pack-index missing required object offsets chunk" msgstr "indeks multipak kehilangan bingkah offset objek yang diperlukan" -#: midx.c:174 +#: midx.c:176 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "nama pak indeks multipak tidak berurutan: '%s' sebelum '%s'" -#: midx.c:221 +#: midx.c:224 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "pack-int-id jelek: %u (total pak %u)" -#: midx.c:271 +#: midx.c:274 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "indeks multipak simpan offset 64-bit, tapi off_t terlalu kecil" -#: midx.c:502 +#: midx.c:505 #, c-format msgid "failed to add packfile '%s'" msgstr "gagal menambah berkas pak '%s'" -#: midx.c:508 +#: midx.c:511 #, c-format msgid "failed to open pack-index '%s'" msgstr "gagal membuka indeks pak '%s'" -#: midx.c:576 +#: midx.c:579 #, c-format msgid "failed to locate object %d in packfile" msgstr "gagal melokasi objek %d di dalam berkas pak" -#: midx.c:892 +#: midx.c:895 msgid "cannot store reverse index file" msgstr "tidak dapat menyimpan berkas indeks balik" -#: midx.c:990 +#: midx.c:993 #, c-format msgid "could not parse line: %s" msgstr "tidak dapat menguraikan baris: %s" -#: midx.c:992 +#: midx.c:995 #, c-format msgid "malformed line: %s" msgstr "baris jelek '%s'." -#: midx.c:1159 +#: midx.c:1162 msgid "ignoring existing multi-pack-index; checksum mismatch" msgstr "abaikan indeks multipak yang sudah ada; checksum tidak cocok" -#: midx.c:1184 +#: midx.c:1187 msgid "could not load pack" msgstr "tidak dapat memuat pak" -#: midx.c:1190 +#: midx.c:1193 #, c-format msgid "could not open index for %s" msgstr "tidak dapat membuka indeks untuk %s" -#: midx.c:1201 +#: midx.c:1204 msgid "Adding packfiles to multi-pack-index" msgstr "Menambahkan berkas pak ke indeks multipak" -#: midx.c:1244 +#: midx.c:1247 #, c-format msgid "unknown preferred pack: '%s'" msgstr "pak yang disukai tidak dikenal: '%s'" -#: midx.c:1289 +#: midx.c:1292 #, c-format msgid "cannot select preferred pack %s with no objects" msgstr "tidak dapat memilih pak yang disukai %s tanpa objek" -#: midx.c:1321 +#: midx.c:1324 #, c-format msgid "did not see pack-file %s to drop" msgstr "tidak melihat berkas pak %s untuk dijeblokkan" -#: midx.c:1367 +#: midx.c:1370 #, c-format msgid "preferred pack '%s' is expired" msgstr "pak yang disukai '%s' kadaluarsa" -#: midx.c:1380 +#: midx.c:1383 msgid "no pack files to index." msgstr "tidak ada berkas pak untuk diindeks." -#: midx.c:1417 +#: midx.c:1420 msgid "could not write multi-pack bitmap" msgstr "tidak dapat menulis bitmap multipak" -#: midx.c:1427 +#: midx.c:1430 msgid "could not write multi-pack-index" msgstr "gagal menulis indeks multipak" -#: midx.c:1486 builtin/clean.c:37 +#: midx.c:1489 builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "gagal menghapus %s" -#: midx.c:1517 +#: midx.c:1522 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "gagal membersihkan indeks multipak pada %s" -#: midx.c:1577 +#: midx.c:1585 msgid "multi-pack-index file exists, but failed to parse" msgstr "berkas indeks multipak ada, tetapi gagal diurai" -#: midx.c:1585 +#: midx.c:1593 msgid "incorrect checksum" msgstr "checksum salah" -#: midx.c:1588 +#: midx.c:1596 msgid "Looking for referenced packfiles" msgstr "Mencari berkas pak yang direferensikan" -#: midx.c:1603 +#: midx.c:1611 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" -"kipas-keluar oid tidak berurutan: fanout[%d] =%<PRIx32> > %<PRIx32> = fanout[%d]" +"kipas-keluar oid tidak berurutan: fanout[%d] =%<PRIx32> > %<PRIx32> = " +"fanout[%d]" -#: midx.c:1608 +#: midx.c:1616 msgid "the midx contains no oid" msgstr "midx tidak berisi oid" -#: midx.c:1617 +#: midx.c:1625 msgid "Verifying OID order in multi-pack-index" msgstr "Memverifikasi urutan OID di dalam indeks multipak" -#: midx.c:1626 +#: midx.c:1634 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "urutan pencarian oid tidak berurutan: oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1646 +#: midx.c:1654 msgid "Sorting objects by packfile" msgstr "Mengurutkan objek oleh berkas pak" -#: midx.c:1653 +#: midx.c:1661 msgid "Verifying object offsets" msgstr "Memverifikasi offset objek" -#: midx.c:1669 +#: midx.c:1677 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "gagal memuat entri pak untuk oid[%d] = %s" -#: midx.c:1675 +#: midx.c:1683 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "gagal memuat indeks pak untuk berkas pak %s" -#: midx.c:1684 +#: midx.c:1692 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "offset objek salah untuk oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1709 +#: midx.c:1719 msgid "Counting referenced objects" msgstr "Menghitung objek tereferensi" -#: midx.c:1719 +#: midx.c:1729 msgid "Finding and deleting unreferenced packfiles" msgstr "Mencari dan menghapus berkas pak tak tereferensi" -#: midx.c:1911 +#: midx.c:1921 msgid "could not start pack-objects" msgstr "tidak dapat memulai pack-objects" -#: midx.c:1931 +#: midx.c:1941 msgid "could not finish pack-objects" msgstr "tidak dapat menyelesaikan pack-objects" @@ -5377,257 +5413,257 @@ msgstr "" msgid "Bad %s value: '%s'" msgstr "" -#: object-file.c:459 +#: object-file.c:456 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" -#: object-file.c:517 +#: object-file.c:514 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "" -#: object-file.c:591 +#: object-file.c:588 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "" -#: object-file.c:598 +#: object-file.c:595 #, c-format msgid "unable to normalize object directory: %s" msgstr "" -#: object-file.c:641 +#: object-file.c:638 msgid "unable to fdopen alternates lockfile" msgstr "" -#: object-file.c:659 +#: object-file.c:656 msgid "unable to read alternates file" msgstr "" -#: object-file.c:666 +#: object-file.c:663 msgid "unable to move new alternates file into place" msgstr "" -#: object-file.c:701 +#: object-file.c:741 #, c-format msgid "path '%s' does not exist" msgstr "" -#: object-file.c:722 +#: object-file.c:762 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" -#: object-file.c:728 +#: object-file.c:768 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: object-file.c:734 +#: object-file.c:774 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: object-file.c:742 +#: object-file.c:782 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: object-file.c:773 +#: object-file.c:813 #, c-format msgid "could not find object directory matching %s" msgstr "" -#: object-file.c:823 +#: object-file.c:863 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "" -#: object-file.c:973 +#: object-file.c:1013 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "" -#: object-file.c:1008 +#: object-file.c:1048 #, c-format msgid "mmap failed%s" msgstr "" -#: object-file.c:1174 +#: object-file.c:1214 #, c-format msgid "object file %s is empty" msgstr "" -#: object-file.c:1293 object-file.c:2499 +#: object-file.c:1333 object-file.c:2542 #, c-format msgid "corrupt loose object '%s'" msgstr "" -#: object-file.c:1295 object-file.c:2503 +#: object-file.c:1335 object-file.c:2546 #, c-format msgid "garbage at end of loose object '%s'" msgstr "" -#: object-file.c:1417 +#: object-file.c:1457 #, c-format msgid "unable to parse %s header" msgstr "" -#: object-file.c:1419 +#: object-file.c:1459 msgid "invalid object type" msgstr "" -#: object-file.c:1430 +#: object-file.c:1470 #, c-format msgid "unable to unpack %s header" msgstr "" -#: object-file.c:1434 +#: object-file.c:1474 #, c-format msgid "header for %s too long, exceeds %d bytes" msgstr "" -#: object-file.c:1664 +#: object-file.c:1704 #, c-format msgid "failed to read object %s" msgstr "" -#: object-file.c:1668 +#: object-file.c:1708 #, c-format msgid "replacement %s not found for %s" msgstr "" -#: object-file.c:1672 +#: object-file.c:1712 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "" -#: object-file.c:1676 +#: object-file.c:1716 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "" -#: object-file.c:1781 +#: object-file.c:1821 #, c-format msgid "unable to write file %s" msgstr "" -#: object-file.c:1788 +#: object-file.c:1828 #, c-format msgid "unable to set permission to '%s'" msgstr "" -#: object-file.c:1795 +#: object-file.c:1835 msgid "file write error" msgstr "" -#: object-file.c:1815 +#: object-file.c:1858 msgid "error when closing loose object file" msgstr "" -#: object-file.c:1882 +#: object-file.c:1925 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" -#: object-file.c:1884 +#: object-file.c:1927 msgid "unable to create temporary file" msgstr "" -#: object-file.c:1908 +#: object-file.c:1951 msgid "unable to write loose object file" msgstr "" -#: object-file.c:1914 +#: object-file.c:1957 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "" -#: object-file.c:1918 +#: object-file.c:1961 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "" -#: object-file.c:1922 +#: object-file.c:1965 #, c-format msgid "confused by unstable object source data for %s" msgstr "" -#: object-file.c:1933 builtin/pack-objects.c:1243 +#: object-file.c:1976 builtin/pack-objects.c:1243 #, c-format msgid "failed utime() on %s" msgstr "" -#: object-file.c:2011 +#: object-file.c:2054 #, c-format msgid "cannot read object for %s" msgstr "" -#: object-file.c:2062 +#: object-file.c:2105 msgid "corrupt commit" msgstr "" -#: object-file.c:2070 +#: object-file.c:2113 msgid "corrupt tag" msgstr "" -#: object-file.c:2170 +#: object-file.c:2213 #, c-format msgid "read error while indexing %s" msgstr "" -#: object-file.c:2173 +#: object-file.c:2216 #, c-format msgid "short read while indexing %s" msgstr "" -#: object-file.c:2246 object-file.c:2256 +#: object-file.c:2289 object-file.c:2299 #, c-format msgid "%s: failed to insert into database" msgstr "" -#: object-file.c:2262 +#: object-file.c:2305 #, c-format msgid "%s: unsupported file type" msgstr "" -#: object-file.c:2286 builtin/fetch.c:1445 +#: object-file.c:2329 builtin/fetch.c:1453 #, c-format msgid "%s is not a valid object" msgstr "" -#: object-file.c:2288 +#: object-file.c:2331 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: object-file.c:2315 +#: object-file.c:2358 #, c-format msgid "unable to open %s" msgstr "tidak dapat membuka %s" -#: object-file.c:2510 +#: object-file.c:2553 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "" -#: object-file.c:2533 +#: object-file.c:2576 #, c-format msgid "unable to mmap %s" msgstr "" -#: object-file.c:2539 +#: object-file.c:2582 #, c-format msgid "unable to unpack header of %s" msgstr "" -#: object-file.c:2544 +#: object-file.c:2587 #, c-format msgid "unable to parse header of %s" msgstr "" -#: object-file.c:2555 +#: object-file.c:2598 #, c-format msgid "unable to unpack contents of %s" msgstr "" @@ -5739,25 +5775,25 @@ msgstr "" msgid "hash mismatch %s" msgstr "" -#: pack-bitmap.c:348 +#: pack-bitmap.c:353 msgid "multi-pack bitmap is missing required reverse index" msgstr "" -#: pack-bitmap.c:424 +#: pack-bitmap.c:429 msgid "load_reverse_index: could not open pack" msgstr "" -#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424 +#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424 #, c-format msgid "unable to get size of %s" msgstr "" -#: pack-bitmap.c:1916 +#: pack-bitmap.c:1935 #, c-format msgid "could not find %s in pack %s at offset %<PRIuMAX>" msgstr "" -#: pack-bitmap.c:1952 builtin/rev-list.c:92 +#: pack-bitmap.c:1971 builtin/rev-list.c:92 #, c-format msgid "unable to get disk usage of %s" msgstr "" @@ -5806,45 +5842,50 @@ msgstr "" msgid "could not write '%s' promisor file" msgstr "" -#: packfile.c:626 +#: packfile.c:627 msgid "offset before end of packfile (broken .idx?)" msgstr "" -#: packfile.c:656 +#: packfile.c:657 #, c-format msgid "packfile %s cannot be mapped%s" msgstr "" -#: packfile.c:1923 +#: packfile.c:1924 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" -#: packfile.c:1927 +#: packfile.c:1928 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" -#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175 +#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175 #, c-format msgid "option `%s' expects a numerical value" msgstr "" -#: parse-options-cb.c:41 +#: parse-options-cb.c:42 #, c-format msgid "malformed expiration date '%s'" msgstr "" -#: parse-options-cb.c:54 +#: parse-options-cb.c:55 #, c-format msgid "option `%s' expects \"always\", \"auto\", or \"never\"" msgstr "" -#: parse-options-cb.c:132 parse-options-cb.c:149 +#: parse-options-cb.c:133 parse-options-cb.c:150 #, c-format msgid "malformed object name '%s'" msgstr "" +#: parse-options-cb.c:307 +#, c-format +msgid "option `%s' expects \"%s\" or \"%s\"" +msgstr "" + #: parse-options.c:58 #, c-format msgid "%s requires a value" @@ -5880,36 +5921,36 @@ msgstr "" msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "" -#: parse-options.c:427 parse-options.c:435 +#: parse-options.c:428 parse-options.c:436 #, c-format msgid "did you mean `--%s` (with two dashes)?" msgstr "" -#: parse-options.c:677 parse-options.c:1053 +#: parse-options.c:678 parse-options.c:1054 #, c-format msgid "alias of --%s" msgstr "" -#: parse-options.c:891 +#: parse-options.c:892 #, c-format msgid "unknown option `%s'" msgstr "" -#: parse-options.c:893 +#: parse-options.c:894 #, c-format msgid "unknown switch `%c'" msgstr "" -#: parse-options.c:895 +#: parse-options.c:896 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "" -#: parse-options.c:919 +#: parse-options.c:920 msgid "..." msgstr "" -#: parse-options.c:933 +#: parse-options.c:934 #, c-format msgid "usage: %s" msgstr "" @@ -5917,7 +5958,7 @@ msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:948 +#: parse-options.c:949 #, c-format msgid " or: %s" msgstr "" @@ -5941,17 +5982,17 @@ msgstr "" #. translated) N_() usage string, which contained embedded #. newlines before we split it up. #. -#: parse-options.c:969 +#: parse-options.c:970 #, c-format msgid "%*s%s" msgstr "" -#: parse-options.c:992 +#: parse-options.c:993 #, c-format msgid " %s" msgstr "" -#: parse-options.c:1039 +#: parse-options.c:1040 msgid "-NUM" msgstr "" @@ -6077,17 +6118,17 @@ msgstr "" msgid "the remote end hung up unexpectedly" msgstr "" -#: pkt-line.c:390 pkt-line.c:392 +#: pkt-line.c:417 pkt-line.c:419 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "" -#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417 +#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444 #, c-format msgid "protocol error: bad line length %d" msgstr "" -#: pkt-line.c:434 sideband.c:165 +#: pkt-line.c:472 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "" @@ -6138,7 +6179,7 @@ msgstr "" msgid "could not read `log` output" msgstr "" -#: range-diff.c:97 sequencer.c:5605 +#: range-diff.c:97 sequencer.c:5602 #, c-format msgid "could not parse commit '%s'" msgstr "" @@ -6159,209 +6200,205 @@ msgstr "" msgid "failed to generate diff" msgstr "" -#: range-diff.c:559 -msgid "--left-only and --right-only are mutually exclusive" -msgstr "" - #: range-diff.c:562 range-diff.c:564 #, c-format msgid "could not parse log for '%s'" msgstr "" -#: read-cache.c:710 +#: read-cache.c:723 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "" -#: read-cache.c:726 +#: read-cache.c:739 msgid "cannot create an empty blob in the object database" msgstr "" -#: read-cache.c:748 +#: read-cache.c:761 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" -#: read-cache.c:753 builtin/submodule--helper.c:3241 +#: read-cache.c:766 builtin/submodule--helper.c:3242 #, c-format msgid "'%s' does not have a commit checked out" msgstr "" -#: read-cache.c:805 +#: read-cache.c:818 #, c-format msgid "unable to index file '%s'" msgstr "" -#: read-cache.c:824 +#: read-cache.c:837 #, c-format msgid "unable to add '%s' to index" msgstr "" -#: read-cache.c:835 +#: read-cache.c:848 #, c-format msgid "unable to stat '%s'" msgstr "" -#: read-cache.c:1373 +#: read-cache.c:1386 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "" -#: read-cache.c:1588 +#: read-cache.c:1601 msgid "Refresh index" msgstr "" -#: read-cache.c:1720 +#: read-cache.c:1733 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1730 +#: read-cache.c:1743 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1786 +#: read-cache.c:1799 #, c-format msgid "bad signature 0x%08x" msgstr "" -#: read-cache.c:1789 +#: read-cache.c:1802 #, c-format msgid "bad index version %d" msgstr "" -#: read-cache.c:1798 +#: read-cache.c:1811 msgid "bad index file sha1 signature" msgstr "" -#: read-cache.c:1832 +#: read-cache.c:1845 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "" -#: read-cache.c:1834 +#: read-cache.c:1847 #, c-format msgid "ignoring %.4s extension" msgstr "" -#: read-cache.c:1871 +#: read-cache.c:1884 #, c-format msgid "unknown index entry format 0x%08x" msgstr "" -#: read-cache.c:1887 +#: read-cache.c:1900 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "" -#: read-cache.c:1944 +#: read-cache.c:1957 msgid "unordered stage entries in index" msgstr "" -#: read-cache.c:1947 +#: read-cache.c:1960 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "" -#: read-cache.c:1950 +#: read-cache.c:1963 #, c-format msgid "unordered stage entries for '%s'" msgstr "" -#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095 -#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183 -#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987 +#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183 +#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013 #: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519 -#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293 -#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201 +#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293 +#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202 msgid "index file corrupt" msgstr "" -#: read-cache.c:2209 +#: read-cache.c:2222 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2222 +#: read-cache.c:2235 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2255 +#: read-cache.c:2268 #, c-format msgid "%s: index file open failed" msgstr "" -#: read-cache.c:2259 +#: read-cache.c:2272 #, c-format msgid "%s: cannot stat the open index" msgstr "" -#: read-cache.c:2263 +#: read-cache.c:2276 #, c-format msgid "%s: index file smaller than expected" msgstr "" -#: read-cache.c:2267 +#: read-cache.c:2280 #, c-format msgid "%s: unable to map index file%s" msgstr "" -#: read-cache.c:2310 +#: read-cache.c:2323 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2337 +#: read-cache.c:2350 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2375 +#: read-cache.c:2396 #, c-format msgid "could not freshen shared index '%s'" msgstr "" -#: read-cache.c:2434 +#: read-cache.c:2455 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "" -#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147 +#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150 #, c-format msgid "could not close '%s'" msgstr "" -#: read-cache.c:3108 +#: read-cache.c:3129 msgid "failed to convert to a sparse-index" msgstr "" -#: read-cache.c:3179 +#: read-cache.c:3200 #, c-format msgid "could not stat '%s'" msgstr "" -#: read-cache.c:3192 +#: read-cache.c:3213 #, c-format msgid "unable to open git dir: %s" msgstr "" -#: read-cache.c:3204 +#: read-cache.c:3225 #, c-format msgid "unable to unlink: %s" msgstr "" -#: read-cache.c:3233 +#: read-cache.c:3254 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "" -#: read-cache.c:3390 +#: read-cache.c:3411 #, c-format msgid "%s: cannot drop to stage #0" msgstr "" @@ -6372,8 +6409,8 @@ msgid "" "continue'.\n" "Or you can abort the rebase with 'git rebase --abort'.\n" msgstr "" -"Anda dapat memperbaiki ini dengan 'git rebase --edit-todo' lalu jalankan 'git " -"rebase --continue'.\n" +"Anda dapat memperbaiki ini dengan 'git rebase --edit-todo' lalu jalankan " +"'git rebase --continue'.\n" "Atau Anda dapat membatalkan pendasaran ulang dengan 'git rebase --abort'.\n" #: rebase-interactive.c:33 @@ -6415,10 +6452,12 @@ msgstr "" "s, squash <komit> = gunakan komit, tapi lebur ke komit sebelumnya\n" "f, fixup [-C | -c] <komit> = seperti \"squash\" tapi hanya pertahankan\n" " pesan komit sebelumnya, kecuali -C digunakan, dimana\n" -" hanya pertahankan pesan komit ini; -c sama dengan -C tapi\n" -" buka penyunting" -"x, exec <perintah> = jalankan perintah (sisa baris) menggunakan cangkang\n" -"b, break = berhenti disini (lanjutkan pendasaran ulang nanti dengan 'git rebase --continue')\n" +" hanya pertahankan pesan komit ini; -c sama dengan -C " +"tapi\n" +" buka penyuntingx, exec <perintah> = jalankan perintah " +"(sisa baris) menggunakan cangkang\n" +"b, break = berhenti disini (lanjutkan pendasaran ulang nanti dengan 'git " +"rebase --continue')\n" "d, drop <komit> = hapus komit\n" "l, label <label> = tandai HEAD saat ini dengan nama\n" "t, reset <label> = setel ulang HEAD ke sebuah label\n" @@ -6442,7 +6481,8 @@ msgid "" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" msgstr "" "\n" -"Jangan hapus baris apapun. Gunakan 'drop' secara eksplisit untuk menghapus komit.\n" +"Jangan hapus baris apapun. Gunakan 'drop' secara eksplisit untuk menghapus " +"komit.\n" #: rebase-interactive.c:78 msgid "" @@ -6461,7 +6501,8 @@ msgid "" "\n" msgstr "" "\n" -"Anda sedang menyunting berkas todo dari pendasaran ulang interaktif yang sedang berjalan.\n" +"Anda sedang menyunting berkas todo dari pendasaran ulang interaktif yang " +"sedang berjalan.\n" "Untuk melanjutkan pendasaran ulang setelah menyunting, jalankan:\n" " git rebase --continue\n" "\n" @@ -6473,11 +6514,12 @@ msgid "" "\n" msgstr "" "\n" -"Bagaimanapun, jika Anda menghapus semuanya, pendasaran ulang akan dibatalkan.\n" +"Bagaimanapun, jika Anda menghapus semuanya, pendasaran ulang akan " +"dibatalkan.\n" "\n" -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888 -#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883 +#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791 #: builtin/rebase.c:190 #, c-format msgid "could not write '%s'" @@ -6507,7 +6549,8 @@ msgid "" "The possible behaviours are: ignore, warn, error.\n" "\n" msgstr "" -"Untuk menghindari pesan ini, gunakan \"drop\" untuk menghapus sebuah komit eksplisit.\n" +"Untuk menghindari pesan ini, gunakan \"drop\" untuk menghapus sebuah komit " +"eksplisit.\n" "Gunakan 'git config rebase.missingCommitsCheck untuk' mengganti tingkat " "peringatan.\n" "Kelakuan yang mungkin adalah: ignore, warn, error.\n" @@ -6518,7 +6561,7 @@ msgstr "" msgid "%s: 'preserve' superseded by 'merges'" msgstr "%s: 'preserve' digantikan oleh 'merges'" -#: ref-filter.c:42 wt-status.c:2036 +#: ref-filter.c:42 wt-status.c:2048 msgid "gone" msgstr "" @@ -6557,7 +6600,8 @@ msgstr "" msgid "Integer value expected refname:rstrip=%s" msgstr "" -#: ref-filter.c:265 +#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431 +#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "" @@ -6567,11 +6611,6 @@ msgstr "" msgid "%%(objecttype) does not take arguments" msgstr "" -#: ref-filter.c:344 -#, c-format -msgid "unrecognized %%(objectsize) argument: %s" -msgstr "" - #: ref-filter.c:352 #, c-format msgid "%%(deltabase) does not take arguments" @@ -6582,11 +6621,6 @@ msgstr "" msgid "%%(body) does not take arguments" msgstr "" -#: ref-filter.c:377 -#, c-format -msgid "unrecognized %%(subject) argument: %s" -msgstr "" - #: ref-filter.c:396 #, c-format msgid "expected %%(trailers:key=<value>)" @@ -6602,26 +6636,11 @@ msgstr "" msgid "positive value expected contents:lines=%s" msgstr "" -#: ref-filter.c:431 -#, c-format -msgid "unrecognized %%(contents) argument: %s" -msgstr "" - -#: ref-filter.c:443 -#, c-format -msgid "unrecognized %%(raw) argument: %s" -msgstr "" - #: ref-filter.c:458 #, c-format msgid "positive value expected '%s' in %%(%s)" msgstr "" -#: ref-filter.c:462 -#, c-format -msgid "unrecognized argument '%s' in %%(%s)" -msgstr "" - #: ref-filter.c:476 #, c-format msgid "unrecognized email option: %s" @@ -6642,21 +6661,11 @@ msgstr "" msgid "unrecognized width:%s" msgstr "" -#: ref-filter.c:534 -#, c-format -msgid "unrecognized %%(align) argument: %s" -msgstr "" - #: ref-filter.c:542 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "" -#: ref-filter.c:560 -#, c-format -msgid "unrecognized %%(if) argument: %s" -msgstr "" - #: ref-filter.c:568 #, c-format msgid "%%(rest) does not take arguments" @@ -6678,14 +6687,9 @@ msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" -#: ref-filter.c:844 +#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948 #, c-format -msgid "format: %%(if) atom used without a %%(then) atom" -msgstr "" - -#: ref-filter.c:910 -#, c-format -msgid "format: %%(then) atom used without an %%(if) atom" +msgid "format: %%(%s) atom used without a %%(%s) atom" msgstr "" #: ref-filter.c:912 @@ -6698,16 +6702,6 @@ msgstr "" msgid "format: %%(then) atom used after %%(else)" msgstr "" -#: ref-filter.c:946 -#, c-format -msgid "format: %%(else) atom used without an %%(if) atom" -msgstr "" - -#: ref-filter.c:948 -#, c-format -msgid "format: %%(else) atom used without a %%(then) atom" -msgstr "" - #: ref-filter.c:950 #, c-format msgid "format: %%(else) atom used more than once" @@ -6782,22 +6776,22 @@ msgstr "" msgid "ignoring ref with broken name %s" msgstr "" -#: ref-filter.c:2250 refs.c:673 +#: ref-filter.c:2250 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "" -#: ref-filter.c:2623 +#: ref-filter.c:2629 #, c-format msgid "format: %%(end) atom missing" msgstr "" -#: ref-filter.c:2726 +#: ref-filter.c:2740 #, c-format msgid "malformed object name %s" msgstr "" -#: ref-filter.c:2731 +#: ref-filter.c:2745 #, c-format msgid "option `%s' must point to a commit" msgstr "" @@ -6832,71 +6826,71 @@ msgstr "" msgid "invalid branch name: %s = %s" msgstr "" -#: refs.c:671 +#: refs.c:674 #, c-format msgid "ignoring dangling symref %s" msgstr "" -#: refs.c:920 +#: refs.c:925 #, c-format msgid "log for ref %s has gap after %s" msgstr "" -#: refs.c:927 +#: refs.c:932 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "" -#: refs.c:992 +#: refs.c:997 #, c-format msgid "log for %s is empty" msgstr "" -#: refs.c:1084 +#: refs.c:1090 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "" -#: refs.c:1155 +#: refs.c:1168 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "" -#: refs.c:2062 +#: refs.c:2067 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "" -#: refs.c:2142 +#: refs.c:2150 msgid "ref updates forbidden inside quarantine environment" msgstr "" -#: refs.c:2153 +#: refs.c:2161 msgid "ref updates aborted by hook" msgstr "" -#: refs.c:2253 refs.c:2283 +#: refs.c:2269 refs.c:2299 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "" -#: refs.c:2259 refs.c:2294 +#: refs.c:2275 refs.c:2310 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "" -#: refs/files-backend.c:1271 +#: refs/files-backend.c:1267 #, c-format msgid "could not remove reference %s" msgstr "" -#: refs/files-backend.c:1285 refs/packed-backend.c:1549 +#: refs/files-backend.c:1281 refs/packed-backend.c:1549 #: refs/packed-backend.c:1559 #, c-format msgid "could not delete reference %s: %s" msgstr "" -#: refs/files-backend.c:1288 refs/packed-backend.c:1562 +#: refs/files-backend.c:1284 refs/packed-backend.c:1562 #, c-format msgid "could not delete references: %s" msgstr "" @@ -6906,50 +6900,50 @@ msgstr "" msgid "invalid refspec '%s'" msgstr "" -#: remote.c:351 +#: remote.c:402 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "pintasan konfigurasi remote tidak dapat diawali dengan '/': %s" -#: remote.c:399 +#: remote.c:450 msgid "more than one receivepack given, using the first" msgstr "lebih dari satu paket terima diberikan, gunakan yang pertama" -#: remote.c:407 +#: remote.c:458 msgid "more than one uploadpack given, using the first" msgstr "lebih dari satu paket unggah diberikan, gunakan yang pertama" -#: remote.c:590 +#: remote.c:699 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "tidak dapat mengambil baik %s dan %s ke %s" -#: remote.c:594 +#: remote.c:703 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s biasanya melacak %s, bukan %s" -#: remote.c:598 +#: remote.c:707 #, c-format msgid "%s tracks both %s and %s" msgstr "%s melacak baik %s dan %s" -#: remote.c:666 +#: remote.c:775 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "kunci '%s' dari pola tidak ada '*'" -#: remote.c:676 +#: remote.c:785 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "nilai '%s' dari pola tidak ada '*'" -#: remote.c:1083 +#: remote.c:1192 #, c-format msgid "src refspec %s does not match any" msgstr "spek referensi sumber %s tidak cocok dengan apapun" -#: remote.c:1088 +#: remote.c:1197 #, c-format msgid "src refspec %s matches more than one" msgstr "spek referensi sumber %s cocok dengan lebih dari satu" @@ -6958,7 +6952,7 @@ msgstr "spek referensi sumber %s cocok dengan lebih dari satu" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1103 +#: remote.c:1212 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -6982,7 +6976,7 @@ msgstr "" "Kedua-duanya tidak bekerja, jadi kami menyerah. Anda harus kualifikasi\n" "penuh referensi." -#: remote.c:1123 +#: remote.c:1232 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -6993,7 +6987,7 @@ msgstr "" "Apakah maksud Anda buat cabang baru dengan mendorong ke\n" "'%s:refs/heads/%s'?" -#: remote.c:1128 +#: remote.c:1237 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -7004,7 +6998,7 @@ msgstr "" "Apakah maksud Anda buat tag baru dengan mendorong ke\n" "'%s:refs/tags/%s'?" -#: remote.c:1133 +#: remote.c:1242 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -7015,7 +7009,7 @@ msgstr "" "Apakah maksud Anda tag pohon dengan mendorong ke\n" "'%s:refs/tags/%s'?" -#: remote.c:1138 +#: remote.c:1247 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -7026,114 +7020,114 @@ msgstr "" "Apakah maksud Anda tag blob baru dengan mendorong ke\n" "'%s:refs/tags/%s'?" -#: remote.c:1174 +#: remote.c:1283 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s tidak dapat diselesaikan ke cabang" -#: remote.c:1185 +#: remote.c:1294 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "tidak dapat menghapus '%s': referensi remote tidak ada" -#: remote.c:1197 +#: remote.c:1306 #, c-format msgid "dst refspec %s matches more than one" msgstr "spek referensi tujuan %s cocok dengan lebih dari satu" -#: remote.c:1204 +#: remote.c:1313 #, c-format msgid "dst ref %s receives from more than one src" msgstr "referensi tujuan %s menerima dari lebih dari satu sumber" -#: remote.c:1724 remote.c:1825 +#: remote.c:1834 remote.c:1941 msgid "HEAD does not point to a branch" msgstr "HEAD tidak menunjuk ke cabang" -#: remote.c:1733 +#: remote.c:1843 #, c-format msgid "no such branch: '%s'" msgstr "tidak ada cabang seperti: '%s'" -#: remote.c:1736 +#: remote.c:1846 #, c-format msgid "no upstream configured for branch '%s'" msgstr "tidak ada hulu yang terkonfigurasi untuk cabang '%s'" -#: remote.c:1742 +#: remote.c:1852 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "cabang hulu '%s' tidak disimpan sebagai cabang pelacak remote" -#: remote.c:1757 +#: remote.c:1867 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "tujuan dorong '%s' pada remote '%s' tidak ada cabang pelacak lokal" -#: remote.c:1769 +#: remote.c:1882 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "cabang '%s' tidak ada remote untuk didorong" -#: remote.c:1779 +#: remote.c:1892 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "spek referensi dorong untuk '%s' tidak termasuk '%s'" -#: remote.c:1792 +#: remote.c:1905 msgid "push has no destination (push.default is 'nothing')" msgstr "dorong tidak ada tujuan (push.default yaitu 'nothing')" -#: remote.c:1814 +#: remote.c:1927 msgid "cannot resolve 'simple' push to a single destination" msgstr "tidak dapat menyelesaikan dorongan 'sederhana' ke satu tujuan" -#: remote.c:1943 +#: remote.c:2060 #, c-format msgid "couldn't find remote ref %s" msgstr "tidak dapat menemukan referensi remote %s" -#: remote.c:1956 +#: remote.c:2073 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Abaikan referensi lucu '%s' secara lokal" -#: remote.c:2119 +#: remote.c:2236 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Cabang Anda didasarkan pada '%s', tapi hulu sudah tiada.\n" -#: remote.c:2123 +#: remote.c:2240 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (gunakan \"git branch --unset-upstream\" untuk perbaiki)\n" -#: remote.c:2126 +#: remote.c:2243 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Cabang Anda mutakhir dengan '%s'.\n" -#: remote.c:2130 +#: remote.c:2247 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Cabang Anda dan '%s' merujuk pada komit yang berbeda.\n" -#: remote.c:2133 +#: remote.c:2250 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (gunakan \"%s\" untuk selengkapnya)\n" -#: remote.c:2137 +#: remote.c:2254 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "" msgstr[1] "" -#: remote.c:2143 +#: remote.c:2260 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (gunakan \"git push\" untuk terbitkan komit lokal Anda)\n" -#: remote.c:2146 +#: remote.c:2263 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -7141,11 +7135,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2154 +#: remote.c:2271 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (gunakan \"git pull\" untuk perbarui cabang lokal Anda)\n" -#: remote.c:2157 +#: remote.c:2274 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -7156,11 +7150,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2167 +#: remote.c:2284 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (gunakan \"git pull\" untuk gabungkan cabang remote ke milik Anda)\n" -#: remote.c:2359 +#: remote.c:2476 #, c-format msgid "cannot parse expected object name '%s'" msgstr "tidak dapat mengurai nama object yang diharapkan '%s'" @@ -7193,7 +7187,7 @@ msgstr "tidak dapat menulis rekaman rerere" msgid "there were errors while writing '%s' (%s)" msgstr "ada kesalahan saat menulis '%s' (%s)" -#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281 +#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298 #, c-format msgid "failed to flush '%s'" msgstr "gagal membilas '%s'" @@ -7238,8 +7232,8 @@ msgstr "tidak dapat batal taut simpangan '%s'" msgid "Recorded preimage for '%s'" msgstr "Pracitra direkam untuk '%s'" -#: rerere.c:865 submodule.c:2121 builtin/log.c:2002 -#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819 +#: rerere.c:865 submodule.c:2121 builtin/log.c:2017 +#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820 #, c-format msgid "could not create directory '%s'" msgstr "tidak dapat membuat direktori '%s'" @@ -7277,37 +7271,29 @@ msgstr "tidak dapat membuka direktori rr-cache" msgid "could not determine HEAD revision" msgstr "tidak dapat menentukan revisi HEAD" -#: reset.c:70 reset.c:76 sequencer.c:3705 +#: reset.c:70 reset.c:76 sequencer.c:3700 #, c-format msgid "failed to find tree of %s" msgstr "gagal menemukan pohon %s" -#: revision.c:2259 -msgid "--unsorted-input is incompatible with --no-walk" -msgstr "" - -#: revision.c:2346 +#: revision.c:2347 msgid "--unpacked=<packfile> no longer supported" msgstr "" -#: revision.c:2655 revision.c:2659 -msgid "--no-walk is incompatible with --unsorted-input" -msgstr "" - -#: revision.c:2690 +#: revision.c:2686 msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2693 +#: revision.c:2689 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2895 +#: revision.c:2891 msgid "-L does not yet support diff formats besides -p and -s" msgstr "" -#: run-command.c:1278 +#: run-command.c:1262 #, c-format msgid "cannot create async thread: %s" msgstr "" @@ -7365,41 +7351,43 @@ msgstr "ujung penerima tidak mendukung opsi dorong" #: sequencer.c:197 #, c-format msgid "invalid commit message cleanup mode '%s'" -msgstr "" +msgstr "mode pembersihan pesan komit tidak valid '%s'" #: sequencer.c:325 #, c-format msgid "could not delete '%s'" -msgstr "" +msgstr "tidak dapat menghapus '%s'" -#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297 -#: builtin/rm.c:408 +#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297 +#: builtin/rm.c:409 #, c-format msgid "could not remove '%s'" -msgstr "" +msgstr "tidak dapat menghapus '%s'" #: sequencer.c:355 msgid "revert" -msgstr "" +msgstr "balik" #: sequencer.c:357 msgid "cherry-pick" -msgstr "" +msgstr "petik ceri" #: sequencer.c:359 msgid "rebase" -msgstr "" +msgstr "dasar ulang" #: sequencer.c:361 #, c-format msgid "unknown action: %d" -msgstr "" +msgstr "aksi tidak dikenal: %d" #: sequencer.c:420 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" +"setelah menyelesaikan konflik, tandai jalur yang terkoreksi\n" +"dengan 'git add <jalur>' atau 'git rm <jalur>'" #: sequencer.c:423 msgid "" @@ -7410,6 +7398,12 @@ msgid "" "To abort and get back to the state before \"git cherry-pick\",\n" "run \"git cherry-pick --abort\"." msgstr "" +"Setelah menyelesaikan konflik, tandai dengan\n" +"\"git add/rm <spek jalur\", lalu jalankan\n" +"\"git cherry-pick --continue\".\n" +"Atau Anda dapat melewati komit ini dengan \"git cherry-pick --skip\".\n" +"Untuk membatalkan dan kembali ke keadaan sebelum \"git cherry-pick\",\n" +"jalankan \"git cherry-pick --abort\"." #: sequencer.c:430 msgid "" @@ -7420,47 +7414,59 @@ msgid "" "To abort and get back to the state before \"git revert\",\n" "run \"git revert --abort\"." msgstr "" +"Setelah menyelesaikan konflik, tandai dengan\n" +"\"git add/rm <spek jalur>\", lalu jalankan\n" +"\"git revert --continue\".\n" +"Atau Anda dapat melewati komit ini dengan \"git revert --skip\".\n" +"Untuk membatalkan dan kembali ke keadaan sebelum \"git revert\",\n" +"jalankan \"git revert --abort\"." -#: sequencer.c:448 sequencer.c:3290 +#: sequencer.c:448 sequencer.c:3292 #, c-format msgid "could not lock '%s'" -msgstr "" +msgstr "tidak dapat mengunci '%s'" -#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308 -#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639 +#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310 +#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639 #, c-format msgid "could not write to '%s'" -msgstr "" +msgstr "tidak dapat menulis ke '%s'" #: sequencer.c:455 #, c-format msgid "could not write eol to '%s'" -msgstr "" +msgstr "tidak dapat menulis akhir baris ke '%s'" -#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310 -#: sequencer.c:3574 +#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312 +#: sequencer.c:3569 #, c-format msgid "failed to finalize '%s'" -msgstr "" +msgstr "gagal mengakhiri '%s'" + +#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551 +#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148 +#, c-format +msgid "could not read '%s'" +msgstr "tidak dapat membaca '%s'" #: sequencer.c:499 #, c-format msgid "your local changes would be overwritten by %s." -msgstr "" +msgstr "perubahan lokal Anda akan ditimpa oleh %s." #: sequencer.c:503 msgid "commit your changes or stash them to proceed." -msgstr "" +msgstr "komit perubahan Anda atau stase untuk melanjutkan." #: sequencer.c:535 #, c-format msgid "%s: fast-forward" -msgstr "" +msgstr "%s: maju-cepat" -#: sequencer.c:574 builtin/tag.c:610 +#: sequencer.c:574 builtin/tag.c:614 #, c-format msgid "Invalid cleanup mode %s" -msgstr "" +msgstr "Mode pembersihan tidak valid %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". @@ -7468,60 +7474,60 @@ msgstr "" #: sequencer.c:685 #, c-format msgid "%s: Unable to write new index file" -msgstr "" +msgstr "%s: Tidak dapat menulis berkas indeks baru" #: sequencer.c:699 msgid "unable to update cache tree" -msgstr "" +msgstr "tidak dapat memperbarui pohon tembolok" #: sequencer.c:713 msgid "could not resolve HEAD commit" -msgstr "" +msgstr "tidak dapat menguraikan komit HEAD" #: sequencer.c:793 #, c-format msgid "no key present in '%.*s'" -msgstr "" +msgstr "tidak ada kunci yang ada di pada '%.*s'" #: sequencer.c:804 #, c-format msgid "unable to dequote value of '%s'" -msgstr "" +msgstr "tidak dapat membatal-kutip nilai dari '%s'" -#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730 -#: builtin/am.c:822 builtin/rebase.c:694 +#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756 +#: builtin/am.c:848 builtin/rebase.c:694 #, c-format msgid "could not open '%s' for reading" -msgstr "" +msgstr "tidak dapat membuka '%s' untuk dibaca" #: sequencer.c:851 msgid "'GIT_AUTHOR_NAME' already given" -msgstr "" +msgstr "'GIT_AUTHOR_NAME' sudah diberikan" #: sequencer.c:856 msgid "'GIT_AUTHOR_EMAIL' already given" -msgstr "" +msgstr "'GIT_AUTHOR_EMAIL' sudah diberikan" #: sequencer.c:861 msgid "'GIT_AUTHOR_DATE' already given" -msgstr "" +msgstr "'GIT_AUTHOR_DATE' sudah diberikan" #: sequencer.c:865 #, c-format msgid "unknown variable '%s'" -msgstr "" +msgstr "variabel tidak dikenal '%s'" #: sequencer.c:870 msgid "missing 'GIT_AUTHOR_NAME'" -msgstr "" +msgstr "'GIT_AUTHOR_NAME' hilang" #: sequencer.c:872 msgid "missing 'GIT_AUTHOR_EMAIL'" -msgstr "" +msgstr "'GIT_AUTHOR_EMAIL' hilang" #: sequencer.c:874 msgid "missing 'GIT_AUTHOR_DATE'" -msgstr "" +msgstr "'GIT_AUTHOR_DATE' hilang" #: sequencer.c:939 #, c-format @@ -7539,12 +7545,23 @@ msgid "" "\n" " git rebase --continue\n" msgstr "" +"Anda punya perubahan tergelar di dalam pohon kerja Anda.\n" +"Apabila perubahan tersebut dimaksudkan untuk dilumat ke komit sebelumnya, jalankan:\n" +"\n" +" git commit --amend %s\n" +"\n" +"Apabila dimaksudkan untuk masuk ke komit baru, jalankan:\n" +"\n" +" git commit %s\n" +"Pada kedua kasus tersebut, setelah selesai, lanjutkan dengan:\n" +"\n" +" git rebase --continue\n" -#: sequencer.c:1229 +#: sequencer.c:1225 msgid "'prepare-commit-msg' hook failed" -msgstr "" +msgstr "kait 'prepare-commit-msg' gagal" -#: sequencer.c:1235 +#: sequencer.c:1231 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7558,8 +7575,19 @@ msgid "" "\n" " git commit --amend --reset-author\n" msgstr "" +"Nama dan email Anda dikonfigurasikan otomatis berdasarkan nama pengguna\n" +"dan nama host Anda. Periksa jika itu benar. Anda dapat mematikan pesan\n" +"ini dengan menyetel secara eksplisit. Jalankan perintah berikut dan ikuti\n" +"petunjuk di dalam penyunting untuk menyunting berkas konfigurasi Anda:\n" +"\n" +" git config --global --edit\n" +"\n" +"Setelah itu, Anda dapat memperbaiki identitas yang digunakan untuk komit\n" +"ini dengan:\n" +"\n" +" git commit --amend --reset-author\n" -#: sequencer.c:1248 +#: sequencer.c:1244 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7572,365 +7600,379 @@ msgid "" "\n" " git commit --amend --reset-author\n" msgstr "" +"Nama dan email Anda dikonfigurasikan otomatis berdasarkan nama pengguna\n" +"dan nama host Anda. Periksa jika itu benar. Anda dapat mematikan pesan\n" +"ini dengan menyetel secara eksplisit:\n" +"\n" +" git config --global user.name \"Nama Anda\"\n" +" git config --global user.email anda@example.com\n" +"\n" +"Setelah itu, Anda dapat memperbaiki identitas yang digunakan untuk komit\n" +"ini dengan:\n" +"\n" +" git commit --amend --reset-author\n" -#: sequencer.c:1290 +#: sequencer.c:1288 msgid "couldn't look up newly created commit" -msgstr "" +msgstr "tidak dapat mencari komit yang baru saja dibuat" -#: sequencer.c:1292 +#: sequencer.c:1290 msgid "could not parse newly created commit" -msgstr "" +msgstr "tidak dapat menguraikan komit yang baru saja dibuat" -#: sequencer.c:1338 +#: sequencer.c:1339 msgid "unable to resolve HEAD after creating commit" -msgstr "" +msgstr "tidak dapat menguraikan HEAD setelah membuat komit" -#: sequencer.c:1340 +#: sequencer.c:1342 msgid "detached HEAD" -msgstr "" +msgstr "HEAD terpisah" -#: sequencer.c:1344 +#: sequencer.c:1346 msgid " (root-commit)" -msgstr "" +msgstr " (komit-akar)" -#: sequencer.c:1365 +#: sequencer.c:1367 msgid "could not parse HEAD" -msgstr "" +msgstr "tidak dapat menguraikan HEAD" -#: sequencer.c:1367 +#: sequencer.c:1369 #, c-format msgid "HEAD %s is not a commit!" -msgstr "" +msgstr "HEAD %s bukan sebuah komit!" -#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707 +#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708 msgid "could not parse HEAD commit" -msgstr "" +msgstr "tidak dapat menguraikan komit HEAD" -#: sequencer.c:1427 sequencer.c:2312 +#: sequencer.c:1429 sequencer.c:2314 msgid "unable to parse commit author" -msgstr "" +msgstr "tidak dapat menguraikan pengarang komit" -#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708 +#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710 msgid "git write-tree failed to write a tree" -msgstr "" +msgstr "git write-tree gagal menulis sebuah pohon" -#: sequencer.c:1471 sequencer.c:1591 +#: sequencer.c:1473 sequencer.c:1593 #, c-format msgid "unable to read commit message from '%s'" -msgstr "" +msgstr "tidak dapat membaca pesan komit dari '%s'" -#: sequencer.c:1502 sequencer.c:1534 +#: sequencer.c:1504 sequencer.c:1536 #, c-format msgid "invalid author identity '%s'" -msgstr "" +msgstr "identitas pengarang tidak valid '%s'" -#: sequencer.c:1508 +#: sequencer.c:1510 msgid "corrupt author: missing date information" -msgstr "" +msgstr "pengarang rusak: informasi tanggal hilang" -#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913 -#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915 +#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" -msgstr "" +msgstr "gagal menulis objek komit" -#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199 +#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199 #: t/helper/test-fast-rebase.c:217 #, c-format msgid "could not update %s" -msgstr "" +msgstr "tidak dapat memperbarui %s" -#: sequencer.c:1623 +#: sequencer.c:1625 #, c-format msgid "could not parse commit %s" -msgstr "" +msgstr "tidak dapat menguraikan komit %s" -#: sequencer.c:1628 +#: sequencer.c:1630 #, c-format msgid "could not parse parent commit %s" -msgstr "" +msgstr "tidak dapat menguraikan komit induk %s" -#: sequencer.c:1711 sequencer.c:1992 +#: sequencer.c:1713 sequencer.c:1994 #, c-format msgid "unknown command: %d" -msgstr "" +msgstr "perintah tidak dikenal: %d" -#: sequencer.c:1753 +#: sequencer.c:1755 msgid "This is the 1st commit message:" -msgstr "" +msgstr "Ini komit pertama:" -#: sequencer.c:1754 +#: sequencer.c:1756 #, c-format msgid "This is the commit message #%d:" -msgstr "" +msgstr "Ini komit ke-%d:" -#: sequencer.c:1755 +#: sequencer.c:1757 msgid "The 1st commit message will be skipped:" -msgstr "" +msgstr "Pesan komit pertama akan dilewati:" -#: sequencer.c:1756 +#: sequencer.c:1758 #, c-format msgid "The commit message #%d will be skipped:" -msgstr "" +msgstr "Pesan komit ke-%d akan dilewati" -#: sequencer.c:1757 +#: sequencer.c:1759 #, c-format msgid "This is a combination of %d commits." -msgstr "" +msgstr "Ini kombinasi dari %d komit." -#: sequencer.c:1904 sequencer.c:1961 +#: sequencer.c:1906 sequencer.c:1963 #, c-format msgid "cannot write '%s'" -msgstr "" +msgstr "tidak dapat menulis '%s'" -#: sequencer.c:1951 +#: sequencer.c:1953 msgid "need a HEAD to fixup" -msgstr "" +msgstr "butuh sebuah HEAD untuk memperbaiki" -#: sequencer.c:1953 sequencer.c:3601 +#: sequencer.c:1955 sequencer.c:3596 msgid "could not read HEAD" -msgstr "" +msgstr "tidak dapat membaca HEAD" -#: sequencer.c:1955 +#: sequencer.c:1957 msgid "could not read HEAD's commit message" -msgstr "" +msgstr "tidak dapat membaca pesan komit HEAD" -#: sequencer.c:1979 +#: sequencer.c:1981 #, c-format msgid "could not read commit message of %s" -msgstr "" +msgstr "tidak dapat membaca pesan komit %s" -#: sequencer.c:2089 +#: sequencer.c:2091 msgid "your index file is unmerged." -msgstr "" +msgstr "berkas indeks Anda tak tergabung." -#: sequencer.c:2096 +#: sequencer.c:2098 msgid "cannot fixup root commit" -msgstr "" +msgstr "tidak dapat memperbaiki komit akar" -#: sequencer.c:2115 +#: sequencer.c:2117 #, c-format msgid "commit %s is a merge but no -m option was given." -msgstr "" +msgstr "komit %s adalah penggabungan tetapi opsi -m tidak diberikan." -#: sequencer.c:2123 sequencer.c:2131 +#: sequencer.c:2125 sequencer.c:2133 #, c-format msgid "commit %s does not have parent %d" -msgstr "" +msgstr "komit %s tidak punya induk %d" -#: sequencer.c:2137 +#: sequencer.c:2139 #, c-format msgid "cannot get commit message for %s" -msgstr "" +msgstr "tidak dapat mendapatkan pesan komit untuk %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:2156 +#: sequencer.c:2158 #, c-format msgid "%s: cannot parse parent commit %s" -msgstr "" +msgstr "%s: tidak dapat menguraikan komit induk %s" -#: sequencer.c:2222 +#: sequencer.c:2224 #, c-format msgid "could not rename '%s' to '%s'" -msgstr "" +msgstr "tidak dapat menamai ulang '%s' ke '%s'" -#: sequencer.c:2282 +#: sequencer.c:2284 #, c-format msgid "could not revert %s... %s" -msgstr "" +msgstr "tidak dapat membalikkan %s... %s" -#: sequencer.c:2283 +#: sequencer.c:2285 #, c-format msgid "could not apply %s... %s" -msgstr "" +msgstr "tidak dapat menerapkan %s... %s" -#: sequencer.c:2304 +#: sequencer.c:2306 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" -msgstr "" +msgstr "menjatuhkan %s %s -- isi tambalan sudah di hulu\n" -#: sequencer.c:2362 +#: sequencer.c:2364 #, c-format msgid "git %s: failed to read the index" -msgstr "" +msgstr "git %s: gagal membaca indeks" -#: sequencer.c:2370 +#: sequencer.c:2372 #, c-format msgid "git %s: failed to refresh the index" -msgstr "" +msgstr "git %s: gagal menyegarkan indeks" -#: sequencer.c:2450 +#: sequencer.c:2452 #, c-format msgid "%s does not accept arguments: '%s'" -msgstr "" +msgstr "%s tidak menerima argumen: '%s'" -#: sequencer.c:2459 +#: sequencer.c:2461 #, c-format msgid "missing arguments for %s" -msgstr "" +msgstr "argumen hilang untuk %s" -#: sequencer.c:2502 +#: sequencer.c:2504 #, c-format msgid "could not parse '%s'" -msgstr "" +msgstr "tidak dapat menguraikan '%s'" -#: sequencer.c:2563 +#: sequencer.c:2565 #, c-format msgid "invalid line %d: %.*s" -msgstr "" +msgstr "baris %d tidak valid: %.*s" -#: sequencer.c:2574 +#: sequencer.c:2576 #, c-format msgid "cannot '%s' without a previous commit" -msgstr "" +msgstr "tidak dapat '%s' tanpa komit sebelumnya" -#: sequencer.c:2622 builtin/rebase.c:184 +#: sequencer.c:2624 builtin/rebase.c:184 #, c-format msgid "could not read '%s'." -msgstr "" +msgstr "tidak dapat membaca '%s'." -#: sequencer.c:2660 +#: sequencer.c:2662 msgid "cancelling a cherry picking in progress" -msgstr "" +msgstr "membatalkan pemetikan ceri yang sedang berlangsung" -#: sequencer.c:2669 +#: sequencer.c:2671 msgid "cancelling a revert in progress" -msgstr "" +msgstr "membatalkan pembalikkan yang sedang berlangsung" -#: sequencer.c:2709 +#: sequencer.c:2711 msgid "please fix this using 'git rebase --edit-todo'." -msgstr "" +msgstr "mohon perbaiki menggunakan 'git rebase --edit-todo'." -#: sequencer.c:2711 +#: sequencer.c:2713 #, c-format msgid "unusable instruction sheet: '%s'" -msgstr "" +msgstr "lembar perintah tidak dapat digunakan: '%s'" -#: sequencer.c:2716 +#: sequencer.c:2718 msgid "no commits parsed." -msgstr "" +msgstr "tidak ada komit yang diuraikan." -#: sequencer.c:2727 +#: sequencer.c:2729 msgid "cannot cherry-pick during a revert." -msgstr "" +msgstr "tidak dapat memetik ceri selama pembalikkan." -#: sequencer.c:2729 +#: sequencer.c:2731 msgid "cannot revert during a cherry-pick." -msgstr "" +msgstr "tidak dapat membalikkan selama petik ceri." -#: sequencer.c:2807 +#: sequencer.c:2809 #, c-format msgid "invalid value for %s: %s" -msgstr "" +msgstr "nilai tidak valid untuk %s: %s" -#: sequencer.c:2916 +#: sequencer.c:2918 msgid "unusable squash-onto" -msgstr "" +msgstr "squash-onto tidak dapat digunakan" -#: sequencer.c:2936 +#: sequencer.c:2938 #, c-format msgid "malformed options sheet: '%s'" -msgstr "" +msgstr "lembar opsi jelek: '%s'" -#: sequencer.c:3031 sequencer.c:4905 +#: sequencer.c:3033 sequencer.c:4902 msgid "empty commit set passed" -msgstr "" +msgstr "himpunan komit kosong dilewatkan" -#: sequencer.c:3048 +#: sequencer.c:3050 msgid "revert is already in progress" -msgstr "" +msgstr "pembalikkan sudah berjalan" -#: sequencer.c:3050 +#: sequencer.c:3052 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" -msgstr "" +msgstr "coba \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:3053 +#: sequencer.c:3055 msgid "cherry-pick is already in progress" -msgstr "" +msgstr "pemetikan ceri sudah berjalan" -#: sequencer.c:3055 +#: sequencer.c:3057 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" -msgstr "" +msgstr "coba \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:3069 +#: sequencer.c:3071 #, c-format msgid "could not create sequencer directory '%s'" -msgstr "" +msgstr "tidak dapat membuat direktori pembaris '%s'" -#: sequencer.c:3084 +#: sequencer.c:3086 msgid "could not lock HEAD" -msgstr "" +msgstr "tidak dapat mengunci HEAD" -#: sequencer.c:3144 sequencer.c:4615 +#: sequencer.c:3146 sequencer.c:4612 msgid "no cherry-pick or revert in progress" -msgstr "" +msgstr "tidak ada pemetikan ceri atau pembalikkan yang sedang berjalan" -#: sequencer.c:3146 sequencer.c:3157 +#: sequencer.c:3148 sequencer.c:3159 msgid "cannot resolve HEAD" -msgstr "" +msgstr "tidak dapat menguraikan HEAD" -#: sequencer.c:3148 sequencer.c:3192 +#: sequencer.c:3150 sequencer.c:3194 msgid "cannot abort from a branch yet to be born" -msgstr "" +msgstr "tidak dapat membatalkan dari cabang yang belum lahir" -#: sequencer.c:3178 builtin/grep.c:772 +#: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416 +#: builtin/grep.c:772 #, c-format msgid "cannot open '%s'" -msgstr "" +msgstr "tidak dapat membuka '%s'" -#: sequencer.c:3180 +#: sequencer.c:3182 #, c-format msgid "cannot read '%s': %s" -msgstr "" +msgstr "tidak dapat membaca '%s': %s" -#: sequencer.c:3181 +#: sequencer.c:3183 msgid "unexpected end of file" -msgstr "" +msgstr "akhir berkas tidak diharapkan" -#: sequencer.c:3187 +#: sequencer.c:3189 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" -msgstr "" +msgstr "berkas HEAD pra-petik-ceri yang tersimpan '%s' rusak" -#: sequencer.c:3198 +#: sequencer.c:3200 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" -msgstr "" +msgstr "Sepertinya Anda sudah memindahkan HEAD. Tidak memutar ulang, periksa HEAD Anda!" -#: sequencer.c:3239 +#: sequencer.c:3241 msgid "no revert in progress" -msgstr "" +msgstr "tidak ada pembalikkan yang sedang berjalan" -#: sequencer.c:3248 +#: sequencer.c:3250 msgid "no cherry-pick in progress" -msgstr "" +msgstr "tidak ada pemetikan ceri yang sedang berjalan" -#: sequencer.c:3258 +#: sequencer.c:3260 msgid "failed to skip the commit" -msgstr "" +msgstr "gagal melewati komit" -#: sequencer.c:3265 +#: sequencer.c:3267 msgid "there is nothing to skip" -msgstr "" +msgstr "tidak ada yang dilewati" -#: sequencer.c:3268 +#: sequencer.c:3270 #, c-format msgid "" "have you committed already?\n" "try \"git %s --continue\"" msgstr "" +"sudahkah Anda komit?\n" +"coba \"git %s --continue\"" -#: sequencer.c:3430 sequencer.c:4506 +#: sequencer.c:3432 sequencer.c:4503 msgid "cannot read HEAD" -msgstr "" +msgstr "tidak dapat membaca HEAD" -#: sequencer.c:3447 +#: sequencer.c:3449 #, c-format msgid "unable to copy '%s' to '%s'" -msgstr "" +msgstr "tidak dapat menyalin '%s' ke '%s'" -#: sequencer.c:3455 +#: sequencer.c:3457 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7941,28 +7983,35 @@ msgid "" "\n" " git rebase --continue\n" msgstr "" +"Anda dapat mengubah komit sekarang, dengan\n" +"\n" +" git commit --amend %s\n" +"\n" +"Setelah Anda puas dengan perubahan Anda, jalankan\n" +"\n" +" git rebase --continue\n" -#: sequencer.c:3465 +#: sequencer.c:3467 #, c-format msgid "Could not apply %s... %.*s" -msgstr "" +msgstr "Tidak dapat menerapkan %s... %.*s" -#: sequencer.c:3472 +#: sequencer.c:3474 #, c-format msgid "Could not merge %.*s" -msgstr "" +msgstr "Tidak dapat menggabungkan %.*s" -#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639 +#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" -msgstr "" +msgstr "tidak dapat menyalin '%s' ke '%s'" -#: sequencer.c:3502 +#: sequencer.c:3503 #, c-format msgid "Executing: %s\n" -msgstr "" +msgstr "Mengeksekusi: %s\n" -#: sequencer.c:3517 +#: sequencer.c:3514 #, c-format msgid "" "execution failed: %s\n" @@ -7971,12 +8020,17 @@ msgid "" " git rebase --continue\n" "\n" msgstr "" +"eksekusi gagal: %s\n" +"%sAnda dapat memperbaiki masalah, lalu jalankan\n" +"\n" +" git rebase --continue\n" +"\n" -#: sequencer.c:3523 +#: sequencer.c:3520 msgid "and made changes to the index and/or the working tree\n" -msgstr "" +msgstr "dan buat perubahan ke indeks dan/atau pohon kerja\n" -#: sequencer.c:3529 +#: sequencer.c:3526 #, c-format msgid "" "execution succeeded: %s\n" @@ -7986,121 +8040,130 @@ msgid "" " git rebase --continue\n" "\n" msgstr "" +"eksekusi berhasil: %s\n" +"tapi meninggalkan perubahan ke indeks dan/atau pohon kerja\n" +"Komit atau stase perubahan Anda, lalu jalankan\n" +"\n" +" git rebase --continue\n" +"\n" -#: sequencer.c:3591 +#: sequencer.c:3586 #, c-format msgid "illegal label name: '%.*s'" -msgstr "" +msgstr "nama label ilegal: '%.*s'" -#: sequencer.c:3664 +#: sequencer.c:3659 msgid "writing fake root commit" -msgstr "" +msgstr "menulis komit akar palsu" -#: sequencer.c:3669 +#: sequencer.c:3664 msgid "writing squash-onto" -msgstr "" +msgstr "menulis squash-onto" -#: sequencer.c:3748 +#: sequencer.c:3743 #, c-format msgid "could not resolve '%s'" -msgstr "" +msgstr "tidak dapat menguraikan '%s'" -#: sequencer.c:3780 +#: sequencer.c:3775 msgid "cannot merge without a current revision" -msgstr "" +msgstr "tidak dapat menggabungkan tanpa revisi saat ini" -#: sequencer.c:3802 +#: sequencer.c:3797 #, c-format msgid "unable to parse '%.*s'" -msgstr "" +msgstr "tidak dapat menguraikan '%.*s'" -#: sequencer.c:3811 +#: sequencer.c:3806 #, c-format msgid "nothing to merge: '%.*s'" -msgstr "" +msgstr "tidak ada yang digabungkan: '%.*s'" -#: sequencer.c:3823 +#: sequencer.c:3818 msgid "octopus merge cannot be executed on top of a [new root]" -msgstr "" +msgstr "penggabungan gurita tidak dapat dieksekusi di atas sebuah [akar baru]" -#: sequencer.c:3878 +#: sequencer.c:3873 #, c-format msgid "could not get commit message of '%s'" -msgstr "" +msgstr "tidak dapat mendapatkan pesan komit dari '%s'" -#: sequencer.c:4024 +#: sequencer.c:4019 #, c-format msgid "could not even attempt to merge '%.*s'" -msgstr "" +msgstr "bahkan tidak dapat mencoba menggabungkan '%.*s'" -#: sequencer.c:4040 +#: sequencer.c:4035 msgid "merge: Unable to write new index file" -msgstr "" +msgstr "merge: Tidak dapat menulis berkas indeks baru" -#: sequencer.c:4121 +#: sequencer.c:4116 msgid "Cannot autostash" -msgstr "" +msgstr "Tidak dapat menstase otomatis" -#: sequencer.c:4124 +#: sequencer.c:4119 #, c-format msgid "Unexpected stash response: '%s'" -msgstr "" +msgstr "Respons stase tidak diharapkan: '%s'" -#: sequencer.c:4130 +#: sequencer.c:4125 #, c-format msgid "Could not create directory for '%s'" -msgstr "" +msgstr "Tidak dapat membuat direktori untuk '%s'" -#: sequencer.c:4133 +#: sequencer.c:4128 #, c-format msgid "Created autostash: %s\n" -msgstr "" +msgstr "Stase otomatis dibuat: %s\n" -#: sequencer.c:4137 +#: sequencer.c:4132 msgid "could not reset --hard" -msgstr "" +msgstr "tidak dapat reset --hard" -#: sequencer.c:4162 +#: sequencer.c:4157 #, c-format msgid "Applied autostash.\n" -msgstr "" +msgstr "Stase otomatis diterapkan.\n" -#: sequencer.c:4174 +#: sequencer.c:4169 #, c-format msgid "cannot store %s" -msgstr "" +msgstr "tidak dapat menyimpan %s" -#: sequencer.c:4177 +#: sequencer.c:4172 #, c-format msgid "" "%s\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" +"%s\n" +"Perubahan Anda aman di dalam stase.\n" +"Anda dapat menjalankan \"git stash pop\" atau \"git stash drop\" kapanpun.\n" -#: sequencer.c:4182 +#: sequencer.c:4177 msgid "Applying autostash resulted in conflicts." -msgstr "" +msgstr "Menerapkan stase otomatis menghasilkan konflik." -#: sequencer.c:4183 +#: sequencer.c:4178 msgid "Autostash exists; creating a new stash entry." -msgstr "" +msgstr "Stase otomatis sudah ada; membuat entri stase baru." -#: sequencer.c:4255 +#: sequencer.c:4252 msgid "could not detach HEAD" -msgstr "" +msgstr "tidak dapat melepas HEAD" -#: sequencer.c:4270 +#: sequencer.c:4267 #, c-format msgid "Stopped at HEAD\n" -msgstr "" +msgstr "Berhenti pada HEAD\n" -#: sequencer.c:4272 +#: sequencer.c:4269 #, c-format msgid "Stopped at %s\n" -msgstr "" +msgstr "Berhenti pada %s\n" -#: sequencer.c:4304 +#: sequencer.c:4301 #, c-format msgid "" "Could not execute the todo command\n" @@ -8112,134 +8175,145 @@ msgid "" " git rebase --edit-todo\n" " git rebase --continue\n" msgstr "" +"Tidak dapat mengeksekusi perintah todo\n" +"\n" +" %.*s\n" +"Itu sudah dijadwalkan ulang; Untuk menyunting perintah sebelum melanjutkan,\n" +"mohon sunting daftar todo terlebih dahulu:\n" +"\n" +" git rebase --edit-todo\n" +" git rebase --continue\n" -#: sequencer.c:4350 +#: sequencer.c:4347 #, c-format msgid "Rebasing (%d/%d)%s" -msgstr "" +msgstr "Mendasarkan ulang (%d/%d)%s" -#: sequencer.c:4396 +#: sequencer.c:4393 #, c-format msgid "Stopped at %s... %.*s\n" -msgstr "" +msgstr "Berhenti pada %s... %.*s\n" -#: sequencer.c:4466 +#: sequencer.c:4463 #, c-format msgid "unknown command %d" -msgstr "" +msgstr "perintah tidak dikenal %d" -#: sequencer.c:4514 +#: sequencer.c:4511 msgid "could not read orig-head" -msgstr "" +msgstr "tidak dapat membaca orig-head" -#: sequencer.c:4519 +#: sequencer.c:4516 msgid "could not read 'onto'" -msgstr "" +msgstr "tidak dapat membaca 'onto'" -#: sequencer.c:4533 +#: sequencer.c:4530 #, c-format msgid "could not update HEAD to %s" -msgstr "" +msgstr "tidak dapat memperbarui HEAD ke %s" -#: sequencer.c:4593 +#: sequencer.c:4590 #, c-format msgid "Successfully rebased and updated %s.\n" -msgstr "" +msgstr "%s didasarkan ulang dan diperbarui dengan sukses.\n" -#: sequencer.c:4645 +#: sequencer.c:4642 msgid "cannot rebase: You have unstaged changes." -msgstr "" +msgstr "tidak dapat mendasarkan ulang: Anda punya perubahan tak tergelar." -#: sequencer.c:4654 +#: sequencer.c:4651 msgid "cannot amend non-existing commit" -msgstr "" +msgstr "tidak dapat mengubah komit yang tidak ada" -#: sequencer.c:4656 +#: sequencer.c:4653 #, c-format msgid "invalid file: '%s'" -msgstr "" +msgstr "berkas tidak valid: '%s'" -#: sequencer.c:4658 +#: sequencer.c:4655 #, c-format msgid "invalid contents: '%s'" -msgstr "" +msgstr "konten tidak valid: '%s'" -#: sequencer.c:4661 +#: sequencer.c:4658 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" "first and then run 'git rebase --continue' again." msgstr "" +"\n" +"Anda punya perubahan tak tergelar di dalam pohon kerja Anda. Mohon komit\n" +"terlebih dahulu dan jalankan 'git rebase --continue' lagi." -#: sequencer.c:4697 sequencer.c:4736 +#: sequencer.c:4694 sequencer.c:4733 #, c-format msgid "could not write file: '%s'" -msgstr "" +msgstr "tidak dapat menulis berkas: '%s'" -#: sequencer.c:4752 +#: sequencer.c:4749 msgid "could not remove CHERRY_PICK_HEAD" -msgstr "" +msgstr "tidak dapat menghapus CHERRY_PICK_HEAD" -#: sequencer.c:4762 +#: sequencer.c:4759 msgid "could not commit staged changes." -msgstr "" +msgstr "tidak dapat mengkomit perubahan tergelar." -#: sequencer.c:4882 +#: sequencer.c:4879 #, c-format msgid "%s: can't cherry-pick a %s" -msgstr "" +msgstr "%s: tidak dapat memetik ceri sebuah %s" -#: sequencer.c:4886 +#: sequencer.c:4883 #, c-format msgid "%s: bad revision" -msgstr "" +msgstr "%s: revisi jelek" -#: sequencer.c:4921 +#: sequencer.c:4918 msgid "can't revert as initial commit" -msgstr "" +msgstr "tidak dapat membalikkan sebagai komit awal" -#: sequencer.c:5192 sequencer.c:5421 +#: sequencer.c:5189 sequencer.c:5418 #, c-format msgid "skipped previously applied commit %s" -msgstr "" +msgstr "melewatkan komit yang sudah diterapkan sebelumnya %s" -#: sequencer.c:5262 sequencer.c:5437 +#: sequencer.c:5259 sequencer.c:5434 msgid "use --reapply-cherry-picks to include skipped commits" -msgstr "" +msgstr "gunakan --reapply-cherry-picks untuk memasukkan komit yang terlewat" -#: sequencer.c:5408 +#: sequencer.c:5405 msgid "make_script: unhandled options" -msgstr "" +msgstr "make_script: opsi tak ditangani" -#: sequencer.c:5411 +#: sequencer.c:5408 msgid "make_script: error preparing revisions" -msgstr "" +msgstr "make_script: kesalahan membuat revisi" -#: sequencer.c:5669 sequencer.c:5686 +#: sequencer.c:5666 sequencer.c:5683 msgid "nothing to do" -msgstr "" +msgstr "tidak ada yang dilakukan" -#: sequencer.c:5705 +#: sequencer.c:5702 msgid "could not skip unnecessary pick commands" -msgstr "" +msgstr "tidak dapat melewatkan perintah pick yang tidak perlu" -#: sequencer.c:5805 +#: sequencer.c:5802 msgid "the script was already rearranged." -msgstr "" +msgstr "skrip sudah ditata ulang." -#: setup.c:133 +#: setup.c:134 #, c-format msgid "'%s' is outside repository at '%s'" msgstr "" -#: setup.c:185 +#: setup.c:186 #, c-format msgid "" "%s: no such path in the working tree.\n" "Use 'git <command> -- <path>...' to specify paths that do not exist locally." msgstr "" -#: setup.c:198 +#: setup.c:199 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -8247,12 +8321,12 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" -#: setup.c:264 +#: setup.c:265 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "" -#: setup.c:283 +#: setup.c:284 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -8260,125 +8334,125 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" -#: setup.c:419 +#: setup.c:420 msgid "unable to set up work tree using invalid config" msgstr "" -#: setup.c:423 builtin/rev-parse.c:895 +#: setup.c:424 builtin/rev-parse.c:895 msgid "this operation must be run in a work tree" msgstr "" -#: setup.c:658 +#: setup.c:722 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "" -#: setup.c:666 +#: setup.c:730 msgid "unknown repository extension found:" msgid_plural "unknown repository extensions found:" msgstr[0] "" msgstr[1] "" -#: setup.c:680 +#: setup.c:744 msgid "repo version is 0, but v1-only extension found:" msgid_plural "repo version is 0, but v1-only extensions found:" msgstr[0] "" msgstr[1] "" -#: setup.c:701 +#: setup.c:765 #, c-format msgid "error opening '%s'" msgstr "" -#: setup.c:703 +#: setup.c:767 #, c-format msgid "too large to be a .git file: '%s'" msgstr "" -#: setup.c:705 +#: setup.c:769 #, c-format msgid "error reading %s" msgstr "" -#: setup.c:707 +#: setup.c:771 #, c-format msgid "invalid gitfile format: %s" msgstr "" -#: setup.c:709 +#: setup.c:773 #, c-format msgid "no path in gitfile: %s" msgstr "" -#: setup.c:711 +#: setup.c:775 #, c-format msgid "not a git repository: %s" msgstr "" -#: setup.c:813 +#: setup.c:877 #, c-format msgid "'$%s' too big" msgstr "" -#: setup.c:827 +#: setup.c:891 #, c-format msgid "not a git repository: '%s'" msgstr "" -#: setup.c:856 setup.c:858 setup.c:889 +#: setup.c:920 setup.c:922 setup.c:953 #, c-format msgid "cannot chdir to '%s'" msgstr "" -#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974 +#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038 msgid "cannot come back to cwd" msgstr "" -#: setup.c:988 +#: setup.c:1052 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "" -#: setup.c:1231 +#: setup.c:1295 msgid "Unable to read current working directory" msgstr "" -#: setup.c:1240 setup.c:1246 +#: setup.c:1304 setup.c:1310 #, c-format msgid "cannot change to '%s'" msgstr "" -#: setup.c:1251 +#: setup.c:1315 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "" -#: setup.c:1257 +#: setup.c:1321 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" -#: setup.c:1381 +#: setup.c:1446 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" -#: setup.c:1443 +#: setup.c:1508 msgid "fork failed" msgstr "" -#: setup.c:1448 +#: setup.c:1513 msgid "setsid failed" msgstr "" -#: sparse-index.c:273 +#: sparse-index.c:289 #, c-format msgid "index entry is a directory, but not sparse (%08x)" -msgstr "" +msgstr "entri indeks adalah direktori, tapi bukan tipis (%08x)" #. TRANSLATORS: IEC 80000-13:2008 gibibyte #: strbuf.c:850 @@ -8432,13 +8506,13 @@ msgid_plural "%u bytes/s" msgstr[0] "" msgstr[1] "" -#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739 +#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765 #: builtin/rebase.c:650 #, c-format msgid "could not open '%s' for writing" msgstr "" -#: strbuf.c:1183 +#: strbuf.c:1195 #, c-format msgid "could not edit '%s'" msgstr "" @@ -8530,7 +8604,7 @@ msgstr "" msgid "process for submodule '%s' failed" msgstr "proses untuk submodul '%s' gagal" -#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713 +#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714 msgid "Failed to resolve HEAD as a valid ref." msgstr "Gagal menguraikan HEAD sebagai referensi valid." @@ -8775,7 +8849,7 @@ msgstr "" msgid "invalid remote service path" msgstr "" -#: transport-helper.c:661 transport.c:1475 +#: transport-helper.c:661 transport.c:1479 msgid "operation not supported by protocol" msgstr "" @@ -8981,7 +9055,7 @@ msgstr "" msgid "Aborting." msgstr "" -#: transport.c:1344 +#: transport.c:1343 msgid "failed to push all needed submodules" msgstr "" @@ -9001,98 +9075,105 @@ msgstr "" msgid "too-short tree file" msgstr "" -#: unpack-trees.c:115 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%sPlease commit your changes or stash them before you switch branches." msgstr "" -#: unpack-trees.c:117 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:120 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%sPlease commit your changes or stash them before you merge." msgstr "" -#: unpack-trees.c:122 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:125 +#: unpack-trees.c:128 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%sPlease commit your changes or stash them before you %s." msgstr "" -#: unpack-trees.c:127 +#: unpack-trees.c:130 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:132 +#: unpack-trees.c:135 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" -#: unpack-trees.c:136 +#: unpack-trees.c:138 +#, c-format +msgid "" +"Refusing to remove the current working directory:\n" +"%s" +msgstr "" + +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:138 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:141 +#: unpack-trees.c:147 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:143 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:146 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:148 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:154 +#: unpack-trees.c:160 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -9100,7 +9181,7 @@ msgid "" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:156 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -9108,47 +9189,47 @@ msgid "" "%%s" msgstr "" -#: unpack-trees.c:159 +#: unpack-trees.c:165 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:161 +#: unpack-trees.c:167 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:164 +#: unpack-trees.c:170 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:166 +#: unpack-trees.c:172 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:174 +#: unpack-trees.c:180 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "" -#: unpack-trees.c:177 +#: unpack-trees.c:183 #, c-format msgid "" "Cannot update submodule:\n" "%s" msgstr "" -#: unpack-trees.c:180 +#: unpack-trees.c:186 #, c-format msgid "" "The following paths are not up to date and were left despite sparse " @@ -9156,14 +9237,14 @@ msgid "" "%s" msgstr "" -#: unpack-trees.c:182 +#: unpack-trees.c:188 #, c-format msgid "" "The following paths are unmerged and were left despite sparse patterns:\n" "%s" msgstr "" -#: unpack-trees.c:184 +#: unpack-trees.c:190 #, c-format msgid "" "The following paths were already present and thus not updated despite sparse " @@ -9171,39 +9252,39 @@ msgid "" "%s" msgstr "" -#: unpack-trees.c:264 +#: unpack-trees.c:270 #, c-format msgid "Aborting\n" msgstr "" -#: unpack-trees.c:291 +#: unpack-trees.c:297 #, c-format msgid "" "After fixing the above paths, you may want to run `git sparse-checkout " "reapply`.\n" msgstr "" -#: unpack-trees.c:352 +#: unpack-trees.c:358 msgid "Updating files" msgstr "" -#: unpack-trees.c:384 +#: unpack-trees.c:390 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" "colliding group is in the working tree:\n" msgstr "" -#: unpack-trees.c:1620 +#: unpack-trees.c:1636 msgid "Updating index flags" msgstr "" -#: unpack-trees.c:2772 +#: unpack-trees.c:2803 #, c-format msgid "worktree and untracked commit have duplicate entries: %s" msgstr "" -#: upload-pack.c:1561 +#: upload-pack.c:1565 msgid "expected flush after fetch arguments" msgstr "bilasan diharapkan setelah argumen pengambilan" @@ -9240,100 +9321,100 @@ msgstr "" msgid "Fetching objects" msgstr "" -#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156 +#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156 #, c-format msgid "failed to read '%s'" msgstr "gagal membaca '%s'" -#: worktree.c:303 +#: worktree.c:305 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "'%s' pada pohon kerja utama bukan direktori repositori" -#: worktree.c:314 +#: worktree.c:316 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "berkas '%s' tidak berisi jalur absolut ke lokasi pohon kerja" -#: worktree.c:326 +#: worktree.c:328 #, c-format msgid "'%s' does not exist" msgstr "'%s' tidak ada" -#: worktree.c:332 +#: worktree.c:334 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' bukan berkas .git, kode error %d" -#: worktree.c:341 +#: worktree.c:343 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' tidak menunjuk kembali ke '%s'" -#: worktree.c:603 +#: worktree.c:604 msgid "not a directory" msgstr "bukan direktori" -#: worktree.c:612 +#: worktree.c:613 msgid ".git is not a file" msgstr ".git bukan berkas" -#: worktree.c:614 +#: worktree.c:615 msgid ".git file broken" msgstr "berkas .git rusak" -#: worktree.c:616 +#: worktree.c:617 msgid ".git file incorrect" msgstr "berkas .git salah" -#: worktree.c:722 +#: worktree.c:723 msgid "not a valid path" msgstr "bukan jalur valid" -#: worktree.c:728 +#: worktree.c:729 msgid "unable to locate repository; .git is not a file" msgstr "tidak dapat menempatkan repositori; .git bukan berkas" -#: worktree.c:732 +#: worktree.c:733 msgid "unable to locate repository; .git file does not reference a repository" msgstr "" "tidak dapat menempatkan repositori; berkas .git tidak merujuk repositori" -#: worktree.c:736 +#: worktree.c:737 msgid "unable to locate repository; .git file broken" msgstr "tidak dapat menempatkan repositori; berkas .git rusak" -#: worktree.c:742 +#: worktree.c:743 msgid "gitdir unreadable" msgstr "gitdir tidak dapat dibaca" -#: worktree.c:746 +#: worktree.c:747 msgid "gitdir incorrect" msgstr "gitdir salah" -#: worktree.c:771 +#: worktree.c:772 msgid "not a valid directory" msgstr "bukan direktori valid" -#: worktree.c:777 +#: worktree.c:778 msgid "gitdir file does not exist" msgstr "berkas gitdir tidak ada" -#: worktree.c:782 worktree.c:791 +#: worktree.c:783 worktree.c:792 #, c-format msgid "unable to read gitdir file (%s)" msgstr "tidak dapat membaca berkas gitdir (%s)" -#: worktree.c:801 +#: worktree.c:802 #, c-format msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" msgstr "baca singkat (diharapkan %<PRIuMAX> bita, terbaca %<PRIuMAX>)" -#: worktree.c:809 +#: worktree.c:810 msgid "invalid gitdir file" msgstr "berkas gitdir tidak valid" -#: worktree.c:817 +#: worktree.c:818 msgid "gitdir file points to non-existent location" msgstr "berkas gitdir menunjuk ke lokasi yang tidak ada" @@ -9394,11 +9475,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (gunakan \"git rm <berkas>\" untuk menandai penyelesaian)" -#: wt-status.c:211 wt-status.c:1125 +#: wt-status.c:211 wt-status.c:1131 msgid "Changes to be committed:" msgstr "Perubahan yang akan dikomit:" -#: wt-status.c:234 wt-status.c:1134 +#: wt-status.c:234 wt-status.c:1140 msgid "Changes not staged for commit:" msgstr "Perubahan yang tidak digelar untuk komit:" @@ -9502,22 +9583,22 @@ msgstr "konten yang dimodifikasi, " msgid "untracked content, " msgstr "konten yang tak dilacak, " -#: wt-status.c:958 +#: wt-status.c:964 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Simpanan Anda saat ini ada %d entri" msgstr[1] "Simpanan Anda saat ini ada %d entri" -#: wt-status.c:989 +#: wt-status.c:995 msgid "Submodules changed but not updated:" msgstr "Submodul berubah tapi tak diperbarui:" -#: wt-status.c:991 +#: wt-status.c:997 msgid "Submodule changes to be committed:" msgstr "Perubahan submodul yang akan dikomit:" -#: wt-status.c:1073 +#: wt-status.c:1079 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -9525,7 +9606,7 @@ msgstr "" "Jangan ubah atau hapus baris diatas.\n" "Semua dibawahnya akan diabaikan." -#: wt-status.c:1165 +#: wt-status.c:1171 #, c-format msgid "" "\n" @@ -9536,266 +9617,273 @@ msgstr "" "Butuh %.2f detik untuk menghitung cabang di depan/di belakang nilai.\n" "Anda bisa gunakan '--no-ahead-behind' untuk menghindari hal tersebut.\n" -#: wt-status.c:1195 +#: wt-status.c:1201 msgid "You have unmerged paths." msgstr "Anda punya jalur yang tak tergabung." -#: wt-status.c:1198 +#: wt-status.c:1204 msgid " (fix conflicts and run \"git commit\")" msgstr " (selesaikan konflik dan jalankan \"git commit\")" -#: wt-status.c:1200 +#: wt-status.c:1206 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (gunakan \"git merge --abort\" untuk membatalkan penggabungan)" -#: wt-status.c:1204 +#: wt-status.c:1210 msgid "All conflicts fixed but you are still merging." msgstr "Semua konflik sudah selesai tapi Anda masih menggabungkan." -#: wt-status.c:1207 +#: wt-status.c:1213 msgid " (use \"git commit\" to conclude merge)" msgstr " (gunakan \"git commit\" untuk mengakhiri penggabungan)" -#: wt-status.c:1216 +#: wt-status.c:1224 msgid "You are in the middle of an am session." msgstr "Anda berada ditengah-tengah sesi am." -#: wt-status.c:1219 +#: wt-status.c:1227 msgid "The current patch is empty." msgstr "Jalur saat ini kosong" -#: wt-status.c:1223 +#: wt-status.c:1232 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (selesaikan konflik lalu jalankan \"git am --continue\")" -#: wt-status.c:1225 +#: wt-status.c:1234 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (gunakan \"git am --skip\" untuk lewati tambalan ini)" -#: wt-status.c:1227 +#: wt-status.c:1237 +msgid "" +" (use \"git am --allow-empty\" to record this patch as an empty commit)" +msgstr "" +" (gunakan \"git am --allow-empty\" untuk merekam tambalan ini sebagai komit " +"kosong)" + +#: wt-status.c:1239 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (gunakan \"git am --abort\" untuk mengembalikan cabang asal)" -#: wt-status.c:1360 +#: wt-status.c:1372 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo hilang." -#: wt-status.c:1362 +#: wt-status.c:1374 msgid "No commands done." msgstr "Tidak ada perintah selesai." -#: wt-status.c:1365 +#: wt-status.c:1377 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Perintah yang selesai (%d perintah):" msgstr[1] "Perintah yang selesai (%d perintah):" -#: wt-status.c:1376 +#: wt-status.c:1388 #, c-format msgid " (see more in file %s)" msgstr " (lihat lebih lanjut di berkas %s)" -#: wt-status.c:1381 +#: wt-status.c:1393 msgid "No commands remaining." msgstr "Tidak ada perintah yang tersisa." -#: wt-status.c:1384 +#: wt-status.c:1396 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Perintah berikutnya (%d perintah tersisa):" msgstr[1] "Perintah berikutnya (%d perintah tersisa):" -#: wt-status.c:1392 +#: wt-status.c:1404 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (gunakan \"git rebase --edit-todo\" untuk lihat dan sunting)" -#: wt-status.c:1404 +#: wt-status.c:1416 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Anda sedang mendasarkan ulang cabang '%s' pada '%s'." -#: wt-status.c:1409 +#: wt-status.c:1421 msgid "You are currently rebasing." msgstr "Anda sedang mendasarkan ulang." -#: wt-status.c:1422 +#: wt-status.c:1434 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (selesaikan konflik lalu jalankan \"git rebase --continue\")" -#: wt-status.c:1424 +#: wt-status.c:1436 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (gunakan \"git rebase --skip\" untuk lewati tambalan ini)" -#: wt-status.c:1426 +#: wt-status.c:1438 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (gunakan \"git rebase --abort\" untuk check out cabang asal)" -#: wt-status.c:1433 +#: wt-status.c:1445 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (semua konflik sudah selesai: jalankan \"git rebase --continue\")" -#: wt-status.c:1437 +#: wt-status.c:1449 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" "Anda sedang membelah komit saat mendasarkan ulang cabang '%s' pada '%s'." -#: wt-status.c:1442 +#: wt-status.c:1454 msgid "You are currently splitting a commit during a rebase." msgstr "Anda sedang membelah komit saat mendasarkan ulang." -#: wt-status.c:1445 +#: wt-status.c:1457 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Setelah direktori kerja Anda bersih, jalankan \"git rebase --continue\")" -#: wt-status.c:1449 +#: wt-status.c:1461 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Anda sedang menyunting komit saat mendasarkan ulang cabang '%s' pada '%s'." -#: wt-status.c:1454 +#: wt-status.c:1466 msgid "You are currently editing a commit during a rebase." msgstr "Anda sedang menyunting komit saat mendasarkan ulang." -#: wt-status.c:1457 +#: wt-status.c:1469 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (gunakan \"git commit --amend\" untuk mengubah komit saat ini)" -#: wt-status.c:1459 +#: wt-status.c:1471 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (gunakan \"git rebase --continue\" begitu Anda puas dengan perubahan Anda)" -#: wt-status.c:1470 +#: wt-status.c:1482 msgid "Cherry-pick currently in progress." msgstr "Petik ceri sedang berjalan." -#: wt-status.c:1473 +#: wt-status.c:1485 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Anda sedang memetik ceri komit %s." -#: wt-status.c:1480 +#: wt-status.c:1492 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (selesaikan konflik dan jalankan \"git cherry-pick --continue\")" -#: wt-status.c:1483 +#: wt-status.c:1495 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (jalankan \"git cherry-pick --continue\" untuk melanjutkan)" -#: wt-status.c:1486 +#: wt-status.c:1498 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (semua konflik sudah selesai: jalankan \"git cherry-pick --continue\")" -#: wt-status.c:1488 +#: wt-status.c:1500 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " (gunakan \"git cherry-pick --skip\" untuk lewati tambalan ini)" -#: wt-status.c:1490 +#: wt-status.c:1502 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (gunakan \"git cherry-pick --abort\" untuk membatalkan operasi petik ceri)" -#: wt-status.c:1500 +#: wt-status.c:1512 msgid "Revert currently in progress." msgstr "Pengembalian sedang berjalang." -#: wt-status.c:1503 +#: wt-status.c:1515 #, c-format msgid "You are currently reverting commit %s." msgstr "Anda sedang mengembalikan komit %s." -#: wt-status.c:1509 +#: wt-status.c:1521 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (selesaikan konflik dan jalankan \"git revert --continue\")" -#: wt-status.c:1512 +#: wt-status.c:1524 msgid " (run \"git revert --continue\" to continue)" msgstr " (jalankan \"git revert --continue\" untuk melanjutkan)" -#: wt-status.c:1515 +#: wt-status.c:1527 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (semua konflik sudah selesai: jalankan \"git revert --continue\")" -#: wt-status.c:1517 +#: wt-status.c:1529 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " (gunakan \"git revert --skip\" untuk lewati tambalan ini)" -#: wt-status.c:1519 +#: wt-status.c:1531 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (gunakan \"git revert --abort\" untuk membatalkan operasi pengembalian)" -#: wt-status.c:1529 +#: wt-status.c:1541 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Anda sedang membagi dua, dimulai dari cabang '%s'." -#: wt-status.c:1533 +#: wt-status.c:1545 msgid "You are currently bisecting." msgstr "Anda sedang membagi dua." -#: wt-status.c:1536 +#: wt-status.c:1548 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (gunakan \"git bisect reset\" untuk kembali ke cabang asal)" -#: wt-status.c:1547 +#: wt-status.c:1559 msgid "You are in a sparse checkout." msgstr "Anda berada dalam checkout tipis." -#: wt-status.c:1550 +#: wt-status.c:1562 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "Anda berada dalam checkout tipis dengan %d%% berkas terlacak ada." -#: wt-status.c:1794 +#: wt-status.c:1806 msgid "On branch " msgstr "Pada cabang " -#: wt-status.c:1801 +#: wt-status.c:1813 msgid "interactive rebase in progress; onto " msgstr "sedang mendasarkan ulang interaktif; ke " -#: wt-status.c:1803 +#: wt-status.c:1815 msgid "rebase in progress; onto " msgstr "sedang mendasarkan ulang; ke " -#: wt-status.c:1808 +#: wt-status.c:1820 msgid "HEAD detached at " msgstr "" -#: wt-status.c:1810 +#: wt-status.c:1822 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1813 +#: wt-status.c:1825 msgid "Not currently on any branch." msgstr "Tidak sedang berada pada cabang apapun." -#: wt-status.c:1830 +#: wt-status.c:1842 msgid "Initial commit" msgstr "Komit awal" -#: wt-status.c:1831 +#: wt-status.c:1843 msgid "No commits yet" msgstr "Tidak ada komit" -#: wt-status.c:1845 +#: wt-status.c:1857 msgid "Untracked files" msgstr "Berkas tak terlacak" -#: wt-status.c:1847 +#: wt-status.c:1859 msgid "Ignored files" msgstr "Berkas yang diabaikan" -#: wt-status.c:1851 +#: wt-status.c:1863 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9806,32 +9894,32 @@ msgstr "" "mungkin bisa mempercepat, tapi Anda harus berhati-hati jangan sampai lupa\n" "untuk tambahkan berkas baru sendiri (lihat 'git help status')." -#: wt-status.c:1857 +#: wt-status.c:1869 #, c-format msgid "Untracked files not listed%s" msgstr "Berkas tak terlacak yang tak disebutkan%s" -#: wt-status.c:1859 +#: wt-status.c:1871 msgid " (use -u option to show untracked files)" msgstr " (gunakan opsi -u untuk melihat berkas yang tak terlacak)" -#: wt-status.c:1865 +#: wt-status.c:1877 msgid "No changes" msgstr "Tidak ada perubahan" -#: wt-status.c:1870 +#: wt-status.c:1882 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "tidak ada perubahan untuk dikomit (gunakan \"git add\" dan/atau \"git commit " "-a\")\n" -#: wt-status.c:1874 +#: wt-status.c:1886 #, c-format msgid "no changes added to commit\n" msgstr "tidak ada perubahan untuk dikomit\n" -#: wt-status.c:1878 +#: wt-status.c:1890 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -9840,82 +9928,82 @@ msgstr "" "tidak ada perubahan untuk dikomit tapi berkas yang tak terlacak ada(gunakan " "\"git add\" untuk lacak)\n" -#: wt-status.c:1882 +#: wt-status.c:1894 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "tidak ada perubahan untuk dikomit tapi berkas yang tak terlacak ada\n" -#: wt-status.c:1886 +#: wt-status.c:1898 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "tidak ada yang dikomit (buat/salin berkas dan gunakan \"git add\" untuk " "lacak)\n" -#: wt-status.c:1890 wt-status.c:1896 +#: wt-status.c:1902 wt-status.c:1908 #, c-format msgid "nothing to commit\n" msgstr "tidak ada yang dikomit\n" -#: wt-status.c:1893 +#: wt-status.c:1905 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "tidak ada yang dikomit (gunakan -u untuk lihat berkas tak terlacak)\n" -#: wt-status.c:1898 +#: wt-status.c:1910 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "tidak ada yang dikomit, pohon kerja bersih\n" -#: wt-status.c:2003 +#: wt-status.c:2015 msgid "No commits yet on " msgstr "Tidak ada komit apapun pada " -#: wt-status.c:2007 +#: wt-status.c:2019 msgid "HEAD (no branch)" msgstr "HEAD (tanpa cabang)" -#: wt-status.c:2038 +#: wt-status.c:2050 msgid "different" msgstr "berbeda" -#: wt-status.c:2040 wt-status.c:2048 +#: wt-status.c:2052 wt-status.c:2060 msgid "behind " msgstr "di belakang " -#: wt-status.c:2043 wt-status.c:2046 +#: wt-status.c:2055 wt-status.c:2058 msgid "ahead " msgstr "di depan " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2569 +#: wt-status.c:2596 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "tidak dapat %s: Anda punya perubahan yang tidak digelar." -#: wt-status.c:2575 +#: wt-status.c:2602 msgid "additionally, your index contains uncommitted changes." msgstr "juga indeks Anda berisi perubahan yang belum dikomit." -#: wt-status.c:2577 +#: wt-status.c:2604 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "tidak dapat %s: indeks Anda berisi perubahan yang belum dikomit." -#: compat/simple-ipc/ipc-unix-socket.c:183 +#: compat/simple-ipc/ipc-unix-socket.c:205 msgid "could not send IPC command" msgstr "" -#: compat/simple-ipc/ipc-unix-socket.c:190 +#: compat/simple-ipc/ipc-unix-socket.c:212 msgid "could not read IPC response" msgstr "" -#: compat/simple-ipc/ipc-unix-socket.c:870 +#: compat/simple-ipc/ipc-unix-socket.c:892 #, c-format msgid "could not start accept_thread '%s'" msgstr "" -#: compat/simple-ipc/ipc-unix-socket.c:882 +#: compat/simple-ipc/ipc-unix-socket.c:904 #, c-format msgid "could not start worker[0] for '%s'" msgstr "" @@ -9952,107 +10040,113 @@ msgstr "hapus '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "Perubahan tak tergelar setelah menyegarkan indeks:" -#: builtin/add.c:317 builtin/rev-parse.c:993 +#: builtin/add.c:313 builtin/rev-parse.c:993 msgid "Could not read the index" msgstr "Tidak dapat membaca indeks" -#: builtin/add.c:330 +#: builtin/add.c:326 msgid "Could not write patch" msgstr "Tidak dapat menulis tambalan" -#: builtin/add.c:333 +#: builtin/add.c:329 msgid "editing patch failed" msgstr "Gagal menyunting tambalan" -#: builtin/add.c:336 +#: builtin/add.c:332 #, c-format msgid "Could not stat '%s'" msgstr "Tidak dapat men-stat '%s'" -#: builtin/add.c:338 +#: builtin/add.c:334 msgid "Empty patch. Aborted." msgstr "Tambalan kosong. Dibatalkan." -#: builtin/add.c:343 +#: builtin/add.c:340 #, c-format msgid "Could not apply '%s'" msgstr "Tidak dapat terapkan '%s'" -#: builtin/add.c:351 +#: builtin/add.c:348 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Jalur berikut diabaikan oleh salah satu dari berkas .gitignore Anda:\n" -#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124 +#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124 #: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550 #: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194 msgid "dry run" msgstr "latihan" -#: builtin/add.c:374 +#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484 +#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313 +#: builtin/mv.c:123 builtin/read-tree.c:120 +msgid "be verbose" +msgstr "jadi berkata-kata" + +#: builtin/add.c:371 msgid "interactive picking" msgstr "pengambilan interaktif" -#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314 +#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409 msgid "select hunks interactively" msgstr "pilih bingkah secara interaktif" -#: builtin/add.c:376 +#: builtin/add.c:373 msgid "edit current diff and apply" msgstr "sunting diff saat ini dan terapkan" -#: builtin/add.c:377 +#: builtin/add.c:374 msgid "allow adding otherwise ignored files" msgstr "perbolehkan tambah berkas yang diabaikan" -#: builtin/add.c:378 +#: builtin/add.c:375 msgid "update tracked files" msgstr "perbarui berkas terlacak" -#: builtin/add.c:379 +#: builtin/add.c:376 msgid "renormalize EOL of tracked files (implies -u)" msgstr "normalisasi ulang EOL berkas terlacak (menyiratkan -u)" -#: builtin/add.c:380 +#: builtin/add.c:377 msgid "record only the fact that the path will be added later" msgstr "rekam hanya fakta bahwa jalur akan ditambahkan nanti" -#: builtin/add.c:381 +#: builtin/add.c:378 msgid "add changes from all tracked and untracked files" msgstr "tambahkan perubahan dari semua berkas terlacak dan tak terlacak" -#: builtin/add.c:384 +#: builtin/add.c:381 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "abaikan jalur yang terhapus dari pohon kerja (sama dengan --no-all)" -#: builtin/add.c:386 +#: builtin/add.c:383 msgid "don't add, only refresh the index" msgstr "jangan tambahkan, hanya segarkan indeks" -#: builtin/add.c:387 +#: builtin/add.c:384 msgid "just skip files which cannot be added because of errors" msgstr "hanya lewatkan berkas yang tidak dapat ditambah karena error" -#: builtin/add.c:388 +#: builtin/add.c:385 msgid "check if - even missing - files are ignored in dry run" msgstr "periksa bahwa berkas yang - bahkan hilang - diabaikan dalam latihan" -#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251 +#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251 msgid "allow updating entries outside of the sparse-checkout cone" -msgstr "" +msgstr "perbolehkan perbarui entri di luar kerucut checkout tipis" -#: builtin/add.c:391 builtin/update-index.c:1004 +#: builtin/add.c:388 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "timpa bit yang dapat dieksekusi dari berkas terdaftar" -#: builtin/add.c:393 +#: builtin/add.c:390 msgid "warn when adding an embedded repository" msgstr "peringatkan ketika menambahkan repositori tertanam" -#: builtin/add.c:395 +#: builtin/add.c:392 msgid "backend for `git stash -p`" msgstr "tulang belakang untuk `git stash -p`" -#: builtin/add.c:413 +#: builtin/add.c:410 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -10083,12 +10177,12 @@ msgstr "" "\n" "Lihat \"git help submodule\" untuk selengkapnya." -#: builtin/add.c:442 +#: builtin/add.c:439 #, c-format msgid "adding embedded git repository: %s" msgstr "menambahkan repositori git tertanam: %s" -#: builtin/add.c:462 +#: builtin/add.c:459 msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" @@ -10098,51 +10192,27 @@ msgstr "" "Matikan pesan ini dengan menjalankan\n" "\"git config advice.addIgnoredFile false\"" -#: builtin/add.c:477 +#: builtin/add.c:474 msgid "adding files failed" msgstr "gagal menambahkan berkas" -#: builtin/add.c:513 -msgid "--dry-run is incompatible with --interactive/--patch" -msgstr "--dry-run tidak kompatibel dengan --interactive/--patch" - -#: builtin/add.c:515 builtin/commit.c:358 -msgid "--pathspec-from-file is incompatible with --interactive/--patch" -msgstr "--pathspec-from-file tidak kompatibel dengan --interactive/--patch" - -#: builtin/add.c:532 -msgid "--pathspec-from-file is incompatible with --edit" -msgstr "--pathspec-from-file tidak kompatibel dengan --edit" - -#: builtin/add.c:544 -msgid "-A and -u are mutually incompatible" -msgstr "-A dan -u saling tak kompatibel" - -#: builtin/add.c:547 -msgid "Option --ignore-missing can only be used together with --dry-run" -msgstr "Opsi --ignore-missing hanya dapat digunakan bersama dengan --dry-run" - -#: builtin/add.c:551 +#: builtin/add.c:548 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod param '%s' harus berupa -x atau +x" -#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364 -#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650 -msgid "--pathspec-from-file is incompatible with pathspec arguments" -msgstr "--pathspec-from-file tidak kompatibel dengan argumen pathspec" - -#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370 -#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656 -msgid "--pathspec-file-nul requires --pathspec-from-file" -msgstr "--pathspec-file-nul butuh --pathspec-from-file" +#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364 +#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713 +#, c-format +msgid "'%s' and pathspec arguments cannot be used together" +msgstr "'%s' dan argumen spek jalur tidak dapat digunakan bersamaan" -#: builtin/add.c:583 +#: builtin/add.c:580 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Tidak ada yang disebutkan, tidak ada yang ditambahkan.\n" -#: builtin/add.c:585 +#: builtin/add.c:582 msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" @@ -10152,113 +10222,121 @@ msgstr "" "Matikan pesan ini dengan menjalankan\n" "\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:366 +#: builtin/am.c:202 +#, c-format +msgid "Invalid value for --empty: %s" +msgstr "Nilai tidak valid untuk --empty: %s" + +#: builtin/am.c:392 msgid "could not parse author script" msgstr "tidak dapat mengurai skrip pengarang" -#: builtin/am.c:456 +#: builtin/am.c:482 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' dihapus oleh kail applypatch-msg" -#: builtin/am.c:498 +#: builtin/am.c:524 #, c-format msgid "Malformed input line: '%s'." msgstr "Baris masukan salah format: '%s'." -#: builtin/am.c:536 +#: builtin/am.c:562 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Gagal menyalin catatan dari '%s' ke '%s'" -#: builtin/am.c:562 +#: builtin/am.c:588 msgid "fseek failed" msgstr "fseek gagal" -#: builtin/am.c:750 +#: builtin/am.c:776 #, c-format msgid "could not parse patch '%s'" msgstr "tidak dapat mengurai tambalan '%s'" -#: builtin/am.c:815 +#: builtin/am.c:841 msgid "Only one StGIT patch series can be applied at once" msgstr "Hanya satu rangkaian tambalan StGIT yang bisa diterapkan sekaligus" -#: builtin/am.c:863 +#: builtin/am.c:889 msgid "invalid timestamp" msgstr "stempel waktu tidak valid" -#: builtin/am.c:868 builtin/am.c:880 +#: builtin/am.c:894 builtin/am.c:906 msgid "invalid Date line" msgstr "baris Date tidak valid" -#: builtin/am.c:875 +#: builtin/am.c:901 msgid "invalid timezone offset" msgstr "offset zona waktu tidak valid" -#: builtin/am.c:968 +#: builtin/am.c:994 msgid "Patch format detection failed." msgstr "Pendeteksian format tambalan gagal." -#: builtin/am.c:973 builtin/clone.c:300 +#: builtin/am.c:999 builtin/clone.c:300 #, c-format msgid "failed to create directory '%s'" msgstr "gagal membuat direktori '%s'" -#: builtin/am.c:978 +#: builtin/am.c:1004 msgid "Failed to split patches." msgstr "Gagal memecah tambalan." -#: builtin/am.c:1127 +#: builtin/am.c:1153 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Saat Anda sudah menyelesaikan masalah ini, jalankan \"%s --continue\"." -#: builtin/am.c:1128 +#: builtin/am.c:1154 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" "Jika Anda lebih suka melewati tambalan ini, jalankan \"%s --skip\" sebagai " "gantinya." -#: builtin/am.c:1129 +#: builtin/am.c:1159 +#, c-format +msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"." +msgstr "" +"Untuk merekam tambalan kosong sebagai komit kosong, jalankan \"%s --allow-" +"empty\"." + +#: builtin/am.c:1161 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Untuk mengembalikan cabang yang asli dan berhenti menambal, jalankan \"%s --" "abort\"" -#: builtin/am.c:1224 +#: builtin/am.c:1256 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Tambalan dikirimkan dengan format=flowed; spasi pada akhir baris mungkin " "hilang." -#: builtin/am.c:1252 -msgid "Patch is empty." -msgstr "Tambalan kosong." - -#: builtin/am.c:1317 +#: builtin/am.c:1344 #, c-format msgid "missing author line in commit %s" msgstr "baris pengarang hilang dalam komit %s" -#: builtin/am.c:1320 +#: builtin/am.c:1347 #, c-format msgid "invalid ident line: %.*s" msgstr "baris identitas tidak valid: %.*s" -#: builtin/am.c:1539 +#: builtin/am.c:1566 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Repositori kekurangan blob yang diperlukan untuk mundur ke penggabungan 3 " "arah." -#: builtin/am.c:1541 +#: builtin/am.c:1568 msgid "Using index info to reconstruct a base tree..." msgstr "Menggunakan info indeks untuk membangun ulang sebuah pohon dasar..." -#: builtin/am.c:1560 +#: builtin/am.c:1587 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10266,24 +10344,24 @@ msgstr "" "Apakah Anda menyunting tambalan Anda?\n" "Itu tidak diterapkan ke blob yang direkam dalam indeksnya." -#: builtin/am.c:1566 +#: builtin/am.c:1593 msgid "Falling back to patching base and 3-way merge..." msgstr "Mundur ke penambalan dasar dan penggabungan 3 arah..." -#: builtin/am.c:1592 +#: builtin/am.c:1619 msgid "Failed to merge in the changes." msgstr "Gagal menggabungkan perubahan." -#: builtin/am.c:1624 +#: builtin/am.c:1651 msgid "applying to an empty history" msgstr "menerapkan ke sebuah riwayat kosong" -#: builtin/am.c:1676 builtin/am.c:1680 +#: builtin/am.c:1703 builtin/am.c:1707 #, c-format msgid "cannot resume: %s does not exist." msgstr "tidak dapat melanjutkan: %s tidak ada." -#: builtin/am.c:1698 +#: builtin/am.c:1725 msgid "Commit Body is:" msgstr "Badan komit adalah:" @@ -10291,41 +10369,59 @@ msgstr "Badan komit adalah:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1708 +#: builtin/am.c:1735 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "Terapkan? [y]a/[n] tidak/[e] sunting/[v] lihat tambalan/terim[a] semua: " -#: builtin/am.c:1754 builtin/commit.c:409 +#: builtin/am.c:1781 builtin/commit.c:409 msgid "unable to write index file" msgstr "tidak dapat menulis berkas indeks" -#: builtin/am.c:1758 +#: builtin/am.c:1785 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Indeks kotor: tidak dapat menerapkan tambalan (kotor: %s)" -#: builtin/am.c:1798 builtin/am.c:1865 +#: builtin/am.c:1827 +#, c-format +msgid "Skipping: %.*s" +msgstr "Melewatkan: %.*s" + +#: builtin/am.c:1832 +#, c-format +msgid "Creating an empty commit: %.*s" +msgstr "Membuat sebuah komit kosong: %.*s" + +#: builtin/am.c:1836 +msgid "Patch is empty." +msgstr "Tambalan kosong." + +#: builtin/am.c:1847 builtin/am.c:1916 #, c-format msgid "Applying: %.*s" msgstr "Menerapkan: %.*s" -#: builtin/am.c:1815 +#: builtin/am.c:1864 msgid "No changes -- Patch already applied." msgstr "Tidak ada perubahan -- tambalan sudah diterapkan" -#: builtin/am.c:1821 +#: builtin/am.c:1870 #, c-format msgid "Patch failed at %s %.*s" msgstr "Penambalan gagal pada %s %.*s" -#: builtin/am.c:1825 +#: builtin/am.c:1874 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" "Gunakan 'git am --show-current-patch=diff' untuk melihat tambalan yang gagal" -#: builtin/am.c:1868 +#: builtin/am.c:1920 +msgid "No changes - recorded it as an empty commit." +msgstr "Tidak ada perubahan - direkam sebagai komit kosong." + +#: builtin/am.c:1922 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10335,7 +10431,7 @@ msgstr "" "Jika tidak ada lagi yang diterapkan, sepertinya sesuatu yang lain sudah \n" "memasukkan perubahan yang sama; mungkin Anda ingin melewatkan tambalan ini." -#: builtin/am.c:1875 +#: builtin/am.c:1930 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10348,17 +10444,17 @@ msgstr "" "Anda mungkin jalankan `git rm` pada berkas untuk menerima \"penghapusan oleh " "mereka\" untuk itu." -#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353 -#: builtin/reset.c:361 +#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448 +#: builtin/reset.c:456 #, c-format msgid "Could not parse object '%s'." msgstr "Tidak dapat mengurai objek '%s'." -#: builtin/am.c:2035 builtin/am.c:2111 +#: builtin/am.c:2090 builtin/am.c:2166 msgid "failed to clean index" msgstr "gagal membersihkan indeks" -#: builtin/am.c:2079 +#: builtin/am.c:2134 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10366,160 +10462,168 @@ msgstr "" "Sepertinya Anda telah memindahkan HEAD sejak kegagalan 'am' terakhir.\n" "Tidak memutar ulang ke ORIG_HEAD" -#: builtin/am.c:2187 +#: builtin/am.c:2242 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Nilai tidak valid untuk --patch-format: %s" -#: builtin/am.c:2229 +#: builtin/am.c:2285 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "Nilai tidak valid untuk --show-current-patch: %s" -#: builtin/am.c:2233 +#: builtin/am.c:2289 #, c-format -msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" -msgstr "--show-current-patch=%s tidak kompatibel untuk --show-current-patch=%s" +msgid "options '%s=%s' and '%s=%s' cannot be used together" +msgstr "Opsi '%s=%s' dan '%s=%s' tidak dapat digunakan bersamaan" -#: builtin/am.c:2264 +#: builtin/am.c:2320 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opsi>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2265 +#: builtin/am.c:2321 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opsi>] (--continue | --skip | --abort)" -#: builtin/am.c:2271 +#: builtin/am.c:2327 msgid "run interactively" msgstr "jalankan secara interaktif" -#: builtin/am.c:2273 +#: builtin/am.c:2329 msgid "historical option -- no-op" msgstr "opsi bersejarah -- no-op" -#: builtin/am.c:2275 +#: builtin/am.c:2331 msgid "allow fall back on 3way merging if needed" msgstr "perbolehkan mundur ke penggabungan 3 arah jika diperlukan" -#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16 -#: builtin/repack.c:640 builtin/stash.c:961 +#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16 +#: builtin/repack.c:642 builtin/stash.c:962 msgid "be quiet" msgstr "jadi senyap" -#: builtin/am.c:2278 +#: builtin/am.c:2334 msgid "add a Signed-off-by trailer to the commit message" msgstr "tambahkan trailer Signed-off-by kepada pesan komit" -#: builtin/am.c:2281 +#: builtin/am.c:2337 msgid "recode into utf8 (default)" msgstr "koding ulang ke dalam utf8 (asali)" -#: builtin/am.c:2283 +#: builtin/am.c:2339 msgid "pass -k flag to git-mailinfo" msgstr "lewatkan opsi -k ke git-mailinfo" -#: builtin/am.c:2285 +#: builtin/am.c:2341 msgid "pass -b flag to git-mailinfo" msgstr "lewatkan opsi -b ke git-mailinfo" -#: builtin/am.c:2287 +#: builtin/am.c:2343 msgid "pass -m flag to git-mailinfo" msgstr "lewatkan opsi -m ke git-mailinfo" -#: builtin/am.c:2289 +#: builtin/am.c:2345 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "lewatkan opsi --keep-cr ke git-mailsplit untuk format mbox" -#: builtin/am.c:2292 +#: builtin/am.c:2348 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "jangan lewatkan opsi --keep-cr ke git-mailsplit tak bergantung pada am.keepcr" -#: builtin/am.c:2295 +#: builtin/am.c:2351 msgid "strip everything before a scissors line" msgstr "copot semuanya sebelum garis gunting" -#: builtin/am.c:2297 +#: builtin/am.c:2353 msgid "pass it through git-mailinfo" msgstr "lewatkannya melalui git-mailinfo" -#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309 -#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321 -#: builtin/am.c:2327 +#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 +#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 +#: builtin/am.c:2383 msgid "pass it through git-apply" msgstr "lewatkannya melalui git-apply" -#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262 +#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18 +#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263 #: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221 -#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655 -#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172 +#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657 +#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172 #: builtin/tag.c:445 parse-options.h:154 parse-options.h:175 -#: parse-options.h:315 +#: parse-options.h:317 msgid "n" msgstr "n" -#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109 -#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479 +#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109 +#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479 #: builtin/verify-tag.c:38 msgid "format" msgstr "format" -#: builtin/am.c:2324 +#: builtin/am.c:2380 msgid "format the patch(es) are in" msgstr "format tambalan yang ada di" -#: builtin/am.c:2330 +#: builtin/am.c:2386 msgid "override error message when patch failure occurs" msgstr "timpa pesan error ketika kegagalan penambalan terjadi" -#: builtin/am.c:2332 +#: builtin/am.c:2388 msgid "continue applying patches after resolving a conflict" msgstr "lanjutkan penerapan tambalan setelah menyelesaikan konflik" -#: builtin/am.c:2335 +#: builtin/am.c:2391 msgid "synonyms for --continue" msgstr "sinonim untuk --continue" -#: builtin/am.c:2338 +#: builtin/am.c:2394 msgid "skip the current patch" msgstr "lewati tambalan saat ini" -#: builtin/am.c:2341 +#: builtin/am.c:2397 msgid "restore the original branch and abort the patching operation" msgstr "kembalikan cabang asli dan batalkan operasi penambalan" -#: builtin/am.c:2344 +#: builtin/am.c:2400 msgid "abort the patching operation but keep HEAD where it is" msgstr "batalkan operasi penambalan tetapi simpan HEAD dimanapun itu" -#: builtin/am.c:2348 +#: builtin/am.c:2404 msgid "show the patch being applied" msgstr "perlihatkan tambalan yang diterapkan" -#: builtin/am.c:2353 +#: builtin/am.c:2408 +msgid "record the empty patch as an empty commit" +msgstr "rekam tambalan kosong sebagai komit kosong" + +#: builtin/am.c:2412 msgid "lie about committer date" msgstr "berbohong soal tanggal pengkomit" -#: builtin/am.c:2355 +#: builtin/am.c:2414 msgid "use current timestamp for author date" msgstr "gunakan stempel waktu saat ini untuk tanggal pengarang" -#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642 -#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099 +#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643 +#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099 #: builtin/revert.c:117 builtin/tag.c:460 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2358 builtin/rebase.c:1100 +#: builtin/am.c:2417 builtin/rebase.c:1100 msgid "GPG-sign commits" msgstr "tandatangani komit dengan GPG" -#: builtin/am.c:2361 +#: builtin/am.c:2420 +msgid "how to handle empty patches" +msgstr "bagaimana cara menangani tambalan kosong" + +#: builtin/am.c:2423 msgid "(internal use for git-rebase)" msgstr "(penggunaan internal untuk git-rebase)" -#: builtin/am.c:2379 +#: builtin/am.c:2441 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -10527,17 +10631,17 @@ msgstr "" "Opsi -b/--binary telah menjadi no-op untuk waktu yang lama, dan\n" "itu akan dihapus. Mohon jangan gunakan itu lagi." -#: builtin/am.c:2386 +#: builtin/am.c:2448 msgid "failed to read the index" msgstr "gagal membaca indeks" -#: builtin/am.c:2401 +#: builtin/am.c:2463 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "direktori pendasaran ulang sebelumnya %s masih ada tapi mbox diberikan." -#: builtin/am.c:2425 +#: builtin/am.c:2487 #, c-format msgid "" "Stray %s directory found.\n" @@ -10546,11 +10650,11 @@ msgstr "" "Direktori menyimpang %s ditemukan.\n" "Gunakan \"git am --abort\" untuk menghapusnya." -#: builtin/am.c:2431 +#: builtin/am.c:2493 msgid "Resolve operation not in progress, we are not resuming." msgstr "Operasi penguraian tidak berjalan, kami tidak melanjutkan." -#: builtin/am.c:2441 +#: builtin/am.c:2503 msgid "interactive mode requires patches on the command line" msgstr "mode interaktif butuh tambalan pada baris perintah" @@ -11006,11 +11110,11 @@ msgstr "jangan perlakukan komit akar sebagai perbatasan (asali: off)" msgid "show work cost statistics" msgstr "perlihatkan statistik biaya usaha" -#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94 -#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179 -#: builtin/merge.c:298 builtin/multi-pack-index.c:103 -#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178 -#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566 +#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94 +#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180 +#: builtin/merge.c:301 builtin/multi-pack-index.c:103 +#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180 +#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566 #: builtin/send-pack.c:202 msgid "force progress reporting" msgstr "paksa laporkan perkembangan" @@ -11059,7 +11163,7 @@ msgstr "perlihatkan email pengarang daripada nama (asali: off)" msgid "ignore whitespace differences" msgstr "abaikan perbedaan spasi putih" -#: builtin/blame.c:879 builtin/log.c:1823 +#: builtin/blame.c:879 builtin/log.c:1838 msgid "rev" msgstr "revisi" @@ -11111,7 +11215,7 @@ msgstr "rentang" msgid "process only line range <start>,<end> or function :<funcname>" msgstr "hanya proses rentang baris <awal>,<akhir> atau fungsi :<nama fungsi>" -#: builtin/blame.c:944 +#: builtin/blame.c:947 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress tidak dapat digunakan dengan --incremental atau format porselen" @@ -11124,18 +11228,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:995 +#: builtin/blame.c:998 msgid "4 years, 11 months ago" msgstr "4 tahun, 11 bulan yang lalu" -#: builtin/blame.c:1111 +#: builtin/blame.c:1114 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "berkas %s hanya punya %lu baris" msgstr[1] "berkas %s hanya punya %lu baris" -#: builtin/blame.c:1156 +#: builtin/blame.c:1159 msgid "Blaming lines" msgstr "Menyalahkan baris" @@ -11167,7 +11271,7 @@ msgstr "git branch [<opsi>] [-r | -a] [--points-at]" msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<opsi>] [-r | -a] [--format]" -#: builtin/branch.c:154 +#: builtin/branch.c:153 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -11176,7 +11280,7 @@ msgstr "" "menghapus cabang '%s' yang sudah digabungkan ke\n" " '%s', tapi belum digabungkan ke HEAD." -#: builtin/branch.c:158 +#: builtin/branch.c:157 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -11185,12 +11289,12 @@ msgstr "" "tidak menghapus cabang '%s' yang belum digabungkan ke\n" " '%s', walaupun tergabung ke HEAD." -#: builtin/branch.c:172 +#: builtin/branch.c:171 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Tidak dapat mencari objek komit untuk '%s'" -#: builtin/branch.c:176 +#: builtin/branch.c:175 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -11199,7 +11303,7 @@ msgstr "" "Cabang '%s' belum sepenuhnya tergabung.\n" "Kalau Anda yakin ingin menghapus itu, jalankan 'git branch -D %s'." -#: builtin/branch.c:189 +#: builtin/branch.c:188 msgid "Update of config-file failed" msgstr "Pembaruan berkas konfigurasi gagal" @@ -11211,99 +11315,99 @@ msgstr "tidak dapat gunakan -a dengan -d" msgid "Couldn't look up commit object for HEAD" msgstr "Tidak dapat mencari objek komit untuk HEAD" -#: builtin/branch.c:244 +#: builtin/branch.c:247 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Tidak dapat menghapus cabang '%s' yang ter-checkout pada '%s'" -#: builtin/branch.c:259 +#: builtin/branch.c:262 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "cabang pelacak remote '%s' tidak ditemukan." -#: builtin/branch.c:260 +#: builtin/branch.c:263 #, c-format msgid "branch '%s' not found." msgstr "cabang '%s' tidak ditemukan." -#: builtin/branch.c:291 +#: builtin/branch.c:294 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Cabang pelacak remote %s (yaitu %s) dihapus.\n" -#: builtin/branch.c:292 +#: builtin/branch.c:295 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Cabang %s (yaitu %s) dihapus.\n" -#: builtin/branch.c:441 builtin/tag.c:63 +#: builtin/branch.c:445 builtin/tag.c:63 msgid "unable to parse format string" msgstr "tidak dapat menguraikan untai format" -#: builtin/branch.c:472 +#: builtin/branch.c:476 msgid "could not resolve HEAD" msgstr "tidak dapat menguraikan HEAD" -#: builtin/branch.c:478 +#: builtin/branch.c:482 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "HEAD (%s) merujuk diluar refs/heads/" -#: builtin/branch.c:493 +#: builtin/branch.c:497 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Cabang %s sedang didasarkan ulang pada %s" -#: builtin/branch.c:497 +#: builtin/branch.c:501 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Cabang %s sedang dibagi dua pada %s" -#: builtin/branch.c:514 +#: builtin/branch.c:518 msgid "cannot copy the current branch while not on any." msgstr "tidak dapat menyalin cabang saat ini ketika tidak ada." -#: builtin/branch.c:516 +#: builtin/branch.c:520 msgid "cannot rename the current branch while not on any." msgstr "tidak dapat mengganti nama cabang saat ini ketika tidak ada." -#: builtin/branch.c:527 +#: builtin/branch.c:531 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nama cabang tidak valid: '%s'" -#: builtin/branch.c:556 +#: builtin/branch.c:560 msgid "Branch rename failed" msgstr "Penggantian nama cabang gagal" -#: builtin/branch.c:558 +#: builtin/branch.c:562 msgid "Branch copy failed" msgstr "Penyalinan cabang gagal" -#: builtin/branch.c:562 +#: builtin/branch.c:566 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Salinan cabang salah nama '%s' dibuat" -#: builtin/branch.c:565 +#: builtin/branch.c:569 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Cabang salah nama '%s' berganti nama" -#: builtin/branch.c:571 +#: builtin/branch.c:575 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Cabang berganti nama ke %s, tapi HEAD tidak diperbarui!" -#: builtin/branch.c:580 +#: builtin/branch.c:584 msgid "Branch is renamed, but update of config-file failed" msgstr "Cabang berganti nama, tapi pembaruan berkas konfigurasi gagal" -#: builtin/branch.c:582 +#: builtin/branch.c:586 msgid "Branch is copied, but update of config-file failed" msgstr "Cabang disalin, tapi pembaruan berkas konfigurasi gagal" -#: builtin/branch.c:598 +#: builtin/branch.c:602 #, c-format msgid "" "Please edit the description for the branch\n" @@ -11314,180 +11418,176 @@ msgstr "" " %s\n" "Baris yang diawali dengan '%c' akan dicopot.\n" -#: builtin/branch.c:632 +#: builtin/branch.c:637 msgid "Generic options" msgstr "Opsi generik" -#: builtin/branch.c:634 +#: builtin/branch.c:639 msgid "show hash and subject, give twice for upstream branch" msgstr "perlihatkan hash dan subjek, berikan dua kali untuk cabang hulu" -#: builtin/branch.c:635 +#: builtin/branch.c:640 msgid "suppress informational messages" msgstr "sembunyikan pesan informasi" -#: builtin/branch.c:636 -msgid "set up tracking mode (see git-pull(1))" -msgstr "pasang mode pelacakan (lihat git-pull(1))" +#: builtin/branch.c:642 +msgid "set branch tracking configuration" +msgstr "setel konfigurasi pelacakan cabang" -#: builtin/branch.c:638 +#: builtin/branch.c:645 msgid "do not use" msgstr "jangan gunakan" -#: builtin/branch.c:640 +#: builtin/branch.c:647 msgid "upstream" msgstr "hulu" -#: builtin/branch.c:640 +#: builtin/branch.c:647 msgid "change the upstream info" msgstr "ubah info hulu" -#: builtin/branch.c:641 +#: builtin/branch.c:648 msgid "unset the upstream info" msgstr "batal-setel info hulu" -#: builtin/branch.c:642 +#: builtin/branch.c:649 msgid "use colored output" msgstr "gunakan keluaran berwarna" -#: builtin/branch.c:643 +#: builtin/branch.c:650 msgid "act on remote-tracking branches" msgstr "lakukan pada cabang pelacak remote" -#: builtin/branch.c:645 builtin/branch.c:647 +#: builtin/branch.c:652 builtin/branch.c:654 msgid "print only branches that contain the commit" msgstr "cetak hanya cabang yang berisi komit" -#: builtin/branch.c:646 builtin/branch.c:648 +#: builtin/branch.c:653 builtin/branch.c:655 msgid "print only branches that don't contain the commit" msgstr "cetak hanya cabang yang tak berisi komit" -#: builtin/branch.c:651 +#: builtin/branch.c:658 msgid "Specific git-branch actions:" msgstr "Aksi git-branch spesifik:" -#: builtin/branch.c:652 +#: builtin/branch.c:659 msgid "list both remote-tracking and local branches" msgstr "sebut baik cabang pelacak remote dan cabang lokal" -#: builtin/branch.c:654 +#: builtin/branch.c:661 msgid "delete fully merged branch" msgstr "hapus cabang yang tergabung sepenuhnya" -#: builtin/branch.c:655 +#: builtin/branch.c:662 msgid "delete branch (even if not merged)" msgstr "hapus cabang (walaupun tak tergabung)" -#: builtin/branch.c:656 +#: builtin/branch.c:663 msgid "move/rename a branch and its reflog" msgstr "pindah/ganti nama cabang dan reflog-nya" -#: builtin/branch.c:657 +#: builtin/branch.c:664 msgid "move/rename a branch, even if target exists" msgstr "pindah/ganti nama cabang, walaupun target ada" -#: builtin/branch.c:658 +#: builtin/branch.c:665 msgid "copy a branch and its reflog" msgstr "salin cabang dan reflog-nya" -#: builtin/branch.c:659 +#: builtin/branch.c:666 msgid "copy a branch, even if target exists" msgstr "salin cabang, walapun target ada" -#: builtin/branch.c:660 +#: builtin/branch.c:667 msgid "list branch names" msgstr "sebut nama cabang" -#: builtin/branch.c:661 +#: builtin/branch.c:668 msgid "show current branch name" msgstr "perlihatkan nama cabang saat ini" -#: builtin/branch.c:662 +#: builtin/branch.c:669 msgid "create the branch's reflog" msgstr "buat reflog cabang" -#: builtin/branch.c:664 +#: builtin/branch.c:671 msgid "edit the description for the branch" msgstr "sunting deskripsi cabang" -#: builtin/branch.c:665 +#: builtin/branch.c:672 msgid "force creation, move/rename, deletion" msgstr "paksa buat, pindah/ganti nama, hapus" -#: builtin/branch.c:666 +#: builtin/branch.c:673 msgid "print only branches that are merged" msgstr "cetak hanya cabang yang tergabung" -#: builtin/branch.c:667 +#: builtin/branch.c:674 msgid "print only branches that are not merged" msgstr "cetak hanya cabang yang tak tergabung" -#: builtin/branch.c:668 +#: builtin/branch.c:675 msgid "list branches in columns" msgstr "sebut cabang dalam kolom" -#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413 +#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413 #: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582 #: builtin/tag.c:475 msgid "object" msgstr "objek" -#: builtin/branch.c:671 +#: builtin/branch.c:678 msgid "print only branches of the object" msgstr "cetak hanya cabang objek" -#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482 +#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482 msgid "sorting and filtering are case insensitive" msgstr "pengurutan dan penyaringan tak peka kapital" -#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480 +#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "format yang digunakan untuk keluaran" -#: builtin/branch.c:696 builtin/clone.c:678 +#: builtin/branch.c:703 builtin/clone.c:678 msgid "HEAD not found below refs/heads!" msgstr "HEAD tidak ditemukan di bawah refs/heads!" -#: builtin/branch.c:720 -msgid "--column and --verbose are incompatible" -msgstr "--column dan --verbose tidak kompatibel" - -#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801 +#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807 msgid "branch name required" msgstr "nama cabang diperlukan" -#: builtin/branch.c:768 +#: builtin/branch.c:774 msgid "Cannot give description to detached HEAD" msgstr "Tidak dapat memberikan deskripsi ke HEAD terpisah" -#: builtin/branch.c:773 +#: builtin/branch.c:779 msgid "cannot edit description of more than one branch" msgstr "tidak dapat menyunting deskripsi lebih dari satu cabang" -#: builtin/branch.c:780 +#: builtin/branch.c:786 #, c-format msgid "No commit on branch '%s' yet." msgstr "Belum ada komit pada cabang '%s'." -#: builtin/branch.c:783 +#: builtin/branch.c:789 #, c-format msgid "No branch named '%s'." msgstr "Tidak ada cabang bernama '%s'." -#: builtin/branch.c:798 +#: builtin/branch.c:804 msgid "too many branches for a copy operation" msgstr "terlalu banyak cabang untuk operasi penyalinan" -#: builtin/branch.c:807 +#: builtin/branch.c:813 msgid "too many arguments for a rename operation" msgstr "terlalu banyak argumen untuk operasi penggantian nama" -#: builtin/branch.c:812 +#: builtin/branch.c:818 msgid "too many arguments to set new upstream" msgstr "terlalu banyak argumen untuk menyetel hulu baru" -#: builtin/branch.c:816 +#: builtin/branch.c:822 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -11495,32 +11595,32 @@ msgstr "" "tidak dapat menyetel hulu HEAD ke %s ketika itu tak menunjuk pada cabang " "apapun." -#: builtin/branch.c:819 builtin/branch.c:842 +#: builtin/branch.c:825 builtin/branch.c:848 #, c-format msgid "no such branch '%s'" msgstr "tidak ada cabang '%s'" -#: builtin/branch.c:823 +#: builtin/branch.c:829 #, c-format msgid "branch '%s' does not exist" msgstr "cabang '%s' tidak ada" -#: builtin/branch.c:836 +#: builtin/branch.c:842 msgid "too many arguments to unset upstream" msgstr "terlalu banyak argumen untuk batal-setel hulu" -#: builtin/branch.c:840 +#: builtin/branch.c:846 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "tidak dapat membatal-setel hulu HEAD ketika itu tak menunjuk pada cabang " "apapun." -#: builtin/branch.c:846 +#: builtin/branch.c:852 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Cabang '%s' tidak ada informasi hulu" -#: builtin/branch.c:856 +#: builtin/branch.c:862 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" @@ -11528,7 +11628,7 @@ msgstr "" "Opsi -a dan -r tidak mengambil nama cabang.\n" "Mungkin maksud Anda gunakan: -a|-r --list <pola>?" -#: builtin/branch.c:860 +#: builtin/branch.c:866 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -11783,8 +11883,8 @@ msgstr "" msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549 -#: builtin/worktree.c:494 +#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550 +#: builtin/worktree.c:493 msgid "suppress progress reporting" msgstr "" @@ -11842,10 +11942,10 @@ msgid "git checkout--worker [<options>]" msgstr "" #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 -#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863 -#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874 -#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576 -#: builtin/worktree.c:492 builtin/worktree.c:729 +#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875 +#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577 +#: builtin/worktree.c:491 builtin/worktree.c:728 msgid "string" msgstr "" @@ -11909,100 +12009,95 @@ msgstr "git switch [<opsi>] [<cabang>]" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<opsi>] [--source=<cabang>] <berkas>..." -#: builtin/checkout.c:190 builtin/checkout.c:229 +#: builtin/checkout.c:198 builtin/checkout.c:237 #, c-format msgid "path '%s' does not have our version" msgstr "jalur '%s' tidak punya versi kami" -#: builtin/checkout.c:192 builtin/checkout.c:231 +#: builtin/checkout.c:200 builtin/checkout.c:239 #, c-format msgid "path '%s' does not have their version" msgstr "jalur '%s' tidak punya versi mereka" -#: builtin/checkout.c:208 +#: builtin/checkout.c:216 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "jalur '%s' tidak punya semua versi yang diperlukan" -#: builtin/checkout.c:261 +#: builtin/checkout.c:269 #, c-format msgid "path '%s' does not have necessary versions" msgstr "jalur '%s' tidak punya versi yang diperlukan" -#: builtin/checkout.c:278 +#: builtin/checkout.c:286 #, c-format msgid "path '%s': cannot merge" msgstr "jalur '%s': tidak dapat gabung" -#: builtin/checkout.c:294 +#: builtin/checkout.c:302 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Tidak dapat menambahkan hasil penggabungan untuk '%s'" -#: builtin/checkout.c:411 +#: builtin/checkout.c:419 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "Konflik penggabungan %d dibuat ulang" msgstr[1] "Konflik penggabungan %d dibuat ulang" -#: builtin/checkout.c:416 +#: builtin/checkout.c:424 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "%d jalur diperbarui dari %s" msgstr[1] "%d jalur diperbarui dari %s" -#: builtin/checkout.c:423 +#: builtin/checkout.c:431 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "%d jalur diperbarui dari indeks" msgstr[1] "%d jalur diperbarui dari indeks" -#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452 -#: builtin/checkout.c:456 +#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460 +#: builtin/checkout.c:464 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' tidak dapat digunakan untuk memperbarui jalur" -#: builtin/checkout.c:459 builtin/checkout.c:462 -#, c-format -msgid "'%s' cannot be used with %s" -msgstr "'%s' tidak dapat digunakan untuk %s" - -#: builtin/checkout.c:466 +#: builtin/checkout.c:474 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Tidak dapat memperbarui jalur dan mengganti ke cabang '%s' dalam waktu yang " "bersamaan." -#: builtin/checkout.c:470 +#: builtin/checkout.c:478 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "baik '%s' atau '%s' tidak disebutkan" -#: builtin/checkout.c:474 +#: builtin/checkout.c:482 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "'%s' harus disebutkan ketika '%s' tidak disebutkan" -#: builtin/checkout.c:479 builtin/checkout.c:484 +#: builtin/checkout.c:487 builtin/checkout.c:492 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' atau '%s' tidak dapat digunakan untuk %s" -#: builtin/checkout.c:558 builtin/checkout.c:565 +#: builtin/checkout.c:566 builtin/checkout.c:573 #, c-format msgid "path '%s' is unmerged" msgstr "jalur '%s' tak tergabung" -#: builtin/checkout.c:736 +#: builtin/checkout.c:747 msgid "you need to resolve your current index first" msgstr "Anda perlu selesaikan dulu indeks Anda saat ini" -#: builtin/checkout.c:786 +#: builtin/checkout.c:797 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -12012,50 +12107,50 @@ msgstr "" "berikut:\n" "%s" -#: builtin/checkout.c:879 +#: builtin/checkout.c:890 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Tidak dapat melakukan reflog untuk '%s': %s\n" -#: builtin/checkout.c:921 +#: builtin/checkout.c:934 msgid "HEAD is now at" msgstr "HEAD sekarang berada di" -#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203 +#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203 msgid "unable to update HEAD" msgstr "tidak dapat memperbarui HEAD" -#: builtin/checkout.c:929 +#: builtin/checkout.c:942 #, c-format msgid "Reset branch '%s'\n" msgstr "Ganti ulang cabang '%s'\n" -#: builtin/checkout.c:932 +#: builtin/checkout.c:945 #, c-format msgid "Already on '%s'\n" msgstr "Sudah berada pada '%s'\n" -#: builtin/checkout.c:936 +#: builtin/checkout.c:949 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Ganti ke dan ganti cabang '%s'\n" -#: builtin/checkout.c:938 builtin/checkout.c:1369 +#: builtin/checkout.c:951 builtin/checkout.c:1388 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Ganti ke cabang baru '%s'\n" -#: builtin/checkout.c:940 +#: builtin/checkout.c:953 #, c-format msgid "Switched to branch '%s'\n" msgstr "Ganti ke cabang '%s'\n" -#: builtin/checkout.c:991 +#: builtin/checkout.c:1004 #, c-format msgid " ... and %d more.\n" msgstr "... dan %d lainnya.\n" -#: builtin/checkout.c:997 +#: builtin/checkout.c:1010 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12078,7 +12173,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:1016 +#: builtin/checkout.c:1029 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12101,19 +12196,19 @@ msgstr[1] "" "saat yang tepat untuk dilakukan dengan:\n" "git branch <nama-cabang-baru> %s\n" -#: builtin/checkout.c:1051 +#: builtin/checkout.c:1064 msgid "internal error in revision walk" msgstr "kesalahan internal dalam jalan revisi" -#: builtin/checkout.c:1055 +#: builtin/checkout.c:1068 msgid "Previous HEAD position was" msgstr "Posisi HEAD sebelumnya adalah" -#: builtin/checkout.c:1095 builtin/checkout.c:1364 +#: builtin/checkout.c:1114 builtin/checkout.c:1383 msgid "You are on a branch yet to be born" msgstr "Anda berada pada cabang yang belum lahir" -#: builtin/checkout.c:1177 +#: builtin/checkout.c:1196 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12122,7 +12217,7 @@ msgstr "" "'%s' bisa jadi berkas lokal dan cabang pelacak.\n" "Mohon gunakan -- (dan secara opsional --no-guess) untuk disambiguasi" -#: builtin/checkout.c:1184 +#: builtin/checkout.c:1203 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -12142,51 +12237,51 @@ msgstr "" "seperti remote 'origin', pertimbangkan untuk menyetel\n" "checkout.defaultRemote=origin di konfigurasi Anda" -#: builtin/checkout.c:1194 +#: builtin/checkout.c:1213 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' cocok dengan banyak (%d) cabang pelacak remote" -#: builtin/checkout.c:1260 +#: builtin/checkout.c:1279 msgid "only one reference expected" msgstr "hanya satu referensi yang diharapkan" -#: builtin/checkout.c:1277 +#: builtin/checkout.c:1296 #, c-format msgid "only one reference expected, %d given." msgstr "hanya satu referensi yang diharapkan, %d diberikan" -#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437 +#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436 #, c-format msgid "invalid reference: %s" msgstr "referensi tidak valid: %s" -#: builtin/checkout.c:1336 builtin/checkout.c:1705 +#: builtin/checkout.c:1355 builtin/checkout.c:1725 #, c-format msgid "reference is not a tree: %s" msgstr "referensi bukan pohon: %s" -#: builtin/checkout.c:1383 +#: builtin/checkout.c:1402 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "sebuah cabang diharapkan, dapat tag '%s'" -#: builtin/checkout.c:1385 +#: builtin/checkout.c:1404 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "sebuah cabang diharapkan, dapat cabang remote '%s'" -#: builtin/checkout.c:1386 builtin/checkout.c:1394 +#: builtin/checkout.c:1405 builtin/checkout.c:1413 #, c-format msgid "a branch is expected, got '%s'" msgstr "sebuah cabang diharapkan, dapat '%s'" -#: builtin/checkout.c:1389 +#: builtin/checkout.c:1408 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "sebuah cabang diharapkan, dapat komit '%s'" -#: builtin/checkout.c:1405 +#: builtin/checkout.c:1424 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12195,7 +12290,7 @@ msgstr "" "Pertimbangkan untuk menggunakan \"git merge --quit\" atau \"git worktree add" "\"." -#: builtin/checkout.c:1409 +#: builtin/checkout.c:1428 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12203,7 +12298,7 @@ msgstr "" "tidak dapat mengganti cabang di tengah sesi am\n" "Pertimbangkan untuk menggunakan \"git am --quit\" atau \"git worktree add\"." -#: builtin/checkout.c:1413 +#: builtin/checkout.c:1432 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12212,7 +12307,7 @@ msgstr "" "Pertimbangkan untuk menggunakan \"git rebase --quit\" atau \"git worktree add" "\"." -#: builtin/checkout.c:1417 +#: builtin/checkout.c:1436 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12221,7 +12316,7 @@ msgstr "" "Pertimbangkan untuk menggunakan \"git cherry-pick --quit\" atau \"git " "worktree add\"." -#: builtin/checkout.c:1421 +#: builtin/checkout.c:1440 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12230,138 +12325,126 @@ msgstr "" "Pertimbangkan untuk menggunakan \"git revert --quit\" atau \"git worktree add" "\"." -#: builtin/checkout.c:1425 +#: builtin/checkout.c:1444 msgid "you are switching branch while bisecting" msgstr "Anda mengganti cabang saat pembagian dua" -#: builtin/checkout.c:1432 +#: builtin/checkout.c:1451 msgid "paths cannot be used with switching branches" msgstr "jalur tidak dapat digunakan dengan mengganti cabang" -#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443 +#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' tidak dapat digunakan dengan mengganti cabang" -#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453 -#: builtin/checkout.c:1458 builtin/checkout.c:1463 +#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472 +#: builtin/checkout.c:1477 builtin/checkout.c:1482 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' tidak dapat digunakan dengan '%s'" -#: builtin/checkout.c:1460 +#: builtin/checkout.c:1479 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' tidak bisa mengambil <titik-awal>" -#: builtin/checkout.c:1468 +#: builtin/checkout.c:1487 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Tidak dapat mengganti cabang ke bukan komit '%s'" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1494 msgid "missing branch or commit argument" msgstr "kehilangan argumen cabang atau komit" -#: builtin/checkout.c:1518 +#: builtin/checkout.c:1537 msgid "perform a 3-way merge with the new branch" msgstr "lakukan penggabungan 3 arah dengan cabang baru" -#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321 +#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323 msgid "style" msgstr "gaya" -#: builtin/checkout.c:1520 -msgid "conflict style (merge or diff3)" -msgstr "gaya konflik (merge atau diff3)" +#: builtin/checkout.c:1539 +msgid "conflict style (merge, diff3, or zdiff3)" +msgstr "gaya konflik (merge, diff3, atau zdiff3)" -#: builtin/checkout.c:1532 builtin/worktree.c:489 +#: builtin/checkout.c:1551 builtin/worktree.c:488 msgid "detach HEAD at named commit" msgstr "lepas HEAD pada komit bernama" -#: builtin/checkout.c:1533 -msgid "set upstream info for new branch" -msgstr "setel info hulu untuk cabang baru" +#: builtin/checkout.c:1553 +msgid "set up tracking mode (see git-pull(1))" +msgstr "pasang mode pelacakan (lihat git-pull(1))" -#: builtin/checkout.c:1535 +#: builtin/checkout.c:1556 msgid "force checkout (throw away local modifications)" msgstr "paksa checkout (buang modifikasi lokal)" -#: builtin/checkout.c:1537 +#: builtin/checkout.c:1558 msgid "new-branch" msgstr "cabang baru" -#: builtin/checkout.c:1537 +#: builtin/checkout.c:1558 msgid "new unparented branch" msgstr "cabang baru tanpa induk" -#: builtin/checkout.c:1539 builtin/merge.c:302 +#: builtin/checkout.c:1560 builtin/merge.c:305 msgid "update ignored files (default)" msgstr "perbarui berkas yang diabaikan (default)" -#: builtin/checkout.c:1542 +#: builtin/checkout.c:1563 msgid "do not check if another worktree is holding the given ref" msgstr "" "jangan periksa jika pohon kerja yang lain mempunyai referensi yang diberikan" -#: builtin/checkout.c:1555 +#: builtin/checkout.c:1576 msgid "checkout our version for unmerged files" msgstr "checkout versi kami untuk berkas yang tak tergabung" -#: builtin/checkout.c:1558 +#: builtin/checkout.c:1579 msgid "checkout their version for unmerged files" msgstr "checkout versi mereka untuk berkas yang tak tergabung" -#: builtin/checkout.c:1562 +#: builtin/checkout.c:1583 msgid "do not limit pathspecs to sparse entries only" msgstr "jangan batasi jalur spek hanya ke entri tipis" -#: builtin/checkout.c:1620 +#: builtin/checkout.c:1640 #, c-format -msgid "-%c, -%c and --orphan are mutually exclusive" -msgstr "-%c, -%c dan --orphan saling eksklusif" - -#: builtin/checkout.c:1624 -msgid "-p and --overlay are mutually exclusive" -msgstr "-p dan --overlay saling eksklusif" +msgid "options '-%c', '-%c', and '%s' cannot be used together" +msgstr "opsi '-%c', '-%c', dan '%s' tidak dapat digunakan bersamaan" -#: builtin/checkout.c:1661 +#: builtin/checkout.c:1681 msgid "--track needs a branch name" msgstr "--track butuh nama cabang" -#: builtin/checkout.c:1666 +#: builtin/checkout.c:1686 #, c-format msgid "missing branch name; try -%c" msgstr "kehilangan nama cabang; coba -%c" -#: builtin/checkout.c:1698 +#: builtin/checkout.c:1718 #, c-format msgid "could not resolve %s" msgstr "tidak dapat menyelesaikan %s" -#: builtin/checkout.c:1714 +#: builtin/checkout.c:1734 msgid "invalid path specification" msgstr "spesifikasi jalur tidak valid" -#: builtin/checkout.c:1721 +#: builtin/checkout.c:1741 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' bukanlah commit dan cabang '%s' tidak dapat dibuat dari itu" -#: builtin/checkout.c:1725 +#: builtin/checkout.c:1745 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach tidak mengambil argumen jalur '%s'" -#: builtin/checkout.c:1734 -msgid "--pathspec-from-file is incompatible with --detach" -msgstr "--pathspec-from-file tidak kompatible dengan --detach" - -#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647 -msgid "--pathspec-from-file is incompatible with --patch" -msgstr "--pathspec-from-file tidak kompatibel dengan --patch" - -#: builtin/checkout.c:1750 +#: builtin/checkout.c:1770 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -12369,71 +12452,71 @@ msgstr "" "git checkout: --ours/--theirs, --force dan --merge tidak kompatibel saat\n" "men-checkout index" -#: builtin/checkout.c:1755 +#: builtin/checkout.c:1775 msgid "you must specify path(s) to restore" msgstr "Anda harus sebutkan jalur untuk dipulihkan" -#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832 -#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2958 -#: builtin/submodule--helper.c:3252 builtin/worktree.c:485 -#: builtin/worktree.c:487 +#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854 +#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2959 +#: builtin/submodule--helper.c:3253 builtin/worktree.c:484 +#: builtin/worktree.c:486 msgid "branch" msgstr "cabang" -#: builtin/checkout.c:1782 +#: builtin/checkout.c:1801 msgid "create and checkout a new branch" msgstr "buat dan checkout cabang baru" -#: builtin/checkout.c:1784 +#: builtin/checkout.c:1803 msgid "create/reset and checkout a branch" msgstr "buat/setel ulang dan checkout cabang" -#: builtin/checkout.c:1785 +#: builtin/checkout.c:1804 msgid "create reflog for new branch" msgstr "buat reflog untuk cabang baru" -#: builtin/checkout.c:1787 +#: builtin/checkout.c:1806 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "tebakan kedua 'git checkout <tidak-ada-cabang-seperti-itu>' (default)" -#: builtin/checkout.c:1788 +#: builtin/checkout.c:1807 msgid "use overlay mode (default)" msgstr "gunakan mode hamparan (default)" -#: builtin/checkout.c:1833 +#: builtin/checkout.c:1855 msgid "create and switch to a new branch" msgstr "buat dan ganti ke cabang baru" -#: builtin/checkout.c:1835 +#: builtin/checkout.c:1857 msgid "create/reset and switch to a branch" msgstr "buat/setel ulang dan ganti ke cabang" -#: builtin/checkout.c:1837 +#: builtin/checkout.c:1859 msgid "second guess 'git switch <no-such-branch>'" msgstr "tebakan kedua 'git switch <tidak-ada-cabang-seperti-itu>'" -#: builtin/checkout.c:1839 +#: builtin/checkout.c:1861 msgid "throw away local modifications" msgstr "buang modifikasi lokal" -#: builtin/checkout.c:1873 +#: builtin/checkout.c:1897 msgid "which tree-ish to checkout from" msgstr "mana mirip-cabang untuk di-checkout" -#: builtin/checkout.c:1875 +#: builtin/checkout.c:1899 msgid "restore the index" msgstr "pulihkan indeks" -#: builtin/checkout.c:1877 +#: builtin/checkout.c:1901 msgid "restore the working tree (default)" msgstr "pulihkan pohon kerja (default)" -#: builtin/checkout.c:1879 +#: builtin/checkout.c:1903 msgid "ignore unmerged entries" msgstr "abaikan entri yang tak tergabung" -#: builtin/checkout.c:1880 +#: builtin/checkout.c:1904 msgid "use overlay mode" msgstr "gunakan mode hamparan" @@ -12468,7 +12551,15 @@ msgstr "Akan melewatkan repositori %s\n" msgid "could not lstat %s\n" msgstr "tidak dapat me-lstat %s\n" -#: builtin/clean.c:300 git-add--interactive.perl:593 +#: builtin/clean.c:39 +msgid "Refusing to remove current working directory\n" +msgstr "Menolak menghapus direktori kerja saat ini\n" + +#: builtin/clean.c:40 +msgid "Would refuse to remove current working directory\n" +msgstr "Akan menolak menghapus direktori kerja saat ini\n" + +#: builtin/clean.c:326 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -12481,7 +12572,7 @@ msgstr "" "foo - pilih item berdasarkan prefiks unik\n" " - (kosong) tidak pilih apa-apa\n" -#: builtin/clean.c:304 git-add--interactive.perl:602 +#: builtin/clean.c:330 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -12502,33 +12593,33 @@ msgstr "" "* - pilih semua item\n" " - (kosong) selesai memilih\n" -#: builtin/clean.c:519 git-add--interactive.perl:568 +#: builtin/clean.c:545 git-add--interactive.perl:568 #: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Huh (%s)?\n" -#: builtin/clean.c:659 +#: builtin/clean.c:685 #, c-format msgid "Input ignore patterns>> " msgstr "Masukkan pola pengabaian>> " -#: builtin/clean.c:693 +#: builtin/clean.c:719 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "PERINGATAN: Tidak dapat menemukan item yang cocok dengan: %s" -#: builtin/clean.c:714 +#: builtin/clean.c:740 msgid "Select items to delete" msgstr "Pilih item untuk dihapus" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:755 +#: builtin/clean.c:781 #, c-format msgid "Remove %s [y/N]? " msgstr "Hapus %s [y/N]? " -#: builtin/clean.c:786 +#: builtin/clean.c:812 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -12546,52 +12637,52 @@ msgstr "" "help - layar ini\n" "? - bantuan untuk bisik pemilihan" -#: builtin/clean.c:822 +#: builtin/clean.c:848 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Akan menghapus item berikut:" msgstr[1] "Akan menghapus item berikut:" -#: builtin/clean.c:838 +#: builtin/clean.c:864 msgid "No more files to clean, exiting." msgstr "Tidak ada lagi berkas untuk dibersihkan, keluar." -#: builtin/clean.c:900 +#: builtin/clean.c:926 msgid "do not print names of files removed" msgstr "jangan cetak nama berkas yang dihapus" -#: builtin/clean.c:902 +#: builtin/clean.c:928 msgid "force" msgstr "paksa" -#: builtin/clean.c:903 +#: builtin/clean.c:929 msgid "interactive cleaning" msgstr "pembersihan interaktif" -#: builtin/clean.c:905 +#: builtin/clean.c:931 msgid "remove whole directories" msgstr "hapus keseluruhan direktori" -#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567 #: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186 -#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537 #: builtin/show-ref.c:179 msgid "pattern" msgstr "pola" -#: builtin/clean.c:907 +#: builtin/clean.c:933 msgid "add <pattern> to ignore rules" msgstr "tambahkan <pola> ke aturan pengabaian" -#: builtin/clean.c:908 +#: builtin/clean.c:934 msgid "remove ignored files, too" msgstr "juga hapus berkas terabaikan" -#: builtin/clean.c:910 +#: builtin/clean.c:936 msgid "remove only ignored files" msgstr "hanya hapus berkas terabaikan" -#: builtin/clean.c:925 +#: builtin/clean.c:951 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -12599,7 +12690,7 @@ msgstr "" "clean.requireForce disetel ke true dan baik -i, -n, atau -f tidak diberikan; " "menolak membersihkan" -#: builtin/clean.c:928 +#: builtin/clean.c:954 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -12607,7 +12698,7 @@ msgstr "" "clean.requireForce asal ke true dan baik -i, -n, atau -f tidak diberikan; " "menolak membersihkan" -#: builtin/clean.c:940 +#: builtin/clean.c:966 msgid "-x and -X cannot be used together" msgstr "-x dan -X tidak dapat digunakan bersamaan" @@ -12663,19 +12754,20 @@ msgstr "direktori templat" msgid "directory from which templates will be used" msgstr "direktori dimana templat akan digunakan" -#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870 -#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871 +#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260 msgid "reference repository" msgstr "repositori rujukan" -#: builtin/clone.c:123 builtin/submodule--helper.c:1872 -#: builtin/submodule--helper.c:2515 +#: builtin/clone.c:123 builtin/submodule--helper.c:1873 +#: builtin/submodule--helper.c:2516 msgid "use --reference only while cloning" msgstr "gunakan --reference hanya pada saat kloning" -#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663 -#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595 +#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27 +#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290 +#: builtin/pack-objects.c:3944 builtin/repack.c:665 +#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595 #: t/helper/test-simple-ipc.c:597 msgid "name" msgstr "nama" @@ -12692,7 +12784,7 @@ msgstr "checkout <cabang> daripada HEAD remote" msgid "path to git-upload-pack on the remote" msgstr "jalur ke git-upload-pack pada remote" -#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876 +#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876 #: builtin/pull.c:212 msgid "depth" msgstr "kedalaman" @@ -12701,7 +12793,7 @@ msgstr "kedalaman" msgid "create a shallow clone of that depth" msgstr "buat klon dangkal sedalam kedalaman tersebut" -#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933 +#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933 #: builtin/pull.c:215 msgid "time" msgstr "waktu" @@ -12710,17 +12802,17 @@ msgstr "waktu" msgid "create a shallow clone since a specific time" msgstr "buat klon dangkal sejak waktu yang disebutkan" -#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207 +#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208 #: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022 msgid "revision" msgstr "revisi" -#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219 +#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219 msgid "deepen history of shallow clone, excluding rev" msgstr "perdalam riwayat klon dangkal, tidak termasuk rev" -#: builtin/clone.c:137 builtin/submodule--helper.c:1882 -#: builtin/submodule--helper.c:2529 +#: builtin/clone.c:137 builtin/submodule--helper.c:1883 +#: builtin/submodule--helper.c:2530 msgid "clone only one branch, HEAD or --branch" msgstr "klon hanya satu cabang, HEAD atau --branch" @@ -12748,22 +12840,22 @@ msgstr "kunci=nilai" msgid "set config inside the new repository" msgstr "setel konfigurasi di dalam repositori baru" -#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 +#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77 #: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200 msgid "server-specific" msgstr "spesifik ke server" -#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 +#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77 #: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201 msgid "option to transmit" msgstr "opsi untuk transmisi" -#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238 +#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238 #: builtin/push.c:576 msgid "use IPv4 addresses only" msgstr "gunakan hanya alamat IPv4" -#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241 +#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241 #: builtin/push.c:578 msgid "use IPv6 addresses only" msgstr "gunakan hanya alamat IPv6" @@ -12857,29 +12949,25 @@ msgstr "tidak dapat memaket ulang untuk pembersihan" msgid "cannot unlink temporary alternates file" msgstr "tidak dapat batal-taut berkas alternatif sementara" -#: builtin/clone.c:886 builtin/receive-pack.c:2493 +#: builtin/clone.c:886 msgid "Too many arguments." msgstr "Terlalu banyak argumen." -#: builtin/clone.c:890 +#: builtin/clone.c:890 contrib/scalar/scalar.c:414 msgid "You must specify a repository to clone." msgstr "Anda harus sebutkan repositori untuk diklon." #: builtin/clone.c:903 #, c-format -msgid "--bare and --origin %s options are incompatible." -msgstr "--bare dan --origin %s tidak kompatibel." - -#: builtin/clone.c:906 -msgid "--bare and --separate-git-dir are incompatible." -msgstr "--bare dan --separate-git-dir tidak kompatibel." +msgid "options '%s' and '%s %s' cannot be used together" +msgstr "opsi '%s' dan '%s %s' tidak dapat digunakan bersamaan" #: builtin/clone.c:920 #, c-format msgid "repository '%s' does not exist" msgstr "repositori '%s' tidak ada" -#: builtin/clone.c:924 builtin/fetch.c:2029 +#: builtin/clone.c:924 builtin/fetch.c:2052 #, c-format msgid "depth %s is not a positive number" msgstr "kedalaman %s bukan bilangan positif" @@ -12899,8 +12987,8 @@ msgstr "jalur repositori '%s' sudah ada dan bukan direktori kosong" msgid "working tree '%s' already exists." msgstr "pohon kerja '%s' sudah ada." -#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262 -#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313 +#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256 +#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313 #, c-format msgid "could not create leading directories of '%s'" msgstr "tidak dapat membuat direktori pendahulu '%s'" @@ -13016,7 +13104,7 @@ msgid "" "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" msgstr "" -#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779 +#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794 msgid "dir" msgstr "" @@ -13096,7 +13184,7 @@ msgstr "" msgid "Collecting commits from input" msgstr "" -#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255 +#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259 #, c-format msgid "unrecognized subcommand: %s" msgstr "" @@ -13114,7 +13202,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "induk duplikat %s diabaikan" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577 #, c-format msgid "not a valid object name %s" msgstr "bukan nama objek valid %s" @@ -13137,13 +13225,13 @@ msgstr "induk" msgid "id of a parent commit object" msgstr "id objek komit induk" -#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283 -#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618 +#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284 +#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677 #: builtin/tag.c:454 msgid "message" msgstr "pesan" -#: builtin/commit-tree.c:113 builtin/commit.c:1626 +#: builtin/commit-tree.c:113 builtin/commit.c:1627 msgid "commit message" msgstr "pesan komit" @@ -13151,7 +13239,7 @@ msgstr "pesan komit" msgid "read commit log message from file" msgstr "baca pesan log komit dari berkas" -#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300 +#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303 #: builtin/pull.c:180 builtin/revert.c:118 msgid "GPG sign commit" msgstr "Tandatangani komit dengan GPG" @@ -13230,10 +13318,6 @@ msgstr "" msgid "failed to unpack HEAD tree object" msgstr "gagal membuka objek pohon HEAD" -#: builtin/commit.c:361 -msgid "--pathspec-from-file with -a does not make sense" -msgstr "--pathspec-from-file dengan -a tidak masuk akal" - #: builtin/commit.c:375 msgid "No paths with --include/--only does not make sense." msgstr "Tanpa jalur dengan --include/--only tidak masuk akal." @@ -13321,8 +13405,8 @@ msgstr "tidak dapat membaca berkas log '%s'" #: builtin/commit.c:802 #, c-format -msgid "cannot combine -m with --fixup:%s" -msgstr "tidak dapat menggabungkan -m dengan --fixup:%s" +msgid "options '%s' and '%s:%s' cannot be used together" +msgstr "opsi '%s' dan '%s:%s' tidak dapat digunakan bersamaan" #: builtin/commit.c:814 builtin/commit.c:830 msgid "could not read SQUASH_MSG" @@ -13429,7 +13513,7 @@ msgstr "tidak dapat melewatkan trailer ke --trailers" msgid "Error building trees" msgstr "Kesalahan membangun pohon" -#: builtin/commit.c:1080 builtin/tag.c:317 +#: builtin/commit.c:1080 builtin/tag.c:316 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Mohon berikan pesan baik dengan opsi -m atau -F.\n" @@ -13445,15 +13529,11 @@ msgstr "" msgid "Invalid ignored mode '%s'" msgstr "Mode terabaikan '%s' tidak valid" -#: builtin/commit.c:1156 builtin/commit.c:1450 +#: builtin/commit.c:1156 builtin/commit.c:1451 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode berkas tak terlacak '%s' tidak valid" -#: builtin/commit.c:1196 -msgid "--long and -z are incompatible" -msgstr "--long dan -z tidak kompatibel" - #: builtin/commit.c:1227 msgid "You are in the middle of a merge -- cannot reword." msgstr "Anda berada di tengah penggabungan -- tidak dapat menulis ulang." @@ -13464,113 +13544,111 @@ msgstr "Anda berada di tengah pemetikan ceri -- tidak dapat menulis ulang." #: builtin/commit.c:1232 #, c-format -msgid "cannot combine reword option of --fixup with path '%s'" -msgstr "" -"tidak dapat menggabungkan opsi penulisan ulang --fixup dengan jalur '%s'" +msgid "reword option of '%s' and path '%s' cannot be used together" +msgstr "opsi reword '%s' dan jalur '%s' tidak dapat digunakan bersamaan" #: builtin/commit.c:1234 -msgid "" -"reword option of --fixup is mutually exclusive with --patch/--interactive/--" -"all/--include/--only" -msgstr "" +#, c-format +msgid "reword option of '%s' and '%s' cannot be used together" +msgstr "opsi reword '%s' dan '%s' tidak dapat digunakan bersamaan" -#: builtin/commit.c:1253 +#: builtin/commit.c:1254 msgid "Using both --reset-author and --author does not make sense" msgstr "Menggunakan baik --reset-author dan --author tidak masuk akal" -#: builtin/commit.c:1260 +#: builtin/commit.c:1261 msgid "You have nothing to amend." msgstr "Anda tidak punya apapun untuk diubah." -#: builtin/commit.c:1263 +#: builtin/commit.c:1264 msgid "You are in the middle of a merge -- cannot amend." msgstr "Anda berada di tengah penggabungan -- tidak dapat mengubah." -#: builtin/commit.c:1265 +#: builtin/commit.c:1266 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Anda berada di tengah pemetikan ceri -- tidak dapat mengubah." -#: builtin/commit.c:1267 +#: builtin/commit.c:1268 msgid "You are in the middle of a rebase -- cannot amend." msgstr "Anda berada di tengah pendasaran ulang -- tidak dapat mengubah." -#: builtin/commit.c:1270 +#: builtin/commit.c:1271 msgid "Options --squash and --fixup cannot be used together" msgstr "Opsi --squash dan --fixup tidak dapat digunakan bersamaan" -#: builtin/commit.c:1280 +#: builtin/commit.c:1281 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Hanya salah satu dari -c/-C/-F/--fixup yang dapat digunakan." -#: builtin/commit.c:1282 +#: builtin/commit.c:1283 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "Opsi -m tidak dapat digabung dengan -c/-C/-F." -#: builtin/commit.c:1291 +#: builtin/commit.c:1292 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author hanya dapat digunakan dengan -C, -c atau --amend." -#: builtin/commit.c:1309 +#: builtin/commit.c:1310 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Hanya salah satu dari --include/--only/--all/--interactive/--patch yang " "dapat digunakan." -#: builtin/commit.c:1337 +#: builtin/commit.c:1338 #, c-format msgid "unknown option: --fixup=%s:%s" msgstr "" -#: builtin/commit.c:1354 +#: builtin/commit.c:1355 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "jalur '%s ...' dengan -a tidak masuk akal" -#: builtin/commit.c:1485 builtin/commit.c:1654 +#: builtin/commit.c:1486 builtin/commit.c:1655 msgid "show status concisely" msgstr "perlihatkan status dengan ringkas" -#: builtin/commit.c:1487 builtin/commit.c:1656 +#: builtin/commit.c:1488 builtin/commit.c:1657 msgid "show branch information" msgstr "perlihatkan informasi cabang" -#: builtin/commit.c:1489 +#: builtin/commit.c:1490 msgid "show stash information" msgstr "perlihatkan informasi stase" -#: builtin/commit.c:1491 builtin/commit.c:1658 +#: builtin/commit.c:1492 builtin/commit.c:1659 msgid "compute full ahead/behind values" msgstr "hitung nilai didepan/dibelakang penuh" -#: builtin/commit.c:1493 +#: builtin/commit.c:1494 msgid "version" msgstr "versi" -#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551 -#: builtin/worktree.c:691 +#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551 +#: builtin/worktree.c:690 msgid "machine-readable output" msgstr "keluaran yang dapat dibaca mesin" -#: builtin/commit.c:1496 builtin/commit.c:1662 +#: builtin/commit.c:1497 builtin/commit.c:1663 msgid "show status in long format (default)" msgstr "perlihatkan status dalam format panjang (asali)" -#: builtin/commit.c:1499 builtin/commit.c:1665 +#: builtin/commit.c:1500 builtin/commit.c:1666 msgid "terminate entries with NUL" msgstr "akhiri entri dengan NUL" -#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668 -#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 -#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335 +#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669 +#: builtin/fast-export.c:1172 builtin/fast-export.c:1175 +#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337 msgid "mode" msgstr "mode" -#: builtin/commit.c:1502 builtin/commit.c:1668 +#: builtin/commit.c:1503 builtin/commit.c:1669 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "perlihatkan berkas tak terlacak, mode opsional: all, normal, no. (Asali: all)" -#: builtin/commit.c:1506 +#: builtin/commit.c:1507 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -13578,11 +13656,11 @@ msgstr "" "perlihatkan berkas terabaikan, mode opsional: traditional, matching, no. " "(Asali: traditional)" -#: builtin/commit.c:1508 parse-options.h:192 +#: builtin/commit.c:1509 parse-options.h:192 msgid "when" msgstr "bila" -#: builtin/commit.c:1509 +#: builtin/commit.c:1510 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -13590,192 +13668,192 @@ msgstr "" "abaikan perubahan submodul, bila opsional: all, dirty, untracked. (Asali: " "all)" -#: builtin/commit.c:1511 +#: builtin/commit.c:1512 msgid "list untracked files in columns" msgstr "sebut berkas tak terlacak dalam kolom" -#: builtin/commit.c:1512 +#: builtin/commit.c:1513 msgid "do not detect renames" msgstr "jangan deteksi penggantian nama" -#: builtin/commit.c:1514 +#: builtin/commit.c:1515 msgid "detect renames, optionally set similarity index" msgstr "deteksi penggantian nama, setel indeks kemiripan secara opsional" -#: builtin/commit.c:1537 +#: builtin/commit.c:1538 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "Kombinasi argumen berkas terabaikan dan tak terlacak tidak didukung" -#: builtin/commit.c:1619 +#: builtin/commit.c:1620 msgid "suppress summary after successful commit" msgstr "sembunyikan rangkuman setelah komit berhasil" -#: builtin/commit.c:1620 +#: builtin/commit.c:1621 msgid "show diff in commit message template" msgstr "perlihatkan diff dalam templat pesan komit" -#: builtin/commit.c:1622 +#: builtin/commit.c:1623 msgid "Commit message options" msgstr "Opsi pesan komit" -#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456 +#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456 msgid "read message from file" msgstr "Baca pesan dari berkas" -#: builtin/commit.c:1624 +#: builtin/commit.c:1625 msgid "author" msgstr "pengarang" -#: builtin/commit.c:1624 +#: builtin/commit.c:1625 msgid "override author for commit" msgstr "timpa pengarang komit" -#: builtin/commit.c:1625 builtin/gc.c:550 +#: builtin/commit.c:1626 builtin/gc.c:551 msgid "date" msgstr "tangal" -#: builtin/commit.c:1625 +#: builtin/commit.c:1626 msgid "override date for commit" msgstr "timpa tanggal komit" -#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634 -#: parse-options.h:327 ref-filter.h:92 +#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635 +#: parse-options.h:329 ref-filter.h:89 msgid "commit" msgstr "komit" -#: builtin/commit.c:1627 +#: builtin/commit.c:1628 msgid "reuse and edit message from specified commit" msgstr "gunakan kembali dan sunting pesan dari komit tersebut" -#: builtin/commit.c:1628 +#: builtin/commit.c:1629 msgid "reuse message from specified commit" msgstr "gunakan kembali pesan dari komit tersebut" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate <commit>. #. -#: builtin/commit.c:1633 +#: builtin/commit.c:1634 msgid "[(amend|reword):]commit" msgstr "[(amend|reword):]komit" -#: builtin/commit.c:1633 +#: builtin/commit.c:1634 msgid "" "use autosquash formatted message to fixup or amend/reword specified commit" msgstr "" "gunakan pesan terformat autosquash untuk perbaiki atau ubah/tulis ulang " "komit yang disebutkan" -#: builtin/commit.c:1634 +#: builtin/commit.c:1635 msgid "use autosquash formatted message to squash specified commit" msgstr "gunakan pesan terformat autosquash untuk lumat komit tersebut" -#: builtin/commit.c:1635 +#: builtin/commit.c:1636 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "komit sekarang dikarang olehku (gunakan dengan -C/-c/--amend)" -#: builtin/commit.c:1636 builtin/interpret-trailers.c:111 +#: builtin/commit.c:1637 builtin/interpret-trailers.c:111 msgid "trailer" msgstr "" -#: builtin/commit.c:1636 +#: builtin/commit.c:1637 msgid "add custom trailer(s)" msgstr "" -#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303 +#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306 #: builtin/pull.c:146 builtin/revert.c:110 msgid "add a Signed-off-by trailer" msgstr "tambahkan trailer Signed-off-by" -#: builtin/commit.c:1638 +#: builtin/commit.c:1639 msgid "use specified template file" msgstr "gunakan templat berkas tersebut" -#: builtin/commit.c:1639 +#: builtin/commit.c:1640 msgid "force edit of commit" msgstr "paksa sunting komit" -#: builtin/commit.c:1641 +#: builtin/commit.c:1642 msgid "include status in commit message template" msgstr "masukkan status dalam templat pesaan komit" -#: builtin/commit.c:1646 +#: builtin/commit.c:1647 msgid "Commit contents options" msgstr "Opsi isi komit" -#: builtin/commit.c:1647 +#: builtin/commit.c:1648 msgid "commit all changed files" msgstr "komit semua berkas terubah" -#: builtin/commit.c:1648 +#: builtin/commit.c:1649 msgid "add specified files to index for commit" msgstr "tambahakn berkas tersebut ke indeks untuk dikomit" -#: builtin/commit.c:1649 +#: builtin/commit.c:1650 msgid "interactively add files" msgstr "tambah berkas secara interaktif" -#: builtin/commit.c:1650 +#: builtin/commit.c:1651 msgid "interactively add changes" msgstr "tambah perubahan secara interaktif" -#: builtin/commit.c:1651 +#: builtin/commit.c:1652 msgid "commit only specified files" msgstr "hanya komit berkas tersebut" -#: builtin/commit.c:1652 +#: builtin/commit.c:1653 msgid "bypass pre-commit and commit-msg hooks" msgstr "lewati kail pre-commit dan commit-msg" -#: builtin/commit.c:1653 +#: builtin/commit.c:1654 msgid "show what would be committed" msgstr "perlihatkan apa yang akan dikomit" -#: builtin/commit.c:1666 +#: builtin/commit.c:1667 msgid "amend previous commit" msgstr "ubah komit sebelumnya" -#: builtin/commit.c:1667 +#: builtin/commit.c:1668 msgid "bypass post-rewrite hook" msgstr "lewati kail post-rewrite" -#: builtin/commit.c:1674 +#: builtin/commit.c:1675 msgid "ok to record an empty change" msgstr "ok merekam perubahan kosong" -#: builtin/commit.c:1676 +#: builtin/commit.c:1677 msgid "ok to record a change with an empty message" msgstr "ok merekam perubahan dengan pesan kosong" -#: builtin/commit.c:1752 +#: builtin/commit.c:1753 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Berkas MERGE_HEAD (%s) rusak" -#: builtin/commit.c:1759 +#: builtin/commit.c:1760 msgid "could not read MERGE_MODE" msgstr "tidak dapat membaca MERGE_MODE" -#: builtin/commit.c:1780 +#: builtin/commit.c:1781 #, c-format msgid "could not read commit message: %s" msgstr "tidak dapat membaca pesan komit: %s" -#: builtin/commit.c:1787 +#: builtin/commit.c:1788 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Batalkan komit karena pesan komit kosong.\n" -#: builtin/commit.c:1792 +#: builtin/commit.c:1793 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Batalkan komit; Anda tidak menyunting pesan.\n" -#: builtin/commit.c:1803 +#: builtin/commit.c:1804 #, c-format msgid "Aborting commit due to empty commit message body.\n" msgstr "Batalkan komit karena badan pesan komit kosong.\n" -#: builtin/commit.c:1839 +#: builtin/commit.c:1840 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -14279,7 +14357,7 @@ msgstr "hanya pertimbangkan tag yang cocok dengan <pola>" msgid "do not consider tags matching <pattern>" msgstr "jangan pertimbangkan tag yang cocok dengan <pola>" -#: builtin/describe.c:570 builtin/name-rev.c:535 +#: builtin/describe.c:570 builtin/name-rev.c:544 msgid "show abbreviated commit object as fallback" msgstr "perlihatkan objek komit singkat sebagai langkah terakhir" @@ -14295,25 +14373,14 @@ msgstr "tambahkan <tanda> pada direktori kerja kotor (asali: \"-dirty\")" msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "tambahkan <tanda> pada direktori kerja rusak (asali: \"-broken\")" -#: builtin/describe.c:593 -msgid "--long is incompatible with --abbrev=0" -msgstr "--long tidak kompatibel dengan --abbrev=0" - #: builtin/describe.c:622 msgid "No names found, cannot describe anything." msgstr "Tidak ada nama yang ditemukan, tidak dapat menjelaskan apapun." -#: builtin/describe.c:673 -msgid "--dirty is incompatible with commit-ishes" -msgstr "--dirty tidak kompatibel dengan mirip-komit" - -#: builtin/describe.c:675 -msgid "--broken is incompatible with commit-ishes" -msgstr "--broken tidak kompatibel dengan mirip-komit" - -#: builtin/diff-tree.c:155 -msgid "--stdin and --merge-base are mutually exclusive" -msgstr "--stdin dan --merge-base saling eksklusif" +#: builtin/describe.c:673 builtin/describe.c:675 +#, c-format +msgid "option '%s' and commit-ishes cannot be used together" +msgstr "opsi '%s' dan mirip-komit tidak dapat digunakan bersamaan" #: builtin/diff-tree.c:157 msgid "--merge-base only works with two commits" @@ -14334,26 +14401,26 @@ msgstr "opsi tidak valid: %s" msgid "%s...%s: no merge base" msgstr "%s...%s: tidak ada dasar penggabungan" -#: builtin/diff.c:486 +#: builtin/diff.c:491 msgid "Not a git repository" msgstr "bukan repositori git" -#: builtin/diff.c:532 builtin/grep.c:698 +#: builtin/diff.c:537 builtin/grep.c:698 #, c-format msgid "invalid object '%s' given." msgstr "objek yang diberikan '%s' tidak valid" -#: builtin/diff.c:543 +#: builtin/diff.c:548 #, c-format msgid "more than two blobs given: '%s'" msgstr "lebih dari dua blob diberikan: '%s'" -#: builtin/diff.c:548 +#: builtin/diff.c:553 #, c-format msgid "unhandled object '%s' given." msgstr "objek tak tertangani '%s' diberikan" -#: builtin/diff.c:582 +#: builtin/diff.c:587 #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "%s...%s: banyak dasar penggabungan, menggunakan %s" @@ -14362,22 +14429,22 @@ msgstr "%s...%s: banyak dasar penggabungan, menggunakan %s" msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<opsi>] [<komit> [<komit>]] [--] [<jalur>...]" -#: builtin/difftool.c:293 +#: builtin/difftool.c:287 #, c-format msgid "could not read symlink %s" msgstr "tidak dapat membaca tautan simbolik %s" -#: builtin/difftool.c:295 +#: builtin/difftool.c:289 #, c-format msgid "could not read symlink file %s" msgstr "tidak dapat membaca berkas tautan simbolik %s" -#: builtin/difftool.c:303 +#: builtin/difftool.c:297 #, c-format msgid "could not read object %s for symlink %s" msgstr "tidak dapat membaca objek %s untuk symlink %s" -#: builtin/difftool.c:427 +#: builtin/difftool.c:421 msgid "" "combined diff formats ('-c' and '--cc') are not supported in\n" "directory diff mode ('-d' and '--dir-diff')." @@ -14385,58 +14452,58 @@ msgstr "" "format diff tergabung ('-c' dan '--cc') tidak didukung dalam\n" "mode diff direktori ('-d' dan '--dir-diff')." -#: builtin/difftool.c:632 +#: builtin/difftool.c:626 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "kedua berkas berubah: '%s' dan '%s'." -#: builtin/difftool.c:634 +#: builtin/difftool.c:628 msgid "working tree file has been left." msgstr "berkas pohon kerja telah ditinggalkan." -#: builtin/difftool.c:645 +#: builtin/difftool.c:639 #, c-format msgid "temporary files exist in '%s'." msgstr "berkas sementara ada di '%s'." -#: builtin/difftool.c:646 +#: builtin/difftool.c:640 msgid "you may want to cleanup or recover these." msgstr "mungkin Anda ingin membersihkan atau memulihkan itu." -#: builtin/difftool.c:651 +#: builtin/difftool.c:645 #, c-format msgid "failed: %d" msgstr "gagal: %d" -#: builtin/difftool.c:696 +#: builtin/difftool.c:690 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "gunakan `diff.guitool` daripada `diff.tool`" -#: builtin/difftool.c:698 +#: builtin/difftool.c:692 msgid "perform a full-directory diff" msgstr "lakukan diff direktori penuh" -#: builtin/difftool.c:700 +#: builtin/difftool.c:694 msgid "do not prompt before launching a diff tool" msgstr "jangan bisiki sebelum meluncurkan alat diff" -#: builtin/difftool.c:705 +#: builtin/difftool.c:699 msgid "use symlinks in dir-diff mode" msgstr "gunakan tautan simbolik dalam mode diff direktori" -#: builtin/difftool.c:706 +#: builtin/difftool.c:700 msgid "tool" msgstr "alat" -#: builtin/difftool.c:707 +#: builtin/difftool.c:701 msgid "use the specified diff tool" msgstr "gunakan alat diff yang disebutkan" -#: builtin/difftool.c:709 +#: builtin/difftool.c:703 msgid "print a list of diff tools that may be used with `--tool`" msgstr "cetak daftar alat diff yang bisa digunakan dengan `--tool`" -#: builtin/difftool.c:712 +#: builtin/difftool.c:706 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit " "code" @@ -14444,31 +14511,23 @@ msgstr "" "buat 'git-difftool' keluar ketika alat diff yang dijalankan mengembalikan " "kode keluar bukan nol" -#: builtin/difftool.c:715 +#: builtin/difftool.c:709 msgid "specify a custom command for viewing diffs" msgstr "sebutkan perintah kustom untuk melihat diff" -#: builtin/difftool.c:716 +#: builtin/difftool.c:710 msgid "passed to `diff`" msgstr "dilewatkan ke `diff`" -#: builtin/difftool.c:732 +#: builtin/difftool.c:726 msgid "difftool requires worktree or --no-index" msgstr "difftool butuh pohon kerja atau --no-index" -#: builtin/difftool.c:739 -msgid "--dir-diff is incompatible with --no-index" -msgstr "--dir-diff tidak kompatibel dengan --no-index" - -#: builtin/difftool.c:742 -msgid "--gui, --tool and --extcmd are mutually exclusive" -msgstr "--gui, --tool dan --extcmd saling eksklusif" - -#: builtin/difftool.c:750 +#: builtin/difftool.c:744 msgid "no <tool> given for --tool=<tool>" msgstr "tidak ada <alat> yang diberikan untuk --tool=<alat>" -#: builtin/difftool.c:757 +#: builtin/difftool.c:751 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "tidak ada <perintah> yang diberikan untuk --extcmd=<perintah>" @@ -14504,127 +14563,118 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [opsi rev-list]" -#: builtin/fast-export.c:869 +#: builtin/fast-export.c:843 msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "" "Kesalahan: Tidak dapat mengekspor tag bersarang kecuali jika --mark-tags " "disebutkan." -#: builtin/fast-export.c:1178 +#: builtin/fast-export.c:1152 msgid "--anonymize-map token cannot be empty" msgstr "token --anonymize-map tidak bisa kosong" -#: builtin/fast-export.c:1198 +#: builtin/fast-export.c:1171 msgid "show progress after <n> objects" msgstr "perlihatkan perkembangan setelah <n> objek" -#: builtin/fast-export.c:1200 +#: builtin/fast-export.c:1173 msgid "select handling of signed tags" msgstr "pilih penanganan tag bertandatangan" -#: builtin/fast-export.c:1203 +#: builtin/fast-export.c:1176 msgid "select handling of tags that tag filtered objects" msgstr "pilih penanganan tag yang men-tag objek tersaring" -#: builtin/fast-export.c:1206 +#: builtin/fast-export.c:1179 msgid "select handling of commit messages in an alternate encoding" msgstr "pilih penanganan pesan komit dalam pengkodean alternatif" -#: builtin/fast-export.c:1209 +#: builtin/fast-export.c:1182 msgid "dump marks to this file" msgstr "buang tanda ke berkas ini" -#: builtin/fast-export.c:1211 +#: builtin/fast-export.c:1184 msgid "import marks from this file" msgstr "impor tanda dari berkas ini" -#: builtin/fast-export.c:1215 +#: builtin/fast-export.c:1188 msgid "import marks from this file if it exists" msgstr "impor tanda dari berkas ini jika ada" -#: builtin/fast-export.c:1217 +#: builtin/fast-export.c:1190 msgid "fake a tagger when tags lack one" msgstr "palsukan pen-tag ketika tidak ada pada tag" -#: builtin/fast-export.c:1219 +#: builtin/fast-export.c:1192 msgid "output full tree for each commit" msgstr "keluarkan pohon penuh untuk setiap komit" -#: builtin/fast-export.c:1221 +#: builtin/fast-export.c:1194 msgid "use the done feature to terminate the stream" msgstr "gunakan fitur selesai untuk mengakhiri arus" -#: builtin/fast-export.c:1222 +#: builtin/fast-export.c:1195 msgid "skip output of blob data" msgstr "lewati keluaran data blob" -#: builtin/fast-export.c:1223 builtin/log.c:1826 +#: builtin/fast-export.c:1196 builtin/log.c:1841 msgid "refspec" msgstr "spek referensi" -#: builtin/fast-export.c:1224 +#: builtin/fast-export.c:1197 msgid "apply refspec to exported refs" msgstr "terapkan spek referensi ke referensi terekspor" -#: builtin/fast-export.c:1225 +#: builtin/fast-export.c:1198 msgid "anonymize output" msgstr "anonimkan keluaran" -#: builtin/fast-export.c:1226 +#: builtin/fast-export.c:1199 msgid "from:to" msgstr "dari:ke" -#: builtin/fast-export.c:1227 +#: builtin/fast-export.c:1200 msgid "convert <from> to <to> in anonymized output" msgstr "ubah <dari> ke <ke> pada keluaran teranonim" -#: builtin/fast-export.c:1230 +#: builtin/fast-export.c:1203 msgid "reference parents which are not in fast-export stream by object id" msgstr "referensikan induk yang tidak ada dalam arus fast-export oleh id objek" -#: builtin/fast-export.c:1232 +#: builtin/fast-export.c:1205 msgid "show original object ids of blobs/commits" msgstr "perlihatkan id objek asli dari blob/komit" -#: builtin/fast-export.c:1234 +#: builtin/fast-export.c:1207 msgid "label tags with mark ids" msgstr "label tag dengan id tanda" -#: builtin/fast-export.c:1257 -msgid "--anonymize-map without --anonymize does not make sense" -msgstr "--anonymize-map tanpa --anonymize tidak masuk akal" - -#: builtin/fast-export.c:1272 -msgid "Cannot pass both --import-marks and --import-marks-if-exists" -msgstr "" -"Tidak dapat melewatkan baik --import-marks dan --import-marks-if-exists" - -#: builtin/fast-import.c:3088 +#: builtin/fast-import.c:3090 #, c-format msgid "Missing from marks for submodule '%s'" msgstr "Kehilangan tanda dari untuk submodul '%s'" -#: builtin/fast-import.c:3090 +#: builtin/fast-import.c:3092 #, c-format msgid "Missing to marks for submodule '%s'" msgstr "Kehilangan tanda ke untuk submodul '%s'" -#: builtin/fast-import.c:3225 +#: builtin/fast-import.c:3227 #, c-format msgid "Expected 'mark' command, got %s" msgstr "Perintah 'mark' diharapkan, dapat %s" -#: builtin/fast-import.c:3230 +#: builtin/fast-import.c:3232 #, c-format msgid "Expected 'to' command, got %s" msgstr "Perintah 'to' diharapkan, dapat %s" -#: builtin/fast-import.c:3322 +#: builtin/fast-import.c:3324 msgid "Expected format name:filename for submodule rewrite option" msgstr "" "Format nama:nama berkas diharapkan untuk operasi penulisan ulang submodul" -#: builtin/fast-import.c:3377 +#: builtin/fast-import.c:3379 #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "fitur '%s' dilarang dalam input tanpa --allow-unsafe-features" @@ -14634,116 +14684,118 @@ msgstr "fitur '%s' dilarang dalam input tanpa --allow-unsafe-features" msgid "Lockfile created but not reported: %s" msgstr "Berkas kunci dibuat tetapi tidak dilaporkan: %s" -#: builtin/fetch.c:35 +#: builtin/fetch.c:36 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<opsi>] [<repositori> [<spek referensi>...]]" -#: builtin/fetch.c:36 +#: builtin/fetch.c:37 msgid "git fetch [<options>] <group>" msgstr "git fetch [<opsi>] <grup>" -#: builtin/fetch.c:37 +#: builtin/fetch.c:38 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<opsi>] [(<repositori> | <grup>)]" -#: builtin/fetch.c:38 +#: builtin/fetch.c:39 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opsi>]" -#: builtin/fetch.c:122 +#: builtin/fetch.c:123 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel tidak dapat bernilai negatif" -#: builtin/fetch.c:145 builtin/pull.c:189 +#: builtin/fetch.c:146 builtin/pull.c:189 msgid "fetch from all remotes" msgstr "ambil dari semua remote" -#: builtin/fetch.c:147 builtin/pull.c:249 +#: builtin/fetch.c:148 builtin/pull.c:249 msgid "set upstream for git pull/fetch" msgstr "setel hulu untuk git pull/fetch" -#: builtin/fetch.c:149 builtin/pull.c:192 +#: builtin/fetch.c:150 builtin/pull.c:192 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "tambah ke .git/FETCH_HEAD daripada timpa" -#: builtin/fetch.c:151 +#: builtin/fetch.c:152 msgid "use atomic transaction to update references" msgstr "" -#: builtin/fetch.c:153 builtin/pull.c:195 +#: builtin/fetch.c:154 builtin/pull.c:195 msgid "path to upload pack on remote end" msgstr "jalur ke paket unggah pada sisi remote" -#: builtin/fetch.c:154 +#: builtin/fetch.c:155 msgid "force overwrite of local reference" msgstr "paksa timpa referensi lokal" -#: builtin/fetch.c:156 +#: builtin/fetch.c:157 msgid "fetch from multiple remotes" msgstr "ambil dari banyak remote" -#: builtin/fetch.c:158 builtin/pull.c:199 +#: builtin/fetch.c:159 builtin/pull.c:199 msgid "fetch all tags and associated objects" msgstr "ambil semua tag dan objek yang bersesuaian" -#: builtin/fetch.c:160 +#: builtin/fetch.c:161 msgid "do not fetch all tags (--no-tags)" msgstr "jangan ambil semua tag (--no-tags)" -#: builtin/fetch.c:162 +#: builtin/fetch.c:163 msgid "number of submodules fetched in parallel" msgstr "jumlah submodul yang diambil secara bersamaan" -#: builtin/fetch.c:164 +#: builtin/fetch.c:165 msgid "modify the refspec to place all refs within refs/prefetch/" msgstr "" +"modifikasi spek referensi untuk tempatkan semua referensi di dalam refs/" +"prefetch/" -#: builtin/fetch.c:166 builtin/pull.c:202 +#: builtin/fetch.c:167 builtin/pull.c:202 msgid "prune remote-tracking branches no longer on remote" msgstr "buang cabang pelacak remote yang tidak ada pada remote" -#: builtin/fetch.c:168 +#: builtin/fetch.c:169 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "buang tag lokal yang tidak ada pada remote dan klob tag yang berubah" -#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123 +#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123 msgid "on-demand" msgstr "sesuai permintaan" -#: builtin/fetch.c:170 +#: builtin/fetch.c:171 msgid "control recursive fetching of submodules" msgstr "kontrol pengambilan submodul rekursif" -#: builtin/fetch.c:175 +#: builtin/fetch.c:176 msgid "write fetched references to the FETCH_HEAD file" msgstr "tulis referensi yang diambil ke berkas FETCH_HEAD" -#: builtin/fetch.c:176 builtin/pull.c:210 +#: builtin/fetch.c:177 builtin/pull.c:210 msgid "keep downloaded pack" msgstr "simpan paket yang diunduh" -#: builtin/fetch.c:178 +#: builtin/fetch.c:179 msgid "allow updating of HEAD ref" msgstr "bolehkan perbarui referensi HEAD" -#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213 +#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213 #: builtin/pull.c:222 msgid "deepen history of shallow clone" msgstr "perdalam riwayat klon dangkal" -#: builtin/fetch.c:183 builtin/pull.c:216 +#: builtin/fetch.c:184 builtin/pull.c:216 msgid "deepen history of shallow repository based on time" msgstr "perdalam riwayat repositori dangkal berdasarkan waktu" -#: builtin/fetch.c:189 builtin/pull.c:225 +#: builtin/fetch.c:190 builtin/pull.c:225 msgid "convert to a complete repository" msgstr "ubah ke repositori penuh" -#: builtin/fetch.c:192 +#: builtin/fetch.c:193 msgid "prepend this to submodule path output" msgstr "tambahkan ini ke jalur keluaran submodul" -#: builtin/fetch.c:195 +#: builtin/fetch.c:196 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -14751,143 +14803,148 @@ msgstr "" "default untuk ambil submodul secara rekursif (prioritas lebih rendah " "dariberkas konfigurasi)" -#: builtin/fetch.c:199 builtin/pull.c:228 +#: builtin/fetch.c:200 builtin/pull.c:228 msgid "accept refs that update .git/shallow" msgstr "terima referensi yang memperbarui .git/shallow" -#: builtin/fetch.c:200 builtin/pull.c:230 +#: builtin/fetch.c:201 builtin/pull.c:230 msgid "refmap" msgstr "peta referensi" -#: builtin/fetch.c:201 builtin/pull.c:231 +#: builtin/fetch.c:202 builtin/pull.c:231 msgid "specify fetch refmap" msgstr "sebutkan ambil peta referensi" -#: builtin/fetch.c:208 builtin/pull.c:244 +#: builtin/fetch.c:209 builtin/pull.c:244 msgid "report that we have only objects reachable from this object" msgstr "" "laporkan bahwa kami hanya punya object yang bisa dicapai dari objek ini" -#: builtin/fetch.c:210 +#: builtin/fetch.c:211 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" msgstr "" "jangan ambil berkas pak; sebagai gantinya cetak leluhur dari ujung negosiasi" -#: builtin/fetch.c:213 builtin/fetch.c:215 +#: builtin/fetch.c:214 builtin/fetch.c:216 msgid "run 'maintenance --auto' after fetching" msgstr "lakukan 'maintenance --auto' setelah pengambilan" -#: builtin/fetch.c:217 builtin/pull.c:247 +#: builtin/fetch.c:218 builtin/pull.c:247 msgid "check for forced-updates on all updated branches" msgstr "periksa pembaruan terpaksa pada semua cabang" -#: builtin/fetch.c:219 +#: builtin/fetch.c:220 msgid "write the commit-graph after fetching" msgstr "tulis grafik komit setelah pengambilan" -#: builtin/fetch.c:221 +#: builtin/fetch.c:222 msgid "accept refspecs from stdin" msgstr "terima spek referensi dari masukan standar" -#: builtin/fetch.c:586 -msgid "Couldn't find remote ref HEAD" +#: builtin/fetch.c:592 +msgid "couldn't find remote ref HEAD" msgstr "tidak dapat menemukan referensi remote HEAD" -#: builtin/fetch.c:760 +#: builtin/fetch.c:766 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "konfigurasi fetch.output berisi nilai tidak valid %s" -#: builtin/fetch.c:862 +#: builtin/fetch.c:867 #, c-format msgid "object %s not found" msgstr "objek %s tidak ditemukan" -#: builtin/fetch.c:866 +#: builtin/fetch.c:871 msgid "[up to date]" msgstr "[terkini]" -#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967 +#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973 msgid "[rejected]" msgstr "[tertolak]" -#: builtin/fetch.c:880 +#: builtin/fetch.c:885 msgid "can't fetch in current branch" msgstr "tidak dapat mengambil di cabang saat ini" -#: builtin/fetch.c:890 +#: builtin/fetch.c:886 +msgid "checked out in another worktree" +msgstr "ter-check out di dalam pohon kerja lainnya" + +#: builtin/fetch.c:896 msgid "[tag update]" msgstr "[pembaruan tag]" -#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950 -#: builtin/fetch.c:962 +#: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956 +#: builtin/fetch.c:968 msgid "unable to update local ref" msgstr "tidak dapat memperbarui referensi lokal" -#: builtin/fetch.c:895 +#: builtin/fetch.c:901 msgid "would clobber existing tag" msgstr "akan klob tag yang ada" -#: builtin/fetch.c:917 +#: builtin/fetch.c:923 msgid "[new tag]" msgstr "[tag baru]" -#: builtin/fetch.c:920 +#: builtin/fetch.c:926 msgid "[new branch]" msgstr "[cabang baru]" -#: builtin/fetch.c:923 +#: builtin/fetch.c:929 msgid "[new ref]" msgstr "[referensi baru]" -#: builtin/fetch.c:962 +#: builtin/fetch.c:968 msgid "forced update" msgstr "pembaruan terpaksa" -#: builtin/fetch.c:967 +#: builtin/fetch.c:973 msgid "non-fast-forward" msgstr "bukan-maju-cepat" -#: builtin/fetch.c:1070 +#: builtin/fetch.c:1076 msgid "" -"Fetch normally indicates which branches had a forced update,\n" -"but that check has been disabled. To re-enable, use '--show-forced-updates'\n" -"flag or run 'git config fetch.showForcedUpdates true'." +"fetch normally indicates which branches had a forced update,\n" +"but that check has been disabled; to re-enable, use '--show-forced-updates'\n" +"flag or run 'git config fetch.showForcedUpdates true'" msgstr "" -"Ambil secara normal mengindikasikan cabang mana ada pembaruan terpaksa,\n" -"tapi pemeriksaan tersebut dinonaktifkan. Untuk aktifkan kembali, gunakan\n" -"'--show-forced-updates' atau jalankan 'git config fetch.showForcedUpdates " -"true'." +"fetch secara normal mengindikasikan cabang mana ada pembaruan terpaksa,\n" +"tapi pemeriksaan tersebut sudah dinonaktifkan. Untuk aktifkan kembali, " +"gunakan\n" +"bendera '--show-forced-updates' atau jalankan 'git config fetch." +"showForcedUpdates true'." -#: builtin/fetch.c:1074 +#: builtin/fetch.c:1080 #, c-format msgid "" -"It took %.2f seconds to check forced updates. You can use\n" +"it took %.2f seconds to check forced updates; you can use\n" "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " "false'\n" -" to avoid this check.\n" +"to avoid this check\n" msgstr "" -"Butuh waktu %2.f detik untuk periksa pembaruan terpaksa. Anda dapat\n" +"Butuh waktu %2.f detik untuk memeriksa pembaruan terpaksa; Anda dapat\n" "menggunakan '--no-show-forced-updates' atau jalankan\n" "'git config fetch.showForcedUpdates false'\n" -" untuk menghindari pemeriksaan ini.\n" +"untuk menghindari pemeriksaan ini.\n" -#: builtin/fetch.c:1105 +#: builtin/fetch.c:1112 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s tidak mengirim semua objek yang diperlukan\n" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1141 #, c-format msgid "rejected %s because shallow roots are not allowed to be updated" msgstr "tolak %s karena akar dangkal tidak diperkenankan untuk diperbarui" -#: builtin/fetch.c:1223 builtin/fetch.c:1371 +#: builtin/fetch.c:1231 builtin/fetch.c:1379 #, c-format msgid "From %.*s\n" msgstr "Dari %.*s\n" -#: builtin/fetch.c:1244 +#: builtin/fetch.c:1252 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -14896,141 +14953,142 @@ msgstr "" "beberapa referensi lokal tidak dapat diperbarui; coba jalankan\n" " 'git remote prune %s' untuk hapus cabang yang lama dan berkonflik" -#: builtin/fetch.c:1341 +#: builtin/fetch.c:1349 #, c-format msgid " (%s will become dangling)" msgstr " (%s akan menjadi terjuntai)" -#: builtin/fetch.c:1342 +#: builtin/fetch.c:1350 #, c-format msgid " (%s has become dangling)" msgstr " (%s telah menjadi terjuntai)" -#: builtin/fetch.c:1374 +#: builtin/fetch.c:1382 msgid "[deleted]" msgstr "[dihapus]" -#: builtin/fetch.c:1375 builtin/remote.c:1128 +#: builtin/fetch.c:1383 builtin/remote.c:1128 msgid "(none)" msgstr "(tidak ada)" -#: builtin/fetch.c:1398 +#: builtin/fetch.c:1405 #, c-format -msgid "Refusing to fetch into current branch %s of non-bare repository" -msgstr "Tolak mengambil ke cabang saat ini %s dari repositori non-bare" +msgid "refusing to fetch into branch '%s' checked out at '%s'" +msgstr "menolak mengambil ke dalam cabang '%s' yang ter-checkout pada '%s'" -#: builtin/fetch.c:1417 +#: builtin/fetch.c:1425 #, c-format -msgid "Option \"%s\" value \"%s\" is not valid for %s" -msgstr "Opsi \"%s\" nilai \"%s\" tidak valid untuk %s" +msgid "option \"%s\" value \"%s\" is not valid for %s" +msgstr "opsi \"%s\" nilai \"%s\" tidak valid untuk %s" -#: builtin/fetch.c:1420 +#: builtin/fetch.c:1428 #, c-format -msgid "Option \"%s\" is ignored for %s\n" -msgstr "Opsi \"%s\" diabaikan untuk %s\n" +msgid "option \"%s\" is ignored for %s\n" +msgstr "opsi \"%s\" diabaikan untuk %s\n" -#: builtin/fetch.c:1447 +#: builtin/fetch.c:1455 #, c-format msgid "the object %s does not exist" msgstr "objek '%s' tidak ada" -#: builtin/fetch.c:1633 +#: builtin/fetch.c:1643 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "banyak cabang terdeteksi, tidak kompatibel dengan --set-upstream" -#: builtin/fetch.c:1648 +#: builtin/fetch.c:1655 +#, c-format +msgid "" +"could not set upstream of HEAD to '%s' from '%s' when it does not point to " +"any branch." +msgstr "" +"tidak dapat menyetel hulu HEAD ke %s dari '%s' ketika itu tak menunjuk pada " +"cabang apapun." + +#: builtin/fetch.c:1668 msgid "not setting upstream for a remote remote-tracking branch" msgstr "tidak setel hulu untuk cabang remote pelacak remote" -#: builtin/fetch.c:1650 +#: builtin/fetch.c:1670 msgid "not setting upstream for a remote tag" msgstr "tidak setel hulu untuk tag remote" -#: builtin/fetch.c:1652 +#: builtin/fetch.c:1672 msgid "unknown branch type" msgstr "tipe cabang tidak diketahui" -#: builtin/fetch.c:1654 +#: builtin/fetch.c:1674 msgid "" -"no source branch found.\n" -"you need to specify exactly one branch with the --set-upstream option." +"no source branch found;\n" +"you need to specify exactly one branch with the --set-upstream option" msgstr "" -"cabang sumber tidak ditemukan.\n" +"cabang sumber tidak ditemukan;\n" "Anda harus sebutkan tepat satu cabang dengan opsi --set-upstream." -#: builtin/fetch.c:1783 builtin/fetch.c:1846 +#: builtin/fetch.c:1804 builtin/fetch.c:1867 #, c-format msgid "Fetching %s\n" msgstr "Mengambil %s\n" -#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101 +#: builtin/fetch.c:1814 builtin/fetch.c:1869 #, c-format -msgid "Could not fetch %s" -msgstr "Tidak dapat mengambil %s" +msgid "could not fetch %s" +msgstr "tidak dapat mengambil %s" -#: builtin/fetch.c:1805 +#: builtin/fetch.c:1826 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "tidak dapat mengambil '%s' (kode keluar: %d)\n" -#: builtin/fetch.c:1909 +#: builtin/fetch.c:1930 msgid "" -"No remote repository specified. Please, specify either a URL or a\n" -"remote name from which new revisions should be fetched." +"no remote repository specified; please specify either a URL or a\n" +"remote name from which new revisions should be fetched" msgstr "" -"Repositori remot tidak disebutkan. Mohon sebutkan baik URL atau nama\n" -"cabang yang mana revisi baru sebaiknya diambil." +"repositori remote tidak disebutkan; mohon sebutkan baik URL atau nama\n" +"remote yang mana revisi baru sebaiknya diambil" -#: builtin/fetch.c:1945 -msgid "You need to specify a tag name." -msgstr "Anda perlu sebutkan nama tag" +#: builtin/fetch.c:1966 +msgid "you need to specify a tag name" +msgstr "Anda perlu sebutkan sebuah nama tag" -#: builtin/fetch.c:2009 +#: builtin/fetch.c:2032 msgid "--negotiate-only needs one or more --negotiate-tip=*" msgstr "--negotiate-only perlu satu atau lebih --negotiate-tip=*" -#: builtin/fetch.c:2013 -msgid "Negative depth in --deepen is not supported" -msgstr "Kedalaman negatif di --deepen tidak didukung" - -#: builtin/fetch.c:2015 -msgid "--deepen and --depth are mutually exclusive" -msgstr "--deepen dan --depth saling eksklusif" - -#: builtin/fetch.c:2020 -msgid "--depth and --unshallow cannot be used together" -msgstr "--depth dan --unshallow tidak dapat digunakan bersamaan" +#: builtin/fetch.c:2036 +msgid "negative depth in --deepen is not supported" +msgstr "kedalaman negatif pada --deepen tidak didukung" -#: builtin/fetch.c:2022 +#: builtin/fetch.c:2045 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow pada repositori penuh tidak masuk akal" -#: builtin/fetch.c:2039 +#: builtin/fetch.c:2062 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tidak mengambil argumen repositori" -#: builtin/fetch.c:2041 +#: builtin/fetch.c:2064 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all tidak masuk akal dengan spek referensi" -#: builtin/fetch.c:2050 +#: builtin/fetch.c:2073 #, c-format -msgid "No such remote or remote group: %s" -msgstr "tidak ada remote atau grup remote seperti itu: %s" +msgid "no such remote or remote group: %s" +msgstr "tidak ada remote atau grup remote seperti: %s" -#: builtin/fetch.c:2057 -msgid "Fetching a group and specifying refspecs does not make sense" -msgstr "Ambil grup dan sebutkan spek referensi tidak masuk akal" +#: builtin/fetch.c:2081 +msgid "fetching a group and specifying refspecs does not make sense" +msgstr "mengambil sebuah grup dan menyebutkan spek referensi tidak masuk akal" -#: builtin/fetch.c:2073 +#: builtin/fetch.c:2097 msgid "must supply remote when using --negotiate-only" msgstr "harus suplai remote ketika menggunakan --negotiate-only" -#: builtin/fetch.c:2078 -msgid "Protocol does not support --negotiate-only, exiting." -msgstr "Protokol tidak mendukung --negotiate-only, keluar." +#: builtin/fetch.c:2102 +msgid "protocol does not support --negotiate-only, exiting" +msgstr "protokol tidak mendukung --negotiate-only, keluar." -#: builtin/fetch.c:2097 +#: builtin/fetch.c:2121 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -15038,11 +15096,11 @@ msgstr "" "--filter hanya dapat digunakan dengan remote yang terkonfigurasi di " "extensions.partialclone" -#: builtin/fetch.c:2101 +#: builtin/fetch.c:2125 msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic hanya dapat digunakan saat mengambil dari satu remote" -#: builtin/fetch.c:2105 +#: builtin/fetch.c:2129 msgid "--stdin can only be used when fetching from one remote" msgstr "--stdin hanya dapat digunakan saat mengambil dari satu remote" @@ -15051,23 +15109,27 @@ msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" -#: builtin/fmt-merge-msg.c:18 +#: builtin/fmt-merge-msg.c:19 msgid "populate log with at most <n> entries from shortlog" msgstr "" -#: builtin/fmt-merge-msg.c:21 +#: builtin/fmt-merge-msg.c:22 msgid "alias for --log (deprecated)" msgstr "" -#: builtin/fmt-merge-msg.c:24 +#: builtin/fmt-merge-msg.c:25 msgid "text" msgstr "" -#: builtin/fmt-merge-msg.c:25 +#: builtin/fmt-merge-msg.c:26 msgid "use <text> as start of message" msgstr "" -#: builtin/fmt-merge-msg.c:26 +#: builtin/fmt-merge-msg.c:28 +msgid "use <name> instead of the real target branch" +msgstr "" + +#: builtin/fmt-merge-msg.c:29 msgid "file to read from" msgstr "" @@ -15087,47 +15149,47 @@ msgstr "" msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" msgstr "" -#: builtin/for-each-ref.c:30 +#: builtin/for-each-ref.c:31 msgid "quote placeholders suitably for shells" msgstr "" -#: builtin/for-each-ref.c:32 +#: builtin/for-each-ref.c:33 msgid "quote placeholders suitably for perl" msgstr "" -#: builtin/for-each-ref.c:34 +#: builtin/for-each-ref.c:35 msgid "quote placeholders suitably for python" msgstr "" -#: builtin/for-each-ref.c:36 +#: builtin/for-each-ref.c:37 msgid "quote placeholders suitably for Tcl" msgstr "" -#: builtin/for-each-ref.c:39 +#: builtin/for-each-ref.c:40 msgid "show only <n> matched refs" msgstr "" -#: builtin/for-each-ref.c:41 builtin/tag.c:481 +#: builtin/for-each-ref.c:42 builtin/tag.c:481 msgid "respect format colors" msgstr "" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:45 msgid "print only refs which points at the given object" msgstr "" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:47 msgid "print only refs that are merged" msgstr "" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:48 msgid "print only refs that are not merged" msgstr "" -#: builtin/for-each-ref.c:48 +#: builtin/for-each-ref.c:49 msgid "print only refs which contain the commit" msgstr "" -#: builtin/for-each-ref.c:49 +#: builtin/for-each-ref.c:50 msgid "print only refs which don't contain the commit" msgstr "" @@ -15278,124 +15340,124 @@ msgstr "%s: objek rusak atau hilang: %s" msgid "%s: object is of unknown type '%s': %s" msgstr "%s: objek bertipe tidak dikenal '%s': %s" -#: builtin/fsck.c:644 +#: builtin/fsck.c:645 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: objek tidak dapat diuraikan: %s" -#: builtin/fsck.c:664 +#: builtin/fsck.c:665 #, c-format msgid "bad sha1 file: %s" msgstr "sha1 berkas jelek: %s" -#: builtin/fsck.c:685 +#: builtin/fsck.c:686 msgid "Checking object directory" msgstr "Memeriksa direktori objek" -#: builtin/fsck.c:688 +#: builtin/fsck.c:689 msgid "Checking object directories" msgstr "Memeriksa direktori objek" -#: builtin/fsck.c:704 +#: builtin/fsck.c:705 #, c-format msgid "Checking %s link" msgstr "Memeriksa tautan %s" -#: builtin/fsck.c:709 builtin/index-pack.c:859 +#: builtin/fsck.c:710 builtin/index-pack.c:859 #, c-format msgid "invalid %s" msgstr "%s tidak valid" -#: builtin/fsck.c:716 +#: builtin/fsck.c:717 #, c-format msgid "%s points to something strange (%s)" msgstr "%s menunjuk ke sesuatu yang aneh (%s)" -#: builtin/fsck.c:722 +#: builtin/fsck.c:723 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: HEAD terpisah tidak menunjuk ke apapun" -#: builtin/fsck.c:726 +#: builtin/fsck.c:727 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "catatan: %s menunjuk ke cabang yang belum lahir (%s)" -#: builtin/fsck.c:738 +#: builtin/fsck.c:739 msgid "Checking cache tree" msgstr "Memeriksa pohon tembolok" -#: builtin/fsck.c:743 +#: builtin/fsck.c:744 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: penunjuk sha1 tidak valid pada pohon tembolok" -#: builtin/fsck.c:752 +#: builtin/fsck.c:753 msgid "non-tree in cache-tree" msgstr "bukan pohon pada pohon tembolok" -#: builtin/fsck.c:783 +#: builtin/fsck.c:784 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<opsi>] [<objek>...]" -#: builtin/fsck.c:789 +#: builtin/fsck.c:790 msgid "show unreachable objects" msgstr "perlihatkan objek yang tak dapat dicapai" -#: builtin/fsck.c:790 +#: builtin/fsck.c:791 msgid "show dangling objects" msgstr "perlihatkan objek teruntai" -#: builtin/fsck.c:791 +#: builtin/fsck.c:792 msgid "report tags" msgstr "laporkan tag" -#: builtin/fsck.c:792 +#: builtin/fsck.c:793 msgid "report root nodes" msgstr "laporkan simpul akar" -#: builtin/fsck.c:793 +#: builtin/fsck.c:794 msgid "make index objects head nodes" msgstr "buat objek indeks simpul kepala" -#: builtin/fsck.c:794 +#: builtin/fsck.c:795 msgid "make reflogs head nodes (default)" msgstr "buat log referensi simpul kepala (asali)" -#: builtin/fsck.c:795 +#: builtin/fsck.c:796 msgid "also consider packs and alternate objects" msgstr "juga pertimbangkan pak dan objek alternatif" -#: builtin/fsck.c:796 +#: builtin/fsck.c:797 msgid "check only connectivity" msgstr "hanya periksa konektivitas" -#: builtin/fsck.c:797 builtin/mktag.c:76 +#: builtin/fsck.c:798 builtin/mktag.c:76 msgid "enable more strict checking" msgstr "aktifkan pemeriksaan lebih ketat" -#: builtin/fsck.c:799 +#: builtin/fsck.c:800 msgid "write dangling objects in .git/lost-found" msgstr "tulis objek teruntai dalam .git/lost-found" -#: builtin/fsck.c:800 builtin/prune.c:134 +#: builtin/fsck.c:801 builtin/prune.c:146 msgid "show progress" msgstr "perlihatkan perkembangan" -#: builtin/fsck.c:801 +#: builtin/fsck.c:802 msgid "show verbose names for reachable objects" msgstr "perlihatkan nama lantung untuk objek yang dapat dicapai" -#: builtin/fsck.c:861 builtin/index-pack.c:261 +#: builtin/fsck.c:862 builtin/index-pack.c:261 msgid "Checking objects" msgstr "Memeriksa objek" -#: builtin/fsck.c:889 +#: builtin/fsck.c:890 #, c-format msgid "%s: object missing" msgstr "%s: objek hilang" -#: builtin/fsck.c:900 +#: builtin/fsck.c:901 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "parameter tidak valid: sha1 diharapkan, dapat '%s'" @@ -15414,17 +15476,12 @@ msgstr "Gagal men-fstat %s: %s" msgid "failed to parse '%s' value '%s'" msgstr "gagal menguraikan nilai '%s' '%s'" -#: builtin/gc.c:487 builtin/init-db.c:57 +#: builtin/gc.c:488 builtin/init-db.c:57 #, c-format msgid "cannot stat '%s'" msgstr "tidak dapat men-stat '%s'" -#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574 -#, c-format -msgid "cannot read '%s'" -msgstr "tidak dapat membaca '%s'" - -#: builtin/gc.c:503 +#: builtin/gc.c:504 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -15439,265 +15496,265 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:551 +#: builtin/gc.c:552 msgid "prune unreferenced objects" msgstr "pangkas objek tak tereferensi" -#: builtin/gc.c:553 +#: builtin/gc.c:554 msgid "be more thorough (increased runtime)" msgstr "jadi lebih cermat (waktu yang dijalankan bertambah)" -#: builtin/gc.c:554 +#: builtin/gc.c:555 msgid "enable auto-gc mode" msgstr "aktifkan mode gc otomatis" -#: builtin/gc.c:557 +#: builtin/gc.c:558 msgid "force running gc even if there may be another gc running" msgstr "paksa jalankan gc bahkan jika mungkin ada gc lain yang berjalan" -#: builtin/gc.c:560 +#: builtin/gc.c:561 msgid "repack all other packs except the largest pack" msgstr "pak ulang semua pak yang lain kecuali pak terbesar" -#: builtin/gc.c:576 +#: builtin/gc.c:577 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "gagal menguraikan nilai gc.logexpiry %s" -#: builtin/gc.c:587 +#: builtin/gc.c:588 #, c-format msgid "failed to parse prune expiry value %s" msgstr "gagal menguraikan nilai pangkas kadaluarsa %s" -#: builtin/gc.c:607 +#: builtin/gc.c:608 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "Mempak otomatis repositori di latar belakang untuk performa optimal.\n" -#: builtin/gc.c:609 +#: builtin/gc.c:610 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Mempak otomatis repositori untuk performa optimal.\n" -#: builtin/gc.c:610 +#: builtin/gc.c:611 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Lihat \"git help gc\" untuk pembenahan manual.\n" -#: builtin/gc.c:650 +#: builtin/gc.c:652 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" "gc sudah berjalan pada mesin '%s' pid %<PRIuMAX> (gunakan --force jika tidak)" -#: builtin/gc.c:705 +#: builtin/gc.c:707 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Ada terlalu banyak objek longgar yang tak dapat dicapai; jalankan 'git " "prune' untuk menghapusnya." -#: builtin/gc.c:715 +#: builtin/gc.c:717 msgid "" "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" msgstr "" "git maintenance run [--auto] [--[no-]quiet] [--task=<tugas>] [--schedule]" -#: builtin/gc.c:745 +#: builtin/gc.c:747 msgid "--no-schedule is not allowed" msgstr "--no-schedule tidak diperbolehkan" -#: builtin/gc.c:750 +#: builtin/gc.c:752 #, c-format msgid "unrecognized --schedule argument '%s'" msgstr "argumen --schedule tidak dikenal '%s'" -#: builtin/gc.c:868 +#: builtin/gc.c:870 msgid "failed to write commit-graph" msgstr "gagal menulis grafik komit" -#: builtin/gc.c:904 +#: builtin/gc.c:906 msgid "failed to prefetch remotes" msgstr "gagal mem-praambil remote" -#: builtin/gc.c:1020 +#: builtin/gc.c:1022 msgid "failed to start 'git pack-objects' process" msgstr "gagal memulai proses 'git pack-objects'" -#: builtin/gc.c:1037 +#: builtin/gc.c:1039 msgid "failed to finish 'git pack-objects' process" msgstr "gagal menyelesaikan proses 'git pack-objects'" -#: builtin/gc.c:1088 +#: builtin/gc.c:1090 msgid "failed to write multi-pack-index" msgstr "gagal menulis indeks multipak" -#: builtin/gc.c:1104 +#: builtin/gc.c:1106 msgid "'git multi-pack-index expire' failed" msgstr "'git multi-pack-index expire' gagal" -#: builtin/gc.c:1163 +#: builtin/gc.c:1165 msgid "'git multi-pack-index repack' failed" msgstr "'git multi-pack-index repack' gagal" -#: builtin/gc.c:1172 +#: builtin/gc.c:1174 msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "" "melewatkan tugas pengepakan tambahan karena core.multiPackIndex dinonaktifkan" -#: builtin/gc.c:1276 +#: builtin/gc.c:1278 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "berkas kunci '%s' ada, melewatkan pemeliharaan" -#: builtin/gc.c:1306 +#: builtin/gc.c:1308 #, c-format msgid "task '%s' failed" msgstr "tugas '%s' gagal" -#: builtin/gc.c:1388 +#: builtin/gc.c:1390 #, c-format msgid "'%s' is not a valid task" msgstr "'%s' bukan tugas yang valid" -#: builtin/gc.c:1393 +#: builtin/gc.c:1395 #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "tugas '%s' tidak dapat dipilih berulang kali" -#: builtin/gc.c:1408 +#: builtin/gc.c:1410 msgid "run tasks based on the state of the repository" msgstr "jalankan tugas berdasarkan keadaan repositori" -#: builtin/gc.c:1409 +#: builtin/gc.c:1411 msgid "frequency" msgstr "frekuensi" -#: builtin/gc.c:1410 +#: builtin/gc.c:1412 msgid "run tasks based on frequency" msgstr "jalankan tugas berdasarkan frekuensi" -#: builtin/gc.c:1413 +#: builtin/gc.c:1415 msgid "do not report progress or other information over stderr" msgstr "" "jangan laporkan perkembangan atau informasi lainnya ke kesalahan standar" -#: builtin/gc.c:1414 +#: builtin/gc.c:1416 msgid "task" msgstr "tugas" -#: builtin/gc.c:1415 +#: builtin/gc.c:1417 msgid "run a specific task" msgstr "jalankan tugas spesifik" -#: builtin/gc.c:1432 +#: builtin/gc.c:1434 msgid "use at most one of --auto and --schedule=<frequency>" msgstr "gunakan paling banyak satu dari --auto dan --schedule=<frekuensi>" -#: builtin/gc.c:1475 +#: builtin/gc.c:1477 msgid "failed to run 'git config'" msgstr "gagal menjalankan 'git config'" -#: builtin/gc.c:1627 +#: builtin/gc.c:1629 #, c-format msgid "failed to expand path '%s'" msgstr "gagal memperluas jalur '%s'" -#: builtin/gc.c:1654 builtin/gc.c:1692 +#: builtin/gc.c:1656 builtin/gc.c:1694 msgid "failed to start launchctl" msgstr "gagal menjalankan launchctl" -#: builtin/gc.c:1767 builtin/gc.c:2220 +#: builtin/gc.c:1769 builtin/gc.c:2237 #, c-format msgid "failed to create directories for '%s'" msgstr "gagal membuat direktori untuk '%s'" -#: builtin/gc.c:1794 +#: builtin/gc.c:1796 #, c-format msgid "failed to bootstrap service %s" msgstr "gagal men-tali-botkan layanan %s" -#: builtin/gc.c:1887 +#: builtin/gc.c:1889 msgid "failed to create temp xml file" msgstr "gagal membuat berkas xml sementara" -#: builtin/gc.c:1977 +#: builtin/gc.c:1979 msgid "failed to start schtasks" msgstr "gagal menjalankan schtasks" -#: builtin/gc.c:2046 +#: builtin/gc.c:2063 msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "" "gagal menjalankan 'crontab -l'; sistem Anda mungkin tidak mendukung 'cron'" -#: builtin/gc.c:2063 +#: builtin/gc.c:2080 msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "" "gagal menjalankan 'crontab'; sistem Anda mungkin tidak mendukung 'cron'" -#: builtin/gc.c:2067 +#: builtin/gc.c:2084 msgid "failed to open stdin of 'crontab'" msgstr "gagal membuka masukan standar dari 'crontab'" -#: builtin/gc.c:2109 +#: builtin/gc.c:2126 msgid "'crontab' died" msgstr "'crontab' mati" -#: builtin/gc.c:2174 +#: builtin/gc.c:2191 msgid "failed to start systemctl" msgstr "gagal memulai systemctl" -#: builtin/gc.c:2184 +#: builtin/gc.c:2201 msgid "failed to run systemctl" msgstr "gagal menjalankan systemctl" -#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62 -#: builtin/worktree.c:945 +#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62 +#: builtin/worktree.c:944 #, c-format msgid "failed to delete '%s'" msgstr "gagal menghapus '%s'" -#: builtin/gc.c:2378 +#: builtin/gc.c:2395 #, c-format msgid "unrecognized --scheduler argument '%s'" msgstr "argumen --scheduler tidak dikenal '%s'" -#: builtin/gc.c:2403 +#: builtin/gc.c:2420 msgid "neither systemd timers nor crontab are available" msgstr "baik pewaktu systemd atau crontab tidak tersedia" -#: builtin/gc.c:2418 +#: builtin/gc.c:2435 #, c-format msgid "%s scheduler is not available" msgstr "penjadwal %s tidak tersedia" -#: builtin/gc.c:2432 +#: builtin/gc.c:2449 msgid "another process is scheduling background maintenance" msgstr "proses lainnya sedang menjadwalkan peme" -#: builtin/gc.c:2454 +#: builtin/gc.c:2471 msgid "git maintenance start [--scheduler=<scheduler>]" msgstr "git maintenance start [--scheduler=<penjadwal>]" -#: builtin/gc.c:2463 +#: builtin/gc.c:2480 msgid "scheduler" msgstr "penjadwal" -#: builtin/gc.c:2464 +#: builtin/gc.c:2481 msgid "scheduler to trigger git maintenance run" msgstr "penjadwal untuk memicu git maintenance run" -#: builtin/gc.c:2478 +#: builtin/gc.c:2495 msgid "failed to add repo to global config" msgstr "gagal menambahkan repositori ke konfigurasi global" -#: builtin/gc.c:2487 +#: builtin/gc.c:2504 msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <subperintah> [<opsi>]" -#: builtin/gc.c:2506 +#: builtin/gc.c:2523 #, c-format msgid "invalid subcommand: %s" msgstr "subperintah tidak valid: %s" @@ -16067,25 +16124,25 @@ msgstr "" msgid "unrecognized help format '%s'" msgstr "format bantuan tidak dikenal '%s'" -#: builtin/help.c:223 +#: builtin/help.c:222 msgid "Failed to start emacsclient." msgstr "gagal menjalankan emacsclient." -#: builtin/help.c:236 +#: builtin/help.c:235 msgid "Failed to parse emacsclient version." msgstr "gagal menguraikan versi emacsclient." -#: builtin/help.c:244 +#: builtin/help.c:243 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "versi emacsclient '%d' terlalu usang (< 22)." -#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302 +#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301 #, c-format msgid "failed to exec '%s'" msgstr "gagal menjalankan '%s'" -#: builtin/help.c:340 +#: builtin/help.c:339 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -16094,7 +16151,7 @@ msgstr "" "'%s': jalur untuk pembaca man yang tidak didukung.\n" "Mohon gunakan 'man.<tool>.cmd' sebagai gantinya." -#: builtin/help.c:352 +#: builtin/help.c:351 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -16103,39 +16160,39 @@ msgstr "" "'%s': cmd untuk pembaca man yang didukung.\n" "Mohon gunakan 'man.<tool>.path' sebagai gantinya." -#: builtin/help.c:467 +#: builtin/help.c:466 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s': pembaca man tidak dikenal" -#: builtin/help.c:483 +#: builtin/help.c:482 msgid "no man viewer handled the request" msgstr "tidak ada pembaca man yang menangani permintaan" -#: builtin/help.c:490 +#: builtin/help.c:489 msgid "no info viewer handled the request" msgstr "tidak ada pembaca info yang menangani permintaan" -#: builtin/help.c:551 builtin/help.c:562 git.c:348 +#: builtin/help.c:550 builtin/help.c:561 git.c:348 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' dialiaskan ke '%s'" -#: builtin/help.c:565 git.c:380 +#: builtin/help.c:564 git.c:380 #, c-format msgid "bad alias.%s string: %s" msgstr "untai alias.%s jelek: %s" -#: builtin/help.c:581 +#: builtin/help.c:580 msgid "this option doesn't take any other arguments" msgstr "opsi ini tidak mengambil argumen lainnya" -#: builtin/help.c:602 builtin/help.c:629 +#: builtin/help.c:601 builtin/help.c:628 #, c-format msgid "usage: %s%s" msgstr "penggunaan: %s%s" -#: builtin/help.c:624 +#: builtin/help.c:623 msgid "'git help config' for more information" msgstr "'git help config' untuk informasi lebih lanjut" @@ -16402,18 +16459,10 @@ msgstr "%s jelek" msgid "unknown hash algorithm '%s'" msgstr "algoritma hash tak dikenal '%s'" -#: builtin/index-pack.c:1848 -msgid "--fix-thin cannot be used without --stdin" -msgstr "--fix-thin tidak dapat digunakan tanpa --stdin" - #: builtin/index-pack.c:1850 msgid "--stdin requires a git repository" msgstr "--stdin memerlukan repositori git" -#: builtin/index-pack.c:1852 -msgid "--object-format cannot be used with --stdin" -msgstr "--object-format tidak dapat digunakan dengan --stdin" - #: builtin/index-pack.c:1867 msgid "--verify with no packfile name given" msgstr "--verify tanpa nama berkas paket diberikan" @@ -16540,10 +16589,6 @@ msgstr "" msgid "specify the hash algorithm to use" msgstr "tentukan algoritma hash yang akan digunakan" -#: builtin/init-db.c:560 -msgid "--separate-git-dir and --bare are mutually exclusive" -msgstr "--separate-git-dir dan --bare saling eksklusif" - #: builtin/init-db.c:591 builtin/init-db.c:596 #, c-format msgid "cannot mkdir %s" @@ -16675,85 +16720,85 @@ msgstr "" msgid "-L<range>:<file> cannot be used with pathspec" msgstr "-L<rentang>:<berkas> tidak dapat digunakan dengan spek jalur" -#: builtin/log.c:306 +#: builtin/log.c:321 #, c-format msgid "Final output: %d %s\n" msgstr "Keluaran terakhir: %d %s\n" -#: builtin/log.c:571 +#: builtin/log.c:586 #, c-format msgid "git show %s: bad file" msgstr "git show %s: berkas jelek" -#: builtin/log.c:586 builtin/log.c:676 +#: builtin/log.c:601 builtin/log.c:691 #, c-format msgid "could not read object %s" msgstr "tidak dapat membaca objek %s" -#: builtin/log.c:701 +#: builtin/log.c:716 #, c-format msgid "unknown type: %d" msgstr "tipe tidak dikenal: %d" -#: builtin/log.c:846 +#: builtin/log.c:861 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s: sampul tidak valid dari mode deskripsi" -#: builtin/log.c:853 +#: builtin/log.c:868 msgid "format.headers without value" msgstr "format.headers tanpa nilai" -#: builtin/log.c:982 +#: builtin/log.c:997 #, c-format msgid "cannot open patch file %s" msgstr "tidak dapat membuka berkas tambalan %s" -#: builtin/log.c:999 +#: builtin/log.c:1014 msgid "need exactly one range" msgstr "butuh tepatnya satu rentang" -#: builtin/log.c:1009 +#: builtin/log.c:1024 msgid "not a range" msgstr "bukan sebuah rentang" -#: builtin/log.c:1173 +#: builtin/log.c:1188 msgid "cover letter needs email format" msgstr "sampul surat butuh format email" -#: builtin/log.c:1179 +#: builtin/log.c:1194 msgid "failed to create cover-letter file" msgstr "gagal membuat berkas sampul surat" -#: builtin/log.c:1266 +#: builtin/log.c:1281 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to gila: %s" -#: builtin/log.c:1293 +#: builtin/log.c:1308 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opsi>] [<sejak> | <rentang revisi>]" -#: builtin/log.c:1351 +#: builtin/log.c:1366 msgid "two output directories?" msgstr "dua direktori keluaran?" -#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342 +#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358 #, c-format msgid "unknown commit %s" msgstr "komit tidak dikenal %s" -#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1528 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "gagal menguraikan '%s' sebagai referensi valid" -#: builtin/log.c:1522 +#: builtin/log.c:1537 msgid "could not find exact merge base" msgstr "tidak dapat menemukan dasar penggabungan eksak" -#: builtin/log.c:1532 +#: builtin/log.c:1547 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -16765,292 +16810,276 @@ msgstr "" "Atau Anda dapat menyebutkan dasar komit secara manual dengan --base=<id " "dasar komit>" -#: builtin/log.c:1555 +#: builtin/log.c:1570 msgid "failed to find exact merge base" msgstr "tidak dapat menemukan dasar penggabungan eksak" -#: builtin/log.c:1572 +#: builtin/log.c:1587 msgid "base commit should be the ancestor of revision list" msgstr "dasar komit seharusnya menjadi leluhur daftar revisi" -#: builtin/log.c:1582 +#: builtin/log.c:1597 msgid "base commit shouldn't be in revision list" msgstr "dasar komit tidak seharusnya dalam daftar revisi" -#: builtin/log.c:1640 +#: builtin/log.c:1655 msgid "cannot get patch id" msgstr "tidak dapat mendapatkan id tambalan" -#: builtin/log.c:1703 +#: builtin/log.c:1718 msgid "failed to infer range-diff origin of current series" msgstr "gagal menduga asal range-diff dari seri saat ini" -#: builtin/log.c:1705 +#: builtin/log.c:1720 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "menggunakan '%s' sebagai asal range-diff dari seri saat ini" -#: builtin/log.c:1749 +#: builtin/log.c:1764 msgid "use [PATCH n/m] even with a single patch" msgstr "gunakan [PATCH n/m] bahkan dengan satu tambalan" -#: builtin/log.c:1752 +#: builtin/log.c:1767 msgid "use [PATCH] even with multiple patches" msgstr "gunakan [PATCH] bahkan dengan banyak tambalan" -#: builtin/log.c:1756 +#: builtin/log.c:1771 msgid "print patches to standard out" msgstr "cetak tambalan ke keluaran standar" -#: builtin/log.c:1758 +#: builtin/log.c:1773 msgid "generate a cover letter" msgstr "buat sampul surat" -#: builtin/log.c:1760 +#: builtin/log.c:1775 msgid "use simple number sequence for output file names" msgstr "gunakan urutan bilangan sederhana untuk keluarkan nama berkas" -#: builtin/log.c:1761 +#: builtin/log.c:1776 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1762 +#: builtin/log.c:1777 msgid "use <sfx> instead of '.patch'" msgstr "gunakan <akhiran> daripada '.patch'" -#: builtin/log.c:1764 +#: builtin/log.c:1779 msgid "start numbering patches at <n> instead of 1" msgstr "mulai menomorkan tambalan pada <n> daripada 1" -#: builtin/log.c:1765 +#: builtin/log.c:1780 msgid "reroll-count" msgstr "" -#: builtin/log.c:1766 +#: builtin/log.c:1781 msgid "mark the series as Nth re-roll" msgstr "tandai seri sebagai gulung ulang ke-N" -#: builtin/log.c:1768 +#: builtin/log.c:1783 msgid "max length of output filename" msgstr "panjang nama berkas keluaran maksimum" -#: builtin/log.c:1770 +#: builtin/log.c:1785 msgid "use [RFC PATCH] instead of [PATCH]" msgstr "gunakan [RFC PATCH] daripada [PATCH]" -#: builtin/log.c:1773 +#: builtin/log.c:1788 msgid "cover-from-description-mode" msgstr "cover-from-description-mode" -#: builtin/log.c:1774 +#: builtin/log.c:1789 msgid "generate parts of a cover letter based on a branch's description" msgstr "buat bagian dari sampul surat berdasarkan deskripsi cabang" -#: builtin/log.c:1776 +#: builtin/log.c:1791 msgid "use [<prefix>] instead of [PATCH]" msgstr "gunakan [<prefix>] daripada [PATCH]" -#: builtin/log.c:1779 +#: builtin/log.c:1794 msgid "store resulting files in <dir>" msgstr "simpan hasil berkas di <direktori>" -#: builtin/log.c:1782 +#: builtin/log.c:1797 msgid "don't strip/add [PATCH]" msgstr "jangan copot/tambah [PATCH]" -#: builtin/log.c:1785 +#: builtin/log.c:1800 msgid "don't output binary diffs" msgstr "jangan keluarkan diff biner" -#: builtin/log.c:1787 +#: builtin/log.c:1802 msgid "output all-zero hash in From header" msgstr "keluarkan hash semua-nol di kepala From" -#: builtin/log.c:1789 +#: builtin/log.c:1804 msgid "don't include a patch matching a commit upstream" msgstr "jangan termasuk tambalan yang cocok dengan komit hulu" -#: builtin/log.c:1791 +#: builtin/log.c:1806 msgid "show patch format instead of default (patch + stat)" msgstr "perlihatkan format tambalan daripada asali (tambalan + stat)" -#: builtin/log.c:1793 +#: builtin/log.c:1808 msgid "Messaging" msgstr "Perpesanan" -#: builtin/log.c:1794 +#: builtin/log.c:1809 msgid "header" msgstr "kepala" -#: builtin/log.c:1795 +#: builtin/log.c:1810 msgid "add email header" msgstr "tambahkan kepala email" -#: builtin/log.c:1796 builtin/log.c:1797 +#: builtin/log.c:1811 builtin/log.c:1812 msgid "email" msgstr "email" -#: builtin/log.c:1796 +#: builtin/log.c:1811 msgid "add To: header" msgstr "tambahkan kepala To:" -#: builtin/log.c:1797 +#: builtin/log.c:1812 msgid "add Cc: header" msgstr "tambahkan kepala Cc:" -#: builtin/log.c:1798 +#: builtin/log.c:1813 msgid "ident" msgstr "ident" -#: builtin/log.c:1799 +#: builtin/log.c:1814 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "setel alamat From ke <identitas> (atau identitas pengkomit jika tidak ada)" -#: builtin/log.c:1801 +#: builtin/log.c:1816 msgid "message-id" msgstr "message-id" -#: builtin/log.c:1802 +#: builtin/log.c:1817 msgid "make first mail a reply to <message-id>" msgstr "buat surat pertama balasan ke <id pesan>" -#: builtin/log.c:1803 builtin/log.c:1806 +#: builtin/log.c:1818 builtin/log.c:1821 msgid "boundary" msgstr "perbatasan" -#: builtin/log.c:1804 +#: builtin/log.c:1819 msgid "attach the patch" msgstr "lampirkan tambalan" -#: builtin/log.c:1807 +#: builtin/log.c:1822 msgid "inline the patch" msgstr "bariskan tambalan" -#: builtin/log.c:1811 +#: builtin/log.c:1826 msgid "enable message threading, styles: shallow, deep" msgstr "aktifkan utasan pesan, gaya: shallow, deep" -#: builtin/log.c:1813 +#: builtin/log.c:1828 msgid "signature" msgstr "tanda tangan" -#: builtin/log.c:1814 +#: builtin/log.c:1829 msgid "add a signature" msgstr "tambah tanda tangan" -#: builtin/log.c:1815 +#: builtin/log.c:1830 msgid "base-commit" msgstr "dasar komit" -#: builtin/log.c:1816 +#: builtin/log.c:1831 msgid "add prerequisite tree info to the patch series" msgstr "tambahkan info pohon prasyarat ke seri tambalan" -#: builtin/log.c:1819 +#: builtin/log.c:1834 msgid "add a signature from a file" msgstr "tambahkan tandatangan dari berkas" -#: builtin/log.c:1820 +#: builtin/log.c:1835 msgid "don't print the patch filenames" msgstr "jangan cetak nama berkas tambalan" -#: builtin/log.c:1822 +#: builtin/log.c:1837 msgid "show progress while generating patches" msgstr "perlihatkan perkembangan ketika membuat tambalan" -#: builtin/log.c:1824 +#: builtin/log.c:1839 msgid "show changes against <rev> in cover letter or single patch" msgstr "" "perlihatkan perubahan terhadap <revisi> di sampul surat atau satu tambalan" -#: builtin/log.c:1827 +#: builtin/log.c:1842 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" "perlihatkan perubahan terhadap <spek referensi> di sampul surat atau satu " "tambalan" -#: builtin/log.c:1829 builtin/range-diff.c:28 +#: builtin/log.c:1844 builtin/range-diff.c:28 msgid "percentage by which creation is weighted" msgstr "persentase dimana pembuatan tertimbang" -#: builtin/log.c:1916 +#: builtin/log.c:1931 #, c-format msgid "invalid ident line: %s" msgstr "baris identitas tidak valid: %s" -#: builtin/log.c:1931 -msgid "-n and -k are mutually exclusive" -msgstr "-n dan -k saling eksklusif" - -#: builtin/log.c:1933 -msgid "--subject-prefix/--rfc and -k are mutually exclusive" -msgstr "--subject-prefix/--rfc dan -k saling eksklusif" - -#: builtin/log.c:1941 +#: builtin/log.c:1956 msgid "--name-only does not make sense" msgstr "--name-only tidak masuk akal" -#: builtin/log.c:1943 +#: builtin/log.c:1958 msgid "--name-status does not make sense" msgstr "--name-status tidak masuk akal" -#: builtin/log.c:1945 +#: builtin/log.c:1960 msgid "--check does not make sense" msgstr "--check tidak masuk akal" -#: builtin/log.c:1967 -msgid "--stdout, --output, and --output-directory are mutually exclusive" -msgstr "--stdout, --output, dan --output-directory saling eksklusif" - -#: builtin/log.c:2089 +#: builtin/log.c:2104 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff butuh --cover-letter atau satu tambalan" -#: builtin/log.c:2093 +#: builtin/log.c:2108 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:2094 +#: builtin/log.c:2109 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff terhadap v%d:" -#: builtin/log.c:2100 -msgid "--creation-factor requires --range-diff" -msgstr "--creation-factor butuh --range-diff" - -#: builtin/log.c:2104 +#: builtin/log.c:2119 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff butuh --cover-letter atau satu tambalan" -#: builtin/log.c:2112 +#: builtin/log.c:2127 msgid "Range-diff:" msgstr "Range-diff:" -#: builtin/log.c:2113 +#: builtin/log.c:2128 #, c-format msgid "Range-diff against v%d:" msgstr "Range-diff terhadap v%d:" -#: builtin/log.c:2124 +#: builtin/log.c:2139 #, c-format msgid "unable to read signature file '%s'" msgstr "tidak dapat membaca berkas tanda tangan '%s'" -#: builtin/log.c:2160 +#: builtin/log.c:2175 msgid "Generating patches" msgstr "Membuat tambalan" -#: builtin/log.c:2204 +#: builtin/log.c:2219 msgid "failed to create output files" msgstr "tidak dapat membuat berkas keluaran" -#: builtin/log.c:2263 +#: builtin/log.c:2279 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<hulu> [<kepala> [<batas>]]]" -#: builtin/log.c:2317 +#: builtin/log.c:2333 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -17058,119 +17087,123 @@ msgstr "" "Tidak dapat menemukan cabang remote terlacak, mohon sebutkan <hulu>\n" "secara manual.\n" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:564 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<opsi>] [<berkas>...]" -#: builtin/ls-files.c:615 +#: builtin/ls-files.c:618 msgid "separate paths with the NUL character" msgstr "pisahkan jalur dengan karakter NUL" -#: builtin/ls-files.c:617 +#: builtin/ls-files.c:620 msgid "identify the file status with tags" msgstr "identifikasi status berkas dengan tag" -#: builtin/ls-files.c:619 +#: builtin/ls-files.c:622 msgid "use lowercase letters for 'assume unchanged' files" msgstr "gunakan huruf kecil untuk berkas 'asumsikan tak berubah'" -#: builtin/ls-files.c:621 +#: builtin/ls-files.c:624 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "gunakan huruf kecil untuk berkas 'fsmonitor bersih'" -#: builtin/ls-files.c:623 +#: builtin/ls-files.c:626 msgid "show cached files in the output (default)" msgstr "perlihatkan berkas tertembolok di dalam keluaran (asali)" -#: builtin/ls-files.c:625 +#: builtin/ls-files.c:628 msgid "show deleted files in the output" msgstr "perlihatkan berkas yang dihapus di dalam keluaran" -#: builtin/ls-files.c:627 +#: builtin/ls-files.c:630 msgid "show modified files in the output" msgstr "perlihatkan berkas yang berubah di dalam keluaran" -#: builtin/ls-files.c:629 +#: builtin/ls-files.c:632 msgid "show other files in the output" msgstr "perlihatkan berkas lainnya di dalam keluaran" -#: builtin/ls-files.c:631 +#: builtin/ls-files.c:634 msgid "show ignored files in the output" msgstr "perlihatkan berkas terabaikan di dalam keluaran" -#: builtin/ls-files.c:634 +#: builtin/ls-files.c:637 msgid "show staged contents' object name in the output" msgstr "perlihatkan nama objek dari konten tergelar di dalam keluaran" -#: builtin/ls-files.c:636 +#: builtin/ls-files.c:639 msgid "show files on the filesystem that need to be removed" msgstr "perlihatkan berkas pada sistem berkas yang perlu dihapus" -#: builtin/ls-files.c:638 +#: builtin/ls-files.c:641 msgid "show 'other' directories' names only" msgstr "hanya perlihatkan nama direktori 'lainnya'" -#: builtin/ls-files.c:640 +#: builtin/ls-files.c:643 msgid "show line endings of files" msgstr "perlihatkan akhiran baris berkas" -#: builtin/ls-files.c:642 +#: builtin/ls-files.c:645 msgid "don't show empty directories" msgstr "jangan perlihatkan direktori kosong" -#: builtin/ls-files.c:645 +#: builtin/ls-files.c:648 msgid "show unmerged files in the output" msgstr "perlihatkan berkas tak tergabung di dalam keluaran" -#: builtin/ls-files.c:647 +#: builtin/ls-files.c:650 msgid "show resolve-undo information" msgstr "perlihatkan informasi resolve-undo" -#: builtin/ls-files.c:649 +#: builtin/ls-files.c:652 msgid "skip files matching pattern" msgstr "lewati berkas yang cocok dengan pola" -#: builtin/ls-files.c:652 +#: builtin/ls-files.c:655 msgid "read exclude patterns from <file>" msgstr "baca pola pengecualian dari <berkas>" -#: builtin/ls-files.c:655 +#: builtin/ls-files.c:658 msgid "read additional per-directory exclude patterns in <file>" msgstr "baca pola pengecualian tambahan per direktor dalam <berkas>" -#: builtin/ls-files.c:657 +#: builtin/ls-files.c:660 msgid "add the standard git exclusions" msgstr "tambahkan pengecualian git standar" -#: builtin/ls-files.c:661 +#: builtin/ls-files.c:664 msgid "make the output relative to the project top directory" msgstr "buat keluaran relatif terhadap direktori puncak proyek" -#: builtin/ls-files.c:664 +#: builtin/ls-files.c:667 msgid "recurse through submodules" msgstr "rekursi melalui submodul" -#: builtin/ls-files.c:666 +#: builtin/ls-files.c:669 msgid "if any <file> is not in the index, treat this as an error" msgstr "" "jika <berkas> apapun tidak berada di indeks, perlakukan sebagai kesalahan" -#: builtin/ls-files.c:667 +#: builtin/ls-files.c:670 msgid "tree-ish" msgstr "mirip-pohon" -#: builtin/ls-files.c:668 +#: builtin/ls-files.c:671 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "berpura-pura bahwa jalur yang dihapus sejak <mirip-pohon> masih ada" -#: builtin/ls-files.c:670 +#: builtin/ls-files.c:673 msgid "show debugging data" msgstr "perlihatkan data penirkutuan" -#: builtin/ls-files.c:672 +#: builtin/ls-files.c:675 msgid "suppress duplicate entries" msgstr "hapus entri duplikat" +#: builtin/ls-files.c:677 +msgid "show sparse directories in the presence of a sparse index" +msgstr "perlihatkan direktori tipis di hadapan indeks tipis" + #: builtin/ls-remote.c:9 msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" @@ -17365,26 +17398,30 @@ msgid "use a diff3 based merge" msgstr "" #: builtin/merge-file.c:37 -msgid "for conflicts, use our version" +msgid "use a zealous diff3 based merge" msgstr "" #: builtin/merge-file.c:39 -msgid "for conflicts, use their version" +msgid "for conflicts, use our version" msgstr "" #: builtin/merge-file.c:41 +msgid "for conflicts, use their version" +msgstr "" + +#: builtin/merge-file.c:43 msgid "for conflicts, use a union version" msgstr "" -#: builtin/merge-file.c:44 +#: builtin/merge-file.c:46 msgid "for conflicts, use this marker size" msgstr "" -#: builtin/merge-file.c:45 +#: builtin/merge-file.c:47 msgid "do not warn about conflicts" msgstr "" -#: builtin/merge-file.c:47 +#: builtin/merge-file.c:49 msgid "set labels for file1/orig-file/file2" msgstr "" @@ -17423,180 +17460,184 @@ msgstr "" msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<opsi>] [<komit>...]" -#: builtin/merge.c:124 +#: builtin/merge.c:125 msgid "switch `m' requires a value" msgstr "tombol `m' butuh sebuah nilai" -#: builtin/merge.c:147 +#: builtin/merge.c:148 #, c-format msgid "option `%s' requires a value" msgstr "opsi `%s' butuh sebuah nilai" -#: builtin/merge.c:200 +#: builtin/merge.c:201 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Tidak dapat menemukan strategi penggabungan '%s'.\n" -#: builtin/merge.c:201 +#: builtin/merge.c:202 #, c-format msgid "Available strategies are:" msgstr "Strategi yang tersedia:" -#: builtin/merge.c:206 +#: builtin/merge.c:207 #, c-format msgid "Available custom strategies are:" msgstr "Strategi kustom yang tersedia:" -#: builtin/merge.c:257 builtin/pull.c:134 +#: builtin/merge.c:258 builtin/pull.c:134 msgid "do not show a diffstat at the end of the merge" msgstr "jangan perlihatkan diffstat pada akhir penggabungan" -#: builtin/merge.c:260 builtin/pull.c:137 +#: builtin/merge.c:261 builtin/pull.c:137 msgid "show a diffstat at the end of the merge" msgstr "perlihatkan diffstat pada akhir penggabungan" -#: builtin/merge.c:261 builtin/pull.c:140 +#: builtin/merge.c:262 builtin/pull.c:140 msgid "(synonym to --stat)" msgstr "(sinonim untuk --stat)" -#: builtin/merge.c:263 builtin/pull.c:143 +#: builtin/merge.c:264 builtin/pull.c:143 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "tambah (paling banyak <n>) entri dari log pendek ke pesan komit penggabungan" -#: builtin/merge.c:266 builtin/pull.c:149 +#: builtin/merge.c:267 builtin/pull.c:149 msgid "create a single commit instead of doing a merge" msgstr "buat satu komit daripada melakukan penggabungan" -#: builtin/merge.c:268 builtin/pull.c:152 +#: builtin/merge.c:269 builtin/pull.c:152 msgid "perform a commit if the merge succeeds (default)" msgstr "lakukan komit jika penggabungan sukses (asali)" -#: builtin/merge.c:270 builtin/pull.c:155 +#: builtin/merge.c:271 builtin/pull.c:155 msgid "edit message before committing" msgstr "sunting pesan sebelum komit" -#: builtin/merge.c:272 +#: builtin/merge.c:273 msgid "allow fast-forward (default)" msgstr "perbolehkan maju cepat (asali)" -#: builtin/merge.c:274 builtin/pull.c:162 +#: builtin/merge.c:275 builtin/pull.c:162 msgid "abort if fast-forward is not possible" msgstr "batalkan jika maju cepat tidak dimungkinkan" -#: builtin/merge.c:278 builtin/pull.c:168 +#: builtin/merge.c:279 builtin/pull.c:168 msgid "verify that the named commit has a valid GPG signature" msgstr "periksa bahwa komit bernama punya tandatangan GPG yang valid" -#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172 +#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172 #: builtin/rebase.c:1117 builtin/revert.c:114 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:280 builtin/pull.c:173 +#: builtin/merge.c:281 builtin/pull.c:173 msgid "merge strategy to use" msgstr "strategi penggabungan yang digunakan" -#: builtin/merge.c:281 builtin/pull.c:176 +#: builtin/merge.c:282 builtin/pull.c:176 msgid "option=value" msgstr "opsi=nilai" -#: builtin/merge.c:282 builtin/pull.c:177 +#: builtin/merge.c:283 builtin/pull.c:177 msgid "option for selected merge strategy" msgstr "opsi untuk strategi penggabungan yang dipilih" -#: builtin/merge.c:284 +#: builtin/merge.c:285 msgid "merge commit message (for a non-fast-forward merge)" msgstr "pesan komit penggabungan (untuk penggabungan bukan maju cepat)" #: builtin/merge.c:291 +msgid "use <name> instead of the real target" +msgstr "gunakan <nama> daripada target sebenarnya" + +#: builtin/merge.c:294 msgid "abort the current in-progress merge" msgstr "batalkan penggabungan yang sedang berlangsung saat ini" -#: builtin/merge.c:293 +#: builtin/merge.c:296 msgid "--abort but leave index and working tree alone" msgstr "--abort tapi biarkan indeks dan pohon kerja" -#: builtin/merge.c:295 +#: builtin/merge.c:298 msgid "continue the current in-progress merge" msgstr "lanjutkan penggabungan yang sedang berlangsung saat ini" -#: builtin/merge.c:297 builtin/pull.c:184 +#: builtin/merge.c:300 builtin/pull.c:184 msgid "allow merging unrelated histories" msgstr "perbolehkan penggabungan riwayat yang tak terkait" -#: builtin/merge.c:304 +#: builtin/merge.c:307 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "lewati kail pre-merge-commit dan commit-msg" -#: builtin/merge.c:321 +#: builtin/merge.c:323 msgid "could not run stash." msgstr "tidak dapat menjalankan stase." -#: builtin/merge.c:326 +#: builtin/merge.c:328 msgid "stash failed" msgstr "stase gagal" -#: builtin/merge.c:331 +#: builtin/merge.c:333 #, c-format msgid "not a valid object: %s" msgstr "bukan objek valid: %s" -#: builtin/merge.c:353 builtin/merge.c:370 +#: builtin/merge.c:355 builtin/merge.c:372 msgid "read-tree failed" msgstr "read-tree gagal" -#: builtin/merge.c:401 +#: builtin/merge.c:403 msgid "Already up to date. (nothing to squash)" msgstr "Sudah diperbarui. (tidak ada yang bisa dilumat)" -#: builtin/merge.c:415 +#: builtin/merge.c:417 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Lumat komit -- tak perbarui HEAD\n" -#: builtin/merge.c:465 +#: builtin/merge.c:467 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Tidak ada pesan komit -- tak perbarui HEAD\n" -#: builtin/merge.c:515 +#: builtin/merge.c:517 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' tidak menunjuk pada sebuah komit" -#: builtin/merge.c:603 +#: builtin/merge.c:605 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Untai branch.%s.mergeoptions jelek: %s" -#: builtin/merge.c:730 +#: builtin/merge.c:732 msgid "Not handling anything other than two heads merge." msgstr "Tak tangani apapun selain penggabungan dua kepala." -#: builtin/merge.c:743 +#: builtin/merge.c:745 #, c-format msgid "unknown strategy option: -X%s" msgstr "opsi strategi tidak dikenal: -X%s" -#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223 +#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223 #, c-format msgid "unable to write %s" msgstr "tidak dapat menulis %s" -#: builtin/merge.c:814 +#: builtin/merge.c:816 #, c-format msgid "Could not read from '%s'" msgstr "Tidak dapat membaca dari '%s'" -#: builtin/merge.c:823 +#: builtin/merge.c:825 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Tak mengkomit penggabungan; gunakan 'git commit' untuk menyelesaikan " "penggabungan.\n" -#: builtin/merge.c:829 +#: builtin/merge.c:831 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -17606,11 +17647,11 @@ msgstr "" "diperlukan, khususnya jika itu menggabungkan hulu terbarui ke cabang\n" "topik.\n" -#: builtin/merge.c:834 +#: builtin/merge.c:836 msgid "An empty message aborts the commit.\n" msgstr "Pesan kosong membatalkan komit.\n" -#: builtin/merge.c:837 +#: builtin/merge.c:839 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -17619,72 +17660,72 @@ msgstr "" "Baris yang diawali dengan '%c' akan diabaikan, dan pesan kosong batalkan\n" "komit.\n" -#: builtin/merge.c:892 +#: builtin/merge.c:894 msgid "Empty commit message." msgstr "Pesan komit kosong" -#: builtin/merge.c:907 +#: builtin/merge.c:909 #, c-format msgid "Wonderful.\n" msgstr "Luar biasa.\n" -#: builtin/merge.c:968 +#: builtin/merge.c:970 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "Penggabungan otomatis gagal; selesaikan konflik lalu komit hasilnya.\n" -#: builtin/merge.c:1007 +#: builtin/merge.c:1009 msgid "No current branch." msgstr "Tidak ada cabang saat ini." -#: builtin/merge.c:1009 +#: builtin/merge.c:1011 msgid "No remote for the current branch." msgstr "Tidak ada remote untuk cabang saat ini." -#: builtin/merge.c:1011 +#: builtin/merge.c:1013 msgid "No default upstream defined for the current branch." msgstr "Tidak ada hulu asali yang ditentukan untuk cabang saat ini." -#: builtin/merge.c:1016 +#: builtin/merge.c:1018 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Tidak ada cabang pelacak remote untuk %s dari %s" -#: builtin/merge.c:1073 +#: builtin/merge.c:1075 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Nilai jelek '%s' dalam lingkungan '%s'" -#: builtin/merge.c:1174 +#: builtin/merge.c:1177 #, c-format msgid "not something we can merge in %s: %s" msgstr "bukan sesuatu yang kami bisa gabungkan di %s: %s" -#: builtin/merge.c:1208 +#: builtin/merge.c:1211 msgid "not something we can merge" msgstr "bukan sesuatu yang kami bisa gabungkan" -#: builtin/merge.c:1321 +#: builtin/merge.c:1324 msgid "--abort expects no arguments" msgstr "--abort harap tanpa argumen" -#: builtin/merge.c:1325 +#: builtin/merge.c:1328 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Tidak ada penggabungan yang bisa dibatalkan (MERGE_HEAD hilang)." -#: builtin/merge.c:1343 +#: builtin/merge.c:1346 msgid "--quit expects no arguments" msgstr "--quit harap tanpa argumen" -#: builtin/merge.c:1356 +#: builtin/merge.c:1359 msgid "--continue expects no arguments" msgstr "--continue harap tanpa argumen" -#: builtin/merge.c:1360 +#: builtin/merge.c:1363 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Tidak ada penggabungan yang sedang berlangsung (MERGE_HEAD hilang)." -#: builtin/merge.c:1376 +#: builtin/merge.c:1379 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17692,7 +17733,7 @@ msgstr "" "Anda belum mengakhiri penggabungan Anda (MERGE_HEAD ada).\n" "Mohon komit perubahan Anda sebelum Anda gabungkan." -#: builtin/merge.c:1383 +#: builtin/merge.c:1386 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17700,85 +17741,77 @@ msgstr "" "Anda belum mengakhiri pemetikan ceri Anda (CHERRY_PICK_HEAD ada).\n" "Mohon komit perubahan Anda sebelum Anda gabungkan." -#: builtin/merge.c:1386 +#: builtin/merge.c:1389 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Anda belum mengakhiri pemetikan ceri Anda (CHERRY_PICK_HEAD ada)." -#: builtin/merge.c:1400 -msgid "You cannot combine --squash with --no-ff." -msgstr "Anda tidak dapat menggabungkan --squash dengan --no-ff." - -#: builtin/merge.c:1402 -msgid "You cannot combine --squash with --commit." -msgstr "Anda tidak dapat menggabungkan --squash dengan --commit" - -#: builtin/merge.c:1418 +#: builtin/merge.c:1421 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "Tidak ada komit yang disebutkan dan merge.defaultToUpstream tidak disetel." -#: builtin/merge.c:1435 +#: builtin/merge.c:1438 msgid "Squash commit into empty head not supported yet" msgstr "Lumat komit ke kepala kosong belum didukung" -#: builtin/merge.c:1437 +#: builtin/merge.c:1440 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Komit nir maju cepat tidak masuk akal ke kepala kosong" -#: builtin/merge.c:1442 +#: builtin/merge.c:1445 #, c-format msgid "%s - not something we can merge" msgstr "%s - bukan sesuatu yang kami bisa gabungkan" -#: builtin/merge.c:1444 +#: builtin/merge.c:1447 msgid "Can merge only exactly one commit into empty head" msgstr "Hanya bisa menggabungkan tepantnya satu komit ke kepala kosong" -#: builtin/merge.c:1531 +#: builtin/merge.c:1534 msgid "refusing to merge unrelated histories" msgstr "menolak menggabungkan riwayat tak terkait" -#: builtin/merge.c:1550 +#: builtin/merge.c:1553 #, c-format msgid "Updating %s..%s\n" msgstr "Memperbarui %s..%s\n" -#: builtin/merge.c:1598 +#: builtin/merge.c:1601 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Mencoba penggabungan dalam indeks yang sangat sepele\n" -#: builtin/merge.c:1605 +#: builtin/merge.c:1608 #, c-format msgid "Nope.\n" msgstr "Tidak.\n" -#: builtin/merge.c:1664 builtin/merge.c:1730 +#: builtin/merge.c:1667 builtin/merge.c:1733 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Memutar ulang pohon ke asli...\n" -#: builtin/merge.c:1668 +#: builtin/merge.c:1671 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Mencoba strategi penggabungan %s...\n" -#: builtin/merge.c:1720 +#: builtin/merge.c:1723 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Tidak ada strategi yang menangani penggabungan.\n" -#: builtin/merge.c:1722 +#: builtin/merge.c:1725 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Penggabungan dengan strategi %s gagal.\n" -#: builtin/merge.c:1732 +#: builtin/merge.c:1735 #, c-format msgid "Using the %s strategy to prepare resolving by hand.\n" msgstr "Menggunakan strategi %s untuk menyiapkan penyelesaian dengan tangan.\n" -#: builtin/merge.c:1746 +#: builtin/merge.c:1749 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -17822,7 +17855,7 @@ msgstr "" msgid "tag on stdin did not refer to a valid object" msgstr "" -#: builtin/mktag.c:104 builtin/tag.c:243 +#: builtin/mktag.c:104 builtin/tag.c:242 msgid "unable to write tag file" msgstr "" @@ -17884,7 +17917,7 @@ msgstr "" msgid "refs snapshot for selecting bitmap commits" msgstr "" -#: builtin/multi-pack-index.c:202 +#: builtin/multi-pack-index.c:206 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -17982,52 +18015,52 @@ msgstr "%s, source=%s, destination=%s" msgid "Renaming %s to %s\n" msgstr "Mengganti nama %s ke %s\n" -#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853 +#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857 #, c-format msgid "renaming '%s' failed" msgstr "gagal mengganti nama '%s'" -#: builtin/name-rev.c:465 +#: builtin/name-rev.c:474 msgid "git name-rev [<options>] <commit>..." msgstr "" -#: builtin/name-rev.c:466 +#: builtin/name-rev.c:475 msgid "git name-rev [<options>] --all" msgstr "" -#: builtin/name-rev.c:467 +#: builtin/name-rev.c:476 msgid "git name-rev [<options>] --stdin" msgstr "" -#: builtin/name-rev.c:524 +#: builtin/name-rev.c:533 msgid "print only ref-based names (no object names)" msgstr "" -#: builtin/name-rev.c:525 +#: builtin/name-rev.c:534 msgid "only use tags to name the commits" msgstr "" -#: builtin/name-rev.c:527 +#: builtin/name-rev.c:536 msgid "only use refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:529 +#: builtin/name-rev.c:538 msgid "ignore refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:531 +#: builtin/name-rev.c:540 msgid "list all commits reachable from all refs" msgstr "" -#: builtin/name-rev.c:532 +#: builtin/name-rev.c:541 msgid "read from stdin" msgstr "" -#: builtin/name-rev.c:533 +#: builtin/name-rev.c:542 msgid "allow to print `undefined` names (default)" msgstr "" -#: builtin/name-rev.c:539 +#: builtin/name-rev.c:548 msgid "dereference tags in the input (internal use)" msgstr "" @@ -18140,25 +18173,25 @@ msgstr "" msgid "Write/edit the notes for the following object:" msgstr "" -#: builtin/notes.c:150 +#: builtin/notes.c:149 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "" -#: builtin/notes.c:154 +#: builtin/notes.c:153 msgid "could not read 'show' output" msgstr "" -#: builtin/notes.c:162 +#: builtin/notes.c:161 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "" -#: builtin/notes.c:195 +#: builtin/notes.c:194 msgid "please supply the note contents using either -m or -F option" msgstr "" -#: builtin/notes.c:204 +#: builtin/notes.c:203 msgid "unable to write note object" msgstr "" @@ -18167,7 +18200,7 @@ msgstr "" msgid "the note contents have been left in %s" msgstr "" -#: builtin/notes.c:240 builtin/tag.c:577 +#: builtin/notes.c:240 builtin/tag.c:581 #, c-format msgid "could not open or read '%s'" msgstr "" @@ -18209,8 +18242,8 @@ msgstr "" #: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507 #: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663 -#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983 -#: builtin/prune-packed.c:25 builtin/tag.c:587 +#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987 +#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591 msgid "too many arguments" msgstr "" @@ -18255,7 +18288,7 @@ msgstr "" msgid "Overwriting existing notes for object %s\n" msgstr "" -#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900 +#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904 #, c-format msgid "Removing note for object %s\n" msgstr "" @@ -18371,17 +18404,17 @@ msgstr "" msgid "unknown -s/--strategy: %s" msgstr "" -#: builtin/notes.c:871 +#: builtin/notes.c:874 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "" -#: builtin/notes.c:874 +#: builtin/notes.c:878 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "" -#: builtin/notes.c:876 +#: builtin/notes.c:880 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -18389,41 +18422,41 @@ msgid "" "abort'.\n" msgstr "" -#: builtin/notes.c:895 builtin/tag.c:590 +#: builtin/notes.c:899 builtin/tag.c:594 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/notes.c:898 +#: builtin/notes.c:902 #, c-format msgid "Object %s has no note\n" msgstr "" -#: builtin/notes.c:910 +#: builtin/notes.c:914 msgid "attempt to remove non-existent note is not an error" msgstr "" -#: builtin/notes.c:913 +#: builtin/notes.c:917 msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147 +#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147 msgid "do not remove, show only" msgstr "" -#: builtin/notes.c:953 +#: builtin/notes.c:957 msgid "report pruned notes" msgstr "" -#: builtin/notes.c:996 +#: builtin/notes.c:1000 msgid "notes-ref" msgstr "" -#: builtin/notes.c:997 +#: builtin/notes.c:1001 msgid "use notes from <notes-ref>" msgstr "" -#: builtin/notes.c:1032 builtin/stash.c:1752 +#: builtin/notes.c:1036 builtin/stash.c:1818 #, c-format msgid "unknown subcommand: %s" msgstr "" @@ -18805,10 +18838,6 @@ msgstr "" msgid "--thin cannot be used to build an indexable pack" msgstr "" -#: builtin/pack-objects.c:4073 -msgid "--keep-unreachable and --unpack-unreachable are incompatible" -msgstr "" - #: builtin/pack-objects.c:4079 msgid "cannot use --filter without --stdout" msgstr "" @@ -18825,7 +18854,7 @@ msgstr "" msgid "Enumerating objects" msgstr "" -#: builtin/pack-objects.c:4181 +#: builtin/pack-objects.c:4180 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -18861,19 +18890,19 @@ msgstr "" msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "" -#: builtin/prune.c:133 +#: builtin/prune.c:145 msgid "report pruned objects" msgstr "" -#: builtin/prune.c:136 +#: builtin/prune.c:148 msgid "expire objects older than <time>" msgstr "" -#: builtin/prune.c:138 +#: builtin/prune.c:150 msgid "limit traversal to objects outside promisor packfiles" msgstr "" -#: builtin/prune.c:151 +#: builtin/prune.c:163 msgid "cannot prune in a precious-objects repo" msgstr "" @@ -18906,7 +18935,7 @@ msgstr "perbolehkan maju cepat" msgid "control use of pre-merge-commit and commit-msg hooks" msgstr "kontrol penggunaan kail pre-merge-commit dan commit-msg" -#: builtin/pull.c:171 parse-options.h:338 +#: builtin/pull.c:171 parse-options.h:340 msgid "automatically stash/stash pop before and after" msgstr "stash/stash pop otomatis sebelum dan sesudah" @@ -18983,6 +19012,7 @@ msgid "<remote>" msgstr "<remote>" #: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487 +#: contrib/scalar/scalar.c:375 msgid "<branch>" msgstr "<cabang>" @@ -19015,13 +19045,13 @@ msgstr "Tidak dapat mengakses komit %s" msgid "ignoring --verify-signatures for rebase" msgstr "mengabaikan --verify-signatures untuk pendasaran ulang" -#: builtin/pull.c:942 +#: builtin/pull.c:969 msgid "" "You have divergent branches and need to specify how to reconcile them.\n" "You can do so by running one of the following commands sometime before\n" "your next pull:\n" "\n" -" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase false # merge\n" " git config pull.rebase true # rebase\n" " git config pull.ff only # fast-forward only\n" "\n" @@ -19036,30 +19066,31 @@ msgstr "" "Anda dapat melakukannya dengan menjalankan salah satu perintah berikut\n" "suatu saat sebelum penarikan berikutnya:\n" "\n" -" git config pull.rebase false # penggabungan (strategi asali)\n" +" git config pull.rebase false # penggabungan\n" " git config pull.rebase true # pendasaran ulang\n" " git config pull.ff only # hanya maju cepat\n" "\n" "Anda dapat mengganti \"git config\" dengan \"git config --global\" untuk\n" -"menyetel pilihan asali untuk semua repositori. Anda juga dapat melewatkan\n" +"menyetel preferensi asali untuk semua repositori. Anda juga dapat " +"melewatkan\n" "--rebase, --no-rebase, atau --ff-only pada baris perintah untuk menimpa\n" "asali terkonfigurasi untuk setiap invokasi.\n" -#: builtin/pull.c:1016 +#: builtin/pull.c:1046 msgid "Updating an unborn branch with changes added to the index." msgstr "" "Memperbarui cabang yang belum lahir dengan perubahan yang ditambahkan ke " "indeks." -#: builtin/pull.c:1020 +#: builtin/pull.c:1050 msgid "pull with rebase" msgstr "tarik dengan pendasaran ulang" -#: builtin/pull.c:1021 +#: builtin/pull.c:1051 msgid "please commit or stash them." msgstr "mohon komit atau stase itu." -#: builtin/pull.c:1046 +#: builtin/pull.c:1076 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -19069,7 +19100,7 @@ msgstr "" "fetch memperbarui kepala cabang saat ini.\n" "memajukan-cepat pohon kerja Anda dari komit %s." -#: builtin/pull.c:1052 +#: builtin/pull.c:1082 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -19086,23 +19117,23 @@ msgstr "" "$ git reset --hard\n" "untuk memulihkan." -#: builtin/pull.c:1067 +#: builtin/pull.c:1097 msgid "Cannot merge multiple branches into empty head." msgstr "Tidak dapat menggabungkan banyak cabang ke kepala kosong." -#: builtin/pull.c:1072 +#: builtin/pull.c:1102 msgid "Cannot rebase onto multiple branches." msgstr "Tidak dapat mendasarkan ulang pada banyak cabang." -#: builtin/pull.c:1074 +#: builtin/pull.c:1104 msgid "Cannot fast-forward to multiple branches." msgstr "Tidak dapat maju cepat ke banyak cabang." -#: builtin/pull.c:1088 +#: builtin/pull.c:1119 msgid "Need to specify how to reconcile divergent branches." msgstr "Perlu sebutkan cara merujukkan cabang yang berlainan." -#: builtin/pull.c:1102 +#: builtin/pull.c:1133 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "tidak dapat mendasarkan ulang dengan modifikasi submodul yang terekam lokal." @@ -19278,7 +19309,7 @@ msgstr "Mendorong ke %s\n" msgid "failed to push some refs to '%s'" msgstr "gagal dorong beberapa referensi ke '%s'" -#: builtin/push.c:544 builtin/submodule--helper.c:3258 +#: builtin/push.c:544 builtin/submodule--helper.c:3259 msgid "repository" msgstr "repositori" @@ -19351,10 +19382,6 @@ msgstr "Tandatangan GPG dorong" msgid "request atomic transaction on remote side" msgstr "minta transaksi atomik pada sisi remote" -#: builtin/push.c:592 -msgid "--delete is incompatible with --all, --mirror and --tags" -msgstr "--delete tidak kompatibel dengan --all, --mirror dan --tags " - #: builtin/push.c:594 msgid "--delete doesn't make sense without any refs" msgstr "--delete tidak masuk akal tanpa referensi" @@ -19386,26 +19413,14 @@ msgstr "" "\n" " git push <nama>\n" -#: builtin/push.c:630 -msgid "--all and --tags are incompatible" -msgstr "--all dan --tags tidak kompatibel" - #: builtin/push.c:632 msgid "--all can't be combined with refspecs" msgstr "--all tidak dapat digabung dengan spek referensi" -#: builtin/push.c:636 -msgid "--mirror and --tags are incompatible" -msgstr "--mirror dan --tags tidak kompatibel" - #: builtin/push.c:638 msgid "--mirror can't be combined with refspecs" msgstr "--mirror tidak dapat digabungkan dengan spek referensi" -#: builtin/push.c:641 -msgid "--all and --mirror are incompatible" -msgstr "--all dan --mirror tidak kompatibel" - #: builtin/push.c:648 msgid "push options must not have new line characters" msgstr "opsi dorong harus tidak ada karakter baris baru" @@ -19829,18 +19844,6 @@ msgstr "Sepertinya 'git am' sedang berjalan. Tidak dapat mendasarkan ulang" msgid "--preserve-merges was replaced by --rebase-merges" msgstr "--preserve-merges digantikan oleh --rebase-merges" -#: builtin/rebase.c:1193 -msgid "cannot combine '--keep-base' with '--onto'" -msgstr "tidak dapat menggabungkan '--keep-base' dengan '--onto'" - -#: builtin/rebase.c:1195 -msgid "cannot combine '--keep-base' with '--root'" -msgstr "tidak dapat menggabungkan '--keep-base' dengan '--root'" - -#: builtin/rebase.c:1199 -msgid "cannot combine '--root' with '--fork-point'" -msgstr "tidak dapat menggabungkan '--root' dengan '--fork-point'" - #: builtin/rebase.c:1202 msgid "No rebase in progress?" msgstr "Tidak ada pendasaran ulang yang sedang berjalan?" @@ -19906,8 +19909,8 @@ msgid "--strategy requires --merge or --interactive" msgstr "--strategy butuh --merge atau --interactive" #: builtin/rebase.c:1463 -msgid "cannot combine apply options with merge options" -msgstr "tidak dapat menggabungkan opsi penerapan dengan opsi penggabungan" +msgid "apply options and merge options cannot be used together" +msgstr "opsi apply dan opsi merge tidak dapat digunakan bersamaan" #: builtin/rebase.c:1476 #, c-format @@ -19948,7 +19951,7 @@ msgid "no such branch/commit '%s'" msgstr "tidak ada cabang/komit seperti '%s'" #: builtin/rebase.c:1618 builtin/submodule--helper.c:39 -#: builtin/submodule--helper.c:2658 +#: builtin/submodule--helper.c:2659 #, c-format msgid "No such ref: %s" msgstr "Tidak ada referensi seperti: %s" @@ -20018,7 +20021,7 @@ msgstr "Maju-cepat %s ke %s.\n" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <direktori git>" -#: builtin/receive-pack.c:1280 +#: builtin/receive-pack.c:1275 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -20047,7 +20050,7 @@ msgstr "" "Untuk mematikan pesan ini dan tetap menjaga kebiasaan asali, setel\n" "variabel konfigurasi 'receive.denyCurrentBranch' ke 'refuse'." -#: builtin/receive-pack.c:1300 +#: builtin/receive-pack.c:1295 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -20067,13 +20070,13 @@ msgstr "" "\n" "Untuk mematikan pesan ini, Anda dapat menyetelnya ke 'refuse'." -#: builtin/receive-pack.c:2480 +#: builtin/receive-pack.c:2474 msgid "quiet" msgstr "diam" -#: builtin/receive-pack.c:2495 -msgid "You must specify a directory." -msgstr "Anda harus menyebutkan sebuah direktori." +#: builtin/receive-pack.c:2489 +msgid "you must specify a directory" +msgstr "Anda harus menyebutkan sebuah direktori" #: builtin/reflog.c:17 msgid "" @@ -20097,41 +20100,41 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "git reflog exists <referensi>" -#: builtin/reflog.c:568 builtin/reflog.c:573 +#: builtin/reflog.c:585 builtin/reflog.c:590 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' bukan stempel waktu valid" -#: builtin/reflog.c:609 +#: builtin/reflog.c:631 #, c-format msgid "Marking reachable objects..." msgstr "Menandai objek yang bisa dicapai..." -#: builtin/reflog.c:647 +#: builtin/reflog.c:675 #, c-format msgid "%s points nowhere!" msgstr "%s tidak menunjuk ke apapun!" -#: builtin/reflog.c:700 +#: builtin/reflog.c:731 msgid "no reflog specified to delete" msgstr "tidak ada log referensi yang disebutkan untuk dihapus" -#: builtin/reflog.c:708 +#: builtin/reflog.c:742 #, c-format msgid "not a reflog: %s" msgstr "bukan sebuah log referensi: %s" -#: builtin/reflog.c:713 +#: builtin/reflog.c:747 #, c-format msgid "no reflog for '%s'" msgstr "tidak ada log referensi untuk '%s'" -#: builtin/reflog.c:759 +#: builtin/reflog.c:794 #, c-format msgid "invalid ref format: %s" msgstr "format referensi tidak valid: %s" -#: builtin/reflog.c:768 +#: builtin/reflog.c:803 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" @@ -20222,6 +20225,11 @@ msgstr "git remote update [<opsi>] [<group> | <remote>]..." msgid "Updating %s" msgstr "Memperbarui %s" +#: builtin/remote.c:101 +#, c-format +msgid "Could not fetch %s" +msgstr "Tidak dapat mengambil %s" + #: builtin/remote.c:131 msgid "" "--mirror is dangerous and deprecated; please\n" @@ -20671,151 +20679,143 @@ msgstr "" msgid "could not start pack-objects to repack promisor objects" msgstr "tidak dapat memulai pack-objects untuk mengepak ulang objek pejanji" -#: builtin/repack.c:273 builtin/repack.c:816 +#: builtin/repack.c:275 builtin/repack.c:820 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "repack: Mengharapkan baris ID objek hex penuh hanya dari pack-objects." -#: builtin/repack.c:297 +#: builtin/repack.c:299 msgid "could not finish pack-objects to repack promisor objects" msgstr "" "tidak dapat menyelesaikan pack-objects untuk mengepak ulang objek pejanji" -#: builtin/repack.c:312 +#: builtin/repack.c:314 #, c-format msgid "cannot open index for %s" msgstr "tidak dapat membuka indeks untuk %s" -#: builtin/repack.c:371 +#: builtin/repack.c:373 #, c-format msgid "pack %s too large to consider in geometric progression" msgstr "pak %s terlalu besar untuk dipertimbangkan dalam deret geometri" -#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416 +#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418 #, c-format msgid "pack %s too large to roll up" msgstr "pak %s terlalu besar untuk digulung" -#: builtin/repack.c:496 +#: builtin/repack.c:498 #, c-format msgid "could not open tempfile %s for writing" msgstr "tidak dapat membuka berkas sementara '%s' untuk ditulis" -#: builtin/repack.c:514 +#: builtin/repack.c:516 msgid "could not close refs snapshot tempfile" msgstr "tidak dapat menutup berkas sementara jepretan referensi" -#: builtin/repack.c:628 +#: builtin/repack.c:630 msgid "pack everything in a single pack" msgstr "pak semuanya dalam satu pak" -#: builtin/repack.c:630 +#: builtin/repack.c:632 msgid "same as -a, and turn unreachable objects loose" msgstr "sama seperti -a, dan jadikan objek yang tak dapat dicapai longgar" -#: builtin/repack.c:633 +#: builtin/repack.c:635 msgid "remove redundant packs, and run git-prune-packed" msgstr "hapus pak berlebihan, dan jalankan git-prune-packed" -#: builtin/repack.c:635 +#: builtin/repack.c:637 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "lewatkan --no-reuse-delta ke git-pack-objects" -#: builtin/repack.c:637 +#: builtin/repack.c:639 msgid "pass --no-reuse-object to git-pack-objects" msgstr "lewatkan --no-reuse-object ke git-pack-objects" -#: builtin/repack.c:639 +#: builtin/repack.c:641 msgid "do not run git-update-server-info" msgstr "jangan jalankan git-update-server-info" -#: builtin/repack.c:642 +#: builtin/repack.c:644 msgid "pass --local to git-pack-objects" msgstr "lewatkan --local ke git-pack-objects" -#: builtin/repack.c:644 +#: builtin/repack.c:646 msgid "write bitmap index" msgstr "tulis indeks bitmap" -#: builtin/repack.c:646 +#: builtin/repack.c:648 msgid "pass --delta-islands to git-pack-objects" msgstr "lewatkan --delta-islands ke git-pack-objects" -#: builtin/repack.c:647 +#: builtin/repack.c:649 msgid "approxidate" msgstr "tanggal aproksimasi" -#: builtin/repack.c:648 +#: builtin/repack.c:650 msgid "with -A, do not loosen objects older than this" msgstr "dengan -A, jangan longgarkan objek lebih lama dari ini" -#: builtin/repack.c:650 +#: builtin/repack.c:652 msgid "with -a, repack unreachable objects" msgstr "dengan -a, pak ulang objek yang tak dapat dicapai" -#: builtin/repack.c:652 +#: builtin/repack.c:654 msgid "size of the window used for delta compression" msgstr "ukuran jendela yang digunakan untuk kompresi delta" -#: builtin/repack.c:653 builtin/repack.c:659 +#: builtin/repack.c:655 builtin/repack.c:661 msgid "bytes" msgstr "bita" -#: builtin/repack.c:654 +#: builtin/repack.c:656 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "sama seperti yang diatas, tetapi batasi penggunaan memori daripada hitungan " "entri" -#: builtin/repack.c:656 +#: builtin/repack.c:658 msgid "limits the maximum delta depth" msgstr "batasi kedalaman delta maksimum" -#: builtin/repack.c:658 +#: builtin/repack.c:660 msgid "limits the maximum number of threads" msgstr "batasi jumlah utas maksimum" -#: builtin/repack.c:660 +#: builtin/repack.c:662 msgid "maximum size of each packfile" msgstr "ukuran maksimum setiap berkas pak" -#: builtin/repack.c:662 +#: builtin/repack.c:664 msgid "repack objects in packs marked with .keep" msgstr "pak ulang objek dalam pak yang ditandai dengan .keep" -#: builtin/repack.c:664 +#: builtin/repack.c:666 msgid "do not repack this pack" msgstr "jangan pak ulang pak ini" -#: builtin/repack.c:666 +#: builtin/repack.c:668 msgid "find a geometric progression with factor <N>" msgstr "temukan deret geometri dengan faktor <N>" -#: builtin/repack.c:668 +#: builtin/repack.c:670 msgid "write a multi-pack index of the resulting packs" msgstr "tulis indeks multipak dari pak yang dihasilkan" -#: builtin/repack.c:678 +#: builtin/repack.c:680 msgid "cannot delete packs in a precious-objects repo" msgstr "tidak dapat menghapus pak dalam repositori objek berharga" -#: builtin/repack.c:682 -msgid "--keep-unreachable and -A are incompatible" -msgstr "--keep-unreachable dan -A tidak kompatibel" - -#: builtin/repack.c:713 -msgid "--geometric is incompatible with -A, -a" -msgstr "--geometric tidak kompatibel dengan -A, -a" - -#: builtin/repack.c:825 +#: builtin/repack.c:829 msgid "Nothing new to pack." msgstr "Tidak ada yang baru untuk dipak." -#: builtin/repack.c:855 +#: builtin/repack.c:859 #, c-format msgid "missing required file: %s" msgstr "berkas yang diperlukan hilang: %s" -#: builtin/repack.c:857 +#: builtin/repack.c:861 #, c-format msgid "could not unlink: %s" msgstr "tidak dapat membatal taut: %s" @@ -20893,169 +20893,163 @@ msgstr "" msgid "unable to open %s for reading" msgstr "" -#: builtin/replace.c:272 +#: builtin/replace.c:271 msgid "unable to spawn mktree" msgstr "" -#: builtin/replace.c:276 +#: builtin/replace.c:275 msgid "unable to read from mktree" msgstr "" -#: builtin/replace.c:285 +#: builtin/replace.c:284 msgid "mktree reported failure" msgstr "" -#: builtin/replace.c:289 +#: builtin/replace.c:288 msgid "mktree did not return an object name" msgstr "" -#: builtin/replace.c:298 +#: builtin/replace.c:297 #, c-format msgid "unable to fstat %s" msgstr "" -#: builtin/replace.c:303 +#: builtin/replace.c:302 msgid "unable to write object to database" msgstr "" -#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 -#: builtin/replace.c:454 -#, c-format -msgid "not a valid object name: '%s'" -msgstr "" - -#: builtin/replace.c:326 +#: builtin/replace.c:325 #, c-format msgid "unable to get object type for %s" msgstr "" -#: builtin/replace.c:342 +#: builtin/replace.c:341 msgid "editing object file failed" msgstr "" -#: builtin/replace.c:351 +#: builtin/replace.c:350 #, c-format msgid "new object is the same as the old one: '%s'" msgstr "" -#: builtin/replace.c:384 +#: builtin/replace.c:383 #, c-format msgid "could not parse %s as a commit" msgstr "" -#: builtin/replace.c:416 +#: builtin/replace.c:415 #, c-format msgid "bad mergetag in commit '%s'" msgstr "" -#: builtin/replace.c:418 +#: builtin/replace.c:417 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "" -#: builtin/replace.c:430 +#: builtin/replace.c:429 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "" -#: builtin/replace.c:469 +#: builtin/replace.c:468 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "" -#: builtin/replace.c:470 +#: builtin/replace.c:469 msgid "the signature will be removed in the replacement commit!" msgstr "" -#: builtin/replace.c:480 +#: builtin/replace.c:479 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "" -#: builtin/replace.c:488 +#: builtin/replace.c:487 #, c-format msgid "graft for '%s' unnecessary" msgstr "" -#: builtin/replace.c:492 +#: builtin/replace.c:491 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "" -#: builtin/replace.c:527 +#: builtin/replace.c:526 #, c-format msgid "" "could not convert the following graft(s):\n" "%s" msgstr "" -#: builtin/replace.c:548 +#: builtin/replace.c:547 msgid "list replace refs" msgstr "" -#: builtin/replace.c:549 +#: builtin/replace.c:548 msgid "delete replace refs" msgstr "" -#: builtin/replace.c:550 +#: builtin/replace.c:549 msgid "edit existing object" msgstr "" -#: builtin/replace.c:551 +#: builtin/replace.c:550 msgid "change a commit's parents" msgstr "" -#: builtin/replace.c:552 +#: builtin/replace.c:551 msgid "convert existing graft file" msgstr "" -#: builtin/replace.c:553 +#: builtin/replace.c:552 msgid "replace the ref if it exists" msgstr "" -#: builtin/replace.c:555 +#: builtin/replace.c:554 msgid "do not pretty-print contents for --edit" msgstr "" -#: builtin/replace.c:556 +#: builtin/replace.c:555 msgid "use this format" msgstr "" -#: builtin/replace.c:569 +#: builtin/replace.c:568 msgid "--format cannot be used when not listing" msgstr "" -#: builtin/replace.c:577 +#: builtin/replace.c:576 msgid "-f only makes sense when writing a replacement" msgstr "" -#: builtin/replace.c:581 +#: builtin/replace.c:580 msgid "--raw only makes sense with --edit" msgstr "" -#: builtin/replace.c:587 +#: builtin/replace.c:586 msgid "-d needs at least one argument" msgstr "" -#: builtin/replace.c:593 +#: builtin/replace.c:592 msgid "bad number of arguments" msgstr "" -#: builtin/replace.c:599 +#: builtin/replace.c:598 msgid "-e needs exactly one argument" msgstr "" -#: builtin/replace.c:605 +#: builtin/replace.c:604 msgid "-g needs at least one argument" msgstr "" -#: builtin/replace.c:611 +#: builtin/replace.c:610 msgid "--convert-graft-file takes no argument" msgstr "" -#: builtin/replace.c:617 +#: builtin/replace.c:616 msgid "only one pattern can be given with -l" msgstr "" @@ -21076,132 +21070,124 @@ msgstr "" msgid "unable to generate diff for '%s'" msgstr "" -#: builtin/reset.c:32 +#: builtin/reset.c:33 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<komit>]" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." msgstr "git reset [-q] [<mirip-pohon>] [--] <spek jalur>..." -#: builtin/reset.c:34 +#: builtin/reset.c:35 msgid "" "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" msgstr "" "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<mirip-pohon>]" -#: builtin/reset.c:35 +#: builtin/reset.c:36 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" msgstr "git reset --patch [<mirip-pohon>] [--] [<pathspec>...]" -#: builtin/reset.c:41 +#: builtin/reset.c:42 msgid "mixed" msgstr "campuran" -#: builtin/reset.c:41 +#: builtin/reset.c:42 msgid "soft" msgstr "lunak" -#: builtin/reset.c:41 +#: builtin/reset.c:42 msgid "hard" msgstr "keras" -#: builtin/reset.c:41 +#: builtin/reset.c:42 msgid "merge" msgstr "gabungan" -#: builtin/reset.c:41 +#: builtin/reset.c:42 msgid "keep" msgstr "simpan" -#: builtin/reset.c:89 +#: builtin/reset.c:90 msgid "You do not have a valid HEAD." msgstr "Anda tidak punya HEAD yang valid." -#: builtin/reset.c:91 +#: builtin/reset.c:92 msgid "Failed to find tree of HEAD." msgstr "Gagal menemukan pohon HEAD." -#: builtin/reset.c:97 +#: builtin/reset.c:98 #, c-format msgid "Failed to find tree of %s." msgstr "Gagal menemukan pohon dari %s." -#: builtin/reset.c:122 +#: builtin/reset.c:123 #, c-format msgid "HEAD is now at %s" msgstr "HEAD sekarang pada %s" -#: builtin/reset.c:201 +#: builtin/reset.c:299 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Tidak dapat lakukan reset %s di tengah-tengah penggabungan." -#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679 -#: builtin/stash.c:703 +#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680 +#: builtin/stash.c:704 msgid "be quiet, only report errors" msgstr "diam, hanya laporkan kesalahan" -#: builtin/reset.c:303 +#: builtin/reset.c:398 msgid "reset HEAD and index" msgstr "setel ulang HEAD dan indeks" -#: builtin/reset.c:304 +#: builtin/reset.c:399 msgid "reset only HEAD" msgstr "hanya setel ulang HEAD" -#: builtin/reset.c:306 builtin/reset.c:308 +#: builtin/reset.c:401 builtin/reset.c:403 msgid "reset HEAD, index and working tree" msgstr "setel ulang HEAD, indeks dan pohon kerja" -#: builtin/reset.c:310 +#: builtin/reset.c:405 msgid "reset HEAD but keep local changes" msgstr "setel ulang HEAD tapi simpan perubahan lokal" -#: builtin/reset.c:316 +#: builtin/reset.c:411 msgid "record only the fact that removed paths will be added later" msgstr "hanya rekam fakta bahwa jalur yang terhapus akan ditambahkan nanti" -#: builtin/reset.c:350 +#: builtin/reset.c:445 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Gagal menguraikan '%s' sebagai revisi yang valid." -#: builtin/reset.c:358 +#: builtin/reset.c:453 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Gagal menguraikan '%s' sebagaikan pohon yang valid." -#: builtin/reset.c:367 -msgid "--patch is incompatible with --{hard,mixed,soft}" -msgstr "--patch tidak kompatibel dengan --{hard,mixed,soft}" - -#: builtin/reset.c:377 +#: builtin/reset.c:472 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed dengan jalur usang; sebagai gantinya gunakan 'git reset --<jalur>'." -#: builtin/reset.c:379 +#: builtin/reset.c:474 #, c-format msgid "Cannot do %s reset with paths." msgstr "Tidak dapat lakukan reset %s dengan jalur." -#: builtin/reset.c:394 +#: builtin/reset.c:489 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "Reset %s tidak diperbolehkan dalam repositori bare" -#: builtin/reset.c:398 -msgid "-N can only be used with --mixed" -msgstr "-N hanya dapat digunakan dengan --mixed" - -#: builtin/reset.c:419 +#: builtin/reset.c:520 msgid "Unstaged changes after reset:" msgstr "Perubahan tak tergelar setelah setel ulang:" -#: builtin/reset.c:422 +#: builtin/reset.c:523 #, c-format msgid "" "\n" @@ -21214,19 +21200,15 @@ msgstr "" "Anda dapat menggunakan '--quiet' untuk hindari hal ini. Setel konfigurasi\n" "reset.quiet ke true untuk membuat hal tersebut asali.\n" -#: builtin/reset.c:440 +#: builtin/reset.c:541 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Tidak dapat menyetel ulang berkas indeks ke revisi '%s'." -#: builtin/reset.c:445 +#: builtin/reset.c:546 msgid "Could not write new index file." msgstr "Tidak dapat menulis berkas indeks baru." -#: builtin/rev-list.c:541 -msgid "cannot combine --exclude-promisor-objects and --missing" -msgstr "tidak dapat menggabungkan --exclude-promisor-objects dan --missing" - #: builtin/rev-list.c:602 msgid "object filtering requires --objects" msgstr "penyaringan objek memerlukan --objects" @@ -21236,8 +21218,9 @@ msgid "rev-list does not support display of notes" msgstr "rev-list tidak mendukung penampilan catatan" #: builtin/rev-list.c:679 -msgid "marked counting is incompatible with --objects" -msgstr "penghitungan tertanda tidak kompatibel dengan --objects" +#, c-format +msgid "marked counting and '%s' cannot be used together" +msgstr "hitungan tertanda dan '%s' tidak dapat digunakan bersamaan." #: builtin/rev-parse.c:409 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" @@ -21679,13 +21662,6 @@ msgstr "<n>[,<dasar>]" msgid "show <n> most recent ref-log entries starting at base" msgstr "perlihatkan <n> entri ref-log terkini dimulai dari dasar" -#: builtin/show-branch.c:710 -msgid "" -"--reflog is incompatible with --all, --remotes, --independent or --merge-base" -msgstr "" -"--reflog tidak kompatibel dengan --all, --remotes, --independent atau --" -"merge-base" - #: builtin/show-branch.c:734 msgid "no branches given, and HEAD is not valid" msgstr "tidak ada cabang yang diberikan, dan HEAD tidak valid" @@ -21706,19 +21682,19 @@ msgstr[1] "hanya %d entri yang bisa diperlihatkan pada satu waktu." msgid "no such ref %s" msgstr "tidak ada referensi seperti %s" -#: builtin/show-branch.c:828 +#: builtin/show-branch.c:830 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "tidak dapat menangani lebih dari %d revisi." msgstr[1] "tidak dapat menangani lebih dari %d revisi." -#: builtin/show-branch.c:832 +#: builtin/show-branch.c:834 #, c-format msgid "'%s' is not a valid ref." msgstr "'%s' bukan sebuah referensi yang valid." -#: builtin/show-branch.c:835 +#: builtin/show-branch.c:837 #, c-format msgid "cannot find commit %s (%s)" msgstr "tidak dapat menemukan komit %s (%s)" @@ -21779,94 +21755,122 @@ msgstr "" #: builtin/sparse-checkout.c:22 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" -msgstr "" +msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <opsi>" #: builtin/sparse-checkout.c:46 msgid "git sparse-checkout list" -msgstr "" +msgstr "git sparse-checkout list" + +#: builtin/sparse-checkout.c:60 +msgid "this worktree is not sparse" +msgstr "pohon kerja ini bukan tipis" -#: builtin/sparse-checkout.c:72 +#: builtin/sparse-checkout.c:75 msgid "this worktree is not sparse (sparse-checkout file may not exist)" -msgstr "" +msgstr "pohon kerja ini bukan tipis (berkas sparse-checkout mungkin tidak ada)" -#: builtin/sparse-checkout.c:173 +#: builtin/sparse-checkout.c:176 #, c-format msgid "" "directory '%s' contains untracked files, but is not in the sparse-checkout " "cone" msgstr "" +"directori '%s' berisi berkas tak teracak, tapi tidak di dalam kerucut " +"sparse-checkout" -#: builtin/sparse-checkout.c:181 +#: builtin/sparse-checkout.c:184 #, c-format msgid "failed to remove directory '%s'" -msgstr "" +msgstr "gagal menghapus direktori '%s'" -#: builtin/sparse-checkout.c:321 +#: builtin/sparse-checkout.c:324 msgid "failed to create directory for sparse-checkout file" -msgstr "" +msgstr "gagal membuat direktori untuk berkas sparse-checkout" -#: builtin/sparse-checkout.c:362 +#: builtin/sparse-checkout.c:365 msgid "unable to upgrade repository format to enable worktreeConfig" -msgstr "" +msgstr "gagal mengupgrade format repositori untuk mengaktifkan worktreeConfig" -#: builtin/sparse-checkout.c:364 +#: builtin/sparse-checkout.c:367 msgid "failed to set extensions.worktreeConfig setting" -msgstr "" +msgstr "gagal menyetel setelan extensions.worktreeConfig" + +#: builtin/sparse-checkout.c:411 +msgid "failed to modify sparse-index config" +msgstr "gagal memodifikasi konfigurasi sparse-index" -#: builtin/sparse-checkout.c:384 +#: builtin/sparse-checkout.c:422 msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]" -msgstr "" +msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]" -#: builtin/sparse-checkout.c:404 +#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729 +#: builtin/sparse-checkout.c:778 msgid "initialize the sparse-checkout in cone mode" -msgstr "" +msgstr "inisialisasi checkout tipis dalam mode kerucut" -#: builtin/sparse-checkout.c:406 +#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731 +#: builtin/sparse-checkout.c:780 msgid "toggle the use of a sparse index" -msgstr "" +msgstr "gunakan indeks tipis" -#: builtin/sparse-checkout.c:434 -msgid "failed to modify sparse-index config" -msgstr "" - -#: builtin/sparse-checkout.c:455 +#: builtin/sparse-checkout.c:476 #, c-format msgid "failed to open '%s'" -msgstr "" +msgstr "gagal membuka '%s'" -#: builtin/sparse-checkout.c:507 +#: builtin/sparse-checkout.c:528 #, c-format msgid "could not normalize path %s" -msgstr "" - -#: builtin/sparse-checkout.c:519 -msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" -msgstr "" +msgstr "tidak dapat menormalkan jalur %s" -#: builtin/sparse-checkout.c:544 +#: builtin/sparse-checkout.c:557 #, c-format msgid "unable to unquote C-style string '%s'" -msgstr "" +msgstr "tidak dapat membatal-kutip untai gaya C '%s'" -#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622 +#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640 msgid "unable to load existing sparse-checkout patterns" -msgstr "" +msgstr "tidak dapat memuat pola checkout tipis yang sudah ada" -#: builtin/sparse-checkout.c:667 -msgid "read patterns from standard in" -msgstr "" +#: builtin/sparse-checkout.c:616 +msgid "existing sparse-checkout patterns do not use cone mode" +msgstr "pola checkout tipis yang sudah ada tidak menggunakan mode kerucut" #: builtin/sparse-checkout.c:682 -msgid "git sparse-checkout reapply" +msgid "git sparse-checkout add (--stdin | <patterns>)" +msgstr "git sparse-checkout add (--stdin | <pola>)" + +#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733 +msgid "read patterns from standard in" +msgstr "baca pola dari masukan standar" + +#: builtin/sparse-checkout.c:699 +msgid "no sparse-checkout to add to" +msgstr "tidak ada checkout tipis untuk ditambahkan" + +#: builtin/sparse-checkout.c:712 +msgid "" +"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | " +"<patterns>)" msgstr "" +"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | " +"<pola>)" + +#: builtin/sparse-checkout.c:765 +msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]" +msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]" -#: builtin/sparse-checkout.c:701 +#: builtin/sparse-checkout.c:785 +msgid "must be in a sparse-checkout to reapply sparsity patterns" +msgstr "harus berada di dalam checkout tipis untuk menerapkan ulang pola kejarangan" + +#: builtin/sparse-checkout.c:803 msgid "git sparse-checkout disable" -msgstr "" +msgstr "git sparse-checkout disable" -#: builtin/sparse-checkout.c:732 +#: builtin/sparse-checkout.c:845 msgid "error while refreshing working directory" -msgstr "" +msgstr "kesalahan saat menyegarkan direktori kerja" #: builtin/stash.c:24 builtin/stash.c:40 msgid "git stash list [<options>]" @@ -21890,23 +21894,25 @@ msgstr "git stash branch <nama cabang> [<stase>]" #: builtin/stash.c:30 msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" +"quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <pesan>]\n" -" [--pathspec-from-file=<berkas> [--pathspec-file-nul]]\n" -" [--] [<spek jalur>...]]" +"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index]\n" +" [-q|--quiet] [-u|--include-untracked] [-a|--all]\n" +" [-m|--message <pesan>] [--pathspec-from-file=<berkas>\n" +" [--pathspec-file-nul]] [--] [<spek jalur>...]]" #: builtin/stash.c:34 msgid "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" +"quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" msgstr "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<pesan>]" +"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index]\n" +" [-q|--quiet] [-u|--include-untracked] [-a|--all] [<pesan>]" #: builtin/stash.c:55 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" @@ -21999,142 +22005,160 @@ msgstr "Menggabungkan %s dengan %s" msgid "Index was not unstashed." msgstr "Indeks tak dibatal-stasekan." -#: builtin/stash.c:575 +#: builtin/stash.c:576 msgid "could not restore untracked files from stash" msgstr "tidak dapat mengembalikan berkas tak terlacak dari stase" -#: builtin/stash.c:607 builtin/stash.c:705 +#: builtin/stash.c:608 builtin/stash.c:706 msgid "attempt to recreate the index" msgstr "coba membuat ulang indeks" -#: builtin/stash.c:651 +#: builtin/stash.c:652 #, c-format msgid "Dropped %s (%s)" msgstr "%s (%s) dijatuhkan" -#: builtin/stash.c:654 +#: builtin/stash.c:655 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: Tidak dapat menjatuhkan entri stase" -#: builtin/stash.c:667 +#: builtin/stash.c:668 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' bukan referensi stase" -#: builtin/stash.c:717 +#: builtin/stash.c:718 msgid "The stash entry is kept in case you need it again." msgstr "Entri stase disimpan jika Anda butuh itu lagi." -#: builtin/stash.c:740 +#: builtin/stash.c:741 msgid "No branch name specified" msgstr "Tidak ada nama cabang yang disebutkan" -#: builtin/stash.c:824 +#: builtin/stash.c:825 msgid "failed to parse tree" msgstr "gagal menguraikan pohon" -#: builtin/stash.c:835 +#: builtin/stash.c:836 msgid "failed to unpack trees" msgstr "gagal membongkar pohon" -#: builtin/stash.c:855 +#: builtin/stash.c:856 msgid "include untracked files in the stash" msgstr "masukkan berkas tak terlacak ke dalam stase" -#: builtin/stash.c:858 +#: builtin/stash.c:859 msgid "only show untracked files in the stash" msgstr "hanya perlihatkan berkas tak terlacak dalam stase" -#: builtin/stash.c:945 builtin/stash.c:982 +#: builtin/stash.c:946 builtin/stash.c:983 #, c-format msgid "Cannot update %s with %s" msgstr "Tidak dapat memperbarui %s dengan %s" -#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684 +#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750 msgid "stash message" msgstr "pesan stase" -#: builtin/stash.c:973 +#: builtin/stash.c:974 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" butuh satu argumen <komit>" -#: builtin/stash.c:1187 +#: builtin/stash.c:1159 +msgid "No staged changes" +msgstr "Tidak ada perubahan yang tergelar" + +#: builtin/stash.c:1220 msgid "No changes selected" msgstr "Tidak ada perubahan yang dipilih" -#: builtin/stash.c:1287 +#: builtin/stash.c:1320 msgid "You do not have the initial commit yet" msgstr "Anda belum punya komit awal" -#: builtin/stash.c:1314 +#: builtin/stash.c:1347 msgid "Cannot save the current index state" msgstr "Tidak dapat menyimpan keadaan indeks saat ini" -#: builtin/stash.c:1323 +#: builtin/stash.c:1356 msgid "Cannot save the untracked files" msgstr "Tidak dapat menyimpan berkas tak terlacak" -#: builtin/stash.c:1334 builtin/stash.c:1343 +#: builtin/stash.c:1367 builtin/stash.c:1386 msgid "Cannot save the current worktree state" msgstr "Tidak dapat menyimpang keadaan pohon kerja saat ini" -#: builtin/stash.c:1371 +#: builtin/stash.c:1377 +msgid "Cannot save the current staged state" +msgstr "Tidak dapat menyimpan keadaan tergelar saat ini" + +#: builtin/stash.c:1414 msgid "Cannot record working tree state" msgstr "Tidak dapat merekam keadaan pohon kerja" -#: builtin/stash.c:1420 +#: builtin/stash.c:1463 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" "Tidak dapat menggunakan --patch dan --include-untracked atau --all pada " "waktu yang bersamaan" -#: builtin/stash.c:1438 +#: builtin/stash.c:1474 +msgid "Can't use --staged and --include-untracked or --all at the same time" +msgstr "" +"Tidak dapat menggunakan --staged dan --include-untracked atau --all pada " +"waktu yang bersamaan" + +#: builtin/stash.c:1492 msgid "Did you forget to 'git add'?" msgstr "Anda lupa untuk 'git add'?" -#: builtin/stash.c:1453 +#: builtin/stash.c:1507 msgid "No local changes to save" msgstr "Tidak ada perubahan lokal untuk disimpan" -#: builtin/stash.c:1460 +#: builtin/stash.c:1514 msgid "Cannot initialize stash" msgstr "Tidak dapat menginisialisasi stase" -#: builtin/stash.c:1475 +#: builtin/stash.c:1529 msgid "Cannot save the current status" msgstr "Tidak dapat menyimpan status saat ini" -#: builtin/stash.c:1480 +#: builtin/stash.c:1534 #, c-format msgid "Saved working directory and index state %s" msgstr "Direktori kerja dan keadaan indeks %s disimpan" -#: builtin/stash.c:1571 +#: builtin/stash.c:1627 msgid "Cannot remove worktree changes" msgstr "Tidak dapat menghapus perubahaan pohon kerja" -#: builtin/stash.c:1610 builtin/stash.c:1675 +#: builtin/stash.c:1667 builtin/stash.c:1739 msgid "keep index" msgstr "jaga indeks" -#: builtin/stash.c:1612 builtin/stash.c:1677 +#: builtin/stash.c:1669 builtin/stash.c:1741 +msgid "stash staged changes only" +msgstr "hanya stase perubahan tergelar" + +#: builtin/stash.c:1671 builtin/stash.c:1743 msgid "stash in patch mode" msgstr "stase dalam mode tambalan" -#: builtin/stash.c:1613 builtin/stash.c:1678 +#: builtin/stash.c:1672 builtin/stash.c:1744 msgid "quiet mode" msgstr "mode hening" -#: builtin/stash.c:1615 builtin/stash.c:1680 +#: builtin/stash.c:1674 builtin/stash.c:1746 msgid "include untracked files in stash" msgstr "masukkan berkas tak terlacak ke dalam stase" -#: builtin/stash.c:1617 builtin/stash.c:1682 +#: builtin/stash.c:1676 builtin/stash.c:1748 msgid "include ignore files" msgstr "masukkan berkas ignore" -#: builtin/stash.c:1717 +#: builtin/stash.c:1783 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -22158,7 +22182,7 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "" -#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667 +#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Mengharapkan nama referensi penuh, dapat %s" @@ -22181,7 +22205,7 @@ msgstr "" "tidak dapat mencari konfigurasi '%s'. Asumsi bahwa repositori ini adalah " "hulu otoritatif tersendiri." -#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858 +#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859 msgid "alternative anchor for relative paths" msgstr "jangkar alternatif untuk jalur relatif" @@ -22277,7 +22301,7 @@ msgstr "tidak dapat menguraikan referensi HEAD di dalam submodul '%s'" msgid "failed to recurse into submodule '%s'" msgstr "gagal merekursi ke dalam submodul '%s'" -#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589 +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590 msgid "suppress submodule status output" msgstr "sembunyikan keluaran status submodul" @@ -22346,10 +22370,6 @@ msgstr "git submodule--helper summary [<opsi>] [<commit>] -- [<jalur>]" msgid "could not fetch a revision for HEAD" msgstr "tidak dapat mengambil revisi untuk HEAD" -#: builtin/submodule--helper.c:1316 -msgid "--cached and --files are mutually exclusive" -msgstr "--cached dan --files saling eksklusif" - #: builtin/submodule--helper.c:1373 #, c-format msgid "Synchronizing submodule url for '%s'\n" @@ -22378,16 +22398,16 @@ msgstr "sembunyikan keluaran mensinkronisasi url submodul" msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<jalur>]" -#: builtin/submodule--helper.c:1512 +#: builtin/submodule--helper.c:1508 #, c-format msgid "" -"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " -"really want to remove it including all of its history)" +"Submodule work tree '%s' contains a .git directory. This will be replaced " +"with a .git file by using absorbgitdirs." msgstr "" -"Pohon kerja submodul '%s' berisi direktori .git (gunakan 'rm -rf' bila Anda " -"benar-benar ingin menghapus itu termasuk semua riwayatnya)" +"Pohon kerja submodul '%s' berisi direktori .git. Ini akan diganti dengan " +"berkas .git oleh dengan menggunakan absorbgitdirs." -#: builtin/submodule--helper.c:1524 +#: builtin/submodule--helper.c:1525 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -22396,46 +22416,46 @@ msgstr "" "Pohon kerja submodul '%s' berisi modifikasi lokal; gunakan '-f' untuk " "menyingkirkan itu" -#: builtin/submodule--helper.c:1532 +#: builtin/submodule--helper.c:1533 #, c-format msgid "Cleared directory '%s'\n" msgstr "Direktori '%s' dibersihkan\n" -#: builtin/submodule--helper.c:1534 +#: builtin/submodule--helper.c:1535 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Tidak dapat menghapus pohon kerja submodul '%s'\n" -#: builtin/submodule--helper.c:1545 +#: builtin/submodule--helper.c:1546 #, c-format msgid "could not create empty submodule directory %s" msgstr "tidak dapat membuat direktori submodul kosong %s" -#: builtin/submodule--helper.c:1561 +#: builtin/submodule--helper.c:1562 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Submodul '%s' (%s) tak terdaftar untuk jalur '%s'\n" -#: builtin/submodule--helper.c:1590 +#: builtin/submodule--helper.c:1591 msgid "remove submodule working trees even if they contain local changes" msgstr "hapus pohon kerja submodul bahkan jika itu berisi perubahan lokal" -#: builtin/submodule--helper.c:1591 +#: builtin/submodule--helper.c:1592 msgid "unregister all submodules" msgstr "batal daftar semua submodul" -#: builtin/submodule--helper.c:1596 +#: builtin/submodule--helper.c:1597 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<jalur>...]]" -#: builtin/submodule--helper.c:1610 +#: builtin/submodule--helper.c:1611 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" "Gunakan '--all' jika Anda benar-benar ingin deinisialisasi semua submodul" -#: builtin/submodule--helper.c:1655 +#: builtin/submodule--helper.c:1656 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" @@ -22447,68 +22467,68 @@ msgstr "" " itu, setel submodule.alternateErrorStrategy ke 'info' atau yang sama,\n" "kloning degan '--reference-if-able' daripada '--reference'." -#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703 +#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "submodul '%s' tidak dapat menambahkan pengganti: %s" -#: builtin/submodule--helper.c:1739 +#: builtin/submodule--helper.c:1740 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Nilai '%s' untuk submodule.alternateErrorStrategy tidak dikenal" -#: builtin/submodule--helper.c:1746 +#: builtin/submodule--helper.c:1747 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Nilai '%s' untuk submodule.alternateLocation tidak dikenal" -#: builtin/submodule--helper.c:1771 +#: builtin/submodule--helper.c:1772 #, c-format msgid "refusing to create/use '%s' in another submodule's git dir" msgstr "" "menolak membuat/menggunakan '%s' di dalam direktori git submodul yang lain" -#: builtin/submodule--helper.c:1812 +#: builtin/submodule--helper.c:1813 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "gagal mengkloning '%s' ke dalam jalur submodul '%s'" -#: builtin/submodule--helper.c:1817 +#: builtin/submodule--helper.c:1818 #, c-format msgid "directory not empty: '%s'" msgstr "direktori tidak kosong: '%s'" -#: builtin/submodule--helper.c:1829 +#: builtin/submodule--helper.c:1830 #, c-format msgid "could not get submodule directory for '%s'" msgstr "tidak dapat mendapatkan direktori submodul untuk '%s'" -#: builtin/submodule--helper.c:1861 +#: builtin/submodule--helper.c:1862 msgid "where the new submodule will be cloned to" msgstr "di mana submodul baru akan dikloning" -#: builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:1865 msgid "name of the new submodule" msgstr "nama submodul baru" -#: builtin/submodule--helper.c:1867 +#: builtin/submodule--helper.c:1868 msgid "url where to clone the submodule from" msgstr "url di mana submodul dikloning" -#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264 +#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265 msgid "depth for shallow clones" msgstr "kedalaman untuk kloning dangkal" -#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525 -#: builtin/submodule--helper.c:3257 +#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526 +#: builtin/submodule--helper.c:3258 msgid "force cloning progress" msgstr "paksa perkembangan kloning" -#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527 +#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528 msgid "disallow cloning into non-empty directory" msgstr "tak perbolehkan kloning ke dalam direktori bukan kosong" -#: builtin/submodule--helper.c:1887 +#: builtin/submodule--helper.c:1888 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -22518,93 +22538,93 @@ msgstr "" "<repositori>] [--name <nama>] [--depth <kedalaman>] [--single-branch] --url " "<url> --path <jalur>" -#: builtin/submodule--helper.c:1924 +#: builtin/submodule--helper.c:1925 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Mode pembaruan '%s' tidak valid untuk jalur submodul '%s'" -#: builtin/submodule--helper.c:1928 +#: builtin/submodule--helper.c:1929 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "Mode pembaruan '%s' tidak valid untuk jalur submodul '%s'" -#: builtin/submodule--helper.c:2043 +#: builtin/submodule--helper.c:2044 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Jalur submodul '%s' tidak diinisialisasi" -#: builtin/submodule--helper.c:2047 +#: builtin/submodule--helper.c:2048 msgid "Maybe you want to use 'update --init'?" msgstr "Mungkin Anda ingin menggunakan 'update --init'?" -#: builtin/submodule--helper.c:2077 +#: builtin/submodule--helper.c:2078 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Melewati submodul tak tergabung %s" -#: builtin/submodule--helper.c:2106 +#: builtin/submodule--helper.c:2107 #, c-format msgid "Skipping submodule '%s'" msgstr "Melewati submodul '%s'" -#: builtin/submodule--helper.c:2256 +#: builtin/submodule--helper.c:2257 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Gagal mengkloning '%s'. Percobaan ulang dijadwalkan" -#: builtin/submodule--helper.c:2267 +#: builtin/submodule--helper.c:2268 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Gagal mengkloning '%s' untuk kedua kalinya, batalkan" -#: builtin/submodule--helper.c:2372 +#: builtin/submodule--helper.c:2373 #, c-format msgid "Unable to checkout '%s' in submodule path '%s'" msgstr "Tidak dapat men-checkout '%s' pada jalur submodul '%s'" -#: builtin/submodule--helper.c:2376 +#: builtin/submodule--helper.c:2377 #, c-format msgid "Unable to rebase '%s' in submodule path '%s'" msgstr "Gagal mendasarkan ulang '%s' pada jalur submodul '%s'" -#: builtin/submodule--helper.c:2380 +#: builtin/submodule--helper.c:2381 #, c-format msgid "Unable to merge '%s' in submodule path '%s'" msgstr "Tidak dapat menggabungkan '%s' pada jalur submodul '%s'" -#: builtin/submodule--helper.c:2384 +#: builtin/submodule--helper.c:2385 #, c-format msgid "Execution of '%s %s' failed in submodule path '%s'" msgstr "Eksekusi '%s %s' gagal di jalur submodul '%s'" -#: builtin/submodule--helper.c:2408 +#: builtin/submodule--helper.c:2409 #, c-format msgid "Submodule path '%s': checked out '%s'\n" msgstr "Jalur submodul '%s': ter-checkout '%s'\n" -#: builtin/submodule--helper.c:2412 +#: builtin/submodule--helper.c:2413 #, c-format msgid "Submodule path '%s': rebased into '%s'\n" msgstr "Jalur submodul '%s: terdasarkan ulang ke '%s''\n" -#: builtin/submodule--helper.c:2416 +#: builtin/submodule--helper.c:2417 #, c-format msgid "Submodule path '%s': merged in '%s'\n" msgstr "Jalur submodul '%s': tergabung dalam '%s'\n" -#: builtin/submodule--helper.c:2420 +#: builtin/submodule--helper.c:2421 #, c-format msgid "Submodule path '%s': '%s %s'\n" msgstr "Jalur submodul '%s': '%s %s'\n" -#: builtin/submodule--helper.c:2444 +#: builtin/submodule--helper.c:2445 #, c-format msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:" msgstr "" "Tidak dapat mengambil di dalam jalur submodul '%s'; mencoba mengambil " "langsung %s:" -#: builtin/submodule--helper.c:2453 +#: builtin/submodule--helper.c:2454 #, c-format msgid "" "Fetched in submodule path '%s', but it did not contain %s. Direct fetching " @@ -22613,85 +22633,85 @@ msgstr "" "Terambil di dalam jalur submodul '%s', tetapi itu tidak berisi %s. " "Pengambilan langsung komit tersebut gagal." -#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574 -#: builtin/submodule--helper.c:2812 +#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575 +#: builtin/submodule--helper.c:2813 msgid "path into the working tree" msgstr "jalur ke dalam pohon kerja" -#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579 +#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580 msgid "path into the working tree, across nested submodule boundaries" msgstr "jalur ke dalam pohon kerja, melintasi perbatasan submodul bersarang" -#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577 +#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578 msgid "rebase, merge, checkout or none" msgstr "dasarkan ulang, gabungkan, checkout atau tidak sama sekali" -#: builtin/submodule--helper.c:2517 +#: builtin/submodule--helper.c:2518 msgid "create a shallow clone truncated to the specified number of revisions" msgstr "buat klon dangkal terpotong hingga sejumlah revisi yang disebutkan" -#: builtin/submodule--helper.c:2520 +#: builtin/submodule--helper.c:2521 msgid "parallel jobs" msgstr "pekerjaan paralel" -#: builtin/submodule--helper.c:2522 +#: builtin/submodule--helper.c:2523 msgid "whether the initial clone should follow the shallow recommendation" msgstr "apakah klon awal seharusnya mengikuti rekomendasi dangkal" -#: builtin/submodule--helper.c:2523 +#: builtin/submodule--helper.c:2524 msgid "don't print cloning progress" msgstr "jangan cetak perkembangan pengkloningan" -#: builtin/submodule--helper.c:2534 +#: builtin/submodule--helper.c:2535 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<jalur>] [<jalur>...]" -#: builtin/submodule--helper.c:2547 +#: builtin/submodule--helper.c:2548 msgid "bad value for update parameter" msgstr "nilai jelek untuk parameter pembaruan" -#: builtin/submodule--helper.c:2565 +#: builtin/submodule--helper.c:2566 msgid "suppress output for update by rebase or merge" msgstr "" "sembunyikan keluaran untuk pembaruan oleh pendasaran ulang atau penggabungan" -#: builtin/submodule--helper.c:2566 +#: builtin/submodule--helper.c:2567 msgid "force checkout updates" msgstr "paksa pembaruan checkout" -#: builtin/submodule--helper.c:2568 +#: builtin/submodule--helper.c:2569 msgid "don't fetch new objects from the remote site" msgstr "jangan ambil objek baru dari situs remote" -#: builtin/submodule--helper.c:2570 +#: builtin/submodule--helper.c:2571 msgid "overrides update mode in case the repository is a fresh clone" msgstr "timpa mode pembaruan jika repositori adalah kloning segar" -#: builtin/submodule--helper.c:2571 +#: builtin/submodule--helper.c:2572 msgid "depth for shallow fetch" msgstr "kedalaman untuk pengambilan dangkal" -#: builtin/submodule--helper.c:2581 +#: builtin/submodule--helper.c:2582 msgid "sha1" msgstr "sha1" -#: builtin/submodule--helper.c:2582 +#: builtin/submodule--helper.c:2583 msgid "SHA1 expected by superproject" msgstr "SHA1 diharapkan oleh proyek super" -#: builtin/submodule--helper.c:2584 +#: builtin/submodule--helper.c:2585 msgid "subsha1" msgstr "subsha1" -#: builtin/submodule--helper.c:2585 +#: builtin/submodule--helper.c:2586 msgid "SHA1 of submodule's HEAD" msgstr "SHA1 dari HEAD submodul" -#: builtin/submodule--helper.c:2591 +#: builtin/submodule--helper.c:2592 msgid "git submodule--helper run-update-procedure [<options>] <path>" msgstr "git submodule--helper run-update-procedure [<opsi>] <jalur>" -#: builtin/submodule--helper.c:2662 +#: builtin/submodule--helper.c:2663 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -22700,94 +22720,90 @@ msgstr "" "Cabang submodul (%s) dikonfigurasikan untuk mewarisi cabang dari proyek " "super, tapi proyek super tidak pada cabang apapun" -#: builtin/submodule--helper.c:2780 +#: builtin/submodule--helper.c:2781 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "tidak dapat mendapat pegangan repositori untuk submodul '%s'" -#: builtin/submodule--helper.c:2813 +#: builtin/submodule--helper.c:2814 msgid "recurse into submodules" msgstr "rekursi ke dalam submodul" -#: builtin/submodule--helper.c:2819 +#: builtin/submodule--helper.c:2820 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<opsi>] [<jalur>...]" -#: builtin/submodule--helper.c:2875 +#: builtin/submodule--helper.c:2876 msgid "check if it is safe to write to the .gitmodules file" msgstr "periksa apakah itu aman untuk menulis ke berkas .gitmodules" -#: builtin/submodule--helper.c:2878 +#: builtin/submodule--helper.c:2879 msgid "unset the config in the .gitmodules file" msgstr "batal setel konfigurasi dalam berkas .gitmodules" -#: builtin/submodule--helper.c:2883 +#: builtin/submodule--helper.c:2884 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <nama> [<nilai>]" -#: builtin/submodule--helper.c:2884 +#: builtin/submodule--helper.c:2885 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <nama>" -#: builtin/submodule--helper.c:2885 +#: builtin/submodule--helper.c:2886 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120 -#: builtin/submodule--helper.c:3276 +#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121 +#: builtin/submodule--helper.c:3277 msgid "please make sure that the .gitmodules file is in the working tree" msgstr "mohom pastikan berkas .gitmodules di dalam pohon kerja" -#: builtin/submodule--helper.c:2920 +#: builtin/submodule--helper.c:2921 msgid "suppress output for setting url of a submodule" msgstr "sembunyikan keluaran penyetelan url submodule" -#: builtin/submodule--helper.c:2924 +#: builtin/submodule--helper.c:2925 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] <jalur> <url baru>" -#: builtin/submodule--helper.c:2957 +#: builtin/submodule--helper.c:2958 msgid "set the default tracking branch to master" msgstr "setel cabang pelacak asali ke master" -#: builtin/submodule--helper.c:2959 +#: builtin/submodule--helper.c:2960 msgid "set the default tracking branch" msgstr "setel cabang pelacak asali" -#: builtin/submodule--helper.c:2963 +#: builtin/submodule--helper.c:2964 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <jalur>" -#: builtin/submodule--helper.c:2964 +#: builtin/submodule--helper.c:2965 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <cabang> <jalur>" -#: builtin/submodule--helper.c:2971 +#: builtin/submodule--helper.c:2972 msgid "--branch or --default required" msgstr "--branch atau --default dibutuhkan" -#: builtin/submodule--helper.c:2974 -msgid "--branch and --default are mutually exclusive" -msgstr "--branch dan --default saling eksklusif" - -#: builtin/submodule--helper.c:3037 +#: builtin/submodule--helper.c:3038 #, c-format msgid "Adding existing repo at '%s' to the index\n" msgstr "Menambahkan repo yang sudah ada pada '%s' ke indeks\n" -#: builtin/submodule--helper.c:3040 +#: builtin/submodule--helper.c:3041 #, c-format msgid "'%s' already exists and is not a valid git repo" msgstr "'%s' sudah ada dan bukan repo git valid" -#: builtin/submodule--helper.c:3053 +#: builtin/submodule--helper.c:3054 #, c-format msgid "A git directory for '%s' is found locally with remote(s):\n" msgstr "Sebuah direktori git untuk '%s' ditemukan lokal dengan remote:\n" -#: builtin/submodule--helper.c:3060 +#: builtin/submodule--helper.c:3061 #, c-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -22804,84 +22820,84 @@ msgstr "" "atau Anda tidak yakin apa maksudnya, pilih nama yang lain dengan opsi '--" "name'." -#: builtin/submodule--helper.c:3072 +#: builtin/submodule--helper.c:3073 #, c-format msgid "Reactivating local git directory for submodule '%s'\n" msgstr "Mengaktifkan ulang direktori git lokal untuk submodul '%s'\n" -#: builtin/submodule--helper.c:3109 +#: builtin/submodule--helper.c:3110 #, c-format msgid "unable to checkout submodule '%s'" msgstr "Tidak dapat men-checkout submodul '%s'" -#: builtin/submodule--helper.c:3148 +#: builtin/submodule--helper.c:3149 #, c-format msgid "Failed to add submodule '%s'" msgstr "Tidak dapat menambahkan submodul '%s'" -#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157 -#: builtin/submodule--helper.c:3165 +#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158 +#: builtin/submodule--helper.c:3166 #, c-format msgid "Failed to register submodule '%s'" msgstr "Gagal mendaftarkan jalur submodul '%s'" -#: builtin/submodule--helper.c:3221 +#: builtin/submodule--helper.c:3222 #, c-format msgid "'%s' already exists in the index" msgstr "'%s' sudah ada di dalam indeks" -#: builtin/submodule--helper.c:3224 +#: builtin/submodule--helper.c:3225 #, c-format msgid "'%s' already exists in the index and is not a submodule" msgstr "'%s' sudah ada di dalam indeks dan bukan submodul" -#: builtin/submodule--helper.c:3253 +#: builtin/submodule--helper.c:3254 msgid "branch of repository to add as submodule" msgstr "cabang repositori untuk ditambahkan sebagai submodul" -#: builtin/submodule--helper.c:3254 +#: builtin/submodule--helper.c:3255 msgid "allow adding an otherwise ignored submodule path" msgstr "perbolehkan menambah jalur submodul yang diabaikan" -#: builtin/submodule--helper.c:3256 +#: builtin/submodule--helper.c:3257 msgid "print only error messages" msgstr "hanya cetak pesan kesalahan" -#: builtin/submodule--helper.c:3260 +#: builtin/submodule--helper.c:3261 msgid "borrow the objects from reference repositories" msgstr "pinjam objek dari repositori referensi" -#: builtin/submodule--helper.c:3262 +#: builtin/submodule--helper.c:3263 msgid "" "sets the submodule’s name to the given string instead of defaulting to its " "path" msgstr "" "setel nama submodul ke untai yang diberikan daripada diasalkan ke jalurnya" -#: builtin/submodule--helper.c:3269 +#: builtin/submodule--helper.c:3270 msgid "git submodule--helper add [<options>] [--] <repository> [<path>]" msgstr "git submodule--helper add [<opsi>] [--] <repositori> [<jalur>]" -#: builtin/submodule--helper.c:3297 +#: builtin/submodule--helper.c:3298 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "Jalur relatif hanya dapat digunakan dari level atas dari pohon kerja" -#: builtin/submodule--helper.c:3305 +#: builtin/submodule--helper.c:3306 #, c-format msgid "repo URL: '%s' must be absolute or begin with ./|../" msgstr "URL repo: '%s' harus absolut atau diawali dengan ./|../" -#: builtin/submodule--helper.c:3340 +#: builtin/submodule--helper.c:3341 #, c-format msgid "'%s' is not a valid submodule name" msgstr "'%s' bukan nama submodul yang valid" -#: builtin/submodule--helper.c:3404 git.c:449 git.c:723 +#: builtin/submodule--helper.c:3405 git.c:452 git.c:726 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s tidak mendukung --super-prefix" -#: builtin/submodule--helper.c:3410 +#: builtin/submodule--helper.c:3411 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' bukan subperintah submodule--helper valid" @@ -22980,11 +22996,11 @@ msgstr "" "Baris yang diawali dengan '%c' akan disimpan; Anda dapat menghapus itu bila " "Anda mau.\n" -#: builtin/tag.c:241 +#: builtin/tag.c:240 msgid "unable to sign the tag" msgstr "tidak dapat menandatangani tag" -#: builtin/tag.c:259 +#: builtin/tag.c:258 #, c-format msgid "" "You have created a nested tag. The object referred to by your new tag is\n" @@ -22998,15 +23014,15 @@ msgstr "" "\n" "\tgit tag -f %s %s^{}" -#: builtin/tag.c:275 +#: builtin/tag.c:274 msgid "bad object type." msgstr "tipe objek jelek." -#: builtin/tag.c:326 +#: builtin/tag.c:325 msgid "no tag message?" msgstr "tidak ada pesan tag?" -#: builtin/tag.c:333 +#: builtin/tag.c:332 #, c-format msgid "The tag message has been left in %s\n" msgstr "Pesan tag dibiarkan di %s\n" @@ -23087,45 +23103,22 @@ msgstr "hanya cetak tag yang tak tergabung" msgid "print only tags of the object" msgstr "hanya cetak tag dari objek" -#: builtin/tag.c:525 -msgid "--column and -n are incompatible" -msgstr "--column dan -n tidak kompatibel" - -#: builtin/tag.c:546 -msgid "-n option is only allowed in list mode" -msgstr "opsi -n hanya diperbolehkan dalam mode daftar" - -#: builtin/tag.c:548 -msgid "--contains option is only allowed in list mode" -msgstr "opsi --contains hanya diperbolehkan dalam mode daftar" - -#: builtin/tag.c:550 -msgid "--no-contains option is only allowed in list mode" -msgstr "opsi --no-contains hanya diperbolehkan dalam mode daftar" - -#: builtin/tag.c:552 -msgid "--points-at option is only allowed in list mode" -msgstr "opsi --points-at hanya diperbolehkan dalam mode daftar" - -#: builtin/tag.c:554 -msgid "--merged and --no-merged options are only allowed in list mode" -msgstr "opsi --merged dan --no-merged hanya diperbolehkan dalam mode daftar" - -#: builtin/tag.c:568 -msgid "only one -F or -m option is allowed." -msgstr "hanya satu opsi -F atau -m yang diperbolehkan." +#: builtin/tag.c:558 +#, c-format +msgid "the '%s' option is only allowed in list mode" +msgstr "opsi '%s' hanya diperbolehkan dalam mode daftar" -#: builtin/tag.c:593 +#: builtin/tag.c:597 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' bukan nama tag yang valid." -#: builtin/tag.c:598 +#: builtin/tag.c:602 #, c-format msgid "tag '%s' already exists" msgstr "tag '%s' sudah ada" -#: builtin/tag.c:629 +#: builtin/tag.c:633 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Tag '%s' diperbarui (yaitu %s)\n" @@ -23548,195 +23541,183 @@ msgstr "" msgid "initializing" msgstr "" -#: builtin/worktree.c:421 builtin/worktree.c:427 +#: builtin/worktree.c:420 builtin/worktree.c:426 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "" -#: builtin/worktree.c:423 +#: builtin/worktree.c:422 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "" -#: builtin/worktree.c:432 +#: builtin/worktree.c:431 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "" -#: builtin/worktree.c:438 +#: builtin/worktree.c:437 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "" -#: builtin/worktree.c:483 +#: builtin/worktree.c:482 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" -#: builtin/worktree.c:486 +#: builtin/worktree.c:485 msgid "create a new branch" msgstr "" -#: builtin/worktree.c:488 +#: builtin/worktree.c:487 msgid "create or reset a branch" msgstr "" -#: builtin/worktree.c:490 +#: builtin/worktree.c:489 msgid "populate the new working tree" msgstr "" -#: builtin/worktree.c:491 +#: builtin/worktree.c:490 msgid "keep the new working tree locked" msgstr "" -#: builtin/worktree.c:493 builtin/worktree.c:730 +#: builtin/worktree.c:492 builtin/worktree.c:729 msgid "reason for locking" msgstr "" -#: builtin/worktree.c:496 +#: builtin/worktree.c:495 msgid "set up tracking mode (see git-branch(1))" msgstr "" -#: builtin/worktree.c:499 +#: builtin/worktree.c:498 msgid "try to match the new branch name with a remote-tracking branch" msgstr "" -#: builtin/worktree.c:507 -msgid "-b, -B, and --detach are mutually exclusive" -msgstr "" - -#: builtin/worktree.c:509 -msgid "--reason requires --lock" -msgstr "" - -#: builtin/worktree.c:513 +#: builtin/worktree.c:512 msgid "added with --lock" msgstr "" -#: builtin/worktree.c:575 +#: builtin/worktree.c:574 msgid "--[no-]track can only be used if a new branch is created" msgstr "" -#: builtin/worktree.c:692 +#: builtin/worktree.c:691 msgid "show extended annotations and reasons, if available" msgstr "" -#: builtin/worktree.c:694 +#: builtin/worktree.c:693 msgid "add 'prunable' annotation to worktrees older than <time>" msgstr "" -#: builtin/worktree.c:703 -msgid "--verbose and --porcelain are mutually exclusive" -msgstr "" - -#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849 -#: builtin/worktree.c:973 +#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848 +#: builtin/worktree.c:972 #, c-format msgid "'%s' is not a working tree" msgstr "" -#: builtin/worktree.c:744 builtin/worktree.c:777 +#: builtin/worktree.c:743 builtin/worktree.c:776 msgid "The main working tree cannot be locked or unlocked" msgstr "" -#: builtin/worktree.c:749 +#: builtin/worktree.c:748 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "" -#: builtin/worktree.c:751 +#: builtin/worktree.c:750 #, c-format msgid "'%s' is already locked" msgstr "" -#: builtin/worktree.c:779 +#: builtin/worktree.c:778 #, c-format msgid "'%s' is not locked" msgstr "" -#: builtin/worktree.c:820 +#: builtin/worktree.c:819 msgid "working trees containing submodules cannot be moved or removed" msgstr "" -#: builtin/worktree.c:828 +#: builtin/worktree.c:827 msgid "force move even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:851 builtin/worktree.c:975 +#: builtin/worktree.c:850 builtin/worktree.c:974 #, c-format msgid "'%s' is a main working tree" msgstr "" -#: builtin/worktree.c:856 +#: builtin/worktree.c:855 #, c-format msgid "could not figure out destination name from '%s'" msgstr "" -#: builtin/worktree.c:869 +#: builtin/worktree.c:868 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" "use 'move -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:871 +#: builtin/worktree.c:870 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:874 +#: builtin/worktree.c:873 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "" -#: builtin/worktree.c:879 +#: builtin/worktree.c:878 #, c-format msgid "failed to move '%s' to '%s'" msgstr "" -#: builtin/worktree.c:925 +#: builtin/worktree.c:924 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "" -#: builtin/worktree.c:929 +#: builtin/worktree.c:928 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" -#: builtin/worktree.c:934 +#: builtin/worktree.c:933 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "" -#: builtin/worktree.c:957 +#: builtin/worktree.c:956 msgid "force removal even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:980 +#: builtin/worktree.c:979 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" "use 'remove -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:982 +#: builtin/worktree.c:981 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:985 +#: builtin/worktree.c:984 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" -#: builtin/worktree.c:1009 +#: builtin/worktree.c:1008 #, c-format msgid "repair: %s: %s" msgstr "" -#: builtin/worktree.c:1012 +#: builtin/worktree.c:1011 #, c-format msgid "error: %s: %s" msgstr "" @@ -23788,21 +23769,16 @@ msgstr "" "untuk baca tentang perintah atau konsep spesifik.\n" "Lihat 'git help git' untuk gambaran tentang sistem." -#: git.c:188 +#: git.c:188 git.c:216 git.c:300 #, c-format -msgid "no directory given for --git-dir\n" -msgstr "tidak ada direktori yang diberikan untuk --git-dir\n" +msgid "no directory given for '%s' option\n" +msgstr "tidak ada direktori yang diberikan untuk opsi '%s'\n" #: git.c:202 #, c-format msgid "no namespace given for --namespace\n" msgstr "tidak ada ruang nama yang diberikan untuk --namespace\n" -#: git.c:216 -#, c-format -msgid "no directory given for --work-tree\n" -msgstr "tidak ada direktori yang diberikan untuk --work-tree\n" - #: git.c:230 #, c-format msgid "no prefix given for --super-prefix\n" @@ -23818,11 +23794,6 @@ msgstr "-c mengharapkan sebuah untai konfigurasi\n" msgid "no config key given for --config-env\n" msgstr "tidak ada kunci konfigurasi yang diberikan untuk --config-env\n" -#: git.c:300 -#, c-format -msgid "no directory given for -C\n" -msgstr "tidak ada direktori yang diberikan untuk -C\n" - #: git.c:326 #, c-format msgid "unknown option: %s\n" @@ -23852,29 +23823,29 @@ msgstr "alias kosong untuk %s" msgid "recursive alias: %s" msgstr "alias rekursif: %s" -#: git.c:476 +#: git.c:479 msgid "write failure on standard output" msgstr "kegagalan menulis pada keluaran standar" -#: git.c:478 +#: git.c:481 msgid "unknown write failure on standard output" msgstr "kegagal menulis tidak diketahui pada keluaran standar" -#: git.c:480 +#: git.c:483 msgid "close failed on standard output" msgstr "penutupan gagal pada keluaran standar" -#: git.c:832 +#: git.c:835 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "putaran alias terdeteksi: perluasan '%s' tidak berhenti:%s" -#: git.c:882 +#: git.c:885 #, c-format msgid "cannot handle %s as a builtin" msgstr "tidak dapat menangani %s sebagai bawaan" -#: git.c:895 +#: git.c:898 #, c-format msgid "" "usage: %s\n" @@ -23883,33 +23854,25 @@ msgstr "" "penggunaan: %s\n" "\n" -#: git.c:915 +#: git.c:918 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "perluasan alias '%s' gagal; '%s' bukan sebuah perintah git\n" -#: git.c:927 +#: git.c:930 #, c-format msgid "failed to run command '%s': %s\n" msgstr "gagal menjalankan perintah '%s': %s\n" -#: http-fetch.c:118 +#: http-fetch.c:128 #, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "" -#: http-fetch.c:128 +#: http-fetch.c:138 msgid "not a git repository" msgstr "" -#: http-fetch.c:134 -msgid "--packfile requires --index-pack-args" -msgstr "" - -#: http-fetch.c:143 -msgid "--index-pack-args can only be used with --packfile" -msgstr "" - #: t/helper/test-fast-rebase.c:141 msgid "unhandled options" msgstr "" @@ -24182,6 +24145,170 @@ msgstr "" msgid "remote-curl: unknown command '%s' from git" msgstr "" +#: contrib/scalar/scalar.c:49 +msgid "need a working directory" +msgstr "" + +#: contrib/scalar/scalar.c:86 +msgid "could not find enlistment root" +msgstr "" + +#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351 +#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579 +#, c-format +msgid "could not switch to '%s'" +msgstr "" + +#: contrib/scalar/scalar.c:180 +#, c-format +msgid "could not configure %s=%s" +msgstr "" + +#: contrib/scalar/scalar.c:198 +msgid "could not configure log.excludeDecoration" +msgstr "" + +#: contrib/scalar/scalar.c:219 +msgid "Scalar enlistments require a worktree" +msgstr "" + +#: contrib/scalar/scalar.c:311 +#, c-format +msgid "remote HEAD is not a branch: '%.*s'" +msgstr "" + +#: contrib/scalar/scalar.c:317 +msgid "failed to get default branch name from remote; using local default" +msgstr "" + +#: contrib/scalar/scalar.c:330 +msgid "failed to get default branch name" +msgstr "" + +#: contrib/scalar/scalar.c:341 +msgid "failed to unregister repository" +msgstr "" + +#: contrib/scalar/scalar.c:356 +msgid "failed to delete enlistment directory" +msgstr "" + +#: contrib/scalar/scalar.c:376 +msgid "branch to checkout after clone" +msgstr "" + +#: contrib/scalar/scalar.c:378 +msgid "when cloning, create full working directory" +msgstr "" + +#: contrib/scalar/scalar.c:380 +msgid "only download metadata for the branch that will be checked out" +msgstr "" + +#: contrib/scalar/scalar.c:385 +msgid "scalar clone [<options>] [--] <repo> [<dir>]" +msgstr "" + +#: contrib/scalar/scalar.c:410 +#, c-format +msgid "cannot deduce worktree name from '%s'" +msgstr "" + +#: contrib/scalar/scalar.c:419 +#, c-format +msgid "directory '%s' exists already" +msgstr "" + +#: contrib/scalar/scalar.c:446 +#, c-format +msgid "failed to get default branch for '%s'" +msgstr "" + +#: contrib/scalar/scalar.c:457 +#, c-format +msgid "could not configure remote in '%s'" +msgstr "" + +#: contrib/scalar/scalar.c:466 +#, c-format +msgid "could not configure '%s'" +msgstr "" + +#: contrib/scalar/scalar.c:469 +msgid "partial clone failed; attempting full clone" +msgstr "" + +#: contrib/scalar/scalar.c:473 +msgid "could not configure for full clone" +msgstr "" + +#: contrib/scalar/scalar.c:505 +msgid "`scalar list` does not take arguments" +msgstr "" + +#: contrib/scalar/scalar.c:518 +msgid "scalar register [<enlistment>]" +msgstr "" + +#: contrib/scalar/scalar.c:545 +msgid "reconfigure all registered enlistments" +msgstr "" + +#: contrib/scalar/scalar.c:549 +msgid "scalar reconfigure [--all | <enlistment>]" +msgstr "" + +#: contrib/scalar/scalar.c:567 +msgid "--all or <enlistment>, but not both" +msgstr "" + +#: contrib/scalar/scalar.c:582 +#, c-format +msgid "git repository gone in '%s'" +msgstr "" + +#: contrib/scalar/scalar.c:622 +msgid "" +"scalar run <task> [<enlistment>]\n" +"Tasks:\n" +msgstr "" + +#: contrib/scalar/scalar.c:640 +#, c-format +msgid "no such task: '%s'" +msgstr "" + +#: contrib/scalar/scalar.c:690 +msgid "scalar unregister [<enlistment>]" +msgstr "" + +#: contrib/scalar/scalar.c:737 +msgid "scalar delete <enlistment>" +msgstr "" + +#: contrib/scalar/scalar.c:752 +msgid "refusing to delete current working directory" +msgstr "" + +#: contrib/scalar/scalar.c:767 +msgid "include Git version" +msgstr "" + +#: contrib/scalar/scalar.c:769 +msgid "include Git's build options" +msgstr "" + +#: contrib/scalar/scalar.c:773 +msgid "scalar verbose [-v | --verbose] [--build-options]" +msgstr "" + +#: contrib/scalar/scalar.c:821 +msgid "" +"scalar <command> [<options>]\n" +"\n" +"Commands:\n" +msgstr "" + #: compat/compiler.h:26 msgid "no compiler information available\n" msgstr "" @@ -24206,36 +24333,36 @@ msgstr "" msgid "no-op (backward compatibility)" msgstr "" -#: parse-options.h:308 +#: parse-options.h:310 msgid "be more verbose" msgstr "" -#: parse-options.h:310 +#: parse-options.h:312 msgid "be more quiet" msgstr "" -#: parse-options.h:316 +#: parse-options.h:318 msgid "use <n> digits to display object names" msgstr "" -#: parse-options.h:335 +#: parse-options.h:337 msgid "how to strip spaces and #comments from message" msgstr "" -#: parse-options.h:336 +#: parse-options.h:338 msgid "read pathspec from file" msgstr "" -#: parse-options.h:337 +#: parse-options.h:339 msgid "" "with --pathspec-from-file, pathspec elements are separated with NUL character" msgstr "" -#: ref-filter.h:101 +#: ref-filter.h:98 msgid "key" msgstr "" -#: ref-filter.h:101 +#: ref-filter.h:98 msgid "field name to sort on" msgstr "" @@ -24304,15 +24431,15 @@ msgid "Show canonical names and email addresses of contacts" msgstr "" #: command-list.h:65 -msgid "Switch branches or restore working tree files" +msgid "Ensures that a reference name is well formed" msgstr "" #: command-list.h:66 -msgid "Copy files from the index to the working tree" +msgid "Switch branches or restore working tree files" msgstr "" #: command-list.h:67 -msgid "Ensures that a reference name is well formed" +msgid "Copy files from the index to the working tree" msgstr "" #: command-list.h:68 @@ -24508,55 +24635,55 @@ msgid "Add or parse structured information in commit messages" msgstr "" #: command-list.h:116 -msgid "The Git repository browser" +msgid "Show commit logs" msgstr "" #: command-list.h:117 -msgid "Show commit logs" +msgid "Show information about files in the index and the working tree" msgstr "" #: command-list.h:118 -msgid "Show information about files in the index and the working tree" +msgid "List references in a remote repository" msgstr "" #: command-list.h:119 -msgid "List references in a remote repository" +msgid "List the contents of a tree object" msgstr "" #: command-list.h:120 -msgid "List the contents of a tree object" +msgid "Extracts patch and authorship from a single e-mail message" msgstr "" #: command-list.h:121 -msgid "Extracts patch and authorship from a single e-mail message" +msgid "Simple UNIX mbox splitter program" msgstr "" #: command-list.h:122 -msgid "Simple UNIX mbox splitter program" +msgid "Run tasks to optimize Git repository data" msgstr "" #: command-list.h:123 -msgid "Run tasks to optimize Git repository data" +msgid "Join two or more development histories together" msgstr "" #: command-list.h:124 -msgid "Join two or more development histories together" +msgid "Find as good common ancestors as possible for a merge" msgstr "" #: command-list.h:125 -msgid "Find as good common ancestors as possible for a merge" +msgid "Run a three-way file merge" msgstr "" #: command-list.h:126 -msgid "Run a three-way file merge" +msgid "Run a merge for files needing merging" msgstr "" #: command-list.h:127 -msgid "Run a merge for files needing merging" +msgid "The standard helper program to use with git-merge-index" msgstr "" #: command-list.h:128 -msgid "The standard helper program to use with git-merge-index" +msgid "Show three-way merge without touching index" msgstr "" #: command-list.h:129 @@ -24564,179 +24691,179 @@ msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "" #: command-list.h:130 -msgid "Show three-way merge without touching index" +msgid "Creates a tag object with extra validation" msgstr "" #: command-list.h:131 -msgid "Write and verify multi-pack-indexes" +msgid "Build a tree-object from ls-tree formatted text" msgstr "" #: command-list.h:132 -msgid "Creates a tag object with extra validation" +msgid "Write and verify multi-pack-indexes" msgstr "" #: command-list.h:133 -msgid "Build a tree-object from ls-tree formatted text" +msgid "Move or rename a file, a directory, or a symlink" msgstr "" #: command-list.h:134 -msgid "Move or rename a file, a directory, or a symlink" +msgid "Find symbolic names for given revs" msgstr "" #: command-list.h:135 -msgid "Find symbolic names for given revs" +msgid "Add or inspect object notes" msgstr "" #: command-list.h:136 -msgid "Add or inspect object notes" +msgid "Import from and submit to Perforce repositories" msgstr "" #: command-list.h:137 -msgid "Import from and submit to Perforce repositories" +msgid "Create a packed archive of objects" msgstr "" #: command-list.h:138 -msgid "Create a packed archive of objects" +msgid "Find redundant pack files" msgstr "" #: command-list.h:139 -msgid "Find redundant pack files" +msgid "Pack heads and tags for efficient repository access" msgstr "" #: command-list.h:140 -msgid "Pack heads and tags for efficient repository access" +msgid "Compute unique ID for a patch" msgstr "" #: command-list.h:141 -msgid "Compute unique ID for a patch" +msgid "Prune all unreachable objects from the object database" msgstr "" #: command-list.h:142 -msgid "Prune all unreachable objects from the object database" +msgid "Remove extra objects that are already in pack files" msgstr "" #: command-list.h:143 -msgid "Remove extra objects that are already in pack files" +msgid "Fetch from and integrate with another repository or a local branch" msgstr "" #: command-list.h:144 -msgid "Fetch from and integrate with another repository or a local branch" +msgid "Update remote refs along with associated objects" msgstr "" #: command-list.h:145 -msgid "Update remote refs along with associated objects" +msgid "Applies a quilt patchset onto the current branch" msgstr "" #: command-list.h:146 -msgid "Applies a quilt patchset onto the current branch" +msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "" #: command-list.h:147 -msgid "Compare two commit ranges (e.g. two versions of a branch)" +msgid "Reads tree information into the index" msgstr "" #: command-list.h:148 -msgid "Reads tree information into the index" +msgid "Reapply commits on top of another base tip" msgstr "" #: command-list.h:149 -msgid "Reapply commits on top of another base tip" +msgid "Receive what is pushed into the repository" msgstr "" #: command-list.h:150 -msgid "Receive what is pushed into the repository" +msgid "Manage reflog information" msgstr "" #: command-list.h:151 -msgid "Manage reflog information" +msgid "Manage set of tracked repositories" msgstr "" #: command-list.h:152 -msgid "Manage set of tracked repositories" +msgid "Pack unpacked objects in a repository" msgstr "" #: command-list.h:153 -msgid "Pack unpacked objects in a repository" +msgid "Create, list, delete refs to replace objects" msgstr "" #: command-list.h:154 -msgid "Create, list, delete refs to replace objects" +msgid "Generates a summary of pending changes" msgstr "" #: command-list.h:155 -msgid "Generates a summary of pending changes" +msgid "Reuse recorded resolution of conflicted merges" msgstr "" #: command-list.h:156 -msgid "Reuse recorded resolution of conflicted merges" +msgid "Reset current HEAD to the specified state" msgstr "" #: command-list.h:157 -msgid "Reset current HEAD to the specified state" +msgid "Restore working tree files" msgstr "" #: command-list.h:158 -msgid "Restore working tree files" +msgid "Lists commit objects in reverse chronological order" msgstr "" #: command-list.h:159 -msgid "Revert some existing commits" +msgid "Pick out and massage parameters" msgstr "" #: command-list.h:160 -msgid "Lists commit objects in reverse chronological order" +msgid "Revert some existing commits" msgstr "" #: command-list.h:161 -msgid "Pick out and massage parameters" +msgid "Remove files from the working tree and from the index" msgstr "" #: command-list.h:162 -msgid "Remove files from the working tree and from the index" +msgid "Send a collection of patches as emails" msgstr "" #: command-list.h:163 -msgid "Send a collection of patches as emails" +msgid "Push objects over Git protocol to another repository" msgstr "" #: command-list.h:164 -msgid "Push objects over Git protocol to another repository" +msgid "Git's i18n setup code for shell scripts" msgstr "" #: command-list.h:165 -msgid "Restricted login shell for Git-only SSH access" +msgid "Common Git shell script setup code" msgstr "" #: command-list.h:166 -msgid "Summarize 'git log' output" +msgid "Restricted login shell for Git-only SSH access" msgstr "" #: command-list.h:167 -msgid "Show various types of objects" +msgid "Summarize 'git log' output" msgstr "" #: command-list.h:168 -msgid "Show branches and their commits" +msgid "Show various types of objects" msgstr "" #: command-list.h:169 -msgid "Show packed archive index" +msgid "Show branches and their commits" msgstr "" #: command-list.h:170 -msgid "List references in a local repository" +msgid "Show packed archive index" msgstr "" #: command-list.h:171 -msgid "Git's i18n setup code for shell scripts" +msgid "List references in a local repository" msgstr "" #: command-list.h:172 -msgid "Common Git shell script setup code" +msgid "Initialize and modify the sparse-checkout" msgstr "" #: command-list.h:173 -msgid "Initialize and modify the sparse-checkout" +msgid "Add file contents to the staging area" msgstr "" #: command-list.h:174 @@ -24744,167 +24871,167 @@ msgid "Stash the changes in a dirty working directory away" msgstr "" #: command-list.h:175 -msgid "Add file contents to the staging area" +msgid "Show the working tree status" msgstr "" #: command-list.h:176 -msgid "Show the working tree status" +msgid "Remove unnecessary whitespace" msgstr "" #: command-list.h:177 -msgid "Remove unnecessary whitespace" +msgid "Initialize, update or inspect submodules" msgstr "" #: command-list.h:178 -msgid "Initialize, update or inspect submodules" +msgid "Bidirectional operation between a Subversion repository and Git" msgstr "" #: command-list.h:179 -msgid "Bidirectional operation between a Subversion repository and Git" +msgid "Switch branches" msgstr "" #: command-list.h:180 -msgid "Switch branches" +msgid "Read, modify and delete symbolic refs" msgstr "" #: command-list.h:181 -msgid "Read, modify and delete symbolic refs" +msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" #: command-list.h:182 -msgid "Create, list, delete or verify a tag object signed with GPG" +msgid "Creates a temporary file with a blob's contents" msgstr "" #: command-list.h:183 -msgid "Creates a temporary file with a blob's contents" +msgid "Unpack objects from a packed archive" msgstr "" #: command-list.h:184 -msgid "Unpack objects from a packed archive" +msgid "Register file contents in the working tree to the index" msgstr "" #: command-list.h:185 -msgid "Register file contents in the working tree to the index" +msgid "Update the object name stored in a ref safely" msgstr "" #: command-list.h:186 -msgid "Update the object name stored in a ref safely" +msgid "Update auxiliary info file to help dumb servers" msgstr "" #: command-list.h:187 -msgid "Update auxiliary info file to help dumb servers" +msgid "Send archive back to git-archive" msgstr "" #: command-list.h:188 -msgid "Send archive back to git-archive" +msgid "Send objects packed back to git-fetch-pack" msgstr "" #: command-list.h:189 -msgid "Send objects packed back to git-fetch-pack" +msgid "Show a Git logical variable" msgstr "" #: command-list.h:190 -msgid "Show a Git logical variable" +msgid "Check the GPG signature of commits" msgstr "" #: command-list.h:191 -msgid "Check the GPG signature of commits" +msgid "Validate packed Git archive files" msgstr "" #: command-list.h:192 -msgid "Validate packed Git archive files" +msgid "Check the GPG signature of tags" msgstr "" #: command-list.h:193 -msgid "Check the GPG signature of tags" +msgid "Show logs with difference each commit introduces" msgstr "" #: command-list.h:194 -msgid "Git web interface (web frontend to Git repositories)" +msgid "Manage multiple working trees" msgstr "" #: command-list.h:195 -msgid "Show logs with difference each commit introduces" +msgid "Create a tree object from the current index" msgstr "" #: command-list.h:196 -msgid "Manage multiple working trees" +msgid "Defining attributes per path" msgstr "" #: command-list.h:197 -msgid "Create a tree object from the current index" +msgid "Git command-line interface and conventions" msgstr "" #: command-list.h:198 -msgid "Defining attributes per path" +msgid "A Git core tutorial for developers" msgstr "" #: command-list.h:199 -msgid "Git command-line interface and conventions" +msgid "Providing usernames and passwords to Git" msgstr "" #: command-list.h:200 -msgid "A Git core tutorial for developers" +msgid "Git for CVS users" msgstr "" #: command-list.h:201 -msgid "Providing usernames and passwords to Git" +msgid "Tweaking diff output" msgstr "" #: command-list.h:202 -msgid "Git for CVS users" +msgid "A useful minimum set of commands for Everyday Git" msgstr "" #: command-list.h:203 -msgid "Tweaking diff output" +msgid "Frequently asked questions about using Git" msgstr "" #: command-list.h:204 -msgid "A useful minimum set of commands for Everyday Git" +msgid "A Git Glossary" msgstr "" #: command-list.h:205 -msgid "Frequently asked questions about using Git" +msgid "Hooks used by Git" msgstr "" #: command-list.h:206 -msgid "A Git Glossary" +msgid "Specifies intentionally untracked files to ignore" msgstr "" #: command-list.h:207 -msgid "Hooks used by Git" +msgid "The Git repository browser" msgstr "" #: command-list.h:208 -msgid "Specifies intentionally untracked files to ignore" +msgid "Map author/committer names and/or E-Mail addresses" msgstr "" #: command-list.h:209 -msgid "Map author/committer names and/or E-Mail addresses" +msgid "Defining submodule properties" msgstr "" #: command-list.h:210 -msgid "Defining submodule properties" +msgid "Git namespaces" msgstr "" #: command-list.h:211 -msgid "Git namespaces" +msgid "Helper programs to interact with remote repositories" msgstr "" #: command-list.h:212 -msgid "Helper programs to interact with remote repositories" +msgid "Git Repository Layout" msgstr "" #: command-list.h:213 -msgid "Git Repository Layout" +msgid "Specifying revisions and ranges for Git" msgstr "" #: command-list.h:214 -msgid "Specifying revisions and ranges for Git" +msgid "Mounting one repository inside another" msgstr "" #: command-list.h:215 -msgid "Mounting one repository inside another" +msgid "A tutorial introduction to Git" msgstr "" #: command-list.h:216 @@ -24912,7 +25039,7 @@ msgid "A tutorial introduction to Git: part two" msgstr "" #: command-list.h:217 -msgid "A tutorial introduction to Git" +msgid "Git web interface (web frontend to Git repositories)" msgstr "" #: command-list.h:218 @@ -24984,39 +25111,39 @@ msgstr "" msgid "usage: $dashless $USAGE" msgstr "" -#: git-sh-setup.sh:191 +#: git-sh-setup.sh:183 #, sh-format msgid "Cannot chdir to $cdup, the toplevel of the working tree" msgstr "" -#: git-sh-setup.sh:200 git-sh-setup.sh:207 +#: git-sh-setup.sh:192 git-sh-setup.sh:199 #, sh-format msgid "fatal: $program_name cannot be used without a working tree." msgstr "" -#: git-sh-setup.sh:221 +#: git-sh-setup.sh:213 msgid "Cannot rewrite branches: You have unstaged changes." msgstr "" -#: git-sh-setup.sh:224 +#: git-sh-setup.sh:216 #, sh-format msgid "Cannot $action: You have unstaged changes." msgstr "" -#: git-sh-setup.sh:235 +#: git-sh-setup.sh:227 #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." msgstr "" -#: git-sh-setup.sh:237 +#: git-sh-setup.sh:229 msgid "Additionally, your index contains uncommitted changes." msgstr "" -#: git-sh-setup.sh:357 +#: git-sh-setup.sh:349 msgid "You need to run this command from the toplevel of the working tree." msgstr "" -#: git-sh-setup.sh:362 +#: git-sh-setup.sh:354 msgid "Unable to determine absolute path of git directory" msgstr "" @@ -25084,7 +25211,7 @@ msgstr "" msgid "failed to open hunk edit file for reading: %s" msgstr "" -#: git-add--interactive.perl:1251 +#: git-add--interactive.perl:1253 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -25093,7 +25220,7 @@ msgid "" "d - do not stage this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1257 +#: git-add--interactive.perl:1259 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -25102,7 +25229,7 @@ msgid "" "d - do not stash this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1263 +#: git-add--interactive.perl:1265 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -25111,7 +25238,7 @@ msgid "" "d - do not unstage this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1269 +#: git-add--interactive.perl:1271 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -25120,7 +25247,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1275 git-add--interactive.perl:1293 +#: git-add--interactive.perl:1277 git-add--interactive.perl:1295 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -25129,7 +25256,7 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1281 +#: git-add--interactive.perl:1283 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -25138,7 +25265,7 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1287 +#: git-add--interactive.perl:1289 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -25147,7 +25274,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1299 +#: git-add--interactive.perl:1301 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -25156,7 +25283,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1314 +#: git-add--interactive.perl:1316 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -25169,90 +25296,90 @@ msgid "" "? - print help\n" msgstr "" -#: git-add--interactive.perl:1345 +#: git-add--interactive.perl:1347 msgid "The selected hunks do not apply to the index!\n" msgstr "" -#: git-add--interactive.perl:1360 +#: git-add--interactive.perl:1362 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "" -#: git-add--interactive.perl:1479 +#: git-add--interactive.perl:1481 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1480 +#: git-add--interactive.perl:1482 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1481 +#: git-add--interactive.perl:1483 #, perl-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1482 +#: git-add--interactive.perl:1484 #, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1599 +#: git-add--interactive.perl:1601 msgid "No other hunks to goto\n" msgstr "" -#: git-add--interactive.perl:1617 +#: git-add--interactive.perl:1619 #, perl-format msgid "Invalid number: '%s'\n" msgstr "" -#: git-add--interactive.perl:1622 +#: git-add--interactive.perl:1624 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "" msgstr[1] "" -#: git-add--interactive.perl:1657 +#: git-add--interactive.perl:1659 msgid "No other hunks to search\n" msgstr "" -#: git-add--interactive.perl:1674 +#: git-add--interactive.perl:1676 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "" -#: git-add--interactive.perl:1684 +#: git-add--interactive.perl:1686 msgid "No hunk matches the given pattern\n" msgstr "" -#: git-add--interactive.perl:1696 git-add--interactive.perl:1718 +#: git-add--interactive.perl:1698 git-add--interactive.perl:1720 msgid "No previous hunk\n" msgstr "" -#: git-add--interactive.perl:1705 git-add--interactive.perl:1724 +#: git-add--interactive.perl:1707 git-add--interactive.perl:1726 msgid "No next hunk\n" msgstr "" -#: git-add--interactive.perl:1730 +#: git-add--interactive.perl:1732 msgid "Sorry, cannot split this hunk\n" msgstr "" -#: git-add--interactive.perl:1736 +#: git-add--interactive.perl:1738 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "" msgstr[1] "" -#: git-add--interactive.perl:1746 +#: git-add--interactive.perl:1748 msgid "Sorry, cannot edit this hunk\n" msgstr "" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1811 +#: git-add--interactive.perl:1813 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -25263,56 +25390,56 @@ msgid "" "changes\n" msgstr "" -#: git-add--interactive.perl:1828 git-add--interactive.perl:1840 -#: git-add--interactive.perl:1843 git-add--interactive.perl:1850 -#: git-add--interactive.perl:1853 git-add--interactive.perl:1860 -#: git-add--interactive.perl:1864 git-add--interactive.perl:1870 +#: git-add--interactive.perl:1830 git-add--interactive.perl:1842 +#: git-add--interactive.perl:1845 git-add--interactive.perl:1852 +#: git-add--interactive.perl:1855 git-add--interactive.perl:1862 +#: git-add--interactive.perl:1866 git-add--interactive.perl:1872 msgid "missing --" msgstr "" -#: git-add--interactive.perl:1866 +#: git-add--interactive.perl:1868 #, perl-format msgid "unknown --patch mode: %s" msgstr "" -#: git-add--interactive.perl:1872 git-add--interactive.perl:1878 +#: git-add--interactive.perl:1874 git-add--interactive.perl:1880 #, perl-format msgid "invalid argument %s, expecting --" msgstr "" -#: git-send-email.perl:129 +#: git-send-email.perl:159 msgid "local zone differs from GMT by a non-minute interval\n" msgstr "zona lokal berbeda dari GMT oleh selang non-menit\n" -#: git-send-email.perl:136 git-send-email.perl:142 +#: git-send-email.perl:166 git-send-email.perl:172 msgid "local time offset greater than or equal to 24 hours\n" msgstr "offset waktu lokal lebih dari atau sama dengan 24 jam\n" -#: git-send-email.perl:214 +#: git-send-email.perl:244 #, perl-format msgid "fatal: command '%s' died with exit code %d" msgstr "fatal: perintah '%s' mati dengan kode keluar %d" -#: git-send-email.perl:227 +#: git-send-email.perl:257 msgid "the editor exited uncleanly, aborting everything" msgstr "penyunting keluar dengan kotor, membatalkan semua" -#: git-send-email.perl:316 +#: git-send-email.perl:346 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "'%s' berisi versi menengah dari email yang Anda buat.\n" -#: git-send-email.perl:321 +#: git-send-email.perl:351 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' berisi email yang dibuat.\n" -#: git-send-email.perl:450 +#: git-send-email.perl:484 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases tidak kompatibel dengan opsi yang lain\n" -#: git-send-email.perl:525 +#: git-send-email.perl:561 msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" @@ -25323,11 +25450,11 @@ msgstr "" "Setel sendemail.forbidSendmailVariables ke false untuk menonaktifkan " "pemeriksaan ini.\n" -#: git-send-email.perl:530 git-send-email.perl:746 +#: git-send-email.perl:566 git-send-email.perl:782 msgid "Cannot run git format-patch from outside a repository\n" msgstr "tidak dapat menjalankan git format-patch diluar repositori\n" -#: git-send-email.perl:533 +#: git-send-email.perl:569 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" @@ -25335,37 +25462,37 @@ msgstr "" "`batch-size` dan `relogin` harus disebutkan bersamaan (lewat baris perintah " "atau opsi konfigurasi)\n" -#: git-send-email.perl:546 +#: git-send-email.perl:582 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Bidang --suppress-cc tidak dikenal: '%s'\n" -#: git-send-email.perl:577 +#: git-send-email.perl:613 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Setelan --confirm tidak dikenal: '%s'\n" -#: git-send-email.perl:617 +#: git-send-email.perl:653 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "peringatan: alias sendmail dengan kutipan tidak didukung: %s\n" -#: git-send-email.perl:619 +#: git-send-email.perl:655 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "peringatan: `:include:` tidak didukung: %s\n" -#: git-send-email.perl:621 +#: git-send-email.perl:657 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "peringatan: pengalihan `/file` atau `|pipe` tidak didukung: %s\n" -#: git-send-email.perl:626 +#: git-send-email.perl:662 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "peringatan: baris sendmail tidak dikenal: %s\n" -#: git-send-email.perl:711 +#: git-send-email.perl:747 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -25380,12 +25507,12 @@ msgstr "" " * Sebutkan \"./%s\" jika maksud Anda sebuah berkas; atau\n" " * Berikan opsi --format-patch jika maksud Anda sebuah rentang.\n" -#: git-send-email.perl:732 +#: git-send-email.perl:768 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Gagal membuka direktori %s: %s" -#: git-send-email.perl:767 +#: git-send-email.perl:803 msgid "" "\n" "No patch files specified!\n" @@ -25395,17 +25522,17 @@ msgstr "" "Tidak ada berkas tambalan yang disebutkan!\n" "\n" -#: git-send-email.perl:780 +#: git-send-email.perl:816 #, perl-format msgid "No subject line in %s?" msgstr "Tidak ada baris subjek di %s?" -#: git-send-email.perl:791 +#: git-send-email.perl:827 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Gagal membuka untuk menulis %s: %s" -#: git-send-email.perl:802 +#: git-send-email.perl:838 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -25419,38 +25546,38 @@ msgstr "" "\n" "Bersihkan konten badan jika Anda tidak ingin mengirimkan rangkuman.\n" -#: git-send-email.perl:826 +#: git-send-email.perl:862 #, perl-format msgid "Failed to open %s: %s" msgstr "Gagal membuka %s: %s" -#: git-send-email.perl:843 +#: git-send-email.perl:879 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Gagal membuka %s.final: %s" -#: git-send-email.perl:886 +#: git-send-email.perl:922 msgid "Summary email is empty, skipping it\n" msgstr "Surel rangkuman kosong, lewati\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:935 +#: git-send-email.perl:971 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Anda yakin ingin menggunakan <%s> [y/N]? " -#: git-send-email.perl:990 +#: git-send-email.perl:1026 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "" "Berkas berikut 8bit, tetapi tidak menyebutkan Content-Transfer-Encoding.\n" -#: git-send-email.perl:995 +#: git-send-email.perl:1031 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Pengkodean 8bit apa yang harus saya sebut [UTF-8]? " -#: git-send-email.perl:1003 +#: git-send-email.perl:1039 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -25463,22 +25590,22 @@ msgstr "" "punya subjek templat '*** SUBJECT HERE ***'. Lewatkan --force jika Anda " "benar-benar ingin mengirim.\n" -#: git-send-email.perl:1022 +#: git-send-email.perl:1058 msgid "To whom should the emails be sent (if anyone)?" msgstr "Kepada siapa surel harus dikirim (jika ada)?" -#: git-send-email.perl:1040 +#: git-send-email.perl:1076 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "fatal: alias '%s' diperluas ke dirinya sendiri\n" -#: git-send-email.perl:1052 +#: git-send-email.perl:1088 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" "Message-ID yang akan digunakan sebagai In-Reply-To untuk surel pertama (jika " "ada)?" -#: git-send-email.perl:1114 git-send-email.perl:1122 +#: git-send-email.perl:1150 git-send-email.perl:1158 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "kesalahan: tidak dapat mengekstrak alamat yang valid dari: %s\n" @@ -25486,17 +25613,17 @@ msgstr "kesalahan: tidak dapat mengekstrak alamat yang valid dari: %s\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1126 +#: git-send-email.perl:1162 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "" "Apa yang Anda lakukan dengan alamat ini? ([q] keluar|[d] jatuh|[e] sunting): " -#: git-send-email.perl:1446 +#: git-send-email.perl:1482 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "Jalur CA \"%s\" tidak ada" -#: git-send-email.perl:1529 +#: git-send-email.perl:1565 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -25521,114 +25648,114 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1544 +#: git-send-email.perl:1580 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "Kirim surel ini? ([y]a|[n] tidak|[e] sunting|[q] keluar|semu[a]): " -#: git-send-email.perl:1547 +#: git-send-email.perl:1583 msgid "Send this email reply required" msgstr "Balasan kirim surel ini diperlukan" -#: git-send-email.perl:1581 +#: git-send-email.perl:1617 msgid "The required SMTP server is not properly defined." msgstr "Peladen SMTP yang diperlukan tidak dijelaskan dengan baik." -#: git-send-email.perl:1628 +#: git-send-email.perl:1664 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Peladen tidak mendukung STARTTLS! %s" -#: git-send-email.perl:1633 git-send-email.perl:1637 +#: git-send-email.perl:1669 git-send-email.perl:1673 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS gagal! %s" -#: git-send-email.perl:1646 +#: git-send-email.perl:1682 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Tidak dapat menginisialisasi SMTP dengan benar. Periksa konfigurasi dan " "gunakan --smtp-debug." -#: git-send-email.perl:1664 +#: git-send-email.perl:1700 #, perl-format msgid "Failed to send %s\n" msgstr "Gagal mengirim %s\n" -#: git-send-email.perl:1667 +#: git-send-email.perl:1703 #, perl-format msgid "Dry-Sent %s\n" msgstr "Terkirim-kering %s\n" -#: git-send-email.perl:1667 +#: git-send-email.perl:1703 #, perl-format msgid "Sent %s\n" msgstr "Terkirim %s\n" -#: git-send-email.perl:1669 +#: git-send-email.perl:1705 msgid "Dry-OK. Log says:\n" msgstr "OK-kering. Log berkata:\n" -#: git-send-email.perl:1669 +#: git-send-email.perl:1705 msgid "OK. Log says:\n" msgstr "OK. Log berkata:\n" -#: git-send-email.perl:1688 +#: git-send-email.perl:1724 msgid "Result: " msgstr "Hasil: " -#: git-send-email.perl:1691 +#: git-send-email.perl:1727 msgid "Result: OK\n" msgstr "Hasil: OK\n" -#: git-send-email.perl:1708 +#: git-send-email.perl:1744 #, perl-format msgid "can't open file %s" msgstr "tidak dapat membuka berkas %s" -#: git-send-email.perl:1756 git-send-email.perl:1776 +#: git-send-email.perl:1792 git-send-email.perl:1812 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Menambahkan cc: %s dari baris '%s'\n" -#: git-send-email.perl:1762 +#: git-send-email.perl:1798 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Menambahkan to: %s dari baris '%s'\n" -#: git-send-email.perl:1819 +#: git-send-email.perl:1855 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Menambahkan cc: %s dari baris '%s'\n" -#: git-send-email.perl:1854 +#: git-send-email.perl:1890 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) Menambahkan cc: %s dari baris '%s'\n" -#: git-send-email.perl:1973 +#: git-send-email.perl:2009 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Tidak dapat menjalankan '%s'" -#: git-send-email.perl:1980 +#: git-send-email.perl:2016 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Menambahkan %s: %s dari: '%s'\n" -#: git-send-email.perl:1984 +#: git-send-email.perl:2020 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) gagal menutup pipa ke '%s'" -#: git-send-email.perl:2014 +#: git-send-email.perl:2050 msgid "cannot send message as 7bit" msgstr "tidak dapat mengirim pesan sebagai 7bit" -#: git-send-email.perl:2022 +#: git-send-email.perl:2058 msgid "invalid transfer encoding" msgstr "pengkodean transfer tidak valid" -#: git-send-email.perl:2059 +#: git-send-email.perl:2095 #, perl-format msgid "" "fatal: %s: rejected by sendemail-validate hook\n" @@ -25639,12 +25766,12 @@ msgstr "" "%s\n" "peringatan: tidak ada tambalan yang dikirimkan\n" -#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132 +#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168 #, perl-format msgid "unable to open %s: %s\n" msgstr "tidak dapat membuka %s: %s\n" -#: git-send-email.perl:2072 +#: git-send-email.perl:2108 #, perl-format msgid "" "fatal: %s:%d is longer than 998 characters\n" @@ -25653,13 +25780,13 @@ msgstr "" "fatal: %s:%d lebih panjang dari 998 karakter\n" "peringatan: tidak ada tambalan yang dikirimkan\n" -#: git-send-email.perl:2090 +#: git-send-email.perl:2126 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "Melewati %s dengan akhiran cadangan '%s'.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:2094 +#: git-send-email.perl:2130 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Anda benar-benar ingin mengirim %s? [y|N]: " |