diff options
| -rw-r--r-- | po/id.po | 6210 |
1 files changed, 3103 insertions, 3107 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-11 09:38+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? " @@ -783,7 +783,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "" -#: 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 "" @@ -855,21 +855,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:2033 +#: builtin/fetch.c:2038 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 +1093,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 +1104,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 +1543,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 +1591,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 +1601,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 +1633,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 +1641,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 +1654,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 +1773,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 +1826,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 +1852,89 @@ 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" |