c0a8212802 · matheusbsbs/matheus-bagliano

@@ -7,7 +7,7 @@ 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-08-14 07:56+0800\n"

10 +"POT-Creation-Date: 2021-10-30 09:36+0800\n"

11 "PO-Revision-Date: 2021-08-14 09:35+0700\n"

12 "Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n"

13 "Language-Team: Indonesian\n"

@@ -17,213 +17,213 @@ msgstr ""

17 "Content-Transfer-Encoding: 8bit\n"

18 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

19

20 -#: add-interactive.c:376

20 +#: add-interactive.c:380

21 #, c-format

22 msgid "Huh (%s)?"

23 msgstr "Huh (%s)"

24

25 -#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493

26 -#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528

27 -#: builtin/rebase.c:1953

25 +#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3510

26 +#: sequencer.c:3977 sequencer.c:4139 builtin/rebase.c:1233

27 +#: builtin/rebase.c:1642

28 msgid "could not read index"

29 msgstr "tidak dapat membaca indeks"

30

31 -#: add-interactive.c:584 git-add--interactive.perl:269

31 +#: add-interactive.c:588 git-add--interactive.perl:269

32 #: git-add--interactive.perl:294

33 msgid "binary"

34 msgstr "biner"

35

36 -#: add-interactive.c:642 git-add--interactive.perl:278

36 +#: add-interactive.c:646 git-add--interactive.perl:278

37 #: git-add--interactive.perl:332

38 msgid "nothing"

39 msgstr "tidak ada"

40

41 -#: add-interactive.c:643 git-add--interactive.perl:314

41 +#: add-interactive.c:647 git-add--interactive.perl:314

42 #: git-add--interactive.perl:329

43 msgid "unchanged"

44 msgstr "tak berubah"

45

46 -#: add-interactive.c:680 git-add--interactive.perl:641

46 +#: add-interactive.c:684 git-add--interactive.perl:641

47 msgid "Update"

48 msgstr "Perbarui"

49

50 -#: add-interactive.c:697 add-interactive.c:885

50 +#: add-interactive.c:701 add-interactive.c:889

51 #, c-format

52 msgid "could not stage '%s'"

53 msgstr "tidak dapat menggelar '%s'"

54

55 -#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707

55 +#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3716

56 msgid "could not write index"

57 msgstr "tidak dapat menulis indeks"

58

59 -#: add-interactive.c:706 git-add--interactive.perl:626

59 +#: add-interactive.c:710 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] "%d jalur diperbarui\n"

64 msgstr[1] "%d jalur diperbarui\n"

65

66 -#: add-interactive.c:724 git-add--interactive.perl:676

66 +#: add-interactive.c:728 git-add--interactive.perl:676

67 #, c-format, perl-format

68 msgid "note: %s is untracked now.\n"

69 msgstr "catatan: %s sekarang tak terlacak.\n"

70

71 -#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298

72 -#: builtin/reset.c:145

71 +#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298

72 +#: builtin/reset.c:151

73 #, c-format

74 msgid "make_cache_entry failed for path '%s'"

75 msgstr "make_cache_entry gagal untuk jalur '%s'"

76

77 -#: add-interactive.c:759 git-add--interactive.perl:653

77 +#: add-interactive.c:763 git-add--interactive.perl:653

78 msgid "Revert"

79 msgstr "Kembalikan"

80

81 -#: add-interactive.c:775

81 +#: add-interactive.c:779

82 msgid "Could not parse HEAD^{tree}"

83 msgstr "Tidak dapat menguraikan HEAD^{tree}"

84

85 -#: add-interactive.c:813 git-add--interactive.perl:629

85 +#: add-interactive.c:817 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] "%d jalur dikembalikan\n"

90 msgstr[1] "%d jalur dikembalikan\n"

91

92 -#: add-interactive.c:864 git-add--interactive.perl:693

92 +#: add-interactive.c:868 git-add--interactive.perl:693

93 #, c-format

94 msgid "No untracked files.\n"

95 msgstr "Tidak ada berkas tak terlacak.\n"

96

97 -#: add-interactive.c:868 git-add--interactive.perl:687

97 +#: add-interactive.c:872 git-add--interactive.perl:687

98 msgid "Add untracked"

99 msgstr "Tambahkan tak terlacak"

100

101 -#: add-interactive.c:895 git-add--interactive.perl:623

101 +#: add-interactive.c:899 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] "%d jalur ditambahkan\n"

106 msgstr[1] "%d jalur ditambahkan\n"

107

108 -#: add-interactive.c:925

108 +#: add-interactive.c:929

109 #, c-format

110 msgid "ignoring unmerged: %s"

111 msgstr "mengabaikan tak tergabung: %s"

112

113 -#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369

113 +#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369

114 #, c-format

115 msgid "Only binary files changed.\n"

116 msgstr "Hanya berkas biner yang berubah.\n"

117

118 -#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371

118 +#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371

119 #, c-format

120 msgid "No changes.\n"

121 msgstr "Tidak ada perubahan.\n"

122

123 -#: add-interactive.c:943 git-add--interactive.perl:1379

123 +#: add-interactive.c:947 git-add--interactive.perl:1379

124 msgid "Patch update"

125 msgstr "Pembaruan tambalan"

126

127 -#: add-interactive.c:982 git-add--interactive.perl:1792

127 +#: add-interactive.c:986 git-add--interactive.perl:1792

128 msgid "Review diff"

129 msgstr "Tinjau diff"

130

131 -#: add-interactive.c:1010

131 +#: add-interactive.c:1014

132 msgid "show paths with changes"

133 msgstr "perlihatkan jalur dengan perubahan"

134

135 -#: add-interactive.c:1012

135 +#: add-interactive.c:1016

136 msgid "add working tree state to the staged set of changes"

137 msgstr "tambahkan keadaan pohon kerja ke set perubahan yang tergelar"

138

139 -#: add-interactive.c:1014

139 +#: add-interactive.c:1018

140 msgid "revert staged set of changes back to the HEAD version"

141 msgstr "kembalikan set perubahan yang tergelar kembali ke versi HEAD"

142

143 -#: add-interactive.c:1016

143 +#: add-interactive.c:1020

144 msgid "pick hunks and update selectively"

145 -msgstr "ambil hunk dan perbarui secara selektif"

145 +msgstr "ambil bingkah dan perbarui secara selektif"

146

147 -#: add-interactive.c:1018

147 +#: add-interactive.c:1022

148 msgid "view diff between HEAD and index"

149 msgstr "lihat diff antara HEAD dan indeks"

150

151 -#: add-interactive.c:1020

151 +#: add-interactive.c:1024

152 msgid "add contents of untracked files to the staged set of changes"

153 msgstr "tambahkan isi berkas tak terlacak ke set perubahan yang tergelar"

154

155 -#: add-interactive.c:1028 add-interactive.c:1077

155 +#: add-interactive.c:1032 add-interactive.c:1081

156 msgid "Prompt help:"

157 msgstr "Permintaan bantuan:"

158

159 -#: add-interactive.c:1030

159 +#: add-interactive.c:1034

160 msgid "select a single item"

161 msgstr "pilih satu item"

162

163 -#: add-interactive.c:1032

163 +#: add-interactive.c:1036

164 msgid "select a range of items"

165 msgstr "pilih kisaran item"

166

167 -#: add-interactive.c:1034

167 +#: add-interactive.c:1038

168 msgid "select multiple ranges"

169 msgstr "pilih banyak kisaran"

170

171 -#: add-interactive.c:1036 add-interactive.c:1081

171 +#: add-interactive.c:1040 add-interactive.c:1085

172 msgid "select item based on unique prefix"

173 msgstr "pilih item berdasarkan prefiks unik"

174

175 -#: add-interactive.c:1038

175 +#: add-interactive.c:1042

176 msgid "unselect specified items"

177 msgstr "batal pilih item yang disebutkan"

178

179 -#: add-interactive.c:1040

179 +#: add-interactive.c:1044

180 msgid "choose all items"

181 msgstr "pilih semua item"

182

183 -#: add-interactive.c:1042

183 +#: add-interactive.c:1046

184 msgid "(empty) finish selecting"

185 msgstr "(kosong) sudah memilih"

186

187 -#: add-interactive.c:1079

187 +#: add-interactive.c:1083

188 msgid "select a numbered item"

189 msgstr "pilih item bernomor"

190

191 -#: add-interactive.c:1083

191 +#: add-interactive.c:1087

192 msgid "(empty) select nothing"

193 msgstr "(empty) tidak pilih apapun"

194

195 -#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896

195 +#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896

196 msgid "*** Commands ***"

197 msgstr "*** Perintah ***"

198

199 -#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893

199 +#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893

200 msgid "What now"

201 msgstr "Apa sekarang"

202

203 -#: add-interactive.c:1144 git-add--interactive.perl:213

203 +#: add-interactive.c:1148 git-add--interactive.perl:213

204 msgid "staged"

205 msgstr "tergelar"

206

207 -#: add-interactive.c:1144 git-add--interactive.perl:213

207 +#: add-interactive.c:1148 git-add--interactive.perl:213

208 msgid "unstaged"

209 msgstr "tak tergelar"

210

211 -#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309

212 -#: builtin/am.c:2312 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:410 builtin/submodule--helper.c:1886

215 -#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343

216 -#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589

217 -#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893

211 +#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311

212 +#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128

213 +#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:190

214 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857

215 +#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503

216 +#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573

217 +#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811

218 #: git-add--interactive.perl:213

219 msgid "path"

220 msgstr "jalur"

221

222 -#: add-interactive.c:1151

222 +#: add-interactive.c:1155

223 msgid "could not refresh index"

224 msgstr "tidak dapat menyegarkan indeks"

225

226 -#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803

226 +#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803

227 #, c-format

228 msgid "Bye.\n"

229 msgstr "Sampai jumpa.\n"

@@ -246,15 +246,15 @@ msgstr "Gelar penambahan [y,n,q,a,d%s,?]? "

246 #: add-patch.c:37 git-add--interactive.perl:1434

247 #, c-format, perl-format

248 msgid "Stage this hunk [y,n,q,a,d%s,?]? "

249 -msgstr "Gelar hunk ini [y,n,q,a,d%s,?]? "

249 +msgstr "Gelar bingkah ini [y,n,q,a,d%s,?]? "

250

251 #: add-patch.c:39

252 msgid ""

253 "If the patch applies cleanly, the edited hunk will immediately be marked for "

254 "staging."

255 msgstr ""

256 -"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai "

257 -"untuk digelar."

256 +"Jika tambalan diterapkan bersih, bingkah yang disunting akan langsung "

257 +"ditandai untuk digelar."

258

259 #: add-patch.c:42

260 msgid ""

@@ -264,11 +264,11 @@ msgid ""

264 "a - stage this hunk and all later hunks in the file\n"

265 "d - do not stage this hunk or any of the later hunks in the file\n"

266 msgstr ""

267 -"y - gelar hunk ini\n"

268 -"n - jangan gelar hunk ini\n"

269 -"q - keluar; jangan gelar hunk ini atau yang sisanya\n"

270 -"a - gelar hunk ini dan semua hunk selanjutnya dalam berkas\n"

271 -"d - jangan gelar hunk ini atau hunk selanjutnya dalam berkas\n"

267 +"y - gelar bingkah ini\n"

268 +"n - jangan gelar bingkah ini\n"

269 +"q - keluar; jangan gelar bingkah ini atau yang sisanya\n"

270 +"a - gelar bingkah ini dan semua bingkah selanjutnya dalam berkas\n"

271 +"d - jangan gelar bingkah ini atau bingkah selanjutnya dalam berkas\n"

272

273 #: add-patch.c:56 git-add--interactive.perl:1437

274 #, c-format, perl-format

@@ -288,15 +288,15 @@ msgstr "Stase penambahan [y,n,q,a,d%s,?]? "

288 #: add-patch.c:59 git-add--interactive.perl:1440

289 #, c-format, perl-format

290 msgid "Stash this hunk [y,n,q,a,d%s,?]? "

291 -msgstr "Stase hunk ini [y,n,q,a,d%s,?]? "

291 +msgstr "Stase bingkah ini [y,n,q,a,d%s,?]? "

292

293 #: add-patch.c:61

294 msgid ""

295 "If the patch applies cleanly, the edited hunk will immediately be marked for "

296 "stashing."

297 msgstr ""

298 -"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai "

299 -"untuk distase."

298 +"Jika tambalan diterapkan bersih, bingkah yang disunting akan langsung "

299 +"ditandai untuk distase."

300

301 #: add-patch.c:64

302 msgid ""

@@ -306,11 +306,11 @@ msgid ""

306 "a - stash this hunk and all later hunks in the file\n"

307 "d - do not stash this hunk or any of the later hunks in the file\n"

308 msgstr ""

309 -"y - stase hunk ini\n"

310 -"n - jangan stase hunk ini\n"

311 -"q - keluar; jangan stase hunk ini atau yang sisanya\n"

312 -"a - stase hunk ini dan semua hunk selanjutnya dalam berkas\n"

313 -"d - jangan stase hunk ini atau hunk selanjutnya dalam berkas\n"

309 +"y - stase bingkah ini\n"

310 +"n - jangan stase bingkah ini\n"

311 +"q - keluar; jangan stase bingkah ini atau yang sisanya\n"

312 +"a - stase bingkah ini dan semua bingkah selanjutnya dalam berkas\n"

313 +"d - jangan stase bingkah ini atau bingkah selanjutnya dalam berkas\n"

314

315 #: add-patch.c:80 git-add--interactive.perl:1443

316 #, c-format, perl-format

@@ -330,15 +330,15 @@ msgstr "Batal gelar penambahan [y,n,q,a,d%s,?]? "

330 #: add-patch.c:83 git-add--interactive.perl:1446

331 #, c-format, perl-format

332 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "

333 -msgstr "Batal gelar hunk ini [y,n,q,a,d%s,?]? "

333 +msgstr "Batal gelar bingkah ini [y,n,q,a,d%s,?]? "

334

335 #: add-patch.c:85

336 msgid ""

337 "If the patch applies cleanly, the edited hunk will immediately be marked for "

338 "unstaging."

339 msgstr ""

340 -"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai "

341 -"untuk dibatalgelarkan."

340 +"Jika tambalan diterapkan bersih, bingkah yang disunting akan langsung "

341 +"ditandai untuk dibatalgelarkan."

342

343 #: add-patch.c:88

344 msgid ""

@@ -348,11 +348,11 @@ msgid ""

348 "a - unstage this hunk and all later hunks in the file\n"

349 "d - do not unstage this hunk or any of the later hunks in the file\n"

350 msgstr ""

351 -"y - batal gelar hunk ini\n"

352 -"n - jangan batal gelar hunk ini\n"

353 -"q - keluar; jangan batal gelar hunk ini atau yang sisanya\n"

354 -"a - batal gelar hunk ini dan semua hunk selanjutnya dalam berkas\n"

355 -"d - jangan batal gelar hunk ini atau hunk selanjutnya dalam berkas\n"

351 +"y - batal gelar bingkah ini\n"

352 +"n - jangan batal gelar bingkah ini\n"

353 +"q - keluar; jangan batal gelar bingkah ini atau yang sisanya\n"

354 +"a - batal gelar bingkah ini dan semua bingkah selanjutnya dalam berkas\n"

355 +"d - jangan batal gelar bingkah ini atau bingkah selanjutnya dalam berkas\n"

356

357 #: add-patch.c:103 git-add--interactive.perl:1449

358 #, c-format, perl-format

@@ -372,15 +372,15 @@ msgstr "Terapkan penambahan ke indeks [y,n,q,a,d%s,?]? "

372 #: add-patch.c:106 git-add--interactive.perl:1452

373 #, c-format, perl-format

374 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "

375 -msgstr "Terapkan hunk ini ke indeks [y,n,q,a,d%s,?]? "

375 +msgstr "Terapkan bingkah ini ke indeks [y,n,q,a,d%s,?]? "

376

377 #: add-patch.c:108 add-patch.c:176 add-patch.c:221

378 msgid ""

379 "If the patch applies cleanly, the edited hunk will immediately be marked for "

380 "applying."

381 msgstr ""

382 -"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai "

383 -"untuk diterapkan."

382 +"Jika tambalan diterapkan bersih, bingkah yang disunting akan langsung "

383 +"ditandai untuk diterapkan."

384

385 #: add-patch.c:111

386 msgid ""

@@ -390,11 +390,11 @@ msgid ""

390 "a - apply this hunk and all later hunks in the file\n"

391 "d - do not apply this hunk or any of the later hunks in the file\n"

392 msgstr ""

393 -"y - terapkan hunk ini ke indeks\n"

394 -"n - jangan terapkan hunk ini ke indeks\n"

395 -"q - keluar; jangan terapkan hunk ini atau yang sisanya\n"

396 -"a - terapkan hunk ini dan semua hunk selanjutnya dalam berkas\n"

397 -"d - jangan terapkan hunk ini atau hunk selanjutnya dalam berkas\n"

393 +"y - terapkan bingkah ini ke indeks\n"

394 +"n - jangan terapkan bingkah ini ke indeks\n"

395 +"q - keluar; jangan terapkan bingkah ini atau yang sisanya\n"

396 +"a - terapkan bingkah ini dan semua bingkah selanjutnya dalam berkas\n"

397 +"d - jangan terapkan bingkah ini atau bingkah selanjutnya dalam berkas\n"

398

399 #: add-patch.c:126 git-add--interactive.perl:1455

400 #: git-add--interactive.perl:1473

@@ -418,15 +418,15 @@ msgstr "Buang penambahan dari pohon kerja [y,n,q,a,d%s,?]? "

418 #: git-add--interactive.perl:1476

419 #, c-format, perl-format

420 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "

421 -msgstr "Buang hunk ini dari pohon kerja [y,n,q,a,d%s,?]? "

421 +msgstr "Buang bingkah ini dari pohon kerja [y,n,q,a,d%s,?]? "

422

423 #: add-patch.c:131 add-patch.c:154 add-patch.c:199

424 msgid ""

425 "If the patch applies cleanly, the edited hunk will immediately be marked for "

426 "discarding."

427 msgstr ""

428 -"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai "

429 -"untuk dibuang."

428 +"Jika tambalan diterapkan bersih, bingkah yang disunting akan langsung "

429 +"ditandai untuk dibuang."

430

431 #: add-patch.c:134 add-patch.c:202

432 msgid ""

@@ -436,11 +436,11 @@ msgid ""

436 "a - discard this hunk and all later hunks in the file\n"

437 "d - do not discard this hunk or any of the later hunks in the file\n"

438 msgstr ""

439 -"y - buang hunk ini dari pohon kerja\n"

440 -"n - jangan buang hunk ini dari pohon kerja\n"

441 -"q - keluar; jangan buang hunk ini atau yang sisanya\n"

442 -"a - buang hunk ini dan semua hunk selanjutnya dalam berkas\n"

443 -"d - jangan buang hunk ini atau hunk selanjutnya dalam berkas\n"

439 +"y - buang bingkah ini dari pohon kerja\n"

440 +"n - jangan buang bingkah ini dari pohon kerja\n"

441 +"q - keluar; jangan buang bingkah ini atau yang sisanya\n"

442 +"a - buang hunk ini dan semua bingkah selanjutnya dalam berkas\n"

443 +"d - jangan buang hunk ini atau bingkah selanjutnya dalam berkas\n"

444

445 #: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461

446 #, c-format, perl-format

@@ -460,7 +460,7 @@ msgstr "Buang penambahan dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "

460 #: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464

461 #, c-format, perl-format

462 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "

463 -msgstr "Buang hunk ini dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "

463 +msgstr "Buang bingkah ini dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "

464

465 #: add-patch.c:157

466 msgid ""

@@ -470,11 +470,11 @@ msgid ""

470 "a - discard this hunk and all later hunks in the file\n"

471 "d - do not discard this hunk or any of the later hunks in the file\n"

472 msgstr ""

473 -"y - buang hunk ini dari indeks dan pohon kerja\n"

474 -"n - jangan buang hunk ini dari indeks dan pohon kerja\n"

475 -"q - keluar; jangan buang hunk ini atau yang sisanya\n"

476 -"a - buang hunk ini dan semua hunk selanjutnya dalam berkas\n"

477 -"d - jangan buang hunk ini atau hunk selanjutnya dalam berkas\n"

473 +"y - buang bingkah ini dari indeks dan pohon kerja\n"

474 +"n - jangan buang bingkah ini dari indeks dan pohon kerja\n"

475 +"q - keluar; jangan buang bingkah ini atau yang sisanya\n"

476 +"a - buang bingkah ini dan semua bingkah selanjutnya dalam berkas\n"

477 +"d - jangan buang bingkah ini atau bingkah selanjutnya dalam berkas\n"

478

479 #: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467

480 #, c-format, perl-format

@@ -494,7 +494,7 @@ msgstr "Terapkan penambahan ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "

494 #: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470

495 #, c-format, perl-format

496 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "

497 -msgstr "Terapkan hunk ini ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "

497 +msgstr "Terapkan bingkah ini ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "

498

499 #: add-patch.c:179

500 msgid ""

@@ -504,11 +504,11 @@ msgid ""

504 "a - apply this hunk and all later hunks in the file\n"

505 "d - do not apply this hunk or any of the later hunks in the file\n"

506 msgstr ""

507 -"y - terapkan hunk ini ke indeks dan pohon kerja\n"

508 -"n - jangan terapkan hunk ini ke indeks dan pohon kerja\n"

509 -"q - keluar; jangan terapkan hunk ini atau yang sisanya\n"

510 -"a - terapkan hunk ini dan semua hunk selanjutnya dalam berkas\n"

511 -"d - jangan terapkan hunk ini atau hunk selanjutnya dalam berkas\n"

507 +"y - terapkan bingkah ini ke indeks dan pohon kerja\n"

508 +"n - jangan terapkan bingkah ini ke indeks dan pohon kerja\n"

509 +"q - keluar; jangan terapkan bingkah ini atau yang sisanya\n"

510 +"a - terapkan bingkah ini dan semua bingkah selanjutnya dalam berkas\n"

511 +"d - jangan terapkan bingkah ini atau bingkah selanjutnya dalam berkas\n"

512

513 #: add-patch.c:224

514 msgid ""

@@ -518,21 +518,21 @@ msgid ""

518 "a - apply this hunk and all later hunks in the file\n"

519 "d - do not apply this hunk or any of the later hunks in the file\n"

520 msgstr ""

521 -"y - terapkan hunk ini ke pohon kerja\n"

522 -"n - jangan terapkan hunk ini ke pohon kerja\n"

523 -"q - keluar; jangan terapkan hunk ini atau yang sisanya\n"

524 -"a - terapkan hunk ini dan semua hunk selanjutnya dalam berkas\n"

525 -"d - jangan terapkan hunk ini atau hunk selanjutnya dalam berkas\n"

521 +"y - terapkan bingkah ini ke pohon kerja\n"

522 +"n - jangan terapkan bingkah ini ke pohon kerja\n"

523 +"q - keluar; jangan terapkan bingkah ini atau yang sisanya\n"

524 +"a - terapkan bingkah ini dan semua bingkah selanjutnya dalam berkas\n"

