diff --git a/po/id.po b/po/id.po index 7ce5acb674..41465eed20 100644 --- a/po/id.po +++ b/po/id.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2022-09-28 14:31+0700\n" -"PO-Revision-Date: 2022-09-28 14:50+0700\n" +"POT-Creation-Date: 2022-11-30 11:05+0700\n" +"PO-Revision-Date: 2022-11-30 20:45+0700\n" "Last-Translator: Bagas Sanjaya \n" "Language-Team: Indonesian\n" "Language: id\n" @@ -900,6 +900,11 @@ msgstr "baris perintah diakhiri dengan \\" msgid "unclosed quote" msgstr "tanda kutip tak ditutup" +#: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c +#: builtin/receive-pack.c builtin/tag.c +msgid "too many arguments" +msgstr "terlalu banyak argumen" + #: apply.c #, c-format msgid "unrecognized whitespace option '%s'" @@ -1364,7 +1369,7 @@ msgid "No valid patches in input (allow with \"--allow-empty\")" msgstr "" "Tidak ada tambalan valid dalam masukan (perbolehkan dengan \"--allow-empty\")" -#: apply.c +#: apply.c t/helper/test-cache-tree.c msgid "unable to read index file" msgstr "tidak dapa membaca berkas indeks" @@ -1599,7 +1604,7 @@ msgstr "tidak ada referensi seperti: %.*s" msgid "not a valid object name: %s" msgstr "bukan nama objek valid: %s" -#: archive.c +#: archive.c t/helper/test-cache-tree.c #, c-format msgid "not a tree object: %s" msgstr "bukan objek pohon: %s" @@ -1650,7 +1655,7 @@ msgid "prepend prefix to each pathname in the archive" msgstr "tambahkan prefiks di depan setiap nama jalur dalam arsip" #: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c -#: builtin/fast-export.c builtin/grep.c builtin/hash-object.c +#: builtin/fast-export.c builtin/gc.c builtin/grep.c builtin/hash-object.c #: builtin/ls-files.c builtin/notes.c builtin/read-tree.c parse-options.h msgid "file" msgstr "berkas" @@ -3115,54 +3120,6 @@ msgstr "" "bisect run gagal: 'git bisect--helper --bisect-state %s' keluar dengan kode " "keluar %d" -#: builtin/bisect--helper.c -msgid "reset the bisection state" -msgstr "setel ulang keadaan pembagian dua" - -#: builtin/bisect--helper.c -msgid "check whether bad or good terms exist" -msgstr "periksa apakah ada istilah jelek atau bagus" - -#: builtin/bisect--helper.c -msgid "print out the bisect terms" -msgstr "cetak istilah pembagian dua" - -#: builtin/bisect--helper.c -msgid "start the bisect session" -msgstr "mulai sesi pembagian dua" - -#: builtin/bisect--helper.c -msgid "find the next bisection commit" -msgstr "temukan komit pembagian dua berikutnya" - -#: builtin/bisect--helper.c -msgid "mark the state of ref (or refs)" -msgstr "tandai keadaan referensi" - -#: builtin/bisect--helper.c -msgid "list the bisection steps so far" -msgstr "daftar langkah pembagian dua sejauh ini" - -#: builtin/bisect--helper.c -msgid "replay the bisection process from the given file" -msgstr "mainkan ulang proses pembagian dua dari berkas yang diberikan" - -#: builtin/bisect--helper.c -msgid "skip some commits for checkout" -msgstr "lewati beberapa komit untuk checkout" - -#: builtin/bisect--helper.c -msgid "visualize the bisection" -msgstr "visualisasikan pembagian dua" - -#: builtin/bisect--helper.c -msgid "use ... to automatically bisect" -msgstr "gunakan ... untuk bagi dua otomatis." - -#: builtin/bisect--helper.c -msgid "no log for BISECT_WRITE" -msgstr "tidak ada log untuk BISECT_WRITE" - #: builtin/bisect--helper.c msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset butuh baik tanpa argumen atau sebuah komit" @@ -3187,6 +3144,10 @@ msgstr "tidak ada berkas log yang diberikan" msgid "git blame [] [] [] [--] " msgstr "git blame [] [] [] [--] " +#: builtin/blame.c +msgid "git annotate [] [] [] [--] " +msgstr "git annotate [] [] [] [--] " + #: builtin/blame.c msgid " are documented in git-rev-list(1)" msgstr " didokumentasikan dalam git-rev-list(1)" @@ -3426,10 +3387,6 @@ msgstr "Pembaruan berkas konfigurasi gagal" msgid "cannot use -a with -d" msgstr "tidak dapat gunakan -a dengan -d" -#: builtin/branch.c -msgid "Couldn't look up commit object for HEAD" -msgstr "Tidak dapat mencari objek komit untuk HEAD" - #: builtin/branch.c #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" @@ -3478,19 +3435,21 @@ msgstr "Cabang %s sedang didasarkan ulang pada %s" msgid "Branch %s is being bisected at %s" msgstr "Cabang %s sedang dibagi dua pada %s" -#: builtin/branch.c -msgid "cannot copy the current branch while not on any." -msgstr "tidak dapat menyalin cabang saat ini ketika tidak ada." - -#: builtin/branch.c -msgid "cannot rename the current branch while not on any." -msgstr "tidak dapat mengganti nama cabang saat ini ketika tidak ada." - #: builtin/branch.c #, c-format msgid "Invalid branch name: '%s'" msgstr "Nama cabang tidak valid: '%s'" +#: builtin/branch.c +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "Belum ada komit pada cabang '%s'." + +#: builtin/branch.c +#, c-format +msgid "No branch named '%s'." +msgstr "Tidak ada cabang bernama '%s'." + #: builtin/branch.c msgid "Branch rename failed" msgstr "Penggantian nama cabang gagal" @@ -3699,14 +3658,12 @@ msgid "cannot edit description of more than one branch" msgstr "tidak dapat menyunting deskripsi lebih dari satu cabang" #: builtin/branch.c -#, c-format -msgid "No commit on branch '%s' yet." -msgstr "Belum ada komit pada cabang '%s'." +msgid "cannot copy the current branch while not on any." +msgstr "tidak dapat menyalin cabang saat ini ketika tidak ada." #: builtin/branch.c -#, c-format -msgid "No branch named '%s'." -msgstr "Tidak ada cabang bernama '%s'." +msgid "cannot rename the current branch while not on any." +msgstr "tidak dapat mengganti nama cabang saat ini ketika tidak ada." #: builtin/branch.c msgid "too many branches for a copy operation" @@ -3794,11 +3751,12 @@ msgstr "" #: builtin/bugreport.c msgid "" -"git bugreport [-o|--output-directory ] [-s|--suffix ] [--" -"diagnose[=]" +"git bugreport [(-o | --output-directory) ] [(-s | --suffix) ]\n" +" [--diagnose[=]]" msgstr "" -"git bugreport [-o|--output-directory ] [-s|--suffix ] [--" -"diagnose[=]]" +"git bugreport [(-o | --output-directory) ] [(-s |-- suffix) " +"]\n" +" [--diagnose[=]]" #: builtin/bugreport.c msgid "" @@ -3881,20 +3839,26 @@ msgid "Created new report at '%s'.\n" msgstr "Laporan baru dibuat pada '%s'.\n" #: builtin/bundle.c -msgid "git bundle create [] " -msgstr "git bundle create [] " +msgid "" +"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" +"progress-implied]\n" +" [--version=] " +msgstr "" +"git bundle create [-q | --quiet | --progress | --all-progress] [-all-" +"progress-implied]\n" +" [--version=] " #: builtin/bundle.c -msgid "git bundle verify [] " -msgstr "git bundle verify [] " +msgid "git bundle verify [-q | --quiet] " +msgstr "git bundle verify [-q | --quiet] " #: builtin/bundle.c msgid "git bundle list-heads [...]" msgstr "git bundle list-heads [...]" #: builtin/bundle.c -msgid "git bundle unbundle [...]" -msgstr "git bundle unbundle [...]" +msgid "git bundle unbundle [--progress] [...]" +msgstr "git bundle unbundle [--progress] [...]" #: builtin/bundle.c builtin/pack-objects.c msgid "do not show progress meter" @@ -3991,12 +3955,12 @@ msgid "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters]" +" [--textconv | --filters] [-z]" msgstr "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters]" +" [--textconv | --filters] [-z]" #: builtin/cat-file.c msgid "" @@ -4138,11 +4102,6 @@ msgstr " diperlukan dengan '%s'" msgid " required with '-%c'" msgstr " diperlukan dengan '-%c'" -#: builtin/cat-file.c builtin/notes.c builtin/prune-packed.c -#: builtin/receive-pack.c builtin/tag.c -msgid "too many arguments" -msgstr "terlalu banyak argumen" - #: builtin/cat-file.c #, c-format msgid "only two arguments allowed in mode, not %d" @@ -4810,9 +4769,11 @@ msgstr "gunakan mode hamparan" #: builtin/clean.c msgid "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] ..." +"git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] " +"[...]" msgstr "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] ..." +"git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] [...]" #: builtin/clean.c #, c-format @@ -5181,6 +5142,11 @@ msgstr "%s ada dan bukan direktori" msgid "failed to start iterator over '%s'" msgstr "gagal memulai iterator pada '%s'" +#: builtin/clone.c +#, c-format +msgid "symlink '%s' exists, refusing to clone with --local" +msgstr "tautan simbolik '%s' ada, menolak mengkloning dengan --local" + #: builtin/clone.c compat/precompose_utf8.c #, c-format msgid "failed to unlink '%s'" @@ -5262,11 +5228,6 @@ msgstr "Terlalu banyak argumen." msgid "You must specify a repository to clone." msgstr "Anda harus sebutkan repositori untuk diklon." -#: builtin/clone.c -#, c-format -msgid "options '%s' and '%s %s' cannot be used together" -msgstr "opsi '%s' dan '%s %s' tidak dapat digunakan bersamaan" - #: builtin/clone.c msgid "" "--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" @@ -5423,22 +5384,28 @@ msgstr "--command harus menjadi argumen pertama" #: builtin/commit-graph.c msgid "" -"git commit-graph verify [--object-dir ] [--shallow] [--[no-]progress]" +"git commit-graph verify [--object-dir ] [--shallow] [--[no-]progress]" msgstr "" -"git commit-graph verify [--object-dir ] [--shallow] [--" +"git commit-graph verify [--object-dir ] [--shallow] [--" "[no-]progress]" #: builtin/commit-graph.c msgid "" -"git commit-graph write [--object-dir ] [--append] [--" -"split[=]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]max-new-filters ] [--[no-]progress] " +"git commit-graph write [--object-dir ] [--append]\n" +" [--split[=]] [--reachable | --stdin-packs | " +"--stdin-commits]\n" +" [--changed-paths] [--[no-]max-new-filters ] [--" +"[no-]progress]\n" +" " msgstr "" -"git commit-graph write [--object-dir ] [--append] [--" -"split[=]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]max-new-filters ] [--[-no-]progrss] " +"git commit-graph write [--object-dir ] [--append]\n" +" [--split[=]] [--reachable | --stdin-packs | " +"--stdin-commits]\n" +" [--changed-paths] [--[no-]max-new-filters ] [--[-" +"no-]progress]\n" +" " -#: builtin/commit-graph.c builtin/fetch.c builtin/log.c +#: builtin/commit-graph.c builtin/fetch.c builtin/log.c builtin/repack.c msgid "dir" msgstr "direktori" @@ -5525,13 +5492,17 @@ msgstr "" msgid "Collecting commits from input" msgstr "Mengumpulkan komit dari masukan" +#: builtin/commit-tree.c +msgid "git commit-tree [(-p )...]" +msgstr "git commit-tree [(-p )...]" + #: builtin/commit-tree.c msgid "" -"git commit-tree [(-p )...] [-S[]] [(-m )...] [(-F " -")...] " +"git commit-tree [(-p )...] [-S[]] [(-m )...]\n" +" [(-F )...] " msgstr "" -"git commit-tree [(-p )...] [-S[]] [(-m )...] [(-F " -")...] " +"git commit-tree [(-p )...] [-S[]] [(-m )...]\n" +" [(-F )...] " #: builtin/commit-tree.c #, c-format @@ -5588,12 +5559,31 @@ msgid "git commit-tree: failed to read" msgstr "git commit-tree: gagal membaca" #: builtin/commit.c -msgid "git commit [] [--] ..." -msgstr "git commit [] [--] ..." +msgid "" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u] [--amend]\n" +" [--dry-run] [(-c | -C | --squash) | --fixup [(amend|" +"reword):])]\n" +" [-F | -m ] [--reset-author] [--allow-empty]\n" +" [--allow-empty-message] [--no-verify] [-e] [--author=]\n" +" [--date=] [--cleanup=] [--[no-]status]\n" +" [-i | -o] [--pathspec-from-file= [--pathspec-file-nul]]\n" +" [(--trailer [(=|:)])...] [-S[]]\n" +" [--] [...]" +msgstr "" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u] [--amend]\n" +" [--dry-run] [(-c | -C | --squash) | --fixup [(amend|" +"reword):])]\n" +" [-F | -m ] [--reset-author] [--allow-empty]\n" +" [--allow-empty-message] [--no-verify] [-e] [--" +"author=]\n" +" [--date=] [--cleanup=] [--[no-]status]\n" +" [-i | -o] [--pathspec-from-file= [--pathspec-file-nul]]\n" +" [(--trailer [(=|:)])...] [-S[]]\n" +" [--] [...]" #: builtin/commit.c -msgid "git status [] [--] ..." -msgstr "git status [] [--] ..." +msgid "git status [] [--] [...]" +msgstr "git status [] [--] [...]" #: builtin/commit.c msgid "" @@ -6215,7 +6205,7 @@ msgstr "gunakan berkas konfigurasi repositori" msgid "use per-worktree config file" msgstr "gunakan berkas konfigurasi per pohon kerja" -#: builtin/config.c +#: builtin/config.c builtin/gc.c msgid "use given config file" msgstr "gunakan berkas konfigurasi yang diberikan" @@ -6439,7 +6429,7 @@ msgstr "--blob hanya dapat digunakan di dalam repositori git" msgid "--worktree can only be used inside a git repository" msgstr "--worktree hanya dapat digunakan di dalam repositori git" -#: builtin/config.c +#: builtin/config.c builtin/gc.c msgid "$HOME not set" msgstr "$HOME tak disetel" @@ -6553,12 +6543,20 @@ msgstr "" "tidak dapat mendapatkan kunci penyimpanan kredensial dalam %d milidetik" #: builtin/describe.c -msgid "git describe [] [...]" -msgstr "git describe [] [...]" +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=] [...]" +msgstr "" +"git describe [--all] [--tags] [--contains] [--abbrev=] [...]" #: builtin/describe.c -msgid "git describe [] --dirty" -msgstr "git describe [] --dirty" +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=] --dirty[=]" +msgstr "" +"git describe [--all] [--tags] [--contains] [--abbrev=] --dirty[=]" + +#: builtin/describe.c +msgid "git describe " +msgstr "git describe " #: builtin/describe.c msgid "head" @@ -6713,11 +6711,11 @@ msgstr "opsi '%s' dan mirip-komit tidak dapat digunakan bersamaan" #: builtin/diagnose.c msgid "" -"git diagnose [-o|--output-directory ] [-s|--suffix ] [--" -"mode=]" +"git diagnose [(-o | --output-directory) ] [(-s | --suffix) ]\n" +" [--mode=]" msgstr "" -"git diagnose [-o|--output-directory ] [-s|--suffix ] [--" -"mode=]" +"git diagnose [(-o | --output-directory) ] [(-s | --suffix) ]\n" +" [--mode=]" #: builtin/diagnose.c msgid "specify a destination for the diagnostics archive" @@ -6740,6 +6738,10 @@ msgstr "--merge-base hanya bekerja dengan dua komit" msgid "'%s': not a regular file or symlink" msgstr "'%s': bukan berkas reguler atau tautan simbolik" +#: builtin/diff.c +msgid "no merge given, only parents." +msgstr "tidak ada penggabungan yang diberikan, hanya induk." + #: builtin/diff.c #, c-format msgid "invalid option: %s" @@ -7552,8 +7554,8 @@ msgid "print only refs which don't contain the commit" msgstr "hanya cetak referensi yang tidak berisi komit" #: builtin/for-each-repo.c -msgid "git for-each-repo --config= " -msgstr "git for-each-repo --config= " +msgid "git for-each-repo --config= [--] " +msgstr "git for-each-repo --config= [--] " #: builtin/for-each-repo.c msgid "config" @@ -7770,8 +7772,16 @@ msgid "%s: invalid sha1 pointer in resolve-undo" msgstr "%s: penunjuk sha1 tidak valid di resolve-undo" #: builtin/fsck.c -msgid "git fsck [] [...]" -msgstr "git fsck [] [...]" +msgid "" +"git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" +" [--[no-]full] [--strict] [--verbose] [--lost-found]\n" +" [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n" +" [--[no-]name-objects] [...]" +msgstr "" +"git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" +" [--[no-]full] [--strict] [--verbose] [--lost-found]\n" +" [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n" +" [--[no-]name-objects] [...]" #: builtin/fsck.c msgid "show unreachable objects" @@ -7843,14 +7853,6 @@ msgstr "git fsmonitor--daemon start []" msgid "git fsmonitor--daemon run []" msgstr "git fsmonitor--daemon run []" -#: builtin/fsmonitor--daemon.c -msgid "git fsmonitor--daemon stop" -msgstr "git fsmonitor--daemon stop" - -#: builtin/fsmonitor--daemon.c -msgid "git fsmonitor--daemon status" -msgstr "git fsmonitor--daemon status" - #: builtin/fsmonitor--daemon.c #, c-format msgid "value of '%s' out of range: %d" @@ -7952,7 +7954,7 @@ msgstr "" msgid "invalid 'ipc-threads' value (%d)" msgstr "nilai 'ipc-threads' tidak valid (%d)" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c t/helper/test-cache-tree.c #, c-format msgid "Unhandled subcommand '%s'" msgstr "Subperintah tidak tertangani '%s'" @@ -8157,8 +8159,23 @@ msgid "use at most one of --auto and --schedule=" msgstr "gunakan paling banyak satu dari --auto dan --schedule=" #: builtin/gc.c -msgid "failed to run 'git config'" -msgstr "gagal menjalankan 'git config'" +#, c-format +msgid "unable to add '%s' value of '%s'" +msgstr "tidak dapat menambahkan nilai '%s' dari '%s'" + +#: builtin/gc.c +msgid "return success even if repository was not registered" +msgstr "kembalikan sukses bahkan jika repositori tidak terdaftar" + +#: builtin/gc.c +#, c-format +msgid "unable to unset '%s' value of '%s'" +msgstr "tidak dapat membatal-setel nilai '%s' dari '%s'" + +#: builtin/gc.c +#, c-format +msgid "repository '%s' is not registered" +msgstr "repositori '%s' tidak terdaftar" #: builtin/gc.c #, c-format @@ -8537,11 +8554,15 @@ msgstr "baik --cached dan pohon diberikan" #: builtin/hash-object.c msgid "" -"git hash-object [-t ] [-w] [--path= | --no-filters] [--stdin] " -"[--] ..." +"git hash-object [-t ] [-w] [--path= | --no-filters]\n" +" [--stdin [--literally]] [--] ..." msgstr "" -"git hash-object [-t ] [-w] [--path= | --no-filters] [--stdin] " -"[--] ..." +"git hash-object [-t ] [-w] [--path= | --no-filters]\n" +" [--stdin [--literally]] [--] ..." + +#: builtin/hash-object.c +msgid "git hash-object [-t ] [-w] --stdin-paths [--no-filters]" +msgstr "git hash-object [-t ] [-w] --stdin-paths [--no-filters]" #: builtin/hash-object.c msgid "object type" @@ -9080,11 +9101,15 @@ msgstr "Repositori Git kosong dinisialisasi di %s%s\n" #: builtin/init-db.c msgid "" -"git init [-q | --quiet] [--bare] [--template=] [--" -"shared[=]] []" +"git init [-q | --quiet] [--bare] [--template=]\n" +" [--separate-git-dir ] [--object-format=]\n" +" [-b | --initial-branch=]\n" +" [--shared[=]] []" msgstr "" -"git init [-q | --quiet] [--bare] [--template=][--" -"shared[=]] []" +"git init [-q | --quiet] [--bare] [--template=]\n" +" [--separate-git-dir ] [--object-format=]\n" +" [-b | --initial-branch=]\n" +" [--shared[=]] []" #: builtin/init-db.c msgid "permissions" @@ -9137,11 +9162,13 @@ msgstr "--separate-git-dir tidak kompatibel dengan repositori bare" #: builtin/interpret-trailers.c msgid "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"[(=|:)])...] [...]" +"git interpret-trailers [--in-place] [--trim-empty]\n" +" [(--trailer [(=|:)])...]\n" +" [--parse] [...]" msgstr "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"[(=|:)])...] [...]" +"git interpret-trailers [--in-place] [--trim-empty]\n" +" [(--trailer [(=|:)])...]\n" +" [--parse] [...]" #: builtin/interpret-trailers.c msgid "edit files in place" @@ -9771,11 +9798,11 @@ msgstr "" #: builtin/ls-remote.c msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" +" [-q | --quiet] [--exit-code] [--get-url] [--sort=]\n" " [--symref] [ [...]]" msgstr "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" +" [-q | --quiet] [--exit-code] [--get-url] [--sort=]\n" " [--symref] [ [...]]" #: builtin/ls-remote.c @@ -9947,14 +9974,14 @@ msgstr "git merge-base [-a | --all] ..." msgid "git merge-base [-a | --all] --octopus ..." msgstr "git merge-base [-a | --all] --octopus ..." -#: builtin/merge-base.c -msgid "git merge-base --independent ..." -msgstr "git merge-base --independent ..." - #: builtin/merge-base.c msgid "git merge-base --is-ancestor " msgstr "git merge-base --is-ancestor " +#: builtin/merge-base.c +msgid "git merge-base --independent ..." +msgstr "git merge-base --independent ..." + #: builtin/merge-base.c msgid "git merge-base --fork-point []" msgstr "git merge-base --fork-point []" @@ -10094,10 +10121,24 @@ msgstr "daftar nama berkas tanpa mode/oid/tahap" msgid "allow merging unrelated histories" msgstr "perbolehkan penggabungan riwayat yang tak terkait" +#: builtin/merge-tree.c +msgid "perform multiple merges, one per line of input" +msgstr "lakukan banyak penggabungan, satu per baris masukan" + #: builtin/merge-tree.c msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge tidak kompatibel dengan semua opsi lainnya" +#: builtin/merge-tree.c builtin/notes.c +#, c-format +msgid "malformed input line: '%s'." +msgstr "baris masukan jelek: '%s'." + +#: builtin/merge-tree.c +#, c-format +msgid "merging cannot continue; got unclean result of %d" +msgstr "penggabungan tidak dapat berlanjut; dapat hasil kotor dari %d" + #: builtin/merge.c msgid "git merge [] [...]" msgstr "git merge [] [...]" @@ -10680,7 +10721,7 @@ msgstr "%s, source=%s, destination=%s" msgid "Renaming %s to %s\n" msgstr "Mengganti nama %s ke %s\n" -#: builtin/mv.c builtin/remote.c builtin/repack.c +#: builtin/mv.c builtin/remote.c #, c-format msgid "renaming '%s' failed" msgstr "gagal mengganti nama '%s'" @@ -10884,11 +10925,6 @@ msgstr "gagal membaca objek '%s'." msgid "cannot read note data from non-blob object '%s'." msgstr "gagal membaca data catatan dari objek bukan blob '%s'." -#: builtin/notes.c -#, c-format -msgid "malformed input line: '%s'." -msgstr "baris masukan jelek: '%s'." - #: builtin/notes.c #, c-format msgid "failed to copy notes from '%s' to '%s'" @@ -11130,15 +11166,14 @@ msgid "unknown subcommand: `%s'" msgstr "subperintah tidak dikenal: `%s'" #: builtin/pack-objects.c -msgid "" -"git pack-objects --stdout [...] [< | < ]" +msgid "git pack-objects --stdout [] [< | < ]" msgstr "" -"git pack-objects --stdout [...] [< | < ...] [< | < ]" #: builtin/pack-objects.c msgid "" -"git pack-objects [...] [< | < ]" +"git pack-objects [] [< | < ]" msgstr "" "git pack-objects [...] [< | < ]" @@ -11620,8 +11655,8 @@ msgstr "" ". Terima kasih.\n" #: builtin/pack-refs.c -msgid "git pack-refs []" -msgstr "git pack-refs []" +msgid "git pack-refs [--all] [--no-prune]" +msgstr "git pack-refs [--all] [--no-prune]" #: builtin/pack-refs.c msgid "pack everything" @@ -11631,6 +11666,22 @@ msgstr "pak semuanya" msgid "prune loose refs (default)" msgstr "pangkas referensi longgar (asali)" +#: builtin/patch-id.c +msgid "git patch-id [--stable | --unstable | --verbatim]" +msgstr "git patch-id [--stable | --unstable | --verbatim]" + +#: builtin/patch-id.c +msgid "use the unstable patch-id algorithm" +msgstr "gunakan algoritma id tambalan tidak stabil" + +#: builtin/patch-id.c +msgid "use the stable patch-id algorithm" +msgstr "gunakan algoritma id tambalan stabil" + +#: builtin/patch-id.c +msgid "don't strip whitespace from the patch" +msgstr "jangan kupas spasi dari tambalan" + #: builtin/prune.c msgid "git prune [-n] [-v] [--progress] [--expire