@matheusbsbs / matheus-bagliano / commits / 1df318be63

l10n: id: po-id for 2.32.0 (round 1)

Translate following components: * builtin/add.c * worktree.c * builtin/branch.c * builtin/commit.c * builtin/merge.c * builtin/rebase.c * builtin/pull.c * diff.c * add-interactive.c * builtin/log.c * builtin/stash.c * builtin/tag.c * config.c * builtin/config.c * reset.c * builtin/remote.c * builtin/rm.c * builtin/mv.c * builtin/clean.c * builtin/help.c * archive.c * submodule.c * builtin/submodule--helper.c * submodule-config.c Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>

Bagas Sanjaya committed Apr 17, 2021 at 17:53 UTC 1df318be6342b6c1fd57911e45c107f720b53131
1 file changed +5372 -4437
po/id.po
+5372 -4437
@@ -7,8 +7,8 @@ msgid ""
7 msgstr ""
8 "Project-Id-Version: Git\n"
9 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
10 -"POT-Creation-Date: 2021-03-04 22:41+0800\n"
11 -"PO-Revision-Date: 2021-02-20 18:07+0700\n"
10 +"POT-Creation-Date: 2021-05-17 16:02+0800\n"
11 +"PO-Revision-Date: 2021-05-17 18:32+0700\n"
12 "Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n"
13 "Language-Team: Indonesian\n"
14 "Language: id\n"
@@ -20,238 +20,240 @@ msgstr ""
20 #: add-interactive.c:376
21 #, c-format
22 msgid "Huh (%s)?"
23 -msgstr ""
23 +msgstr "Huh (%s)"
24
25 -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292
26 -#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538
27 -#: builtin/rebase.c:1963
25 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
26 +#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528
27 +#: builtin/rebase.c:1953
28 msgid "could not read index"
29 -msgstr ""
29 +msgstr "tidak dapat membaca indeks"
30
31 #: add-interactive.c:584 git-add--interactive.perl:269
32 #: git-add--interactive.perl:294
33 msgid "binary"
34 -msgstr ""
34 +msgstr "biner"
35
36 #: add-interactive.c:642 git-add--interactive.perl:278
37 #: git-add--interactive.perl:332
38 msgid "nothing"
39 -msgstr ""
39 +msgstr "tidak ada"
40
41 #: add-interactive.c:643 git-add--interactive.perl:314
42 #: git-add--interactive.perl:329
43 msgid "unchanged"
44 -msgstr ""
44 +msgstr "tak berubah"
45
46 #: add-interactive.c:680 git-add--interactive.perl:641
47 msgid "Update"
48 -msgstr ""
48 +msgstr "Perbarui"
49
50 #: add-interactive.c:697 add-interactive.c:885
51 #, c-format
52 msgid "could not stage '%s'"
53 -msgstr ""
53 +msgstr "tidak dapat menggelar '%s'"
54
55 -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486
55 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687
56 msgid "could not write index"
57 -msgstr ""
57 +msgstr "tidak dapat menulis indeks"
58
59 #: add-interactive.c:706 git-add--interactive.perl:626
60 #, c-format, perl-format
61 msgid "updated %d path\n"
62 msgid_plural "updated %d paths\n"
63 -msgstr[0] ""
64 -msgstr[1] ""
63 +msgstr[0] "%d jalur diperbarui\n"
64 +msgstr[1] "%d jalur diperbarui\n"
65
66 #: add-interactive.c:724 git-add--interactive.perl:676
67 #, c-format, perl-format
68 msgid "note: %s is untracked now.\n"
69 -msgstr ""
69 +msgstr "catatan: %s sekarang tak terlacak.\n"
70
71 -#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295
71 +#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
72 #: builtin/reset.c:145
73 #, c-format
74 msgid "make_cache_entry failed for path '%s'"
75 -msgstr ""
75 +msgstr "make_cache_entry gagal untuk jalur '%s'"
76
77 #: add-interactive.c:759 git-add--interactive.perl:653
78 msgid "Revert"
79 -msgstr ""
79 +msgstr "Kembalikan"
80
81 #: add-interactive.c:775
82 msgid "Could not parse HEAD^{tree}"
83 -msgstr ""
83 +msgstr "Tidak dapat menguraikan HEAD^{tree}"
84
85 #: add-interactive.c:813 git-add--interactive.perl:629
86 #, c-format, perl-format
87 msgid "reverted %d path\n"
88 msgid_plural "reverted %d paths\n"
89 -msgstr[0] ""
90 -msgstr[1] ""
89 +msgstr[0] "%d jalur dikembalikan\n"
90 +msgstr[1] "%d jalur dikembalikan\n"
91
92 #: add-interactive.c:864 git-add--interactive.perl:693
93 #, c-format
94 msgid "No untracked files.\n"
95 -msgstr ""
95 +msgstr "Tidak ada berkas tak terlacak.\n"
96
97 #: add-interactive.c:868 git-add--interactive.perl:687
98 msgid "Add untracked"
99 -msgstr ""
99 +msgstr "Tambahkan tak terlacak"
100
101 #: add-interactive.c:895 git-add--interactive.perl:623
102 #, c-format, perl-format
103 msgid "added %d path\n"
104 msgid_plural "added %d paths\n"
105 -msgstr[0] ""
106 -msgstr[1] ""
105 +msgstr[0] "%d jalur ditambahkan\n"
106 +msgstr[1] "%d jalur ditambahkan\n"
107
108 #: add-interactive.c:925
109 #, c-format
110 msgid "ignoring unmerged: %s"
111 -msgstr ""
111 +msgstr "mengabaikan tak tergabung: %s"
112
113 #: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
114 #, c-format
115 msgid "Only binary files changed.\n"
116 -msgstr ""
116 +msgstr "Hanya berkas biner yang berubah.\n"
117
118 #: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
119 #, c-format
120 msgid "No changes.\n"
121 -msgstr ""
121 +msgstr "Tidak ada perubahan.\n"
122
123 #: add-interactive.c:943 git-add--interactive.perl:1379
124 msgid "Patch update"
125 -msgstr ""
125 +msgstr "Pembaruan tambalan"
126
127 #: add-interactive.c:982 git-add--interactive.perl:1792
128 msgid "Review diff"
129 -msgstr ""
129 +msgstr "Tinjau diff"
130
131 #: add-interactive.c:1010
132 msgid "show paths with changes"
133 -msgstr ""
133 +msgstr "perlihatkan jalur dengan perubahan"
134
135 #: add-interactive.c:1012
136 msgid "add working tree state to the staged set of changes"
137 -msgstr ""
137 +msgstr "tambahkan keadaan pohon kerja ke set perubahan yang tergelar"
138
139 #: add-interactive.c:1014
140 msgid "revert staged set of changes back to the HEAD version"
141 -msgstr ""
141 +msgstr "kembalikan set perubahan yang tergelar kembali ke versi HEAD"
142
143 #: add-interactive.c:1016
144 msgid "pick hunks and update selectively"
145 -msgstr ""
145 +msgstr "ambil hunk dan perbarui secara selektif"
146
147 #: add-interactive.c:1018
148 msgid "view diff between HEAD and index"
149 -msgstr ""
149 +msgstr "lihat diff antara HEAD dan indeks"
150
151 #: add-interactive.c:1020
152 msgid "add contents of untracked files to the staged set of changes"
153 -msgstr ""
153 +msgstr "tambahkan isi berkas tak terlacak ke set perubahan yang tergelar"
154
155 #: add-interactive.c:1028 add-interactive.c:1077
156 msgid "Prompt help:"
157 -msgstr ""
157 +msgstr "Permintaan bantuan:"
158
159 #: add-interactive.c:1030
160 msgid "select a single item"
161 -msgstr ""
161 +msgstr "pilih satu item"
162
163 #: add-interactive.c:1032
164 msgid "select a range of items"
165 -msgstr ""
165 +msgstr "pilih kisaran item"
166
167 #: add-interactive.c:1034
168 msgid "select multiple ranges"
169 -msgstr ""
169 +msgstr "pilih banyak kisaran"
170
171 #: add-interactive.c:1036 add-interactive.c:1081
172 msgid "select item based on unique prefix"
173 -msgstr ""
173 +msgstr "pilih item berdasarkan prefiks unik"
174
175 #: add-interactive.c:1038
176 msgid "unselect specified items"
177 -msgstr ""
177 +msgstr "batal pilih item yang disebutkan"
178
179 #: add-interactive.c:1040
180 msgid "choose all items"
181 -msgstr ""
181 +msgstr "pilih semua item"
182
183 #: add-interactive.c:1042
184 msgid "(empty) finish selecting"
185 -msgstr ""
185 +msgstr "(kosong) sudah memilih"
186
187 #: add-interactive.c:1079
188 msgid "select a numbered item"
189 -msgstr ""
189 +msgstr "pilih item bernomor"
190
191 #: add-interactive.c:1083
192 msgid "(empty) select nothing"
193 -msgstr ""
193 +msgstr "(empty) tidak pilih apapun"
194
195 #: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
196 msgid "*** Commands ***"
197 -msgstr ""
197 +msgstr "*** Perintah ***"
198
199 #: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
200 msgid "What now"
201 -msgstr ""
201 +msgstr "Apa sekarang"
202
203 #: add-interactive.c:1144 git-add--interactive.perl:213
204 msgid "staged"
205 -msgstr ""
205 +msgstr "tergelar"
206
207 #: add-interactive.c:1144 git-add--interactive.perl:213
208 msgid "unstaged"
209 -msgstr ""
210 -
211 -#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257
212 -#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
213 -#: builtin/fetch.c:150 builtin/merge.c:285 builtin/pull.c:190
214 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818
215 -#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326
216 -#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572
209 +msgstr "tak tergelar"
210 +
211 +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308
212 +#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128
213 +#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
214 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
215 +#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327
216 +#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573
217 #: git-add--interactive.perl:213
218 msgid "path"
219 -msgstr ""
219 +msgstr "jalur"
220
221 #: add-interactive.c:1151
222 msgid "could not refresh index"
223 -msgstr ""
223 +msgstr "tidak dapat menyegarkan indeks"
224
225 #: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
226 #, c-format
227 msgid "Bye.\n"
228 -msgstr ""
228 +msgstr "Sampai jumpa.\n"
229
230 #: add-patch.c:34 git-add--interactive.perl:1431
231 #, c-format, perl-format
232 msgid "Stage mode change [y,n,q,a,d%s,?]? "
233 -msgstr ""
233 +msgstr "Gelar perubahan mode [y,n,q,a,d%s,?]? "
234
235 #: add-patch.c:35 git-add--interactive.perl:1432
236 #, c-format, perl-format
237 msgid "Stage deletion [y,n,q,a,d%s,?]? "
238 -msgstr ""
238 +msgstr "Gelar penghapusan [y,n,q,a,d%s,?]? "
239
240 #: add-patch.c:36 git-add--interactive.perl:1433
241 #, c-format, perl-format
242 msgid "Stage addition [y,n,q,a,d%s,?]? "
243 -msgstr ""
243 +msgstr "Gelar penambahan [y,n,q,a,d%s,?]? "
244
245 #: add-patch.c:37 git-add--interactive.perl:1434
246 #, c-format, perl-format
247 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
248 -msgstr ""
248 +msgstr "Gelar hunk ini [y,n,q,a,d%s,?]? "
249
250 #: add-patch.c:39
251 msgid ""
252 "If the patch applies cleanly, the edited hunk will immediately be marked for "
253 "staging."
254 msgstr ""
255 +"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai "
256 +"untuk digelar."
257
258 #: add-patch.c:42
259 msgid ""
@@ -261,32 +263,39 @@ msgid ""
263 "a - stage this hunk and all later hunks in the file\n"
264 "d - do not stage this hunk or any of the later hunks in the file\n"
265 msgstr ""
266 +"y - gelar hunk ini\n"
267 +"n - jangan gelar hunk ini\n"
268 +"q - keluar; jangan gelar hunk ini atau yang sisanya\n"
269 +"a - gelar hunk ini dan semua hunk selanjutnya dalam berkas\n"
270 +"d - jangan gelar hunk ini atau hunk selanjutnya dalam berkas\n"
271
272 #: add-patch.c:56 git-add--interactive.perl:1437
273 #, c-format, perl-format
274 msgid "Stash mode change [y,n,q,a,d%s,?]? "
268 -msgstr ""
275 +msgstr "Stase perubahan mode [y,n,q,a,d%s,?]? "
276
277 #: add-patch.c:57 git-add--interactive.perl:1438
278 #, c-format, perl-format
279 msgid "Stash deletion [y,n,q,a,d%s,?]? "
273 -msgstr ""
280 +msgstr "Stase penghapusan [y,n,q,a,d%s,?]? "
281
282 #: add-patch.c:58 git-add--interactive.perl:1439
283 #, c-format, perl-format
284 msgid "Stash addition [y,n,q,a,d%s,?]? "
278 -msgstr ""
285 +msgstr "Stase penambahan [y,n,q,a,d%s,?]? "
286
287 #: add-patch.c:59 git-add--interactive.perl:1440
288 #, c-format, perl-format
289 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
283 -msgstr ""
290 +msgstr "Stase hunk ini [y,n,q,a,d%s,?]? "
291
292 #: add-patch.c:61
293 msgid ""
294 "If the patch applies cleanly, the edited hunk will immediately be marked for "
295 "stashing."
296 msgstr ""
297 +"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai "
298 +"untuk distase."
299
300 #: add-patch.c:64
301 msgid ""
@@ -296,32 +305,39 @@ msgid ""
305 "a - stash this hunk and all later hunks in the file\n"
306 "d - do not stash this hunk or any of the later hunks in the file\n"
307 msgstr ""
308 +"y - stase hunk ini\n"
309 +"n - jangan stase hunk ini\n"
310 +"q - keluar; jangan stase hunk ini atau yang sisanya\n"
311 +"a - stase hunk ini dan semua hunk selanjutnya dalam berkas\n"
312 +"d - jangan stase hunk ini atau hunk selanjutnya dalam berkas\n"
313
314 #: add-patch.c:80 git-add--interactive.perl:1443
315 #, c-format, perl-format
316 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
303 -msgstr ""
317 +msgstr "Batal gelar perubahan mode [y,n,q,a,d%s,?]? "
318
319 #: add-patch.c:81 git-add--interactive.perl:1444
320 #, c-format, perl-format
321 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
308 -msgstr ""
322 +msgstr "Batal gelar penghapusan [y,n,q,a,d%s,?]? "
323
324 #: add-patch.c:82 git-add--interactive.perl:1445
325 #, c-format, perl-format
326 msgid "Unstage addition [y,n,q,a,d%s,?]? "
313 -msgstr ""
327 +msgstr "Batal gelar penambahan [y,n,q,a,d%s,?]? "
328
329 #: add-patch.c:83 git-add--interactive.perl:1446
330 #, c-format, perl-format
331 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
318 -msgstr ""
332 +msgstr "Batal gelar hunk ini [y,n,q,a,d%s,?]? "
333
334 #: add-patch.c:85
335 msgid ""
336 "If the patch applies cleanly, the edited hunk will immediately be marked for "
337 "unstaging."
338 msgstr ""
339 +"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai "
340 +"untuk dibatalgelarkan."
341
342 #: add-patch.c:88
343 msgid ""
@@ -331,32 +347,39 @@ msgid ""
347 "a - unstage this hunk and all later hunks in the file\n"
348 "d - do not unstage this hunk or any of the later hunks in the file\n"
349 msgstr ""
350 +"y - batal gelar hunk ini\n"
351 +"n - jangan batal gelar hunk ini\n"
352 +"q - keluar; jangan batal gelar hunk ini atau yang sisanya\n"
353 +"a - batal gelar hunk ini dan semua hunk selanjutnya dalam berkas\n"
354 +"d - jangan batal gelar hunk ini atau hunk selanjutnya dalam berkas\n"
355
356 #: add-patch.c:103 git-add--interactive.perl:1449
357 #, c-format, perl-format
358 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
338 -msgstr ""
359 +msgstr "Terapkan perubahan mode ke indeks [y,n,q,a,d%s,?]? "
360
361 #: add-patch.c:104 git-add--interactive.perl:1450
362 #, c-format, perl-format
363 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
343 -msgstr ""
364 +msgstr "Terapkan penghapusan ke indeks [y,n,q,a,d%s,?]? "
365
366 #: add-patch.c:105 git-add--interactive.perl:1451
367 #, c-format, perl-format
368 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
348 -msgstr ""
369 +msgstr "Terapkan penambahan ke indeks [y,n,q,a,d%s,?]? "
370
371 #: add-patch.c:106 git-add--interactive.perl:1452
372 #, c-format, perl-format
373 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
353 -msgstr ""
374 +msgstr "Terapkan hunk ini ke indeks [y,n,q,a,d%s,?]? "
375
376 #: add-patch.c:108 add-patch.c:176 add-patch.c:221
377 msgid ""
378 "If the patch applies cleanly, the edited hunk will immediately be marked for "
379 "applying."
380 msgstr ""
381 +"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai "
382 +"untuk diterapkan."
383
384 #: add-patch.c:111
385 msgid ""
@@ -366,36 +389,43 @@ msgid ""
389 "a - apply this hunk and all later hunks in the file\n"
390 "d - do not apply this hunk or any of the later hunks in the file\n"
391 msgstr ""
392 +"y - terapkan hunk ini ke indeks\n"
393 +"n - jangan terapkan hunk ini ke indeks\n"
394 +"q - keluar; jangan terapkan hunk ini atau yang sisanya\n"
395 +"a - terapkan hunk ini dan semua hunk selanjutnya dalam berkas\n"
396 +"d - jangan terapkan hunk ini atau hunk selanjutnya dalam berkas\n"
397
398 #: add-patch.c:126 git-add--interactive.perl:1455
399 #: git-add--interactive.perl:1473
400 #, c-format, perl-format
401 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
374 -msgstr ""
402 +msgstr "Buang perubahan mode dari pohon kerja [y,n,q,a,d%s,?]? "
403
404 #: add-patch.c:127 git-add--interactive.perl:1456
405 #: git-add--interactive.perl:1474
406 #, c-format, perl-format
407 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
380 -msgstr ""
408 +msgstr "Buang penghapusan dari pohon kerja [y,n,q,a,d%s,?]? "
409
410 #: add-patch.c:128 git-add--interactive.perl:1457
411 #: git-add--interactive.perl:1475
412 #, c-format, perl-format
413 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
386 -msgstr ""
414 +msgstr "Buang penambahan dari pohon kerja [y,n,q,a,d%s,?]? "
415
416 #: add-patch.c:129 git-add--interactive.perl:1458
417 #: git-add--interactive.perl:1476
418 #, c-format, perl-format
419 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
392 -msgstr ""
420 +msgstr "Buang hunk ini dari pohon kerja [y,n,q,a,d%s,?]? "
421
422 #: add-patch.c:131 add-patch.c:154 add-patch.c:199
423 msgid ""
424 "If the patch applies cleanly, the edited hunk will immediately be marked for "
425 "discarding."
426 msgstr ""
427 +"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai "
428 +"untuk dibuang."
429
430 #: add-patch.c:134 add-patch.c:202
431 msgid ""
@@ -405,26 +435,31 @@ msgid ""
435 "a - discard this hunk and all later hunks in the file\n"
436 "d - do not discard this hunk or any of the later hunks in the file\n"
437 msgstr ""
438 +"y - buang hunk ini dari pohon kerja\n"
439 +"n - jangan buang hunk ini dari pohon kerja\n"
440 +"q - keluar; jangan buang hunk ini atau yang sisanya\n"
441 +"a - buang hunk ini dan semua hunk selanjutnya dalam berkas\n"
442 +"d - jangan buang hunk ini atau hunk selanjutnya dalam berkas\n"
443
444 #: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
445 #, c-format, perl-format
446 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
412 -msgstr ""
447 +msgstr "Buang perubahan mode dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "
448
449 #: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
450 #, c-format, perl-format
451 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
417 -msgstr ""
452 +msgstr "Buang penghapusan dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "
453
454 #: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
455 #, c-format, perl-format
456 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
422 -msgstr ""
457 +msgstr "Buang penambahan dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "
458
459 #: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
460 #, c-format, perl-format
461 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
427 -msgstr ""
462 +msgstr "Buang hunk ini dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "
463
464 #: add-patch.c:157
465 msgid ""
@@ -434,26 +469,31 @@ msgid ""
469 "a - discard this hunk and all later hunks in the file\n"
470 "d - do not discard this hunk or any of the later hunks in the file\n"
471 msgstr ""
472 +"y - buang hunk ini dari indeks dan pohon kerja\n"
473 +"n - jangan buang hunk ini dari indeks dan pohon kerja\n"
474 +"q - keluar; jangan buang hunk ini atau yang sisanya\n"
475 +"a - buang hunk ini dan semua hunk selanjutnya dalam berkas\n"
476 +"d - jangan buang hunk ini atau hunk selanjutnya dalam berkas\n"
477
478 #: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
479 #, c-format, perl-format
480 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
441 -msgstr ""
481 +msgstr "Terapkan perubahan mode ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "
482
483 #: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
484 #, c-format, perl-format
485 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
446 -msgstr ""
486 +msgstr "Terapkan penghapusan ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "
487
488 #: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
489 #, c-format, perl-format
490 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
451 -msgstr ""
491 +msgstr "Terapkan penambahan ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "
492
493 #: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
494 #, c-format, perl-format
495 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
456 -msgstr ""
496 +msgstr "Terapkan hunk ini ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "
497
498 #: add-patch.c:179
499 msgid ""
@@ -463,6 +503,11 @@ msgid ""
503 "a - apply this hunk and all later hunks in the file\n"
504 "d - do not apply this hunk or any of the later hunks in the file\n"
505 msgstr ""
506 +"y - terapkan hunk ini ke indeks dan pohon kerja\n"
507 +"n - jangan terapkan hunk ini ke indeks dan pohon kerja\n"
508 +"q - keluar; jangan terapkan hunk ini atau yang sisanya\n"
509 +"a - terapkan hunk ini dan semua hunk selanjutnya dalam berkas\n"
510 +"d - jangan terapkan hunk ini atau hunk selanjutnya dalam berkas\n"
511
512 #: add-patch.c:224
513 msgid ""
@@ -472,39 +517,46 @@ msgid ""
517 "a - apply this hunk and all later hunks in the file\n"
518 "d - do not apply this hunk or any of the later hunks in the file\n"
519 msgstr ""
520 +"y - terapkan hunk ini ke pohon kerja\n"
521 +"n - jangan terapkan hunk ini ke pohon kerja\n"
522 +"q - keluar; jangan terapkan hunk ini atau yang sisanya\n"
523 +"a - terapkan hunk ini dan semua hunk selanjutnya dalam berkas\n"
524 +"d - jangan terapkan hunk ini atau hunk selanjutnya dalam berkas\n"
525
526 #: add-patch.c:342
527 #, c-format
528 msgid "could not parse hunk header '%.*s'"
479 -msgstr ""
529 +msgstr "tidak dapat menguraikan kepala hunk '%.*s'"
530
531 #: add-patch.c:361 add-patch.c:365
532 #, c-format
533 msgid "could not parse colored hunk header '%.*s'"
484 -msgstr ""
534 +msgstr "tidak dapat menguraikan kepala hunk berwarna '%.*s'"
535
536 #: add-patch.c:419
537 msgid "could not parse diff"
488 -msgstr ""
538 +msgstr "tidak dapat menguraikan diff"
539
540 #: add-patch.c:438
541 msgid "could not parse colored diff"
492 -msgstr ""
542 +msgstr "tidak dapat menguraikan diff berwarna"
543
544 #: add-patch.c:452
545 #, c-format
546 msgid "failed to run '%s'"
497 -msgstr ""
547 +msgstr "gagal menjalankan '%s'"
548
549 #: add-patch.c:611
550 msgid "mismatched output from interactive.diffFilter"
501 -msgstr ""
551 +msgstr "keluaran tak cocok dari interactive.diffFilter"
552
553 #: add-patch.c:612
554 msgid ""
555 "Your filter must maintain a one-to-one correspondence\n"
556 "between its input and output lines."
557 msgstr ""
558 +"Saringan Anda haru menjaga korespondensi satu-satu antara masukannya\n"
559 +"dan baris keluaran."
560
561 #: add-patch.c:790
562 #, c-format
@@ -512,6 +564,8 @@ msgid ""
564 "expected context line #%d in\n"
565 "%.*s"
566 msgstr ""
567 +"baris konteks #%d diharapkan dalam\n"
568 +"%.*s"
569
570 #: add-patch.c:805
571 #, c-format
@@ -521,10 +575,14 @@ msgid ""
575 "\tdoes not end with:\n"
576 "%.*s"
577 msgstr ""
578 +"hunk tidak tumpang tindih:\n"
579 +"%.*s\n"
580 +"tidak berakhir dengan:\n"
581 +"%.*s"
582
583 #: add-patch.c:1081 git-add--interactive.perl:1115
584 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
527 -msgstr ""
585 +msgstr "Mode sunting hunk manual -- lihat dibawah untuk panduan cepat.\n"
586
587 #: add-patch.c:1085
588 #, c-format
@@ -534,6 +592,10 @@ msgid ""
592 "To remove '%c' lines, delete them.\n"
593 "Lines starting with %c will be removed.\n"
594 msgstr ""
595 +"---\n"
596 +"Untuk menghapus baris '%c', buatlah menjadi baris ' ' (konteks).\n"
597 +"Untuk menghapus baris '%c', hapuslah itu.\n"
598 +"Baris yang diawali dengan %c akan dihapus.\n"
599
600 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
601 #: add-patch.c:1099 git-add--interactive.perl:1129
@@ -542,14 +604,17 @@ msgid ""
604 "edit again. If all lines of the hunk are removed, then the edit is\n"
605 "aborted and the hunk is left unchanged.\n"
606 msgstr ""
607 +"Jika itu tidak diterapkan dengan bersih, Anda akan diberikan kesempatan\n"
608 +"untuk menyunting lagi. Jika semua baris dalam hunk dihapus, suntingan\n"
609 +"dibatalkan dan hunk tetap tidak berubah.\n"
610
611 #: add-patch.c:1132
612 msgid "could not parse hunk header"
548 -msgstr ""
613 +msgstr "tidak dapat menguraikan kepala hunk"
614
615 #: add-patch.c:1177
616 msgid "'git apply --cached' failed"
552 -msgstr ""
617 +msgstr "'git apply --cached' gagal"
618
619 #. TRANSLATORS: do not translate [y/n]
620 #. The program will only accept that input at this point.
@@ -567,18 +632,20 @@ msgstr ""
632 msgid ""
633 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
634 msgstr ""
635 +"Hunk Anda tak diterapkan. Sunting lagi (bilang \"n\" untuk \"tidak\" buang!) "
636 +"[y/n]?"
637
638 #: add-patch.c:1289
639 msgid "The selected hunks do not apply to the index!"
573 -msgstr ""
640 +msgstr "Hunk yang dipilih tidak diterapkan ke indeks!"
641
642 #: add-patch.c:1290 git-add--interactive.perl:1346
643 msgid "Apply them to the worktree anyway? "
577 -msgstr ""
644 +msgstr "Tetap terapkan itu ke pohon kerja? "
645
646 #: add-patch.c:1297 git-add--interactive.perl:1349
647 msgid "Nothing was applied.\n"
581 -msgstr ""
648 +msgstr "Tidak ada yang diterapkan.\n"
649
650 #: add-patch.c:1354
651 msgid ""
@@ -592,133 +659,155 @@ msgid ""
659 "e - manually edit the current hunk\n"
660 "? - print help\n"
661 msgstr ""
662 +"j - biarkan hunk ini ragu, lihat hunk ragu berikutnya\n"
663 +"J - biarkan hunk ini ragu, lihat hunk berikutnya\n"
664 +"k - biarkan hunk ini ragu, lihat hunk ragu sebelumnya\n"
665 +"K - biarkan hunk ini ragu, lihat hunk sebelumnya\n"
666 +"g - pilih satu hunk untuk dikunjungi\n"
667 +"/ - cari satu hunk yang cocok dengan regex yang diberikan\n"
668 +"s - belah hunk saat ini ke dalam hunk yang lebih kecil\n"
669 +"e - sunting hunk saat ini secara manual\n"
670 +"? - cetak bantuan\n"
671
672 #: add-patch.c:1516 add-patch.c:1526
673 msgid "No previous hunk"
598 -msgstr ""
674 +msgstr "Tidak ada hunk sebelumnya"
675
676 #: add-patch.c:1521 add-patch.c:1531
677 msgid "No next hunk"
602 -msgstr ""
678 +msgstr "Tidak ada hunk selanjutnya"
679
680 #: add-patch.c:1537
681 msgid "No other hunks to goto"
606 -msgstr ""
682 +msgstr "Tidak ada hunk lainnya untuk dikunjungi"
683
684 #: add-patch.c:1548 git-add--interactive.perl:1606
685 msgid "go to which hunk (<ret> to see more)? "
610 -msgstr ""
686 +msgstr "pergi ke hunk yang mana (<ret> untuk lihat lebih)? "
687
688 #: add-patch.c:1549 git-add--interactive.perl:1608
689 msgid "go to which hunk? "
614 -msgstr ""
690 +msgstr "pergi ke hunk yang mana?"
691
692 #: add-patch.c:1560
693 #, c-format
694 msgid "Invalid number: '%s'"
619 -msgstr ""
695 +msgstr "Angka tidak valid: '%s'"
696
697 #: add-patch.c:1565
698 #, c-format
699 msgid "Sorry, only %d hunk available."
700 msgid_plural "Sorry, only %d hunks available."
625 -msgstr[0] ""
626 -msgstr[1] ""
701 +msgstr[0] "Maaf, hanya %d hunk yang tersedia."
702 +msgstr[1] "Maaf, hanya %d hunk yang tersedia."
703
704 #: add-patch.c:1574
705 msgid "No other hunks to search"
630 -msgstr ""
706 +msgstr "Tidak ada hunk lainnya untuk dicari"
707
708 #: add-patch.c:1580 git-add--interactive.perl:1661
709 msgid "search for regex? "
634 -msgstr ""
710 +msgstr "cari untuk regex? "
711
712 #: add-patch.c:1595
713 #, c-format
714 msgid "Malformed search regexp %s: %s"
639 -msgstr ""
715 +msgstr "regexp pencarian %s cacat: %s"
716
717 #: add-patch.c:1612
718 msgid "No hunk matches the given pattern"
643 -msgstr ""
719 +msgstr "Tidak ada hunk yang cocok dengan pola yang diberikan"
720
721 #: add-patch.c:1619
722 msgid "Sorry, cannot split this hunk"
647 -msgstr ""
723 +msgstr "Maaf, tidak dapat membelah hunk ini"
724
725 #: add-patch.c:1623
726 #, c-format
727 msgid "Split into %d hunks."
652 -msgstr ""
728 +msgstr "Terbelah ke dalam %d hunk."
729
730 #: add-patch.c:1627
731 msgid "Sorry, cannot edit this hunk"
656 -msgstr ""
732 +msgstr "Maaf, tidak dapat menyunting hunk ini"
733
734 #: add-patch.c:1679
735 msgid "'git apply' failed"
660 -msgstr ""
736 +msgstr "'git apply' gagal"
737
662 -#: advice.c:143
738 +#: advice.c:145
739 #, c-format
740 msgid ""
741 "\n"
742 "Disable this message with \"git config advice.%s false\""
743 msgstr ""
744
669 -#: advice.c:159
745 +#: advice.c:161
746 #, c-format
747 msgid "%shint: %.*s%s\n"
748 msgstr ""
749
674 -#: advice.c:250
750 +#: advice.c:252
751 msgid "Cherry-picking is not possible because you have unmerged files."
752 msgstr ""
753
678 -#: advice.c:252
754 +#: advice.c:254
755 msgid "Committing is not possible because you have unmerged files."
756 msgstr ""
757
682 -#: advice.c:254
758 +#: advice.c:256
759 msgid "Merging is not possible because you have unmerged files."
760 msgstr ""
761
686 -#: advice.c:256
762 +#: advice.c:258
763 msgid "Pulling is not possible because you have unmerged files."
764 msgstr ""
765
690 -#: advice.c:258
766 +#: advice.c:260
767 msgid "Reverting is not possible because you have unmerged files."
768 msgstr ""
769
694 -#: advice.c:260
770 +#: advice.c:262
771 #, c-format
772 msgid "It is not possible to %s because you have unmerged files."
773 msgstr ""
774
699 -#: advice.c:268
775 +#: advice.c:270
776 msgid ""
777 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
778 "as appropriate to mark resolution and make a commit."
779 msgstr ""
780
705 -#: advice.c:276
781 +#: advice.c:278
782 msgid "Exiting because of an unresolved conflict."
783 msgstr ""
784
709 -#: advice.c:281 builtin/merge.c:1370
785 +#: advice.c:283 builtin/merge.c:1374
786 msgid "You have not concluded your merge (MERGE_HEAD exists)."
787 msgstr ""
788
713 -#: advice.c:283
789 +#: advice.c:285
790 msgid "Please, commit your changes before merging."
791 msgstr ""
792
717 -#: advice.c:284
793 +#: advice.c:286
794 msgid "Exiting because of unfinished merge."
795 msgstr ""
796
721 -#: advice.c:290
797 +#: advice.c:296
798 +#, c-format
799 +msgid ""
800 +"The following pathspecs didn't match any eligible path, but they do match "
801 +"index\n"
802 +"entries outside the current sparse checkout:\n"
803 +msgstr ""
804 +
805 +#: advice.c:303
806 +msgid ""
807 +"Disable or modify the sparsity rules if you intend to update such entries."
808 +msgstr ""
809 +
810 +#: advice.c:310
811 #, c-format
812 msgid ""
813 "Note: switching to '%s'.\n"
@@ -749,82 +838,78 @@ msgstr ""
838 msgid "unclosed quote"
839 msgstr ""
840
752 -#: apply.c:69
841 +#: apply.c:70
842 #, c-format
843 msgid "unrecognized whitespace option '%s'"
844 msgstr ""
845
757 -#: apply.c:85
846 +#: apply.c:86
847 #, c-format
848 msgid "unrecognized whitespace ignore option '%s'"
849 msgstr ""
850
762 -#: apply.c:135
851 +#: apply.c:136
852 msgid "--reject and --3way cannot be used together."
853 msgstr ""
854
766 -#: apply.c:137
767 -msgid "--cached and --3way cannot be used together."
768 -msgstr ""
769 -
770 -#: apply.c:140
855 +#: apply.c:139
856 msgid "--3way outside a repository"
857 msgstr ""
858
774 -#: apply.c:151
859 +#: apply.c:150
860 msgid "--index outside a repository"
861 msgstr ""
862
778 -#: apply.c:154
863 +#: apply.c:153
864 msgid "--cached outside a repository"
865 msgstr ""
866
782 -#: apply.c:801
867 +#: apply.c:800
868 #, c-format
869 msgid "Cannot prepare timestamp regexp %s"
870 msgstr ""
871
787 -#: apply.c:810
872 +#: apply.c:809
873 #, c-format
874 msgid "regexec returned %d for input: %s"
875 msgstr ""
876
792 -#: apply.c:884
877 +#: apply.c:883
878 #, c-format
879 msgid "unable to find filename in patch at line %d"
880 msgstr ""
881
797 -#: apply.c:922
882 +#: apply.c:921
883 #, c-format
884 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
885 msgstr ""
886
802 -#: apply.c:928
887 +#: apply.c:927
888 #, c-format
889 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
890 msgstr ""
891
807 -#: apply.c:929
892 +#: apply.c:928
893 #, c-format
894 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
895 msgstr ""
896
812 -#: apply.c:934
897 +#: apply.c:933
898 #, c-format
899 msgid "git apply: bad git-diff - expected /dev/null on line %d"
900 msgstr ""
901
817 -#: apply.c:963
902 +#: apply.c:962
903 #, c-format
904 msgid "invalid mode on line %d: %s"
905 msgstr ""
906
822 -#: apply.c:1282
907 +#: apply.c:1281
908 #, c-format
909 msgid "inconsistent header lines %d and %d"
910 msgstr ""
911
827 -#: apply.c:1372
912 +#: apply.c:1371
913 #, c-format
914 msgid ""
915 "git diff header lacks filename information when removing %d leading pathname "
@@ -835,524 +920,530 @@ msgid_plural ""
920 msgstr[0] ""
921 msgstr[1] ""
922
838 -#: apply.c:1385
923 +#: apply.c:1384
924 #, c-format
925 msgid "git diff header lacks filename information (line %d)"
926 msgstr ""
927
843 -#: apply.c:1481
928 +#: apply.c:1480
929 #, c-format
930 msgid "recount: unexpected line: %.*s"
931 msgstr ""
932
848 -#: apply.c:1550
933 +#: apply.c:1549
934 #, c-format
935 msgid "patch fragment without header at line %d: %.*s"
936 msgstr ""
937
853 -#: apply.c:1753
938 +#: apply.c:1752
939 msgid "new file depends on old contents"
940 msgstr ""
941
857 -#: apply.c:1755
942 +#: apply.c:1754
943 msgid "deleted file still has contents"
944 msgstr ""
945
861 -#: apply.c:1789
946 +#: apply.c:1788
947 #, c-format
948 msgid "corrupt patch at line %d"
949 msgstr ""
950
866 -#: apply.c:1826
951 +#: apply.c:1825
952 #, c-format
953 msgid "new file %s depends on old contents"
954 msgstr ""
955
871 -#: apply.c:1828
956 +#: apply.c:1827
957 #, c-format
958 msgid "deleted file %s still has contents"
959 msgstr ""
960
876 -#: apply.c:1831
961 +#: apply.c:1830
962 #, c-format
963 msgid "** warning: file %s becomes empty but is not deleted"
964 msgstr ""
965
881 -#: apply.c:1978
966 +#: apply.c:1977
967 #, c-format
968 msgid "corrupt binary patch at line %d: %.*s"
969 msgstr ""
970
886 -#: apply.c:2015
971 +#: apply.c:2014
972 #, c-format
973 msgid "unrecognized binary patch at line %d"
974 msgstr ""
975
891 -#: apply.c:2177
976 +#: apply.c:2176
977 #, c-format
978 msgid "patch with only garbage at line %d"
979 msgstr ""
980
896 -#: apply.c:2263
981 +#: apply.c:2262
982 #, c-format
983 msgid "unable to read symlink %s"
984 msgstr ""
985
901 -#: apply.c:2267
986 +#: apply.c:2266
987 #, c-format
988 msgid "unable to open or read %s"
989 msgstr ""
990
906 -#: apply.c:2936
991 +#: apply.c:2935
992 #, c-format
993 msgid "invalid start of line: '%c'"
994 msgstr ""
995
911 -#: apply.c:3057
996 +#: apply.c:3056
997 #, c-format
998 msgid "Hunk #%d succeeded at %d (offset %d line)."
999 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1000 msgstr[0] ""
1001 msgstr[1] ""
1002
918 -#: apply.c:3069
1003 +#: apply.c:3068
1004 #, c-format
1005 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1006 msgstr ""
1007
923 -#: apply.c:3075
1008 +#: apply.c:3074
1009 #, c-format
1010 msgid ""
1011 "while searching for:\n"
1012 "%.*s"
1013 msgstr ""
1014
930 -#: apply.c:3097
1015 +#: apply.c:3096
1016 #, c-format
1017 msgid "missing binary patch data for '%s'"
1018 msgstr ""
1019
935 -#: apply.c:3105
1020 +#: apply.c:3104
1021 #, c-format
1022 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
1023 msgstr ""
1024
940 -#: apply.c:3152
1025 +#: apply.c:3151
1026 #, c-format
1027 msgid "cannot apply binary patch to '%s' without full index line"
1028 msgstr ""
1029
945 -#: apply.c:3163
1030 +#: apply.c:3162
1031 #, c-format
1032 msgid ""
1033 "the patch applies to '%s' (%s), which does not match the current contents."
1034 msgstr ""
1035
951 -#: apply.c:3171
1036 +#: apply.c:3170
1037 #, c-format
1038 msgid "the patch applies to an empty '%s' but it is not empty"
1039 msgstr ""
1040
956 -#: apply.c:3189
1041 +#: apply.c:3188
1042 #, c-format
1043 msgid "the necessary postimage %s for '%s' cannot be read"
1044 msgstr ""
1045
961 -#: apply.c:3202
1046 +#: apply.c:3201
1047 #, c-format
1048 msgid "binary patch does not apply to '%s'"
1049 msgstr ""
1050
966 -#: apply.c:3209
1051 +#: apply.c:3208
1052 #, c-format
1053 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1054 msgstr ""
1055
971 -#: apply.c:3230
1056 +#: apply.c:3229
1057 #, c-format
1058 msgid "patch failed: %s:%ld"
1059 msgstr ""
1060
976 -#: apply.c:3353
1061 +#: apply.c:3352
1062 #, c-format
1063 msgid "cannot checkout %s"
1064 msgstr ""
1065
981 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213
1066 +#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
1067 #: setup.c:308
1068 #, c-format
1069 msgid "failed to read %s"
1070 msgstr ""
1071
987 -#: apply.c:3413
1072 +#: apply.c:3412
1073 #, c-format
1074 msgid "reading from '%s' beyond a symbolic link"
1075 msgstr ""
1076
992 -#: apply.c:3442 apply.c:3685
1077 +#: apply.c:3441 apply.c:3687
1078 #, c-format
1079 msgid "path %s has been renamed/deleted"
1080 msgstr ""
1081
997 -#: apply.c:3528 apply.c:3700
1082 +#: apply.c:3527 apply.c:3702
1083 #, c-format
1084 msgid "%s: does not exist in index"
1085 msgstr ""
1086
1002 -#: apply.c:3537 apply.c:3708 apply.c:3952
1087 +#: apply.c:3536 apply.c:3710 apply.c:3954
1088 #, c-format
1089 msgid "%s: does not match index"
1090 msgstr ""
1091
1007 -#: apply.c:3572
1008 -msgid "repository lacks the necessary blob to fall back on 3-way merge."
1092 +#: apply.c:3571
1093 +msgid "repository lacks the necessary blob to perform 3-way merge."
1094 msgstr ""
1095
1011 -#: apply.c:3575
1096 +#: apply.c:3574
1097 #, c-format
1013 -msgid "Falling back to three-way merge...\n"
1098 +msgid "Performing three-way merge...\n"
1099 msgstr ""
1100
1016 -#: apply.c:3591 apply.c:3595
1101 +#: apply.c:3590 apply.c:3594
1102 #, c-format
1103 msgid "cannot read the current contents of '%s'"
1104 msgstr ""
1105
1021 -#: apply.c:3607
1106 +#: apply.c:3606
1107 #, c-format
1023 -msgid "Failed to fall back on three-way merge...\n"
1108 +msgid "Failed to perform three-way merge...\n"
1109 msgstr ""
1110
1026 -#: apply.c:3621
1111 +#: apply.c:3620
1112 #, c-format
1113 msgid "Applied patch to '%s' with conflicts.\n"
1114 msgstr ""
1115
1031 -#: apply.c:3626
1116 +#: apply.c:3625
1117 #, c-format
1118 msgid "Applied patch to '%s' cleanly.\n"
1119 msgstr ""
1120
1036 -#: apply.c:3652
1121 +#: apply.c:3642
1122 +#, c-format
1123 +msgid "Falling back to direct application...\n"
1124 +msgstr ""
1125 +
1126 +#: apply.c:3654
1127 msgid "removal patch leaves file contents"
1128 msgstr ""
1129
1040 -#: apply.c:3725
1130 +#: apply.c:3727
1131 #, c-format
1132 msgid "%s: wrong type"
1133 msgstr ""
1134
1045 -#: apply.c:3727
1135 +#: apply.c:3729
1136 #, c-format
1137 msgid "%s has type %o, expected %o"
1138 msgstr ""
1139
1050 -#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858
1051 -#: read-cache.c:1313
1140 +#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890
1141 +#: read-cache.c:1351
1142 #, c-format
1143 msgid "invalid path '%s'"
1144 msgstr ""
1145
1056 -#: apply.c:3950
1146 +#: apply.c:3952
1147 #, c-format
1148 msgid "%s: already exists in index"
1149 msgstr ""
1150
1061 -#: apply.c:3954
1151 +#: apply.c:3956
1152 #, c-format
1153 msgid "%s: already exists in working directory"
1154 msgstr ""
1155
1066 -#: apply.c:3974
1156 +#: apply.c:3976
1157 #, c-format
1158 msgid "new mode (%o) of %s does not match old mode (%o)"
1159 msgstr ""
1160
1071 -#: apply.c:3979
1161 +#: apply.c:3981
1162 #, c-format
1163 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1164 msgstr ""
1165
1076 -#: apply.c:3999
1166 +#: apply.c:4001
1167 #, c-format
1168 msgid "affected file '%s' is beyond a symbolic link"
1169 msgstr ""
1170
1081 -#: apply.c:4003
1171 +#: apply.c:4005
1172 #, c-format
1173 msgid "%s: patch does not apply"
1174 msgstr ""
1175
1086 -#: apply.c:4018
1176 +#: apply.c:4020
1177 #, c-format
1178 msgid "Checking patch %s..."
1179 msgstr ""
1180
1091 -#: apply.c:4110
1181 +#: apply.c:4112
1182 #, c-format
1183 msgid "sha1 information is lacking or useless for submodule %s"
1184 msgstr ""
1185
1096 -#: apply.c:4117
1186 +#: apply.c:4119
1187 #, c-format
1188 msgid "mode change for %s, which is not in current HEAD"
1189 msgstr ""
1190
1101 -#: apply.c:4120
1191 +#: apply.c:4122
1192 #, c-format
1193 msgid "sha1 information is lacking or useless (%s)."
1194 msgstr ""
1195
1106 -#: apply.c:4129
1196 +#: apply.c:4131
1197 #, c-format
1198 msgid "could not add %s to temporary index"
1199 msgstr ""
1200
1111 -#: apply.c:4139
1201 +#: apply.c:4141
1202 #, c-format
1203 msgid "could not write temporary index to %s"
1204 msgstr ""
1205
1116 -#: apply.c:4277
1206 +#: apply.c:4279
1207 #, c-format
1208 msgid "unable to remove %s from index"
1209 msgstr ""
1210
1121 -#: apply.c:4311
1211 +#: apply.c:4313
1212 #, c-format
1213 msgid "corrupt patch for submodule %s"
1214 msgstr ""
1215
1126 -#: apply.c:4317
1216 +#: apply.c:4319
1217 #, c-format
1218 msgid "unable to stat newly created file '%s'"
1219 msgstr ""
1220
1131 -#: apply.c:4325
1221 +#: apply.c:4327
1222 #, c-format
1223 msgid "unable to create backing store for newly created file %s"
1224 msgstr ""
1225
1136 -#: apply.c:4331 apply.c:4476
1226 +#: apply.c:4333 apply.c:4478
1227 #, c-format
1228 msgid "unable to add cache entry for %s"
1229 msgstr ""
1230
1141 -#: apply.c:4374 builtin/bisect--helper.c:523
1231 +#: apply.c:4376 builtin/bisect--helper.c:523
1232 #, c-format
1233 msgid "failed to write to '%s'"
1234 msgstr ""
1235
1146 -#: apply.c:4378
1236 +#: apply.c:4380
1237 #, c-format
1238 msgid "closing file '%s'"
1239 msgstr ""
1240
1151 -#: apply.c:4448
1241 +#: apply.c:4450
1242 #, c-format
1243 msgid "unable to write file '%s' mode %o"
1244 msgstr ""
1245
1156 -#: apply.c:4546
1246 +#: apply.c:4548
1247 #, c-format
1248 msgid "Applied patch %s cleanly."
1249 msgstr ""
1250
1161 -#: apply.c:4554
1251 +#: apply.c:4556
1252 msgid "internal error"
1253 msgstr ""
1254
1165 -#: apply.c:4557
1255 +#: apply.c:4559
1256 #, c-format
1257 msgid "Applying patch %%s with %d reject..."
1258 msgid_plural "Applying patch %%s with %d rejects..."
1259 msgstr[0] ""
1260 msgstr[1] ""
1261
1172 -#: apply.c:4568
1262 +#: apply.c:4570
1263 #, c-format
1264 msgid "truncating .rej filename to %.*s.rej"
1265 msgstr ""
1266
1177 -#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334
1267 +#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
1268 #, c-format
1269 msgid "cannot open %s"
1270 msgstr ""
1271
1182 -#: apply.c:4590
1272 +#: apply.c:4592
1273 #, c-format
1274 msgid "Hunk #%d applied cleanly."
1275 msgstr ""
1276
1187 -#: apply.c:4594
1277 +#: apply.c:4596
1278 #, c-format
1279 msgid "Rejected hunk #%d."
1280 msgstr ""
1281
1192 -#: apply.c:4718
1282 +#: apply.c:4725
1283 #, c-format
1284 msgid "Skipped patch '%s'."
1285 msgstr ""
1286
1197 -#: apply.c:4726
1287 +#: apply.c:4733
1288 msgid "unrecognized input"
1289 msgstr ""
1290
1201 -#: apply.c:4746
1291 +#: apply.c:4753
1292 msgid "unable to read index file"
1293 msgstr ""
1294
1205 -#: apply.c:4903
1295 +#: apply.c:4910
1296 #, c-format
1297 msgid "can't open patch '%s': %s"
1298 msgstr ""
1299
1210 -#: apply.c:4930
1300 +#: apply.c:4937
1301 #, c-format
1302 msgid "squelched %d whitespace error"
1303 msgid_plural "squelched %d whitespace errors"
1304 msgstr[0] ""
1305 msgstr[1] ""
1306
1217 -#: apply.c:4936 apply.c:4951
1307 +#: apply.c:4943 apply.c:4958
1308 #, c-format
1309 msgid "%d line adds whitespace errors."
1310 msgid_plural "%d lines add whitespace errors."
1311 msgstr[0] ""
1312 msgstr[1] ""
1313
1224 -#: apply.c:4944
1314 +#: apply.c:4951
1315 #, c-format
1316 msgid "%d line applied after fixing whitespace errors."
1317 msgid_plural "%d lines applied after fixing whitespace errors."
1318 msgstr[0] ""
1319 msgstr[1] ""
1320
1231 -#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406
1321 +#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423
1322 msgid "Unable to write new index file"
1323 msgstr ""
1324
1235 -#: apply.c:4988
1325 +#: apply.c:4995
1326 msgid "don't apply changes matching the given path"
1327 msgstr ""
1328
1239 -#: apply.c:4991
1329 +#: apply.c:4998
1330 msgid "apply changes matching the given path"
1331 msgstr ""
1332
1243 -#: apply.c:4993 builtin/am.c:2266
1333 +#: apply.c:5000 builtin/am.c:2317
1334 msgid "num"
1335 msgstr ""
1336
1247 -#: apply.c:4994
1337 +#: apply.c:5001
1338 msgid "remove <num> leading slashes from traditional diff paths"
1339 msgstr ""
1340
1251 -#: apply.c:4997
1341 +#: apply.c:5004
1342 msgid "ignore additions made by the patch"
1343 msgstr ""
1344
1255 -#: apply.c:4999
1345 +#: apply.c:5006
1346 msgid "instead of applying the patch, output diffstat for the input"
1347 msgstr ""
1348
1259 -#: apply.c:5003
1349 +#: apply.c:5010
1350 msgid "show number of added and deleted lines in decimal notation"
1351 msgstr ""
1352
1263 -#: apply.c:5005
1353 +#: apply.c:5012
1354 msgid "instead of applying the patch, output a summary for the input"
1355 msgstr ""
1356
1267 -#: apply.c:5007
1357 +#: apply.c:5014
1358 msgid "instead of applying the patch, see if the patch is applicable"
1359 msgstr ""
1360
1271 -#: apply.c:5009
1361 +#: apply.c:5016
1362 msgid "make sure the patch is applicable to the current index"
1363 msgstr ""
1364
1275 -#: apply.c:5011
1365 +#: apply.c:5018
1366 msgid "mark new files with `git add --intent-to-add`"
1367 msgstr ""
1368
1279 -#: apply.c:5013
1369 +#: apply.c:5020
1370 msgid "apply a patch without touching the working tree"
1371 msgstr ""
1372
1283 -#: apply.c:5015
1373 +#: apply.c:5022
1374 msgid "accept a patch that touches outside the working area"
1375 msgstr ""
1376
1287 -#: apply.c:5018
1377 +#: apply.c:5025
1378 msgid "also apply the patch (use with --stat/--summary/--check)"
1379 msgstr ""
1380
1291 -#: apply.c:5020
1292 -msgid "attempt three-way merge if a patch does not apply"
1381 +#: apply.c:5027
1382 +msgid "attempt three-way merge, fall back on normal patch if that fails"
1383 msgstr ""
1384
1295 -#: apply.c:5022
1385 +#: apply.c:5029
1386 msgid "build a temporary index based on embedded index information"
1387 msgstr ""
1388
1299 -#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540
1389 +#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
1390 msgid "paths are separated with NUL character"
1391 msgstr ""
1392
1303 -#: apply.c:5027
1393 +#: apply.c:5034
1394 msgid "ensure at least <n> lines of context match"
1395 msgstr ""
1396
1307 -#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98
1308 -#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
1309 -#: builtin/pack-objects.c:3577 builtin/rebase.c:1352
1397 +#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296
1398 +#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
1399 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831
1400 +#: builtin/rebase.c:1347
1401 msgid "action"
1402 msgstr ""
1403
1313 -#: apply.c:5029
1404 +#: apply.c:5036
1405 msgid "detect new or modified lines that have whitespace errors"
1406 msgstr ""
1407
1317 -#: apply.c:5032 apply.c:5035
1408 +#: apply.c:5039 apply.c:5042
1409 msgid "ignore changes in whitespace when finding context"
1410 msgstr ""
1411
1321 -#: apply.c:5038
1412 +#: apply.c:5045
1413 msgid "apply the patch in reverse"
1414 msgstr ""
1415
1325 -#: apply.c:5040
1416 +#: apply.c:5047
1417 msgid "don't expect at least one line of context"
1418 msgstr ""
1419
1329 -#: apply.c:5042
1420 +#: apply.c:5049
1421 msgid "leave the rejected hunks in corresponding *.rej files"
1422 msgstr ""
1423
1333 -#: apply.c:5044
1424 +#: apply.c:5051
1425 msgid "allow overlapping hunks"
1426 msgstr ""
1427
1337 -#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22
1338 -#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757
1339 -#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128
1428 +#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
1429 +#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755
1430 +#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128
1431 msgid "be verbose"
1432 msgstr ""
1433
1343 -#: apply.c:5047
1434 +#: apply.c:5054
1435 msgid "tolerate incorrectly detected missing new-line at the end of file"
1436 msgstr ""
1437
1347 -#: apply.c:5050
1438 +#: apply.c:5057
1439 msgid "do not trust the line counts in the hunk headers"
1440 msgstr ""
1441
1351 -#: apply.c:5052 builtin/am.c:2254
1442 +#: apply.c:5059 builtin/am.c:2305
1443 msgid "root"
1444 msgstr ""
1445
1355 -#: apply.c:5053
1446 +#: apply.c:5060
1447 msgid "prepend <root> to all filenames"
1448 msgstr ""
1449
@@ -1402,171 +1493,173 @@ msgstr ""
1493
1494 #: archive.c:14
1495 msgid "git archive [<options>] <tree-ish> [<path>...]"
1405 -msgstr ""
1496 +msgstr "git archive [<opsi>] <mirip pohon> [<jalur>...]"
1497
1498 #: archive.c:15
1499 msgid "git archive --list"
1409 -msgstr ""
1500 +msgstr "git archive --list"
1501
1502 #: archive.c:16
1503 msgid ""
1504 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
1505 msgstr ""
1506 +"git archive --remote <repo> [--exec <perintah>] [<opsi>] <mirip pohon> "
1507 +"[<jalur>...]"
1508
1509 #: archive.c:17
1510 msgid "git archive --remote <repo> [--exec <cmd>] --list"
1418 -msgstr ""
1511 +msgstr "git archive --remote <repo> [--exec <perintah>] --list"
1512
1420 -#: archive.c:192
1513 +#: archive.c:188
1514 #, c-format
1515 msgid "cannot read %s"
1423 -msgstr ""
1516 +msgstr "Tidak dapat membaca %s"
1517
1425 -#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894
1426 -#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786
1427 -#: builtin/merge.c:1139
1518 +#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
1519 +#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833
1520 +#: builtin/merge.c:1143
1521 #, c-format
1522 msgid "could not read '%s'"
1430 -msgstr ""
1523 +msgstr "tidak dapat membaca '%s'"
1524
1432 -#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315
1525 +#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328
1526 #, c-format
1527 msgid "pathspec '%s' did not match any files"
1435 -msgstr ""
1528 +msgstr "spek jalur '%s' tidak cocok dengan berkas apapun"
1529
1437 -#: archive.c:454
1530 +#: archive.c:451
1531 #, c-format
1532 msgid "no such ref: %.*s"
1440 -msgstr ""
1533 +msgstr "tidak ada referensi seperti: %.*s"
1534
1442 -#: archive.c:460
1535 +#: archive.c:457
1536 #, c-format
1537 msgid "not a valid object name: %s"
1445 -msgstr ""
1538 +msgstr "bukan nama objek valid: %s"
1539
1447 -#: archive.c:473
1540 +#: archive.c:470
1541 #, c-format
1542 msgid "not a tree object: %s"
1450 -msgstr ""
1543 +msgstr "bukan objek pohon: %s"
1544
1452 -#: archive.c:485
1545 +#: archive.c:482
1546 msgid "current working directory is untracked"
1454 -msgstr ""
1547 +msgstr "direktori kerja saat ini tak terlacak"
1548
1456 -#: archive.c:526
1549 +#: archive.c:523
1550 #, c-format
1551 msgid "File not found: %s"
1459 -msgstr ""
1552 +msgstr "Berkas tidak ditemukan: %s"
1553
1461 -#: archive.c:528
1554 +#: archive.c:525
1555 #, c-format
1556 msgid "Not a regular file: %s"
1464 -msgstr ""
1557 +msgstr "Bukan berkas reguler: %s"
1558
1466 -#: archive.c:555
1559 +#: archive.c:552
1560 msgid "fmt"
1468 -msgstr ""
1561 +msgstr "fmt"
1562
1470 -#: archive.c:555
1563 +#: archive.c:552
1564 msgid "archive format"
1472 -msgstr ""
1565 +msgstr "format arsip"
1566
1474 -#: archive.c:556 builtin/log.c:1764
1567 +#: archive.c:553 builtin/log.c:1772
1568 msgid "prefix"
1476 -msgstr ""
1569 +msgstr "prefiks"
1570
1478 -#: archive.c:557
1571 +#: archive.c:554
1572 msgid "prepend prefix to each pathname in the archive"
1480 -msgstr ""
1573 +msgstr "tambahkan prefiks di depan setiap nama jalur dalam arsip"
1574
1482 -#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888
1575 +#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
1576 #: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
1577 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209
1485 -#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105
1486 -#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412
1487 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190
1578 +#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105
1579 +#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
1580 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
1581 msgid "file"
1489 -msgstr ""
1582 +msgstr "berkas"
1583
1491 -#: archive.c:559
1584 +#: archive.c:556
1585 msgid "add untracked file to archive"
1493 -msgstr ""
1586 +msgstr "tambahkan berkas tak terlacak ke arsip"
1587
1495 -#: archive.c:562 builtin/archive.c:90
1588 +#: archive.c:559 builtin/archive.c:90
1589 msgid "write the archive to this file"
1497 -msgstr ""
1590 +msgstr "tulis arsip ke berkas ini"
1591
1499 -#: archive.c:564
1592 +#: archive.c:561
1593 msgid "read .gitattributes in working directory"
1501 -msgstr ""
1594 +msgstr "baca .gitattributes dalam direktori kerja"
1595
1503 -#: archive.c:565
1596 +#: archive.c:562
1597 msgid "report archived files on stderr"
1505 -msgstr ""
1598 +msgstr "laporkan berkas terarsip ke error standar"
1599
1507 -#: archive.c:567
1600 +#: archive.c:564
1601 msgid "set compression level"
1509 -msgstr ""
1602 +msgstr "setel level kompresi"
1603
1511 -#: archive.c:570
1604 +#: archive.c:567
1605 msgid "list supported archive formats"
1513 -msgstr ""
1606 +msgstr "daftar format arsip yang didukung"
1607
1515 -#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117
1516 -#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
1608 +#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
1609 +#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336
1610 msgid "repo"
1518 -msgstr ""
1611 +msgstr "repositori"
1612
1520 -#: archive.c:573 builtin/archive.c:92
1613 +#: archive.c:570 builtin/archive.c:92
1614 msgid "retrieve the archive from remote repository <repo>"
1522 -msgstr ""
1615 +msgstr "ambil arsip dari repositori remote <repo>"
1616
1524 -#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714
1617 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718
1618 #: builtin/notes.c:498
1619 msgid "command"
1527 -msgstr ""
1620 +msgstr "perintah"
1621
1529 -#: archive.c:575 builtin/archive.c:94
1622 +#: archive.c:572 builtin/archive.c:94
1623 msgid "path to the remote git-upload-archive command"
1531 -msgstr ""
1624 +msgstr "jalur ke perintah git-upload-archive remote"
1625
1533 -#: archive.c:582
1626 +#: archive.c:579
1627 msgid "Unexpected option --remote"
1535 -msgstr ""
1628 +msgstr "Opsi --remote tak diharapkan"
1629
1537 -#: archive.c:584
1630 +#: archive.c:581
1631 msgid "Option --exec can only be used together with --remote"
1539 -msgstr ""
1632 +msgstr "Opsi --exec hanya dapat digunakan bersamaan dengan --remote"
1633
1541 -#: archive.c:586
1634 +#: archive.c:583
1635 msgid "Unexpected option --output"
1543 -msgstr ""
1636 +msgstr "Opsi --output tak diharapkan"
1637
1545 -#: archive.c:588
1638 +#: archive.c:585
1639 msgid "Options --add-file and --remote cannot be used together"
1547 -msgstr ""
1640 +msgstr "Opsi --add-file dan --remote tidak dapat digunakan bersamaan"
1641
1549 -#: archive.c:610
1642 +#: archive.c:607
1643 #, c-format
1644 msgid "Unknown archive format '%s'"
1552 -msgstr ""
1645 +msgstr "Format arsip tidak dikenal '%s'"
1646
1554 -#: archive.c:619
1647 +#: archive.c:616
1648 #, c-format
1649 msgid "Argument not supported for format '%s': -%d"
1557 -msgstr ""
1650 +msgstr "Argumen tidak didukung untuk format '%s': -%d"
1651
1652 #: attr.c:202
1653 #, c-format
1654 msgid "%.*s is not a valid attribute name"
1655 msgstr ""
1656
1564 -#: attr.c:359
1657 +#: attr.c:363
1658 #, c-format
1659 msgid "%s not allowed: %s:%d"
1660 msgstr ""
1661
1569 -#: attr.c:399
1662 +#: attr.c:403
1663 msgid ""
1664 "Negative patterns are ignored in git attributes\n"
1665 "Use '\\!' for literal leading exclamation."
@@ -1634,7 +1727,7 @@ msgstr ""
1727 msgid "a %s revision is needed"
1728 msgstr ""
1729
1637 -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287
1730 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
1731 #, c-format
1732 msgid "could not create file '%s'"
1733 msgstr ""
@@ -1677,37 +1770,37 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1770 msgstr[0] ""
1771 msgstr[1] ""
1772
1680 -#: blame.c:2777
1773 +#: blame.c:2776
1774 msgid "--contents and --reverse do not blend well."
1775 msgstr ""
1776
1684 -#: blame.c:2791
1777 +#: blame.c:2790
1778 msgid "cannot use --contents with final commit object name"
1779 msgstr ""
1780
1688 -#: blame.c:2812
1781 +#: blame.c:2811
1782 msgid "--reverse and --first-parent together require specified latest commit"
1783 msgstr ""
1784
1692 -#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146
1693 -#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411
1694 -#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335
1695 -#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410
1696 -#: builtin/shortlog.c:255
1785 +#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333
1786 +#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411
1787 +#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344
1788 +#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646
1789 +#: builtin/pack-objects.c:3661 builtin/shortlog.c:255
1790 msgid "revision walk setup failed"
1791 msgstr "persiapan jalan revisi gagal"
1792
1700 -#: blame.c:2839
1793 +#: blame.c:2838
1794 msgid ""
1795 "--reverse --first-parent together require range along first-parent chain"
1796 msgstr ""
1797
1705 -#: blame.c:2850
1798 +#: blame.c:2849
1799 #, c-format
1800 msgid "no such path %s in %s"
1801 msgstr ""
1802
1710 -#: blame.c:2861
1803 +#: blame.c:2860
1804 #, c-format
1805 msgid "cannot read blob %s for path %s"
1806 msgstr ""
@@ -1826,12 +1919,12 @@ msgstr ""
1919 msgid "Not a valid branch point: '%s'."
1920 msgstr ""
1921
1829 -#: branch.c:365
1922 +#: branch.c:366
1923 #, c-format
1924 msgid "'%s' is already checked out at '%s'"
1925 msgstr ""
1926
1834 -#: branch.c:388
1927 +#: branch.c:389
1928 #, c-format
1929 msgid "HEAD of working tree %s is not updated"
1930 msgstr ""
@@ -1856,8 +1949,8 @@ msgstr ""
1949 msgid "unrecognized header: %s%s (%d)"
1950 msgstr ""
1951
1859 -#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184
1860 -#: builtin/commit.c:814
1952 +#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
1953 +#: builtin/commit.c:861
1954 #, c-format
1955 msgid "could not open '%s'"
1956 msgstr ""
@@ -1915,7 +2008,7 @@ msgstr ""
2008 msgid "cannot write bundle version %d with algorithm %s"
2009 msgstr ""
2010
1918 -#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396
2011 +#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396
2012 #, c-format
2013 msgid "unrecognized argument: %s"
2014 msgstr ""
@@ -1957,252 +2050,252 @@ msgstr ""
2050 msgid "invalid color value: %.*s"
2051 msgstr ""
2052
1960 -#: commit-graph.c:197 midx.c:46
2053 +#: commit-graph.c:204 midx.c:47
2054 msgid "invalid hash version"
2055 msgstr ""
2056
1964 -#: commit-graph.c:255
2057 +#: commit-graph.c:262
2058 msgid "commit-graph file is too small"
2059 msgstr ""
2060
1968 -#: commit-graph.c:348
2061 +#: commit-graph.c:355
2062 #, c-format
2063 msgid "commit-graph signature %X does not match signature %X"
2064 msgstr ""
2065
1973 -#: commit-graph.c:355
2066 +#: commit-graph.c:362
2067 #, c-format
2068 msgid "commit-graph version %X does not match version %X"
2069 msgstr ""
2070
1978 -#: commit-graph.c:362
2071 +#: commit-graph.c:369
2072 #, c-format
2073 msgid "commit-graph hash version %X does not match version %X"
2074 msgstr ""
2075
1983 -#: commit-graph.c:379
2076 +#: commit-graph.c:386
2077 #, c-format
2078 msgid "commit-graph file is too small to hold %u chunks"
2079 msgstr ""
2080
1988 -#: commit-graph.c:472
2081 +#: commit-graph.c:482
2082 msgid "commit-graph has no base graphs chunk"
2083 msgstr ""
2084
1992 -#: commit-graph.c:482
2085 +#: commit-graph.c:492
2086 msgid "commit-graph chain does not match"
2087 msgstr ""
2088
1996 -#: commit-graph.c:530
2089 +#: commit-graph.c:540
2090 #, c-format
2091 msgid "invalid commit-graph chain: line '%s' not a hash"
2092 msgstr ""
2093
2001 -#: commit-graph.c:554
2094 +#: commit-graph.c:564
2095 msgid "unable to find all commit-graph files"
2096 msgstr ""
2097
2005 -#: commit-graph.c:735 commit-graph.c:772
2098 +#: commit-graph.c:745 commit-graph.c:782
2099 msgid "invalid commit position. commit-graph is likely corrupt"
2100 msgstr ""
2101
2009 -#: commit-graph.c:756
2102 +#: commit-graph.c:766
2103 #, c-format
2104 msgid "could not find commit %s"
2105 msgstr ""
2106
2014 -#: commit-graph.c:789
2107 +#: commit-graph.c:799
2108 msgid "commit-graph requires overflow generation data but has none"
2109 msgstr ""
2110
2018 -#: commit-graph.c:1065 builtin/am.c:1292
2111 +#: commit-graph.c:1075 builtin/am.c:1340
2112 #, c-format
2113 msgid "unable to parse commit %s"
2114 msgstr ""
2115
2023 -#: commit-graph.c:1327 builtin/pack-objects.c:2872
2116 +#: commit-graph.c:1337 builtin/pack-objects.c:2897
2117 #, c-format
2118 msgid "unable to get type of object %s"
2119 msgstr ""
2120
2028 -#: commit-graph.c:1358
2121 +#: commit-graph.c:1368
2122 msgid "Loading known commits in commit graph"
2123 msgstr ""
2124
2032 -#: commit-graph.c:1375
2125 +#: commit-graph.c:1385
2126 msgid "Expanding reachable commits in commit graph"
2127 msgstr ""
2128
2036 -#: commit-graph.c:1395
2129 +#: commit-graph.c:1405
2130 msgid "Clearing commit marks in commit graph"
2131 msgstr ""
2132
2040 -#: commit-graph.c:1414
2133 +#: commit-graph.c:1424
2134 msgid "Computing commit graph topological levels"
2135 msgstr ""
2136
2044 -#: commit-graph.c:1467
2137 +#: commit-graph.c:1477
2138 msgid "Computing commit graph generation numbers"
2139 msgstr ""
2140
2048 -#: commit-graph.c:1548
2141 +#: commit-graph.c:1558
2142 msgid "Computing commit changed paths Bloom filters"
2143 msgstr ""
2144
2052 -#: commit-graph.c:1625
2145 +#: commit-graph.c:1635
2146 msgid "Collecting referenced commits"
2147 msgstr ""
2148
2056 -#: commit-graph.c:1650
2149 +#: commit-graph.c:1660
2150 #, c-format
2151 msgid "Finding commits for commit graph in %d pack"
2152 msgid_plural "Finding commits for commit graph in %d packs"
2153 msgstr[0] ""
2154 msgstr[1] ""
2155
2063 -#: commit-graph.c:1663
2156 +#: commit-graph.c:1673
2157 #, c-format
2158 msgid "error adding pack %s"
2159 msgstr ""
2160
2068 -#: commit-graph.c:1667
2161 +#: commit-graph.c:1677
2162 #, c-format
2163 msgid "error opening index for %s"
2164 msgstr ""
2165
2073 -#: commit-graph.c:1704
2166 +#: commit-graph.c:1714
2167 msgid "Finding commits for commit graph among packed objects"
2168 msgstr ""
2169
2077 -#: commit-graph.c:1722
2170 +#: commit-graph.c:1732
2171 msgid "Finding extra edges in commit graph"
2172 msgstr ""
2173
2081 -#: commit-graph.c:1771
2174 +#: commit-graph.c:1781
2175 msgid "failed to write correct number of base graph ids"
2176 msgstr ""
2177
2085 -#: commit-graph.c:1802 midx.c:794
2178 +#: commit-graph.c:1812 midx.c:906
2179 #, c-format
2180 msgid "unable to create leading directories of %s"
2181 msgstr ""
2182
2090 -#: commit-graph.c:1815
2183 +#: commit-graph.c:1825
2184 msgid "unable to create temporary graph layer"
2185 msgstr ""
2186
2094 -#: commit-graph.c:1820
2187 +#: commit-graph.c:1830
2188 #, c-format
2189 msgid "unable to adjust shared permissions for '%s'"
2190 msgstr ""
2191
2099 -#: commit-graph.c:1879
2192 +#: commit-graph.c:1887
2193 #, c-format
2194 msgid "Writing out commit graph in %d pass"
2195 msgid_plural "Writing out commit graph in %d passes"
2196 msgstr[0] ""
2197 msgstr[1] ""
2198
2106 -#: commit-graph.c:1915
2199 +#: commit-graph.c:1923
2200 msgid "unable to open commit-graph chain file"
2201 msgstr ""
2202
2110 -#: commit-graph.c:1931
2203 +#: commit-graph.c:1939
2204 msgid "failed to rename base commit-graph file"
2205 msgstr ""
2206
2114 -#: commit-graph.c:1951
2207 +#: commit-graph.c:1959
2208 msgid "failed to rename temporary commit-graph file"
2209 msgstr ""
2210
2118 -#: commit-graph.c:2084
2211 +#: commit-graph.c:2092
2212 msgid "Scanning merged commits"
2213 msgstr ""
2214
2122 -#: commit-graph.c:2128
2215 +#: commit-graph.c:2136
2216 msgid "Merging commit-graph"
2217 msgstr ""
2218
2126 -#: commit-graph.c:2235
2219 +#: commit-graph.c:2244
2220 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
2221 msgstr ""
2222
2130 -#: commit-graph.c:2342
2223 +#: commit-graph.c:2351
2224 msgid "too many commits to write graph"
2225 msgstr ""
2226
2134 -#: commit-graph.c:2440
2227 +#: commit-graph.c:2450
2228 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
2229 msgstr ""
2230
2138 -#: commit-graph.c:2450
2231 +#: commit-graph.c:2460
2232 #, c-format
2233 msgid "commit-graph has incorrect OID order: %s then %s"
2234 msgstr ""
2235
2143 -#: commit-graph.c:2460 commit-graph.c:2475
2236 +#: commit-graph.c:2470 commit-graph.c:2485
2237 #, c-format
2238 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
2239 msgstr ""
2240
2148 -#: commit-graph.c:2467
2241 +#: commit-graph.c:2477
2242 #, c-format
2243 msgid "failed to parse commit %s from commit-graph"
2244 msgstr ""
2245
2153 -#: commit-graph.c:2485
2246 +#: commit-graph.c:2495
2247 msgid "Verifying commits in commit graph"
2248 msgstr ""
2249
2157 -#: commit-graph.c:2500
2250 +#: commit-graph.c:2510
2251 #, c-format
2252 msgid "failed to parse commit %s from object database for commit-graph"
2253 msgstr ""
2254
2162 -#: commit-graph.c:2507
2255 +#: commit-graph.c:2517
2256 #, c-format
2257 msgid "root tree OID for commit %s in commit-graph is %s != %s"
2258 msgstr ""
2259
2167 -#: commit-graph.c:2517
2260 +#: commit-graph.c:2527
2261 #, c-format
2262 msgid "commit-graph parent list for commit %s is too long"
2263 msgstr ""
2264
2172 -#: commit-graph.c:2526
2265 +#: commit-graph.c:2536
2266 #, c-format
2267 msgid "commit-graph parent for %s is %s != %s"
2268 msgstr ""
2269
2177 -#: commit-graph.c:2540
2270 +#: commit-graph.c:2550
2271 #, c-format
2272 msgid "commit-graph parent list for commit %s terminates early"
2273 msgstr ""
2274
2182 -#: commit-graph.c:2545
2275 +#: commit-graph.c:2555
2276 #, c-format
2277 msgid ""
2278 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
2279 msgstr ""
2280
2188 -#: commit-graph.c:2549
2281 +#: commit-graph.c:2559
2282 #, c-format
2283 msgid ""
2284 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
2285 msgstr ""
2286
2194 -#: commit-graph.c:2566
2287 +#: commit-graph.c:2576
2288 #, c-format
2289 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
2290 msgstr ""
2291
2199 -#: commit-graph.c:2572
2292 +#: commit-graph.c:2582
2293 #, c-format
2294 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
2295 msgstr ""
2296
2204 -#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403
2205 -#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457
2297 +#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416
2298 +#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457
2299 #, c-format
2300 msgid "could not parse %s"
2301 msgstr ""
@@ -2224,27 +2317,27 @@ msgid ""
2317 "\"git config advice.graftFileDeprecated false\""
2318 msgstr ""
2319
2227 -#: commit.c:1223
2320 +#: commit.c:1237
2321 #, c-format
2322 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
2323 msgstr ""
2324
2232 -#: commit.c:1227
2325 +#: commit.c:1241
2326 #, c-format
2327 msgid "Commit %s has a bad GPG signature allegedly by %s."
2328 msgstr ""
2329
2237 -#: commit.c:1230
2330 +#: commit.c:1244
2331 #, c-format
2332 msgid "Commit %s does not have a GPG signature."
2333 msgstr ""
2334
2242 -#: commit.c:1233
2335 +#: commit.c:1247
2336 #, c-format
2337 msgid "Commit %s has a good GPG signature by %s\n"
2338 msgstr ""
2339
2247 -#: commit.c:1487
2340 +#: commit.c:1501
2341 msgid ""
2342 "Warning: commit message did not conform to UTF-8.\n"
2343 "You may want to amend it after fixing the message, or set the config\n"
@@ -2264,336 +2357,345 @@ msgid ""
2357 "\t%s\n"
2358 "This might be due to circular includes."
2359 msgstr ""
2360 +"melebihi kedalaman include maksimum (%d) ketika memasukkan\n"
2361 +"\t%s\n"
2362 +"dari\n"
2363 +"\t%s\n"
2364 +"Ini mungkin disebabkan oleh include sirkular."
2365
2366 #: config.c:142
2367 #, c-format
2368 msgid "could not expand include path '%s'"
2271 -msgstr ""
2369 +msgstr "tidak dapat menjabarkan jalur include '%s'"
2370
2371 #: config.c:153
2372 msgid "relative config includes must come from files"
2275 -msgstr ""
2373 +msgstr "include konfigurasi relatif harus dari berkas"
2374
2375 #: config.c:199
2376 msgid "relative config include conditionals must come from files"
2279 -msgstr ""
2377 +msgstr "kondisional include konfigurasi relative harus dari berkas"
2378
2379 #: config.c:396
2380 +#, c-format
2381 msgid "invalid config format: %s"
2283 -msgstr ""
2382 +msgstr "format konfigurasi tidak valid: %s"
2383
2384 #: config.c:400
2385 #, c-format
2386 msgid "missing environment variable name for configuration '%.*s'"
2288 -msgstr ""
2387 +msgstr "nama variabel lingkungan untuk konfigurasi hilang '%.*s'"
2388
2389 #: config.c:405
2390 #, c-format
2391 msgid "missing environment variable '%s' for configuration '%.*s'"
2293 -msgstr ""
2392 +msgstr "variabel lingkungan '%s' untuk konfigurasi '%.*s'"
2393
2394 #: config.c:442
2395 #, c-format
2396 msgid "key does not contain a section: %s"
2298 -msgstr ""
2397 +msgstr "kunci tidak berisi bagian: %s"
2398
2399 #: config.c:448
2400 #, c-format
2401 msgid "key does not contain variable name: %s"
2303 -msgstr ""
2402 +msgstr "kunci tidak berisi nama variabel: %s"
2403
2305 -#: config.c:472 sequencer.c:2588
2404 +#: config.c:472 sequencer.c:2785
2405 #, c-format
2406 msgid "invalid key: %s"
2308 -msgstr ""
2407 +msgstr "kunci tidak valid: %s"
2408
2409 #: config.c:478
2410 #, c-format
2411 msgid "invalid key (newline): %s"
2313 -msgstr ""
2412 +msgstr "kunci tidak valid (barisbaru): %s"
2413
2414 #: config.c:511
2415 msgid "empty config key"
2317 -msgstr ""
2416 +msgstr "kunci konfigurasi kosong"
2417
2418 #: config.c:529 config.c:541
2419 #, c-format
2420 msgid "bogus config parameter: %s"
2322 -msgstr ""
2421 +msgstr "parameter konfigurasi gadungan: %s"
2422
2423 #: config.c:555 config.c:572 config.c:579 config.c:588
2424 #, c-format
2425 msgid "bogus format in %s"
2327 -msgstr ""
2426 +msgstr "format gadungan dalam %s"
2427
2428 #: config.c:622
2429 #, c-format
2430 msgid "bogus count in %s"
2332 -msgstr ""
2431 +msgstr "hitungan gadungan dalam %s"
2432
2433 #: config.c:626
2434 #, c-format
2435 msgid "too many entries in %s"
2337 -msgstr ""
2436 +msgstr "terlalu banyak entri di %s"
2437
2438 #: config.c:636
2439 #, c-format
2440 msgid "missing config key %s"
2342 -msgstr ""
2441 +msgstr "kunci konfigurasi %s hilang"
2442
2443 #: config.c:644
2444 #, c-format
2445 msgid "missing config value %s"
2347 -msgstr ""
2446 +msgstr "nilai konfigurasi %s hilang"
2447
2448 #: config.c:995
2449 #, c-format
2450 msgid "bad config line %d in blob %s"
2352 -msgstr ""
2451 +msgstr "baris konfigurasi %d jelek dalam blob %s"
2452
2453 #: config.c:999
2454 #, c-format
2455 msgid "bad config line %d in file %s"
2357 -msgstr ""
2456 +msgstr "baris konfigurasi %d jelek dalam berkas %s"
2457
2458 #: config.c:1003
2459 #, c-format
2460 msgid "bad config line %d in standard input"
2362 -msgstr ""
2461 +msgstr "baris konfigurasi %d jelek pada masukan standar"
2462
2463 #: config.c:1007
2464 #, c-format
2465 msgid "bad config line %d in submodule-blob %s"
2367 -msgstr ""
2466 +msgstr "baris konfigurasi %d jelek dalam blob submodul %s"
2467
2468 #: config.c:1011
2469 #, c-format
2470 msgid "bad config line %d in command line %s"
2372 -msgstr ""
2471 +msgstr "baris konfigurasi %d jelek pada baris perintah %s"
2472
2473 #: config.c:1015
2474 #, c-format
2475 msgid "bad config line %d in %s"
2377 -msgstr ""
2476 +msgstr "baris konfigurasi %d jelek dalam %s"
2477
2478 #: config.c:1152
2479 msgid "out of range"
2381 -msgstr ""
2480 +msgstr "di luar rentang"
2481
2482 #: config.c:1152
2483 msgid "invalid unit"
2385 -msgstr ""
2484 +msgstr "satuan tidak valid"
2485
2486 #: config.c:1153
2487 #, c-format
2488 msgid "bad numeric config value '%s' for '%s': %s"
2390 -msgstr ""
2489 +msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s': %s"
2490
2491 #: config.c:1163
2492 #, c-format
2493 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
2395 -msgstr ""
2494 +msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s' dalam blob %s: %s"
2495
2496 #: config.c:1166
2497 #, c-format
2498 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
2400 -msgstr ""
2499 +msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s' dalam berkas %s: %s"
2500
2501 #: config.c:1169
2502 #, c-format
2503 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
2504 msgstr ""
2505 +"nilai konfigurasi numerik '%s' jelek untuk '%s' pada masukan standar: %s"
2506
2507 #: config.c:1172
2508 #, c-format
2509 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
2510 msgstr ""
2511 +"nilai konfigurasi numerik '%s' jelek untuk '%s' dalam blob submodul %s: %s"
2512
2513 #: config.c:1175
2514 #, c-format
2515 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
2516 msgstr ""
2517 +"nilai konfigurasi numerik '%s' jelek untuk '%s' pada baris perintah %s: %s"
2518
2519 #: config.c:1178
2520 #, c-format
2521 msgid "bad numeric config value '%s' for '%s' in %s: %s"
2420 -msgstr ""
2522 +msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s' dalam %s: %s"
2523
2422 -#: config.c:1194
2524 +#: config.c:1257
2525 #, c-format
2526 msgid "bad boolean config value '%s' for '%s'"
2425 -msgstr ""
2527 +msgstr "nilai konfigurasi boolean '%s' jelek untuk '%s'"
2528
2427 -#: config.c:1289
2529 +#: config.c:1275
2530 #, c-format
2531 msgid "failed to expand user dir in: '%s'"
2430 -msgstr ""
2532 +msgstr "gagal menjabarkan direktori pengguna di: '%s'"
2533
2432 -#: config.c:1298
2534 +#: config.c:1284
2535 #, c-format
2536 msgid "'%s' for '%s' is not a valid timestamp"
2435 -msgstr ""
2537 +msgstr "'%s' untuk '%s' bukan stempel waktu valid"
2538
2437 -#: config.c:1391
2539 +#: config.c:1377
2540 #, c-format
2541 msgid "abbrev length out of range: %d"
2440 -msgstr ""
2542 +msgstr "panjang singkatan di luar rentang: %d"
2543
2442 -#: config.c:1405 config.c:1416
2544 +#: config.c:1391 config.c:1402
2545 #, c-format
2546 msgid "bad zlib compression level %d"
2445 -msgstr ""
2547 +msgstr "level kompresi zlib jelek %d"
2548
2447 -#: config.c:1508
2549 +#: config.c:1494
2550 msgid "core.commentChar should only be one character"
2449 -msgstr ""
2551 +msgstr "core.commentChar harusnya hanya satu karakter"
2552
2451 -#: config.c:1541
2553 +#: config.c:1527
2554 #, c-format
2555 msgid "invalid mode for object creation: %s"
2454 -msgstr ""
2556 +msgstr "mode tidak valid untuk pembuatan objek: %s"
2557
2456 -#: config.c:1613
2558 +#: config.c:1599
2559 #, c-format
2560 msgid "malformed value for %s"
2459 -msgstr ""
2561 +msgstr "nilai rusak untuk %s"
2562
2461 -#: config.c:1639
2563 +#: config.c:1625
2564 #, c-format
2565 msgid "malformed value for %s: %s"
2464 -msgstr ""
2566 +msgstr "nilai rusak untuk %s: %s"
2567
2466 -#: config.c:1640
2568 +#: config.c:1626
2569 msgid "must be one of nothing, matching, simple, upstream or current"
2468 -msgstr ""
2570 +msgstr "harus salah satu dari nothing, matching, simple, upstream atau current"
2571
2470 -#: config.c:1701 builtin/pack-objects.c:3666
2572 +#: config.c:1687 builtin/pack-objects.c:3924
2573 #, c-format
2574 msgid "bad pack compression level %d"
2473 -msgstr ""
2575 +msgstr "level kompresi pak jelek %d"
2576
2475 -#: config.c:1823
2577 +#: config.c:1809
2578 #, c-format
2579 msgid "unable to load config blob object '%s'"
2478 -msgstr ""
2580 +msgstr "tidak dapat memuat objek blob konfigurasi '%s'"
2581
2480 -#: config.c:1826
2582 +#: config.c:1812
2583 #, c-format
2584 msgid "reference '%s' does not point to a blob"
2483 -msgstr ""
2585 +msgstr "referensi '%s' tidak menunjuk pada sebuah blob"
2586
2485 -#: config.c:1843
2587 +#: config.c:1829
2588 #, c-format
2589 msgid "unable to resolve config blob '%s'"
2488 -msgstr ""
2590 +msgstr "tidak dapat menguraikan blob konfigurasi '%s'"
2591
2592 #: config.c:1873
2593 #, c-format
2594 msgid "failed to parse %s"
2493 -msgstr ""
2595 +msgstr "gagal menguraikan %s"
2596
2495 -#: config.c:1927
2597 +#: config.c:1929
2598 msgid "unable to parse command-line config"
2497 -msgstr ""
2599 +msgstr "gagal menguraikan konfigurasi baris perintah"
2600
2499 -#: config.c:2290
2601 +#: config.c:2293
2602 msgid "unknown error occurred while reading the configuration files"
2501 -msgstr ""
2603 +msgstr "error tidak diketahui ketika membaca berkas konfigurasi"
2604
2503 -#: config.c:2464
2605 +#: config.c:2467
2606 #, c-format
2607 msgid "Invalid %s: '%s'"
2506 -msgstr ""
2608 +msgstr "%s tidak valid: '%s'"
2609
2508 -#: config.c:2509
2610 +#: config.c:2512
2611 #, c-format
2612 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
2511 -msgstr ""
2613 +msgstr "nilai splitIndex.maxPercentChange '%d' harusnya diantara 0 dan 100"
2614
2513 -#: config.c:2555
2615 +#: config.c:2558
2616 #, c-format
2617 msgid "unable to parse '%s' from command-line config"
2516 -msgstr ""
2618 +msgstr "tidak dapat menguraikan '%s' dari konfigurasi baris perintah"
2619
2518 -#: config.c:2557
2620 +#: config.c:2560
2621 #, c-format
2622 msgid "bad config variable '%s' in file '%s' at line %d"
2521 -msgstr ""
2623 +msgstr "variabel konfigurasi '%s' jelek dalam berkas '%s' pada baris %d"
2624
2523 -#: config.c:2641
2625 +#: config.c:2644
2626 #, c-format
2627 msgid "invalid section name '%s'"
2526 -msgstr ""
2628 +msgstr "nama bagian '%s' tidak valid"
2629
2528 -#: config.c:2673
2630 +#: config.c:2676
2631 #, c-format
2632 msgid "%s has multiple values"
2531 -msgstr ""
2633 +msgstr "%s punya banyak nilai"
2634
2533 -#: config.c:2702
2635 +#: config.c:2705
2636 #, c-format
2637 msgid "failed to write new configuration file %s"
2536 -msgstr ""
2638 +msgstr "gagal menulis berkas konfigurasi baru %s"
2639
2538 -#: config.c:2954 config.c:3280
2640 +#: config.c:2957 config.c:3283
2641 #, c-format
2642 msgid "could not lock config file %s"
2541 -msgstr ""
2643 +msgstr "tidak dapat mengunci berkas konfigurasi %s"
2644
2543 -#: config.c:2965
2645 +#: config.c:2968
2646 #, c-format
2647 msgid "opening %s"
2546 -msgstr ""
2648 +msgstr "membuka %s"
2649
2548 -#: config.c:3002 builtin/config.c:361
2650 +#: config.c:3005 builtin/config.c:361
2651 #, c-format
2652 msgid "invalid pattern: %s"
2551 -msgstr ""
2653 +msgstr "pola tidak valid: %s"
2654
2553 -#: config.c:3027
2655 +#: config.c:3030
2656 #, c-format
2657 msgid "invalid config file %s"
2556 -msgstr ""
2658 +msgstr "berkas konfigurasi %s tidak valid"
2659
2558 -#: config.c:3040 config.c:3293
2660 +#: config.c:3043 config.c:3296
2661 #, c-format
2662 msgid "fstat on %s failed"
2561 -msgstr ""
2663 +msgstr "fstat pada %s gagal"
2664
2563 -#: config.c:3051
2665 +#: config.c:3054
2666 #, c-format
2667 msgid "unable to mmap '%s'"
2566 -msgstr ""
2668 +msgstr "tidak dapat me-mmap '%s'"
2669
2568 -#: config.c:3060 config.c:3298
2670 +#: config.c:3063 config.c:3301
2671 #, c-format
2672 msgid "chmod on %s failed"
2571 -msgstr ""
2673 +msgstr "chmod pada %s gagal"
2674
2573 -#: config.c:3145 config.c:3395
2675 +#: config.c:3148 config.c:3398
2676 #, c-format
2677 msgid "could not write config file %s"
2576 -msgstr ""
2678 +msgstr "tidak dapat menulis berkas konfigurasi %s"
2679
2578 -#: config.c:3179
2680 +#: config.c:3182
2681 #, c-format
2682 msgid "could not set '%s' to '%s'"
2581 -msgstr ""
2683 +msgstr "tidak dapat menyetel '%s' ke '%s'"
2684
2583 -#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
2685 +#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
2686 #, c-format
2687 msgid "could not unset '%s'"
2586 -msgstr ""
2688 +msgstr "tidak dapat mem-batal setel '%s'"
2689
2588 -#: config.c:3271
2690 +#: config.c:3274
2691 #, c-format
2692 msgid "invalid section name: %s"
2591 -msgstr ""
2693 +msgstr "nama bagian tidak valid: %s"
2694
2593 -#: config.c:3438
2695 +#: config.c:3441
2696 #, c-format
2697 msgid "missing value for '%s'"
2596 -msgstr ""
2698 +msgstr "nilai hilang untuk '%s'"
2699
2700 #: connect.c:61
2701 msgid "the remote end hung up upon initial contact"
@@ -2759,7 +2861,7 @@ msgstr ""
2861 msgid "unable to fork"
2862 msgstr ""
2863
2762 -#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45
2864 +#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45
2865 msgid "Checking connectivity"
2866 msgstr ""
2867
@@ -2775,119 +2877,119 @@ msgstr ""
2877 msgid "failed to close rev-list's stdin"
2878 msgstr ""
2879
2778 -#: convert.c:194
2880 +#: convert.c:183
2881 #, c-format
2882 msgid "illegal crlf_action %d"
2883 msgstr ""
2884
2783 -#: convert.c:207
2885 +#: convert.c:196
2886 #, c-format
2887 msgid "CRLF would be replaced by LF in %s"
2888 msgstr ""
2889
2788 -#: convert.c:209
2890 +#: convert.c:198
2891 #, c-format
2892 msgid ""
2893 "CRLF will be replaced by LF in %s.\n"
2894 "The file will have its original line endings in your working directory"
2895 msgstr ""
2896
2795 -#: convert.c:217
2897 +#: convert.c:206
2898 #, c-format
2899 msgid "LF would be replaced by CRLF in %s"
2900 msgstr ""
2901
2800 -#: convert.c:219
2902 +#: convert.c:208
2903 #, c-format
2904 msgid ""
2905 "LF will be replaced by CRLF in %s.\n"
2906 "The file will have its original line endings in your working directory"
2907 msgstr ""
2908
2807 -#: convert.c:284
2909 +#: convert.c:273
2910 #, c-format
2911 msgid "BOM is prohibited in '%s' if encoded as %s"
2912 msgstr ""
2913
2812 -#: convert.c:291
2914 +#: convert.c:280
2915 #, c-format
2916 msgid ""
2917 "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
2918 "working-tree-encoding."
2919 msgstr ""
2920
2819 -#: convert.c:304
2921 +#: convert.c:293
2922 #, c-format
2923 msgid "BOM is required in '%s' if encoded as %s"
2924 msgstr ""
2925
2824 -#: convert.c:306
2926 +#: convert.c:295
2927 #, c-format
2928 msgid ""
2929 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
2930 "%sLE (depending on the byte order) as working-tree-encoding."
2931 msgstr ""
2932
2831 -#: convert.c:419 convert.c:490
2933 +#: convert.c:408 convert.c:479
2934 #, c-format
2935 msgid "failed to encode '%s' from %s to %s"
2936 msgstr ""
2937
2836 -#: convert.c:462
2938 +#: convert.c:451
2939 #, c-format
2940 msgid "encoding '%s' from %s to %s and back is not the same"
2941 msgstr ""
2942
2841 -#: convert.c:665
2943 +#: convert.c:654
2944 #, c-format
2945 msgid "cannot fork to run external filter '%s'"
2946 msgstr ""
2947
2846 -#: convert.c:685
2948 +#: convert.c:674
2949 #, c-format
2950 msgid "cannot feed the input to external filter '%s'"
2951 msgstr ""
2952
2851 -#: convert.c:692
2953 +#: convert.c:681
2954 #, c-format
2955 msgid "external filter '%s' failed %d"
2956 msgstr ""
2957
2856 -#: convert.c:727 convert.c:730
2958 +#: convert.c:716 convert.c:719
2959 #, c-format
2960 msgid "read from external filter '%s' failed"
2961 msgstr ""
2962
2861 -#: convert.c:733 convert.c:788
2963 +#: convert.c:722 convert.c:777
2964 #, c-format
2965 msgid "external filter '%s' failed"
2966 msgstr ""
2967
2866 -#: convert.c:837
2968 +#: convert.c:826
2969 msgid "unexpected filter type"
2970 msgstr ""
2971
2870 -#: convert.c:848
2972 +#: convert.c:837
2973 msgid "path name too long for external filter"
2974 msgstr ""
2975
2874 -#: convert.c:940
2976 +#: convert.c:934
2977 #, c-format
2978 msgid ""
2979 "external filter '%s' is not available anymore although not all paths have "
2980 "been filtered"
2981 msgstr ""
2982
2881 -#: convert.c:1240
2983 +#: convert.c:1234
2984 msgid "true/false are no valid working-tree-encodings"
2985 msgstr ""
2986
2885 -#: convert.c:1428 convert.c:1462
2987 +#: convert.c:1414 convert.c:1447
2988 #, c-format
2989 msgid "%s: clean filter '%s' failed"
2990 msgstr ""
2991
2890 -#: convert.c:1508
2992 +#: convert.c:1490
2993 #, c-format
2994 msgid "%s: smudge filter %s failed"
2995 msgstr ""
@@ -3012,28 +3114,28 @@ msgstr ""
3114 msgid "Marked %d islands, done.\n"
3115 msgstr ""
3116
3015 -#: diff-merges.c:70
3117 +#: diff-merges.c:80
3118 #, c-format
3119 msgid "unknown value for --diff-merges: %s"
3120 msgstr ""
3121
3020 -#: diff-lib.c:534
3122 +#: diff-lib.c:538
3123 msgid "--merge-base does not work with ranges"
3124 msgstr ""
3125
3024 -#: diff-lib.c:536
3126 +#: diff-lib.c:540
3127 msgid "--merge-base only works with commits"
3128 msgstr ""
3129
3028 -#: diff-lib.c:553
3130 +#: diff-lib.c:557
3131 msgid "unable to get HEAD"
3132 msgstr ""
3133
3032 -#: diff-lib.c:560
3134 +#: diff-lib.c:564
3135 msgid "no merge base found"
3136 msgstr ""
3137
3036 -#: diff-lib.c:562
3138 +#: diff-lib.c:566
3139 msgid "multiple merge bases found"
3140 msgstr ""
3141
@@ -3050,18 +3152,20 @@ msgstr ""
3152 #: diff.c:156
3153 #, c-format
3154 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
3053 -msgstr ""
3155 +msgstr " Gagal mengurai persentase potongan dirstat '%s'\n"
3156
3157 #: diff.c:161
3158 #, c-format
3159 msgid " Unknown dirstat parameter '%s'\n"
3058 -msgstr ""
3160 +msgstr " Parameter dirstat tidak ditketahui '%s'\n"
3161
3162 #: diff.c:297
3163 msgid ""
3164 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
3165 "'dimmed-zebra', 'plain'"
3166 msgstr ""
3167 +"Setelan warna berpindah harus salah satu dari 'no', 'default', 'blocks', "
3168 +"'dimmed-zebra', 'plain'"
3169
3170 #: diff.c:325
3171 #, c-format
@@ -3069,17 +3173,22 @@ msgid ""
3173 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
3174 "'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
3175 msgstr ""
3176 +"mode color-moved-ws tidak dikenal '%s', nilai yang mungkin yaitu 'ignore-"
3177 +"space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
3178 +"change'"
3179
3180 #: diff.c:333
3181 msgid ""
3182 "color-moved-ws: allow-indentation-change cannot be combined with other "
3183 "whitespace modes"
3184 msgstr ""
3185 +"color-moved-ws: allow-indentation-change tidak dapat digabungkan dengan mode "
3186 +"spasi yang lainnya"
3187
3188 #: diff.c:410
3189 #, c-format
3190 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
3082 -msgstr ""
3191 +msgstr "Nilai tidak dikenal untuk variabel konfigurasi 'diff.submodule': '%s'"
3192
3193 #: diff.c:470
3194 #, c-format
@@ -3087,556 +3196,583 @@ msgid ""
3196 "Found errors in 'diff.dirstat' config variable:\n"
3197 "%s"
3198 msgstr ""
3199 +"Ditemukan error dalam variable konfigurasi 'diff.dirstat':\n"
3200 +"%s"
3201
3091 -#: diff.c:4276
3202 +#: diff.c:4278
3203 #, c-format
3204 msgid "external diff died, stopping at %s"
3094 -msgstr ""
3205 +msgstr "diff eksternal mati, berhenti pada %s"
3206
3096 -#: diff.c:4628
3207 +#: diff.c:4630
3208 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
3098 -msgstr ""
3209 +msgstr "--name-only, --name-status, --check dan -s saling eksklusif"
3210
3100 -#: diff.c:4631
3211 +#: diff.c:4633
3212 msgid "-G, -S and --find-object are mutually exclusive"
3102 -msgstr ""
3213 +msgstr "-G, -S dan --find-object saling eksklusif"
3214
3104 -#: diff.c:4710
3215 +#: diff.c:4712
3216 msgid "--follow requires exactly one pathspec"
3106 -msgstr ""
3217 +msgstr "--follow butuh tepatnya satu spek jalur"
3218
3108 -#: diff.c:4758
3219 +#: diff.c:4760
3220 #, c-format
3221 msgid "invalid --stat value: %s"
3111 -msgstr ""
3222 +msgstr "nilai --stat tidak valid: %s"
3223
3113 -#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306
3224 +#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308
3225 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
3226 #, c-format
3227 msgid "%s expects a numerical value"
3117 -msgstr ""
3228 +msgstr "%s harap nilai numerik"
3229
3119 -#: diff.c:4795
3230 +#: diff.c:4797
3231 #, c-format
3232 msgid ""
3233 "Failed to parse --dirstat/-X option parameter:\n"
3234 "%s"
3235 msgstr ""
3236 +"Gagal menguraikan parameter opsi --dirstat/-X:\n"
3237 +"%s"
3238
3126 -#: diff.c:4880
3239 +#: diff.c:4882
3240 #, c-format
3241 msgid "unknown change class '%c' in --diff-filter=%s"
3129 -msgstr ""
3242 +msgstr "kelas perubahan '%c' tidak dikenal dalam --diff-filter=%s"
3243
3131 -#: diff.c:4904
3244 +#: diff.c:4906
3245 #, c-format
3246 msgid "unknown value after ws-error-highlight=%.*s"
3134 -msgstr ""
3247 +msgstr "nilai tidak dikenal setelah ws-error-highlight=%.*s"
3248
3136 -#: diff.c:4918
3249 +#: diff.c:4920
3250 #, c-format
3251 msgid "unable to resolve '%s'"
3139 -msgstr ""
3252 +msgstr "tidak dapat menguraikan '%s'"
3253
3141 -#: diff.c:4968 diff.c:4974
3254 +#: diff.c:4970 diff.c:4976
3255 #, c-format
3256 msgid "%s expects <n>/<m> form"
3144 -msgstr ""
3257 +msgstr "%s butuh bentuk <n>/<m>"
3258
3146 -#: diff.c:4986
3259 +#: diff.c:4988
3260 #, c-format
3261 msgid "%s expects a character, got '%s'"
3149 -msgstr ""
3262 +msgstr "%s butuh sebuah karakter, dapat '%s'"
3263
3151 -#: diff.c:5007
3264 +#: diff.c:5009
3265 #, c-format
3266 msgid "bad --color-moved argument: %s"
3154 -msgstr ""
3267 +msgstr "argumen --color-moved jelek: %s"
3268
3156 -#: diff.c:5026
3269 +#: diff.c:5028
3270 #, c-format
3271 msgid "invalid mode '%s' in --color-moved-ws"
3159 -msgstr ""
3272 +msgstr "mode tidak valid '%s' dalam --color-moved-ws"
3273
3161 -#: diff.c:5066
3274 +#: diff.c:5068
3275 msgid ""
3276 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
3277 "\"histogram\""
3278 msgstr ""
3279 +"opsi diff-algorithm terima \"myers\", \"minimal\", \"patience\" dan "
3280 +"\"histogram\""
3281
3167 -#: diff.c:5102 diff.c:5122
3282 +#: diff.c:5104 diff.c:5124
3283 #, c-format
3284 msgid "invalid argument to %s"
3170 -msgstr ""
3285 +msgstr "argumen tidak valid ke %s"
3286
3172 -#: diff.c:5226
3287 +#: diff.c:5228
3288 #, c-format
3289 msgid "invalid regex given to -I: '%s'"
3175 -msgstr ""
3290 +msgstr "regex tidak valid diberikan ke -I: '%s'"
3291
3177 -#: diff.c:5275
3292 +#: diff.c:5277
3293 #, c-format
3294 msgid "failed to parse --submodule option parameter: '%s'"
3180 -msgstr ""
3295 +msgstr "gagal menguraikan parameter opsi --submodule: '%s'"
3296
3182 -#: diff.c:5331
3297 +#: diff.c:5333
3298 #, c-format
3299 msgid "bad --word-diff argument: %s"
3185 -msgstr ""
3300 +msgstr "argumen --word-diff jelek: %s"
3301
3187 -#: diff.c:5367
3302 +#: diff.c:5369
3303 msgid "Diff output format options"
3189 -msgstr ""
3304 +msgstr "Opsi format keluaran diff"
3305
3191 -#: diff.c:5369 diff.c:5375
3306 +#: diff.c:5371 diff.c:5377
3307 msgid "generate patch"
3193 -msgstr ""
3308 +msgstr "buat tambalan"
3309
3195 -#: diff.c:5372 builtin/log.c:179
3310 +#: diff.c:5374 builtin/log.c:179
3311 msgid "suppress diff output"
3197 -msgstr ""
3312 +msgstr "sembunyikan keluaran diff"
3313
3199 -#: diff.c:5377 diff.c:5491 diff.c:5498
3314 +#: diff.c:5379 diff.c:5493 diff.c:5500
3315 msgid "<n>"
3201 -msgstr ""
3316 +msgstr "<n>"
3317
3203 -#: diff.c:5378 diff.c:5381
3318 +#: diff.c:5380 diff.c:5383
3319 msgid "generate diffs with <n> lines context"
3205 -msgstr ""
3320 +msgstr "buat diff dengan <n> baris konteks"
3321
3207 -#: diff.c:5383
3322 +#: diff.c:5385
3323 msgid "generate the diff in raw format"
3209 -msgstr ""
3324 +msgstr "buat diff dalam format mentah"
3325
3211 -#: diff.c:5386
3326 +#: diff.c:5388
3327 msgid "synonym for '-p --raw'"
3213 -msgstr ""
3328 +msgstr "sinonim untuk '-p --raw'"
3329
3215 -#: diff.c:5390
3330 +#: diff.c:5392
3331 msgid "synonym for '-p --stat'"
3217 -msgstr ""
3332 +msgstr "sinonim untuk '-p --stat'"
3333
3219 -#: diff.c:5394
3334 +#: diff.c:5396
3335 msgid "machine friendly --stat"
3221 -msgstr ""
3336 +msgstr "--stat yang ramah mesin"
3337
3223 -#: diff.c:5397
3338 +#: diff.c:5399
3339 msgid "output only the last line of --stat"
3225 -msgstr ""
3340 +msgstr "keluarkan hanya baris terakhir --stat"
3341
3227 -#: diff.c:5399 diff.c:5407
3342 +#: diff.c:5401 diff.c:5409
3343 msgid "<param1,param2>..."
3229 -msgstr ""
3344 +msgstr "<parameter 1,parameter 2>..."
3345
3231 -#: diff.c:5400
3346 +#: diff.c:5402
3347 msgid ""
3348 "output the distribution of relative amount of changes for each sub-directory"
3349 msgstr ""
3350 +"keluarkan distribusi jumlah perubahan relatif untuk setiap subdirektori"
3351
3236 -#: diff.c:5404
3352 +#: diff.c:5406
3353 msgid "synonym for --dirstat=cumulative"
3238 -msgstr ""
3354 +msgstr "sinonim untuk --dirstat=cumulative"
3355
3240 -#: diff.c:5408
3356 +#: diff.c:5410
3357 msgid "synonym for --dirstat=files,param1,param2..."
3242 -msgstr ""
3358 +msgstr "sinonim untuk --dirstat=files,param1,param2..."
3359
3244 -#: diff.c:5412
3360 +#: diff.c:5414
3361 msgid "warn if changes introduce conflict markers or whitespace errors"
3362 msgstr ""
3363 +"peringatkan bila perubahan memasukkan penanda konflik atau kesalahan spasi"
3364
3248 -#: diff.c:5415
3365 +#: diff.c:5417
3366 msgid "condensed summary such as creations, renames and mode changes"
3367 msgstr ""
3368 +"ringkasan singkat seperti pembuatan, penggantian nama dan perubahan mode"
3369
3252 -#: diff.c:5418
3370 +#: diff.c:5420
3371 msgid "show only names of changed files"
3254 -msgstr ""
3372 +msgstr "perlihatkan hanya nama berkas yang berubah"
3373
3256 -#: diff.c:5421
3374 +#: diff.c:5423
3375 msgid "show only names and status of changed files"
3258 -msgstr ""
3376 +msgstr "perlihatkan hanya nama dan status berkas yang berubah"
3377
3260 -#: diff.c:5423
3378 +#: diff.c:5425
3379 msgid "<width>[,<name-width>[,<count>]]"
3262 -msgstr ""
3380 +msgstr "<lebar>[,<nama lebar>[,<hitungan>]]"
3381
3264 -#: diff.c:5424
3382 +#: diff.c:5426
3383 msgid "generate diffstat"
3266 -msgstr ""
3384 +msgstr "buat diffstat"
3385
3268 -#: diff.c:5426 diff.c:5429 diff.c:5432
3386 +#: diff.c:5428 diff.c:5431 diff.c:5434
3387 msgid "<width>"
3270 -msgstr ""
3388 +msgstr "<lebar>"
3389
3272 -#: diff.c:5427
3390 +#: diff.c:5429
3391 msgid "generate diffstat with a given width"
3274 -msgstr ""
3392 +msgstr "buat diffstat dengan lebar yang diberikan"
3393
3276 -#: diff.c:5430
3394 +#: diff.c:5432
3395 msgid "generate diffstat with a given name width"
3278 -msgstr ""
3396 +msgstr "buat diffstat dengan nama lebar yang diberikan"
3397
3280 -#: diff.c:5433
3398 +#: diff.c:5435
3399 msgid "generate diffstat with a given graph width"
3282 -msgstr ""
3400 +msgstr "buat diffstat dengan lebar grafik yang diberikan"
3401
3284 -#: diff.c:5435
3402 +#: diff.c:5437
3403 msgid "<count>"
3286 -msgstr ""
3404 +msgstr "<hitungan>"
3405
3288 -#: diff.c:5436
3406 +#: diff.c:5438
3407 msgid "generate diffstat with limited lines"
3290 -msgstr ""
3408 +msgstr "buat diffstat dengan baris yang terbatas"
3409
3292 -#: diff.c:5439
3410 +#: diff.c:5441
3411 msgid "generate compact summary in diffstat"
3294 -msgstr ""
3412 +msgstr "buat ringkasan singkat dalam diffstat"
3413
3296 -#: diff.c:5442
3414 +#: diff.c:5444
3415 msgid "output a binary diff that can be applied"
3298 -msgstr ""
3416 +msgstr "keluarkan diff biner yang dapat diterapkan"
3417
3300 -#: diff.c:5445
3418 +#: diff.c:5447
3419 msgid "show full pre- and post-image object names on the \"index\" lines"
3302 -msgstr ""
3420 +msgstr "perlihatkan objek pra- dan pasca-citra penuh pada baris \"index\""
3421
3304 -#: diff.c:5447
3422 +#: diff.c:5449
3423 msgid "show colored diff"
3306 -msgstr ""
3424 +msgstr "perlihatkan diff berwarna"
3425
3308 -#: diff.c:5448
3426 +#: diff.c:5450
3427 msgid "<kind>"
3310 -msgstr ""
3428 +msgstr "<tipe>"
3429
3312 -#: diff.c:5449
3430 +#: diff.c:5451
3431 msgid ""
3432 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
3433 "diff"
3434 msgstr ""
3435 +"soroti kesalahan spasi dalam baris 'context', 'old' atau 'new' dalam diff"
3436
3318 -#: diff.c:5452
3437 +#: diff.c:5454
3438 msgid ""
3439 "do not munge pathnames and use NULs as output field terminators in --raw or "
3440 "--numstat"
3441 msgstr ""
3442 +"jangan tengkar jalur nama dan gunakan NUL sebagai pembatas bidang keluaran "
3443 +"pada --raw atau --numstat"
3444
3324 -#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570
3445 +#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572
3446 msgid "<prefix>"
3326 -msgstr ""
3447 +msgstr "<prefiks>"
3448
3328 -#: diff.c:5456
3449 +#: diff.c:5458
3450 msgid "show the given source prefix instead of \"a/\""
3330 -msgstr ""
3451 +msgstr "perlihatkan prefiks sumber yang diberikan daripada \"a/\""
3452
3332 -#: diff.c:5459
3453 +#: diff.c:5461
3454 msgid "show the given destination prefix instead of \"b/\""
3334 -msgstr ""
3455 +msgstr "perlihatkan prefiks tujuan daripada \"b/\""
3456
3336 -#: diff.c:5462
3457 +#: diff.c:5464
3458 msgid "prepend an additional prefix to every line of output"
3338 -msgstr ""
3459 +msgstr "tambah depan prefiks tambahan pada setiap baris keluaran"
3460
3340 -#: diff.c:5465
3461 +#: diff.c:5467
3462 msgid "do not show any source or destination prefix"
3342 -msgstr ""
3463 +msgstr "jangan perlihatkan prefiks sumber atau tujuan apapun"
3464
3344 -#: diff.c:5468
3465 +#: diff.c:5470
3466 msgid "show context between diff hunks up to the specified number of lines"
3467 msgstr ""
3468 +"perlihatkan konteks diantara hunk diff hingga jumlah baris yang disebutkan"
3469
3348 -#: diff.c:5472 diff.c:5477 diff.c:5482
3470 +#: diff.c:5474 diff.c:5479 diff.c:5484
3471 msgid "<char>"
3350 -msgstr ""
3472 +msgstr "<karakter>"
3473
3352 -#: diff.c:5473
3474 +#: diff.c:5475
3475 msgid "specify the character to indicate a new line instead of '+'"
3354 -msgstr ""
3476 +msgstr "sebutkan karakter yang menandai baris baru daripada '+'"
3477
3356 -#: diff.c:5478
3478 +#: diff.c:5480
3479 msgid "specify the character to indicate an old line instead of '-'"
3358 -msgstr ""
3480 +msgstr "sebutkan karakter yang menandai baris lama daripada '-'"
3481
3360 -#: diff.c:5483
3482 +#: diff.c:5485
3483 msgid "specify the character to indicate a context instead of ' '"
3362 -msgstr ""
3484 +msgstr "sebutkan karakter yang menandai konteks daripada ' '"
3485
3364 -#: diff.c:5486
3486 +#: diff.c:5488
3487 msgid "Diff rename options"
3366 -msgstr ""
3488 +msgstr "Opsi penamaan ulang diff"
3489
3368 -#: diff.c:5487
3490 +#: diff.c:5489
3491 msgid "<n>[/<m>]"
3370 -msgstr ""
3492 +msgstr "<n>[/<m>]"
3493
3372 -#: diff.c:5488
3494 +#: diff.c:5490
3495 msgid "break complete rewrite changes into pairs of delete and create"
3496 msgstr ""
3497 +"pisahkan perubahan penulisan ulang penuh kedalam pasangan penghapusan dan "
3498 +"pembuatan"
3499
3376 -#: diff.c:5492
3500 +#: diff.c:5494
3501 msgid "detect renames"
3378 -msgstr ""
3502 +msgstr "deteksi penamaan ulang"
3503
3380 -#: diff.c:5496
3504 +#: diff.c:5498
3505 msgid "omit the preimage for deletes"
3382 -msgstr ""
3506 +msgstr "lewati pracitra untuk penghapusan"
3507
3384 -#: diff.c:5499
3508 +#: diff.c:5501
3509 msgid "detect copies"
3386 -msgstr ""
3510 +msgstr "deteksi penyalinan"
3511
3388 -#: diff.c:5503
3512 +#: diff.c:5505
3513 msgid "use unmodified files as source to find copies"
3514 msgstr ""
3515 +"gunakan berkas tak termodifikasi sebagai sumber untuk menemukan salinan"
3516
3392 -#: diff.c:5505
3517 +#: diff.c:5507
3518 msgid "disable rename detection"
3394 -msgstr ""
3519 +msgstr "nonaktifkan deteksi penamaan ulang"
3520
3396 -#: diff.c:5508
3521 +#: diff.c:5510
3522 msgid "use empty blobs as rename source"
3398 -msgstr ""
3523 +msgstr "gunakan blob kosong sebagai sumber penamaan ulang"
3524
3400 -#: diff.c:5510
3525 +#: diff.c:5512
3526 msgid "continue listing the history of a file beyond renames"
3402 -msgstr ""
3527 +msgstr "lanjutkan daftarkan riwayat berkas di luar penamaan ulang"
3528
3404 -#: diff.c:5513
3529 +#: diff.c:5515
3530 msgid ""
3531 "prevent rename/copy detection if the number of rename/copy targets exceeds "
3532 "given limit"
3533 msgstr ""
3534 +"cegah pendeteksian penamaan ulang/penyalinan jika jumlah target penamaan "
3535 +"ulang/penyalinan melebihi batas yang diberikan"
3536
3410 -#: diff.c:5515
3537 +#: diff.c:5517
3538 msgid "Diff algorithm options"
3412 -msgstr ""
3539 +msgstr "Opsi algoritma diff"
3540
3414 -#: diff.c:5517
3541 +#: diff.c:5519
3542 msgid "produce the smallest possible diff"
3416 -msgstr ""
3543 +msgstr "hasilkan diff yang paling kecil yang dimungkinkan"
3544
3418 -#: diff.c:5520
3545 +#: diff.c:5522
3546 msgid "ignore whitespace when comparing lines"
3420 -msgstr ""
3547 +msgstr "abaikan spasi saat membandingkan baris"
3548
3422 -#: diff.c:5523
3549 +#: diff.c:5525
3550 msgid "ignore changes in amount of whitespace"
3424 -msgstr ""
3551 +msgstr "abaikan perubahan dalam jumlah spasi"
3552
3426 -#: diff.c:5526
3553 +#: diff.c:5528
3554 msgid "ignore changes in whitespace at EOL"
3428 -msgstr ""
3555 +msgstr "abaikan perubahan spasi pada EOL"
3556
3430 -#: diff.c:5529
3557 +#: diff.c:5531
3558 msgid "ignore carrier-return at the end of line"
3432 -msgstr ""
3559 +msgstr "abaikan kembalian-kurir pada akhir baris"
3560
3434 -#: diff.c:5532
3561 +#: diff.c:5534
3562 msgid "ignore changes whose lines are all blank"
3436 -msgstr ""
3563 +msgstr "abaikan perubahan yang semua baris kosong"
3564
3438 -#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604
3565 +#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606
3566 msgid "<regex>"
3440 -msgstr ""
3567 +msgstr "<regex>"
3568
3442 -#: diff.c:5535
3569 +#: diff.c:5537
3570 msgid "ignore changes whose all lines match <regex>"
3444 -msgstr ""
3571 +msgstr "abaikan perubahan yang semua baris cocok dengan <regex>"
3572
3446 -#: diff.c:5538
3573 +#: diff.c:5540
3574 msgid "heuristic to shift diff hunk boundaries for easy reading"
3448 -msgstr ""
3575 +msgstr "heuristik untuk geser perbatasan hunk diff untuk pembacaan yang mudah"
3576
3450 -#: diff.c:5541
3577 +#: diff.c:5543
3578 msgid "generate diff using the \"patience diff\" algorithm"
3452 -msgstr ""
3579 +msgstr "buat diff menggunakan algoritma \"diff sabar\""
3580
3454 -#: diff.c:5545
3581 +#: diff.c:5547
3582 msgid "generate diff using the \"histogram diff\" algorithm"
3456 -msgstr ""
3583 +msgstr "buat diff menggunakan algoritma \"diff histogram\""
3584
3458 -#: diff.c:5547
3585 +#: diff.c:5549
3586 msgid "<algorithm>"
3460 -msgstr ""
3587 +msgstr "<algoritma>"
3588
3462 -#: diff.c:5548
3589 +#: diff.c:5550
3590 msgid "choose a diff algorithm"
3464 -msgstr ""
3591 +msgstr "pilih algoritma diff"
3592
3466 -#: diff.c:5550
3593 +#: diff.c:5552
3594 msgid "<text>"
3468 -msgstr ""
3595 +msgstr "<teks>"
3596
3470 -#: diff.c:5551
3597 +#: diff.c:5553
3598 msgid "generate diff using the \"anchored diff\" algorithm"
3472 -msgstr ""
3599 +msgstr "buat diff menggunakan algoritma \"diff terlabuh\""
3600
3474 -#: diff.c:5553 diff.c:5562 diff.c:5565
3601 +#: diff.c:5555 diff.c:5564 diff.c:5567
3602 msgid "<mode>"
3476 -msgstr ""
3603 +msgstr "<mode>"
3604
3478 -#: diff.c:5554
3605 +#: diff.c:5556
3606 msgid "show word diff, using <mode> to delimit changed words"
3607 msgstr ""
3608 +"perlihatkan diff kata, menggunakan <mode> untuk batasi kata yang berubah"
3609
3482 -#: diff.c:5557
3610 +#: diff.c:5559
3611 msgid "use <regex> to decide what a word is"
3484 -msgstr ""
3612 +msgstr "gunakan <regex> untuk menentukan apa itu kata"
3613
3486 -#: diff.c:5560
3614 +#: diff.c:5562
3615 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
3488 -msgstr ""
3616 +msgstr "sama dengan --word-diff=color --word-diff-regex=<regex>"
3617
3490 -#: diff.c:5563
3618 +#: diff.c:5565
3619 msgid "moved lines of code are colored differently"
3492 -msgstr ""
3620 +msgstr "baris kode yang berpindah diwarnai berbeda"
3621
3494 -#: diff.c:5566
3622 +#: diff.c:5568
3623 msgid "how white spaces are ignored in --color-moved"
3496 -msgstr ""
3624 +msgstr "bagaimana spasi diabaikan di --color-moved"
3625
3498 -#: diff.c:5569
3626 +#: diff.c:5571
3627 msgid "Other diff options"
3500 -msgstr ""
3628 +msgstr "Opsi diff yang lainnya"
3629
3502 -#: diff.c:5571
3630 +#: diff.c:5573
3631 msgid "when run from subdir, exclude changes outside and show relative paths"
3632 msgstr ""
3633 +"ketika dijalankan dari subdirektori, kecualikan perubahan diluar dan "
3634 +"perlihatkan jalur relatif"
3635
3506 -#: diff.c:5575
3636 +#: diff.c:5577
3637 msgid "treat all files as text"
3508 -msgstr ""
3638 +msgstr "perlakukan semua berkas sebagai teks"
3639
3510 -#: diff.c:5577
3640 +#: diff.c:5579
3641 msgid "swap two inputs, reverse the diff"
3512 -msgstr ""
3642 +msgstr "tukar dua masukkan, balikkan diff"
3643
3514 -#: diff.c:5579
3644 +#: diff.c:5581
3645 msgid "exit with 1 if there were differences, 0 otherwise"
3516 -msgstr ""
3646 +msgstr "keluar dengan 1 jika ada perbedaan, selain itu 0"
3647
3518 -#: diff.c:5581
3648 +#: diff.c:5583
3649 msgid "disable all output of the program"
3520 -msgstr ""
3650 +msgstr "nonaktifkan semua keluaran program"
3651
3522 -#: diff.c:5583
3652 +#: diff.c:5585
3653 msgid "allow an external diff helper to be executed"
3524 -msgstr ""
3654 +msgstr "perbolehkan pembantu diff eksternal untuk dieksekusi"
3655
3526 -#: diff.c:5585
3656 +#: diff.c:5587
3657 msgid "run external text conversion filters when comparing binary files"
3658 msgstr ""
3659 +"jalankan saringan konversi teks eksternal ketika membandingkan berkas biner"
3660
3530 -#: diff.c:5587
3661 +#: diff.c:5589
3662 msgid "<when>"
3532 -msgstr ""
3663 +msgstr "<kapan>"
3664
3534 -#: diff.c:5588
3665 +#: diff.c:5590
3666 msgid "ignore changes to submodules in the diff generation"
3536 -msgstr ""
3667 +msgstr "abaikan perubahan submodul dalam pembuatan diff"
3668
3538 -#: diff.c:5591
3669 +#: diff.c:5593
3670 msgid "<format>"
3540 -msgstr ""
3671 +msgstr "<format>"
3672
3542 -#: diff.c:5592
3673 +#: diff.c:5594
3674 msgid "specify how differences in submodules are shown"
3544 -msgstr ""
3675 +msgstr "sebutkan bagaimana perbedaan dalam submodul diperlihatkan"
3676
3546 -#: diff.c:5596
3677 +#: diff.c:5598
3678 msgid "hide 'git add -N' entries from the index"
3548 -msgstr ""
3679 +msgstr "sembunyikan entri 'git add -N' dari indeks"
3680
3550 -#: diff.c:5599
3681 +#: diff.c:5601
3682 msgid "treat 'git add -N' entries as real in the index"
3552 -msgstr ""
3683 +msgstr "perlakukan entri 'git add -N' sebagai nyata dalam indeks"
3684
3554 -#: diff.c:5601
3685 +#: diff.c:5603
3686 msgid "<string>"
3556 -msgstr ""
3687 +msgstr "<untai>"
3688
3558 -#: diff.c:5602
3689 +#: diff.c:5604
3690 msgid ""
3691 "look for differences that change the number of occurrences of the specified "
3692 "string"
3562 -msgstr ""
3693 +msgstr "cari perbedaan yang mengubah jumlah kemunculan untai yang disebutkan"
3694
3564 -#: diff.c:5605
3695 +#: diff.c:5607
3696 msgid ""
3697 "look for differences that change the number of occurrences of the specified "
3698 "regex"
3568 -msgstr ""
3699 +msgstr "cari perbedaan yang mengubah jumlah kemunculan regex yang disebutkan"
3700
3570 -#: diff.c:5608
3701 +#: diff.c:5610
3702 msgid "show all changes in the changeset with -S or -G"
3572 -msgstr ""
3703 +msgstr "perlihatkan semua perubahan dalam set perubahan dengan -S atau -G"
3704
3574 -#: diff.c:5611
3705 +#: diff.c:5613
3706 msgid "treat <string> in -S as extended POSIX regular expression"
3707 msgstr ""
3708 +"perlakukan <string> di -S sebagai ekspresi reguler POSIX yang diperluas"
3709
3578 -#: diff.c:5614
3710 +#: diff.c:5616
3711 msgid "control the order in which files appear in the output"
3580 -msgstr ""
3712 +msgstr "kontrol urutan berkas yang muncul dalam keluaran"
3713
3582 -#: diff.c:5615 diff.c:5618
3714 +#: diff.c:5617 diff.c:5620
3715 msgid "<path>"
3584 -msgstr ""
3716 +msgstr "<jalur>"
3717
3586 -#: diff.c:5616
3718 +#: diff.c:5618
3719 msgid "show the change in the specified path first"
3588 -msgstr ""
3720 +msgstr "perlihatkan perubahan dalam jalur yang disebutkan terlebih dahulu"
3721
3590 -#: diff.c:5619
3722 +#: diff.c:5621
3723 msgid "skip the output to the specified path"
3592 -msgstr ""
3724 +msgstr "lewati keluaran ke jalur yang disebutkan"
3725
3594 -#: diff.c:5621
3726 +#: diff.c:5623
3727 msgid "<object-id>"
3596 -msgstr ""
3728 +msgstr "<id objek>"
3729
3598 -#: diff.c:5622
3730 +#: diff.c:5624
3731 msgid ""
3732 "look for differences that change the number of occurrences of the specified "
3733 "object"
3602 -msgstr ""
3734 +msgstr "cari perubahan yang mengubah jumlah kemunculan objek yang disebutkan"
3735
3604 -#: diff.c:5624
3736 +#: diff.c:5626
3737 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
3606 -msgstr ""
3738 +msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
3739
3608 -#: diff.c:5625
3740 +#: diff.c:5627
3741 msgid "select files by diff type"
3610 -msgstr ""
3742 +msgstr "pilih berkas oleh tipe diff"
3743
3612 -#: diff.c:5627
3744 +#: diff.c:5629
3745 msgid "<file>"
3614 -msgstr ""
3746 +msgstr "<berkas>"
3747
3616 -#: diff.c:5628
3748 +#: diff.c:5630
3749 msgid "Output to a specific file"
3618 -msgstr ""
3750 +msgstr "Keluarkan ke berkas yang disebutkan"
3751
3620 -#: diff.c:6285
3752 +#: diff.c:6287
3753 msgid "inexact rename detection was skipped due to too many files."
3754 msgstr ""
3755 +"deteksi penamaan ulang tak eksak dilewati karena terlalu banyak berkas."
3756
3624 -#: diff.c:6288
3757 +#: diff.c:6290
3758 msgid "only found copies from modified paths due to too many files."
3759 msgstr ""
3760 +"hanya ditemukan salinan dari jalur yang berubah karena terlalu banyak berkas."
3761
3628 -#: diff.c:6291
3762 +#: diff.c:6293
3763 #, c-format
3764 msgid ""
3765 "you may want to set your %s variable to at least %d and retry the command."
3766 msgstr ""
3767 +"mungkin Anda ingin menyetel variabel %s Anda ke setidaknya %d dan coba lagi "
3768 +"perintah."
3769
3770 #: diffcore-order.c:24
3771 #, c-format
3772 msgid "failed to read orderfile '%s'"
3773 msgstr ""
3774
3639 -#: diffcore-rename.c:786
3775 +#: diffcore-rename.c:1418
3776 msgid "Performing inexact rename detection"
3777 msgstr ""
3778
@@ -3669,35 +3805,35 @@ msgstr ""
3805 msgid "disabling cone pattern matching"
3806 msgstr ""
3807
3672 -#: dir.c:1198
3808 +#: dir.c:1206
3809 #, c-format
3810 msgid "cannot use %s as an exclude file"
3811 msgstr ""
3812
3677 -#: dir.c:2305
3813 +#: dir.c:2314
3814 #, c-format
3815 msgid "could not open directory '%s'"
3816 msgstr ""
3817
3682 -#: dir.c:2605
3818 +#: dir.c:2614
3819 msgid "failed to get kernel name and information"
3820 msgstr ""
3821
3686 -#: dir.c:2729
3822 +#: dir.c:2738
3823 msgid "untracked cache is disabled on this system or location"
3824 msgstr ""
3825
3690 -#: dir.c:3534
3826 +#: dir.c:3543
3827 #, c-format
3828 msgid "index file corrupt in repo %s"
3829 msgstr ""
3830
3695 -#: dir.c:3579 dir.c:3584
3831 +#: dir.c:3590 dir.c:3595
3832 #, c-format
3833 msgid "could not create directories for %s"
3834 msgstr ""
3835
3700 -#: dir.c:3613
3836 +#: dir.c:3624
3837 #, c-format
3838 msgid "could not migrate git directory from '%s' to '%s'"
3839 msgstr ""
@@ -3707,11 +3843,11 @@ msgstr ""
3843 msgid "hint: Waiting for your editor to close the file...%c"
3844 msgstr ""
3845
3710 -#: entry.c:177
3846 +#: entry.c:179
3847 msgid "Filtering content"
3848 msgstr ""
3849
3714 -#: entry.c:478
3850 +#: entry.c:500
3851 #, c-format
3852 msgid "could not stat file '%s'"
3853 msgstr ""
@@ -3731,249 +3867,257 @@ msgstr ""
3867 msgid "too many args to run %s"
3868 msgstr ""
3869
3734 -#: fetch-pack.c:177
3870 +#: fetch-pack.c:182
3871 msgid "git fetch-pack: expected shallow list"
3872 msgstr ""
3873
3738 -#: fetch-pack.c:180
3874 +#: fetch-pack.c:185
3875 msgid "git fetch-pack: expected a flush packet after shallow list"
3876 msgstr ""
3877
3742 -#: fetch-pack.c:191
3878 +#: fetch-pack.c:196
3879 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
3880 msgstr ""
3881
3746 -#: fetch-pack.c:211
3882 +#: fetch-pack.c:216
3883 #, c-format
3884 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
3885 msgstr ""
3886
3751 -#: fetch-pack.c:222
3887 +#: fetch-pack.c:227
3888 msgid "unable to write to remote"
3889 msgstr ""
3890
3755 -#: fetch-pack.c:283
3891 +#: fetch-pack.c:288
3892 msgid "--stateless-rpc requires multi_ack_detailed"
3893 msgstr ""
3894
3759 -#: fetch-pack.c:378 fetch-pack.c:1457
3895 +#: fetch-pack.c:383 fetch-pack.c:1423
3896 #, c-format
3897 msgid "invalid shallow line: %s"
3898 msgstr ""
3899
3764 -#: fetch-pack.c:384 fetch-pack.c:1463
3900 +#: fetch-pack.c:389 fetch-pack.c:1429
3901 #, c-format
3902 msgid "invalid unshallow line: %s"
3903 msgstr ""
3904
3769 -#: fetch-pack.c:386 fetch-pack.c:1465
3905 +#: fetch-pack.c:391 fetch-pack.c:1431
3906 #, c-format
3907 msgid "object not found: %s"
3908 msgstr ""
3909
3774 -#: fetch-pack.c:389 fetch-pack.c:1468
3910 +#: fetch-pack.c:394 fetch-pack.c:1434
3911 #, c-format
3912 msgid "error in object: %s"
3913 msgstr ""
3914
3779 -#: fetch-pack.c:391 fetch-pack.c:1470
3915 +#: fetch-pack.c:396 fetch-pack.c:1436
3916 #, c-format
3917 msgid "no shallow found: %s"
3918 msgstr ""
3919
3784 -#: fetch-pack.c:394 fetch-pack.c:1474
3920 +#: fetch-pack.c:399 fetch-pack.c:1440
3921 #, c-format
3922 msgid "expected shallow/unshallow, got %s"
3923 msgstr ""
3924
3789 -#: fetch-pack.c:434
3925 +#: fetch-pack.c:439
3926 #, c-format
3927 msgid "got %s %d %s"
3928 msgstr ""
3929
3794 -#: fetch-pack.c:451
3930 +#: fetch-pack.c:456
3931 #, c-format
3932 msgid "invalid commit %s"
3933 msgstr ""
3934
3799 -#: fetch-pack.c:482
3935 +#: fetch-pack.c:487
3936 msgid "giving up"
3937 msgstr ""
3938
3803 -#: fetch-pack.c:495 progress.c:339
3939 +#: fetch-pack.c:500 progress.c:339
3940 msgid "done"
3941 msgstr ""
3942
3807 -#: fetch-pack.c:507
3943 +#: fetch-pack.c:512
3944 #, c-format
3945 msgid "got %s (%d) %s"
3946 msgstr ""
3947
3812 -#: fetch-pack.c:543
3948 +#: fetch-pack.c:548
3949 #, c-format
3950 msgid "Marking %s as complete"
3951 msgstr ""
3952
3817 -#: fetch-pack.c:758
3953 +#: fetch-pack.c:763
3954 #, c-format
3955 msgid "already have %s (%s)"
3956 msgstr ""
3957
3822 -#: fetch-pack.c:844
3958 +#: fetch-pack.c:849
3959 msgid "fetch-pack: unable to fork off sideband demultiplexer"
3960 msgstr ""
3961
3826 -#: fetch-pack.c:852
3962 +#: fetch-pack.c:857
3963 msgid "protocol error: bad pack header"
3964 msgstr ""
3965
3830 -#: fetch-pack.c:946
3966 +#: fetch-pack.c:951
3967 #, c-format
3968 msgid "fetch-pack: unable to fork off %s"
3969 msgstr ""
3970
3835 -#: fetch-pack.c:952
3971 +#: fetch-pack.c:957
3972 msgid "fetch-pack: invalid index-pack output"
3973 msgstr ""
3974
3839 -#: fetch-pack.c:969
3975 +#: fetch-pack.c:974
3976 #, c-format
3977 msgid "%s failed"
3978 msgstr ""
3979
3844 -#: fetch-pack.c:971
3980 +#: fetch-pack.c:976
3981 msgid "error in sideband demultiplexer"
3982 msgstr ""
3983
3848 -#: fetch-pack.c:1031
3984 +#: fetch-pack.c:1019
3985 #, c-format
3986 msgid "Server version is %.*s"
3987 msgstr ""
3988
3853 -#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054
3854 -#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070
3855 -#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086
3856 -#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108
3989 +#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
3990 +#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
3991 +#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
3992 +#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
3993 #, c-format
3994 msgid "Server supports %s"
3995 msgstr ""
3996
3861 -#: fetch-pack.c:1041
3997 +#: fetch-pack.c:1029
3998 msgid "Server does not support shallow clients"
3999 msgstr ""
4000
3865 -#: fetch-pack.c:1101
4001 +#: fetch-pack.c:1089
4002 msgid "Server does not support --shallow-since"
4003 msgstr ""
4004
3869 -#: fetch-pack.c:1106
4005 +#: fetch-pack.c:1094
4006 msgid "Server does not support --shallow-exclude"
4007 msgstr ""
4008
3873 -#: fetch-pack.c:1110
4009 +#: fetch-pack.c:1098
4010 msgid "Server does not support --deepen"
4011 msgstr ""
4012
3877 -#: fetch-pack.c:1112
4013 +#: fetch-pack.c:1100
4014 msgid "Server does not support this repository's object format"
4015 msgstr ""
4016
3881 -#: fetch-pack.c:1125
4017 +#: fetch-pack.c:1113
4018 msgid "no common commits"
4019 msgstr ""
4020
3885 -#: fetch-pack.c:1138 fetch-pack.c:1682
4021 +#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
4022 +msgid "source repository is shallow, reject to clone."
4023 +msgstr ""
4024 +
4025 +#: fetch-pack.c:1128 fetch-pack.c:1651
4026 msgid "git fetch-pack: fetch failed."
4027 msgstr ""
4028
3889 -#: fetch-pack.c:1265
4029 +#: fetch-pack.c:1242
4030 #, c-format
4031 msgid "mismatched algorithms: client %s; server %s"
4032 msgstr ""
4033
3894 -#: fetch-pack.c:1269
4034 +#: fetch-pack.c:1246
4035 #, c-format
4036 msgid "the server does not support algorithm '%s'"
4037 msgstr ""
4038
3899 -#: fetch-pack.c:1289
4039 +#: fetch-pack.c:1279
4040 msgid "Server does not support shallow requests"
4041 msgstr ""
4042
3903 -#: fetch-pack.c:1296
4043 +#: fetch-pack.c:1286
4044 msgid "Server supports filter"
4045 msgstr ""
4046
3907 -#: fetch-pack.c:1335
4047 +#: fetch-pack.c:1329 fetch-pack.c:2034
4048 msgid "unable to write request to remote"
4049 msgstr ""
4050
3911 -#: fetch-pack.c:1353
4051 +#: fetch-pack.c:1347
4052 #, c-format
4053 msgid "error reading section header '%s'"
4054 msgstr ""
4055
3916 -#: fetch-pack.c:1359
4056 +#: fetch-pack.c:1353
4057 #, c-format
4058 msgid "expected '%s', received '%s'"
4059 msgstr ""
4060
3921 -#: fetch-pack.c:1420
4061 +#: fetch-pack.c:1387
4062 #, c-format
4063 msgid "unexpected acknowledgment line: '%s'"
4064 msgstr ""
4065
3926 -#: fetch-pack.c:1425
4066 +#: fetch-pack.c:1392
4067 #, c-format
4068 msgid "error processing acks: %d"
4069 msgstr ""
4070
3931 -#: fetch-pack.c:1435
4071 +#: fetch-pack.c:1402
4072 msgid "expected packfile to be sent after 'ready'"
4073 msgstr ""
4074
3935 -#: fetch-pack.c:1437
4075 +#: fetch-pack.c:1404
4076 msgid "expected no other sections to be sent after no 'ready'"
4077 msgstr ""
4078
3939 -#: fetch-pack.c:1479
4079 +#: fetch-pack.c:1445
4080 #, c-format
4081 msgid "error processing shallow info: %d"
4082 msgstr ""
4083
3944 -#: fetch-pack.c:1526
4084 +#: fetch-pack.c:1494
4085 #, c-format
4086 msgid "expected wanted-ref, got '%s'"
4087 msgstr ""
4088
3949 -#: fetch-pack.c:1531
4089 +#: fetch-pack.c:1499
4090 #, c-format
4091 msgid "unexpected wanted-ref: '%s'"
4092 msgstr ""
4093
3954 -#: fetch-pack.c:1536
4094 +#: fetch-pack.c:1504
4095 #, c-format
4096 msgid "error processing wanted refs: %d"
4097 msgstr ""
4098
3959 -#: fetch-pack.c:1566
4099 +#: fetch-pack.c:1534
4100 msgid "git fetch-pack: expected response end packet"
4101 msgstr ""
4102
3963 -#: fetch-pack.c:1960
4103 +#: fetch-pack.c:1930
4104 msgid "no matching remote head"
4105 msgstr ""
4106
3967 -#: fetch-pack.c:1983 builtin/clone.c:693
4107 +#: fetch-pack.c:1953 builtin/clone.c:697
4108 msgid "remote did not send all necessary objects"
4109 msgstr ""
4110
3971 -#: fetch-pack.c:2010
4111 +#: fetch-pack.c:2056
4112 +msgid "unexpected 'ready' from remote"
4113 +msgstr ""
4114 +
4115 +#: fetch-pack.c:2079
4116 #, c-format
4117 msgid "no such remote ref %s"
4118 msgstr ""
4119
3976 -#: fetch-pack.c:2013
4120 +#: fetch-pack.c:2082
4121 #, c-format
4122 msgid "Server does not allow request for unadvertised object %s"
4123 msgstr ""
@@ -3996,24 +4140,24 @@ msgstr ""
4140 msgid "ignore invalid color '%.*s' in log.graphColors"
4141 msgstr ""
4142
3999 -#: grep.c:543
4143 +#: grep.c:531
4144 msgid ""
4145 "given pattern contains NULL byte (via -f <file>). This is only supported "
4146 "with -P under PCRE v2"
4147 msgstr ""
4148
4005 -#: grep.c:1906
4149 +#: grep.c:1893
4150 #, c-format
4151 msgid "'%s': unable to read %s"
4152 msgstr ""
4153
4010 -#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90
4011 -#: builtin/rm.c:135
4154 +#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
4155 +#: builtin/rm.c:136
4156 #, c-format
4157 msgid "failed to stat '%s'"
4158 msgstr ""
4159
4016 -#: grep.c:1934
4160 +#: grep.c:1921
4161 #, c-format
4162 msgid "'%s': short read"
4163 msgstr ""
@@ -4215,47 +4359,52 @@ msgstr ""
4359 msgid "name consists only of disallowed characters: %s"
4360 msgstr ""
4361
4218 -#: ident.c:454 builtin/commit.c:634
4362 +#: ident.c:454 builtin/commit.c:647
4363 #, c-format
4364 msgid "invalid date format: %s"
4365 msgstr ""
4366
4223 -#: list-objects-filter-options.c:81
4367 +#: list-objects-filter-options.c:83
4368 msgid "expected 'tree:<depth>'"
4369 msgstr ""
4370
4227 -#: list-objects-filter-options.c:96
4371 +#: list-objects-filter-options.c:98
4372 msgid "sparse:path filters support has been dropped"
4373 msgstr ""
4374
4231 -#: list-objects-filter-options.c:109
4375 +#: list-objects-filter-options.c:105
4376 +#, c-format
4377 +msgid "'%s' for 'object:type=<type>' isnot a valid object type"
4378 +msgstr ""
4379 +
4380 +#: list-objects-filter-options.c:124
4381 #, c-format
4382 msgid "invalid filter-spec '%s'"
4383 msgstr ""
4384
4236 -#: list-objects-filter-options.c:125
4385 +#: list-objects-filter-options.c:140
4386 #, c-format
4387 msgid "must escape char in sub-filter-spec: '%c'"
4388 msgstr ""
4389
4241 -#: list-objects-filter-options.c:167
4390 +#: list-objects-filter-options.c:182
4391 msgid "expected something after combine:"
4392 msgstr ""
4393
4245 -#: list-objects-filter-options.c:249
4394 +#: list-objects-filter-options.c:264
4395 msgid "multiple filter-specs cannot be combined"
4396 msgstr ""
4397
4249 -#: list-objects-filter-options.c:361
4398 +#: list-objects-filter-options.c:376
4399 msgid "unable to upgrade repository format to support partial clone"
4400 msgstr ""
4401
4253 -#: list-objects-filter.c:492
4402 +#: list-objects-filter.c:532
4403 #, c-format
4404 msgid "unable to access sparse blob in '%s'"
4405 msgstr ""
4406
4258 -#: list-objects-filter.c:495
4407 +#: list-objects-filter.c:535
4408 #, c-format
4409 msgid "unable to parse sparse filter data in %s"
4410 msgstr ""
@@ -4270,7 +4419,7 @@ msgstr ""
4419 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
4420 msgstr ""
4421
4273 -#: list-objects.c:375
4422 +#: list-objects.c:395
4423 #, c-format
4424 msgid "unable to load root tree for commit %s"
4425 msgstr ""
@@ -4301,38 +4450,48 @@ msgstr ""
4450 msgid "expected flush after ls-refs arguments"
4451 msgstr ""
4452
4304 -#: merge-ort.c:888 merge-recursive.c:1191
4453 +#: mailinfo.c:1050
4454 +msgid "quoted CRLF detected"
4455 +msgstr ""
4456 +
4457 +#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
4458 +#, c-format
4459 +msgid "bad action '%s' for '%s'"
4460 +msgstr ""
4461 +
4462 +#: merge-ort.c:1116 merge-recursive.c:1205
4463 #, c-format
4464 msgid "Failed to merge submodule %s (not checked out)"
4465 msgstr ""
4466
4309 -#: merge-ort.c:897 merge-recursive.c:1198
4467 +#: merge-ort.c:1125 merge-recursive.c:1212
4468 #, c-format
4469 msgid "Failed to merge submodule %s (commits not present)"
4470 msgstr ""
4471
4314 -#: merge-ort.c:906 merge-recursive.c:1205
4472 +#: merge-ort.c:1134 merge-recursive.c:1219
4473 #, c-format
4474 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
4475 msgstr ""
4476
4319 -#: merge-ort.c:916 merge-ort.c:923
4477 +#: merge-ort.c:1144 merge-ort.c:1151
4478 #, c-format
4479 msgid "Note: Fast-forwarding submodule %s to %s"
4480 msgstr ""
4481
4324 -#: merge-ort.c:944
4482 +#: merge-ort.c:1172
4483 +#, c-format
4484 msgid "Failed to merge submodule %s"
4485 msgstr ""
4486
4328 -#: merge-ort.c:951
4487 +#: merge-ort.c:1179
4488 #, c-format
4489 msgid ""
4490 "Failed to merge submodule %s, but a possible merge resolution exists:\n"
4491 "%s\n"
4492 msgstr ""
4493
4335 -#: merge-ort.c:955 merge-recursive.c:1259
4494 +#: merge-ort.c:1183 merge-recursive.c:1273
4495 #, c-format
4496 msgid ""
4497 "If this is correct simply add it to the index for example\n"
@@ -4343,42 +4502,42 @@ msgid ""
4502 "which will accept this suggestion.\n"
4503 msgstr ""
4504
4346 -#: merge-ort.c:968
4505 +#: merge-ort.c:1196
4506 #, c-format
4507 msgid ""
4508 "Failed to merge submodule %s, but multiple possible merges exist:\n"
4509 "%s"
4510 msgstr ""
4511
4353 -#: merge-ort.c:1127 merge-recursive.c:1341
4512 +#: merge-ort.c:1415 merge-recursive.c:1362
4513 msgid "Failed to execute internal merge"
4514 msgstr ""
4515
4357 -#: merge-ort.c:1132 merge-recursive.c:1346
4516 +#: merge-ort.c:1420 merge-recursive.c:1367
4517 #, c-format
4518 msgid "Unable to add %s to database"
4519 msgstr ""
4520
4362 -#: merge-ort.c:1139 merge-recursive.c:1378
4521 +#: merge-ort.c:1427 merge-recursive.c:1400
4522 #, c-format
4523 msgid "Auto-merging %s"
4524 msgstr ""
4525
4367 -#: merge-ort.c:1278 merge-recursive.c:2100
4526 +#: merge-ort.c:1566 merge-recursive.c:2122
4527 #, c-format
4528 msgid ""
4529 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
4530 "implicit directory rename(s) putting the following path(s) there: %s."
4531 msgstr ""
4532
4374 -#: merge-ort.c:1288 merge-recursive.c:2110
4533 +#: merge-ort.c:1576 merge-recursive.c:2132
4534 #, c-format
4535 msgid ""
4536 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
4537 "implicit directory renames tried to put these paths there: %s"
4538 msgstr ""
4539
4381 -#: merge-ort.c:1471
4540 +#: merge-ort.c:1634
4541 #, c-format
4542 msgid ""
4543 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4386,47 +4545,47 @@ msgid ""
4545 "majority of the files."
4546 msgstr ""
4547
4389 -#: merge-ort.c:1637 merge-recursive.c:2447
4548 +#: merge-ort.c:1788 merge-recursive.c:2468
4549 #, c-format
4550 msgid ""
4551 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
4552 "renamed."
4553 msgstr ""
4554
4396 -#: merge-ort.c:1781 merge-recursive.c:3215
4555 +#: merge-ort.c:1932 merge-recursive.c:3244
4556 #, c-format
4557 msgid ""
4558 "Path updated: %s added in %s inside a directory that was renamed in %s; "
4559 "moving it to %s."
4560 msgstr ""
4561
4403 -#: merge-ort.c:1788 merge-recursive.c:3222
4562 +#: merge-ort.c:1939 merge-recursive.c:3251
4563 #, c-format
4564 msgid ""
4565 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
4566 "%s; moving it to %s."
4567 msgstr ""
4568
4410 -#: merge-ort.c:1801 merge-recursive.c:3218
4569 +#: merge-ort.c:1952 merge-recursive.c:3247
4570 #, c-format
4571 msgid ""
4572 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
4573 "in %s, suggesting it should perhaps be moved to %s."
4574 msgstr ""
4575
4417 -#: merge-ort.c:1809 merge-recursive.c:3225
4576 +#: merge-ort.c:1960 merge-recursive.c:3254
4577 #, c-format
4578 msgid ""
4579 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
4580 "was renamed in %s, suggesting it should perhaps be moved to %s."
4581 msgstr ""
4582
4424 -#: merge-ort.c:1952
4583 +#: merge-ort.c:2103
4584 #, c-format
4585 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
4586 msgstr ""
4587
4429 -#: merge-ort.c:2047
4588 +#: merge-ort.c:2198
4589 #, c-format
4590 msgid ""
4591 "CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4434,76 +4593,91 @@ msgid ""
4593 "markers."
4594 msgstr ""
4595
4437 -#: merge-ort.c:2066 merge-ort.c:2090
4596 +#: merge-ort.c:2217 merge-ort.c:2241
4597 #, c-format
4598 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
4599 msgstr ""
4600
4442 -#: merge-ort.c:2735
4601 +#: merge-ort.c:2550 merge-recursive.c:3002
4602 +#, c-format
4603 +msgid "cannot read object %s"
4604 +msgstr ""
4605 +
4606 +#: merge-ort.c:2553 merge-recursive.c:3005
4607 +#, c-format
4608 +msgid "object %s is not a blob"
4609 +msgstr ""
4610 +
4611 +#: merge-ort.c:2981
4612 #, c-format
4613 msgid ""
4614 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
4615 "%s instead."
4616 msgstr ""
4617
4449 -#: merge-ort.c:2808
4618 +#: merge-ort.c:3055
4619 #, c-format
4620 msgid ""
4452 -"CONFLICT (distinct types): %s had different types on each side; renamed %s "
4621 +"CONFLICT (distinct types): %s had different types on each side; renamed both "
4622 "of them so each can be recorded somewhere."
4623 msgstr ""
4624
4456 -#: merge-ort.c:2812
4457 -msgid "both"
4458 -msgstr ""
4459 -
4460 -#: merge-ort.c:2812
4461 -msgid "one"
4625 +#: merge-ort.c:3062
4626 +#, c-format
4627 +msgid ""
4628 +"CONFLICT (distinct types): %s had different types on each side; renamed one "
4629 +"of them so each can be recorded somewhere."
4630 msgstr ""
4631
4464 -#: merge-ort.c:2907 merge-recursive.c:3052
4632 +#: merge-ort.c:3162 merge-recursive.c:3081
4633 msgid "content"
4634 msgstr ""
4635
4468 -#: merge-ort.c:2909 merge-recursive.c:3056
4636 +#: merge-ort.c:3164 merge-recursive.c:3085
4637 msgid "add/add"
4638 msgstr ""
4639
4472 -#: merge-ort.c:2911 merge-recursive.c:3101
4640 +#: merge-ort.c:3166 merge-recursive.c:3130
4641 msgid "submodule"
4642 msgstr ""
4643
4476 -#: merge-ort.c:2913 merge-recursive.c:3102
4644 +#: merge-ort.c:3168 merge-recursive.c:3131
4645 #, c-format
4646 msgid "CONFLICT (%s): Merge conflict in %s"
4647 msgstr ""
4648
4481 -#: merge-ort.c:2938
4649 +#: merge-ort.c:3198
4650 #, c-format
4651 msgid ""
4652 "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
4653 "of %s left in tree."
4654 msgstr ""
4655
4656 +#: merge-ort.c:3433
4657 +#, c-format
4658 +msgid ""
4659 +"Note: %s not up to date and in way of checking out conflicted version; old "
4660 +"copy renamed to %s"
4661 +msgstr ""
4662 +
4663 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
4664 #. base, and 2-3) the trees for the two trees we're merging.
4665 #.
4491 -#: merge-ort.c:3406
4666 +#: merge-ort.c:3730
4667 #, c-format
4668 msgid "collecting merge info failed for trees %s, %s, %s"
4669 msgstr ""
4670
4496 -#: merge-ort-wrappers.c:13 merge-recursive.c:3661
4671 +#: merge-ort-wrappers.c:13 merge-recursive.c:3699
4672 #, c-format
4673 msgid ""
4674 "Your local changes to the following files would be overwritten by merge:\n"
4675 " %s"
4676 msgstr ""
4677
4503 -#: merge-ort-wrappers.c:33 merge-recursive.c:3436
4504 -#, c-format
4505 -msgid "Already up to date!"
4506 -msgstr ""
4678 +#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402
4679 +msgid "Already up to date."
4680 +msgstr "Sudah terbaru."
4681
4682 #: merge-recursive.c:356
4683 msgid "(bad commit)\n"
@@ -4519,162 +4693,162 @@ msgstr ""
4693 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
4694 msgstr ""
4695
4522 -#: merge-recursive.c:874
4696 +#: merge-recursive.c:876
4697 #, c-format
4698 msgid "failed to create path '%s'%s"
4699 msgstr ""
4700
4527 -#: merge-recursive.c:885
4701 +#: merge-recursive.c:887
4702 #, c-format
4703 msgid "Removing %s to make room for subdirectory\n"
4704 msgstr ""
4705
4532 -#: merge-recursive.c:899 merge-recursive.c:918
4706 +#: merge-recursive.c:901 merge-recursive.c:920
4707 msgid ": perhaps a D/F conflict?"
4708 msgstr ""
4709
4536 -#: merge-recursive.c:908
4710 +#: merge-recursive.c:910
4711 #, c-format
4712 msgid "refusing to lose untracked file at '%s'"
4713 msgstr ""
4714
4541 -#: merge-recursive.c:949 builtin/cat-file.c:41
4715 +#: merge-recursive.c:951 builtin/cat-file.c:41
4716 #, c-format
4717 msgid "cannot read object %s '%s'"
4718 msgstr ""
4719
4546 -#: merge-recursive.c:954
4720 +#: merge-recursive.c:956
4721 #, c-format
4722 msgid "blob expected for %s '%s'"
4723 msgstr ""
4724
4551 -#: merge-recursive.c:979
4725 +#: merge-recursive.c:981
4726 #, c-format
4727 msgid "failed to open '%s': %s"
4728 msgstr ""
4729
4556 -#: merge-recursive.c:990
4730 +#: merge-recursive.c:992
4731 #, c-format
4732 msgid "failed to symlink '%s': %s"
4733 msgstr ""
4734
4561 -#: merge-recursive.c:995
4735 +#: merge-recursive.c:997
4736 #, c-format
4737 msgid "do not know what to do with %06o %s '%s'"
4738 msgstr ""
4739
4566 -#: merge-recursive.c:1213 merge-recursive.c:1225
4740 +#: merge-recursive.c:1227 merge-recursive.c:1239
4741 #, c-format
4742 msgid "Fast-forwarding submodule %s to the following commit:"
4743 msgstr ""
4744
4571 -#: merge-recursive.c:1216 merge-recursive.c:1228
4745 +#: merge-recursive.c:1230 merge-recursive.c:1242
4746 #, c-format
4747 msgid "Fast-forwarding submodule %s"
4748 msgstr ""
4749
4576 -#: merge-recursive.c:1251
4750 +#: merge-recursive.c:1265
4751 #, c-format
4752 msgid "Failed to merge submodule %s (merge following commits not found)"
4753 msgstr ""
4754
4581 -#: merge-recursive.c:1255
4755 +#: merge-recursive.c:1269
4756 #, c-format
4757 msgid "Failed to merge submodule %s (not fast-forward)"
4758 msgstr ""
4759
4586 -#: merge-recursive.c:1256
4760 +#: merge-recursive.c:1270
4761 msgid "Found a possible merge resolution for the submodule:\n"
4762 msgstr ""
4763
4590 -#: merge-recursive.c:1268
4764 +#: merge-recursive.c:1282
4765 #, c-format
4766 msgid "Failed to merge submodule %s (multiple merges found)"
4767 msgstr ""
4768
4595 -#: merge-recursive.c:1402
4769 +#: merge-recursive.c:1424
4770 #, c-format
4771 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
4772 msgstr ""
4773
4600 -#: merge-recursive.c:1474
4774 +#: merge-recursive.c:1496
4775 #, c-format
4776 msgid ""
4777 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
4778 "in tree."
4779 msgstr ""
4780
4607 -#: merge-recursive.c:1479
4781 +#: merge-recursive.c:1501
4782 #, c-format
4783 msgid ""
4784 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
4785 "left in tree."
4786 msgstr ""
4787
4614 -#: merge-recursive.c:1486
4788 +#: merge-recursive.c:1508
4789 #, c-format
4790 msgid ""
4791 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
4792 "in tree at %s."
4793 msgstr ""
4794
4621 -#: merge-recursive.c:1491
4795 +#: merge-recursive.c:1513
4796 #, c-format
4797 msgid ""
4798 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
4799 "left in tree at %s."
4800 msgstr ""
4801
4628 -#: merge-recursive.c:1526
4802 +#: merge-recursive.c:1548
4803 msgid "rename"
4804 msgstr ""
4805
4632 -#: merge-recursive.c:1526
4806 +#: merge-recursive.c:1548
4807 msgid "renamed"
4808 msgstr ""
4809
4636 -#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129
4810 +#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158
4811 #, c-format
4812 msgid "Refusing to lose dirty file at %s"
4813 msgstr ""
4814
4641 -#: merge-recursive.c:1587
4815 +#: merge-recursive.c:1609
4816 #, c-format
4817 msgid "Refusing to lose untracked file at %s, even though it's in the way."
4818 msgstr ""
4819
4646 -#: merge-recursive.c:1645
4820 +#: merge-recursive.c:1667
4821 #, c-format
4822 msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
4823 msgstr ""
4824
4651 -#: merge-recursive.c:1676
4825 +#: merge-recursive.c:1698
4826 #, c-format
4827 msgid "%s is a directory in %s adding as %s instead"
4828 msgstr ""
4829
4656 -#: merge-recursive.c:1681
4830 +#: merge-recursive.c:1703
4831 #, c-format
4832 msgid "Refusing to lose untracked file at %s; adding as %s instead"
4833 msgstr ""
4834
4661 -#: merge-recursive.c:1708
4835 +#: merge-recursive.c:1730
4836 #, c-format
4837 msgid ""
4838 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
4839 "\"->\"%s\" in \"%s\"%s"
4840 msgstr ""
4841
4668 -#: merge-recursive.c:1713
4842 +#: merge-recursive.c:1735
4843 msgid " (left unresolved)"
4844 msgstr ""
4845
4672 -#: merge-recursive.c:1805
4846 +#: merge-recursive.c:1827
4847 #, c-format
4848 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
4849 msgstr ""
4850
4677 -#: merge-recursive.c:2068
4851 +#: merge-recursive.c:2090
4852 #, c-format
4853 msgid ""
4854 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4682,96 +4856,86 @@ msgid ""
4856 "getting a majority of the files."
4857 msgstr ""
4858
4685 -#: merge-recursive.c:2202
4859 +#: merge-recursive.c:2224
4860 #, c-format
4861 msgid ""
4862 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
4863 ">%s in %s"
4864 msgstr ""
4865
4692 -#: merge-recursive.c:2973
4693 -#, c-format
4694 -msgid "cannot read object %s"
4695 -msgstr ""
4696 -
4697 -#: merge-recursive.c:2976
4698 -#, c-format
4699 -msgid "object %s is not a blob"
4700 -msgstr ""
4701 -
4702 -#: merge-recursive.c:3040
4866 +#: merge-recursive.c:3069
4867 msgid "modify"
4868 msgstr ""
4869
4706 -#: merge-recursive.c:3040
4870 +#: merge-recursive.c:3069
4871 msgid "modified"
4872 msgstr ""
4873
4710 -#: merge-recursive.c:3079
4874 +#: merge-recursive.c:3108
4875 #, c-format
4876 msgid "Skipped %s (merged same as existing)"
4877 msgstr ""
4878
4715 -#: merge-recursive.c:3132
4879 +#: merge-recursive.c:3161
4880 #, c-format
4881 msgid "Adding as %s instead"
4882 msgstr ""
4883
4720 -#: merge-recursive.c:3339
4884 +#: merge-recursive.c:3368
4885 #, c-format
4886 msgid "Removing %s"
4887 msgstr ""
4888
4725 -#: merge-recursive.c:3362
4889 +#: merge-recursive.c:3391
4890 msgid "file/directory"
4891 msgstr ""
4892
4729 -#: merge-recursive.c:3367
4893 +#: merge-recursive.c:3396
4894 msgid "directory/file"
4895 msgstr ""
4896
4733 -#: merge-recursive.c:3374
4897 +#: merge-recursive.c:3403
4898 #, c-format
4899 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
4900 msgstr ""
4901
4738 -#: merge-recursive.c:3383
4902 +#: merge-recursive.c:3412
4903 #, c-format
4904 msgid "Adding %s"
4905 msgstr ""
4906
4743 -#: merge-recursive.c:3392
4907 +#: merge-recursive.c:3421
4908 #, c-format
4909 msgid "CONFLICT (add/add): Merge conflict in %s"
4910 msgstr ""
4911
4748 -#: merge-recursive.c:3445
4912 +#: merge-recursive.c:3474
4913 #, c-format
4914 msgid "merging of trees %s and %s failed"
4915 msgstr ""
4916
4753 -#: merge-recursive.c:3539
4917 +#: merge-recursive.c:3568
4918 msgid "Merging:"
4919 msgstr ""
4920
4757 -#: merge-recursive.c:3552
4921 +#: merge-recursive.c:3581
4922 #, c-format
4923 msgid "found %u common ancestor:"
4924 msgid_plural "found %u common ancestors:"
4925 msgstr[0] ""
4926 msgstr[1] ""
4927
4764 -#: merge-recursive.c:3602
4928 +#: merge-recursive.c:3631
4929 msgid "merge returned no commit"
4930 msgstr ""
4931
4768 -#: merge-recursive.c:3758
4932 +#: merge-recursive.c:3796
4933 #, c-format
4934 msgid "Could not parse object '%s'"
4935 msgstr ""
4936
4773 -#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896
4774 -#: builtin/stash.c:471
4937 +#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900
4938 +#: builtin/stash.c:473
4939 msgid "Unable to write index."
4940 msgstr ""
4941
@@ -4779,176 +4943,195 @@ msgstr ""
4943 msgid "failed to read the cache"
4944 msgstr ""
4945
4782 -#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917
4783 -#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817
4784 -#: builtin/stash.c:265
4946 +#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965
4947 +#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821
4948 +#: builtin/stash.c:267
4949 msgid "unable to write new index file"
4950 msgstr ""
4951
4788 -#: midx.c:62
4952 +#: midx.c:74
4953 msgid "multi-pack-index OID fanout is of the wrong size"
4954 msgstr ""
4955
4792 -#: midx.c:93
4956 +#: midx.c:105
4957 #, c-format
4958 msgid "multi-pack-index file %s is too small"
4959 msgstr ""
4960
4797 -#: midx.c:109
4961 +#: midx.c:121
4962 #, c-format
4963 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
4964 msgstr ""
4965
4802 -#: midx.c:114
4966 +#: midx.c:126
4967 #, c-format
4968 msgid "multi-pack-index version %d not recognized"
4969 msgstr ""
4970
4807 -#: midx.c:119
4971 +#: midx.c:131
4972 #, c-format
4973 msgid "multi-pack-index hash version %u does not match version %u"
4974 msgstr ""
4975
4812 -#: midx.c:136
4976 +#: midx.c:148
4977 msgid "multi-pack-index missing required pack-name chunk"
4978 msgstr ""
4979
4816 -#: midx.c:138
4980 +#: midx.c:150
4981 msgid "multi-pack-index missing required OID fanout chunk"
4982 msgstr ""
4983
4820 -#: midx.c:140
4984 +#: midx.c:152
4985 msgid "multi-pack-index missing required OID lookup chunk"
4986 msgstr ""
4987
4824 -#: midx.c:142
4988 +#: midx.c:154
4989 msgid "multi-pack-index missing required object offsets chunk"
4990 msgstr ""
4991
4828 -#: midx.c:158
4992 +#: midx.c:170
4993 #, c-format
4994 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
4995 msgstr ""
4996
4833 -#: midx.c:202
4997 +#: midx.c:214
4998 #, c-format
4999 msgid "bad pack-int-id: %u (%u total packs)"
5000 msgstr ""
5001
4838 -#: midx.c:252
5002 +#: midx.c:264
5003 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
5004 msgstr ""
5005
4842 -#: midx.c:467
5006 +#: midx.c:490
5007 #, c-format
5008 msgid "failed to add packfile '%s'"
5009 msgstr ""
5010
4847 -#: midx.c:473
5011 +#: midx.c:496
5012 #, c-format
5013 msgid "failed to open pack-index '%s'"
5014 msgstr ""
5015
4852 -#: midx.c:533
5016 +#: midx.c:564
5017 #, c-format
5018 msgid "failed to locate object %d in packfile"
5019 msgstr ""
5020
4857 -#: midx.c:821
5021 +#: midx.c:880 builtin/index-pack.c:1535
5022 +msgid "cannot store reverse index file"
5023 +msgstr "tidak dapat menyimpan berkas indeks balik"
5024 +
5025 +#: midx.c:933
5026 msgid "Adding packfiles to multi-pack-index"
5027 msgstr ""
5028
4861 -#: midx.c:855
5029 +#: midx.c:979
5030 #, c-format
5031 msgid "did not see pack-file %s to drop"
5032 msgstr ""
5033
4866 -#: midx.c:904
5034 +#: midx.c:1024
5035 +#, c-format
5036 +msgid "unknown preferred pack: '%s'"
5037 +msgstr ""

This file is too large to show in full.