525 +"d - jangan terapkan bingkah ini atau bingkah selanjutnya dalam berkas\n"

526

527 #: add-patch.c:343

528 #, c-format

529 msgid "could not parse hunk header '%.*s'"

530 -msgstr "tidak dapat menguraikan kepala hunk '%.*s'"

530 +msgstr "tidak dapat menguraikan kepala bingkah '%.*s'"

531

532 #: add-patch.c:362 add-patch.c:366

533 #, c-format

534 msgid "could not parse colored hunk header '%.*s'"

535 -msgstr "tidak dapat menguraikan kepala hunk berwarna '%.*s'"

535 +msgstr "tidak dapat menguraikan kepala bingkah berwarna '%.*s'"

536

537 #: add-patch.c:420

538 msgid "could not parse diff"

@@ -576,14 +576,14 @@ msgid ""

576 "\tdoes not end with:\n"

577 "%.*s"

578 msgstr ""

579 -"hunk tidak tumpang tindih:\n"

579 +"bingkah tidak tumpang tindih:\n"

580 "%.*s\n"

581 "tidak berakhir dengan:\n"

582 "%.*s"

583

584 #: add-patch.c:1082 git-add--interactive.perl:1115

585 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"

586 -msgstr "Mode sunting hunk manual -- lihat dibawah untuk panduan cepat.\n"

586 +msgstr "Mode sunting bingkah manual -- lihat dibawah untuk panduan cepat.\n"

587

588 #: add-patch.c:1086

589 #, c-format

@@ -606,12 +606,12 @@ msgid ""

606 "aborted and the hunk is left unchanged.\n"

607 msgstr ""

608 "Jika itu tidak diterapkan dengan bersih, Anda akan diberikan kesempatan\n"

609 -"untuk menyunting lagi. Jika semua baris dalam hunk dihapus, suntingan\n"

610 -"dibatalkan dan hunk tetap tidak berubah.\n"

609 +"untuk menyunting lagi. Jika semua baris dalam bingkah dihapus, suntingan\n"

610 +"dibatalkan dan bingkah tetap tidak berubah.\n"

611

612 #: add-patch.c:1133

613 msgid "could not parse hunk header"

614 -msgstr "tidak dapat menguraikan kepala hunk"

614 +msgstr "tidak dapat menguraikan kepala bingkah"

615

616 #: add-patch.c:1178

617 msgid "'git apply --cached' failed"

@@ -633,12 +633,12 @@ msgstr "'git apply --cached' gagal"

633 msgid ""

634 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "

635 msgstr ""

636 -"Hunk Anda tak diterapkan. Sunting lagi (bilang \"n\" untuk \"tidak\" buang!) "

637 -"[y/n]?"

636 +"Bingkah Anda tak diterapkan. Sunting lagi (bilang \"n\" untuk \"tidak\" "

637 +"buang!) [y/n]?"

638

639 #: add-patch.c:1290

640 msgid "The selected hunks do not apply to the index!"

641 -msgstr "Hunk yang dipilih tidak diterapkan ke indeks!"

641 +msgstr "Bingkah yang dipilih tidak diterapkan ke indeks!"

642

643 #: add-patch.c:1291 git-add--interactive.perl:1346

644 msgid "Apply them to the worktree anyway? "

@@ -660,35 +660,35 @@ msgid ""

660 "e - manually edit the current hunk\n"

661 "? - print help\n"

662 msgstr ""

663 -"j - biarkan hunk ini ragu, lihat hunk ragu berikutnya\n"

664 -"J - biarkan hunk ini ragu, lihat hunk berikutnya\n"

665 -"k - biarkan hunk ini ragu, lihat hunk ragu sebelumnya\n"

666 -"K - biarkan hunk ini ragu, lihat hunk sebelumnya\n"

667 -"g - pilih satu hunk untuk dikunjungi\n"

668 -"/ - cari satu hunk yang cocok dengan regex yang diberikan\n"

669 -"s - belah hunk saat ini ke dalam hunk yang lebih kecil\n"

670 -"e - sunting hunk saat ini secara manual\n"

663 +"j - biarkan bingkah ini ragu, lihat bingkah ragu berikutnya\n"

664 +"J - biarkan bingkah ini ragu, lihat bingkah berikutnya\n"

665 +"k - biarkan bingkah ini ragu, lihat bingkah ragu sebelumnya\n"

666 +"K - biarkan bingkah ini ragu, lihat bingkah sebelumnya\n"

667 +"g - pilih satu bingkah untuk dikunjungi\n"

668 +"/ - cari satu bingkah yang cocok dengan regex yang diberikan\n"

669 +"s - belah bingkah saat ini ke dalam bingkah yang lebih kecil\n"

670 +"e - sunting bingkah saat ini secara manual\n"

671 "? - cetak bantuan\n"

672

673 #: add-patch.c:1517 add-patch.c:1527

674 msgid "No previous hunk"

675 -msgstr "Tidak ada hunk sebelumnya"

675 +msgstr "Tidak ada bingkah sebelumnya"

676

677 #: add-patch.c:1522 add-patch.c:1532

678 msgid "No next hunk"

679 -msgstr "Tidak ada hunk selanjutnya"

679 +msgstr "Tidak ada bingkah selanjutnya"

680

681 #: add-patch.c:1538

682 msgid "No other hunks to goto"

683 -msgstr "Tidak ada hunk lainnya untuk dikunjungi"

683 +msgstr "Tidak ada bingkah lainnya untuk dikunjungi"

684

685 #: add-patch.c:1549 git-add--interactive.perl:1606

686 msgid "go to which hunk (<ret> to see more)? "

687 -msgstr "pergi ke hunk yang mana (<ret> untuk lihat lebih)? "

687 +msgstr "pergi ke bingkah yang mana (<ret> untuk lihat lebih)? "

688

689 #: add-patch.c:1550 git-add--interactive.perl:1608

690 msgid "go to which hunk? "

691 -msgstr "pergi ke hunk yang mana?"

691 +msgstr "pergi ke bingkah yang mana?"

692

693 #: add-patch.c:1561

694 #, c-format

@@ -699,12 +699,12 @@ msgstr "Angka tidak valid: '%s'"

699 #, c-format

700 msgid "Sorry, only %d hunk available."

701 msgid_plural "Sorry, only %d hunks available."

702 -msgstr[0] "Maaf, hanya %d hunk yang tersedia."

703 -msgstr[1] "Maaf, hanya %d hunk yang tersedia."

702 +msgstr[0] "Maaf, hanya %d bingkah yang tersedia."

703 +msgstr[1] "Maaf, hanya %d bingkah yang tersedia."

704

705 #: add-patch.c:1575

706 msgid "No other hunks to search"

707 -msgstr "Tidak ada hunk lainnya untuk dicari"

707 +msgstr "Tidak ada bingkah lainnya untuk dicari"

708

709 #: add-patch.c:1581 git-add--interactive.perl:1661

710 msgid "search for regex? "

@@ -717,98 +717,104 @@ msgstr "regexp pencarian %s cacat: %s"

717

718 #: add-patch.c:1613

719 msgid "No hunk matches the given pattern"

720 -msgstr "Tidak ada hunk yang cocok dengan pola yang diberikan"

720 +msgstr "Tidak ada bingkah yang cocok dengan pola yang diberikan"

721

722 #: add-patch.c:1620

723 msgid "Sorry, cannot split this hunk"

724 -msgstr "Maaf, tidak dapat membelah hunk ini"

724 +msgstr "Maaf, tidak dapat membelah bingkah ini"

725

726 #: add-patch.c:1624

727 #, c-format

728 msgid "Split into %d hunks."

729 -msgstr "Terbelah ke dalam %d hunk."

729 +msgstr "Terbelah ke dalam %d bingkah."

730

731 #: add-patch.c:1628

732 msgid "Sorry, cannot edit this hunk"

733 -msgstr "Maaf, tidak dapat menyunting hunk ini"

733 +msgstr "Maaf, tidak dapat menyunting bingkah ini"

734

735 #: add-patch.c:1680

736 msgid "'git apply' failed"

737 msgstr "'git apply' gagal"

738

739 -#: advice.c:145

739 +#: advice.c:78

740 #, c-format

741 msgid ""

742 "\n"

743 "Disable this message with \"git config advice.%s false\""

744 msgstr ""

745

746 -#: advice.c:161

746 +#: advice.c:94

747 #, c-format

748 msgid "%shint: %.*s%s\n"

749 msgstr ""

750

751 -#: advice.c:252

751 +#: advice.c:178

752 msgid "Cherry-picking is not possible because you have unmerged files."

753 msgstr ""

754

755 -#: advice.c:254

755 +#: advice.c:180

756 msgid "Committing is not possible because you have unmerged files."

757 msgstr ""

758

759 -#: advice.c:256

759 +#: advice.c:182

760 msgid "Merging is not possible because you have unmerged files."

761 msgstr ""

762

763 -#: advice.c:258

763 +#: advice.c:184

764 msgid "Pulling is not possible because you have unmerged files."

765 msgstr ""

766

767 -#: advice.c:260

767 +#: advice.c:186

768 msgid "Reverting is not possible because you have unmerged files."

769 msgstr ""

770

771 -#: advice.c:262

771 +#: advice.c:188

772 #, c-format

773 msgid "It is not possible to %s because you have unmerged files."

774 msgstr ""

775

776 -#: advice.c:270

776 +#: advice.c:196

777 msgid ""

778 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"

779 "as appropriate to mark resolution and make a commit."

780 msgstr ""

781

782 -#: advice.c:278

782 +#: advice.c:204

783 msgid "Exiting because of an unresolved conflict."

784 msgstr ""

785

786 -#: advice.c:283 builtin/merge.c:1375

786 +#: advice.c:209 builtin/merge.c:1379

787 msgid "You have not concluded your merge (MERGE_HEAD exists)."

788 msgstr ""

789

790 -#: advice.c:285

790 +#: advice.c:211

791 msgid "Please, commit your changes before merging."

792 msgstr ""

793

794 -#: advice.c:286

794 +#: advice.c:212

795 msgid "Exiting because of unfinished merge."

796 msgstr ""

797

798 -#: advice.c:296

798 +#: advice.c:217

799 +msgid "Not possible to fast-forward, aborting."

800 +msgstr "Tidak mungkin untuk maju cepat, batalkan."

801 +

802 +#: advice.c:227

803 #, c-format

804 msgid ""

801 -"The following pathspecs didn't match any eligible path, but they do match "

802 -"index\n"

803 -"entries outside the current sparse checkout:\n"

805 +"The following paths and/or pathspecs matched paths that exist\n"

806 +"outside of your sparse-checkout definition, so will not be\n"

807 +"updated in the index:\n"

808 msgstr ""

809

806 -#: advice.c:303

810 +#: advice.c:234

811 msgid ""

808 -"Disable or modify the sparsity rules if you intend to update such entries."

812 +"If you intend to update such entries, try one of the following:\n"

813 +"* Use the --sparse option.\n"

814 +"* Disable or modify the sparsity rules."

815 msgstr ""

816

811 -#: advice.c:310

817 +#: advice.c:242

818 #, c-format

819 msgid ""

820 "Note: switching to '%s'.\n"

@@ -842,73 +848,75 @@ msgstr ""

848 #: apply.c:70

849 #, c-format

850 msgid "unrecognized whitespace option '%s'"

845 -msgstr ""

851 +msgstr "opsi spasi putih tidak dikenal '%s'"

852

853 #: apply.c:86

854 #, c-format

855 msgid "unrecognized whitespace ignore option '%s'"

850 -msgstr ""

856 +msgstr "opsi abai spasi putih tidak dikenal '%s'"

857

858 #: apply.c:136

859 msgid "--reject and --3way cannot be used together."

854 -msgstr ""

860 +msgstr "--reject dan --3way tidak dapat digunakan bersamaan."

861

862 #: apply.c:139

863 msgid "--3way outside a repository"

858 -msgstr ""

864 +msgstr "--3way di luar repositori"

865

866 #: apply.c:150

867 msgid "--index outside a repository"

862 -msgstr ""

868 +msgstr "--index di luar repositori"

869

870 #: apply.c:153

871 msgid "--cached outside a repository"

866 -msgstr ""

872 +msgstr "--cached di luar repositori"

873

874 #: apply.c:800

875 #, c-format

876 msgid "Cannot prepare timestamp regexp %s"

871 -msgstr ""

877 +msgstr "Tidak dapat menyiapkan ekspresi reguler stempel waktu %s"

878

879 #: apply.c:809

880 #, c-format

881 msgid "regexec returned %d for input: %s"

876 -msgstr ""

882 +msgstr "regexec kembalikan %d untuk input: %s"

883

884 #: apply.c:883

885 #, c-format

886 msgid "unable to find filename in patch at line %d"

881 -msgstr ""

887 +msgstr "tidak dapat menemukan nama berkas dalam tambalan pada baris %d"

888

889 #: apply.c:921

890 #, c-format

891 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"

886 -msgstr ""

892 +msgstr "git apply: git-diff jelek - berharap /dev/null, dapat %s pada baris %d"

893

894 #: apply.c:927

895 #, c-format

896 msgid "git apply: bad git-diff - inconsistent new filename on line %d"

897 msgstr ""

898 +"git apply: git-diff jelek - nama berkas baru tidak konsisten pada baris %d"

899

900 #: apply.c:928

901 #, c-format

902 msgid "git apply: bad git-diff - inconsistent old filename on line %d"

903 msgstr ""

904 +"git apply: git-diff jelek - nama berkas lama tidak konsisten pada baris %d"

905

906 #: apply.c:933

907 #, c-format

908 msgid "git apply: bad git-diff - expected /dev/null on line %d"

901 -msgstr ""

909 +msgstr "git apply: git-diff jelek - berharap /dev/null pada baris %d"

910

911 #: apply.c:962

912 #, c-format

913 msgid "invalid mode on line %d: %s"

906 -msgstr ""

914 +msgstr "mode tidak valid pada baris %d: %s"

915

916 #: apply.c:1281

917 #, c-format

918 msgid "inconsistent header lines %d and %d"

911 -msgstr ""

919 +msgstr "kepala baris %d dan %d tidak konsisten"

920

921 #: apply.c:1371

922 #, c-format

@@ -919,534 +927,548 @@ msgid_plural ""

927 "git diff header lacks filename information when removing %d leading pathname "

928 "components (line %d)"

929 msgstr[0] ""

930 +"kepala git diff kekurangan informasi nama berkas ketika menghapus %d "

931 +"komponen nama jalur terkemuka (baris %d)"

932 msgstr[1] ""

933 +"kepala git diff kekurangan informasi nama berkas ketika menghapus %d "

934 +"komponen nama jalur terkemuka (baris %d)"

935

936 #: apply.c:1384

937 #, c-format

938 msgid "git diff header lacks filename information (line %d)"

927 -msgstr ""

939 +msgstr "kepala git diff kekurangan informasi nama berkas (baris %d)"

940

941 #: apply.c:1480

942 #, c-format

943 msgid "recount: unexpected line: %.*s"

932 -msgstr ""

944 +msgstr "recount: baris tidak diharapkan: %.*s"

945

946 #: apply.c:1549

947 #, c-format

948 msgid "patch fragment without header at line %d: %.*s"

937 -msgstr ""

949 +msgstr "pecahan tambalan tanpa kepala pada baris %d: %.*s"

950

951 #: apply.c:1752

952 msgid "new file depends on old contents"

941 -msgstr ""

953 +msgstr "berkas baru bergantung pada konten yang lama"

954

955 #: apply.c:1754

956 msgid "deleted file still has contents"

945 -msgstr ""

957 +msgstr "berkas terhapus masih ada konten"

958

959 #: apply.c:1788

960 #, c-format

961 msgid "corrupt patch at line %d"

950 -msgstr ""

962 +msgstr "tambalan rusak pada baris %d"

963

964 #: apply.c:1825

965 #, c-format

966 msgid "new file %s depends on old contents"

955 -msgstr ""

967 +msgstr "berkas baru %s bergantung pada konten yang lama"

968

969 #: apply.c:1827

970 #, c-format

971 msgid "deleted file %s still has contents"

960 -msgstr ""

972 +msgstr "berkas yang dihapus %s masih ada konten"

973

974 #: apply.c:1830

975 #, c-format

976 msgid "** warning: file %s becomes empty but is not deleted"

965 -msgstr ""

977 +msgstr "** peringatan: berkas %s menjadi kosong tetapi tidak dihapus"

978

967 -#: apply.c:1977

979 +#: apply.c:1978

980 #, c-format

981 msgid "corrupt binary patch at line %d: %.*s"

970 -msgstr ""

982 +msgstr "tambalan biner rusak pada baris %d: %.*s"

983

972 -#: apply.c:2014

984 +#: apply.c:2015

985 #, c-format

986 msgid "unrecognized binary patch at line %d"

975 -msgstr ""

987 +msgstr "tambalan biner tidak dikenal pada baris %d"

988

977 -#: apply.c:2176

989 +#: apply.c:2177

990 #, c-format

991 msgid "patch with only garbage at line %d"

980 -msgstr ""

992 +msgstr "tambal dengan hanya sampah pada baris %d"

993

982 -#: apply.c:2262

994 +#: apply.c:2263

995 #, c-format

996 msgid "unable to read symlink %s"

985 -msgstr ""

997 +msgstr "tidak dapat membaca tautan simbolik %s"

998

987 -#: apply.c:2266

999 +#: apply.c:2267

1000 #, c-format

1001 msgid "unable to open or read %s"

990 -msgstr ""

1002 +msgstr "tidak dapat membuka atau membaca %s"

1003

992 -#: apply.c:2935

1004 +#: apply.c:2936

1005 #, c-format

1006 msgid "invalid start of line: '%c'"

995 -msgstr ""

1007 +msgstr "awal baris tidak valid: '%c'"

1008

997 -#: apply.c:3056

1009 +#: apply.c:3057

1010 #, c-format

1011 msgid "Hunk #%d succeeded at %d (offset %d line)."

1012 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."

1001 -msgstr[0] ""

1002 -msgstr[1] ""

1013 +msgstr[0] "Bingkah #%d berhasil pada %d (ganti %d baris)."

1014 +msgstr[1] "Bingkah #%d berhasil pada %d (ganti %d baris)."

1015

1004 -#: apply.c:3068

1016 +#: apply.c:3069

1017 #, c-format

1018 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"

1007 -msgstr ""

1019 +msgstr "Konteks dikurangi menjadi (%ld/%ld) untuk terapkan pecahan pada %d"

1020

1009 -#: apply.c:3074

1021 +#: apply.c:3075

1022 #, c-format

1023 msgid ""

1024 "while searching for:\n"

1025 "%.*s"

1026 msgstr ""

1027 +"ketika mencari:\n"

1028 +"%.*s"

1029

1016 -#: apply.c:3096

1030 +#: apply.c:3097

1031 #, c-format

1032 msgid "missing binary patch data for '%s'"

1019 -msgstr ""

1033 +msgstr "data tambalan biner hilang untuk '%s'"

1034

1021 -#: apply.c:3104

1035 +#: apply.c:3105

1036 #, c-format

1037 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"

1038 msgstr ""

1039 +"tidak dapat menerapkan balik tambalan biner tanpa membalikkan bingkah ke '%s'"

1040

1026 -#: apply.c:3151

1041 +#: apply.c:3152

1042 #, c-format

1043 msgid "cannot apply binary patch to '%s' without full index line"

1029 -msgstr ""

1044 +msgstr "tidak dapat menerapkan tambalan biner ke '%s' tanpa baris indeks penuh"

1045

1031 -#: apply.c:3162

1046 +#: apply.c:3163

1047 #, c-format

1048 msgid ""

1049 "the patch applies to '%s' (%s), which does not match the current contents."

1050 msgstr ""

1051 +"tambalan diterapkan ke '%s' (%s), yang tidak cocok dengan konten saat ini."

1052

1037 -#: apply.c:3170

1053 +#: apply.c:3171

1054 #, c-format

1055 msgid "the patch applies to an empty '%s' but it is not empty"

1040 -msgstr ""

1056 +msgstr "tambalan diterapkan ke '%s' kosong tapi tidak kosong"

1057

1042 -#: apply.c:3188

1058 +#: apply.c:3189

1059 #, c-format

1060 msgid "the necessary postimage %s for '%s' cannot be read"

1045 -msgstr ""

1061 +msgstr "pascacitra %s yang diperlukan untuk '%s' tidak dapat dibaca"

1062

1047 -#: apply.c:3201

1063 +#: apply.c:3202

1064 #, c-format

1065 msgid "binary patch does not apply to '%s'"

1050 -msgstr ""

1066 +msgstr "tambalan biner tidak dapat diterapkan ke '%s'"

1067

1052 -#: apply.c:3208

1068 +#: apply.c:3209

1069 #, c-format

1070 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"

1071 msgstr ""

1072 +"tambalan biner ke '%s' membuat hasil yang salah (diharapkan %s, dapat %s)"

1073

1057 -#: apply.c:3229

1074 +#: apply.c:3230

1075 #, c-format

1076 msgid "patch failed: %s:%ld"

1060 -msgstr ""

1077 +msgstr "tambalan gagal: %s:%ld"

1078

1062 -#: apply.c:3352

1079 +#: apply.c:3353

1080 #, c-format

1081 msgid "cannot checkout %s"

1065 -msgstr ""

1082 +msgstr "tidak dapat men-checkout %s"

1083

1067 -#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214

1084 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214

1085 #: setup.c:308

1086 #, c-format

1087 msgid "failed to read %s"

1071 -msgstr ""

1088 +msgstr "gagal membaca %s"

1089

1073 -#: apply.c:3412

1090 +#: apply.c:3413

1091 #, c-format

1092 msgid "reading from '%s' beyond a symbolic link"

1076 -msgstr ""

1093 +msgstr "membaca dari '%s' diluar tautan simbolik"

1094

1078 -#: apply.c:3441 apply.c:3687

1095 +#: apply.c:3442 apply.c:3709

1096 #, c-format

1097 msgid "path %s has been renamed/deleted"

1081 -msgstr ""

1098 +msgstr "jalus %s sudah dinamai ulang/dihapus"

1099

1083 -#: apply.c:3527 apply.c:3702

1100 +#: apply.c:3549 apply.c:3724

1101 #, c-format

1102 msgid "%s: does not exist in index"

1086 -msgstr ""

1103 +msgstr "%s: tidak ada di indeks"

1104

1088 -#: apply.c:3536 apply.c:3710 apply.c:3954

1105 +#: apply.c:3558 apply.c:3732 apply.c:3976

1106 #, c-format

1107 msgid "%s: does not match index"

1091 -msgstr ""

1108 +msgstr "%s: tidak cocok dengan indeks"

1109

1093 -#: apply.c:3571

1110 +#: apply.c:3593

1111 msgid "repository lacks the necessary blob to perform 3-way merge."

1112 msgstr ""

1113 +"repositori kekurangan blob yang diperlukan untuk melakukan penggabungan 3 "

1114 +"arah."

1115

1097 -#: apply.c:3574

1116 +#: apply.c:3596

1117 #, c-format

