l10n: po-id for 2.44 (round 1)

Update following components: * builtin/replay.c * command-list.h * commit-graph.c * pack-bitmap.c * sequencer.c Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>

Bagas Sanjaya committed Feb 10, 2024 at 20:02 UTC c293cf8c4769c0dd0a910b7f3444359d937fc465
1 file changed +319 -166
po/id.po
+319 -166
@@ -7,8 +7,8 @@ msgid ""
7 msgstr ""
8 "Project-Id-Version: Git\n"
9 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
10 -"POT-Creation-Date: 2023-11-12 20:04+0700\n"
11 -"PO-Revision-Date: 2023-11-12 20:30+0700\n"
10 +"POT-Creation-Date: 2024-02-16 09:36+0700\n"
11 +"PO-Revision-Date: 2024-02-16 10:45+0700\n"
12 "Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n"
13 "Language-Team: Indonesian\n"
14 "Language: id\n"
@@ -909,7 +909,7 @@ msgid "unclosed quote"
909 msgstr "tanda kutip tak ditutup"
910
911 #: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c
912 -#: builtin/receive-pack.c builtin/tag.c
912 +#: builtin/receive-pack.c builtin/tag.c t/helper/test-pkt-line.c
913 msgid "too many arguments"
914 msgstr "terlalu banyak argumen"
915
@@ -924,12 +924,13 @@ msgid "unrecognized whitespace ignore option '%s'"
924 msgstr "opsi abai spasi putih tidak dikenal '%s'"
925
926 #: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.c
927 -#: builtin/checkout.c builtin/clone.c builtin/commit.c builtin/describe.c
928 -#: builtin/diff-tree.c builtin/difftool.c builtin/fast-export.c builtin/fetch.c
929 -#: builtin/help.c builtin/index-pack.c builtin/init-db.c builtin/log.c
930 -#: builtin/ls-files.c builtin/merge-base.c builtin/merge.c
931 -#: builtin/pack-objects.c builtin/push.c builtin/rebase.c builtin/repack.c
932 -#: builtin/reset.c builtin/rev-list.c builtin/show-branch.c builtin/stash.c
927 +#: builtin/checkout.c builtin/clean.c builtin/clone.c builtin/commit.c
928 +#: builtin/describe.c builtin/diff-tree.c builtin/difftool.c
929 +#: builtin/fast-export.c builtin/fetch.c builtin/help.c builtin/index-pack.c
930 +#: builtin/init-db.c builtin/log.c builtin/ls-files.c builtin/merge-base.c
931 +#: builtin/merge-tree.c builtin/merge.c builtin/pack-objects.c builtin/rebase.c
932 +#: builtin/repack.c builtin/replay.c builtin/reset.c builtin/rev-list.c
933 +#: builtin/rev-parse.c builtin/show-branch.c builtin/stash.c
934 #: builtin/submodule--helper.c builtin/tag.c builtin/worktree.c parse-options.c
935 #: range-diff.c revision.c
936 #, c-format
@@ -1752,6 +1753,11 @@ msgstr "opsi `%s' butuh '%s'"
1753 msgid "Unexpected option --output"
1754 msgstr "Opsi --output tak diharapkan"
1755
1756 +#: archive.c
1757 +#, c-format
1758 +msgid "extra command line parameter '%s'"
1759 +msgstr "parameter konfigurasi tambahan: '%s'"
1760 +
1761 #: archive.c
1762 #, c-format
1763 msgid "Unknown archive format '%s'"
@@ -1808,6 +1814,17 @@ msgstr "mengabaikan blob gitattributes '%s' yang terlalu besar"
1814 msgid "bad --attr-source or GIT_ATTR_SOURCE"
1815 msgstr "--attr-source atau GIT_ATTR_SOURCE jelek"
1816
1817 +#: attr.c read-cache.c
1818 +#, c-format
1819 +msgid "unable to stat '%s'"
1820 +msgstr "tidak dapat men-stat '%s'"
1821 +
1822 +#: bisect.c builtin/cat-file.c builtin/index-pack.c builtin/notes.c
1823 +#: builtin/pack-objects.c combine-diff.c rerere.c
1824 +#, c-format
1825 +msgid "unable to read %s"
1826 +msgstr "tidak dapat membaca %s"
1827 +
1828 #: bisect.c
1829 #, c-format
1830 msgid "Badly quoted content in file '%s': %s"
@@ -2359,8 +2376,8 @@ msgid "bad action '%s' for '%s'"
2376 msgstr "tindakan jelek '%s' untuk '%s'"
2377
2378 #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c
2362 -#: builtin/pull.c diff-merges.c gpg-interface.c ls-refs.c parallel-checkout.c
2363 -#: sequencer.c setup.c
2379 +#: builtin/pull.c config.c diff-merges.c gpg-interface.c ls-refs.c
2380 +#: parallel-checkout.c sequencer.c setup.c
2381 #, c-format
2382 msgid "invalid value for '%s': '%s'"
2383 msgstr "nilai tidak valid untuk '%s': '%s'"
@@ -2523,8 +2540,7 @@ msgstr "git write-tree gagal menulis sebuah pohon"
2540 msgid "applying to an empty history"
2541 msgstr "menerapkan ke sebuah riwayat kosong"
2542
2526 -#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c
2527 -#: t/helper/test-fast-rebase.c
2543 +#: builtin/am.c builtin/commit.c builtin/merge.c builtin/replay.c sequencer.c
2544 msgid "failed to write commit object"
2545 msgstr "gagal menulis objek komit"
2546
@@ -2710,8 +2726,9 @@ msgid "n"
2726 msgstr "n"
2727
2728 #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c
2713 -#: builtin/diagnose.c builtin/for-each-ref.c builtin/ls-files.c
2714 -#: builtin/ls-tree.c builtin/replace.c builtin/tag.c builtin/verify-tag.c
2729 +#: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c
2730 +#: builtin/ls-files.c builtin/ls-tree.c builtin/replace.c builtin/tag.c
2731 +#: builtin/verify-tag.c
2732 msgid "format"
2733 msgstr "format"
2734
@@ -3406,12 +3423,13 @@ msgstr "tidak dapat mencari objek komit untuk '%s'"
3423
3424 #: builtin/branch.c
3425 #, c-format
3409 -msgid ""
3410 -"the branch '%s' is not fully merged.\n"
3411 -"If you are sure you want to delete it, run 'git branch -D %s'"
3412 -msgstr ""
3413 -"cabang '%s' belum sepenuhnya tergabung.\n"
3414 -"kalau Anda yakin ingin menghapusnya, jalankan 'git branch -D %s'"
3426 +msgid "the branch '%s' is not fully merged"
3427 +msgstr "cabang '%s' belum sepenuhnya digabungkan"
3428 +
3429 +#: builtin/branch.c
3430 +#, c-format
3431 +msgid "If you are sure you want to delete it, run 'git branch -D %s'"
3432 +msgstr "Jika anda yakin untuk menghapusnya, lakukan 'git branch -D %s'"
3433
3434 #: builtin/branch.c
3435 msgid "update of config-file failed"
@@ -4443,7 +4461,7 @@ msgstr "Tidak dapat melakukan reflog untuk '%s': %s\n"
4461 msgid "HEAD is now at"
4462 msgstr "HEAD sekarang berada di"
4463
4446 -#: builtin/checkout.c builtin/clone.c t/helper/test-fast-rebase.c
4464 +#: builtin/checkout.c builtin/clone.c
4465 msgid "unable to update HEAD"
4466 msgstr "tidak dapat memperbarui HEAD"
4467
@@ -4714,8 +4732,8 @@ msgid "new-branch"
4732 msgstr "cabang baru"
4733
4734 #: builtin/checkout.c
4717 -msgid "new unparented branch"
4718 -msgstr "cabang baru tanpa induk"
4735 +msgid "new unborn branch"
4736 +msgstr "cabang yatim baru"
4737
4738 #: builtin/checkout.c builtin/merge.c
4739 msgid "update ignored files (default)"
@@ -4783,7 +4801,7 @@ msgstr ""
4801 msgid "you must specify path(s) to restore"
4802 msgstr "Anda harus sebutkan jalur untuk dipulihkan"
4803
4786 -#: builtin/checkout.c builtin/clone.c builtin/remote.c
4804 +#: builtin/checkout.c builtin/clone.c builtin/remote.c builtin/replay.c
4805 #: builtin/submodule--helper.c builtin/worktree.c
4806 msgid "branch"
4807 msgstr "cabang"
@@ -5027,10 +5045,6 @@ msgstr ""
5045 "clean.requireForce asal ke true dan baik -i, -n, atau -f tidak diberikan; "
5046 "menolak membersihkan"
5047
5030 -#: builtin/clean.c
5031 -msgid "-x and -X cannot be used together"
5032 -msgstr "-x dan -X tidak dapat digunakan bersamaan"
5033 -
5048 #: builtin/clone.c
5049 msgid "git clone [<options>] [--] <repo> [<dir>]"
5050 msgstr "git clone [<opsi>] [--] <repo> [<direktori>]"
@@ -5122,6 +5136,7 @@ msgid "create a shallow clone since a specific time"
5136 msgstr "buat klon dangkal sejak waktu yang disebutkan"
5137
5138 #: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/rebase.c
5139 +#: builtin/replay.c
5140 msgid "revision"
5141 msgstr "revisi"
5142
@@ -5149,6 +5164,10 @@ msgstr "direktori git"
5164 msgid "separate git dir from working tree"
5165 msgstr "pisahkan direktori git dari pohon kerja"
5166
5167 +#: builtin/clone.c builtin/init-db.c
5168 +msgid "specify the reference format to use"
5169 +msgstr "sebutkan format referensi untuk digunakan"
5170 +
5171 #: builtin/clone.c
5172 msgid "key=value"
5173 msgstr "kunci=nilai"
@@ -5299,13 +5318,10 @@ msgstr "Terlalu banyak argumen."
5318 msgid "You must specify a repository to clone."
5319 msgstr "Anda harus sebutkan repositori untuk diklon."
5320
5302 -#: builtin/clone.c
5303 -msgid ""
5304 -"--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-"
5305 -"exclude"
5306 -msgstr ""
5307 -"--bundle-uri tidak kompatibel dengan --depth, --shallow-since, dan --shallow-"
5308 -"exclude"
5321 +#: builtin/clone.c builtin/init-db.c setup.c
5322 +#, c-format
5323 +msgid "unknown ref storage format '%s'"
5324 +msgstr "format penyimpanan referensi tidak dikenal '%s'"
5325
5326 #: builtin/clone.c
5327 #, c-format
@@ -5471,13 +5487,13 @@ msgid ""
5487 "--stdin-commits]\n"
5488 " [--changed-paths] [--[no-]max-new-filters <n>] [--"
5489 "[no-]progress]\n"
5474 -" <split options>"
5490 +" <split-options>"
5491 msgstr ""
5492 "git commit-graph write [--object-dir <direktori>] [--append]\n"
5493 " [--split[=<strategi>]] [--reachable | --stdin-packs | "
5494 "--stdin-commits]\n"
5479 -" [--changed-paths] [--[no-]max-new-filters <n>] [--[-"
5480 -"no-]progress]\n"
5495 +" [--changed-paths] [--[no-]max-new-filters <n>] [--"
5496 +"[no-]progress]\n"
5497 " <opsi pemisahan>"
5498
5499 #: builtin/commit-graph.c builtin/fetch.c builtin/log.c builtin/repack.c
@@ -8400,6 +8416,11 @@ msgstr "tidak ada dukungan utas, abaikan %s"
8416 msgid "unable to read tree (%s)"
8417 msgstr "tidak dapat membaca pohon (%s)"
8418
8419 +#: builtin/grep.c
8420 +#, c-format
8421 +msgid "unable to read tree %s"
8422 +msgstr "tidak dapat membaca pohon %s"
8423 +
8424 #: builtin/grep.c
8425 #, c-format
8426 msgid "unable to grep from object of type %s"
@@ -8929,11 +8950,6 @@ msgstr "inkonsistensi inflate serius"
8950 msgid "SHA1 COLLISION FOUND WITH %s !"
8951 msgstr "TUMBUKAN SHA1 DITEMUKAN DENGAN %s !"
8952
8932 -#: builtin/index-pack.c builtin/pack-objects.c
8933 -#, c-format
8934 -msgid "unable to read %s"
8935 -msgstr "tidak dapat membaca %s"
8936 -
8953 #: builtin/index-pack.c
8954 #, c-format
8955 msgid "cannot read existing object info %s"
@@ -9111,11 +9127,13 @@ msgstr "kesalahan fsck dalam objek paket"
9127 msgid ""
9128 "git init [-q | --quiet] [--bare] [--template=<template-directory>]\n"
9129 " [--separate-git-dir <git-dir>] [--object-format=<format>]\n"
9130 +" [--ref-format=<format>]\n"
9131 " [-b <branch-name> | --initial-branch=<branch-name>]\n"
9132 " [--shared[=<permissions>]] [<directory>]"
9133 msgstr ""
9134 "git init [-q | --quiet] [--bare] [--template=<direktori templat>]\n"
9135 " [--separate-git-dir <direktori git>] [--object-format=<format>]\n"
9136 +"\t [--ref-format=<format>]\n"
9137 " [-b <nama cabang> | --initial-branch=<nama cabang>]\n"
9138 " [--shared[=<perizinan>]] [<direktori>]"
9139
@@ -9280,7 +9298,7 @@ msgstr ""
9298 "lacak evolusi rentang baris <awal>,<akhir> atau fungsi :<nama fungsi> dalam "
9299 "<berkas>"
9300
9283 -#: builtin/log.c builtin/shortlog.c bundle.c
9301 +#: builtin/log.c builtin/replay.c builtin/shortlog.c bundle.c
9302 #, c-format
9303 msgid "unrecognized argument: %s"
9304 msgstr "argumen tidak dikenal: %s"
@@ -10036,6 +10054,14 @@ msgstr ""
10054 "git merge-file [<opsi>] [-L <nama 1> [-L <asli> [-L <nama 2>]]] <berkas 1> "
10055 "<berkas asli> <berkas 2>"
10056
10057 +#: builtin/merge-file.c diff.c
10058 +msgid ""
10059 +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
10060 +"\"histogram\""
10061 +msgstr ""
10062 +"opsi diff-algorithm terima \"myers\", \"minimal\", \"patience\" dan "
10063 +"\"histogram\""
10064 +
10065 #: builtin/merge-file.c
10066 msgid "send results to standard output"
10067 msgstr "kirim hasil ke keluaran standar"
@@ -10064,6 +10090,14 @@ msgstr "untuk konflik, gunakan versi mereka"
10090 msgid "for conflicts, use a union version"
10091 msgstr "untuk konflik, gunakan versi bersatu"
10092
10093 +#: builtin/merge-file.c diff.c
10094 +msgid "<algorithm>"
10095 +msgstr "<algoritma>"
10096 +
10097 +#: builtin/merge-file.c diff.c
10098 +msgid "choose a diff algorithm"
10099 +msgstr "pilih algoritma diff"
10100 +
10101 #: builtin/merge-file.c
10102 msgid "for conflicts, use this marker size"
10103 msgstr "untuk konflik, gunakan ukuran penanda ini"
@@ -10181,10 +10215,6 @@ msgstr "--trivial-merge tidak kompatibel dengan semua opsi lainnya"
10215 msgid "unknown strategy option: -X%s"
10216 msgstr "opsi strategi tidak dikenal: -X%s"
10217
10184 -#: builtin/merge-tree.c
10185 -msgid "--merge-base is incompatible with --stdin"
10186 -msgstr "--merge-base tidak kompatibel dengan --stdin"
10187 -
10218 #: builtin/merge-tree.c builtin/notes.c
10219 #, c-format
10220 msgid "malformed input line: '%s'."
@@ -10342,7 +10372,7 @@ msgstr "'%s' tidak menunjuk pada sebuah komit"
10372 msgid "Bad branch.%s.mergeoptions string: %s"
10373 msgstr "Untai branch.%s.mergeoptions jelek: %s"
10374
10345 -#: builtin/merge.c builtin/stash.c merge-recursive.c
10375 +#: builtin/merge.c merge-recursive.c
10376 msgid "Unable to write index."
10377 msgstr "Tidak dapat menulis indeks."
10378
@@ -10350,7 +10380,7 @@ msgstr "Tidak dapat menulis indeks."
10380 msgid "Not handling anything other than two heads merge."
10381 msgstr "Tak tangani apapun selain penggabungan dua kepala."
10382
10353 -#: builtin/merge.c t/helper/test-fast-rebase.c
10383 +#: builtin/merge.c
10384 #, c-format
10385 msgid "unable to write %s"
10386 msgstr "tidak dapat menulis %s"
@@ -11363,6 +11393,11 @@ msgstr "Memampatkan objek"
11393 msgid "inconsistency with delta count"
11394 msgstr "ketidakkonsistenan dengan hitungan delta"
11395
11396 +#: builtin/pack-objects.c
11397 +#, c-format
11398 +msgid "invalid pack.allowPackReuse value: '%s'"
11399 +msgstr "nilai pack.allowPackReuse tidak valid: '%s'"
11400 +
11401 #: builtin/pack-objects.c
11402 #, c-format
11403 msgid ""
@@ -11694,10 +11729,10 @@ msgstr "Menghitung objek"
11729 #, c-format
11730 msgid ""
11731 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
11697 -"reused %<PRIu32>"
11732 +"reused %<PRIu32> (from %<PRIuMAX>)"
11733 msgstr ""
11734 "Total %<PRIu32> (delta %<PRIu32>), digunakan ulang %<PRIu32> (delta "
11700 -"%<PRIu32>), pak yang digunakan ulang %<PRIu32>"
11735 +"%<PRIu32>), pak yang digunakan ulang %<PRIu32> (dari %<PRIuMAX>)"
11736
11737 #: builtin/pack-redundant.c
11738 msgid ""
@@ -12816,7 +12851,7 @@ msgid "The --edit-todo action can only be used during interactive rebase."
12851 msgstr ""
12852 "Aksi --edit-todo hanya dapat digunakan selama pendasaran ulang interaktif."
12853
12819 -#: builtin/rebase.c t/helper/test-fast-rebase.c
12854 +#: builtin/rebase.c
12855 msgid "Cannot read HEAD"
12856 msgstr "Tidak dapat membaca HEAD"
12857
@@ -12862,14 +12897,6 @@ msgstr ""
12897 msgid "switch `C' expects a numerical value"
12898 msgstr "tombol `C' harap nilai numerik"
12899
12865 -#: builtin/rebase.c
12866 -msgid ""
12867 -"apply options are incompatible with rebase.autoSquash. Consider adding --no-"
12868 -"autosquash"
12869 -msgstr ""
12870 -"opsi penerapan tidak kompatibel dengan rebase.autoSquash. "
12871 -"Pertimbangkanmenambahkan --no-autosquash"
12872 -
12900 #: builtin/rebase.c
12901 msgid ""
12902 "apply options are incompatible with rebase.rebaseMerges. Consider adding --"
@@ -13368,10 +13395,10 @@ msgid_plural ""
13395 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
13396 "to delete them, use:"
13397 msgstr[0] ""
13371 -"Catatan: Sebuah cabang diluar hierarki refs/remotes tidak dihapus;\n"
13398 +"Catatan: Sebuah cabang diluar hierarki refs/remotes/ tidak dihapus;\n"
13399 "untuk menghapusnya, gunakan:"
13400 msgstr[1] ""
13374 -"Catatan: Beberapa cabang diluar hierarki refs/remotes tidak dihapus;\n"
13401 +"Catatan: Beberapa cabang diluar hierarki refs/remotes/ tidak dihapus;\n"
13402 "untuk menghapusnya, gunakan:"
13403
13404 #: builtin/remote.c
@@ -14108,6 +14135,94 @@ msgstr "--convert-graft-file tidak mengambil argumen"
14135 msgid "only one pattern can be given with -l"
14136 msgstr "hanya satu pola yang dapat diberikan dengan -l"
14137
14138 +#: builtin/replay.c
14139 +msgid "need some commits to replay"
14140 +msgstr "butuh beberapa komit untuk dimainkan ulang"
14141 +
14142 +#: builtin/replay.c
14143 +msgid "--onto and --advance are incompatible"
14144 +msgstr "--onto dan --advance tidak kompatibel"
14145 +
14146 +#: builtin/replay.c
14147 +msgid "all positive revisions given must be references"
14148 +msgstr "semua revisi positif yang diberikan haruslah referensi"
14149 +
14150 +#: builtin/replay.c
14151 +msgid "argument to --advance must be a reference"
14152 +msgstr "argumen pada --advance harus sebuah referensi"
14153 +
14154 +#: builtin/replay.c
14155 +msgid ""
14156 +"cannot advance target with multiple sources because ordering would be ill-"
14157 +"defined"
14158 +msgstr ""
14159 +"tidak dapat memajukan target dengan banyak sumber karena pengurutannya akan "
14160 +"menjadi tidak jelas"
14161 +
14162 +#: builtin/replay.c
14163 +msgid ""
14164 +"cannot implicitly determine whether this is an --advance or --onto operation"
14165 +msgstr ""
14166 +"tidak dapat menentukan secara tidak langsung apakah ini operasi --advance "
14167 +"atau --onto"
14168 +
14169 +#: builtin/replay.c
14170 +msgid ""
14171 +"cannot advance target with multiple source branches because ordering would "
14172 +"be ill-defined"
14173 +msgstr ""
14174 +"tidak dapat memajukan target dengan banyak cabang sumber karena "
14175 +"pengurutannya akan menjadi tidak jelas"
14176 +
14177 +#: builtin/replay.c
14178 +msgid "cannot implicitly determine correct base for --onto"
14179 +msgstr "tidak dapat menentukan secara tidak langsung dasar untuk --onto"
14180 +
14181 +#: builtin/replay.c
14182 +msgid ""
14183 +"(EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance "
14184 +"<branch>) <revision-range>..."
14185 +msgstr ""
14186 +"(EKSPERIMENTAL!) git replay ([--contained] --onto <dasar baru> | --advance "
14187 +"<cabang>) <rentang revisi>..."
14188 +
14189 +#: builtin/replay.c
14190 +msgid "make replay advance given branch"
14191 +msgstr "buat pemainan ulang memajukan caban yang diberikan"
14192 +
14193 +#: builtin/replay.c
14194 +msgid "replay onto given commit"
14195 +msgstr "mainkan ulang pada komit yang diberikan"
14196 +
14197 +#: builtin/replay.c
14198 +msgid "advance all branches contained in revision-range"
14199 +msgstr "majukan semua cabang yang berada pada rentang komit"
14200 +
14201 +#: builtin/replay.c
14202 +msgid "option --onto or --advance is mandatory"
14203 +msgstr "opsi --onto atau --advance diwajibkan"
14204 +
14205 +#: builtin/replay.c
14206 +#, c-format
14207 +msgid ""
14208 +"some rev walking options will be overridden as '%s' bit in 'struct rev_info' "
14209 +"will be forced"
14210 +msgstr ""
14211 +"beberapa opsi jalan revisi akan ditimpa oleh karena bit '%s' di 'struct "
14212 +"rev_info' akan dipaksakan"
14213 +
14214 +#: builtin/replay.c
14215 +msgid "error preparing revisions"
14216 +msgstr "kesalahan menyiapkan revisi"
14217 +
14218 +#: builtin/replay.c
14219 +msgid "replaying down to root commit is not supported yet!"
14220 +msgstr "memainkan ulang ke komit akar belum didukung!"
14221 +
14222 +#: builtin/replay.c
14223 +msgid "replaying merge commits is not supported yet!"
14224 +msgstr "memainkan ulang komit penggabungan belum didukung!"
14225 +
14226 #: builtin/rerere.c
14227 msgid ""
14228 "git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]"
@@ -14370,18 +14485,6 @@ msgstr "--prefix butuh sebuah argumen"
14485 msgid "unknown mode for --abbrev-ref: %s"
14486 msgstr "mode untuk --abbrev-ref tidak dikenal: %s"
14487
14373 -#: builtin/rev-parse.c revision.c
14374 -msgid "--exclude-hidden cannot be used together with --branches"
14375 -msgstr "--exclude-hidden tidak dapat digunakan bersamaan dengan --branches"
14376 -
14377 -#: builtin/rev-parse.c revision.c
14378 -msgid "--exclude-hidden cannot be used together with --tags"
14379 -msgstr "--exclude-hidden tidak dapat digunakan bersamaan dengan --tags"
14380 -
14381 -#: builtin/rev-parse.c revision.c
14382 -msgid "--exclude-hidden cannot be used together with --remotes"
14383 -msgstr "--exclude-hidden tidak dapat digunakan dengan --remotes"
14384 -
14488 #: builtin/rev-parse.c setup.c
14489 msgid "this operation must be run in a work tree"
14490 msgstr "operasi ini harus dijalankan di dalam pohon kerja"
@@ -14894,11 +14997,6 @@ msgstr ""
14997 "perlihatkan referensi dari masukan standar yang tidak ada dalam repositori "
14998 "lokal"
14999
14897 -#: builtin/show-ref.c
14898 -#, c-format
14899 -msgid "only one of '%s', '%s' or '%s' can be given"
14900 -msgstr "hanya salah satu dari '%s', '%s', dan '%s' dapat diberikan"
14901 -
15000 #: builtin/sparse-checkout.c
15001 msgid ""
15002 "git sparse-checkout (init | list | set | add | reapply | disable | check-"
@@ -16720,7 +16818,7 @@ msgstr "Tidak ada cabang sumber yang mungkin, menyimpulkan '--orphan'"
16818 #: builtin/worktree.c
16819 #, c-format
16820 msgid ""
16723 -"If you meant to create a worktree containing a new orphan branch\n"
16821 +"If you meant to create a worktree containing a new unborn branch\n"
16822 "(branch with no commits) for this repository, you can do so\n"
16823 "using the --orphan flag:\n"
16824 "\n"
@@ -16734,7 +16832,7 @@ msgstr ""
16832 #: builtin/worktree.c
16833 #, c-format
16834 msgid ""
16737 -"If you meant to create a worktree containing a new orphan branch\n"
16835 +"If you meant to create a worktree containing a new unborn branch\n"
16836 "(branch with no commits) for this repository, you can do so\n"
16837 "using the --orphan flag:\n"
16838 "\n"
@@ -16812,6 +16910,11 @@ msgstr "tidak dapat membuat direktori '%s'"
16910 msgid "initializing"
16911 msgstr "menginisialisasi"
16912
16913 +#: builtin/worktree.c
16914 +#, c-format
16915 +msgid "could not find created worktree '%s'"
16916 +msgstr "tidak dapat menemukan pohon kerja yang dibuat '%s'"
16917 +
16918 #: builtin/worktree.c
16919 #, c-format
16920 msgid "Preparing worktree (new branch '%s')"
@@ -16858,11 +16961,6 @@ msgstr ""
16961 "ada, berhenti; gunakan 'add -f' untuk menimpa atau mengambil remote\n"
16962 "terlebih dahulu"
16963
16861 -#: builtin/worktree.c
16862 -#, c-format
16863 -msgid "'%s' and '%s' cannot be used together"
16864 -msgstr "'%s' dan '%s' tidak dapat digunakan bersamaan"
16865 -
16964 #: builtin/worktree.c
16965 msgid "checkout <branch> even if already checked out in other worktree"
16966 msgstr ""
@@ -16877,7 +16975,7 @@ msgid "create or reset a branch"
16975 msgstr "buat atau setel ulang sebuah cabang"
16976
16977 #: builtin/worktree.c
16880 -msgid "create unborn/orphaned branch"
16978 +msgid "create unborn branch"
16979 msgstr "buat cabang belum lahir/yatim"
16980
16981 #: builtin/worktree.c
@@ -16907,12 +17005,8 @@ msgstr "Opsi '%s', '%s', dan '%s' tidak dapat digunakan bersamaan"
17005
17006 #: builtin/worktree.c
17007 #, c-format
16910 -msgid "options '%s', and '%s' cannot be used together"
16911 -msgstr "Opsi '%s', dan '%s' tidak dapat digunakan bersamaan"
16912 -
16913 -#: builtin/worktree.c
16914 -msgid "<commit-ish>"
16915 -msgstr "<mirip-komit>"
17008 +msgid "option '%s' and commit-ish cannot be used together"
17009 +msgstr "opsi '%s' dan mirip-komit tidak dapat digunakan bersamaan"
17010
17011 #: builtin/worktree.c
17012 msgid "added with --lock"
@@ -17714,6 +17808,12 @@ msgstr "Pak objek tak terpak di dalam repositori"
17808 msgid "Create, list, delete refs to replace objects"
17809 msgstr "Buat, daftar, hapus referensi untuk mengganti objek"
17810
17811 +#: command-list.h
17812 +msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too"
17813 +msgstr ""
17814 +"EKSPERIMENTAL: Mainkan ulang komit pada dasar baru, dan juga bekerja pada "
17815 +"repositori bare"
17816 +
17817 #: command-list.h
17818 msgid "Generates a summary of pending changes"
17819 msgstr "Buat ringkasan perubahan tertunda"
@@ -18031,6 +18131,39 @@ msgstr "Alat untuk mengelola repositori Git besar"
18131 msgid "commit-graph file is too small"
18132 msgstr "berkas grafik komit terlalu kecil"
18133
18134 +#: commit-graph.c
18135 +msgid "commit-graph oid fanout chunk is wrong size"
18136 +msgstr "bingkah oid grafik komit kipas keluar salah ukuran"
18137 +
18138 +#: commit-graph.c
18139 +msgid "commit-graph fanout values out of order"
18140 +msgstr "nilai kipas keluar grafik komit tidak berurutan"
18141 +
18142 +#: commit-graph.c
18143 +msgid "commit-graph OID lookup chunk is the wrong size"
18144 +msgstr "bingkah OID pencarian grafik komit salah ukuran"
18145 +
18146 +#: commit-graph.c
18147 +msgid "commit-graph commit data chunk is wrong size"
18148 +msgstr "bingkah data grafik komit salah ukuran"
18149 +
18150 +#: commit-graph.c
18151 +msgid "commit-graph generations chunk is wrong size"
18152 +msgstr "bingkah generasi grafik komit salah ukuran"
18153 +
18154 +#: commit-graph.c
18155 +msgid "commit-graph changed-path index chunk is too small"
18156 +msgstr "bingkah indeks grafik komit jalur berubah terlalu kecil"
18157 +
18158 +#: commit-graph.c
18159 +#, c-format
18160 +msgid ""
18161 +"ignoring too-small changed-path chunk (%<PRIuMAX> < %<PRIuMAX>) in commit-"
18162 +"graph file"
18163 +msgstr ""
18164 +"mengabaikan bingkah jalur berubah yang terlalu kecil (%<PRIuMAX> < "
18165 +"%<PRIuMAX>) di dalam berkas grafik komit"
18166 +
18167 #: commit-graph.c
18168 #, c-format
18169 msgid "commit-graph signature %X does not match signature %X"
@@ -18051,6 +18184,19 @@ msgstr "versi hash grafik komit %X tidak cocok dengan versi %X"
18184 msgid "commit-graph file is too small to hold %u chunks"
18185 msgstr "berkas grafik komit terlalu kecil untuk menyimpan %u bingkah"
18186
18187 +#: commit-graph.c
18188 +msgid "commit-graph required OID fanout chunk missing or corrupted"
18189 +msgstr ""
18190 +"bingkah grafik komit OID kipas keluar yang diperlukan hilang atau rusak"
18191 +
18192 +#: commit-graph.c
18193 +msgid "commit-graph required OID lookup chunk missing or corrupted"
18194 +msgstr "bingkah grafik komit OID pencarian yang diperlukan hilang atau rusak"
18195 +
18196 +#: commit-graph.c
18197 +msgid "commit-graph required commit data chunk missing or corrupted"
18198 +msgstr "bingkah grafik komit data komit yang diperlukan hilang atau rusak"
18199 +
18200 #: commit-graph.c
18201 msgid "commit-graph has no base graphs chunk"
18202 msgstr "grafik komit tidak punya bingkah grafik dasar"
@@ -18068,6 +18214,10 @@ msgstr "rantai grafik komit tidak cocok"
18214 msgid "commit count in base graph too high: %<PRIuMAX>"
18215 msgstr "jumlah komit pada grafik dasar terlalu tinggi: %<PRIuMAX>"
18216
18217 +#: commit-graph.c
18218 +msgid "commit-graph chain file too small"
18219 +msgstr "berkas rantai grafik komit terlalu kecil"
18220 +
18221 #: commit-graph.c
18222 #, c-format
18223 msgid "invalid commit-graph chain: line '%s' not a hash"
@@ -18094,6 +18244,10 @@ msgstr "grafik komit memerlukan pembuatan data meluap tapi tidak punya"
18244 msgid "commit-graph overflow generation data is too small"
18245 msgstr "data generasi luapan grafik komit terlalu kecil"
18246
18247 +#: commit-graph.c
18248 +msgid "commit-graph extra-edges pointer out of bounds"
18249 +msgstr "penunjuk tepi tambahan grafik komit di luar batas"
18250 +
18251 #: commit-graph.c
18252 msgid "Loading known commits in commit graph"
18253 msgstr "Memuat komit yang dikenal di grafik komit"
@@ -19505,6 +19659,11 @@ msgstr ""
19659 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
19660 msgstr "Nilai tidak dikenal untuk variabel konfigurasi 'diff.submodule': '%s'"
19661
19662 +#: diff.c transport.c
19663 +#, c-format
19664 +msgid "unknown value for config '%s': %s"
19665 +msgstr "nilai tidak dikenal untuk konfigurasi '%s': %s"
19666 +
19667 #: diff.c
19668 #, c-format
19669 msgid ""
@@ -19601,14 +19760,6 @@ msgstr "argumen --color-moved jelek: %s"
19760 msgid "invalid mode '%s' in --color-moved-ws"
19761 msgstr "mode tidak valid '%s' dalam --color-moved-ws"
19762
19604 -#: diff.c
19605 -msgid ""
19606 -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
19607 -"\"histogram\""
19608 -msgstr ""
19609 -"opsi diff-algorithm terima \"myers\", \"minimal\", \"patience\" dan "
19610 -"\"histogram\""
19611 -
19763 #: diff.c
19764 #, c-format
19765 msgid "invalid argument to %s"
@@ -19666,8 +19817,8 @@ msgid "output only the last line of --stat"
19817 msgstr "keluarkan hanya baris terakhir --stat"
19818
19819 #: diff.c
19669 -msgid "<param1,param2>..."
19670 -msgstr "<parameter 1,parameter 2>..."
19820 +msgid "<param1>,<param2>..."
19821 +msgstr "<parameter 1>,<parameter 2>..."
19822
19823 #: diff.c
19824 msgid ""
@@ -19680,8 +19831,8 @@ msgid "synonym for --dirstat=cumulative"
19831 msgstr "sinonim untuk --dirstat=cumulative"
19832
19833 #: diff.c
19683 -msgid "synonym for --dirstat=files,param1,param2..."
19684 -msgstr "sinonim untuk --dirstat=files,param1,param2..."
19834 +msgid "synonym for --dirstat=files,<param1>,<param2>..."
19835 +msgstr "sinonim untuk --dirstat=files,<parameter 1>,<parameter 2>..."
19836
19837 #: diff.c
19838 msgid "warn if changes introduce conflict markers or whitespace errors"
@@ -19913,14 +20064,6 @@ msgstr "buat diff menggunakan algoritma \"diff sabar\""
20064 msgid "generate diff using the \"histogram diff\" algorithm"
20065 msgstr "buat diff menggunakan algoritma \"diff histogram\""
20066
19916 -#: diff.c
19917 -msgid "<algorithm>"
19918 -msgstr "<algoritma>"
19919 -
19920 -#: diff.c
19921 -msgid "choose a diff algorithm"
19922 -msgstr "pilih algoritma diff"
19923 -
20067 #: diff.c
20068 msgid "<text>"
20069 msgstr "<teks>"
@@ -21729,6 +21872,14 @@ msgstr "gagal membaca tembolok"
21872 msgid "multi-pack-index OID fanout is of the wrong size"
21873 msgstr "OID kipas-keluar indeks multipak salah ukuran"
21874
21875 +#: midx.c
21876 +#, c-format
21877 +msgid ""
21878 +"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
21879 +msgstr ""
21880 +"kipas-keluar oid tidak berurutan: fanout[%d] =%<PRIx32> > %<PRIx32> = "
21881 +"fanout[%d]"
21882 +
21883 #: midx.c
21884 msgid "multi-pack-index OID lookup chunk is the wrong size"
21885 msgstr "bingkah pencarian OID kipas-keluar indeks multipak salah ukuran"
@@ -21790,6 +21941,15 @@ msgstr "nama pak indeks multipak tidak berurutan: '%s' sebelum '%s'"
21941 msgid "bad pack-int-id: %u (%u total packs)"
21942 msgstr "pack-int-id jelek: %u (total pak %u)"
21943
21944 +#: midx.c
21945 +msgid "MIDX does not contain the BTMP chunk"
21946 +msgstr "MIDX tidak berisi bingkah BTMP"
21947 +
21948 +#: midx.c
21949 +#, c-format
21950 +msgid "could not load bitmapped pack %<PRIu32>"
21951 +msgstr "tidak dapat membuka pak terbitmap %<PRIu32>"
21952 +
21953 #: midx.c
21954 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
21955 msgstr "indeks multipak simpan offset 64-bit, tapi off_t terlalu kecil"
@@ -21897,14 +22057,6 @@ msgstr "checksum salah"
22057 msgid "Looking for referenced packfiles"
22058 msgstr "Mencari berkas pak yang direferensikan"
22059
21900 -#: midx.c
21901 -#, c-format
21902 -msgid ""
21903 -"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
21904 -msgstr ""
21905 -"kipas-keluar oid tidak berurutan: fanout[%d] =%<PRIx32> > %<PRIx32> = "
21906 -"fanout[%d]"
21907 -
22060 #: midx.c
22061 msgid "the midx contains no oid"
22062 msgstr "midx tidak berisi oid"
@@ -22542,6 +22694,10 @@ msgstr "bitmap multipak kehilangan indeks balik yang diperlukan"
22694 msgid "could not open pack %s"
22695 msgstr "tidak dapat membuka '%s'"
22696
22697 +#: pack-bitmap.c t/helper/test-read-midx.c
22698 +msgid "could not determine MIDX preferred pack"
22699 +msgstr "tidak dapat menentukan pak MIDX terpilih"
22700 +
22701 #: pack-bitmap.c
22702 #, c-format
22703 msgid "preferred pack (%s) is invalid"
@@ -22565,6 +22721,11 @@ msgstr "tabel pencarian bitmap rusak: indeks komit %u di luar jangkauan"
22721 msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\""
22722 msgstr "bitmap ewah rusak: kepala terpotong untuk bitmap komit \"%s\""
22723
22724 +#: pack-bitmap.c
22725 +#, c-format
22726 +msgid "unable to load pack: '%s', disabling pack-reuse"
22727 +msgstr "tidak dapat memuat pak: '%s', mematikan penggunaan ulang pak"
22728 +
22729 #: pack-bitmap.c
22730 #, c-format
22731 msgid "object '%s' not found in type bitmaps"
@@ -22680,6 +22841,10 @@ msgstr "posisi indeks balik tidak valid pada %<PRIu64>: %<PRIu32> != %<PRIu32>"
22841 msgid "multi-pack-index reverse-index chunk is the wrong size"
22842 msgstr "bingkah indeks balik multipak salah ukuran"
22843
22844 +#: pack-revindex.c
22845 +msgid "could not determine preferred pack"
22846 +msgstr "tidak dapat menentukan pak terpilih"
22847 +
22848 #: pack-write.c
22849 msgid "cannot both write and verify reverse index"
22850 msgstr "tidak dapat kedua-duanya menulis dan memverifikasi indeks balik"
@@ -22760,11 +22925,6 @@ msgstr ""
22925 "%s mengharapkan nilai bilangan bulat non negatif dengan akhiran opsional k/m/"
22926 "g"
22927
22763 -#: parse-options.c
22764 -#, c-format
22765 -msgid "%s is incompatible with %s"
22766 -msgstr "%s tidak kompatibel dengan %s"
22767 -
22928 #: parse-options.c
22929 #, c-format
22930 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
@@ -23164,11 +23324,6 @@ msgstr "tidak dapat menulis berkas indeks '%s'"
23324 msgid "unable to add '%s' to index"
23325 msgstr "tidak dapat menambahkan '%s' ke indeks"
23326
23167 -#: read-cache.c
23168 -#, c-format
23169 -msgid "unable to stat '%s'"
23170 -msgstr "tidak dapat men-stat '%s'"
23171 -
23327 #: read-cache.c
23328 #, c-format
23329 msgid "'%s' appears as both a file and as a directory"
@@ -23855,17 +24010,12 @@ msgstr "'%s' ada; tidak dapat membuat '%s'"
24010 msgid "cannot process '%s' and '%s' at the same time"
24011 msgstr "tidak dapat memproses '%s' dan '%s' pada waktu yang bersamaan"
24012
23858 -#: refs/files-backend.c
23859 -#, c-format
23860 -msgid "could not remove reference %s"
23861 -msgstr "tidak dapat menghapus referensi %s"
23862 -
23863 -#: refs/files-backend.c refs/packed-backend.c
24013 +#: refs.c
24014 #, c-format
24015 msgid "could not delete reference %s: %s"
24016 msgstr "tidak dapat menghapus referensi %s: %s"
24017
23868 -#: refs/files-backend.c refs/packed-backend.c
24018 +#: refs.c
24019 #, c-format
24020 msgid "could not delete references: %s"
24021 msgstr "tidak dapat menghapus referensi: %s"
@@ -24100,9 +24250,9 @@ msgid ""
24250 msgstr ""
24251 "Tujuan yang Anda berikan bukan nama referensi penuh (seperti \n"
24252 "dimulai dengan \"refs/\"). Kami mencoba menebak maksud Anda dengan:\n"
24103 -"- Cari referensi yang cocok dengan '%s' pada sisi remote.\n"
24104 -"- Perika apakah <src> yang sedang didorong ('%s') adalah \n"
24105 -" referensi pada \"refs/{heads,tags}\". Bila demikian kami \n"
24253 +"- mencari referensi yang cocok dengan '%s' pada sisi remote.\n"
24254 +"- memeriksa apakah <src> yang sedang didorong ('%s') adalah \n"
24255 +" referensi pada \"refs/{heads,tags}/\". Bila demikian kami \n"
24256 " menambahkan awalan refs/{heads,tags}/ yang bersesuaian pada sisi \n"
24257 " remote.\n"
24258 "\n"
@@ -25042,7 +25192,7 @@ msgstr "identitas pengarang tidak valid '%s'"
25192 msgid "corrupt author: missing date information"
25193 msgstr "pengarang rusak: informasi tanggal hilang"
25194
25045 -#: sequencer.c t/helper/test-fast-rebase.c
25195 +#: sequencer.c
25196 #, c-format
25197 msgid "could not update %s"
25198 msgstr "tidak dapat memperbarui %s"
@@ -25536,6 +25686,10 @@ msgstr "Menerapkan stase otomatis menghasilkan konflik."
25686 msgid "Autostash exists; creating a new stash entry."
25687 msgstr "Stase otomatis sudah ada; membuat entri stase baru."
25688
25689 +#: sequencer.c
25690 +msgid "autostash reference is a symref"
25691 +msgstr "referensi autostase itu referensi simbolik"
25692 +
25693 #: sequencer.c
25694 msgid "could not detach HEAD"
25695 msgstr "tidak dapat melepas HEAD"
@@ -25916,6 +26070,11 @@ msgstr "tidak menyalin templat dari '%s': %s"
26070 msgid "invalid initial branch name: '%s'"
26071 msgstr "nama cabang asal salah: '%s'"
26072
26073 +#: setup.c
26074 +#, c-format
26075 +msgid "re-init: ignored --initial-branch=%s"
26076 +msgstr "re-init: --initial-branch=%s diabaikan"
26077 +
26078 #: setup.c
26079 #, c-format
26080 msgid "unable to handle file type %d"
@@ -25931,14 +26090,16 @@ msgid "attempt to reinitialize repository with different hash"
26090 msgstr "mencoba menginisialisasi ulang repositori dengan hash yang berbeda"
26091
26092 #: setup.c
25934 -#, c-format
25935 -msgid "%s already exists"
25936 -msgstr "%s sudah ada"
26093 +msgid ""
26094 +"attempt to reinitialize repository with different reference storage format"
26095 +msgstr ""
26096 +"mencoba menginisialisasi ulang repositori dengan format penyimpanan "
26097 +"referensi yang berbeda"
26098
26099 #: setup.c
26100 #, c-format
25940 -msgid "re-init: ignored --initial-branch=%s"
25941 -msgstr "re-init: --initial-branch=%s diabaikan"
26101 +msgid "%s already exists"
26102 +msgstr "%s sudah ada"
26103
26104 #: setup.c
26105 #, c-format
@@ -26264,14 +26425,6 @@ msgstr "bersihkan pohon tembolok sebelum setiap iterasi"
26425 msgid "number of entries in the cache tree to invalidate (default 0)"
26426 msgstr "jumlah entri di dalam pohon tembolok untuk dinirvalidasi (asali 0)"
26427
26267 -#: t/helper/test-fast-rebase.c
26268 -msgid "unhandled options"
26269 -msgstr "opsi tak tertangani"
26270 -
26271 -#: t/helper/test-fast-rebase.c
26272 -msgid "error preparing revisions"
26273 -msgstr "kesalahan menyiapkan revisi"
26274 -
26428 #: t/helper/test-reach.c
26429 #, c-format
26430 msgid "commit %s is not marked reachable"
@@ -26469,10 +26622,6 @@ msgstr "menyetel jalur layanan remote tidak didukung oleh protokol"
26622 msgid "invalid remote service path"
26623 msgstr "jalur layanan remote tidak valid"
26624
26472 -#: transport-helper.c transport.c
26473 -msgid "operation not supported by protocol"
26474 -msgstr "operasi tidak didukung oleh protokol"
26475 -
26625 #: transport-helper.c
26626 #, c-format
26627 msgid "can't connect to subservice %s"
@@ -26636,11 +26785,6 @@ msgstr "tidak dapat menguraikan konfigurasi transport.color.*"
26785 msgid "support for protocol v2 not implemented yet"
26786 msgstr "dukungan untuk protokol v2 belum diterapkan"
26787
26639 -#: transport.c
26640 -#, c-format
26641 -msgid "unknown value for config '%s': %s"
26642 -msgstr "nilai tidak dikenal untuk konfigurasi '%s': %s"
26643 -
26788 #: transport.c
26789 #, c-format
26790 msgid "transport '%s' not allowed"
@@ -26701,6 +26845,10 @@ msgstr "operasi bundle-uri tidak didukung oleh protokol"
26845 msgid "could not retrieve server-advertised bundle-uri list"
26846 msgstr "tidak dapat menerima daftar bundle-uri teriklankan server"
26847
26848 +#: transport.c
26849 +msgid "operation not supported by protocol"
26850 +msgstr "operasi tidak didukung oleh protokol"
26851 +
26852 #: tree-walk.c
26853 msgid "too-short tree object"
26854 msgstr "objek pohon terlalu pendek"
@@ -27722,6 +27870,11 @@ msgstr "juga indeks Anda berisi perubahan yang belum dikomit."
27870 msgid "cannot %s: Your index contains uncommitted changes."
27871 msgstr "tidak dapat %s: indeks Anda berisi perubahan yang belum dikomit."
27872
27873 +#: xdiff-interface.c
27874 +#, c-format
27875 +msgid "unknown style '%s' given for '%s'"
27876 +msgstr "nilai gaya tidak dikenal '%s' diberikan untuk '%s'"
27877 +
27878 #: git-merge-octopus.sh git-merge-resolve.sh
27879 msgid ""
27880 "Error: Your local changes to the following files would be overwritten by "