1118 msgid "Performing three-way merge...\n"

1100 -msgstr ""

1119 +msgstr "Melakukan penggabungan 3 arah...\n"

1120

1102 -#: apply.c:3590 apply.c:3594

1121 +#: apply.c:3612 apply.c:3616

1122 #, c-format

1123 msgid "cannot read the current contents of '%s'"

1105 -msgstr ""

1124 +msgstr "tidak dapat membaca konten saat ini dari '%s'"

1125

1107 -#: apply.c:3606

1126 +#: apply.c:3628

1127 #, c-format

1128 msgid "Failed to perform three-way merge...\n"

1110 -msgstr ""

1129 +msgstr "Gagal melakukan penggabungan 3 arah...\n"

1130

1112 -#: apply.c:3620

1131 +#: apply.c:3642

1132 #, c-format

1133 msgid "Applied patch to '%s' with conflicts.\n"

1115 -msgstr ""

1134 +msgstr "Tambalan diterapkan ke '%s' dengan konflik.\n"

1135

1117 -#: apply.c:3625

1136 +#: apply.c:3647

1137 #, c-format

1138 msgid "Applied patch to '%s' cleanly.\n"

1120 -msgstr ""

1139 +msgstr "Tambalan diterapkan ke '%s' dengan rapi.\n"

1140

1122 -#: apply.c:3642

1141 +#: apply.c:3664

1142 #, c-format

1143 msgid "Falling back to direct application...\n"

1125 -msgstr ""

1144 +msgstr "Mundur ke penerapan langsung...\n"

1145

1127 -#: apply.c:3654

1146 +#: apply.c:3676

1147 msgid "removal patch leaves file contents"

1129 -msgstr ""

1148 +msgstr "tambalan penghapusan meninggalkan isi berkas"

1149

1131 -#: apply.c:3727

1150 +#: apply.c:3749

1151 #, c-format

1152 msgid "%s: wrong type"

1134 -msgstr ""

1153 +msgstr "%s: salah tipe"

1154

1136 -#: apply.c:3729

1155 +#: apply.c:3751

1156 #, c-format

1157 msgid "%s has type %o, expected %o"

1139 -msgstr ""

1158 +msgstr "%s bertipe %o, diharapkan %o"

1159

1141 -#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892

1142 -#: read-cache.c:1353

1160 +#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905

1161 +#: read-cache.c:1368

1162 #, c-format

1163 msgid "invalid path '%s'"

1145 -msgstr ""

1164 +msgstr "jalur tidak valid '%s'"

1165

1147 -#: apply.c:3952

1166 +#: apply.c:3974

1167 #, c-format

1168 msgid "%s: already exists in index"

1150 -msgstr ""

1169 +msgstr "%s: sudah ada di indeks"

1170

1152 -#: apply.c:3956

1171 +#: apply.c:3978

1172 #, c-format

1173 msgid "%s: already exists in working directory"

1155 -msgstr ""

1174 +msgstr "%s: sudah ada di direktori kerja"

1175

1157 -#: apply.c:3976

1176 +#: apply.c:3998

1177 #, c-format

1178 msgid "new mode (%o) of %s does not match old mode (%o)"

1160 -msgstr ""

1179 +msgstr "mode baru (%o) dari %s tidak cocok dengan mode lama (%o)"

1180

1162 -#: apply.c:3981

1181 +#: apply.c:4003

1182 #, c-format

1183 msgid "new mode (%o) of %s does not match old mode (%o) of %s"

1165 -msgstr ""

1184 +msgstr "mode baru (%o) dari %s tidak cocok dengan mode lama (%o) dari %s"

1185

1167 -#: apply.c:4001

1186 +#: apply.c:4023

1187 #, c-format

1188 msgid "affected file '%s' is beyond a symbolic link"

1170 -msgstr ""

1189 +msgstr "berkas yang terpengaruh '%s' diluar tautan simbolik"

1190

1172 -#: apply.c:4005

1191 +#: apply.c:4027

1192 #, c-format

1193 msgid "%s: patch does not apply"

1175 -msgstr ""

1194 +msgstr "%s: tambalan tak diterapkan"

1195

1177 -#: apply.c:4020

1196 +#: apply.c:4042

1197 #, c-format

1198 msgid "Checking patch %s..."

1180 -msgstr ""

1199 +msgstr "Memeriksa tambalan %s..."

1200

1182 -#: apply.c:4112

1201 +#: apply.c:4134

1202 #, c-format

1203 msgid "sha1 information is lacking or useless for submodule %s"

1185 -msgstr ""

1204 +msgstr "informasi sha1 kurang atau tidak berguna untuk submodul %s"

1205

1187 -#: apply.c:4119

1206 +#: apply.c:4141

1207 #, c-format

1208 msgid "mode change for %s, which is not in current HEAD"

1190 -msgstr ""

1209 +msgstr "perubahan mode untuk %s, yang bukan dalam HEAD saat ini"

1210

1192 -#: apply.c:4122

1211 +#: apply.c:4144

1212 #, c-format

1213 msgid "sha1 information is lacking or useless (%s)."

1195 -msgstr ""

1214 +msgstr "informasi sha1 kurang atau tidak berguna (%s)"

1215

1197 -#: apply.c:4131

1216 +#: apply.c:4153

1217 #, c-format

1218 msgid "could not add %s to temporary index"

1200 -msgstr ""

1219 +msgstr "tidak dapat menambahkan %s ke indeks sementara"

1220

1202 -#: apply.c:4141

1221 +#: apply.c:4163

1222 #, c-format

1223 msgid "could not write temporary index to %s"

1205 -msgstr ""

1224 +msgstr "tidak dapat menulis indeks sementara ke %s"

1225

1207 -#: apply.c:4279

1226 +#: apply.c:4301

1227 #, c-format

1228 msgid "unable to remove %s from index"

1210 -msgstr ""

1229 +msgstr "tidak dapat menghapus %s dari indeks"

1230

1212 -#: apply.c:4313

1231 +#: apply.c:4335

1232 #, c-format

1233 msgid "corrupt patch for submodule %s"

1215 -msgstr ""

1234 +msgstr "tambalan rusak untuk submodul %s"

1235

1217 -#: apply.c:4319

1236 +#: apply.c:4341

1237 #, c-format

1238 msgid "unable to stat newly created file '%s'"

1220 -msgstr ""

1239 +msgstr "tidak dapat men-stat berkas yang baru dibuat '%s'"

1240

1222 -#: apply.c:4327

1241 +#: apply.c:4349

1242 #, c-format

1243 msgid "unable to create backing store for newly created file %s"

1244 msgstr ""

1245 +"tidak dapat membuat simpanan pendukung untuk berkas yang baru dibuat %s"

1246

1227 -#: apply.c:4333 apply.c:4478

1247 +#: apply.c:4355 apply.c:4500

1248 #, c-format

1249 msgid "unable to add cache entry for %s"

1230 -msgstr ""

1250 +msgstr "tidak dapat menambahkan entri tembolok untuk %s"

1251

1232 -#: apply.c:4376 builtin/bisect--helper.c:525

1252 +#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2242

1253 +#: builtin/gc.c:2277

1254 #, c-format

1255 msgid "failed to write to '%s'"

1235 -msgstr ""

1256 +msgstr "gagal menulis ke '%s'"

1257

1237 -#: apply.c:4380

1258 +#: apply.c:4402

1259 #, c-format

1260 msgid "closing file '%s'"

1240 -msgstr ""

1261 +msgstr "menutup berkas '%s'"

1262

1242 -#: apply.c:4450

1263 +#: apply.c:4472

1264 #, c-format

1265 msgid "unable to write file '%s' mode %o"

1245 -msgstr ""

1266 +msgstr "tidak dapat menulis berkas '%s' mode %o"

1267

1247 -#: apply.c:4548

1268 +#: apply.c:4570

1269 #, c-format

1270 msgid "Applied patch %s cleanly."

1250 -msgstr ""

1271 +msgstr "Tambalan %s diterapkan dengan rapi."

1272

1252 -#: apply.c:4556

1273 +#: apply.c:4578

1274 msgid "internal error"

1254 -msgstr ""

1275 +msgstr "kesalahan internal"

1276

1256 -#: apply.c:4559

1277 +#: apply.c:4581

1278 #, c-format

1279 msgid "Applying patch %%s with %d reject..."

1280 msgid_plural "Applying patch %%s with %d rejects..."

1260 -msgstr[0] ""

1261 -msgstr[1] ""

1281 +msgstr[0] "Menerapkan tambalan %%s dengan %d penolakan..."

1282 +msgstr[1] "Menerapkan tambalan %%s dengan %d penolakan..."

1283

1263 -#: apply.c:4570

1284 +#: apply.c:4592

1285 #, c-format

1286 msgid "truncating .rej filename to %.*s.rej"

1266 -msgstr ""

1287 +msgstr "memotong nama berkas .rej ke %.*s.rej"

1288

1268 -#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394

1289 +#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408

1290 #, c-format

1291 msgid "cannot open %s"

1271 -msgstr ""

1292 +msgstr "tidak dapat membuka %s"

1293

1273 -#: apply.c:4592

1294 +#: apply.c:4614

1295 #, c-format

1296 msgid "Hunk #%d applied cleanly."

1276 -msgstr ""

1297 +msgstr "Bingkah #%d diterapkan dengan rapi."

1298

1278 -#: apply.c:4596

1299 +#: apply.c:4618

1300 #, c-format

1301 msgid "Rejected hunk #%d."

1281 -msgstr ""

1302 +msgstr "Bingkah #%d ditolak."

1303

1283 -#: apply.c:4725

1304 +#: apply.c:4747

1305 #, c-format

1306 msgid "Skipped patch '%s'."

1286 -msgstr ""

1307 +msgstr "Tambalan '%s' dilewatkan."

1308

1288 -#: apply.c:4733

1309 +#: apply.c:4755

1310 msgid "unrecognized input"

1290 -msgstr ""

1311 +msgstr "masukan tidak dikenal"

1312

1292 -#: apply.c:4753

1313 +#: apply.c:4775

1314 msgid "unable to read index file"

1294 -msgstr ""

1315 +msgstr "tidak dapa membaca berkas indeks"

1316

1296 -#: apply.c:4910

1317 +#: apply.c:4932

1318 #, c-format

1319 msgid "can't open patch '%s': %s"

1299 -msgstr ""

1320 +msgstr "tidak dapat membuka tambalan '%s': %s"

1321

1301 -#: apply.c:4937

1322 +#: apply.c:4959

1323 #, c-format

1324 msgid "squelched %d whitespace error"

1325 msgid_plural "squelched %d whitespace errors"

1305 -msgstr[0] ""

1306 -msgstr[1] ""

1326 +msgstr[0] "%d kesalahan spasi putih dipadamkan"

1327 +msgstr[1] "%d kesalahan spasi putih dipadamkan"

1328

1308 -#: apply.c:4943 apply.c:4958

1329 +#: apply.c:4965 apply.c:4980

1330 #, c-format

1331 msgid "%d line adds whitespace errors."

1332 msgid_plural "%d lines add whitespace errors."

1312 -msgstr[0] ""

1313 -msgstr[1] ""

1333 +msgstr[0] "%d baris menambahkan kesalahan spasi putih."

1334 +msgstr[1] "%d baris menambahkan kesalahan spasi putih."

1335

1315 -#: apply.c:4951

1336 +#: apply.c:4973

1337 #, c-format

1338 msgid "%d line applied after fixing whitespace errors."

1339 msgid_plural "%d lines applied after fixing whitespace errors."

1319 -msgstr[0] ""

1320 -msgstr[1] ""

1340 +msgstr[0] "%d baris diterapkan setelah memperbaiki kesalahan spasi putih."

1341 +msgstr[1] "%d baris diterapkan setelah memperbaiki kesalahan spasi putih."

1342

1322 -#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423

1343 +#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429

1344 msgid "Unable to write new index file"

1324 -msgstr ""

1345 +msgstr "Tidak dapat menulis berkas indeks baru"

1346

1326 -#: apply.c:4995

1347 +#: apply.c:5017

1348 msgid "don't apply changes matching the given path"

1328 -msgstr ""

1349 +msgstr "jangan terapkan perubahan yang cocok dengan jalur yang diberikan"

1350

1330 -#: apply.c:4998

1351 +#: apply.c:5020

1352 msgid "apply changes matching the given path"

1332 -msgstr ""

1353 +msgstr "terapkan perubahan yang cocok dengan jalur yang diberikan"

1354

1334 -#: apply.c:5000 builtin/am.c:2318

1355 +#: apply.c:5022 builtin/am.c:2320

1356 msgid "num"

1336 -msgstr ""

1357 +msgstr "jumlah"

1358

1338 -#: apply.c:5001

1359 +#: apply.c:5023

1360 msgid "remove <num> leading slashes from traditional diff paths"

1340 -msgstr ""

1361 +msgstr "hapus <jumlah> garis miring terkemuka dari jalur diff tradisional"

1362

1342 -#: apply.c:5004

1363 +#: apply.c:5026

1364 msgid "ignore additions made by the patch"

1344 -msgstr ""

1365 +msgstr "abaikan penambahan yang dibuat oleh tambalan"

1366

1346 -#: apply.c:5006

1367 +#: apply.c:5028

1368 msgid "instead of applying the patch, output diffstat for the input"

1348 -msgstr ""

1369 +msgstr "daripada menerapkan tambalan, keluarkan diffstat untuk masukan"

1370

1350 -#: apply.c:5010

1371 +#: apply.c:5032

1372 msgid "show number of added and deleted lines in decimal notation"

1373 msgstr ""

1374 +"perlihatkan jumlah baris yang ditambahkan dan dihapuskan dalam notasi desimal"

1375

1354 -#: apply.c:5012

1376 +#: apply.c:5034

1377 msgid "instead of applying the patch, output a summary for the input"

1356 -msgstr ""

1378 +msgstr "daripada menerapkan tambalan, keluarkan ringkasan untuk masukan"

1379

1358 -#: apply.c:5014

1380 +#: apply.c:5036

1381 msgid "instead of applying the patch, see if the patch is applicable"

1360 -msgstr ""

1382 +msgstr "daripada menerapkan tambalan, lihat jika tambalan bisa diterapkan"

1383

1362 -#: apply.c:5016

1384 +#: apply.c:5038

1385 msgid "make sure the patch is applicable to the current index"

1364 -msgstr ""

1386 +msgstr "pastikan tambalan bisa diterapkan ke indeks saat ini"

1387

1366 -#: apply.c:5018

1388 +#: apply.c:5040

1389 msgid "mark new files with `git add --intent-to-add`"

1368 -msgstr ""

1390 +msgstr "tandai berkas baru dengan `git add --intent-to-add`"

1391

1370 -#: apply.c:5020

1392 +#: apply.c:5042

1393 msgid "apply a patch without touching the working tree"

1372 -msgstr ""

1394 +msgstr "terapkan sebuah tambalan tanpa menyentuh pohon kerja"

1395

1374 -#: apply.c:5022

1396 +#: apply.c:5044

1397 msgid "accept a patch that touches outside the working area"

1376 -msgstr ""

1398 +msgstr "terima sebuah tambalan yang menyentuh di luar area kerja"

1399

1378 -#: apply.c:5025

1400 +#: apply.c:5047

1401 msgid "also apply the patch (use with --stat/--summary/--check)"

1380 -msgstr ""

1402 +msgstr "juga terapkan tambalan (gunakan dengan --stat/--summary/--check)"

1403

1382 -#: apply.c:5027

1404 +#: apply.c:5049

1405 msgid "attempt three-way merge, fall back on normal patch if that fails"

1384 -msgstr ""

1406 +msgstr "coba penggabungan tiga arah, mundur ke penambalan normal jika gagal"

1407

1386 -#: apply.c:5029

1408 +#: apply.c:5051

1409 msgid "build a temporary index based on embedded index information"

1388 -msgstr ""

1410 +msgstr "bangun sebuah indeks sementara berdasarkan informasi indeks tertanam"

1411

1390 -#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617

1412 +#: apply.c:5054 builtin/checkout-index.c:196

1413 msgid "paths are separated with NUL character"

1392 -msgstr ""

1414 +msgstr "jalur dipisahkan dengan karakter NUL"

1415

1394 -#: apply.c:5034

1416 +#: apply.c:5056

1417 msgid "ensure at least <n> lines of context match"

1396 -msgstr ""

1418 +msgstr "pastikan setidaknya <n> baris dari konteks cocokan"

1419

1398 -#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297

1420 +#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299

1421 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100

1400 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991

1401 -#: builtin/rebase.c:1347

1422 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960

1423 +#: builtin/rebase.c:1051

1424 msgid "action"

1403 -msgstr ""

1425 +msgstr "aksi"

1426

1405 -#: apply.c:5036

1427 +#: apply.c:5058

1428 msgid "detect new or modified lines that have whitespace errors"

1407 -msgstr ""

1429 +msgstr "deteksi baris baru atau yang diubah yang ada kesalahan spasi putih"

1430

1409 -#: apply.c:5039 apply.c:5042

1431 +#: apply.c:5061 apply.c:5064

1432 msgid "ignore changes in whitespace when finding context"

1411 -msgstr ""

1433 +msgstr "abaikan perubahan spasi putih ketika menemukan konteks"

1434

1413 -#: apply.c:5045

1435 +#: apply.c:5067

1436 msgid "apply the patch in reverse"

1415 -msgstr ""

1437 +msgstr "terapkan tambalan terbalik"

1438

1417 -#: apply.c:5047

1439 +#: apply.c:5069

1440 msgid "don't expect at least one line of context"

1419 -msgstr ""

1441 +msgstr "jangan harap setidaknya satu baris konteks"

1442

1421 -#: apply.c:5049

1443 +#: apply.c:5071

1444 msgid "leave the rejected hunks in corresponding *.rej files"

1423 -msgstr ""

1445 +msgstr "tinggalkan bingkah yang ditolak pada berkas *.rej yang bersesuaian"

1446

1425 -#: apply.c:5051

1447 +#: apply.c:5073

1448 msgid "allow overlapping hunks"

1427 -msgstr ""

1449 +msgstr "perbolehkan bingkah yang tumpang tindih"

1450

1429 -#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22

1430 -#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756

1431 -#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128

1451 +#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22

1452 +#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788

1453 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120

1454 msgid "be verbose"

1433 -msgstr ""

1455 +msgstr "jadi berkata-kata"

1456

1435 -#: apply.c:5054

1457 +#: apply.c:5076

1458 msgid "tolerate incorrectly detected missing new-line at the end of file"

1437 -msgstr ""

1459 +msgstr "tolerir baris baru hilang yang salah dideteksi pada akhir berkas"

1460

1439 -#: apply.c:5057

1461 +#: apply.c:5079

1462 msgid "do not trust the line counts in the hunk headers"

1441 -msgstr ""

1463 +msgstr "jangan percaya hitungan baris pada kepala bingkah"

1464

1443 -#: apply.c:5059 builtin/am.c:2306

1465 +#: apply.c:5081 builtin/am.c:2308

1466 msgid "root"

1445 -msgstr ""

1467 +msgstr "akar"

1468

1447 -#: apply.c:5060

1469 +#: apply.c:5082

1470 msgid "prepend <root> to all filenames"

1449 -msgstr ""

1471 +msgstr "tambahkan <akar> di depan semua nama berkas"

1472

1473 #: archive-tar.c:125 archive-zip.c:345

1474 #, c-format

@@ -1516,173 +1538,172 @@ msgstr "git archive --remote <repo> [--exec <perintah>] --list"

1538 msgid "cannot read %s"

1539 msgstr "Tidak dapat membaca %s"

1540

1519 -#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095

1520 -#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833

1521 -#: builtin/merge.c:1144

1541 +#: archive.c:341 sequencer.c:473 sequencer.c:1930 sequencer.c:3112

1542 +#: sequencer.c:3554 sequencer.c:3682 builtin/am.c:263 builtin/commit.c:834

1543 +#: builtin/merge.c:1145

1544 #, c-format

1545 msgid "could not read '%s'"

1546 msgstr "tidak dapat membaca '%s'"

1547

1526 -#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328

1548 +#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334

1549 #, c-format

1550 msgid "pathspec '%s' did not match any files"

1551 msgstr "spek jalur '%s' tidak cocok dengan berkas apapun"

1552

1531 -#: archive.c:451

1553 +#: archive.c:450

1554 #, c-format

1555 msgid "no such ref: %.*s"

1556 msgstr "tidak ada referensi seperti: %.*s"

1557

1536 -#: archive.c:457

1558 +#: archive.c:456

1559 #, c-format

1560 msgid "not a valid object name: %s"

1561 msgstr "bukan nama objek valid: %s"

1562

1541 -#: archive.c:470

1563 +#: archive.c:469

1564 #, c-format

1565 msgid "not a tree object: %s"

1566 msgstr "bukan objek pohon: %s"

1567

1546 -#: archive.c:482

1568 +#: archive.c:481

1569 msgid "current working directory is untracked"

1570 msgstr "direktori kerja saat ini tak terlacak"

1571

1550 -#: archive.c:523

1572 +#: archive.c:522

1573 #, c-format

1574 msgid "File not found: %s"

1575 msgstr "Berkas tidak ditemukan: %s"

1576

1555 -#: archive.c:525

1577 +#: archive.c:524

1578 #, c-format

1579 msgid "Not a regular file: %s"

1580 msgstr "Bukan berkas reguler: %s"

1581

1560 -#: archive.c:552

1582 +#: archive.c:551

1583 msgid "fmt"

1584 msgstr "fmt"

1585

1564 -#: archive.c:552

1586 +#: archive.c:551

1587 msgid "archive format"

1588 msgstr "format arsip"

1589

1568 -#: archive.c:553 builtin/log.c:1775

1590 +#: archive.c:552 builtin/log.c:1775

1591 msgid "prefix"

1592 msgstr "prefiks"

1593

1572 -#: archive.c:554

1594 +#: archive.c:553

1595 msgid "prepend prefix to each pathname in the archive"

1596 msgstr "tambahkan prefiks di depan setiap nama jalur dalam arsip"

1597

1576 -#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888

1577 -#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135

1578 -#: builtin/fast-export.c:1207 builtin/fast-export.c:1209

1579 -#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105

1580 -#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412

1581 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191

1598 +#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884

1599 +#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135

1600 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210

1601 +#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103

1602 +#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410

1603 +#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190

1604 msgid "file"

1605 msgstr "berkas"

1606

1585 -#: archive.c:556

1607 +#: archive.c:555

1608 msgid "add untracked file to archive"

1609 msgstr "tambahkan berkas tak terlacak ke arsip"

1610

1589 -#: archive.c:559 builtin/archive.c:90

1611 +#: archive.c:558 builtin/archive.c:88

1612 msgid "write the archive to this file"

1613 msgstr "tulis arsip ke berkas ini"

1614

1593 -#: archive.c:561

1615 +#: archive.c:560

1616 msgid "read .gitattributes in working directory"

1617 msgstr "baca .gitattributes dalam direktori kerja"

1618

1597 -#: archive.c:562

1619 +#: archive.c:561

1620 msgid "report archived files on stderr"

1621 msgstr "laporkan berkas terarsip ke error standar"

1622

1601 -#: archive.c:564

1623 +#: archive.c:563

1624 msgid "set compression level"

1625 msgstr "setel level kompresi"

1626

1605 -#: archive.c:567

1627 +#: archive.c:566

1628 msgid "list supported archive formats"

1629 msgstr "daftar format arsip yang didukung"

1630

1609 -#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121

1610 -#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352

1611 -#: builtin/submodule--helper.c:2902

1631 +#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121

1632 +#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512

1633 msgid "repo"

1634 msgstr "repositori"

1635

1615 -#: archive.c:570 builtin/archive.c:92

1636 +#: archive.c:569 builtin/archive.c:90

1637 msgid "retrieve the archive from remote repository <repo>"

1638 msgstr "ambil arsip dari repositori remote <repo>"

1639

1619 -#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717

1620 -#: builtin/notes.c:498

1640 +#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714

1641 +#: builtin/notes.c:496

1642 msgid "command"

1643 msgstr "perintah"

1644

1624 -#: archive.c:572 builtin/archive.c:94

1645 +#: archive.c:571 builtin/archive.c:92

1646 msgid "path to the remote git-upload-archive command"

1647 msgstr "jalur ke perintah git-upload-archive remote"

1648

1628 -#: archive.c:579

1649 +#: archive.c:578

1650 msgid "Unexpected option --remote"

1651 msgstr "Opsi --remote tak diharapkan"

1652

1632 -#: archive.c:581

1653 +#: archive.c:580

1654 msgid "Option --exec can only be used together with --remote"

1655 msgstr "Opsi --exec hanya dapat digunakan bersamaan dengan --remote"

1656

1636 -#: archive.c:583

1657 +#: archive.c:582

1658 msgid "Unexpected option --output"

1659 msgstr "Opsi --output tak diharapkan"

1660

1640 -#: archive.c:585

1661 +#: archive.c:584

1662 msgid "Options --add-file and --remote cannot be used together"

1663 msgstr "Opsi --add-file dan --remote tidak dapat digunakan bersamaan"

1664

1644 -#: archive.c:607

1665 +#: archive.c:606

1666 #, c-format

1667 msgid "Unknown archive format '%s'"

1668 msgstr "Format arsip tidak dikenal '%s'"

1669

1649 -#: archive.c:616

1670 +#: archive.c:615

1671 #, c-format

1672 msgid "Argument not supported for format '%s': -%d"

1673 msgstr "Argumen tidak didukung untuk format '%s': -%d"

1674

1654 -#: attr.c:202

1675 +#: attr.c:203

1676 #, c-format

1677 msgid "%.*s is not a valid attribute name"

1678 msgstr ""

1679

1659 -#: attr.c:363

1680 +#: attr.c:364

1681 #, c-format

1682 msgid "%s not allowed: %s:%d"

1683 msgstr ""

1684

1664 -#: attr.c:403

1685 +#: attr.c:404

1686 msgid ""

1687 "Negative patterns are ignored in git attributes\n"

1688 "Use '\\!' for literal leading exclamation."

1689 msgstr ""

1690

1670 -#: bisect.c:489

1691 +#: bisect.c:488

1692 #, c-format

1693 msgid "Badly quoted content in file '%s': %s"

1694 msgstr "Kontent terkutip jelek dalam berkas '%s': %s"

1695

1675 -#: bisect.c:699

1696 +#: bisect.c:698

1697 #, c-format

1698 msgid "We cannot bisect more!\n"

1699 msgstr "Kami tidak dapat membagi dua lagi!\n"

1700

1680 -#: bisect.c:766

1701 +#: bisect.c:764

1702 #, c-format

1703 msgid "Not a valid commit name %s"

1704 msgstr "Bukan sebuah nama komit yang valid %s"

1705

1685 -#: bisect.c:791

1706 +#: bisect.c:789

1707 #, c-format

1708 msgid ""

1709 "The merge base %s is bad.\n"

@@ -1691,7 +1712,7 @@ msgstr ""

1712 "Dasar penggabungan %s jelek.\n"

1713 "Ini berarti bug telah diperbaiki antara %s dan [%s].\n"

1714

1694 -#: bisect.c:796

1715 +#: bisect.c:794

1716 #, c-format

1717 msgid ""

1718 "The merge base %s is new.\n"

@@ -1700,7 +1721,7 @@ msgstr ""

1721 "Dasar penggabungan %s baru.\n"

1722 "Properti telah berubah antara %s dan [%s].\n"

1723

1703 -#: bisect.c:801

1724 +#: bisect.c:799

1725 #, c-format

1726 msgid ""

1727 "The merge base %s is %s.\n"

@@ -1709,7 +1730,7 @@ msgstr ""

1730 "Dasar penggabungan %s adalah %s.\n"

1731 "Ini berarti komit '%s' pertama adalah di antara %s dan [%s].\n"

1732

1712 -#: bisect.c:809

1733 +#: bisect.c:807

1734 #, c-format

1735 msgid ""

1736 "Some %s revs are not ancestors of the %s rev.\n"

@@ -1720,7 +1741,7 @@ msgstr ""

1741 "git bisect tidak dapat bekerja dengan benar pada kasus ini.\n"

1742 "Mungkin Anda salah mengira revisi %s dan %s?\n"

1743

1723 -#: bisect.c:822

1744 +#: bisect.c:820

1745 #, c-format

1746 msgid ""

1747 "the merge base between %s and [%s] must be skipped.\n"

@@ -1731,36 +1752,36 @@ msgstr ""

1752 "Jadi kami tidak dapat yakin komit %s pertama di antara %s dan %s.\n"

1753 "Kami tetap lanjutkan."

1754

1734 -#: bisect.c:861

1755 +#: bisect.c:859

1756 #, c-format

1757 msgid "Bisecting: a merge base must be tested\n"

1758 msgstr "Membagi dua: dasar penggabungan harus diuji\n"

1759

1739 -#: bisect.c:911

1760 +#: bisect.c:909

1761 #, c-format

1762 msgid "a %s revision is needed"

1763 msgstr "sebuah revisi %s diperlukan"

1764

1744 -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298

1765 +#: bisect.c:939

1766 #, c-format

1767 msgid "could not create file '%s'"

1768 msgstr "tidak dapat membuat berkas '%s'"

1769

1749 -#: bisect.c:987 builtin/merge.c:153

1770 +#: bisect.c:985 builtin/merge.c:154

1771 #, c-format

1772 msgid "could not read file '%s'"

1773 msgstr "tidak dapat membaca berkas '%s'"

1774

1754 -#: bisect.c:1027

1775 +#: bisect.c:1025

1776 msgid "reading bisect refs failed"

1777 msgstr "gagal membaca berkas referensi bagi dua"

1778

1758 -#: bisect.c:1057

1779 +#: bisect.c:1055

1780 #, c-format

1781 msgid "%s was both %s and %s\n"

1782 msgstr "%s sama-sama %s dan %s\n"

1783

1763 -#: bisect.c:1066

1784 +#: bisect.c:1064

1785 #, c-format

1786 msgid ""

1787 "No testable commit found.\n"

@@ -1769,7 +1790,7 @@ msgstr ""

1790 "Tidak ada komit yang bisa diuji ditemukan.\n"

1791 "Mungkin Anda mulai dengan argumen jalur jelek?\n"

1792

1772 -#: bisect.c:1095

1793 +#: bisect.c:1093

1794 #, c-format

1795 msgid "(roughly %d step)"

1796 msgid_plural "(roughly %d steps)"

@@ -1779,7 +1800,7 @@ msgstr[1] "(kira-kira %d langkah)"

1800 #. TRANSLATORS: the last %s will be replaced with "(roughly %d

1801 #. steps)" translation.

1802 #.

1782 -#: bisect.c:1101

1803 +#: bisect.c:1099

1804 #, c-format

1805 msgid "Bisecting: %d revision left to test after this %s\n"

1806 msgid_plural "Bisecting: %d revisions left to test after this %s\n"

@@ -1799,11 +1820,12 @@ msgid "--reverse and --first-parent together require specified latest commit"

1820 msgstr ""

1821 "--reverse dan --first-parent bersama-sama butuh komit terbaru yang disebutkan"

1822

1802 -#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333

1803 -#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414

1804 -#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346

1805 -#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806

1806 -#: builtin/pack-objects.c:3821 builtin/shortlog.c:255

1823 +#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041

1824 +#: sequencer.c:2348 sequencer.c:4900 submodule.c:883 builtin/commit.c:1114

1825 +#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056

1826 +#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373

1827 +#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790

1828 +#: builtin/shortlog.c:255

1829 msgid "revision walk setup failed"

1830 msgstr "persiapan jalan revisi gagal"

1831

@@ -1951,99 +1973,99 @@ msgstr ""

1973 #: bundle.c:44

1974 #, c-format

1975 msgid "unrecognized bundle hash algorithm: %s"

1954 -msgstr ""

1976 +msgstr "algoritma hash bundel tidak dikenal: %s"

1977

1978 #: bundle.c:48

1979 #, c-format

1980 msgid "unknown capability '%s'"

1959 -msgstr ""

1981 +msgstr "kapabilitas '%s' tidak dikenal"

1982

1983 #: bundle.c:74

1984 #, c-format

1985 msgid "'%s' does not look like a v2 or v3 bundle file"

1964 -msgstr ""

1986 +msgstr "'%s' tidak terlihat seperti berkas bundel v2 atau v3"

1987

1988 #: bundle.c:113

1989 #, c-format

1990 msgid "unrecognized header: %s%s (%d)"

1969 -msgstr ""

1991 +msgstr "kepala tidak dikenal: %s%s (%d)"

1992

1971 -#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385

1972 -#: builtin/commit.c:861

1993 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2616 sequencer.c:3402

1994 +#: builtin/commit.c:862

1995 #, c-format

1996 msgid "could not open '%s'"

1975 -msgstr ""

1997 +msgstr "tidak dapat membuka '%s'"

1998

1999 #: bundle.c:198

2000 msgid "Repository lacks these prerequisite commits:"

1979 -msgstr ""

2001 +msgstr "Repositori kekurangan komit prasyarat berikut:"

2002

2003 #: bundle.c:201

2004 msgid "need a repository to verify a bundle"

1983 -msgstr ""

2005 +msgstr "perlu sebuah repositori untuk verifikasi bundel"

2006

2007 #: bundle.c:257

2008 #, c-format

2009 msgid "The bundle contains this ref:"

2010 msgid_plural "The bundle contains these %d refs:"

1989 -msgstr[0] ""

1990 -msgstr[1] ""

2011 +msgstr[0] "Bundel berisi referensi ini:"

2012 +msgstr[1] "Bundel berisi %d referensi berikut:"

2013

2014 #: bundle.c:264

2015 msgid "The bundle records a complete history."

1994 -msgstr ""

2016 +msgstr "Bundel merekam riwayat penuh."

2017

2018 #: bundle.c:266

2019 #, c-format

2020 msgid "The bundle requires this ref:"

2021 msgid_plural "The bundle requires these %d refs:"

2000 -msgstr[0] ""

2001 -msgstr[1] ""

2022 +msgstr[0] "Bundel membutuhkan referensi ini:"

2023 +msgstr[1] "Bundel membutuhkan %d referensi berikut:"

2024

2025 #: bundle.c:333

2026 msgid "unable to dup bundle descriptor"

2005 -msgstr ""

2027 +msgstr "tidak dapat men-dup pendeskripsi bundel"

2028

2029 #: bundle.c:340

2030 msgid "Could not spawn pack-objects"

2009 -msgstr ""

2031 +msgstr "Tidak dapat menghidupkan pack-objects"

2032

2033 #: bundle.c:351

2034 msgid "pack-objects died"

2013 -msgstr ""

2035 +msgstr "pack-objects mati"

2036

2037 #: bundle.c:400

2038 #, c-format

2039 msgid "ref '%s' is excluded by the rev-list options"

2018 -msgstr ""

2040 +msgstr "referensi '%s' dikecualikan oleh opsi rev-list"

2041

2042 #: bundle.c:504

2043 #, c-format

2044 msgid "unsupported bundle version %d"

2023 -msgstr ""

2045 +msgstr "versi bundle %d tidak didukung"

2046

2047 #: bundle.c:506

2048 #, c-format

2049 msgid "cannot write bundle version %d with algorithm %s"

2028 -msgstr ""

2050 +msgstr "tidak dapat menulis versi bundel %d dengan algoritma %s"

2051

2030 -#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396

2052 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399

2053 #, c-format

2054 msgid "unrecognized argument: %s"

2033 -msgstr ""

2055 +msgstr "argumen tidak dikenal: %s"

2056

2057 #: bundle.c:553

2058 msgid "Refusing to create empty bundle."

2037 -msgstr ""

2059 +msgstr "Menolak memuat bundel kosong."

2060

2061 #: bundle.c:563

2062 #, c-format

2063 msgid "cannot create '%s'"

2042 -msgstr ""

2064 +msgstr "tidak dapat membuat '%s'"

2065

2066 #: bundle.c:588

2067 msgid "index-pack died"

2046 -msgstr ""

2068 +msgstr "index-pack mati"

2069

2070 #: chunk-format.c:117

2071 msgid "terminating chunk id appears earlier than expected"

@@ -2069,7 +2091,7 @@ msgstr ""

2091 msgid "invalid color value: %.*s"

2092 msgstr ""

2093

2072 -#: commit-graph.c:204 midx.c:47

2094 +#: commit-graph.c:204 midx.c:51

2095 msgid "invalid hash version"

2096 msgstr ""

2097

@@ -2114,217 +2136,217 @@ msgstr ""

2136 msgid "unable to find all commit-graph files"

2137 msgstr ""

2138

2117 -#: commit-graph.c:745 commit-graph.c:782

2139 +#: commit-graph.c:746 commit-graph.c:783

2140 msgid "invalid commit position. commit-graph is likely corrupt"

2141 msgstr ""

2142

2121 -#: commit-graph.c:766

2143 +#: commit-graph.c:767

2144 #, c-format

2145 msgid "could not find commit %s"

2146 msgstr ""

2147

2126 -#: commit-graph.c:799

2148 +#: commit-graph.c:800

2149 msgid "commit-graph requires overflow generation data but has none"

2150 msgstr ""

2151

2130 -#: commit-graph.c:1075 builtin/am.c:1341

2152 +#: commit-graph.c:1105 builtin/am.c:1342

2153 #, c-format

2154 msgid "unable to parse commit %s"

2155 msgstr ""

2156

2135 -#: commit-graph.c:1337 builtin/pack-objects.c:3057

2157 +#: commit-graph.c:1367 builtin/pack-objects.c:3070

2158 #, c-format

2159 msgid "unable to get type of object %s"

2160 msgstr ""

2161

2140 -#: commit-graph.c:1368

2162 +#: commit-graph.c:1398

2163 msgid "Loading known commits in commit graph"

2164 msgstr ""

2165

2144 -#: commit-graph.c:1385

2166 +#: commit-graph.c:1415

2167 msgid "Expanding reachable commits in commit graph"

2168 msgstr ""

2169

2148 -#: commit-graph.c:1405

2170 +#: commit-graph.c:1435

2171 msgid "Clearing commit marks in commit graph"

2172 msgstr ""

2173

2152 -#: commit-graph.c:1424

2174 +#: commit-graph.c:1454

2175 msgid "Computing commit graph topological levels"

2176 msgstr ""

2177

2156 -#: commit-graph.c:1477

2178 +#: commit-graph.c:1507

2179 msgid "Computing commit graph generation numbers"

2180 msgstr ""

2181

2160 -#: commit-graph.c:1558

2182 +#: commit-graph.c:1588

2183 msgid "Computing commit changed paths Bloom filters"

2184 msgstr ""

2185

2164 -#: commit-graph.c:1635

2186 +#: commit-graph.c:1665

2187 msgid "Collecting referenced commits"

2188 msgstr ""

2189

2168 -#: commit-graph.c:1660

2190 +#: commit-graph.c:1690

2191 #, c-format

2192 msgid "Finding commits for commit graph in %d pack"

2193 msgid_plural "Finding commits for commit graph in %d packs"

2194 msgstr[0] ""

2195 msgstr[1] ""

2196

2175 -#: commit-graph.c:1673

2197 +#: commit-graph.c:1703

2198 #, c-format

2199 msgid "error adding pack %s"

2200 msgstr ""

2201

2180 -#: commit-graph.c:1677

2202 +#: commit-graph.c:1707

2203 #, c-format

2204 msgid "error opening index for %s"

2205 msgstr ""

2206

2185 -#: commit-graph.c:1714

2207 +#: commit-graph.c:1744

2208 msgid "Finding commits for commit graph among packed objects"

2209 msgstr ""

2210

2189 -#: commit-graph.c:1732

2211 +#: commit-graph.c:1762

2212 msgid "Finding extra edges in commit graph"

2213 msgstr ""

2214

2193 -#: commit-graph.c:1781

2215 +#: commit-graph.c:1811

2216 msgid "failed to write correct number of base graph ids"

2217 msgstr ""

2218

2197 -#: commit-graph.c:1812 midx.c:911

2219 +#: commit-graph.c:1842 midx.c:1146

2220 #, c-format

2221 msgid "unable to create leading directories of %s"

2222 msgstr ""

2223

2202 -#: commit-graph.c:1825

2224 +#: commit-graph.c:1855

2225 msgid "unable to create temporary graph layer"

2226 msgstr ""

2227

2206 -#: commit-graph.c:1830

2228 +#: commit-graph.c:1860

2229 #, c-format

2230 msgid "unable to adjust shared permissions for '%s'"

2231 msgstr ""

2232

2211 -#: commit-graph.c:1887

2233 +#: commit-graph.c:1917

2234 #, c-format

2235 msgid "Writing out commit graph in %d pass"

2236 msgid_plural "Writing out commit graph in %d passes"

2237 msgstr[0] ""

2238 msgstr[1] ""

2239

2218 -#: commit-graph.c:1923

2240 +#: commit-graph.c:1953

2241 msgid "unable to open commit-graph chain file"

2242 msgstr ""

2243

2222 -#: commit-graph.c:1939

2244 +#: commit-graph.c:1969

2245 msgid "failed to rename base commit-graph file"

2246 msgstr ""

2247

2226 -#: commit-graph.c:1959

2248 +#: commit-graph.c:1989

2249 msgid "failed to rename temporary commit-graph file"

2250 msgstr ""

2251

2230 -#: commit-graph.c:2092

2252 +#: commit-graph.c:2122

2253 msgid "Scanning merged commits"

2254 msgstr ""

2255

2234 -#: commit-graph.c:2136

2256 +#: commit-graph.c:2166

2257 msgid "Merging commit-graph"

2258 msgstr ""

2259

2238 -#: commit-graph.c:2244

2260 +#: commit-graph.c:2274

2261 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"

2262 msgstr ""

2263

2242 -#: commit-graph.c:2351

2264 +#: commit-graph.c:2381

2265 msgid "too many commits to write graph"

2266 msgstr ""

2267

2246 -#: commit-graph.c:2449

2268 +#: commit-graph.c:2479

2269 msgid "the commit-graph file has incorrect checksum and is likely corrupt"

2270 msgstr ""

2271

2250 -#: commit-graph.c:2459

2272 +#: commit-graph.c:2489

2273 #, c-format

2274 msgid "commit-graph has incorrect OID order: %s then %s"

2275 msgstr ""

2276

2255 -#: commit-graph.c:2469 commit-graph.c:2484

2277 +#: commit-graph.c:2499 commit-graph.c:2514

2278 #, c-format

2279 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"

2280 msgstr ""

2281

2260 -#: commit-graph.c:2476

2282 +#: commit-graph.c:2506

2283 #, c-format

2284 msgid "failed to parse commit %s from commit-graph"

2285 msgstr ""

2286

2265 -#: commit-graph.c:2494

2287 +#: commit-graph.c:2524

2288 msgid "Verifying commits in commit graph"

2289 msgstr ""

2290

2269 -#: commit-graph.c:2509

2291 +#: commit-graph.c:2539

2292 #, c-format

2293 msgid "failed to parse commit %s from object database for commit-graph"

2294 msgstr ""

2295

2274 -#: commit-graph.c:2516

2296 +#: commit-graph.c:2546

2297 #, c-format

2298 msgid "root tree OID for commit %s in commit-graph is %s != %s"

2299 msgstr ""

2300

2279 -#: commit-graph.c:2526

2301 +#: commit-graph.c:2556

2302 #, c-format

2303 msgid "commit-graph parent list for commit %s is too long"

2304 msgstr ""

2305

2284 -#: commit-graph.c:2535

2306 +#: commit-graph.c:2565

2307 #, c-format

2308 msgid "commit-graph parent for %s is %s != %s"

2309 msgstr ""

2310

2289 -#: commit-graph.c:2549

2311 +#: commit-graph.c:2579

2312 #, c-format

2313 msgid "commit-graph parent list for commit %s terminates early"

2314 msgstr ""

2315

2294 -#: commit-graph.c:2554

2316 +#: commit-graph.c:2584

2317 #, c-format

2318 msgid ""

2319 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"

2320 msgstr ""

2321

2300 -#: commit-graph.c:2558

2322 +#: commit-graph.c:2588

2323 #, c-format

2324 msgid ""

2325 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"

2326 msgstr ""

2327

2306 -#: commit-graph.c:2575

2328 +#: commit-graph.c:2605

2329 #, c-format

2330 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"

2331 msgstr ""

2332

2311 -#: commit-graph.c:2581

2333 +#: commit-graph.c:2611

2334 #, c-format

2335 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"

2336 msgstr ""

2337

2316 -#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417

2317 -#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457

2338 +#: commit.c:53 sequencer.c:3105 builtin/am.c:373 builtin/am.c:418

2339 +#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457

2340 #, c-format

2341 msgid "could not parse %s"

2342 msgstr ""

2343

2322 -#: commit.c:54

2344 +#: commit.c:55

2345 #, c-format

2346 msgid "%s %s is not a commit!"

2347 msgstr ""

2348

2327 -#: commit.c:194

2349 +#: commit.c:196

2350 msgid ""

2351 "Support for <GIT_DIR>/info/grafts is deprecated\n"

2352 "and will be removed in a future Git version.\n"

@@ -2336,27 +2358,27 @@ msgid ""

2358 "\"git config advice.graftFileDeprecated false\""

2359 msgstr ""

2360

2339 -#: commit.c:1237

2361 +#: commit.c:1239

2362 #, c-format

2363 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

2364 msgstr ""

2365

2344 -#: commit.c:1241

2366 +#: commit.c:1243

2367 #, c-format

2368 msgid "Commit %s has a bad GPG signature allegedly by %s."

2369 msgstr ""

2370

2349 -#: commit.c:1244

2371 +#: commit.c:1246

2372 #, c-format

2373 msgid "Commit %s does not have a GPG signature."

2374 msgstr ""

2375

2354 -#: commit.c:1247

2376 +#: commit.c:1249

2377 #, c-format

2378 msgid "Commit %s has a good GPG signature by %s\n"

2379 msgstr ""

2380

2359 -#: commit.c:1501

2381 +#: commit.c:1503

2382 msgid ""

2383 "Warning: commit message did not conform to UTF-8.\n"

2384 "You may want to amend it after fixing the message, or set the config\n"

@@ -2367,7 +2389,7 @@ msgstr ""

2389 msgid "memory exhausted"

2390 msgstr ""

2391

2370 -#: config.c:126

2392 +#: config.c:125

2393 #, c-format

2394 msgid ""

2395 "exceeded maximum include depth (%d) while including\n"

@@ -2382,35 +2404,35 @@ msgstr ""

2404 "\t%s\n"

2405 "Ini mungkin disebabkan oleh include sirkular."

2406

2385 -#: config.c:142

2407 +#: config.c:141

2408 #, c-format

2409 msgid "could not expand include path '%s'"

2410 msgstr "tidak dapat menjabarkan jalur include '%s'"

2411

2390 -#: config.c:153

2412 +#: config.c:152

2413 msgid "relative config includes must come from files"

2414 msgstr "include konfigurasi relatif harus dari berkas"

2415

2394 -#: config.c:199

2416 +#: config.c:201

2417 msgid "relative config include conditionals must come from files"

2418 msgstr "kondisional include konfigurasi relative harus dari berkas"

2419

2398 -#: config.c:396

2420 +#: config.c:398

2421 #, c-format

2422 msgid "invalid config format: %s"

2423 msgstr "format konfigurasi tidak valid: %s"

2424

2403 -#: config.c:400

2425 +#: config.c:402

2426 #, c-format

2427 msgid "missing environment variable name for configuration '%.*s'"

2428 msgstr "nama variabel lingkungan untuk konfigurasi hilang '%.*s'"

2429

2408 -#: config.c:405

2430 +#: config.c:407

2431 #, c-format

2432 msgid "missing environment variable '%s' for configuration '%.*s'"

2433 msgstr "variabel lingkungan '%s' untuk konfigurasi '%.*s'"

2434

2413 -#: config.c:442

2435 +#: config.c:443

2436 #, c-format

2437 msgid "key does not contain a section: %s"

2438 msgstr "kunci tidak berisi bagian: %s"

@@ -2420,298 +2442,298 @@ msgstr "kunci tidak berisi bagian: %s"

2442 msgid "key does not contain variable name: %s"

2443 msgstr "kunci tidak berisi nama variabel: %s"

2444

2423 -#: config.c:472 sequencer.c:2785

2445 +#: config.c:470 sequencer.c:2802

2446 #, c-format

2447 msgid "invalid key: %s"

2448 msgstr "kunci tidak valid: %s"

2449

2428 -#: config.c:478

2450 +#: config.c:475

2451 #, c-format

2452 msgid "invalid key (newline): %s"

2453 msgstr "kunci tidak valid (barisbaru): %s"

2454

2433 -#: config.c:511

2455 +#: config.c:495

2456 msgid "empty config key"

2457 msgstr "kunci konfigurasi kosong"

2458

2437 -#: config.c:529 config.c:541

2459 +#: config.c:513 config.c:525

2460 #, c-format

2461 msgid "bogus config parameter: %s"

2462 msgstr "parameter konfigurasi gadungan: %s"

2463

2442 -#: config.c:555 config.c:572 config.c:579 config.c:588

2464 +#: config.c:539 config.c:556 config.c:563 config.c:572

2465 #, c-format

2466 msgid "bogus format in %s"

2467 msgstr "format gadungan dalam %s"

2468

2447 -#: config.c:622

2469 +#: config.c:606

2470 #, c-format

2471 msgid "bogus count in %s"

2472 msgstr "hitungan gadungan dalam %s"

2473

2452 -#: config.c:626

2474 +#: config.c:610

2475 #, c-format

2476 msgid "too many entries in %s"

2477 msgstr "terlalu banyak entri di %s"

2478

2457 -#: config.c:636

2479 +#: config.c:620

2480 #, c-format

2481 msgid "missing config key %s"

2482 msgstr "kunci konfigurasi %s hilang"

2483

2462 -#: config.c:644

2484 +#: config.c:628

2485 #, c-format

2486 msgid "missing config value %s"

2487 msgstr "nilai konfigurasi %s hilang"

2488

2467 -#: config.c:995

2489 +#: config.c:979

2490 #, c-format

2491 msgid "bad config line %d in blob %s"

2492 msgstr "baris konfigurasi %d jelek dalam blob %s"

2493

2472 -#: config.c:999

2494 +#: config.c:983

2495 #, c-format

2496 msgid "bad config line %d in file %s"

2497 msgstr "baris konfigurasi %d jelek dalam berkas %s"

2498

2477 -#: config.c:1003

2499 +#: config.c:987

2500 #, c-format

2501 msgid "bad config line %d in standard input"

2502 msgstr "baris konfigurasi %d jelek pada masukan standar"

2503

2482 -#: config.c:1007

2504 +#: config.c:991

2505 #, c-format

2506 msgid "bad config line %d in submodule-blob %s"

2507 msgstr "baris konfigurasi %d jelek dalam blob submodul %s"

2508

2487 -#: config.c:1011

2509 +#: config.c:995

2510 #, c-format

2511 msgid "bad config line %d in command line %s"

2512 msgstr "baris konfigurasi %d jelek pada baris perintah %s"

2513

2492 -#: config.c:1015

2514 +#: config.c:999

2515 #, c-format

2516 msgid "bad config line %d in %s"

2517 msgstr "baris konfigurasi %d jelek dalam %s"

2518

2497 -#: config.c:1152

2519 +#: config.c:1136

2520 msgid "out of range"

2521 msgstr "di luar rentang"

2522

2501 -#: config.c:1152

2523 +#: config.c:1136

2524 msgid "invalid unit"

2525 msgstr "satuan tidak valid"

2526

2505 -#: config.c:1153

2527 +#: config.c:1137

2528 #, c-format

2529 msgid "bad numeric config value '%s' for '%s': %s"

2530 msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s': %s"

2531

2510 -#: config.c:1163

2532 +#: config.c:1147

2533 #, c-format

2534 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"

2535 msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s' dalam blob %s: %s"

2536

2515 -#: config.c:1166

2537 +#: config.c:1150

2538 #, c-format

2539 msgid "bad numeric config value '%s' for '%s' in file %s: %s"

2540 msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s' dalam berkas %s: %s"

2541

2520 -#: config.c:1169

2542 +#: config.c:1153

2543 #, c-format

2544 msgid "bad numeric config value '%s' for '%s' in standard input: %s"

2545 msgstr ""

2546 "nilai konfigurasi numerik '%s' jelek untuk '%s' pada masukan standar: %s"

2547

2526 -#: config.c:1172

2548 +#: config.c:1156

2549 #, c-format

2550 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"

2551 msgstr ""

2552 "nilai konfigurasi numerik '%s' jelek untuk '%s' dalam blob submodul %s: %s"

2553

2532 -#: config.c:1175

2554 +#: config.c:1159

2555 #, c-format

2556 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"

2557 msgstr ""

2558 "nilai konfigurasi numerik '%s' jelek untuk '%s' pada baris perintah %s: %s"

2559

2538 -#: config.c:1178

2560 +#: config.c:1162

2561 #, c-format

2562 msgid "bad numeric config value '%s' for '%s' in %s: %s"

2563 msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s' dalam %s: %s"

2564

2543 -#: config.c:1257

2565 +#: config.c:1241

2566 #, c-format

2567 msgid "bad boolean config value '%s' for '%s'"

2568 msgstr "nilai konfigurasi boolean '%s' jelek untuk '%s'"

2569

2548 -#: config.c:1275

2570 +#: config.c:1259

2571 #, c-format

2572 msgid "failed to expand user dir in: '%s'"

2573 msgstr "gagal menjabarkan direktori pengguna di: '%s'"

2574

2553 -#: config.c:1284

2575 +#: config.c:1268

2576 #, c-format

2577 msgid "'%s' for '%s' is not a valid timestamp"

2578 msgstr "'%s' untuk '%s' bukan stempel waktu valid"

2579

2558 -#: config.c:1377

2580 +#: config.c:1361

2581 #, c-format

2582 msgid "abbrev length out of range: %d"

2583 msgstr "panjang singkatan di luar rentang: %d"

2584

2563 -#: config.c:1391 config.c:1402

2585 +#: config.c:1375 config.c:1386

2586 #, c-format

2587 msgid "bad zlib compression level %d"

2588 msgstr "level kompresi zlib jelek %d"

2589

2568 -#: config.c:1494

2590 +#: config.c:1476

2591 msgid "core.commentChar should only be one character"

2592 msgstr "core.commentChar harusnya hanya satu karakter"

2593

2572 -#: config.c:1527

2594 +#: config.c:1509

2595 #, c-format

2596 msgid "invalid mode for object creation: %s"

2597 msgstr "mode tidak valid untuk pembuatan objek: %s"

2598

2577 -#: config.c:1599

2599 +#: config.c:1581

2600 #, c-format

2601 msgid "malformed value for %s"

2602 msgstr "nilai rusak untuk %s"

2603

2582 -#: config.c:1625

2604 +#: config.c:1607

2605 #, c-format

2606 msgid "malformed value for %s: %s"

2607 msgstr "nilai rusak untuk %s: %s"

2608

2587 -#: config.c:1626

2609 +#: config.c:1608

2610 msgid "must be one of nothing, matching, simple, upstream or current"

2611 msgstr "harus salah satu dari nothing, matching, simple, upstream atau current"

2612

2591 -#: config.c:1687 builtin/pack-objects.c:4084

2613 +#: config.c:1669 builtin/pack-objects.c:4053

2614 #, c-format

2615 msgid "bad pack compression level %d"

2616 msgstr "level kompresi pak jelek %d"

2617

2596 -#: config.c:1809

2618 +#: config.c:1792

2619 #, c-format

2620 msgid "unable to load config blob object '%s'"

2621 msgstr "tidak dapat memuat objek blob konfigurasi '%s'"

2622

2601 -#: config.c:1812

2623 +#: config.c:1795

2624 #, c-format

2625 msgid "reference '%s' does not point to a blob"

2626 msgstr "referensi '%s' tidak menunjuk pada sebuah blob"

2627

2606 -#: config.c:1829

2628 +#: config.c:1813

2629 #, c-format

2630 msgid "unable to resolve config blob '%s'"

2631 msgstr "tidak dapat menguraikan blob konfigurasi '%s'"

2632

2611 -#: config.c:1874

2633 +#: config.c:1858

2634 #, c-format

2635 msgid "failed to parse %s"

2636 msgstr "gagal menguraikan %s"

2637

2616 -#: config.c:1930

2638 +#: config.c:1914

2639 msgid "unable to parse command-line config"

2640 msgstr "gagal menguraikan konfigurasi baris perintah"

2641

2620 -#: config.c:2294

2642 +#: config.c:2282

2643 msgid "unknown error occurred while reading the configuration files"

2644 msgstr "error tidak diketahui ketika membaca berkas konfigurasi"

2645

2624 -#: config.c:2468

2646 +#: config.c:2456

2647 #, c-format

2648 msgid "Invalid %s: '%s'"

2649 msgstr "%s tidak valid: '%s'"

2650

2629 -#: config.c:2513

2651 +#: config.c:2501

2652 #, c-format

2653 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"

2654 msgstr "nilai splitIndex.maxPercentChange '%d' harusnya diantara 0 dan 100"

2655

2634 -#: config.c:2559

2656 +#: config.c:2547

2657 #, c-format

2658 msgid "unable to parse '%s' from command-line config"

2659 msgstr "tidak dapat menguraikan '%s' dari konfigurasi baris perintah"

2660

2639 -#: config.c:2561

2661 +#: config.c:2549

2662 #, c-format

2663 msgid "bad config variable '%s' in file '%s' at line %d"

2664 msgstr "variabel konfigurasi '%s' jelek dalam berkas '%s' pada baris %d"

2665

2644 -#: config.c:2645

2666 +#: config.c:2633

2667 #, c-format

2668 msgid "invalid section name '%s'"

2669 msgstr "nama bagian '%s' tidak valid"

2670

2649 -#: config.c:2677

2671 +#: config.c:2665

2672 #, c-format

2673 msgid "%s has multiple values"

2674 msgstr "%s punya banyak nilai"

2675

2654 -#: config.c:2706

2676 +#: config.c:2694

2677 #, c-format

2678 msgid "failed to write new configuration file %s"

2679 msgstr "gagal menulis berkas konfigurasi baru %s"

2680

2659 -#: config.c:2958 config.c:3285

2681 +#: config.c:2946 config.c:3273

2682 #, c-format

2683 msgid "could not lock config file %s"

2684 msgstr "tidak dapat mengunci berkas konfigurasi %s"

2685

2664 -#: config.c:2969

2686 +#: config.c:2957

2687 #, c-format

2688 msgid "opening %s"

2689 msgstr "membuka %s"

2690

2669 -#: config.c:3006 builtin/config.c:361

2691 +#: config.c:2994 builtin/config.c:361

2692 #, c-format

2693 msgid "invalid pattern: %s"

2694 msgstr "pola tidak valid: %s"

2695

2674 -#: config.c:3031

2696 +#: config.c:3019

2697 #, c-format

2698 msgid "invalid config file %s"

2699 msgstr "berkas konfigurasi %s tidak valid"

2700

2679 -#: config.c:3044 config.c:3298

2701 +#: config.c:3032 config.c:3286

2702 #, c-format

2703 msgid "fstat on %s failed"

2704 msgstr "fstat pada %s gagal"

2705

2684 -#: config.c:3055

2706 +#: config.c:3043

2707 #, c-format

2708 msgid "unable to mmap '%s'%s"

2709 msgstr "tidak dapat me-mmap '%s'%s"

2710

2689 -#: config.c:3065 config.c:3303

2711 +#: config.c:3053 config.c:3291

2712 #, c-format

2713 msgid "chmod on %s failed"

2714 msgstr "chmod pada %s gagal"

2715

2694 -#: config.c:3150 config.c:3400

2716 +#: config.c:3138 config.c:3388

2717 #, c-format

2718 msgid "could not write config file %s"

2719 msgstr "tidak dapat menulis berkas konfigurasi %s"

2720

2699 -#: config.c:3184

2721 +#: config.c:3172

2722 #, c-format

2723 msgid "could not set '%s' to '%s'"

2724 msgstr "tidak dapat menyetel '%s' ke '%s'"

2725

2704 -#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

2726 +#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868

2727 #, c-format

2728 msgid "could not unset '%s'"

2729 msgstr "tidak dapat mem-batal setel '%s'"

2730

2709 -#: config.c:3276

2731 +#: config.c:3264

2732 #, c-format

2733 msgid "invalid section name: %s"

2734 msgstr "nama bagian tidak valid: %s"

2735

2714 -#: config.c:3443

2736 +#: config.c:3431

2737 #, c-format

2738 msgid "missing value for '%s'"

2739 msgstr "nilai hilang untuk '%s'"

@@ -2742,79 +2764,79 @@ msgstr ""

2764 msgid "expected flush after capabilities"

2765 msgstr ""

2766

2745 -#: connect.c:263

2767 +#: connect.c:265

2768 #, c-format

2769 msgid "ignoring capabilities after first line '%s'"

2770 msgstr ""

2771

2750 -#: connect.c:284

2772 +#: connect.c:286

2773 msgid "protocol error: unexpected capabilities^{}"

2774 msgstr ""

2775

2754 -#: connect.c:306

2776 +#: connect.c:308

2777 #, c-format

2778 msgid "protocol error: expected shallow sha-1, got '%s'"

2779 msgstr ""

2780

2759 -#: connect.c:308

2781 +#: connect.c:310

2782 msgid "repository on the other end cannot be shallow"

2783 msgstr ""

2784

2763 -#: connect.c:347

2785 +#: connect.c:349

2786 msgid "invalid packet"

2787 msgstr ""

2788

2767 -#: connect.c:367

2789 +#: connect.c:369

2790 #, c-format

2791 msgid "protocol error: unexpected '%s'"

2792 msgstr ""

2793

2772 -#: connect.c:497

2794 +#: connect.c:499

2795 #, c-format

2796 msgid "unknown object format '%s' specified by server"

2797 msgstr ""

2798

2777 -#: connect.c:526

2799 +#: connect.c:528

2800 #, c-format

2801 msgid "invalid ls-refs response: %s"

2802 msgstr ""

2803

2782 -#: connect.c:530

2804 +#: connect.c:532

2805 msgid "expected flush after ref listing"

2806 msgstr ""

2807

2786 -#: connect.c:533

2808 +#: connect.c:535

2809 msgid "expected response end packet after ref listing"

2810 msgstr ""

2811

2790 -#: connect.c:666

2812 +#: connect.c:670

2813 #, c-format

2814 msgid "protocol '%s' is not supported"

2815 msgstr ""

2816

2795 -#: connect.c:717

2817 +#: connect.c:721

2818 msgid "unable to set SO_KEEPALIVE on socket"

2819 msgstr ""

2820

2799 -#: connect.c:757 connect.c:820

2821 +#: connect.c:761 connect.c:824

2822 #, c-format

2823 msgid "Looking up %s ... "

2824 msgstr ""

2825

2804 -#: connect.c:761

2826 +#: connect.c:765

2827 #, c-format

2828 msgid "unable to look up %s (port %s) (%s)"

2829 msgstr ""

2830

2831 #. TRANSLATORS: this is the end of "Looking up %s ... "

2810 -#: connect.c:765 connect.c:836

2832 +#: connect.c:769 connect.c:840

2833 #, c-format

2834 msgid ""

2835 "done.\n"

2836 "Connecting to %s (port %s) ... "

2837 msgstr ""

2838

2817 -#: connect.c:787 connect.c:864

2839 +#: connect.c:791 connect.c:868

2840 #, c-format

2841 msgid ""

2842 "unable to connect to %s:\n"

@@ -2822,77 +2844,77 @@ msgid ""

2844 msgstr ""

2845

2846 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "

2825 -#: connect.c:793 connect.c:870

2847 +#: connect.c:797 connect.c:874

2848 msgid "done."

2849 msgstr ""

2850

2829 -#: connect.c:824

2851 +#: connect.c:828

2852 #, c-format

2853 msgid "unable to look up %s (%s)"

2854 msgstr ""

2855

2834 -#: connect.c:830

2856 +#: connect.c:834

2857 #, c-format

2858 msgid "unknown port %s"

2859 msgstr ""

2860

2839 -#: connect.c:967 connect.c:1299

2861 +#: connect.c:971 connect.c:1303

2862 #, c-format

2863 msgid "strange hostname '%s' blocked"

2864 msgstr ""

2865

2844 -#: connect.c:969

2866 +#: connect.c:973

2867 #, c-format

2868 msgid "strange port '%s' blocked"

2869 msgstr ""

2870

2849 -#: connect.c:979

2871 +#: connect.c:983

2872 #, c-format

2873 msgid "cannot start proxy %s"

2874 msgstr ""

2875

2854 -#: connect.c:1050

2876 +#: connect.c:1054

2877 msgid "no path specified; see 'git help pull' for valid url syntax"

2878 msgstr ""

2879

2858 -#: connect.c:1190

2880 +#: connect.c:1194

2881 msgid "newline is forbidden in git:// hosts and repo paths"

2882 msgstr ""

2883

2862 -#: connect.c:1247

2884 +#: connect.c:1251

2885 msgid "ssh variant 'simple' does not support -4"

2886 msgstr ""

2887

2866 -#: connect.c:1259

2888 +#: connect.c:1263

2889 msgid "ssh variant 'simple' does not support -6"

2890 msgstr ""

2891

2870 -#: connect.c:1276

2892 +#: connect.c:1280

2893 msgid "ssh variant 'simple' does not support setting port"

2894 msgstr ""

2895

2874 -#: connect.c:1388

2896 +#: connect.c:1392

2897 #, c-format

2898 msgid "strange pathname '%s' blocked"

2899 msgstr ""

2900

2879 -#: connect.c:1436

2901 +#: connect.c:1440

2902 msgid "unable to fork"

2903 msgstr ""

2904

2883 -#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45

2905 +#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45

2906 msgid "Checking connectivity"

2907 msgstr ""

2908

2887 -#: connected.c:120

2909 +#: connected.c:122

2910 msgid "Could not run 'git rev-list'"

2911 msgstr ""

2912

2891 -#: connected.c:144

2913 +#: connected.c:146

2914 msgid "failed write to rev-list"

2915 msgstr ""

2916

2895 -#: connected.c:149

2917 +#: connected.c:151

2918 msgid "failed to close rev-list's stdin"

2919 msgstr ""

2920

@@ -3026,17 +3048,17 @@ msgstr ""

3048 msgid "refusing to work with credential missing protocol field"

3049 msgstr ""

3050

3029 -#: credential.c:394

3051 +#: credential.c:395

3052 #, c-format

3053 msgid "url contains a newline in its %s component: %s"

3054 msgstr ""

3055

3034 -#: credential.c:438

3056 +#: credential.c:439

3057 #, c-format

3058 msgid "url has no scheme: %s"

3059 msgstr ""

3060

3039 -#: credential.c:511

3061 +#: credential.c:512

3062 #, c-format

3063 msgid "credential url cannot be parsed: %s"

3064 msgstr ""

@@ -3138,23 +3160,23 @@ msgstr ""

3160 msgid "unknown value for --diff-merges: %s"

3161 msgstr ""

3162

3141 -#: diff-lib.c:557

3163 +#: diff-lib.c:561

3164 msgid "--merge-base does not work with ranges"

3165 msgstr ""

3166

3145 -#: diff-lib.c:559

3167 +#: diff-lib.c:563

3168 msgid "--merge-base only works with commits"

3169 msgstr ""

3170

3149 -#: diff-lib.c:576

3171 +#: diff-lib.c:580

3172 msgid "unable to get HEAD"

3173 msgstr ""

3174

3153 -#: diff-lib.c:583

3175 +#: diff-lib.c:587

3176 msgid "no merge base found"

3177 msgstr ""

3178

3157 -#: diff-lib.c:585

3179 +#: diff-lib.c:589

3180 msgid "multiple merge bases found"

3181 msgstr ""

3182

@@ -3168,17 +3190,17 @@ msgid ""

3190 "tree"

3191 msgstr ""

3192

3171 -#: diff.c:156

3193 +#: diff.c:157

3194 #, c-format

3195 msgid " Failed to parse dirstat cut-off percentage '%s'\n"

3196 msgstr " Gagal mengurai persentase potongan dirstat '%s'\n"

3197

3176 -#: diff.c:161

3198 +#: diff.c:162

3199 #, c-format

3200 msgid " Unknown dirstat parameter '%s'\n"

3201 msgstr " Parameter dirstat tidak ditketahui '%s'\n"

3202

3181 -#: diff.c:297

3203 +#: diff.c:298

3204 msgid ""

3205 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "

3206 "'dimmed-zebra', 'plain'"

@@ -3186,7 +3208,7 @@ msgstr ""

3208 "Setelan warna berpindah harus salah satu dari 'no', 'default', 'blocks', "

3209 "'dimmed-zebra', 'plain'"

3210

3189 -#: diff.c:325

3211 +#: diff.c:326

3212 #, c-format

3213 msgid ""

3214 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "

@@ -3196,7 +3218,7 @@ msgstr ""

3218 "space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"

3219 "change'"

3220

3199 -#: diff.c:333

3221 +#: diff.c:334

3222 msgid ""

3223 "color-moved-ws: allow-indentation-change cannot be combined with other "

3224 "whitespace modes"

@@ -3204,12 +3226,12 @@ msgstr ""

3226 "color-moved-ws: allow-indentation-change tidak dapat digabungkan dengan mode "

3227 "spasi yang lainnya"

3228

3207 -#: diff.c:410

3229 +#: diff.c:411

3230 #, c-format

3231 msgid "Unknown value for 'diff.submodule' config variable: '%s'"

3232 msgstr "Nilai tidak dikenal untuk variabel konfigurasi 'diff.submodule': '%s'"

3233

3212 -#: diff.c:470

3234 +#: diff.c:471

3235 #, c-format

3236 msgid ""

3237 "Found errors in 'diff.dirstat' config variable:\n"

@@ -3218,26 +3240,26 @@ msgstr ""

3240 "Ditemukan error dalam variable konfigurasi 'diff.dirstat':\n"

3241 "%s"

3242

3221 -#: diff.c:4282

3243 +#: diff.c:4290

3244 #, c-format

3245 msgid "external diff died, stopping at %s"

3246 msgstr "diff eksternal mati, berhenti pada %s"

3247

3226 -#: diff.c:4634

3248 +#: diff.c:4642

3249 msgid "--name-only, --name-status, --check and -s are mutually exclusive"

3250 msgstr "--name-only, --name-status, --check dan -s saling eksklusif"

3251

3230 -#: diff.c:4637

3252 +#: diff.c:4645

3253 msgid "-G, -S and --find-object are mutually exclusive"

3254 msgstr "-G, -S dan --find-object saling eksklusif"

3255

3234 -#: diff.c:4640

3256 +#: diff.c:4648

3257 msgid ""

3258 "-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"

3259 msgstr ""

3260 "-G dan --pickaxe-regex saling eksklusif, gunakan --pickaxe-regex dengan -S"

3261

3240 -#: diff.c:4643

3262 +#: diff.c:4651

3263 msgid ""

3264 "--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "

3265 "with -G and -S"

@@ -3245,22 +3267,22 @@ msgstr ""

3267 "--pickaxe-all dan --find-object saling eksklusif, gunakan --pickaxe-all "

3268 "dengan -G dan -S"

3269

3248 -#: diff.c:4722

3270 +#: diff.c:4730

3271 msgid "--follow requires exactly one pathspec"

3272 msgstr "--follow butuh tepatnya satu spek jalur"

3273

3252 -#: diff.c:4770

3274 +#: diff.c:4778

3275 #, c-format

3276 msgid "invalid --stat value: %s"

3277 msgstr "nilai --stat tidak valid: %s"

3278

3257 -#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318

3258 -#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180

3279 +#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326

3280 +#: parse-options.c:217 parse-options.c:221

3281 #, c-format

3282 msgid "%s expects a numerical value"

3283 msgstr "%s harap nilai numerik"

3284

3263 -#: diff.c:4807

3285 +#: diff.c:4815

3286 #, c-format

3287 msgid ""

3288 "Failed to parse --dirstat/-X option parameter:\n"

@@ -3269,42 +3291,42 @@ msgstr ""

3291 "Gagal menguraikan parameter opsi --dirstat/-X:\n"

3292 "%s"

3293

3272 -#: diff.c:4892

3294 +#: diff.c:4900

3295 #, c-format

3296 msgid "unknown change class '%c' in --diff-filter=%s"

3297 msgstr "kelas perubahan '%c' tidak dikenal dalam --diff-filter=%s"

3298

3277 -#: diff.c:4916

3299 +#: diff.c:4924

3300 #, c-format

3301 msgid "unknown value after ws-error-highlight=%.*s"

3302 msgstr "nilai tidak dikenal setelah ws-error-highlight=%.*s"

3303

3282 -#: diff.c:4930

3304 +#: diff.c:4938

3305 #, c-format

3306 msgid "unable to resolve '%s'"

3307 msgstr "tidak dapat menguraikan '%s'"

3308

3287 -#: diff.c:4980 diff.c:4986

3309 +#: diff.c:4988 diff.c:4994

3310 #, c-format

3311 msgid "%s expects <n>/<m> form"

3312 msgstr "%s butuh bentuk <n>/<m>"

3313

3292 -#: diff.c:4998

3314 +#: diff.c:5006

3315 #, c-format

3316 msgid "%s expects a character, got '%s'"

3317 msgstr "%s butuh sebuah karakter, dapat '%s'"

3318

3297 -#: diff.c:5019

3319 +#: diff.c:5027

3320 #, c-format

3321 msgid "bad --color-moved argument: %s"

3322 msgstr "argumen --color-moved jelek: %s"

3323

3302 -#: diff.c:5038

3324 +#: diff.c:5046

3325 #, c-format

3326 msgid "invalid mode '%s' in --color-moved-ws"

3327 msgstr "mode tidak valid '%s' dalam --color-moved-ws"

3328

3307 -#: diff.c:5078

3329 +#: diff.c:5086

3330 msgid ""

3331 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "

3332 "\"histogram\""

@@ -3312,162 +3334,162 @@ msgstr ""

3334 "opsi diff-algorithm terima \"myers\", \"minimal\", \"patience\" dan "

3335 "\"histogram\""

3336

3315 -#: diff.c:5114 diff.c:5134

3337 +#: diff.c:5122 diff.c:5142

3338 #, c-format

3339 msgid "invalid argument to %s"

3340 msgstr "argumen tidak valid ke %s"

3341

3320 -#: diff.c:5238

3342 +#: diff.c:5246

3343 #, c-format

3344 msgid "invalid regex given to -I: '%s'"

3345 msgstr "regex tidak valid diberikan ke -I: '%s'"

3346

3325 -#: diff.c:5287

3347 +#: diff.c:5295

3348 #, c-format

3349 msgid "failed to parse --submodule option parameter: '%s'"

3350 msgstr "gagal menguraikan parameter opsi --submodule: '%s'"

3351

3330 -#: diff.c:5343

3352 +#: diff.c:5351

3353 #, c-format

3354 msgid "bad --word-diff argument: %s"

3355 msgstr "argumen --word-diff jelek: %s"

3356

3335 -#: diff.c:5379

3357 +#: diff.c:5387

3358 msgid "Diff output format options"

3359 msgstr "Opsi format keluaran diff"

3360

3339 -#: diff.c:5381 diff.c:5387

3361 +#: diff.c:5389 diff.c:5395

3362 msgid "generate patch"

3363 msgstr "buat tambalan"

3364

3343 -#: diff.c:5384 builtin/log.c:179

3365 +#: diff.c:5392 builtin/log.c:179

3366 msgid "suppress diff output"

3367 msgstr "sembunyikan keluaran diff"

3368

3347 -#: diff.c:5389 diff.c:5503 diff.c:5510

3369 +#: diff.c:5397 diff.c:5511 diff.c:5518

3370 msgid "<n>"

3371 msgstr "<n>"

3372

3351 -#: diff.c:5390 diff.c:5393

3373 +#: diff.c:5398 diff.c:5401

3374 msgid "generate diffs with <n> lines context"

3375 msgstr "buat diff dengan <n> baris konteks"

3376

3355 -#: diff.c:5395

3377 +#: diff.c:5403

3378 msgid "generate the diff in raw format"

3379 msgstr "buat diff dalam format mentah"

3380

3359 -#: diff.c:5398

3381 +#: diff.c:5406

3382 msgid "synonym for '-p --raw'"

3383 msgstr "sinonim untuk '-p --raw'"

3384

3363 -#: diff.c:5402

3385 +#: diff.c:5410

3386 msgid "synonym for '-p --stat'"

3387 msgstr "sinonim untuk '-p --stat'"

3388

3367 -#: diff.c:5406

3389 +#: diff.c:5414

3390 msgid "machine friendly --stat"

3391 msgstr "--stat yang ramah mesin"

3392

3371 -#: diff.c:5409

3393 +#: diff.c:5417

3394 msgid "output only the last line of --stat"

3395 msgstr "keluarkan hanya baris terakhir --stat"

3396

3375 -#: diff.c:5411 diff.c:5419

3397 +#: diff.c:5419 diff.c:5427

3398 msgid "<param1,param2>..."

3399 msgstr "<parameter 1,parameter 2>..."

3400

3379 -#: diff.c:5412

3401 +#: diff.c:5420

3402 msgid ""

3403 "output the distribution of relative amount of changes for each sub-directory"

3404 msgstr ""

3405 "keluarkan distribusi jumlah perubahan relatif untuk setiap subdirektori"

3406

3385 -#: diff.c:5416

3407 +#: diff.c:5424

3408 msgid "synonym for --dirstat=cumulative"

3409 msgstr "sinonim untuk --dirstat=cumulative"

3410

3389 -#: diff.c:5420

3411 +#: diff.c:5428

3412 msgid "synonym for --dirstat=files,param1,param2..."

3413 msgstr "sinonim untuk --dirstat=files,param1,param2..."

3414

3393 -#: diff.c:5424

3415 +#: diff.c:5432

3416 msgid "warn if changes introduce conflict markers or whitespace errors"

3417 msgstr ""

3418 "peringatkan bila perubahan memasukkan penanda konflik atau kesalahan spasi"

3419

3398 -#: diff.c:5427

3420 +#: diff.c:5435

3421 msgid "condensed summary such as creations, renames and mode changes"

3422 msgstr ""

3423 "ringkasan singkat seperti pembuatan, penggantian nama dan perubahan mode"

3424

3403 -#: diff.c:5430

3425 +#: diff.c:5438

3426 msgid "show only names of changed files"

3427 msgstr "perlihatkan hanya nama berkas yang berubah"

3428

3407 -#: diff.c:5433

3429 +#: diff.c:5441

3430 msgid "show only names and status of changed files"

3431 msgstr "perlihatkan hanya nama dan status berkas yang berubah"

3432

3411 -#: diff.c:5435

3433 +#: diff.c:5443

3434 msgid "<width>[,<name-width>[,<count>]]"

3435 msgstr "<lebar>[,<nama lebar>[,<hitungan>]]"

3436

3415 -#: diff.c:5436

3437 +#: diff.c:5444

3438 msgid "generate diffstat"

3439 msgstr "buat diffstat"

3440

3419 -#: diff.c:5438 diff.c:5441 diff.c:5444

3441 +#: diff.c:5446 diff.c:5449 diff.c:5452

3442 msgid "<width>"

3443 msgstr "<lebar>"

3444

3423 -#: diff.c:5439

3445 +#: diff.c:5447

3446 msgid "generate diffstat with a given width"

3447 msgstr "buat diffstat dengan lebar yang diberikan"

3448

3427 -#: diff.c:5442

3449 +#: diff.c:5450

3450 msgid "generate diffstat with a given name width"

3451 msgstr "buat diffstat dengan nama lebar yang diberikan"

3452

3431 -#: diff.c:5445

3453 +#: diff.c:5453

3454 msgid "generate diffstat with a given graph width"

3455 msgstr "buat diffstat dengan lebar grafik yang diberikan"

3456

3435 -#: diff.c:5447

3457 +#: diff.c:5455

3458 msgid "<count>"

3459 msgstr "<hitungan>"

3460

3439 -#: diff.c:5448

3461 +#: diff.c:5456

3462 msgid "generate diffstat with limited lines"

3463 msgstr "buat diffstat dengan baris yang terbatas"

3464

3443 -#: diff.c:5451

3465 +#: diff.c:5459

3466 msgid "generate compact summary in diffstat"

3467 msgstr "buat ringkasan singkat dalam diffstat"

3468

3447 -#: diff.c:5454

3469 +#: diff.c:5462

3470 msgid "output a binary diff that can be applied"

3471 msgstr "keluarkan diff biner yang dapat diterapkan"

3472

3451 -#: diff.c:5457

3473 +#: diff.c:5465

3474 msgid "show full pre- and post-image object names on the \"index\" lines"

3475 msgstr "perlihatkan objek pra- dan pasca-citra penuh pada baris \"index\""

3476

3455 -#: diff.c:5459

3477 +#: diff.c:5467

3478 msgid "show colored diff"

3479 msgstr "perlihatkan diff berwarna"

3480

3459 -#: diff.c:5460

3481 +#: diff.c:5468

3482 msgid "<kind>"

3483 msgstr "<tipe>"

3484

3463 -#: diff.c:5461

3485 +#: diff.c:5469

3486 msgid ""

3487 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

3488 "diff"

3489 msgstr ""

3490 "soroti kesalahan spasi dalam baris 'context', 'old' atau 'new' dalam diff"

3491

3470 -#: diff.c:5464

3492 +#: diff.c:5472

3493 msgid ""

3494 "do not munge pathnames and use NULs as output field terminators in --raw or "

3495 "--numstat"

@@ -3475,91 +3497,91 @@ msgstr ""

3497 "jangan tengkar jalur nama dan gunakan NUL sebagai pembatas bidang keluaran "

3498 "pada --raw atau --numstat"

3499

3478 -#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582

3500 +#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590

3501 msgid "<prefix>"

3502 msgstr "<prefiks>"

3503

3482 -#: diff.c:5468

3504 +#: diff.c:5476

3505 msgid "show the given source prefix instead of \"a/\""

3506 msgstr "perlihatkan prefiks sumber yang diberikan daripada \"a/\""

3507

3486 -#: diff.c:5471

3508 +#: diff.c:5479

3509 msgid "show the given destination prefix instead of \"b/\""

3510 msgstr "perlihatkan prefiks tujuan daripada \"b/\""

3511

3490 -#: diff.c:5474

3512 +#: diff.c:5482

3513 msgid "prepend an additional prefix to every line of output"

3514 msgstr "tambah depan prefiks tambahan pada setiap baris keluaran"

3515

3494 -#: diff.c:5477

3516 +#: diff.c:5485

3517 msgid "do not show any source or destination prefix"

3518 msgstr "jangan perlihatkan prefiks sumber atau tujuan apapun"

3519

3498 -#: diff.c:5480

3520 +#: diff.c:5488

3521 msgid "show context between diff hunks up to the specified number of lines"

3522 msgstr ""

3501 -"perlihatkan konteks diantara hunk diff hingga jumlah baris yang disebutkan"

3523 +"perlihatkan konteks diantara bingkah diff hingga jumlah baris yang disebutkan"

3524

3503 -#: diff.c:5484 diff.c:5489 diff.c:5494

3525 +#: diff.c:5492 diff.c:5497 diff.c:5502

3526 msgid "<char>"

3527 msgstr "<karakter>"

3528

3507 -#: diff.c:5485

3529 +#: diff.c:5493

3530 msgid "specify the character to indicate a new line instead of '+'"

3531 msgstr "sebutkan karakter yang menandai baris baru daripada '+'"

3532

3511 -#: diff.c:5490

3533 +#: diff.c:5498

3534 msgid "specify the character to indicate an old line instead of '-'"

3535 msgstr "sebutkan karakter yang menandai baris lama daripada '-'"

3536

3515 -#: diff.c:5495

3537 +#: diff.c:5503

3538 msgid "specify the character to indicate a context instead of ' '"

3539 msgstr "sebutkan karakter yang menandai konteks daripada ' '"

3540

3519 -#: diff.c:5498

3541 +#: diff.c:5506

3542 msgid "Diff rename options"

3543 msgstr "Opsi penamaan ulang diff"

3544

3523 -#: diff.c:5499

3545 +#: diff.c:5507

3546 msgid "<n>[/<m>]"

3547 msgstr "<n>[/<m>]"

3548

3527 -#: diff.c:5500

3549 +#: diff.c:5508

3550 msgid "break complete rewrite changes into pairs of delete and create"

3551 msgstr ""

3552 "pisahkan perubahan penulisan ulang penuh kedalam pasangan penghapusan dan "

3553 "pembuatan"

3554

3533 -#: diff.c:5504

3555 +#: diff.c:5512

3556 msgid "detect renames"

3557 msgstr "deteksi penamaan ulang"

3558

3537 -#: diff.c:5508

3559 +#: diff.c:5516

3560 msgid "omit the preimage for deletes"

3561 msgstr "lewati pracitra untuk penghapusan"

3562

3541 -#: diff.c:5511

3563 +#: diff.c:5519

3564 msgid "detect copies"

3565 msgstr "deteksi penyalinan"

3566

3545 -#: diff.c:5515

3567 +#: diff.c:5523

3568 msgid "use unmodified files as source to find copies"

3569 msgstr ""

3570 "gunakan berkas tak termodifikasi sebagai sumber untuk menemukan salinan"

3571

3550 -#: diff.c:5517

3572 +#: diff.c:5525

3573 msgid "disable rename detection"

3574 msgstr "nonaktifkan deteksi penamaan ulang"

3575

3554 -#: diff.c:5520

3576 +#: diff.c:5528

3577 msgid "use empty blobs as rename source"

3578 msgstr "gunakan blob kosong sebagai sumber penamaan ulang"

3579

3558 -#: diff.c:5522

3580 +#: diff.c:5530

3581 msgid "continue listing the history of a file beyond renames"

3582 msgstr "lanjutkan daftarkan riwayat berkas di luar penamaan ulang"

3583

3562 -#: diff.c:5525

3584 +#: diff.c:5533

3585 msgid ""

3586 "prevent rename/copy detection if the number of rename/copy targets exceeds "

3587 "given limit"

@@ -3567,231 +3589,232 @@ msgstr ""

3589 "cegah pendeteksian penamaan ulang/penyalinan jika jumlah target penamaan "

3590 "ulang/penyalinan melebihi batas yang diberikan"

3591

3570 -#: diff.c:5527

3592 +#: diff.c:5535

3593 msgid "Diff algorithm options"

3594 msgstr "Opsi algoritma diff"

3595

3574 -#: diff.c:5529

3596 +#: diff.c:5537

3597 msgid "produce the smallest possible diff"

3598 msgstr "hasilkan diff yang paling kecil yang dimungkinkan"

3599

3578 -#: diff.c:5532

3600 +#: diff.c:5540

3601 msgid "ignore whitespace when comparing lines"

3602 msgstr "abaikan spasi saat membandingkan baris"

3603

3582 -#: diff.c:5535

3604 +#: diff.c:5543

3605 msgid "ignore changes in amount of whitespace"

3606 msgstr "abaikan perubahan dalam jumlah spasi"

3607

3586 -#: diff.c:5538

3608 +#: diff.c:5546

3609 msgid "ignore changes in whitespace at EOL"

3610 msgstr "abaikan perubahan spasi pada EOL"

3611

3590 -#: diff.c:5541

3612 +#: diff.c:5549

3613 msgid "ignore carrier-return at the end of line"

3614 msgstr "abaikan kembalian-kurir pada akhir baris"

3615

3594 -#: diff.c:5544

3616 +#: diff.c:5552

3617 msgid "ignore changes whose lines are all blank"

3618 msgstr "abaikan perubahan yang semua baris kosong"

3619

3598 -#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616

3620 +#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624

3621 msgid "<regex>"

3622 msgstr "<regex>"

3623

3602 -#: diff.c:5547

3624 +#: diff.c:5555

3625 msgid "ignore changes whose all lines match <regex>"

3626 msgstr "abaikan perubahan yang semua baris cocok dengan <regex>"

3627

3606 -#: diff.c:5550

3628 +#: diff.c:5558

3629 msgid "heuristic to shift diff hunk boundaries for easy reading"

3608 -msgstr "heuristik untuk geser perbatasan hunk diff untuk pembacaan yang mudah"

3630 +msgstr ""

3631 +"heuristik untuk geser perbatasan bingkah diff untuk pembacaan yang mudah"

3632

3610 -#: diff.c:5553

3633 +#: diff.c:5561

3634 msgid "generate diff using the \"patience diff\" algorithm"

3635 msgstr "buat diff menggunakan algoritma \"diff sabar\""

3636

3614 -#: diff.c:5557

3637 +#: diff.c:5565

3638 msgid "generate diff using the \"histogram diff\" algorithm"

3639 msgstr "buat diff menggunakan algoritma \"diff histogram\""

3640

3618 -#: diff.c:5559

3641 +#: diff.c:5567

3642 msgid "<algorithm>"

3643 msgstr "<algoritma>"

3644

3622 -#: diff.c:5560

3645 +#: diff.c:5568

3646 msgid "choose a diff algorithm"

3647 msgstr "pilih algoritma diff"

3648

3626 -#: diff.c:5562

3649 +#: diff.c:5570

3650 msgid "<text>"

3651 msgstr "<teks>"

3652

3630 -#: diff.c:5563

3653 +#: diff.c:5571

3654 msgid "generate diff using the \"anchored diff\" algorithm"

3655 msgstr "buat diff menggunakan algoritma \"diff terlabuh\""

3656

3634 -#: diff.c:5565 diff.c:5574 diff.c:5577

3657 +#: diff.c:5573 diff.c:5582 diff.c:5585

3658 msgid "<mode>"

3659 msgstr "<mode>"

3660

3638 -#: diff.c:5566

3661 +#: diff.c:5574

3662 msgid "show word diff, using <mode> to delimit changed words"

3663 msgstr ""

3664 "perlihatkan diff kata, menggunakan <mode> untuk batasi kata yang berubah"

3665

3643 -#: diff.c:5569

3666 +#: diff.c:5577

3667 msgid "use <regex> to decide what a word is"

3668 msgstr "gunakan <regex> untuk menentukan apa itu kata"

3669

3647 -#: diff.c:5572

3670 +#: diff.c:5580

3671 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3672 msgstr "sama dengan --word-diff=color --word-diff-regex=<regex>"

3673

3651 -#: diff.c:5575

3674 +#: diff.c:5583

3675 msgid "moved lines of code are colored differently"

3676 msgstr "baris kode yang berpindah diwarnai berbeda"

3677

3655 -#: diff.c:5578

3678 +#: diff.c:5586

3679 msgid "how white spaces are ignored in --color-moved"

3680 msgstr "bagaimana spasi diabaikan di --color-moved"

3681

3659 -#: diff.c:5581

3682 +#: diff.c:5589

3683 msgid "Other diff options"

3684 msgstr "Opsi diff yang lainnya"

3685

3663 -#: diff.c:5583

3686 +#: diff.c:5591

3687 msgid "when run from subdir, exclude changes outside and show relative paths"

3688 msgstr ""

3689 "ketika dijalankan dari subdirektori, kecualikan perubahan diluar dan "

3690 "perlihatkan jalur relatif"

3691

3669 -#: diff.c:5587

3692 +#: diff.c:5595

3693 msgid "treat all files as text"

3694 msgstr "perlakukan semua berkas sebagai teks"

3695

3673 -#: diff.c:5589

3696 +#: diff.c:5597

3697 msgid "swap two inputs, reverse the diff"

3698 msgstr "tukar dua masukkan, balikkan diff"

3699

3677 -#: diff.c:5591

3700 +#: diff.c:5599

3701 msgid "exit with 1 if there were differences, 0 otherwise"

3702 msgstr "keluar dengan 1 jika ada perbedaan, selain itu 0"

3703

3681 -#: diff.c:5593

3704 +#: diff.c:5601

3705 msgid "disable all output of the program"

3706 msgstr "nonaktifkan semua keluaran program"

3707

3685 -#: diff.c:5595

3708 +#: diff.c:5603

3709 msgid "allow an external diff helper to be executed"

3710 msgstr "perbolehkan pembantu diff eksternal untuk dieksekusi"

3711

3689 -#: diff.c:5597

3712 +#: diff.c:5605

3713 msgid "run external text conversion filters when comparing binary files"

3714 msgstr ""

3715 "jalankan saringan konversi teks eksternal ketika membandingkan berkas biner"

3716

3694 -#: diff.c:5599

3717 +#: diff.c:5607

3718 msgid "<when>"

3719 msgstr "<kapan>"

3720

3698 -#: diff.c:5600

3721 +#: diff.c:5608

3722 msgid "ignore changes to submodules in the diff generation"

3723 msgstr "abaikan perubahan submodul dalam pembuatan diff"

3724

3702 -#: diff.c:5603

3725 +#: diff.c:5611

3726 msgid "<format>"

3727 msgstr "<format>"

3728

3706 -#: diff.c:5604

3729 +#: diff.c:5612

3730 msgid "specify how differences in submodules are shown"

3731 msgstr "sebutkan bagaimana perbedaan dalam submodul diperlihatkan"

3732

3710 -#: diff.c:5608

3733 +#: diff.c:5616

3734 msgid "hide 'git add -N' entries from the index"

3735 msgstr "sembunyikan entri 'git add -N' dari indeks"

3736

3714 -#: diff.c:5611

3737 +#: diff.c:5619

3738 msgid "treat 'git add -N' entries as real in the index"

3739 msgstr "perlakukan entri 'git add -N' sebagai nyata dalam indeks"

3740

3718 -#: diff.c:5613

3741 +#: diff.c:5621

3742 msgid "<string>"

3743 msgstr "<untai>"

3744

3722 -#: diff.c:5614

3745 +#: diff.c:5622

3746 msgid ""

3747 "look for differences that change the number of occurrences of the specified "

3748 "string"

3749 msgstr "cari perbedaan yang mengubah jumlah kemunculan untai yang disebutkan"

3750

3728 -#: diff.c:5617

3751 +#: diff.c:5625

3752 msgid ""

3753 "look for differences that change the number of occurrences of the specified "

3754 "regex"

3755 msgstr "cari perbedaan yang mengubah jumlah kemunculan regex yang disebutkan"

3756

3734 -#: diff.c:5620

3757 +#: diff.c:5628

3758 msgid "show all changes in the changeset with -S or -G"

3759 msgstr "perlihatkan semua perubahan dalam set perubahan dengan -S atau -G"

3760

3738 -#: diff.c:5623

3761 +#: diff.c:5631

3762 msgid "treat <string> in -S as extended POSIX regular expression"

3763 msgstr ""

3764 "perlakukan <string> di -S sebagai ekspresi reguler POSIX yang diperluas"

3765

3743 -#: diff.c:5626

3766 +#: diff.c:5634

3767 msgid "control the order in which files appear in the output"

3768 msgstr "kontrol urutan berkas yang muncul dalam keluaran"

3769

3747 -#: diff.c:5627 diff.c:5630

3770 +#: diff.c:5635 diff.c:5638

3771 msgid "<path>"

3772 msgstr "<jalur>"

3773

3751 -#: diff.c:5628

3774 +#: diff.c:5636

3775 msgid "show the change in the specified path first"

3776 msgstr "perlihatkan perubahan dalam jalur yang disebutkan terlebih dahulu"

3777

3755 -#: diff.c:5631

3778 +#: diff.c:5639

3779 msgid "skip the output to the specified path"

3780 msgstr "lewati keluaran ke jalur yang disebutkan"

3781

3759 -#: diff.c:5633

3782 +#: diff.c:5641

3783 msgid "<object-id>"

3784 msgstr "<id objek>"

3785

3763 -#: diff.c:5634

3786 +#: diff.c:5642

3787 msgid ""

3788 "look for differences that change the number of occurrences of the specified "

3789 "object"

3790 msgstr "cari perubahan yang mengubah jumlah kemunculan objek yang disebutkan"

3791

3769 -#: diff.c:5636

3792 +#: diff.c:5644

3793 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

3794 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"

3795

3773 -#: diff.c:5637

3796 +#: diff.c:5645

3797 msgid "select files by diff type"

3798 msgstr "pilih berkas oleh tipe diff"

3799

3777 -#: diff.c:5639

3800 +#: diff.c:5647

3801 msgid "<file>"

3802 msgstr "<berkas>"

3803

3781 -#: diff.c:5640

3804 +#: diff.c:5648

3805 msgid "Output to a specific file"

3806 msgstr "Keluarkan ke berkas yang disebutkan"

3807

3785 -#: diff.c:6298

3808 +#: diff.c:6306

3809 msgid "exhaustive rename detection was skipped due to too many files."

3810 msgstr "deteksi penamaan ulang lengkap dilewati karena terlalu banyak berkas."

3811

3789 -#: diff.c:6301

3812 +#: diff.c:6309

3813 msgid "only found copies from modified paths due to too many files."

3814 msgstr ""

3815 "hanya ditemukan salinan dari jalur yang berubah karena terlalu banyak berkas."

3816

3794 -#: diff.c:6304

3817 +#: diff.c:6312

3818 #, c-format

3819 msgid ""

3820 "you may want to set your %s variable to at least %d and retry the command."

@@ -3804,7 +3827,7 @@ msgstr ""

3827 msgid "failed to read orderfile '%s'"

3828 msgstr ""

3829

3807 -#: diffcore-rename.c:1514

3830 +#: diffcore-rename.c:1564

3831 msgid "Performing inexact rename detection"

3832 msgstr ""

3833

@@ -3842,331 +3865,402 @@ msgstr ""

3865 msgid "cannot use %s as an exclude file"

3866 msgstr ""

3867

3845 -#: dir.c:2351

3868 +#: dir.c:2464

3869 #, c-format

3870 msgid "could not open directory '%s'"

3871 msgstr ""

3872

3850 -#: dir.c:2653

3873 +#: dir.c:2766

3874 msgid "failed to get kernel name and information"

3875 msgstr ""

3876

3854 -#: dir.c:2777

3877 +#: dir.c:2890

3878 msgid "untracked cache is disabled on this system or location"

3879 msgstr ""

3880

3858 -#: dir.c:3610

3881 +#: dir.c:3158

3882 +msgid ""

3883 +"No directory name could be guessed.\n"

3884 +"Please specify a directory on the command line"

3885 +msgstr ""

3886 +"Nama direktori tidak dapat ditebak.\n"

3887 +"Mohon sebutkan direktori pada baris perintah"

3888 +

3889 +#: dir.c:3837

3890 #, c-format

3891 msgid "index file corrupt in repo %s"

3892 msgstr ""

3893

3863 -#: dir.c:3657 dir.c:3662

3894 +#: dir.c:3884 dir.c:3889

3895 #, c-format

3896 msgid "could not create directories for %s"

3897 msgstr ""

3898

3868 -#: dir.c:3691

3899 +#: dir.c:3918

3900 #, c-format

3901 msgid "could not migrate git directory from '%s' to '%s'"

3902 msgstr ""

3903

3873 -#: editor.c:74

3904 +#: editor.c:77

3905 #, c-format

3906 msgid "hint: Waiting for your editor to close the file...%c"

3907 msgstr ""

3908

3878 -#: entry.c:176

3909 +#: entry.c:177

3910 msgid "Filtering content"

3911 msgstr ""

3912

3882 -#: entry.c:497

3913 +#: entry.c:498

3914 #, c-format

3915 msgid "could not stat file '%s'"

3916 msgstr ""

3917

3887 -#: environment.c:152

3918 +#: environment.c:143

3919 #, c-format

3920 msgid "bad git namespace path \"%s\""

3921 msgstr ""

3922

3892 -#: environment.c:334

3923 +#: exec-cmd.c:363

3924 #, c-format

3894 -msgid "could not set GIT_DIR to '%s'"

3925 +msgid "too many args to run %s"

3926 msgstr ""

3927

3897 -#: exec-cmd.c:363

3898 -#, c-format

3899 -msgid "too many args to run %s"

3900 -msgstr ""

3901 -

3902 -#: fetch-pack.c:182

3928 +#: fetch-pack.c:193

3929 msgid "git fetch-pack: expected shallow list"

3930 msgstr ""

3931

3906 -#: fetch-pack.c:185

3932 +#: fetch-pack.c:196

3933 msgid "git fetch-pack: expected a flush packet after shallow list"

3934 msgstr ""

3935

3910 -#: fetch-pack.c:196

3936 +#: fetch-pack.c:207

3937 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

3938 msgstr ""

3939

3914 -#: fetch-pack.c:216

3940 +#: fetch-pack.c:227

3941 #, c-format

3942 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

3943 msgstr ""

3944

3919 -#: fetch-pack.c:227

3945 +#: fetch-pack.c:238

3946 msgid "unable to write to remote"

3947 msgstr ""

3948

3923 -#: fetch-pack.c:288

3949 +#: fetch-pack.c:299

3950 msgid "--stateless-rpc requires multi_ack_detailed"

3951 msgstr ""

3952

3927 -#: fetch-pack.c:383 fetch-pack.c:1423

3953 +#: fetch-pack.c:394 fetch-pack.c:1434

3954 #, c-format

3955 msgid "invalid shallow line: %s"

3956 msgstr ""

3957

3932 -#: fetch-pack.c:389 fetch-pack.c:1429

3958 +#: fetch-pack.c:400 fetch-pack.c:1440

3959 #, c-format

3960 msgid "invalid unshallow line: %s"

3961 msgstr ""

3962

3937 -#: fetch-pack.c:391 fetch-pack.c:1431

3963 +#: fetch-pack.c:402 fetch-pack.c:1442

3964 #, c-format

3965 msgid "object not found: %s"

3966 msgstr ""

3967

3942 -#: fetch-pack.c:394 fetch-pack.c:1434

3968 +#: fetch-pack.c:405 fetch-pack.c:1445

3969 #, c-format

3970 msgid "error in object: %s"

3971 msgstr ""

3972

3947 -#: fetch-pack.c:396 fetch-pack.c:1436

3973 +#: fetch-pack.c:407 fetch-pack.c:1447

3974 #, c-format

3975 msgid "no shallow found: %s"

3976 msgstr ""

3977

3952 -#: fetch-pack.c:399 fetch-pack.c:1440

3978 +#: fetch-pack.c:410 fetch-pack.c:1451

3979 #, c-format

3980 msgid "expected shallow/unshallow, got %s"

3981 msgstr ""

3982

3957 -#: fetch-pack.c:439

3983 +#: fetch-pack.c:450

3984 #, c-format

3985 msgid "got %s %d %s"

3986 msgstr ""

3987

3962 -#: fetch-pack.c:456

3988 +#: fetch-pack.c:467

3989 #, c-format

3990 msgid "invalid commit %s"

3991 msgstr ""

3992

3967 -#: fetch-pack.c:487

3993 +#: fetch-pack.c:498

3994 msgid "giving up"

3995 msgstr ""

3996

3971 -#: fetch-pack.c:500 progress.c:339

3997 +#: fetch-pack.c:511 progress.c:339

3998 msgid "done"

3999 msgstr ""

4000

3975 -#: fetch-pack.c:512

4001 +#: fetch-pack.c:523

4002 #, c-format

4003 msgid "got %s (%d) %s"

4004 msgstr ""

4005

3980 -#: fetch-pack.c:548

4006 +#: fetch-pack.c:559

4007 #, c-format

4008 msgid "Marking %s as complete"

4009 msgstr ""

4010

3985 -#: fetch-pack.c:763

4011 +#: fetch-pack.c:774

4012 #, c-format

4013 msgid "already have %s (%s)"

4014 msgstr ""

4015

3990 -#: fetch-pack.c:849

4016 +#: fetch-pack.c:860

4017 msgid "fetch-pack: unable to fork off sideband demultiplexer"

4018 msgstr ""

4019

3994 -#: fetch-pack.c:857

4020 +#: fetch-pack.c:868

4021 msgid "protocol error: bad pack header"

4022 msgstr ""

4023

3998 -#: fetch-pack.c:951

4024 +#: fetch-pack.c:962

4025 #, c-format

4026 msgid "fetch-pack: unable to fork off %s"

4027 msgstr ""

4028

4003 -#: fetch-pack.c:957

4029 +#: fetch-pack.c:968

4030 msgid "fetch-pack: invalid index-pack output"

4031 msgstr ""

4032

4007 -#: fetch-pack.c:974

4033 +#: fetch-pack.c:985

4034 #, c-format

4035 msgid "%s failed"

4036 msgstr ""

4037

4012 -#: fetch-pack.c:976

4038 +#: fetch-pack.c:987

4039 msgid "error in sideband demultiplexer"

4040 msgstr ""

4041

4016 -#: fetch-pack.c:1019

4042 +#: fetch-pack.c:1030

4043 #, c-format

4044 msgid "Server version is %.*s"

4045 msgstr ""

4046

4021 -#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042

4022 -#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058

4023 -#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074

4024 -#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096

4047 +#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053

4048 +#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069

4049 +#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085

4050 +#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107

4051 #, c-format

4052 msgid "Server supports %s"

4053 msgstr ""

4054

4029 -#: fetch-pack.c:1029

4055 +#: fetch-pack.c:1040

4056 msgid "Server does not support shallow clients"

4057 msgstr ""

4058

4033 -#: fetch-pack.c:1089

4059 +#: fetch-pack.c:1100

4060 msgid "Server does not support --shallow-since"

4061 msgstr ""

4062

4037 -#: fetch-pack.c:1094

4063 +#: fetch-pack.c:1105

4064 msgid "Server does not support --shallow-exclude"

4065 msgstr ""

4066

4041 -#: fetch-pack.c:1098

4067 +#: fetch-pack.c:1109

4068 msgid "Server does not support --deepen"

4069 msgstr ""

4070

4045 -#: fetch-pack.c:1100

4071 +#: fetch-pack.c:1111

4072 msgid "Server does not support this repository's object format"

4073 msgstr ""

4074

4049 -#: fetch-pack.c:1113

4075 +#: fetch-pack.c:1124

4076 msgid "no common commits"

4077 msgstr ""

4078

4053 -#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238

4079 +#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130

4080 msgid "source repository is shallow, reject to clone."

4081 msgstr ""

4082

4057 -#: fetch-pack.c:1128 fetch-pack.c:1660

4083 +#: fetch-pack.c:1139 fetch-pack.c:1671

4084 msgid "git fetch-pack: fetch failed."

4085 msgstr ""

4086

4061 -#: fetch-pack.c:1242

4087 +#: fetch-pack.c:1253

4088 #, c-format

4089 msgid "mismatched algorithms: client %s; server %s"

4090 msgstr ""

4091

4066 -#: fetch-pack.c:1246

4092 +#: fetch-pack.c:1257

4093 #, c-format

4094 msgid "the server does not support algorithm '%s'"

4095 msgstr ""

4096

4071 -#: fetch-pack.c:1279

4097 +#: fetch-pack.c:1290

4098 msgid "Server does not support shallow requests"

4099 msgstr ""

4100

4075 -#: fetch-pack.c:1286

4101 +#: fetch-pack.c:1297

4102 msgid "Server supports filter"

4103 msgstr ""

4104

4079 -#: fetch-pack.c:1329 fetch-pack.c:2043

4105 +#: fetch-pack.c:1340 fetch-pack.c:2053

4106 msgid "unable to write request to remote"

4107 msgstr ""

4108

4083 -#: fetch-pack.c:1347

4109 +#: fetch-pack.c:1358

4110 #, c-format

4111 msgid "error reading section header '%s'"

4112 msgstr ""

4113

4088 -#: fetch-pack.c:1353

4114 +#: fetch-pack.c:1364

4115 #, c-format

4116 msgid "expected '%s', received '%s'"

4117 msgstr ""

4118

4093 -#: fetch-pack.c:1387

4119 +#: fetch-pack.c:1398

4120 #, c-format

4121 msgid "unexpected acknowledgment line: '%s'"

4122 msgstr ""

4123

4098 -#: fetch-pack.c:1392

4124 +#: fetch-pack.c:1403

4125 #, c-format

4126 msgid "error processing acks: %d"

4127 msgstr ""

4128

4103 -#: fetch-pack.c:1402

4129 +#: fetch-pack.c:1413

4130 msgid "expected packfile to be sent after 'ready'"

4131 msgstr ""

4132

4107 -#: fetch-pack.c:1404

4133 +#: fetch-pack.c:1415

4134 msgid "expected no other sections to be sent after no 'ready'"

4135 msgstr ""

4136

4111 -#: fetch-pack.c:1445

4137 +#: fetch-pack.c:1456

4138 #, c-format

4139 msgid "error processing shallow info: %d"

4140 msgstr ""

4141

4116 -#: fetch-pack.c:1494

4142 +#: fetch-pack.c:1505

4143 #, c-format

4144 msgid "expected wanted-ref, got '%s'"

4145 msgstr ""

4146

4121 -#: fetch-pack.c:1499

4147 +#: fetch-pack.c:1510

4148 #, c-format

4149 msgid "unexpected wanted-ref: '%s'"

4150 msgstr ""

4151

4126 -#: fetch-pack.c:1504

4152 +#: fetch-pack.c:1515

4153 #, c-format

4154 msgid "error processing wanted refs: %d"

4155 msgstr ""

4156

4131 -#: fetch-pack.c:1534

4157 +#: fetch-pack.c:1545

4158 msgid "git fetch-pack: expected response end packet"

4159 msgstr ""

4160

4135 -#: fetch-pack.c:1939

4161 +#: fetch-pack.c:1949

4162 msgid "no matching remote head"

4163 msgstr ""

4164

4139 -#: fetch-pack.c:1962 builtin/clone.c:697

4165 +#: fetch-pack.c:1972 builtin/clone.c:581

4166 msgid "remote did not send all necessary objects"

4167 msgstr ""

4168

4143 -#: fetch-pack.c:2065

4169 +#: fetch-pack.c:2075

4170 msgid "unexpected 'ready' from remote"

4171 msgstr ""

4172

4147 -#: fetch-pack.c:2088

4173 +#: fetch-pack.c:2098

4174 #, c-format

4175 msgid "no such remote ref %s"

4176 msgstr ""

4177

4152 -#: fetch-pack.c:2091

4178 +#: fetch-pack.c:2101

4179 #, c-format

4180 msgid "Server does not allow request for unadvertised object %s"

4181 msgstr ""

4182

4157 -#: gpg-interface.c:273

4183 +#: gpg-interface.c:329 gpg-interface.c:449 gpg-interface.c:900

4184 +#: gpg-interface.c:916

4185 msgid "could not create temporary file"

4186 msgstr ""

4187

4161 -#: gpg-interface.c:276

4188 +#: gpg-interface.c:332 gpg-interface.c:452

4189 #, c-format

4190 msgid "failed writing detached signature to '%s'"

4191 msgstr ""

4192

4166 -#: gpg-interface.c:470

4193 +#: gpg-interface.c:443

4194 +msgid ""

4195 +"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "

4196 +"signature verification"

4197 +msgstr ""

4198 +

4199 +#: gpg-interface.c:467

4200 +msgid ""

4201 +"ssh-keygen -Y find-principals/verify is needed for ssh signature "

4202 +"verification (available in openssh version 8.2p1+)"

4203 +msgstr ""

4204 +

4205 +#: gpg-interface.c:521

4206 +#, c-format

4207 +msgid "ssh signing revocation file configured but not found: %s"

4208 +msgstr ""

4209 +

4210 +#: gpg-interface.c:574

4211 +#, c-format

4212 +msgid "bad/incompatible signature '%s'"

4213 +msgstr "tanda tangan '%s' jelek/tidak kompatibel"

4214 +

4215 +#: gpg-interface.c:733 gpg-interface.c:738

4216 +#, c-format

4217 +msgid "failed to get the ssh fingerprint for key '%s'"

4218 +msgstr "gagal mendapatkan sidik jari ssh untuk kunci '%s'"

4219 +

4220 +#: gpg-interface.c:760

4221 +msgid ""

4222 +"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"

4223 +msgstr ""

4224 +

4225 +#: gpg-interface.c:778

4226 +#, c-format

4227 +msgid "gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s"

4228 +msgstr ""

4229 +

4230 +#: gpg-interface.c:784

4231 +#, c-format

4232 +msgid "gpg.ssh.defaultKeyCommand failed: %s %s"

4233 +msgstr ""

4234 +

4235 +#: gpg-interface.c:872

4236 msgid "gpg failed to sign the data"

4237 msgstr ""

4238

4239 +#: gpg-interface.c:893

4240 +msgid "user.signingkey needs to be set for ssh signing"

4241 +msgstr ""

4242 +

4243 +#: gpg-interface.c:904

4244 +#, c-format

4245 +msgid "failed writing ssh signing key to '%s'"

4246 +msgstr "gagal menulis kunci penandatanganan ssh ke '%s'"

4247 +

4248 +#: gpg-interface.c:922

4249 +#, c-format

4250 +msgid "failed writing ssh signing key buffer to '%s'"

4251 +msgstr "gagal menulis penyangga kunci penandatanganan ssh ke '%s'"

4252 +

4253 +#: gpg-interface.c:940

4254 +msgid ""

4255 +"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "

4256 +"8.2p1+)"

4257 +msgstr ""

4258 +

4259 +#: gpg-interface.c:952

4260 +#, c-format

4261 +msgid "failed reading ssh signing data buffer from '%s'"

4262 +msgstr ""

4263 +

4264 #: graph.c:98

4265 #, c-format

4266 msgid "ignored invalid color '%.*s' in log.graphColors"

@@ -4180,109 +4274,109 @@ msgstr ""

4274 "pola yang diberikan berisi bita NULL (via -f <berkas>). Hal ini hanya "

4275 "didukung dengan -P di bawah PCRE v2"

4276

4183 -#: grep.c:1895

4277 +#: grep.c:1907

4278 #, c-format

4279 msgid "'%s': unable to read %s"

4280 msgstr "'%s': tidak dapat membaca %s"

4281

4188 -#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90

4282 +#: grep.c:1924 setup.c:176 builtin/clone.c:302 builtin/diff.c:90

4283 #: builtin/rm.c:136

4284 #, c-format

4285 msgid "failed to stat '%s'"

4286 msgstr "gagal men-stat '%s'"

4287

4194 -#: grep.c:1923

4288 +#: grep.c:1935

4289 #, c-format

4290 msgid "'%s': short read"

4291 msgstr "'%s': baca pendek"

4292

4199 -#: help.c:23

4293 +#: help.c:24

4294 msgid "start a working area (see also: git help tutorial)"

4295 msgstr "mulai area kerja (lihat pula: git help tutorial)"

4296

4203 -#: help.c:24

4297 +#: help.c:25

4298 msgid "work on the current change (see also: git help everyday)"

4299 msgstr "bekerja pada perubahan saat ini (lihat pula: git help everyday)"

4300

4207 -#: help.c:25

4301 +#: help.c:26

4302 msgid "examine the history and state (see also: git help revisions)"

4303 msgstr "periksa riwayat dan keadaan (lihat pula: git help revisions)"

4304

4211 -#: help.c:26

4305 +#: help.c:27

4306 msgid "grow, mark and tweak your common history"

4307 msgstr "tumbuhkan, tandai, dan cubit riwayat umum Anda"

4308

4215 -#: help.c:27

4309 +#: help.c:28

4310 msgid "collaborate (see also: git help workflows)"

4311 msgstr "kolaborasi (lihat pula: git help workflows)"

4312

4219 -#: help.c:31

4313 +#: help.c:32

4314 msgid "Main Porcelain Commands"

4315 msgstr "Perintah Porselen Utama"

4316

4223 -#: help.c:32

4317 +#: help.c:33

4318 msgid "Ancillary Commands / Manipulators"

4319 msgstr "Perintah Tambahan / Peubah"

4320

4227 -#: help.c:33

4321 +#: help.c:34

4322 msgid "Ancillary Commands / Interrogators"

4323 msgstr "Perintah Tambahan / Pemeriksa"

4324

4231 -#: help.c:34

4325 +#: help.c:35

4326 msgid "Interacting with Others"

4327 msgstr "Berinteraksi dengan yang Lain"

4328

4235 -#: help.c:35

4329 +#: help.c:36

4330 msgid "Low-level Commands / Manipulators"

4331 msgstr "Perintah Tingkat Rendah / Peubah"

4332

4239 -#: help.c:36

4333 +#: help.c:37

4334 msgid "Low-level Commands / Interrogators"

4335 msgstr "Perintah Tingkat Rendah / Pemeriksa"

4336

4243 -#: help.c:37

4337 +#: help.c:38

4338 msgid "Low-level Commands / Syncing Repositories"

4339 msgstr "Perintah Tingkat Rendah / Sinkronisasi Repositori"

4340

4247 -#: help.c:38

4341 +#: help.c:39

4342 msgid "Low-level Commands / Internal Helpers"

4343 msgstr "Perintah Tingak Rendah / Pembantu Internal"

4344

4251 -#: help.c:300

4345 +#: help.c:313

4346 #, c-format

4347 msgid "available git commands in '%s'"

4348 msgstr "perintah git yang tersedia di '%s'"

4349

4256 -#: help.c:307

4350 +#: help.c:320

4351 msgid "git commands available from elsewhere on your $PATH"

4352 msgstr "perintah git yang tersedia dari tempat lain pada $PATH Anda"

4353

4260 -#: help.c:316

4354 +#: help.c:329

4355 msgid "These are common Git commands used in various situations:"

4356 msgstr "Berikut ini perintah Git umum yang digunakan dalam beragam situasi:"

4357

4264 -#: help.c:365 git.c:100

4358 +#: help.c:378 git.c:100

4359 #, c-format

4360 msgid "unsupported command listing type '%s'"

4361 msgstr "tipe daftar perintah '%s' tidak didukung"

4362

4269 -#: help.c:405

4363 +#: help.c:418

4364 msgid "The Git concept guides are:"

4365 msgstr "Panduan konsep Git adalah:"

4366

4273 -#: help.c:429

4367 +#: help.c:442

4368 msgid "See 'git help <command>' to read about a specific subcommand"

4369 msgstr "Lihat 'git help <perintah>' untuk baca tentang subperintah spesifik"

4370

4277 -#: help.c:434

4371 +#: help.c:447

4372 msgid "External commands"

4373 msgstr "Perintah eksternal"

4374

4281 -#: help.c:449

4375 +#: help.c:462

4376 msgid "Command aliases"

4377 msgstr "Alias perintah"

4378

4285 -#: help.c:527

4379 +#: help.c:543

4380 #, c-format

4381 msgid ""

4382 "'%s' appears to be a git command, but we were not\n"

@@ -4291,31 +4385,36 @@ msgstr ""

4385 "'%s' sepertinya perintah git, tetapi kami tidak dapat\n"

4386 "menjalankannya. Mungkin git-%s rusak?"

4387

4294 -#: help.c:543 help.c:631

4388 +#: help.c:565 help.c:662

4389 #, c-format

4390 msgid "git: '%s' is not a git command. See 'git --help'."

4391 msgstr "git: '%s' bukan perintah git. Lihat 'git --help'."

4392

4299 -#: help.c:591

4393 +#: help.c:613

4394 msgid "Uh oh. Your system reports no Git commands at all."

4395 msgstr "Eh oh. Sistem Anda melaporkan tidak ada perintah Git sama sekali."

4396

4303 -#: help.c:613

4397 +#: help.c:635

4398 #, c-format

4399 msgid "WARNING: You called a Git command named '%s', which does not exist."

4400 msgstr "PERINGATAN: Anda memanggil perintah Git bernama '%s' yang tidak ada."

4401

4308 -#: help.c:618

4402 +#: help.c:640

4403 #, c-format

4404 msgid "Continuing under the assumption that you meant '%s'."

4405 msgstr "Melanjutkan di bawah asumsi bahwa maksud Anda '%s'."

4406

4313 -#: help.c:623

4407 +#: help.c:646

4408 +#, c-format

4409 +msgid "Run '%s' instead? (y/N)"

4410 +msgstr ""

4411 +

4412 +#: help.c:654

4413 #, c-format

4414 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

4415 msgstr "Melanjutkan dalam %0.1f detik, mengasumsikan bahwa maksud Anda '%s'."

4416

4318 -#: help.c:635

4417 +#: help.c:666

4418 msgid ""

4419 "\n"

4420 "The most similar command is"

@@ -4329,16 +4428,16 @@ msgstr[1] ""

4428 "\n"

4429 "Perintah paling mirip adalah"

4430

4332 -#: help.c:675

4431 +#: help.c:706

4432 msgid "git version [<options>]"

4433 msgstr "git version [<opsi>]"

4434

4336 -#: help.c:730

4435 +#: help.c:761

4436 #, c-format

4437 msgid "%s: %s - %s"

4438 msgstr "%s: %s - %s"

4439

4341 -#: help.c:734

4440 +#: help.c:765

4441 msgid ""

4442 "\n"

4443 "Did you mean this?"

@@ -4352,6 +4451,13 @@ msgstr[1] ""

4451 "\n"

4452 "Mungkin maksud Anda salah satu dari yang ini?"

4453

4454 +#: hook.c:27

4455 +#, c-format

4456 +msgid ""

4457 +"The '%s' hook was ignored because it's not set as executable.\n"

4458 +"You can disable this warning with `git config advice.ignoredHook false`."

4459 +msgstr ""

4460 +

4461 #: ident.c:353

4462 msgid "Author identity unknown\n"

4463 msgstr ""

@@ -4403,7 +4509,7 @@ msgstr ""

4509 msgid "name consists only of disallowed characters: %s"

4510 msgstr ""

4511

4406 -#: ident.c:454 builtin/commit.c:647

4512 +#: ident.c:454 builtin/commit.c:648

4513 #, c-format

4514 msgid "invalid date format: %s"

4515 msgstr ""

@@ -4490,7 +4596,12 @@ msgstr ""

4596 msgid "invalid value '%s' for lsrefs.unborn"

4597 msgstr ""

4598

4493 -#: ls-refs.c:167

4599 +#: ls-refs.c:174

4600 +#, c-format

4601 +msgid "unexpected line: '%s'"

4602 +msgstr ""

4603 +

4604 +#: ls-refs.c:178

4605 msgid "expected flush after ls-refs arguments"

4606 msgstr ""

4607

@@ -4498,44 +4609,44 @@ msgstr ""

4609 msgid "quoted CRLF detected"

4610 msgstr ""

4611

4501 -#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46

4612 +#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46

4613 #, c-format

4614 msgid "bad action '%s' for '%s'"

4615 msgstr ""

4616

4506 -#: merge-ort.c:1569 merge-recursive.c:1201

4617 +#: merge-ort.c:1584 merge-recursive.c:1211

4618 #, c-format

4619 msgid "Failed to merge submodule %s (not checked out)"

4620 msgstr ""

4621

4511 -#: merge-ort.c:1578 merge-recursive.c:1208

4622 +#: merge-ort.c:1593 merge-recursive.c:1218

4623 #, c-format

4624 msgid "Failed to merge submodule %s (commits not present)"

4625 msgstr ""

4626

4516 -#: merge-ort.c:1587 merge-recursive.c:1215

4627 +#: merge-ort.c:1602 merge-recursive.c:1225

4628 #, c-format

4629 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

4630 msgstr ""

4631

4521 -#: merge-ort.c:1597 merge-ort.c:1604

4632 +#: merge-ort.c:1612 merge-ort.c:1620

4633 #, c-format

4634 msgid "Note: Fast-forwarding submodule %s to %s"

4635 msgstr ""

4636

4526 -#: merge-ort.c:1625

4637 +#: merge-ort.c:1642

4638 #, c-format

4639 msgid "Failed to merge submodule %s"

4640 msgstr ""

4641

4531 -#: merge-ort.c:1632

4642 +#: merge-ort.c:1649

4643 #, c-format

4644 msgid ""

4645 "Failed to merge submodule %s, but a possible merge resolution exists:\n"

4646 "%s\n"

4647 msgstr ""

4648

4538 -#: merge-ort.c:1636 merge-recursive.c:1269

4649 +#: merge-ort.c:1653 merge-recursive.c:1281

4650 #, c-format

4651 msgid ""

4652 "If this is correct simply add it to the index for example\n"

@@ -4546,42 +4657,42 @@ msgid ""

4657 "which will accept this suggestion.\n"

4658 msgstr ""

4659

4549 -#: merge-ort.c:1649

4660 +#: merge-ort.c:1666

4661 #, c-format

4662 msgid ""

4663 "Failed to merge submodule %s, but multiple possible merges exist:\n"

4664 "%s"

4665 msgstr ""

4666

4556 -#: merge-ort.c:1868 merge-recursive.c:1358

4667 +#: merge-ort.c:1887 merge-recursive.c:1372

4668 msgid "Failed to execute internal merge"

4669 msgstr ""

4670

4560 -#: merge-ort.c:1873 merge-recursive.c:1363

4671 +#: merge-ort.c:1892 merge-recursive.c:1377

4672 #, c-format

4673 msgid "Unable to add %s to database"

4674 msgstr ""

4675

4565 -#: merge-ort.c:1880 merge-recursive.c:1396

4676 +#: merge-ort.c:1899 merge-recursive.c:1410

4677 #, c-format

4678 msgid "Auto-merging %s"

4679 msgstr ""

4680

4570 -#: merge-ort.c:2019 merge-recursive.c:2118

4681 +#: merge-ort.c:2038 merge-recursive.c:2132

4682 #, c-format

4683 msgid ""

4684 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

4685 "implicit directory rename(s) putting the following path(s) there: %s."

4686 msgstr ""

4687

4577 -#: merge-ort.c:2029 merge-recursive.c:2128

4688 +#: merge-ort.c:2048 merge-recursive.c:2142

4689 #, c-format

4690 msgid ""

4691 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

4692 "implicit directory renames tried to put these paths there: %s"

4693 msgstr ""

4694

4584 -#: merge-ort.c:2087

4695 +#: merge-ort.c:2106

4696 #, c-format

4697 msgid ""

4698 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "

@@ -4589,47 +4700,47 @@ msgid ""

4700 "majority of the files."

4701 msgstr ""

4702

4592 -#: merge-ort.c:2241 merge-recursive.c:2464

4703 +#: merge-ort.c:2260 merge-recursive.c:2478

4704 #, c-format

4705 msgid ""

4706 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

4707 "renamed."

4708 msgstr ""

4709

4599 -#: merge-ort.c:2385 merge-recursive.c:3247

4710 +#: merge-ort.c:2400 merge-recursive.c:3261

4711 #, c-format

4712 msgid ""

4713 "Path updated: %s added in %s inside a directory that was renamed in %s; "

4714 "moving it to %s."

4715 msgstr ""

4716

4606 -#: merge-ort.c:2392 merge-recursive.c:3254

4717 +#: merge-ort.c:2407 merge-recursive.c:3268

4718 #, c-format

4719 msgid ""

4720 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

4721 "%s; moving it to %s."

4722 msgstr ""

4723

4613 -#: merge-ort.c:2405 merge-recursive.c:3250

4724 +#: merge-ort.c:2420 merge-recursive.c:3264

4725 #, c-format

4726 msgid ""

4727 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

4728 "in %s, suggesting it should perhaps be moved to %s."

4729 msgstr ""

4730

4620 -#: merge-ort.c:2413 merge-recursive.c:3257

4731 +#: merge-ort.c:2428 merge-recursive.c:3271

4732 #, c-format

4733 msgid ""

4734 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

4735 "was renamed in %s, suggesting it should perhaps be moved to %s."

4736 msgstr ""

4737

4627 -#: merge-ort.c:2569

4738 +#: merge-ort.c:2584

4739 #, c-format

4740 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."

4741 msgstr ""

4742

4632 -#: merge-ort.c:2664

4743 +#: merge-ort.c:2679

4744 #, c-format

4745 msgid ""

4746 "CONFLICT (rename involved in collision): rename of %s -> %s has content "

@@ -4637,67 +4748,67 @@ msgid ""

4748 "markers."

4749 msgstr ""

4750

4640 -#: merge-ort.c:2683 merge-ort.c:2707

4751 +#: merge-ort.c:2698 merge-ort.c:2722

4752 #, c-format

4753 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."

4754 msgstr ""

4755

4645 -#: merge-ort.c:3182 merge-recursive.c:3008

4756 +#: merge-ort.c:3212 merge-recursive.c:3022

4757 #, c-format

4758 msgid "cannot read object %s"

4759 msgstr ""

4760

4650 -#: merge-ort.c:3185 merge-recursive.c:3011

4761 +#: merge-ort.c:3215 merge-recursive.c:3025

4762 #, c-format

4763 msgid "object %s is not a blob"

4764 msgstr ""

4765

4655 -#: merge-ort.c:3613

4766 +#: merge-ort.c:3644

4767 #, c-format

4768 msgid ""

4769 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "

4770 "%s instead."

4771 msgstr ""

4772

4662 -#: merge-ort.c:3689

4773 +#: merge-ort.c:3721

4774 #, c-format

4775 msgid ""

4776 "CONFLICT (distinct types): %s had different types on each side; renamed both "

4777 "of them so each can be recorded somewhere."

4778 msgstr ""

4779

4669 -#: merge-ort.c:3696

4780 +#: merge-ort.c:3728

4781 #, c-format

4782 msgid ""

4783 "CONFLICT (distinct types): %s had different types on each side; renamed one "

4784 "of them so each can be recorded somewhere."

4785 msgstr ""

4786

4676 -#: merge-ort.c:3796 merge-recursive.c:3087

4787 +#: merge-ort.c:3819 merge-recursive.c:3101

4788 msgid "content"

4789 msgstr ""

4790

4680 -#: merge-ort.c:3798 merge-recursive.c:3091

4791 +#: merge-ort.c:3821 merge-recursive.c:3105

4792 msgid "add/add"

4793 msgstr ""

4794

4684 -#: merge-ort.c:3800 merge-recursive.c:3136

4795 +#: merge-ort.c:3823 merge-recursive.c:3150

4796 msgid "submodule"

4797 msgstr ""

4798

4688 -#: merge-ort.c:3802 merge-recursive.c:3137

4799 +#: merge-ort.c:3825 merge-recursive.c:3151

4800 #, c-format

4801 msgid "CONFLICT (%s): Merge conflict in %s"

4802 msgstr ""

4803

4693 -#: merge-ort.c:3833

4804 +#: merge-ort.c:3856

4805 #, c-format

4806 msgid ""

4807 "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "

4808 "of %s left in tree."

4809 msgstr ""

4810

4700 -#: merge-ort.c:4120

4811 +#: merge-ort.c:4152

4812 #, c-format

4813 msgid ""

4814 "Note: %s not up to date and in way of checking out conflicted version; old "

@@ -4707,192 +4818,192 @@ msgstr ""

4818 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge

4819 #. base, and 2-3) the trees for the two trees we're merging.

4820 #.

4710 -#: merge-ort.c:4487

4821 +#: merge-ort.c:4521

4822 #, c-format

4823 msgid "collecting merge info failed for trees %s, %s, %s"

4824 msgstr ""

4825

4715 -#: merge-ort-wrappers.c:13 merge-recursive.c:3702

4826 +#: merge-ort-wrappers.c:13 merge-recursive.c:3716

4827 #, c-format

4828 msgid ""

4829 "Your local changes to the following files would be overwritten by merge:\n"

4830 " %s"

4831 msgstr ""

4832

4722 -#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402

4833 +#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403

4834 msgid "Already up to date."

4835 msgstr "Sudah terbaru."

4836

4726 -#: merge-recursive.c:352

4837 +#: merge-recursive.c:353

4838 msgid "(bad commit)\n"

4839 msgstr ""

4840

4730 -#: merge-recursive.c:375

4841 +#: merge-recursive.c:381

4842 #, c-format

4843 msgid "add_cacheinfo failed for path '%s'; merge aborting."

4844 msgstr ""

4845

4735 -#: merge-recursive.c:384

4846 +#: merge-recursive.c:390

4847 #, c-format

4848 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

4849 msgstr ""

4850

4740 -#: merge-recursive.c:872

4851 +#: merge-recursive.c:881

4852 #, c-format

4853 msgid "failed to create path '%s'%s"

4854 msgstr ""

4855

4745 -#: merge-recursive.c:883

4856 +#: merge-recursive.c:892

4857 #, c-format

4858 msgid "Removing %s to make room for subdirectory\n"

4859 msgstr ""

4860

4750 -#: merge-recursive.c:897 merge-recursive.c:916

4861 +#: merge-recursive.c:906 merge-recursive.c:925

4862 msgid ": perhaps a D/F conflict?"

4863 msgstr ""

4864

4754 -#: merge-recursive.c:906

4865 +#: merge-recursive.c:915

4866 #, c-format

4867 msgid "refusing to lose untracked file at '%s'"

4868 msgstr ""

4869

4759 -#: merge-recursive.c:947 builtin/cat-file.c:41

4870 +#: merge-recursive.c:956 builtin/cat-file.c:41

4871 #, c-format

4872 msgid "cannot read object %s '%s'"

4873 msgstr ""

4874

4764 -#: merge-recursive.c:952

4875 +#: merge-recursive.c:961

4876 #, c-format

4877 msgid "blob expected for %s '%s'"

4878 msgstr ""

4879

4769 -#: merge-recursive.c:977

4880 +#: merge-recursive.c:986

4881 #, c-format

4882 msgid "failed to open '%s': %s"

4883 msgstr ""

4884

4774 -#: merge-recursive.c:988

4885 +#: merge-recursive.c:997

4886 #, c-format

4887 msgid "failed to symlink '%s': %s"

4888 msgstr ""

4889

4779 -#: merge-recursive.c:993

4890 +#: merge-recursive.c:1002

4891 #, c-format

4892 msgid "do not know what to do with %06o %s '%s'"

4893 msgstr ""

4894

4784 -#: merge-recursive.c:1223 merge-recursive.c:1235

4895 +#: merge-recursive.c:1233 merge-recursive.c:1246

4896 #, c-format

4897 msgid "Fast-forwarding submodule %s to the following commit:"

4898 msgstr ""

4899

4789 -#: merge-recursive.c:1226 merge-recursive.c:1238

4900 +#: merge-recursive.c:1236 merge-recursive.c:1249

4901 #, c-format

4902 msgid "Fast-forwarding submodule %s"

4903 msgstr ""

4904

4794 -#: merge-recursive.c:1261

4905 +#: merge-recursive.c:1273

4906 #, c-format

4907 msgid "Failed to merge submodule %s (merge following commits not found)"

4908 msgstr ""

4909

4799 -#: merge-recursive.c:1265

4910 +#: merge-recursive.c:1277

4911 #, c-format

4912 msgid "Failed to merge submodule %s (not fast-forward)"

4913 msgstr ""

4914

4804 -#: merge-recursive.c:1266

4915 +#: merge-recursive.c:1278

4916 msgid "Found a possible merge resolution for the submodule:\n"

4917 msgstr ""

4918

4808 -#: merge-recursive.c:1278

4919 +#: merge-recursive.c:1290

4920 #, c-format

4921 msgid "Failed to merge submodule %s (multiple merges found)"

4922 msgstr ""

4923

4813 -#: merge-recursive.c:1420

4924 +#: merge-recursive.c:1434

4925 #, c-format

4926 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

4927 msgstr ""

4928

4818 -#: merge-recursive.c:1492

4929 +#: merge-recursive.c:1506

4930 #, c-format

4931 msgid ""

4932 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

4933 "in tree."

4934 msgstr ""

4935

4825 -#: merge-recursive.c:1497

4936 +#: merge-recursive.c:1511

4937 #, c-format

4938 msgid ""

4939 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

4940 "left in tree."

4941 msgstr ""

4942

4832 -#: merge-recursive.c:1504

4943 +#: merge-recursive.c:1518

4944 #, c-format

4945 msgid ""

4946 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

4947 "in tree at %s."

4948 msgstr ""

4949

4839 -#: merge-recursive.c:1509

4950 +#: merge-recursive.c:1523

4951 #, c-format

4952 msgid ""

4953 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

4954 "left in tree at %s."

4955 msgstr ""

4956

4846 -#: merge-recursive.c:1544

4957 +#: merge-recursive.c:1558

4958 msgid "rename"

4959 msgstr ""

4960

4850 -#: merge-recursive.c:1544

4961 +#: merge-recursive.c:1558

4962 msgid "renamed"

4963 msgstr ""

4964

4854 -#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164

4965 +#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178

4966 #, c-format

4967 msgid "Refusing to lose dirty file at %s"

4968 msgstr ""

4969

4859 -#: merge-recursive.c:1605

4970 +#: merge-recursive.c:1619

4971 #, c-format

4972 msgid "Refusing to lose untracked file at %s, even though it's in the way."

4973 msgstr ""

4974

4864 -#: merge-recursive.c:1663

4975 +#: merge-recursive.c:1677

4976 #, c-format

4977 msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"

4978 msgstr ""

4979

4869 -#: merge-recursive.c:1694

4980 +#: merge-recursive.c:1708

4981 #, c-format

4982 msgid "%s is a directory in %s adding as %s instead"

4983 msgstr ""

4984

4874 -#: merge-recursive.c:1699

4985 +#: merge-recursive.c:1713

4986 #, c-format

4987 msgid "Refusing to lose untracked file at %s; adding as %s instead"

4988 msgstr ""

4989

4879 -#: merge-recursive.c:1726

4990 +#: merge-recursive.c:1740

4991 #, c-format

4992 msgid ""

4993 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

4994 "\"->\"%s\" in \"%s\"%s"

4995 msgstr ""

4996

4886 -#: merge-recursive.c:1731

4997 +#: merge-recursive.c:1745

4998 msgid " (left unresolved)"

4999 msgstr ""

l10n: po-id for 2.34 (round 1)